Optimize SofaRuntimeConfigurationProperties.(#185)

Optimize SofaRuntimeConfigurationProperties.
sofastack · Aug 14, 2018 · e79bb10 · e79bb10
1 parent be66043
commit e79bb10
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 7 deletions.
diff --git a/runtime-sofa-boot-starter/pom.xml b/runtime-sofa-boot-starter/pom.xml
@@ -89,6 +89,12 @@
             <optional>true</optional>
         </dependency>
 
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-configuration-processor</artifactId>
+            <optional>true</optional>
+        </dependency>
+
         <!-- provided -->
         <dependency>
             <groupId>com.alipay.sofa</groupId>

diff --git a/...c/main/java/com/alipay/sofa/runtime/spring/config/SofaRuntimeConfigurationProperties.java b/...c/main/java/com/alipay/sofa/runtime/spring/config/SofaRuntimeConfigurationProperties.java
@@ -24,19 +24,23 @@
  */
 @ConfigurationProperties(SofaRuntimeConfigurationProperties.PREFIX)
 public class SofaRuntimeConfigurationProperties {
-    static final String PREFIX                      = "com.alipay.sofa.boot";
-
-    private boolean     skipJvmReferenceHealthCheck = false;
-    private boolean     disableJvmFirst             = false;
+    static final String PREFIX = "com.alipay.sofa.boot";
 
     public void setSkipJvmReferenceHealthCheck(boolean skipJvmReferenceHealthCheck) {
-        this.skipJvmReferenceHealthCheck = skipJvmReferenceHealthCheck;
         SofaRuntimeProperties.setSkipJvmReferenceHealthCheck(this.getClass().getClassLoader(),
             skipJvmReferenceHealthCheck);
     }
 
     public void setDisableJvmFirst(boolean disableJvmFirst) {
-        this.disableJvmFirst = disableJvmFirst;
         SofaRuntimeProperties.setDisableJvmFirst(this.getClass().getClassLoader(), disableJvmFirst);
     }
+
+    public boolean isSkipJvmReferenceHealthCheck() {
+        return SofaRuntimeProperties
+            .isSkipJvmReferenceHealthCheck(this.getClass().getClassLoader());
+    }
+
+    public boolean isDisableJvmFirst() {
+        return SofaRuntimeProperties.isDisableJvmFirst(this.getClass().getClassLoader());
+    }
 }
diff --git a/...tarter/src/test/java/com/alipay/sofa/runtime/spring/config/SofaRuntimePropertiesTest.java b/...tarter/src/test/java/com/alipay/sofa/runtime/spring/config/SofaRuntimePropertiesTest.java
@@ -23,6 +23,7 @@
 import org.springframework.boot.test.util.EnvironmentTestUtils;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
 public class SofaRuntimePropertiesTest {
@@ -35,12 +36,35 @@ public void closeContext() {
     }
 
     @Test
-    public void testProperties() {
+    public void testDisableJvmFirstProperty() {
+        assertFalse(SofaRuntimeProperties.isDisableJvmFirst(applicationContext.getClassLoader()));
+
         EnvironmentTestUtils.addEnvironment(this.applicationContext,
             "com.alipay.sofa.boot.disableJvmFirst=true");
         this.applicationContext.register(SofaRuntimeAutoConfiguration.class);
         this.applicationContext.refresh();
+        SofaRuntimeConfigurationProperties configurationProperties = this.applicationContext
+            .getBean(SofaRuntimeConfigurationProperties.class);
+
         assertTrue(SofaRuntimeProperties.isDisableJvmFirst(applicationContext.getClassLoader()));
+        assertTrue(configurationProperties.isDisableJvmFirst());
+    }
+
+    @Test
+    public void testSkipJvmReferenceHealthCheckProperty() {
+        assertFalse(SofaRuntimeProperties.isSkipJvmReferenceHealthCheck(applicationContext
+            .getClassLoader()));
+
+        EnvironmentTestUtils.addEnvironment(this.applicationContext,
+            "com.alipay.sofa.boot.skipJvmReferenceHealthCheck=true");
+        this.applicationContext.register(SofaRuntimeAutoConfiguration.class);
+        this.applicationContext.refresh();
+        SofaRuntimeConfigurationProperties configurationProperties = this.applicationContext
+            .getBean(SofaRuntimeConfigurationProperties.class);
+
+        assertTrue(SofaRuntimeProperties.isSkipJvmReferenceHealthCheck(applicationContext
+            .getClassLoader()));
+        assertTrue(configurationProperties.isSkipJvmReferenceHealthCheck());
     }
 
 }