- Unify the amount of null checking.

- No need to be a an attributes config producer.

5 files changed, 9 insertions, 22 deletions

diff --git a/config-model/src/main/java/com/yahoo/config/model/producer/AnyConfigProducer.java b/config-model/src/main/java/com/yahoo/config/model/producer/AnyConfigProducer.java
index 2327615cbe4..539447b41e9 100644
--- a/config-model/src/main/java/com/yahoo/config/model/producer/AnyConfigProducer.java
+++ b/config-model/src/main/java/com/yahoo/config/model/producer/AnyConfigProducer.java
@@ -30,7 +30,6 @@ import java.util.logging.Logger;
 public abstract class AnyConfigProducer
         implements ConfigProducer, ConfigInstance.Producer, Serializable {
 
-    private static final long serialVersionUID = 1L;
     public static final Logger log = Logger.getLogger(AnyConfigProducer.class.getPackage().toString());
     private final String subId;
     private String configId = null;
diff --git a/config-model/src/main/java/com/yahoo/config/model/producer/TreeConfigProducer.java b/config-model/src/main/java/com/yahoo/config/model/producer/TreeConfigProducer.java
index 094a43696cc..b10bd29aee2 100644
--- a/config-model/src/main/java/com/yahoo/config/model/producer/TreeConfigProducer.java
+++ b/config-model/src/main/java/com/yahoo/config/model/producer/TreeConfigProducer.java
@@ -23,7 +23,6 @@ import java.util.Map;
 public abstract class TreeConfigProducer<CHILD extends AnyConfigProducer>
     extends AnyConfigProducer
 {
-    private static final long serialVersionUID = 1L;
     private final List<Service> descendantServices = new ArrayList<>();
     private final FreezableMap<String, CHILD> childrenBySubId = new FreezableMap<>(LinkedHashMap.class);
 
diff --git a/config-model/src/main/java/com/yahoo/schema/derived/DerivedConfiguration.java b/config-model/src/main/java/com/yahoo/schema/derived/DerivedConfiguration.java
index 575b7264628..bc1c097ea4b 100644
--- a/config-model/src/main/java/com/yahoo/schema/derived/DerivedConfiguration.java
+++ b/config-model/src/main/java/com/yahoo/schema/derived/DerivedConfiguration.java
@@ -24,7 +24,7 @@ import java.io.Writer;
  *
  * @author bratseth
  */
-public class DerivedConfiguration implements AttributesConfig.Producer {
+public class DerivedConfiguration {
 
     private final Schema schema;
     private Summaries summaries;
@@ -74,8 +74,6 @@ public class DerivedConfiguration implements AttributesConfig.Producer {
             if (!schema.isDocumentsOnly()) {
                 streamingFields = new VsmFields(schema);
                 streamingSummary = new VsmSummary(schema);
-            }
-            if (!schema.isDocumentsOnly()) {
                 attributeFields = new AttributeFields(schema);
                 summaries = new Summaries(schema, deployState.getDeployLogger(), deployState.getProperties().featureFlags());
                 juniperrc = new Juniperrc(schema);
@@ -154,7 +152,6 @@ public class DerivedConfiguration implements AttributesConfig.Producer {
         return attributeFields;
     }
 
-    @Override
     public void getConfig(AttributesConfig.Builder builder) {
         getConfig(builder, AttributeFields.FieldSet.ALL);
     }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/search/IndexedSearchCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/search/IndexedSearchCluster.java
index a55eb0fefe8..6f5390fdeaa 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/search/IndexedSearchCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/search/IndexedSearchCluster.java
@@ -31,15 +31,10 @@ import java.util.List;
 /**
  * @author baldersheim
  */
-public class IndexedSearchCluster extends SearchCluster
-    implements
-        DocumentdbInfoConfig.Producer,
-        IndexInfoConfig.Producer,
-        SchemaInfoConfig.Producer,
-        IlscriptsConfig.Producer,
+public class IndexedSearchCluster extends SearchCluster implements
         DispatchConfig.Producer,
-        DispatchNodesConfig.Producer,
-        ConfigInstance.Producer {
+        DispatchNodesConfig.Producer
+{
 
     private Tuning tuning;
     private SearchCoverage searchCoverage;
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/search/StreamingSearchCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/search/StreamingSearchCluster.java
index f3ae7e2a312..90f74af868b 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/search/StreamingSearchCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/search/StreamingSearchCluster.java
@@ -29,14 +29,14 @@ import java.util.List;
  * @author vegardh
  */
 public class StreamingSearchCluster extends SearchCluster implements
-        DocumentdbInfoConfig.Producer,
         RankProfilesConfig.Producer,
         RankingConstantsConfig.Producer,
         RankingExpressionsConfig.Producer,
         OnnxModelsConfig.Producer,
         VsmsummaryConfig.Producer,
         VsmfieldsConfig.Producer,
-        SummaryConfig.Producer {
+        SummaryConfig.Producer
+{
 
     private final String storageRouteSpec;
     private final AttributesProducer attributesConfig;
@@ -129,20 +129,17 @@ public class StreamingSearchCluster extends SearchCluster implements
 
     @Override
     public void getConfig(VsmsummaryConfig.Builder builder) {
-        if (derivedConfig.getVsmSummary() != null)
-            derivedConfig.getVsmSummary().getConfig(builder);
+        derivedConfig.getVsmSummary().getConfig(builder);
     }
     
     @Override
     public void getConfig(VsmfieldsConfig.Builder builder) {
-        if (derivedConfig.getVsmFields() != null)
-            derivedConfig.getVsmFields().getConfig(builder);
+        derivedConfig.getVsmFields().getConfig(builder);
     }
     
     @Override
     public void getConfig(SummaryConfig.Builder builder) {
-        if (derivedConfig.getSummaries() != null)
-            derivedConfig.getSummaries().getConfig(builder);
+        derivedConfig.getSummaries().getConfig(builder);
     }
 
     private class AttributesProducer extends AnyConfigProducer implements AttributesConfig.Producer {