Fixing Maven build for gRPC Java.

nathanmittler · ejona86 · commit 70341df5822b · 2015-01-08T14:43:17.000-08:00
------------- Created by MOE: http://code.google.com/p/moe-java MOE_MIGRATED_REVID=81456318
diff --git a/all/pom.xml b/all/pom.xml
@@ -213,6 +213,24 @@
           <locale>en_US</locale>
         </configuration>
       </plugin>
+
+      <!-- Skip the sniffer plugin. -->
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>animal-sniffer-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>check-java-version</id>
+            <phase>verify</phase>
+            <goals>
+              <goal>check</goal>
+            </goals>
+            <configuration>
+              <skip>true</skip>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
 </project>
diff --git a/integration-testing/src/main/java/com/google/net/stubby/testing/integration/AbstractTransportTest.java b/integration-testing/src/main/java/com/google/net/stubby/testing/integration/AbstractTransportTest.java
@@ -487,8 +487,8 @@ public void exchangeContextUnaryCall() throws Exception {
     fixedHeaders.put(METADATA_KEY, contextValue);
     stub = MetadataUtils.attachHeaders(stub, fixedHeaders);
     // .. and expect it to be echoed back in trailers
-    AtomicReference<Metadata.Trailers> trailersCapture = new AtomicReference<>();
-    AtomicReference<Metadata.Headers> headersCapture = new AtomicReference<>();
+    AtomicReference<Metadata.Trailers> trailersCapture = new AtomicReference<Metadata.Trailers>();
+    AtomicReference<Metadata.Headers> headersCapture = new AtomicReference<Metadata.Headers>();
     stub = MetadataUtils.captureMetadata(stub, headersCapture, trailersCapture);
 
     Assert.assertNotNull(stub.unaryCall(unaryRequest()));
@@ -513,8 +513,8 @@ public void exchangeContextStreamingCall() throws Exception {
     fixedHeaders.put(METADATA_KEY, contextValue);
     stub = MetadataUtils.attachHeaders(stub, fixedHeaders);
     // .. and expect it to be echoed back in trailers
-    AtomicReference<Metadata.Trailers> trailersCapture = new AtomicReference<>();
-    AtomicReference<Metadata.Headers> headersCapture = new AtomicReference<>();
+    AtomicReference<Metadata.Trailers> trailersCapture = new AtomicReference<Metadata.Trailers>();
+    AtomicReference<Metadata.Headers> headersCapture = new AtomicReference<Metadata.Headers>();
     stub = MetadataUtils.captureMetadata(stub, headersCapture, trailersCapture);
 
     List<Integer> responseSizes = Arrays.asList(50, 100, 150, 200);
@@ -564,7 +564,7 @@ protected SimpleRequest unaryRequest() {
 
   protected static void assertSuccess(StreamRecorder<?> recorder) {
     if (recorder.getError() != null) {
-      throw new AssertionError("Error in stream", recorder.getError());
+      throw new AssertionError(recorder.getError());
     }
   }
 }
diff --git a/integration-testing/src/main/java/com/google/net/stubby/testing/integration/Util.java b/integration-testing/src/main/java/com/google/net/stubby/testing/integration/Util.java
@@ -86,11 +86,7 @@ public static void assertEquals(List<? extends MessageLite> expected,
       Assert.assertEquals(expected, actual);
     } else {
       for (int i = 0; i < expected.size(); i++) {
-        try {
-          assertEquals(expected.get(i), actual.get(i));
-        } catch (Error e) {
-          throw new AssertionError("At index " + i, e);
-        }
+        assertEquals(expected.get(i), actual.get(i));
       }
     }
   }
diff --git a/netty/pom.xml b/netty/pom.xml
@@ -52,4 +52,26 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
+
+  <build>
+    <plugins>
+      <!-- Skip the sniffer plugin for Netty. -->
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>animal-sniffer-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>check-java-version</id>
+            <phase>verify</phase>
+            <goals>
+              <goal>check</goal>
+            </goals>
+            <configuration>
+              <skip>true</skip>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
 </project>

Original file line number	Diff line number	Diff line change
`@@ -86,11 +86,7 @@ public static void assertEquals(List<? extends MessageLite> expected,`
`86`	`86`	`Assert.assertEquals(expected, actual);`
`87`	`87`	`} else {`
`88`	`88`	`for (int i = 0; i < expected.size(); i++) {`
`89`		`- try {`
`90`		`- assertEquals(expected.get(i), actual.get(i));`
`91`		`- } catch (Error e) {`
`92`		`- throw new AssertionError("At index " + i, e);`
`93`		`- }`
	`89`	`+ assertEquals(expected.get(i), actual.get(i));`
`94`	`90`	`}`
`95`	`91`	`}`
`96`	`92`	`}`