format and compile delomboked sources

Author: Alexander Furer

grpc-spring-boot-starter-demo/build.gradle

@@ -70,16 +70,20 @@ dependencies {
     testCompile('org.springframework.cloud:spring-cloud-starter-consul-discovery')
     testCompile 'com.pszymczyk.consul:embedded-consul:2.1.4'
     testCompile 'org.awaitility:awaitility:4.0.3'
-
-
     testCompile "org.springframework.cloud:spring-cloud-config-server"
     testCompile "org.springframework.cloud:spring-cloud-config-client"
-    testCompile "com.playtika.testcontainers:embedded-keycloak:2.0.6"
     testCompile "org.springframework.cloud:spring-cloud-starter-bootstrap"
 
+    testCompile "com.playtika.testcontainers:embedded-keycloak:2.0.8"
+    constraints {
+        testCompile('org.testcontainers:testcontainers:1.15.3'){
+            because 'embedded-keycloak or testcontainers  should be upgraded when https://github.com/testcontainers/testcontainers-java/issues/4125 fixed.'
+        }
+
+    }
 
-    testImplementation 'org.hamcrest:hamcrest:2.1'
 
+    testImplementation 'org.hamcrest:hamcrest:2.1'
     testImplementation 'org.mockito:mockito-core:2.23.0'
 
     customSecurityTestCompile  sourceSets.test.output

grpc-spring-boot-starter-demo/src/test/java/org/lognet/springboot/grpc/auth/JwtAuthBaseTest.java

@@ -79,7 +79,7 @@ protected ByteBuffer generateToken() {
             return ByteBuffer.wrap(new ObjectMapper().readTree(response.getBody())
                     .at("/access_token")
                     .asText().getBytes());
-        } catch (JsonProcessingException e) {
+        } catch ( Exception e) {
             throw new RuntimeException(e);
         }
     }

grpc-spring-boot-starter/build.gradle

@@ -10,6 +10,8 @@ buildscript {
 }
 plugins {
     id "de.undercouch.download" version "4.1.1"
+    id "com.github.sherter.google-java-format" version "0.9"
+
 }
 apply plugin: 'java'
 apply plugin: 'org.springframework.boot'
@@ -47,24 +49,39 @@ task generateReleaseNotes(type: JavaExec, group: "documentation") {
         }
     }
 }
-
+def delombokOutputDir = file("$buildDir/delombok")
 task delombok(type: io.franzbecker.gradle.lombok.task.DelombokTask) {
-    def outputDir = file("$buildDir/delombok")
-    outputs.dir(outputDir)
+
+    outputs.dir(delombokOutputDir)
     for (srcDir in project.sourceSets.main.java.srcDirs) {
         inputs.dir(srcDir)
-        args(srcDir, "-d", outputDir)
+        args(srcDir, "-d", delombokOutputDir)
     }
     doFirst {
-        outputDir.deleteDir()
+        delombokOutputDir.deleteDir()
     }
 }
 
+googleJavaFormat {
+    toolVersion = '1.9'
+    source = delombokOutputDir
+    include '**/*.java'
+}
+tasks.verifyGoogleJavaFormat {
+    enabled false
+}
+tasks.googleJavaFormat {
+    dependsOn tasks.delombok
+}
 task sourceJar(type: Jar) {
+    dependsOn(tasks.googleJavaFormat)
     classifier "sources"
-    from delombok
+    from delombokOutputDir
+}
+javadoc {
+    dependsOn tasks.googleJavaFormat
+    source = delombokOutputDir
 }
-
 task javadocJar(type: Jar, dependsOn: javadoc) {
     classifier "javadoc"
     from javadoc.destinationDir
@@ -168,6 +185,19 @@ dependencies {
 
 
 }
-compileJava.dependsOn(processResources)
+if(null!=System.getenv("CI")) {
+    compileJava {
+        dependsOn(processResources, tasks.googleJavaFormat)
+        source googleJavaFormat.source
+        include { FileTreeElement e ->
+            def included = true
+            if (e.name.toLowerCase().endsWith("java")) {
+                included = e.file.absolutePath.startsWith(delombokOutputDir.absolutePath)
+            }
+
+            return included
+        }
+    }
+}
 
 

grpc-spring-boot-starter/src/main/java/org/lognet/springboot/grpc/autoconfigure/GRpcServerProperties.java

@@ -113,8 +113,8 @@ public static class NettyServerProperties {
         /**
          *  grpc listen address. <P>If configured, takes precedence over {@code grpc.port} property value.</p>
          *  Supported format:
-         *  <li>{@code host:port} (if port is less than 1, uses random value)
-         *  <li>{@code host:}  (uses default grpc port, 6565 )
+         *  <ul><li>{@code host:port} (if port is less than 1, uses random value)
+         *  <li>{@code host:}  (uses default grpc port, 6565 )</ul>
          */
         private InetSocketAddress primaryListenAddress;