style fix

* avoid hard-coding config names as strings, use getDefName() instead.
* use consistent variable naming style.

1 files changed, 14 insertions, 14 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/RankSetupValidator.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/RankSetupValidator.java
index 4692d228617..71f0fea7855 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/RankSetupValidator.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/RankSetupValidator.java
@@ -98,25 +98,25 @@ public class RankSetupValidator extends Validator {
     }
 
     private void writeConfigs(String dir, AbstractConfigProducer producer) throws IOException {
-            RankProfilesConfig.Builder rpb = new RankProfilesConfig.Builder();
-            RankProfilesConfig.Producer rpProd = (RankProfilesConfig.Producer) producer;
-            rpProd.getConfig(rpb);
-            writeConfig(dir, "rank-profiles.cfg", new RankProfilesConfig(rpb));
+            RankProfilesConfig.Builder rpcb = new RankProfilesConfig.Builder();
+            RankProfilesConfig.Producer.class.cast(producer).getConfig(rpcb);
+            RankProfilesConfig rpc = new RankProfilesConfig(rpcb);
+            writeConfig(dir, rpc.getDefName() + ".cfg", rpc);
 
-            IndexschemaConfig.Builder isB = new IndexschemaConfig.Builder();
-            IndexschemaConfig.Producer isProd = (IndexschemaConfig.Producer) producer;
-            isProd.getConfig(isB);
-            writeConfig(dir, "indexschema.cfg", new IndexschemaConfig(isB));
+            IndexschemaConfig.Builder iscb = new IndexschemaConfig.Builder();
+            IndexschemaConfig.Producer.class.cast(producer).getConfig(iscb);
+            IndexschemaConfig isc = new IndexschemaConfig(iscb);
+            writeConfig(dir, isc.getDefName() + ".cfg", isc);
 
             AttributesConfig.Builder acb = new AttributesConfig.Builder();
-            AttributesConfig.Producer acProd = (AttributesConfig.Producer) producer;
-            acProd.getConfig(acb);
-            writeConfig(dir, "attributes.cfg", new AttributesConfig(acb));
+            AttributesConfig.Producer.class.cast(producer).getConfig(acb);
+            AttributesConfig ac = new AttributesConfig(acb);
+            writeConfig(dir, ac.getDefName() + ".cfg", ac);
 
             RankingConstantsConfig.Builder rccb = new RankingConstantsConfig.Builder();
-            RankingConstantsConfig.Producer rccProd = (RankingConstantsConfig.Producer) producer;
-            rccProd.getConfig(rccb);
-            writeConfig(dir, "ranking-constants.cfg", new RankingConstantsConfig(rccb));
+            RankingConstantsConfig.Producer.class.cast(producer).getConfig(rccb);
+            RankingConstantsConfig rcc = new RankingConstantsConfig(rccb);
+            writeConfig(dir, rcc.getDefName() + ".cfg", rcc);
     }
 
     private static void writeConfig(String dir, String configName, ConfigInstance config) throws IOException {