Revert "Merge pull request #12060 from vespa-engine/revert-12040-bratseth/anonymous-query-profile-types-take-2"

This reverts commit 558506aa9008c5255f849892f476c819391f06a7, reversing
changes made to 17e572d4dad3c9e5040544072dbdc9f7a703e7bd.

1 files changed, 8 insertions, 14 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/search/QueryProfiles.java b/config-model/src/main/java/com/yahoo/vespa/model/container/search/QueryProfiles.java
index 0abb0803405..0a9618e7b08 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/search/QueryProfiles.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/search/QueryProfiles.java
@@ -232,8 +232,7 @@ public class QueryProfiles implements Serializable, QueryProfilesConfig.Producer
         return propB;
     }
 
-    private QueryProfilesConfig.Queryprofile.Queryprofilevariant.Property.Builder createVariantPropertyFieldConfig(
-            String fullName, Object value) {
+    private QueryProfilesConfig.Queryprofile.Queryprofilevariant.Property.Builder createVariantPropertyFieldConfig(String fullName, Object value) {
         QueryProfilesConfig.Queryprofile.Queryprofilevariant.Property.Builder propB = new QueryProfilesConfig.Queryprofile.Queryprofilevariant.Property.Builder();
         if (value instanceof SubstituteString)
             value=value.toString(); // Send only types understood by configBuilder downwards
@@ -251,7 +250,7 @@ public class QueryProfiles implements Serializable, QueryProfilesConfig.Producer
             qtB.matchaspath(true);
         for (QueryProfileType inherited : profileType.inherited())
             qtB.inherit(inherited.getId().stringValue());
-        List<FieldDescription> fields=new ArrayList<>(profileType.declaredFields().values());
+        List<FieldDescription> fields = new ArrayList<>(profileType.declaredFields().values());
         Collections.sort(fields);
         for (FieldDescription field : fields)
             qtB.field(createConfig(field));
@@ -260,22 +259,20 @@ public class QueryProfiles implements Serializable, QueryProfilesConfig.Producer
 
     private QueryProfilesConfig.Queryprofiletype.Field.Builder createConfig(FieldDescription field) {
         QueryProfilesConfig.Queryprofiletype.Field.Builder fB = new QueryProfilesConfig.Queryprofiletype.Field.Builder();
-        fB.
-        name(field.getName()).
-        type(field.getType().stringValue());
+        fB.name(field.getName()).type(field.getType().stringValue());
         if ( ! field.isOverridable())
             fB.overridable(false);
         if (field.isMandatory())
             fB.mandatory(true);
-        String aliases=toSpaceSeparatedString(field.getAliases());
-        if (!aliases.isEmpty())
+        String aliases = toSpaceSeparatedString(field.getAliases());
+        if ( ! aliases.isEmpty())
             fB.alias(aliases);
         return fB;
     }
 
     public String toSpaceSeparatedString(List<String> list) {
-        StringBuilder b=new StringBuilder();
-        for (Iterator<String> i=list.iterator(); i.hasNext(); ) {
+        StringBuilder b = new StringBuilder();
+        for (Iterator<String> i = list.iterator(); i.hasNext(); ) {
             b.append(i.next());
             if (i.hasNext())
                 b.append(" ");
@@ -290,10 +287,7 @@ public class QueryProfiles implements Serializable, QueryProfilesConfig.Producer
         }
     }
 
-    /**
-     * The config produced by this
-     * @return query profiles config
-     */
+    /** Returns the config produced by this */
     public QueryProfilesConfig getConfig() {
         QueryProfilesConfig.Builder qB = new QueryProfilesConfig.Builder();
         getConfig(qB);