[Java] Improve build for Java 10 plus upgrade to Gradle 4.7.

Author: mjpt777

build.gradle

@@ -122,8 +122,6 @@ subprojects {
 
     jar.enabled = true
 
-    [compileJava, compileTestJava]*.options*.encoding = 'UTF-8'
-
     dependencies {
         checkstyle 'com.puppycrawl.tools:checkstyle:8.9'
 
@@ -141,8 +139,17 @@ subprojects {
     compileJava {
         sourceCompatibility = '1.8'
         targetCompatibility = '1.8'
+        options.encoding = 'UTF-8'
+        options.deprecation = true
     }
 
+    compileTestJava {
+        sourceCompatibility = '1.8'
+        targetCompatibility = '1.8'
+        options.encoding = 'UTF-8'
+        options.deprecation = true
+    }
+    
     test {
         testLogging {
             showStandardStreams = true
@@ -153,6 +160,9 @@ subprojects {
     javadoc {
         title = '<h1>Simple Binary Encoding</h1>'
         options.bottom = '<i>Copyright &#169; 2014-2018 Real Logic Ltd. All Rights Reserved.</i>'
+        if (JavaVersion.current() == JavaVersion.VERSION_1_10) {
+            options.addBooleanOption 'html5', true
+        }
     }
 
     signing {
@@ -690,6 +700,6 @@ task uploadToMavenCentral {
 }
 
 task wrapper(type: Wrapper) {
-    gradleVersion = '4.6'
+    gradleVersion = '4.7'
     distributionType = 'ALL'
 }

gradle/wrapper/gradle-wrapper.jar

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.7-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.properties

@@ -87,7 +87,7 @@ public void shouldGenerateMessageHeaderStub() throws Exception
         final Class<?> clazz = compile(fqClassName);
         assertNotNull(clazz);
 
-        final Object flyweight = clazz.newInstance();
+        final Object flyweight = clazz.getConstructor().newInstance();
         final Method method = flyweight.getClass().getDeclaredMethod("wrap", BUFFER_CLASS, int.class);
         method.invoke(flyweight, mockBuffer, bufferOffset);
 
@@ -113,7 +113,7 @@ public void shouldGenerateMessageHeaderDecoderStub() throws Exception
         final Class<?> clazz = compile(fqClassName);
         assertNotNull(clazz);
 
-        final Object flyweight = clazz.newInstance();
+        final Object flyweight = clazz.getConstructor().newInstance();
         final Method method = flyweight.getClass().getDeclaredMethod("wrap", READ_ONLY_BUFFER_CLASS, int.class);
         method.invoke(flyweight, mockBuffer, bufferOffset);
 
@@ -164,7 +164,7 @@ public void shouldGenerateChoiceSetStub() throws Exception
         final Class<?> clazz = compile(fqClassName);
         assertNotNull(clazz);
 
-        final Object flyweight = clazz.newInstance();
+        final Object flyweight = clazz.getConstructor().newInstance();
         final Method method = flyweight.getClass().getDeclaredMethod("wrap", READ_ONLY_BUFFER_CLASS, int.class);
         method.invoke(flyweight, mockBuffer, bufferOffset);
 
@@ -193,7 +193,7 @@ public void shouldGenerateCompositeEncoder() throws Exception
         final Class<?> clazz = compile(fqClassName);
         assertNotNull(clazz);
 
-        final Object flyweight = clazz.newInstance();
+        final Object flyweight = clazz.getConstructor().newInstance();
         wrap(bufferOffset, flyweight, mockBuffer, BUFFER_CLASS);
 
         final short numCylinders = (short)4;
@@ -224,7 +224,7 @@ public void shouldGenerateCompositeDecoder() throws Exception
         final Class<?> clazz = compile(fqClassName);
         assertNotNull(clazz);
 
-        final Object flyweight = clazz.newInstance();
+        final Object flyweight = clazz.getConstructor().newInstance();
         wrap(bufferOffset, flyweight, mockBuffer, READ_ONLY_BUFFER_CLASS);
 
         final int capacityResult = getCapacity(flyweight);
@@ -240,7 +240,7 @@ public void shouldGenerateBasicMessage() throws Exception
         final UnsafeBuffer buffer = new UnsafeBuffer(new byte[4096]);
         generator().generate();
 
-        final Object msgFlyweight = wrap(buffer, compileCarEncoder().newInstance());
+        final Object msgFlyweight = wrap(buffer, compileCarEncoder().getConstructor().newInstance());
 
         final Object groupFlyweight = fuelFiguresCount(msgFlyweight, 0);
 
@@ -255,9 +255,12 @@ public void shouldGenerateRepeatingGroupDecoder() throws Exception
         final UnsafeBuffer buffer = new UnsafeBuffer(new byte[4096]);
         generator().generate();
 
-        final Object encoder = wrap(buffer, compileCarEncoder().newInstance());
+        final Object encoder = wrap(buffer, compileCarEncoder().getConstructor().newInstance());
         final Object decoder = wrap(
-            buffer, compileCarDecoder().newInstance(), getSbeBlockLength(encoder), getSbeSchemaVersion(encoder));
+            buffer,
+            compileCarDecoder().getConstructor().newInstance(),
+            getSbeBlockLength(encoder),
+            getSbeSchemaVersion(encoder));
 
         final Integer initialPosition = getLimit(decoder);
 
@@ -273,7 +276,7 @@ public void shouldGenerateReadOnlyMessage() throws Exception
         final UnsafeBuffer buffer = new UnsafeBuffer(new byte[4096]);
         generator().generate();
 
-        final Object encoder = wrap(buffer, compileCarEncoder().newInstance());
+        final Object encoder = wrap(buffer, compileCarEncoder().getConstructor().newInstance());
         final Object decoder = getCarDecoder(buffer, encoder);
 
         final long expectedSerialNumber = 5L;
@@ -290,7 +293,7 @@ public void shouldGenerateVarDataCodecs() throws Exception
 
         generator().generate();
 
-        final Object encoder = wrap(buffer, compileCarEncoder().newInstance());
+        final Object encoder = wrap(buffer, compileCarEncoder().getConstructor().newInstance());
         final Object decoder = getCarDecoder(buffer, encoder);
 
         setManufacturer(encoder, expectedManufacturer);
@@ -301,14 +304,14 @@ public void shouldGenerateVarDataCodecs() throws Exception
     }
 
     @Test
-    public void shouldGenerateCompositeDecodings() throws Exception
+    public void shouldGenerateCompositeDecoding() throws Exception
     {
         final int expectedEngineCapacity = 2000;
         final UnsafeBuffer buffer = new UnsafeBuffer(new byte[4096]);
 
         generator().generate();
 
-        final Object encoder = wrap(buffer, compileCarEncoder().newInstance());
+        final Object encoder = wrap(buffer, compileCarEncoder().getConstructor().newInstance());
         final Object decoder = getCarDecoder(buffer, encoder);
 
         final Object engineEncoder = get(encoder, "engine");
@@ -325,7 +328,7 @@ public void shouldGenerateBitSetCodecs() throws Exception
 
         generator().generate();
 
-        final Object encoder = wrap(buffer, compileCarEncoder().newInstance());
+        final Object encoder = wrap(buffer, compileCarEncoder().getConstructor().newInstance());
         final Object decoder = getCarDecoder(buffer, encoder);
 
         final Object extrasEncoder = getExtras(encoder);
@@ -342,7 +345,7 @@ public void shouldGenerateEnumCodecs() throws Exception
         final UnsafeBuffer buffer = new UnsafeBuffer(new byte[4096]);
         generator().generate();
 
-        final Object encoder = wrap(buffer, compileCarEncoder().newInstance());
+        final Object encoder = wrap(buffer, compileCarEncoder().getConstructor().newInstance());
         final Object decoder = getCarDecoder(buffer, encoder);
 
         final Class<?> encoderModel = getModelClass(encoder);
@@ -359,7 +362,7 @@ public void shouldGenerateGetString() throws Exception
         final UnsafeBuffer buffer = new UnsafeBuffer(new byte[4096]);
         generator().generate();
 
-        final Object encoder = wrap(buffer, compileCarEncoder().newInstance());
+        final Object encoder = wrap(buffer, compileCarEncoder().getConstructor().newInstance());
         final Object decoder = getCarDecoder(buffer, encoder);
 
         set(encoder, "vehicleCode", String.class, "R11");
@@ -378,7 +381,7 @@ public void shouldGeneratePutCharSequence() throws Exception
         final UnsafeBuffer buffer = new UnsafeBuffer(new byte[4096]);
         generator().generate();
 
-        final Object encoder = wrap(buffer, compileCarEncoder().newInstance());
+        final Object encoder = wrap(buffer, compileCarEncoder().getConstructor().newInstance());
         final Object decoder = getCarDecoder(buffer, encoder);
 
         set(encoder, "vehicleCode", CharSequence.class, "R11");
@@ -401,7 +404,7 @@ private Class<?> getModelClass(final Object encoder) throws ClassNotFoundExcepti
 
     private Object getCarDecoder(final UnsafeBuffer buffer, final Object encoder) throws Exception
     {
-        final Object decoder = compileCarDecoder().newInstance();
+        final Object decoder = compileCarDecoder().getConstructor().newInstance();
 
         return wrap(buffer, decoder, getSbeBlockLength(encoder), getSbeSchemaVersion(encoder));
     }

sbe-tool/src/test/java/uk/co/real_logic/sbe/generation/java/JavaGeneratorTest.java

@@ -67,7 +67,7 @@ public void testMessage1() throws Exception
         final UnsafeBuffer buffer = new UnsafeBuffer(new byte[4096]);
 
         { // Encode
-            final Object encoder = wrap(buffer, compile("TestMessage1Encoder").newInstance());
+            final Object encoder = wrap(buffer, compile("TestMessage1Encoder").getConstructor().newInstance());
 
             set(encoder, "tag1", int.class, 100);
             set(encoder, "tag2", int.class, 200);
@@ -152,7 +152,7 @@ public void testMessage2() throws Exception
         final UnsafeBuffer buffer = new UnsafeBuffer(new byte[4096]);
 
         { // Encode
-            final Object encoder = wrap(buffer, compile("TestMessage2Encoder").newInstance());
+            final Object encoder = wrap(buffer, compile("TestMessage2Encoder").getConstructor().newInstance());
 
             set(encoder, "tag1", int.class, 100);
             set(encoder, "tag2", int.class, 200);
@@ -243,14 +243,14 @@ private JavaGenerator generator()
     private Object getMessage1Decoder(final UnsafeBuffer buffer, final int blockLength, final int version)
         throws Exception
     {
-        final Object decoder = compile("TestMessage1Decoder").newInstance();
+        final Object decoder = compile("TestMessage1Decoder").getConstructor().newInstance();
         return wrap(buffer, decoder, blockLength, version);
     }
 
     private Object getMessage2Decoder(final UnsafeBuffer buffer, final int blockLength, final int version)
         throws Exception
     {
-        final Object decoder = compile("TestMessage2Decoder").newInstance();
+        final Object decoder = compile("TestMessage2Decoder").getConstructor().newInstance();
         return wrap(buffer, decoder, blockLength, version);
     }