Merge pull request #30830 from vespa-engine/balder/use-default-java-compiler-config

Balder/use default java compiler config

5 files changed, 2 insertions, 28 deletions

diff --git a/client/pom.xml b/client/pom.xml
index d44c0820cac..4c08075fdee 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -35,12 +35,6 @@
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
           <release>${vespaClients.jdk.releaseVersion}</release>
-          <compilerArgs> <!-- Remove (to use default) when not compiling for 8 -->
-            <arg>-Xlint:all</arg>
-            <arg>-Xlint:-rawtypes</arg>
-            <arg>-Xlint:-unchecked</arg>
-            <arg>-Xlint:-serial</arg>
-          </compilerArgs>
         </configuration>
       </plugin>
       <plugin>
diff --git a/container-core/src/main/java/com/yahoo/container/di/componentgraph/core/ComponentNode.java b/container-core/src/main/java/com/yahoo/container/di/componentgraph/core/ComponentNode.java
index 3ed02fad6c5..4500a5636f4 100644
--- a/container-core/src/main/java/com/yahoo/container/di/componentgraph/core/ComponentNode.java
+++ b/container-core/src/main/java/com/yahoo/container/di/componentgraph/core/ComponentNode.java
@@ -165,8 +165,7 @@ public class ComponentNode extends Node {
     }
 
     private Object initId(Object component) {
-        if (component instanceof AbstractComponent) {
-            AbstractComponent abstractComponent = (AbstractComponent) component;
+        if (component instanceof AbstractComponent abstractComponent) {
             if (abstractComponent.hasInitializedId() && !abstractComponent.getId().equals(componentId())) {
                 throw new IllegalStateException(
                         "Component with id '" + componentId() + "' is trying to set its component id explicitly: '" + abstractComponent.getId() + "'. " +
@@ -199,8 +198,7 @@ public class ComponentNode extends Node {
 
     @Override
     public boolean equals(Object other) {
-        if (other instanceof ComponentNode) {
-            ComponentNode that = (ComponentNode) other;
+        if (other instanceof ComponentNode that) {
             return super.equals(that) && equalEdges(Arrays.asList(this.arguments), Arrays.asList(that.arguments)) && this.usedConfigs().equals(that.usedConfigs());
         } else {
             return false;
diff --git a/vespa-feed-client-api/pom.xml b/vespa-feed-client-api/pom.xml
index a6c47da84b8..d0e0e221fdd 100644
--- a/vespa-feed-client-api/pom.xml
+++ b/vespa-feed-client-api/pom.xml
@@ -42,12 +42,6 @@
         <configuration>
           <release>${vespaClients.jdk.releaseVersion}</release>
           <showDeprecation>true</showDeprecation>
-          <compilerArgs> <!-- Remove (to use default) when not compiling for 8 -->
-            <arg>-Xlint:all</arg>
-            <arg>-Xlint:-rawtypes</arg>
-            <arg>-Xlint:-unchecked</arg>
-            <arg>-Xlint:-serial</arg>
-          </compilerArgs>
         </configuration>
       </plugin>
       <plugin>
diff --git a/vespa-feed-client-cli/pom.xml b/vespa-feed-client-cli/pom.xml
index 4f0b77769de..de52abfddfa 100644
--- a/vespa-feed-client-cli/pom.xml
+++ b/vespa-feed-client-cli/pom.xml
@@ -53,12 +53,6 @@
         <configuration>
           <release>${vespaClients.jdk.releaseVersion}</release>
           <showDeprecation>true</showDeprecation>
-          <compilerArgs> <!-- Remove (to use default) when not compiling for 8 -->
-            <arg>-Xlint:all</arg>
-            <arg>-Xlint:-rawtypes</arg>
-            <arg>-Xlint:-unchecked</arg>
-            <arg>-Xlint:-serial</arg>
-          </compilerArgs>
         </configuration>
       </plugin>
       <plugin>
diff --git a/vespa-feed-client/pom.xml b/vespa-feed-client/pom.xml
index 1f4cd3949ab..78065920828 100644
--- a/vespa-feed-client/pom.xml
+++ b/vespa-feed-client/pom.xml
@@ -60,12 +60,6 @@
               <goal>compile</goal>
             </goals>
             <configuration>
-              <compilerArgs> <!-- Remove (to use default) when not compiling for 8 -->
-                <arg>-Xlint:all</arg>
-                <arg>-Xlint:-rawtypes</arg>
-                <arg>-Xlint:-unchecked</arg>
-                <arg>-Xlint:-serial</arg>
-              </compilerArgs>
               <release>${vespaClients.jdk.releaseVersion}</release>
               <showDeprecation>true</showDeprecation>
             </configuration>