Skip to content

Commit

Permalink
resolve javadoc error. (#344)
Browse files Browse the repository at this point in the history
* resolve javadoc error.

* add maven-war-plugin
  • Loading branch information
jefferson-chern authored Jun 14, 2024
1 parent 9b61ef6 commit 4b106fb
Show file tree
Hide file tree
Showing 9 changed files with 27 additions and 13 deletions.
1 change: 0 additions & 1 deletion nacos-spring-context-aot/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
<dependency>
<groupId>com.alibaba.nacos</groupId>
<artifactId>nacos-spring-context</artifactId>
<version>${revision}</version>
<optional>true</optional>
</dependency>
</dependencies>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@
/**
* @author wuhaoqiang
* @since 1.1.2
* @desc: spring @Value Processor
**/
public class SpringValueAnnotationBeanPostProcessor
extends AbstractAnnotationBeanPostProcessor implements BeanFactoryAware,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -532,6 +532,7 @@ public static Map<String, Object> 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<String, Object> toProperties(String dataId, String group,
String text, String type) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 0 additions & 2 deletions nacos-spring-samples/nacos-spring-webmvc-sample/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,10 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>nacos-spring-context</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>nacos-embedded-webserver</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>

Expand Down
17 changes: 17 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,18 @@
<artifactId>guava</artifactId>
<version>${guava.version}</version>
</dependency>

<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>nacos-spring-context</artifactId>
<version>${revision}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>nacos-embedded-webserver</artifactId>
<version>${revision}</version>
</dependency>

</dependencies>
</dependencyManagement>

Expand Down Expand Up @@ -386,6 +398,11 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>3.4.0</version>
</plugin>
</plugins>
</build>

Expand Down

0 comments on commit 4b106fb

Please sign in to comment.