Merge pull request #708 from chidaodezhongsheng/dev

fix ProprertyUtil checkstyle errors
apache · Apr 9, 2018 · 4d04eef · 4d04eef
2 parents 8eaa43f + 198ee46
commit 4d04eef
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 14 deletions.
diff --git a/...core-spring-boot-starter/src/main/java/io/shardingjdbc/spring/boot/util/PropertyUtil.java b/...core-spring-boot-starter/src/main/java/io/shardingjdbc/spring/boot/util/PropertyUtil.java
@@ -27,17 +27,17 @@
 import io.shardingjdbc.core.exception.ShardingJdbcException;
 
 public class PropertyUtil {
-
+    
     private static int springBootVersion = 1;
-
+    
     static {
         try {
             Class.forName("org.springframework.boot.bind.RelaxedPropertyResolver");
         } catch (ClassNotFoundException e) {
             springBootVersion = 2;
         }
     }
-
+    
     /**
      * Spring Boot 1.x is compatible with Spring Boot 2.x by Using Java Reflect.
      * @param environment : the environment context
@@ -50,13 +50,13 @@ public class PropertyUtil {
     public static <T> T handle(final Environment environment, final String prefix, final Class<T> targetClass) {
         switch (springBootVersion) {
             case 1:
-                return (T) v1(environment, prefix, targetClass);
+                return (T) v1(environment, prefix);
             default:
                 return (T) v2(environment, prefix, targetClass);
         }
     }
-
-    private static Object v1(final Environment environment, final String prefix, final Class<?> targetClass) {
+    
+    private static Object v1(final Environment environment, final String prefix) {
         try {
             Class<?> resolverClass = Class.forName("org.springframework.boot.bind.RelaxedPropertyResolver");
             Constructor<?> resolverConstructor = resolverClass.getDeclaredConstructor(PropertyResolver.class);
@@ -69,7 +69,7 @@ private static Object v1(final Environment environment, final String prefix, fin
             throw new ShardingJdbcException(ex.getMessage(), ex);
         }
     }
-
+    
     private static Object v2(final Environment environment, final String prefix, final Class<?> targetClass) {
         try {
             Class<?> binderClass = Class.forName("org.springframework.boot.context.properties.bind.Binder");

diff --git a/...ot-starter/src/main/java/io/shardingjdbc/orchestration/spring/boot/util/PropertyUtil.java b/...ot-starter/src/main/java/io/shardingjdbc/orchestration/spring/boot/util/PropertyUtil.java
@@ -27,17 +27,17 @@
 import io.shardingjdbc.core.exception.ShardingJdbcException;
 
 public class PropertyUtil {
-
+    
     private static int springBootVersion = 1;
-
+    
     static {
         try {
             Class.forName("org.springframework.boot.bind.RelaxedPropertyResolver");
         } catch (ClassNotFoundException e) {
             springBootVersion = 2;
         }
     }
-
+    
     /**
      * Spring Boot 1.x is compatible with Spring Boot 2.x by Using Java Reflect.
      * @param environment : the environment context
@@ -50,13 +50,13 @@ public class PropertyUtil {
     public static <T> T handle(final Environment environment, final String prefix, final Class<T> targetClass) {
         switch (springBootVersion) {
             case 1:
-                return (T) v1(environment, prefix, targetClass);
+                return (T) v1(environment, prefix);
             default:
                 return (T) v2(environment, prefix, targetClass);
         }
     }
-
-    private static Object v1(final Environment environment, final String prefix, final Class<?> targetClass) {
+    
+    private static Object v1(final Environment environment, final String prefix) {
         try {
             Class<?> resolverClass = Class.forName("org.springframework.boot.bind.RelaxedPropertyResolver");
             Constructor<?> resolverConstructor = resolverClass.getDeclaredConstructor(PropertyResolver.class);
@@ -69,7 +69,7 @@ private static Object v1(final Environment environment, final String prefix, fin
             throw new ShardingJdbcException(ex.getMessage(), ex);
         }
     }
-
+    
     private static Object v2(final Environment environment, final String prefix, final Class<?> targetClass) {
         try {
             Class<?> binderClass = Class.forName("org.springframework.boot.context.properties.bind.Binder");