feat:

xs-fork · Jun 14, 2019 · cc5e636 · cc5e636
1 parent f20855d
commit cc5e636
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -18,11 +18,16 @@ matrix:
     - os: linux
       env: CUSTOM_JDK="oraclejdk8"
 
+jdk:
+  - openjdk10
+  - openjdk9
+  - openjdk8
+
 before_install:
   - echo 'MAVEN_OPTS="$MAVEN_OPTS -Xmx1024m -XX:MaxPermSize=512m -XX:+BytecodeVerificationLocal"' >> ~/.mavenrc
   - cat ~/.mavenrc
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export JAVA_HOME=$(/usr/libexec/java_home); fi
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then jdk_switcher use "$CUSTOM_JDK"; fi
+#  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export JAVA_HOME=$(/usr/libexec/java_home); fi
+#  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then jdk_switcher use "$CUSTOM_JDK"; fi
 
 script:
   - mvn -B clean package apache-rat:check findbugs:findbugs -Dmaven.test.skip=true

diff --git a/api/src/main/java/com/alibaba/nacos/api/annotation/NacosProperties.java b/api/src/main/java/com/alibaba/nacos/api/annotation/NacosProperties.java
@@ -132,12 +132,12 @@
     String ENCODE_PLACEHOLDER = "${" + PREFIX + ENCODE + ":UTF-8}";
 
     /**
-     * The placeholder of {@link NacosProperties#CONFIG_LONG_POLL_TIMEOUT config.long-poll.timeout}, the value is <code>"${nacos.config.long-poll.timeout:}"</code>
+     * The placeholder of {@link NacosProperties#CONFIG_LONG_POLL_TIMEOUT configLongPollTimeout}, the value is <code>"${nacos.configLongPollTimeout:}"</code>
      */
     String CONFIG_LONG_POLL_TIMEOUT_PLACEHOLDER = "${" + PREFIX + CONFIG_LONG_POLL_TIMEOUT + ":}";
 
     /**
-     * The placeholder of {@link NacosProperties#CONFIG_RETRY_TIME config.retry.time}, the value is <code>"${nacos.config.retry.time:}"</code>
+     * The placeholder of {@link NacosProperties#CONFIG_RETRY_TIME configRetryTime}, the value is <code>"${nacos.configRetryTime:}"</code>
      */
     String CONFIG_RETRY_TIME_PLACEHOLDER = "${" + PREFIX + CONFIG_RETRY_TIME + ":}";
 
@@ -211,15 +211,15 @@
     String encode() default ENCODE_PLACEHOLDER;
 
     /**
-     * The property of "config.long-poll.timeout"
+     * The property of "configLongPollTimeout"
      *
      * @return empty as default value
      * @see #CONFIG_LONG_POLL_TIMEOUT_PLACEHOLDER
      */
     String configLongPollTimeout() default CONFIG_LONG_POLL_TIMEOUT_PLACEHOLDER;
 
     /**
-     * The property of "config.retry.time"
+     * The property of "configRetryTime"
      *
      * @return empty as default value
      * @see #CONFIG_RETRY_TIME_PLACEHOLDER