diff --git a/nacos-spring-context-aot/pom.xml b/nacos-spring-context-aot/pom.xml index 3ecc158a..18c7883c 100644 --- a/nacos-spring-context-aot/pom.xml +++ b/nacos-spring-context-aot/pom.xml @@ -30,7 +30,6 @@ com.alibaba.nacos nacos-spring-context - ${revision} true diff --git a/nacos-spring-context/src/main/java/com/alibaba/nacos/spring/context/annotation/config/SpringValueAnnotationBeanPostProcessor.java b/nacos-spring-context/src/main/java/com/alibaba/nacos/spring/context/annotation/config/SpringValueAnnotationBeanPostProcessor.java index a7392f3e..7cda9c9a 100644 --- a/nacos-spring-context/src/main/java/com/alibaba/nacos/spring/context/annotation/config/SpringValueAnnotationBeanPostProcessor.java +++ b/nacos-spring-context/src/main/java/com/alibaba/nacos/spring/context/annotation/config/SpringValueAnnotationBeanPostProcessor.java @@ -52,7 +52,6 @@ /** * @author wuhaoqiang * @since 1.1.2 - * @desc: spring @Value Processor **/ public class SpringValueAnnotationBeanPostProcessor extends AbstractAnnotationBeanPostProcessor implements BeanFactoryAware, diff --git a/nacos-spring-context/src/main/java/com/alibaba/nacos/spring/context/event/config/EventPublishingConfigService.java b/nacos-spring-context/src/main/java/com/alibaba/nacos/spring/context/event/config/EventPublishingConfigService.java index 2c74320e..5d63ac27 100644 --- a/nacos-spring-context/src/main/java/com/alibaba/nacos/spring/context/event/config/EventPublishingConfigService.java +++ b/nacos-spring-context/src/main/java/com/alibaba/nacos/spring/context/event/config/EventPublishingConfigService.java @@ -174,7 +174,7 @@ public Properties getProperties() { /** * Destroy lifecycle method to invoke {@link #shutDown()} - * @throws Exception + * @throws Exception throw exception * @since 1.0.0 */ @Override diff --git a/nacos-spring-context/src/main/java/com/alibaba/nacos/spring/enums/FileTypeEnum.java b/nacos-spring-context/src/main/java/com/alibaba/nacos/spring/enums/FileTypeEnum.java index 29904d27..afb29793 100644 --- a/nacos-spring-context/src/main/java/com/alibaba/nacos/spring/enums/FileTypeEnum.java +++ b/nacos-spring-context/src/main/java/com/alibaba/nacos/spring/enums/FileTypeEnum.java @@ -87,7 +87,7 @@ public String getFileType() { * Get the corresponding FileTypeEnum by file extension or fileType. If not found FileTypeEnum.TEXT is returned * * @param extOrFileType file extension or fileType - * @return + * @return return {@link FileTypeEnum} */ public static FileTypeEnum getFileTypeEnumByFileExtensionOrFileType(String extOrFileType) { if (StringUtils.isNotBlank(extOrFileType)) { diff --git a/nacos-spring-context/src/main/java/com/alibaba/nacos/spring/util/NacosUtils.java b/nacos-spring-context/src/main/java/com/alibaba/nacos/spring/util/NacosUtils.java index 1fceef05..26c7c7f6 100644 --- a/nacos-spring-context/src/main/java/com/alibaba/nacos/spring/util/NacosUtils.java +++ b/nacos-spring-context/src/main/java/com/alibaba/nacos/spring/util/NacosUtils.java @@ -532,6 +532,7 @@ public static Map toProperties(String dataId, String group, * @param group config group * @param text config context * @param type config type + * @return map format of result */ public static Map toProperties(String dataId, String group, String text, String type) { diff --git a/nacos-spring-context/src/main/java/com/alibaba/nacos/spring/util/PlaceholderHelper.java b/nacos-spring-context/src/main/java/com/alibaba/nacos/spring/util/PlaceholderHelper.java index ba291f2c..b937bad0 100644 --- a/nacos-spring-context/src/main/java/com/alibaba/nacos/spring/util/PlaceholderHelper.java +++ b/nacos-spring-context/src/main/java/com/alibaba/nacos/spring/util/PlaceholderHelper.java @@ -20,12 +20,12 @@ public class PlaceholderHelper { /** * find keys from placeholder - * ${key} -> "key" - * xxx${key}yyy -> "key" - * ${key:${key2:1}} -> "key", "key2" - * ${${key}} -> "key" - * ${${key:100}} -> "key" - * ${${key}:${key2}} -> "key", "key2" + * ${key} - "key" + * xxx${key}yyy - "key" + * ${key:${key2:1}} - "key", "key2" + * ${${key}} - "key" + * ${${key:100}} - "key" + * ${${key}:${key2}} - "key", "key2" * @param propertyString ${key} * @return key */ diff --git a/nacos-spring-context/src/main/java/com/alibaba/nacos/spring/util/aot/NativeDetector.java b/nacos-spring-context/src/main/java/com/alibaba/nacos/spring/util/aot/NativeDetector.java index 5e1cd7ce..419162e3 100644 --- a/nacos-spring-context/src/main/java/com/alibaba/nacos/spring/util/aot/NativeDetector.java +++ b/nacos-spring-context/src/main/java/com/alibaba/nacos/spring/util/aot/NativeDetector.java @@ -25,7 +25,7 @@ public abstract class NativeDetector { private static final boolean imageCode = (System.getProperty("org.graalvm.nativeimage.imagecode") != null); /** - * Returns {@code true} if invoked in the context of image building or during image runtime, else {@code false}. + * @return Returns {@code true} if invoked in the context of image building or during image runtime, else {@code false}. */ public static boolean inNativeImage() { return imageCode; diff --git a/nacos-spring-samples/nacos-spring-webmvc-sample/pom.xml b/nacos-spring-samples/nacos-spring-webmvc-sample/pom.xml index ec60448f..c15c4437 100644 --- a/nacos-spring-samples/nacos-spring-webmvc-sample/pom.xml +++ b/nacos-spring-samples/nacos-spring-webmvc-sample/pom.xml @@ -39,12 +39,10 @@ ${project.groupId} nacos-spring-context - ${project.version} ${project.groupId} nacos-embedded-webserver - ${project.version} diff --git a/pom.xml b/pom.xml index 4b856474..c83c2eae 100644 --- a/pom.xml +++ b/pom.xml @@ -204,6 +204,18 @@ guava ${guava.version} + + + ${project.groupId} + nacos-spring-context + ${revision} + + + ${project.groupId} + nacos-embedded-webserver + ${revision} + + @@ -386,6 +398,11 @@ + + org.apache.maven.plugins + maven-war-plugin + 3.4.0 +