refactor googleJavaFormat (#21)

build.gradle

@@ -54,6 +54,7 @@ allprojects {
     group = 'com.webank.wedpr'
     version = '1.0.0-rc1-SNAPSHOT'
     apply plugin: 'maven-publish'
+    apply plugin: 'com.github.sherter.google-java-format'
     apply plugin: 'idea'
     apply plugin: 'eclipse'
     apply plugin: 'java'
@@ -174,6 +175,13 @@ subprojects {
             resources.srcDir file('src/integration-test/resources')
         }
     }
+    googleJavaFormat {
+        //toolVersion = '1.7'
+        options style: 'AOSP'
+        source = sourceSets*.allJava
+        include '**/*.java'
+        //source = *.allJava
+    }
     configurations {
         integrationTestCompile.extendsFrom testCompile
         integrationTestRuntime.extendsFrom testRuntime

wedpr-adm/build.gradle

@@ -18,10 +18,3 @@ dependencies {
     compile project(":wedpr-components-security")
     compile project(":wedpr-components-report")
 }
-googleJavaFormat {
-    //toolVersion = '1.7'
-    options style: 'AOSP'
-    source = sourceSets*.allJava
-    include '**/*.java'
-    //source = *.allJava
-}

wedpr-admin/build.gradle

@@ -9,10 +9,3 @@ dependencies {
     compile project(":wedpr-components-security")
     compile project(":wedpr-components-admin")
 }
-googleJavaFormat {
-    //toolVersion = '1.7'
-    options style: 'AOSP'
-    source = sourceSets*.allJava
-    include '**/*.java'
-    //source = *.allJava
-}

wedpr-components/admin/build.gradle

@@ -1,17 +1,9 @@
 // Apply the java-library plugin to add support for Java Library
 plugins {
     id 'java'
-    id 'com.github.sherter.google-java-format'
 }
 
 dependencies {
     compile project(":wedpr-components-token-auth")
     compile project(":wedpr-components-mybatis")
-}
-googleJavaFormat {
-    //toolVersion = '1.7'
-    options style: 'AOSP'
-    source = sourceSets*.allJava
-    include '**/*.java'
-    //source = *.allJava
-}
+}

wedpr-components/authorization/build.gradle

@@ -1,18 +1,10 @@
 // Apply the java-library plugin to add support for Java Library
 plugins {
     id 'java'
-    id 'com.github.sherter.google-java-format'
 }
 dependencies{
     compile project(":wedpr-components-mybatis")
     compile project(":wedpr-components-uuid")
     compile project(":wedpr-components-sync")
     compile project(":wedpr-components-resource-follower")
-}
-googleJavaFormat {
-    //toolVersion = '1.7'
-    options style: 'AOSP'
-    source = sourceSets*.allJava
-    include '**/*.java'
-    //source = *.allJava
 }

wedpr-components/blockchain/build.gradle

@@ -1,17 +1,9 @@
 // Apply the java-library plugin to add support for Java Library
 plugins {
     id 'java'
-    id 'com.github.sherter.google-java-format'
 }
 
 dependencies {
     compile project(":wedpr-core-utils")
     compile ("org.fisco-bcos.java-sdk:fisco-bcos-java-sdk:${bcosSDKVersion}")
-}
-googleJavaFormat {
-    //toolVersion = '1.7'
-    options style: 'AOSP'
-    source = sourceSets*.allJava
-    include '**/*.java'
-    //source = *.allJava
 }

wedpr-components/dataset/build.gradle

@@ -1,7 +1,6 @@
 // Apply the java-library plugin to add support for Java Library
 plugins {
     id 'java'
-    id 'com.github.sherter.google-java-format'
 }
 
 // Additional attribute definition
@@ -38,14 +37,4 @@ dependencies {
     // shen tong
     compile files('libs/oscarJDBC8.jar')
 //    compile files('libs/oscarHibernate54.jar')
-}
-
-googleJavaFormat {
-    toolVersion = '1.7'
-    options style: 'AOSP'
-    source = sourceSets*.allJava
-    include '**/*.java'
-//    exclude '**/*Test.java'
-//    exclude '**/Test*.java'
-//    exclude '**/Mock*.java'
-}
+}

wedpr-components/dataset/src/main/java/com/webank/wedpr/components/dataset/service/DatasetServiceImpl.java

@@ -253,7 +253,8 @@ public void deleteDatasetList(UserInfo userInfo, List<String> datasetIdList)
 
         // sort and distinct
         List<String> newDatasetIdList =
-                datasetIdList.stream()
+                datasetIdList
+                        .stream()
                         .distinct()
                         .sorted(String::compareTo)
                         .collect(Collectors.toList());

wedpr-components/env-integration/jupyter/build.gradle

@@ -1,17 +1,9 @@
 // Apply the java-library plugin to add support for Java Library
 plugins {
     id 'java'
-    id 'com.github.sherter.google-java-format'
 }
 dependencies{
     compile project(":wedpr-components-mybatis")
     compile project(":wedpr-components-uuid")
     compile project(":wedpr-components-sys-config")
 }
-googleJavaFormat {
-    //toolVersion = '1.7'
-    options style: 'AOSP'
-    source = sourceSets*.allJava
-    include '**/*.java'
-    //source = *.allJava
-}

wedpr-components/http-client/build.gradle

@@ -1,17 +1,9 @@
 // Apply the java-library plugin to add support for Java Library
 plugins {
     id 'java'
-    id 'com.github.sherter.google-java-format'
 }
 
 dependencies {
     compile ("org.apache.httpcomponents:httpclient:${httpClientVersion}")
     compile project(":wedpr-core-utils")
 }
-googleJavaFormat {
-    //toolVersion = '1.7'
-    options style: 'AOSP'
-    source = sourceSets*.allJava
-    include '**/*.java'
-    //source = *.allJava
-}

wedpr-components/initializer/build.gradle

@@ -1,7 +1,6 @@
 // Apply the java-library plugin to add support for Java Library
 plugins {
     id 'java'
-    id 'com.github.sherter.google-java-format'
 }
 
 dependencies {
@@ -10,10 +9,3 @@ dependencies {
     compile project(":wedpr-components-mybatis")
     compile("org.springframework.boot:spring-boot-starter-web:${springBootVersion}")
 }
-googleJavaFormat {
-    //toolVersion = '1.7'
-    options style: 'AOSP'
-    source = sourceSets*.allJava
-    include '**/*.java'
-    //source = *.allJava
-}

wedpr-components/leader-election/build.gradle

@@ -1,16 +1,8 @@
 // Apply the java-library plugin to add support for Java Library
 plugins {
     id 'java'
-    id 'com.github.sherter.google-java-format'
 }
 
 dependencies {
     compile project(":wedpr-components-sys-config")
 }
-googleJavaFormat {
-    //toolVersion = '1.7'
-    options style: 'AOSP'
-    source = sourceSets*.allJava
-    include '**/*.java'
-    //source = *.allJava
-}

wedpr-components/meta/agency/build.gradle

@@ -1,16 +1,8 @@
 // Apply the java-library plugin to add support for Java Library
 plugins {
     id 'java'
-    id 'com.github.sherter.google-java-format'
 }
 dependencies{
     compile project(":wedpr-components-mybatis")
     compile project(":wedpr-components-uuid")
 }
-googleJavaFormat {
-    //toolVersion = '1.7'
-    options style: 'AOSP'
-    source = sourceSets*.allJava
-    include '**/*.java'
-    //source = *.allJava
-}

wedpr-components/meta/project/build.gradle

@@ -1,7 +1,6 @@
 // Apply the java-library plugin to add support for Java Library
 plugins {
     id 'java'
-    id 'com.github.sherter.google-java-format'
 }
 dependencies{
     compile project(":wedpr-components-mybatis")
@@ -10,10 +9,3 @@ dependencies{
     compile project(":wedpr-components-resource-follower")
     compile project(":wedpr-components-dataset")
 }
-googleJavaFormat {
-    //toolVersion = '1.7'
-    options style: 'AOSP'
-    source = sourceSets*.allJava
-    include '**/*.java'
-    //source = *.allJava
-}

wedpr-components/meta/resource-follower/build.gradle

@@ -1,16 +1,8 @@
 // Apply the java-library plugin to add support for Java Library
 plugins {
     id 'java'
-    id 'com.github.sherter.google-java-format'
 }
 dependencies{
 	compile project(":wedpr-components-uuid")
     compile project(":wedpr-components-mybatis")
-}
-googleJavaFormat {
-    //toolVersion = '1.7'
-    options style: 'AOSP'
-    source = sourceSets*.allJava
-    include '**/*.java'
-    //source = *.allJava
-}
+}

wedpr-components/meta/setting-template/build.gradle

@@ -1,17 +1,9 @@
 // Apply the java-library plugin to add support for Java Library
 plugins {
     id 'java'
-    id 'com.github.sherter.google-java-format'
 }
 dependencies{
     compile project(":wedpr-components-mybatis")
     compile project(":wedpr-core-protocol")
     compile project(":wedpr-components-uuid")
-}
-googleJavaFormat {
-    //toolVersion = '1.7'
-    options style: 'AOSP'
-    source = sourceSets*.allJava
-    include '**/*.java'
-    //source = *.allJava
-}
+}

wedpr-components/meta/sys-config/build.gradle

@@ -1,16 +1,8 @@
 // Apply the java-library plugin to add support for Java Library
 plugins {
     id 'java'
-    id 'com.github.sherter.google-java-format'
 }
 dependencies{
     compile project(":wedpr-components-mybatis")
     compile project(":wedpr-core-protocol")
-}
-googleJavaFormat {
-    //toolVersion = '1.7'
-    options style: 'AOSP'
-    source = sourceSets*.allJava
-    include '**/*.java'
-    //source = *.allJava
 }

wedpr-components/mybatis/build.gradle

@@ -1,6 +1,5 @@
 plugins {
     id 'java'
-    id 'com.github.sherter.google-java-format'
 }
 
 dependencies {
@@ -13,10 +12,3 @@ dependencies {
     compile("com.baomidou:mybatis-plus-generator:${mybatisPlusGeneratorVersion}")
     compile("org.apache.velocity:velocity-engine-core:${velocityVersion}")
 }
-googleJavaFormat {
-    //toolVersion = '1.7'
-    options style: 'AOSP'
-    source = sourceSets*.allJava
-    include '**/*.java'
-    //source = *.allJava
-}

wedpr-components/report/build.gradle

@@ -1,17 +1,9 @@
 // Apply the java-library plugin to add support for Java Library
 plugins {
     id 'java'
-    id 'com.github.sherter.google-java-format'
 }
 
 dependencies {
     compile project(":wedpr-components-mybatis")
     implementation("org.springframework.boot:spring-boot-starter-quartz:${springBootVersion}")
 }
-googleJavaFormat {
-    //toolVersion = '1.7'
-    options style: 'AOSP'
-    source = sourceSets*.allJava
-    include '**/*.java'
-    //source = *.allJava
-}

wedpr-components/scheduler/build.gradle

@@ -1,7 +1,6 @@
 // Apply the java-library plugin to add support for Java Library
 plugins {
     id 'java'
-    id 'com.github.sherter.google-java-format'
 }
 
 dependencies {
@@ -11,11 +10,4 @@ dependencies {
     compile project(":wedpr-components-project")
     compile project(":wedpr-components-sync")
     compile project(":wedpr-components-http-client")
-}
-googleJavaFormat {
-    //toolVersion = '1.7'
-    options style: 'AOSP'
-    source = sourceSets*.allJava
-    include '**/*.java'
-    //source = *.allJava
-}
+}

wedpr-components/security/build.gradle

@@ -1,17 +1,9 @@
 // Apply the java-library plugin to add support for Java Library
 plugins {
     id 'java'
-    id 'com.github.sherter.google-java-format'
 }
 
 dependencies {
     compile project(":wedpr-components-token-auth")
     compile project(":wedpr-components-user")
-}
-googleJavaFormat {
-    //toolVersion = '1.7'
-    options style: 'AOSP'
-    source = sourceSets*.allJava
-    include '**/*.java'
-    //source = *.allJava
-}
+}

wedpr-components/spi/build.gradle

@@ -1,15 +1,7 @@
 // Apply the java-library plugin to add support for Java Library
 plugins {
     id 'java'
-    id 'com.github.sherter.google-java-format'
 }
 dependencies{
     compile project(":wedpr-core-utils")
 }
-googleJavaFormat {
-    //toolVersion = '1.7'
-    options style: 'AOSP'
-    source = sourceSets*.allJava
-    include '**/*.java'
-    //source = *.allJava
-}