diff options
author | Lester Solbakken <lesters@users.noreply.github.com> | 2018-09-05 10:56:23 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-09-05 10:56:23 +0200 |
commit | 773cdb1ef16386fb7d8d023080cbba811a1073fe (patch) | |
tree | 8de003ab12298a093433e8b8ed32ae75260bc644 /config-model | |
parent | 245d4aa6cda2c635c28dd8d7f2f64fb6de1c6d94 (diff) | |
parent | 8d17136ce64e0071400b136a8e534b044b05af3f (diff) |
Merge pull request #6797 from vespa-engine/bratseth/add-owners-and-readme
Nonfunctional changes only
Diffstat (limited to 'config-model')
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/routing/Protocol.java | 16 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/routing/Routing.java | 5 |
2 files changed, 7 insertions, 14 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); } + } |