Merge with master

11 files changed, 21 insertions, 17 deletions

diff --git a/component/src/main/java/com/yahoo/component/AbstractComponent.java b/component/src/main/java/com/yahoo/component/AbstractComponent.java
index 455e1a437a6..41d4c0dc6e9 100644
--- a/component/src/main/java/com/yahoo/component/AbstractComponent.java
+++ b/component/src/main/java/com/yahoo/component/AbstractComponent.java
@@ -141,4 +141,5 @@ public class AbstractComponent implements Component {
         Class declaringClass = deconstruct.getDeclaringClass();
         return (declaringClass != AbstractComponent.class);
     }
+
 }
diff --git a/component/src/main/java/com/yahoo/component/Component.java b/component/src/main/java/com/yahoo/component/Component.java
index 3fd98e72599..9740ef9d490 100644
--- a/component/src/main/java/com/yahoo/component/Component.java
+++ b/component/src/main/java/com/yahoo/component/Component.java
@@ -4,7 +4,6 @@ package com.yahoo.component;
 
 /**
  * A named, versioned, identifiable component.
- * <p>
  * Components can by default be ordered by their id order. Their identity is defined by the id.
  * Prefer extending AbstractComponent instead of implementing this interface directly.
  *
diff --git a/component/src/main/java/com/yahoo/component/ComponentId.java b/component/src/main/java/com/yahoo/component/ComponentId.java
index b0f7206785d..e1e1b43c08a 100644
--- a/component/src/main/java/com/yahoo/component/ComponentId.java
+++ b/component/src/main/java/com/yahoo/component/ComponentId.java
@@ -9,7 +9,7 @@ import java.util.concurrent.atomic.AtomicInteger;
  * This is an immutable value object.
  *
  * @author bratseth
- * @author tonytv
+ * @author Tony Vaagenes
  */
 public final class ComponentId implements Comparable<ComponentId> {
 
diff --git a/component/src/main/java/com/yahoo/component/ComponentSpecification.java b/component/src/main/java/com/yahoo/component/ComponentSpecification.java
index 341136391ce..a27f66dea21 100644
--- a/component/src/main/java/com/yahoo/component/ComponentSpecification.java
+++ b/component/src/main/java/com/yahoo/component/ComponentSpecification.java
@@ -7,9 +7,10 @@ package com.yahoo.component;
  * This is an immutable value object
  *
  * @author Arne Bergene Fossaa
- * @author tonytv
+ * @author Tony Vaagenes
  */
 public final class ComponentSpecification {
+
     private final class VersionHandler implements Spec.VersionHandler<VersionSpecification> {
         @Override
         public VersionSpecification emptyVersion() {
@@ -157,4 +158,5 @@ public final class ComponentSpecification {
             return getNamespace().equals(otherNamespace);
         }
     }
+
 }
diff --git a/component/src/main/java/com/yahoo/component/Spec.java b/component/src/main/java/com/yahoo/component/Spec.java
index f8df736d2a7..d4fc68324b7 100644
--- a/component/src/main/java/com/yahoo/component/Spec.java
+++ b/component/src/main/java/com/yahoo/component/Spec.java
@@ -6,7 +6,7 @@ import static com.yahoo.container.util.Util.firstNonNull;
 /**
  * Code common to ComponentId and ComponentSpecification
  *
- * @author tonytv
+ * @author Tony Vaagenes
  */
 final class Spec<VERSION> {
 
@@ -93,4 +93,5 @@ final class Spec<VERSION> {
 
         return n1.compareTo(n2);
     }
+
 }
diff --git a/component/src/main/java/com/yahoo/component/SpecSplitter.java b/component/src/main/java/com/yahoo/component/SpecSplitter.java
index f21850ac387..07d5c573140 100644
--- a/component/src/main/java/com/yahoo/component/SpecSplitter.java
+++ b/component/src/main/java/com/yahoo/component/SpecSplitter.java
@@ -5,11 +5,12 @@ import java.util.Arrays;
 import java.util.List;
 
 /**
- * Splits and component id or component specification string
- * into their constituent parts.
- * @author tonytv
+ * Splits and component id or component specification string into their constituent parts.
+ * 
+ * @author Tony Vaagenes
  */
 class SpecSplitter {
+
     final String name;
     final String version;
     final ComponentId namespace;
@@ -41,4 +42,5 @@ class SpecSplitter {
             return Arrays.asList(string, null);
         }
     }
+
 }
diff --git a/component/src/main/java/com/yahoo/component/Version.java b/component/src/main/java/com/yahoo/component/Version.java
index 4d9e43bdf08..d97ecc3e1e7 100644
--- a/component/src/main/java/com/yahoo/component/Version.java
+++ b/component/src/main/java/com/yahoo/component/Version.java
@@ -115,8 +115,7 @@ public final class Version implements Comparable<Version> {
      * </pre>
      *
      * @param versionString String representation of the version identifier
-     * @throws IllegalArgumentException If <code>version</code> is improperly
-     *         formatted.
+     * @throws IllegalArgumentException If <code>version</code> is improperly formatted.
      */
     public Version(String versionString) {
         if (! "".equals(versionString)) {
@@ -378,8 +377,8 @@ public final class Version implements Comparable<Version> {
         if (this == emptyVersion)
             return VersionSpecification.emptyVersionSpecification;
         else {
-            return new VersionSpecification(getMajor(), getMinor(), getMicro(),
-                                            getQualifier());
+            return new VersionSpecification(getMajor(), getMinor(), getMicro(), getQualifier());
         }
     }
+
 }
diff --git a/component/src/main/java/com/yahoo/component/provider/ComponentClass.java b/component/src/main/java/com/yahoo/component/provider/ComponentClass.java
index 7d22f4ee50e..25c27128786 100644
--- a/component/src/main/java/com/yahoo/component/provider/ComponentClass.java
+++ b/component/src/main/java/com/yahoo/component/provider/ComponentClass.java
@@ -20,6 +20,7 @@ import java.util.logging.Logger;
  * @author bratseth
  */
 public class ComponentClass<T extends AbstractComponent> {
+
     private static Logger log = Logger.getLogger(ComponentClass.class.getName());
 
     private final Class<T> clazz;
diff --git a/component/src/main/java/com/yahoo/component/provider/ComponentRegistry.java b/component/src/main/java/com/yahoo/component/provider/ComponentRegistry.java
index 26ecfa881be..03b0285639f 100644
--- a/component/src/main/java/com/yahoo/component/provider/ComponentRegistry.java
+++ b/component/src/main/java/com/yahoo/component/provider/ComponentRegistry.java
@@ -31,8 +31,7 @@ import java.util.Set;
 public class ComponentRegistry<COMPONENT> {
 
     /** All versions of all components, indexed by name and namespace */
-    private Map<ComponentId, Map<String, Map<Version, COMPONENT>>> componentsByNameByNamespace =
-            new LinkedHashMap<>();
+    private Map<ComponentId, Map<String, Map<Version, COMPONENT>>> componentsByNameByNamespace = new LinkedHashMap<>();
 
     /** All versions of all components indexed by id */
     private Map<ComponentId, COMPONENT> componentsById =new LinkedHashMap<>();
diff --git a/component/src/main/java/com/yahoo/component/provider/Freezable.java b/component/src/main/java/com/yahoo/component/provider/Freezable.java
index 42988480b9e..e2a50e510ca 100644
--- a/component/src/main/java/com/yahoo/component/provider/Freezable.java
+++ b/component/src/main/java/com/yahoo/component/provider/Freezable.java
@@ -14,7 +14,7 @@ public interface Freezable {
      * structures and dependent objects. Overrides must call super.
      * Calling freeze on an already frozen class must have no effect.
      */
-    public void freeze();
+    void freeze();
 
 
     /**
@@ -25,5 +25,6 @@ public interface Freezable {
      * @return true if this instance is in an immutable state, false otherwise
      * @since 5.1.4
      */
-    public boolean isFrozen();
+    boolean isFrozen();
+
 }
diff --git a/component/src/main/java/com/yahoo/component/provider/ListenableFreezable.java b/component/src/main/java/com/yahoo/component/provider/ListenableFreezable.java
index 6c1c5c11a9f..e0c01b66785 100644
--- a/component/src/main/java/com/yahoo/component/provider/ListenableFreezable.java
+++ b/component/src/main/java/com/yahoo/component/provider/ListenableFreezable.java
@@ -5,11 +5,10 @@ package com.yahoo.component.provider;
  * A freezable which supports listening
  *
  * @author bratseth
- * @since 5.1.13
  */
 public interface ListenableFreezable extends Freezable {
 
     /** Adds a listener which will be called when this is frozen */
-    public void addFreezeListener(java.lang.Runnable runnable, java.util.concurrent.Executor executor);
+    void addFreezeListener(java.lang.Runnable runnable, java.util.concurrent.Executor executor);
 
 }