diff --git a/spring-cloud-alibaba-examples/nacos-example/nacos-config-example/src/main/java/com/alibaba/cloud/examples/Application.java b/spring-cloud-alibaba-examples/nacos-example/nacos-config-example/src/main/java/com/alibaba/cloud/examples/Application.java index 814528bf3..cda11b31f 100644 --- a/spring-cloud-alibaba-examples/nacos-example/nacos-config-example/src/main/java/com/alibaba/cloud/examples/Application.java +++ b/spring-cloud-alibaba-examples/nacos-example/nacos-config-example/src/main/java/com/alibaba/cloud/examples/Application.java @@ -28,9 +28,9 @@ import org.springframework.boot.context.properties.EnableConfigurationProperties @SpringBootApplication @EnableConfigurationProperties(NacosConfigInfo.class) public class Application { - - public static void main(String[] args) { - SpringApplication.run(Application.class, args); - } - + + public static void main(String[] args) { + SpringApplication.run(Application.class, args); + } + } diff --git a/spring-cloud-alibaba-examples/nacos-example/nacos-config-example/src/main/java/com/alibaba/cloud/examples/configuration/BeanConfiguration.java b/spring-cloud-alibaba-examples/nacos-example/nacos-config-example/src/main/java/com/alibaba/cloud/examples/configuration/BeanConfiguration.java index 538475316..a635f36a0 100644 --- a/spring-cloud-alibaba-examples/nacos-example/nacos-config-example/src/main/java/com/alibaba/cloud/examples/configuration/BeanConfiguration.java +++ b/spring-cloud-alibaba-examples/nacos-example/nacos-config-example/src/main/java/com/alibaba/cloud/examples/configuration/BeanConfiguration.java @@ -27,9 +27,9 @@ import org.springframework.context.annotation.Configuration; */ @Configuration public class BeanConfiguration { - - @Bean - public NacosConfigInfo nacosConfigInfo() { - return new NacosConfigInfo(); - } + + @Bean + public NacosConfigInfo nacosConfigInfo() { + return new NacosConfigInfo(); + } } diff --git a/spring-cloud-alibaba-examples/nacos-example/nacos-config-example/src/main/java/com/alibaba/cloud/examples/example/BeanAutoRefreshConfigExample.java b/spring-cloud-alibaba-examples/nacos-example/nacos-config-example/src/main/java/com/alibaba/cloud/examples/example/BeanAutoRefreshConfigExample.java index eed64fe42..04318fc87 100644 --- a/spring-cloud-alibaba-examples/nacos-example/nacos-config-example/src/main/java/com/alibaba/cloud/examples/example/BeanAutoRefreshConfigExample.java +++ b/spring-cloud-alibaba-examples/nacos-example/nacos-config-example/src/main/java/com/alibaba/cloud/examples/example/BeanAutoRefreshConfigExample.java @@ -33,17 +33,17 @@ import java.util.Map; @RestController @RequestMapping("/nacos/bean") public class BeanAutoRefreshConfigExample { - - @Autowired - private NacosConfigInfo nacosConfigInfo; - - @GetMapping - public Map getConfigInfo() { - Map result = new HashMap<>(); - result.put("serveraddr", nacosConfigInfo.getServeraddr()); - result.put("prefix", nacosConfigInfo.getPrefix()); - result.put("group", nacosConfigInfo.getGroup()); - result.put("namespace", nacosConfigInfo.getNamespace()); - return result; - } + + @Autowired + private NacosConfigInfo nacosConfigInfo; + + @GetMapping + public Map getConfigInfo() { + Map result = new HashMap<>(); + result.put("serveraddr", nacosConfigInfo.getServeraddr()); + result.put("prefix", nacosConfigInfo.getPrefix()); + result.put("group", nacosConfigInfo.getGroup()); + result.put("namespace", nacosConfigInfo.getNamespace()); + return result; + } } diff --git a/spring-cloud-alibaba-examples/nacos-example/nacos-config-example/src/main/java/com/alibaba/cloud/examples/example/ConfigListenerExample.java b/spring-cloud-alibaba-examples/nacos-example/nacos-config-example/src/main/java/com/alibaba/cloud/examples/example/ConfigListenerExample.java index 7b3c1737d..b6a4e294f 100644 --- a/spring-cloud-alibaba-examples/nacos-example/nacos-config-example/src/main/java/com/alibaba/cloud/examples/example/ConfigListenerExample.java +++ b/spring-cloud-alibaba-examples/nacos-example/nacos-config-example/src/main/java/com/alibaba/cloud/examples/example/ConfigListenerExample.java @@ -16,7 +16,6 @@ package com.alibaba.cloud.examples.example; - import com.alibaba.cloud.nacos.NacosConfigManager; import com.alibaba.nacos.api.config.ConfigService; import com.alibaba.nacos.api.config.listener.Listener; @@ -35,29 +34,30 @@ import java.util.concurrent.Executors; */ @Component public class ConfigListenerExample { - - public static final String DATA_ID = "nacos-config-example.properties"; - - public static final String GROUP = "DEFAULT_GROUP"; - - @Autowired - private NacosConfigManager nacosConfigManager; - - @PostConstruct - public void init() throws NacosException { - ConfigService configService = nacosConfigManager.getConfigService(); - - configService.addListener(DATA_ID, GROUP, new Listener() { - @Override - public Executor getExecutor() { - return Executors.newSingleThreadExecutor(); - } - - @Override - public void receiveConfigInfo(String configInfo) { - System.out.println("[dataId]:[" + DATA_ID + "],Configuration changed to:" + configInfo); - } - }); - } - + + public static final String DATA_ID = "nacos-config-example.properties"; + + public static final String GROUP = "DEFAULT_GROUP"; + + @Autowired + private NacosConfigManager nacosConfigManager; + + @PostConstruct + public void init() throws NacosException { + ConfigService configService = nacosConfigManager.getConfigService(); + + configService.addListener(DATA_ID, GROUP, new Listener() { + @Override + public Executor getExecutor() { + return Executors.newSingleThreadExecutor(); + } + + @Override + public void receiveConfigInfo(String configInfo) { + System.out.println("[dataId]:[" + DATA_ID + "],Configuration changed to:" + + configInfo); + } + }); + } + } diff --git a/spring-cloud-alibaba-examples/nacos-example/nacos-config-example/src/main/java/com/alibaba/cloud/examples/example/DockingInterfaceExample.java b/spring-cloud-alibaba-examples/nacos-example/nacos-config-example/src/main/java/com/alibaba/cloud/examples/example/DockingInterfaceExample.java index 5428c0c4f..7cefc6baa 100644 --- a/spring-cloud-alibaba-examples/nacos-example/nacos-config-example/src/main/java/com/alibaba/cloud/examples/example/DockingInterfaceExample.java +++ b/spring-cloud-alibaba-examples/nacos-example/nacos-config-example/src/main/java/com/alibaba/cloud/examples/example/DockingInterfaceExample.java @@ -36,93 +36,96 @@ import java.util.concurrent.Executor; @RestController @RequestMapping("nacos") public class DockingInterfaceExample { - - public static final String DEFAULT_GROUP = "DEFAULT_GROUP"; - - @Autowired - private NacosConfigManager nacosConfigManager; - - /** - * Get configuration information - * - * @param dataId - * @param group - * @return - * @throws NacosException - */ - @RequestMapping("getConfig") - public String getConfig(@RequestParam("dataId") String dataId, - @RequestParam(value = "group", required = false) String group) throws NacosException { - if (StringUtils.isEmpty(group)) { - group = DEFAULT_GROUP; - } - ConfigService configService = nacosConfigManager.getConfigService(); - return configService.getConfig(dataId, group, 2000); - } - - /** - * Publish configuration - * - * @param dataId - * @param group - * @param content - * @return - * @throws NacosException - */ - @RequestMapping("publishConfig") - public boolean publishConfig(@RequestParam("dataId") String dataId, - @RequestParam(value = "group", required = false) String group, @RequestParam("content") String content) - throws NacosException { - if (StringUtils.isEmpty(group)) { - group = DEFAULT_GROUP; - } - ConfigService configService = nacosConfigManager.getConfigService(); - return configService.publishConfig(dataId, group, content); - } - - /** - * Delete configuration - * - * @param dataId - * @param group - * @return - * @throws NacosException - */ - @RequestMapping("remoteConfig") - public boolean remoteConfig(@RequestParam("dataId") String dataId, - @RequestParam(value = "group", required = false) String group) throws NacosException { - if (StringUtils.isEmpty(group)) { - group = DEFAULT_GROUP; - } - ConfigService configService = nacosConfigManager.getConfigService(); - return configService.removeConfig(dataId, group); - } - - /** - * Add listener configuration information - * - * @param dataId - * @param group - * @throws NacosException - */ - @RequestMapping("listener") - public String listenerConfig(@RequestParam("dataId") String dataId, - @RequestParam(value = "group", required = false) String group) throws NacosException { - if (StringUtils.isEmpty(group)) { - group = DEFAULT_GROUP; - } - ConfigService configService = nacosConfigManager.getConfigService(); - configService.addListener(dataId, group, new Listener() { - @Override - public Executor getExecutor() { - return null; - } - - @Override - public void receiveConfigInfo(String configInfo) { - System.out.println("[Listen for configuration changes]:" + configInfo); - } - }); - return "Add Lister successfully!"; - } + + public static final String DEFAULT_GROUP = "DEFAULT_GROUP"; + + @Autowired + private NacosConfigManager nacosConfigManager; + + /** + * Get configuration information + * + * @param dataId + * @param group + * @return + * @throws NacosException + */ + @RequestMapping("getConfig") + public String getConfig(@RequestParam("dataId") String dataId, + @RequestParam(value = "group", required = false) String group) + throws NacosException { + if (StringUtils.isEmpty(group)) { + group = DEFAULT_GROUP; + } + ConfigService configService = nacosConfigManager.getConfigService(); + return configService.getConfig(dataId, group, 2000); + } + + /** + * Publish configuration + * + * @param dataId + * @param group + * @param content + * @return + * @throws NacosException + */ + @RequestMapping("publishConfig") + public boolean publishConfig(@RequestParam("dataId") String dataId, + @RequestParam(value = "group", required = false) String group, + @RequestParam("content") String content) throws NacosException { + if (StringUtils.isEmpty(group)) { + group = DEFAULT_GROUP; + } + ConfigService configService = nacosConfigManager.getConfigService(); + return configService.publishConfig(dataId, group, content); + } + + /** + * Delete configuration + * + * @param dataId + * @param group + * @return + * @throws NacosException + */ + @RequestMapping("remoteConfig") + public boolean remoteConfig(@RequestParam("dataId") String dataId, + @RequestParam(value = "group", required = false) String group) + throws NacosException { + if (StringUtils.isEmpty(group)) { + group = DEFAULT_GROUP; + } + ConfigService configService = nacosConfigManager.getConfigService(); + return configService.removeConfig(dataId, group); + } + + /** + * Add listener configuration information + * + * @param dataId + * @param group + * @throws NacosException + */ + @RequestMapping("listener") + public String listenerConfig(@RequestParam("dataId") String dataId, + @RequestParam(value = "group", required = false) String group) + throws NacosException { + if (StringUtils.isEmpty(group)) { + group = DEFAULT_GROUP; + } + ConfigService configService = nacosConfigManager.getConfigService(); + configService.addListener(dataId, group, new Listener() { + @Override + public Executor getExecutor() { + return null; + } + + @Override + public void receiveConfigInfo(String configInfo) { + System.out.println("[Listen for configuration changes]:" + configInfo); + } + }); + return "Add Lister successfully!"; + } } diff --git a/spring-cloud-alibaba-examples/nacos-example/nacos-config-example/src/main/java/com/alibaba/cloud/examples/example/ValueAnnotationExample.java b/spring-cloud-alibaba-examples/nacos-example/nacos-config-example/src/main/java/com/alibaba/cloud/examples/example/ValueAnnotationExample.java index 821aff30f..32c2687a3 100644 --- a/spring-cloud-alibaba-examples/nacos-example/nacos-config-example/src/main/java/com/alibaba/cloud/examples/example/ValueAnnotationExample.java +++ b/spring-cloud-alibaba-examples/nacos-example/nacos-config-example/src/main/java/com/alibaba/cloud/examples/example/ValueAnnotationExample.java @@ -34,26 +34,26 @@ import java.util.Map; @RequestMapping("/nacos/annotation") @RefreshScope public class ValueAnnotationExample { - - @Value("${spring.cloud.nacos.config.serveraddr:}") - private String serveraddr; - - @Value("${spring.cloud.nacos.config.prefix:}") - private String prefix; - - @Value("${spring.cloud.nacos.config.group:}") - private String group; - - @Value("${spring.cloud.nacos.config.namespace:}") - private String namespace; - - @GetMapping - public Map getConfigInfo() { - Map result = new HashMap<>(); - result.put("serveraddr", serveraddr); - result.put("prefix", prefix); - result.put("group", group); - result.put("namespace", namespace); - return result; - } + + @Value("${spring.cloud.nacos.config.serveraddr:}") + private String serveraddr; + + @Value("${spring.cloud.nacos.config.prefix:}") + private String prefix; + + @Value("${spring.cloud.nacos.config.group:}") + private String group; + + @Value("${spring.cloud.nacos.config.namespace:}") + private String namespace; + + @GetMapping + public Map getConfigInfo() { + Map result = new HashMap<>(); + result.put("serveraddr", serveraddr); + result.put("prefix", prefix); + result.put("group", group); + result.put("namespace", namespace); + return result; + } } diff --git a/spring-cloud-alibaba-examples/nacos-example/nacos-config-example/src/main/java/com/alibaba/cloud/examples/model/NacosConfigInfo.java b/spring-cloud-alibaba-examples/nacos-example/nacos-config-example/src/main/java/com/alibaba/cloud/examples/model/NacosConfigInfo.java index cacfd0307..b77458166 100644 --- a/spring-cloud-alibaba-examples/nacos-example/nacos-config-example/src/main/java/com/alibaba/cloud/examples/model/NacosConfigInfo.java +++ b/spring-cloud-alibaba-examples/nacos-example/nacos-config-example/src/main/java/com/alibaba/cloud/examples/model/NacosConfigInfo.java @@ -22,57 +22,56 @@ import org.springframework.cloud.context.config.annotation.RefreshScope; @ConfigurationProperties(prefix = "spring.cloud.nacos.config") @RefreshScope public class NacosConfigInfo { - - /** - * Nacos server address - */ - private String serveraddr; - - /** - * Data Id prefix - */ - private String prefix; - - /** - * Nacos group - */ - private String group; - - /** - * Nacos namespace - */ - private String namespace; - - public String getServeraddr() { - return serveraddr; - } - - public void setServeraddr(String serveraddr) { - this.serveraddr = serveraddr; - } - - public String getPrefix() { - return prefix; - } - - public void setPrefix(String prefix) { - this.prefix = prefix; - } - - public String getGroup() { - return group; - } - - public void setGroup(String group) { - this.group = group; - } - - public String getNamespace() { - return namespace; - } - - public void setNamespace(String namespace) { - this.namespace = namespace; - } -} + /** + * Nacos server address + */ + private String serveraddr; + + /** + * Data Id prefix + */ + private String prefix; + + /** + * Nacos group + */ + private String group; + + /** + * Nacos namespace + */ + private String namespace; + + public String getServeraddr() { + return serveraddr; + } + + public void setServeraddr(String serveraddr) { + this.serveraddr = serveraddr; + } + + public String getPrefix() { + return prefix; + } + + public void setPrefix(String prefix) { + this.prefix = prefix; + } + + public String getGroup() { + return group; + } + + public void setGroup(String group) { + this.group = group; + } + + public String getNamespace() { + return namespace; + } + + public void setNamespace(String namespace) { + this.namespace = namespace; + } +}