Merge pull request #32489 from vespa-engine/bratseth/less-warnings

Less warnings

configgen/src/main/java/com/yahoo/config/codegen/JavaClassBuilder.java

@@ -61,17 +61,15 @@ public String getConfigClass(String className) {
     }
 
     private String getHeader() {
-        return "/**\n" + //
-                " * This file is generated from a config definition file.\n" + //
-                " * ------------   D O   N O T   E D I T !   ------------\n" + //
-                " */\n" + //
-                "\n" + //
-                "package " + javaPackage + ";\n" + //
-                "\n" + //
-                "import java.util.*;\n" + //
-                "import java.io.File;\n" + //
-                "import java.nio.file.Path;\n" + //
-                "import com.yahoo.config.*;";
+        return "// ------------   D O   N O T   E D I T !   ------------\n" + //
+               "// This file is generated from a config definition file.\n" + //
+               "\n" + //
+               "package " + javaPackage + ";\n" + //
+               "\n" + //
+               "import java.util.*;\n" + //
+               "import java.io.File;\n" + //
+               "import java.nio.file.Path;\n" + //
+               "import com.yahoo.config.*;";
     }
 
     // TODO: remove the extra comment line " *" if root.getCommentBlock is empty

configgen/src/test/resources/allfeatures.reference

@@ -1,7 +1,5 @@
-/**
- * This file is generated from a config definition file.
- * ------------   D O   N O T   E D I T !   ------------
- */
+// ------------   D O   N O T   E D I T !   ------------
+// This file is generated from a config definition file.
 
 package com.yahoo.configgen;
 

jdisc_core/src/main/java/com/yahoo/jdisc/AbstractResource.java

@@ -22,6 +22,7 @@ public abstract class AbstractResource implements SharedResource {
 
     private final References references;
 
+    @SuppressWarnings("this-escape")
     protected AbstractResource() {
         DestructableResource destructable = new WrappedResource(this);
         if (debug == Debug.STACK) {

jdisc_core/src/main/java/com/yahoo/jdisc/Request.java

@@ -87,6 +87,7 @@ public Request(CurrentContainer current, URI uri, boolean isServerRequest) {
         this(current, uri, isServerRequest, -1);
     }
 
+    @SuppressWarnings("this-escape")
     public Request(CurrentContainer current, URI uri, boolean isServerRequest, long creationTime) {
         this.parent = null;
         this.container = current.newReference(uri, this);
@@ -121,6 +122,7 @@ public Request(CurrentContainer current, URI uri, boolean isServerRequest, long
      * @param parent The parent Request of this.
      * @param uri    The identifier of this request.
      */
+    @SuppressWarnings("this-escape")
     public Request(Request parent, URI uri) {
         this.parent = parent;
         this.container = null;

jdisc_core/src/main/java/com/yahoo/jdisc/core/ActiveContainer.java

@@ -33,6 +33,7 @@ public class ActiveContainer extends AbstractResource implements CurrentContaine
     private final BindingSetSelector bindingSetSelector;
     private final TimeoutManagerImpl timeoutMgr;
 
+    @SuppressWarnings("this-escape")
     public ActiveContainer(ContainerBuilder builder) {
         serverProviders = builder.serverProviders().activate();
         serverProviders.forEach(resourceReferences::retain);

jdisc_core/src/main/java/com/yahoo/jdisc/core/ApplicationLoader.java

@@ -46,6 +46,7 @@ public class ApplicationLoader implements BootstrapLoader, ContainerActivator, C
     private Application application;
     private ApplicationInUseTracker applicationInUseTracker;
 
+    @SuppressWarnings("this-escape")
     public ApplicationLoader(OsgiFramework osgiFramework, Iterable<? extends Module> guiceModules) {
         LogSetup.initVespaLogging("Container");
         this.osgiFramework = osgiFramework;

jdisc_core/src/main/java/com/yahoo/jdisc/handler/RequestDispatch.java

@@ -50,6 +50,8 @@
 public abstract class RequestDispatch implements Future<Response>, ResponseHandler {
 
     private final FutureConjunction completions = new FutureConjunction();
+
+    @SuppressWarnings("this-escape")
     private final FutureResponse futureResponse = new FutureResponse(this);
 
     /**

jdisc_core/src/main/java/com/yahoo/jdisc/refcount/DebugReferencesWithStack.java

@@ -23,6 +23,7 @@ public class DebugReferencesWithStack implements References {
     private final DestructableResource resource;
     private final DebugResourceReference initialreference;
 
+    @SuppressWarnings("this-escape")
     public DebugReferencesWithStack(DestructableResource resource) {
         final Throwable referenceStack = new Throwable();
         this.activeReferences.put(referenceStack, this);

jdisc_core/src/test/java/com/yahoo/jdisc/core/ExportPackagesIT.java

@@ -29,7 +29,6 @@
  */
 public class ExportPackagesIT {
 
-
     private static final File expectedExportPackages = new File("src/test/resources" + ExportPackages.PROPERTIES_FILE);
 
     private static final String JAR_PATH = "target/dependency/";

jrt/src/com/yahoo/jrt/Connection.java

@@ -425,9 +425,9 @@ public boolean completeRequest(TieBreaker done) {
         return true;
     }
 
-    ///////////////////////////////////////////////////////////////////////////
+    // -------------------------------------------------------------------------
     // Methods defined in the Target superclass
-    ///////////////////////////////////////////////////////////////////////////
+    // -------------------------------------------------------------------------
 
     public boolean isValid() {
         return (state != CLOSED);

jrt/src/com/yahoo/jrt/Supervisor.java

@@ -27,6 +27,7 @@ public class Supervisor {
      *
      * @param transport object performing low-level operations for this Supervisor
      */
+    @SuppressWarnings("this-escape")
     public Supervisor(Transport transport) {
         this.transport = transport;
         new MandatoryMethods(this);

vespajlib/src/main/java/com/yahoo/concurrent/maintenance/Maintainer.java

@@ -40,6 +40,7 @@ public abstract class Maintainer implements Runnable {
     private final double successFactorBaseline;
     private final boolean acquireLock;
 
+    @SuppressWarnings("this-escape")
     public Maintainer(String name, Duration interval, Clock clock, JobControl jobControl,
                       JobMetrics jobMetrics, List<String> clusterHostnames, boolean ignoreCollision,
                       double successFactorBaseline, boolean acquireLock) {

vespajlib/src/main/java/com/yahoo/io/AbstractByteWriter.java

@@ -22,6 +22,7 @@ public abstract class AbstractByteWriter extends GenericWriter implements Writab
     protected final BufferChain buffer;
     protected final CharBuffer charBuffer = CharBuffer.allocate(2);
 
+    @SuppressWarnings("this-escape")
     protected AbstractByteWriter(final CharsetEncoder encoder) {
         this.encoder = encoder;
         buffer = new BufferChain(this);