Merge pull request #6797 from vespa-engine/bratseth/add-owners-and-readme

Nonfunctional changes only

5 files changed, 10 insertions, 18 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/routing/Protocol.java b/config-model/src/main/java/com/yahoo/vespa/model/routing/Protocol.java
index ad684894176..49596aa0ddf 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/routing/Protocol.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/routing/Protocol.java
@@ -12,18 +12,10 @@ import com.yahoo.messagebus.routing.RoutingTableSpec;
  */
 public interface Protocol {
 
-    /**
-     * Returns the specification for the routing table of this protocol.
-     *
-     * @return The routing table spec.
-     */
-    public RoutingTableSpec getRoutingTableSpec();
+    /** Returns the specification for the routing table of this protocol. */
+    RoutingTableSpec getRoutingTableSpec();
 
-    /**
-     * Returns the specification of the application as seen by this protocol.
-     *
-     * @return The application spec.
-     */
-    public ApplicationSpec getApplicationSpec();
+    /** Returns the specification of the application as seen by this protocol. */
+    ApplicationSpec getApplicationSpec();
 
 }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/routing/Routing.java b/config-model/src/main/java/com/yahoo/vespa/model/routing/Routing.java
index 16f51935f2a..2403594d331 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/routing/Routing.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/routing/Routing.java
@@ -21,7 +21,7 @@ public class Routing extends ConfigModel {
     private final List<String> errors = new ArrayList<>();
     private ApplicationSpec explicitApplication = null;
     private RoutingSpec explicitRouting = null;
-    private List<Protocol> protocols = new ArrayList<>();
+    private final List<Protocol> protocols = new ArrayList<>();
     private RoutingSpec derivedRouting;
 
     public Routing(ConfigModelContext modelContext) {
@@ -91,7 +91,7 @@ public class Routing extends ConfigModel {
     }
 
     public void getConfig(MessagebusConfig.Builder builder) {
-        if (derivedRouting==null) {
+        if (derivedRouting == null) {
             // The error list should be populated then
             return;
         }
@@ -198,4 +198,5 @@ public class Routing extends ConfigModel {
     public List<String> getErrors() {
         return Collections.unmodifiableList(errors);
     }
+
 }
diff --git a/container-search/src/main/java/com/yahoo/prelude/query/CompositeItem.java b/container-search/src/main/java/com/yahoo/prelude/query/CompositeItem.java
index 2c05f2e7edf..eee9949d831 100644
--- a/container-search/src/main/java/com/yahoo/prelude/query/CompositeItem.java
+++ b/container-search/src/main/java/com/yahoo/prelude/query/CompositeItem.java
@@ -73,8 +73,7 @@ public abstract class CompositeItem extends Item {
      */
     public void addItem(int index, Item item) {
         if (index > subitems.size() || index < 0) {
-            throw new IndexOutOfBoundsException(
-                    "Could not add a subitem at position " + index + " to " + this);
+            throw new IndexOutOfBoundsException("Could not add a subitem at position " + index + " to " + this);
         }
         adding(item);
         subitems.add(index, item);
diff --git a/container-search/src/main/java/com/yahoo/prelude/query/NonReducibleCompositeItem.java b/container-search/src/main/java/com/yahoo/prelude/query/NonReducibleCompositeItem.java
index 547825cb51c..84aa177369a 100644
--- a/container-search/src/main/java/com/yahoo/prelude/query/NonReducibleCompositeItem.java
+++ b/container-search/src/main/java/com/yahoo/prelude/query/NonReducibleCompositeItem.java
@@ -7,10 +7,9 @@ package com.yahoo.prelude.query;
  * <p>
  * Most composites, like AND and OR, are reducible as e.g (AND a) is semantically equal to (a).
  * <p>
- * This type functions as a marked interfaces for query rewriters.
+ * This type functions as a marker type for query rewriters.
  *
  * @author bratseth
- * @since 5.1.22
  */
 public abstract class NonReducibleCompositeItem extends CompositeItem {
 }
diff --git a/container-search/src/main/java/com/yahoo/prelude/query/SameElementItem.java b/container-search/src/main/java/com/yahoo/prelude/query/SameElementItem.java
index ca2c5a80283..aa446140da0 100644
--- a/container-search/src/main/java/com/yahoo/prelude/query/SameElementItem.java
+++ b/container-search/src/main/java/com/yahoo/prelude/query/SameElementItem.java
@@ -11,6 +11,7 @@ import java.util.Iterator;
  * This represents a query where all terms are required to match in the same element id.
  * The primary usecase is to allow efficient search in arrays and maps of struct.
  * The common path is the field name containing the struct.
+ *
  * @author baldersheim
  */
 @Beta