Convert container-search to junit5

8 files changed, 265 insertions, 272 deletions

diff --git a/container-search/src/test/java/com/yahoo/search/query/profile/types/test/FieldTypeTestCase.java b/container-search/src/test/java/com/yahoo/search/query/profile/types/test/FieldTypeTestCase.java
index 0ace8f93f1d..b245648b861 100644
--- a/container-search/src/test/java/com/yahoo/search/query/profile/types/test/FieldTypeTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/query/profile/types/test/FieldTypeTestCase.java
@@ -4,9 +4,9 @@ package com.yahoo.search.query.profile.types.test;
 import com.yahoo.search.query.profile.types.FieldType;
 import com.yahoo.search.query.profile.types.QueryProfileType;
 import com.yahoo.search.query.profile.types.QueryProfileTypeRegistry;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * @author bratseth
@@ -14,14 +14,14 @@ import static org.junit.Assert.assertEquals;
 public class FieldTypeTestCase {
 
     @Test
-    public void testConvertToFromString() {
-        QueryProfileTypeRegistry registry=new QueryProfileTypeRegistry();
+    void testConvertToFromString() {
+        QueryProfileTypeRegistry registry = new QueryProfileTypeRegistry();
         registry.register(new QueryProfileType("foo"));
 
-        assertEquals("string", FieldType.fromString("string",registry).stringValue());
-        assertEquals("boolean", FieldType.fromString("boolean",registry).stringValue());
-        assertEquals("query-profile", FieldType.fromString("query-profile",registry).stringValue());
-        assertEquals("query-profile:foo", FieldType.fromString("query-profile:foo",registry).stringValue());
+        assertEquals("string", FieldType.fromString("string", registry).stringValue());
+        assertEquals("boolean", FieldType.fromString("boolean", registry).stringValue());
+        assertEquals("query-profile", FieldType.fromString("query-profile", registry).stringValue());
+        assertEquals("query-profile:foo", FieldType.fromString("query-profile:foo", registry).stringValue());
     }
 
 }
diff --git a/container-search/src/test/java/com/yahoo/search/query/profile/types/test/MandatoryTestCase.java b/container-search/src/test/java/com/yahoo/search/query/profile/types/test/MandatoryTestCase.java
index dfe4b24e256..5bde89d0282 100644
--- a/container-search/src/test/java/com/yahoo/search/query/profile/types/test/MandatoryTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/query/profile/types/test/MandatoryTestCase.java
@@ -13,9 +13,9 @@ import com.yahoo.search.query.profile.types.FieldType;
 import com.yahoo.search.query.profile.types.QueryProfileType;
 import com.yahoo.search.query.profile.types.QueryProfileTypeRegistry;
 import com.yahoo.search.test.QueryTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * @author bratseth
@@ -55,18 +55,18 @@ public class MandatoryTestCase {
     }
 
     @Test
-    public void testMandatoryFullySpecifiedQueryProfile() {
+    void testMandatoryFullySpecifiedQueryProfile() {
         Fixture1 fixture = new Fixture1();
 
-        QueryProfile test=new QueryProfile("test");
+        QueryProfile test = new QueryProfile("test");
         test.setType(fixture.type);
         test.set("myString", "aString", fixture.registry);
         fixture.registry.register(test);
 
-        QueryProfile myUser=new QueryProfile("user");
+        QueryProfile myUser = new QueryProfile("user");
         myUser.setType(fixture.user);
-        myUser.set("myUserInteger",1, fixture.registry);
-        myUser.set("myUserString",1, fixture.registry);
+        myUser.set("myUserInteger", 1, fixture.registry);
+        myUser.set("myUserString", 1, fixture.registry);
         test.set("myUserQueryProfile", myUser, fixture.registry);
         fixture.registry.register(myUser);
 
@@ -77,7 +77,7 @@ public class MandatoryTestCase {
     }
 
     @Test
-    public void testMandatoryRequestPropertiesNeeded() {
+    void testMandatoryRequestPropertiesNeeded() {
         Fixture1 fixture = new Fixture1();
 
         QueryProfile test = new QueryProfile("test");
@@ -94,11 +94,11 @@ public class MandatoryTestCase {
 
         // Underspecified request 1
         assertError("Incomplete query: Parameter 'myString' is mandatory in query profile 'test' of type 'testtype' but is not set",
-                    new Query(HttpRequest.createTestRequest("", Method.GET), cRegistry.getComponent("test")));
+                new Query(HttpRequest.createTestRequest("", Method.GET), cRegistry.getComponent("test")));
 
         // Underspecified request 2
         assertError("Incomplete query: Parameter 'myUserQueryProfile.myUserString' is mandatory in query profile 'test' of type 'testtype' but is not set",
-                    new Query(HttpRequest.createTestRequest("?myString=aString", Method.GET), cRegistry.getComponent("test")));
+                new Query(HttpRequest.createTestRequest("?myString=aString", Method.GET), cRegistry.getComponent("test")));
 
         // Fully specified request
         assertError(null, new Query(HttpRequest.createTestRequest("?myString=aString&myUserQueryProfile.myUserString=userString", Method.GET), cRegistry.getComponent("test")));
@@ -106,7 +106,7 @@ public class MandatoryTestCase {
 
     /** Same as above except the whole thing is nested in maps */
     @Test
-    public void testMandatoryNestedInMaps() {
+    void testMandatoryNestedInMaps() {
         Fixture1 fixture = new Fixture1();
 
         QueryProfile topMap = new QueryProfile("topMap");
@@ -123,7 +123,7 @@ public class MandatoryTestCase {
 
         QueryProfile myUser = new QueryProfile("user");
         myUser.setType(fixture.user);
-        myUser.set("myUserInteger",1, fixture.registry);
+        myUser.set("myUserInteger", 1, fixture.registry);
         test.set("myUserQueryProfile", myUser, fixture.registry);
         fixture.registry.register(myUser);
 
@@ -132,11 +132,11 @@ public class MandatoryTestCase {
 
         // Underspecified request 1
         assertError("Incomplete query: Parameter 'subMap.test.myString' is mandatory in query profile 'topMap' but is not set",
-                    new Query(HttpRequest.createTestRequest("", Method.GET), cRegistry.getComponent("topMap")));
+                new Query(HttpRequest.createTestRequest("", Method.GET), cRegistry.getComponent("topMap")));
 
         // Underspecified request 2
         assertError("Incomplete query: Parameter 'subMap.test.myUserQueryProfile.myUserString' is mandatory in query profile 'topMap' but is not set",
-                    new Query(HttpRequest.createTestRequest("?subMap.test.myString=aString", Method.GET), cRegistry.getComponent("topMap")));
+                new Query(HttpRequest.createTestRequest("?subMap.test.myString=aString", Method.GET), cRegistry.getComponent("topMap")));
 
         // Fully specified request
         assertError(null, new Query(HttpRequest.createTestRequest("?subMap.test.myString=aString&subMap.test.myUserQueryProfile.myUserString=userString", Method.GET), cRegistry.getComponent("topMap")));
@@ -144,7 +144,7 @@ public class MandatoryTestCase {
 
     /** Here, no user query profile is referenced in the query profile, but one is chosen in the request */
     @Test
-    public void testMandatoryUserProfileSetInRequest() {
+    void testMandatoryUserProfileSetInRequest() {
         Fixture1 fixture = new Fixture1();
 
         QueryProfile test = new QueryProfile("test");
@@ -161,11 +161,11 @@ public class MandatoryTestCase {
 
         // Underspecified request 1
         assertError("Incomplete query: Parameter 'myUserQueryProfile' is mandatory in query profile 'test' of type 'testtype' but is not set",
-                    new Query(HttpRequest.createTestRequest("?myString=aString", Method.GET), cRegistry.getComponent("test")));
+                new Query(HttpRequest.createTestRequest("?myString=aString", Method.GET), cRegistry.getComponent("test")));
 
         // Underspecified request 1
         assertError("Incomplete query: Parameter 'myUserQueryProfile.myUserString' is mandatory in query profile 'test' of type 'testtype' but is not set",
-                    new Query(HttpRequest.createTestRequest("?myString=aString&myUserQueryProfile=user", Method.GET), cRegistry.getComponent("test")));
+                new Query(HttpRequest.createTestRequest("?myString=aString&myUserQueryProfile=user", Method.GET), cRegistry.getComponent("test")));
 
         // Fully specified request
         assertError(null, new Query(HttpRequest.createTestRequest("?myString=aString&myUserQueryProfile=user&myUserQueryProfile.myUserString=userString", Method.GET), cRegistry.getComponent("test")));
@@ -173,7 +173,7 @@ public class MandatoryTestCase {
 
     /** Here, a partially specified query profile is added to a non-mandatory field, making the request underspecified */
     @Test
-    public void testNonMandatoryUnderspecifiedUserProfileSetInRequest() {
+    void testNonMandatoryUnderspecifiedUserProfileSetInRequest() {
         Fixture1 fixture = new Fixture1();
 
         QueryProfile test = new QueryProfile("test");
@@ -199,7 +199,7 @@ public class MandatoryTestCase {
 
         // Underspecified because an underspecified profile is added
         assertError("Incomplete query: Parameter 'myQueryProfile.myUserString' is mandatory in query profile 'test' of type 'testtype' but is not set",
-                    new Query(HttpRequest.createTestRequest("?myString=aString&myQueryProfile=otherUser", Method.GET), cRegistry.getComponent("test")));
+                new Query(HttpRequest.createTestRequest("?myString=aString&myQueryProfile=otherUser", Method.GET), cRegistry.getComponent("test")));
 
         // Back to fully specified
         assertError(null, new Query(HttpRequest.createTestRequest("?myString=aString&myQueryProfile=otherUser&myQueryProfile.myUserString=userString", Method.GET), cRegistry.getComponent("test")));
@@ -223,7 +223,7 @@ public class MandatoryTestCase {
     }
 
     @Test
-    public void testMandatoryInParentType() {
+    void testMandatoryInParentType() {
         Fixture2 fixture = new Fixture2();
 
         QueryProfile defaultProfile = new QueryProfile("default");
@@ -237,11 +237,11 @@ public class MandatoryTestCase {
         CompiledQueryProfileRegistry cRegistry = fixture.registry.compile();
 
         assertError("Incomplete query: Parameter 'foobar' is mandatory in query profile 'mandatory' of type 'mandatory-type' but is not set",
-                    new Query(QueryTestCase.httpEncode("?queryProfile=mandatory"), cRegistry.getComponent("mandatory")));
+                new Query(QueryTestCase.httpEncode("?queryProfile=mandatory"), cRegistry.getComponent("mandatory")));
     }
 
     @Test
-    public void testMandatoryInParentTypeWithInheritance() {
+    void testMandatoryInParentTypeWithInheritance() {
         Fixture2 fixture = new Fixture2();
 
         QueryProfile defaultProfile = new QueryProfile("default");
@@ -256,7 +256,7 @@ public class MandatoryTestCase {
         CompiledQueryProfileRegistry cRegistry = fixture.registry.compile();
 
         assertError("Incomplete query: Parameter 'foobar' is mandatory in query profile 'mandatory' of type 'mandatory-type' but is not set",
-                    new Query(QueryTestCase.httpEncode("?queryProfile=mandatory"), cRegistry.getComponent("mandatory")));
+                new Query(QueryTestCase.httpEncode("?queryProfile=mandatory"), cRegistry.getComponent("mandatory")));
     }
 
     private void assertError(String message,Query query) {
diff --git a/container-search/src/test/java/com/yahoo/search/query/profile/types/test/NameTestCase.java b/container-search/src/test/java/com/yahoo/search/query/profile/types/test/NameTestCase.java
index fa7508ea5ac..37991f7f14f 100644
--- a/container-search/src/test/java/com/yahoo/search/query/profile/types/test/NameTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/query/profile/types/test/NameTestCase.java
@@ -8,10 +8,10 @@ import com.yahoo.search.query.profile.QueryProfile;
 import com.yahoo.search.query.profile.types.FieldDescription;
 import com.yahoo.search.query.profile.types.FieldType;
 import com.yahoo.search.query.profile.types.QueryProfileType;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
 
 /**
  * tests creating invalid names
@@ -21,7 +21,7 @@ import static org.junit.Assert.fail;
 public class NameTestCase {
 
     @Test
-    public void testNames() {
+    void testNames() {
         assertLegalName("aB");
         assertIllegalName("a.");
         assertLegalName("_a_b");
@@ -33,11 +33,11 @@ public class NameTestCase {
     }
 
     @Test
-    public void testFieldNames() {
+    void testFieldNames() {
         assertLegalFieldName("aB");
         try {
-            QueryProfile profile=new QueryProfile("test");
-            profile.set("a.","anyValue", (QueryProfileRegistry)null);
+            QueryProfile profile = new QueryProfile("test");
+            profile.set("a.", "anyValue", (QueryProfileRegistry) null);
             fail("Should have failed");
         } catch (IllegalArgumentException e) {
             assertEquals("'a.' is not a legal compound name. Names can not end with a dot.", e.getMessage());
@@ -48,12 +48,12 @@ public class NameTestCase {
         assertLegalFieldName("/a/b");
         assertLegalFieldName("/a/b/");
         assertIllegalFieldName("aBc.dooEee.ce_d.-some-other.moreHere",
-                               "Could not set 'aBc.dooEee.ce_d.-some-other.moreHere' to 'anyValue'",
-                               "Illegal name '-some-other'");
+                "Could not set 'aBc.dooEee.ce_d.-some-other.moreHere' to 'anyValue'",
+                "Illegal name '-some-other'");
     }
 
     @Test
-    public void testComponentIdAsCompoundName() {
+    void testComponentIdAsCompoundName() {
         String name = "a/b";
         assertEquals(new CompoundName(name), new QueryProfileType(name).getComponentIdAsCompoundName());
     }
diff --git a/container-search/src/test/java/com/yahoo/search/query/profile/types/test/NativePropertiesTestCase.java b/container-search/src/test/java/com/yahoo/search/query/profile/types/test/NativePropertiesTestCase.java
index 6f884650b5d..72499002ba9 100644
--- a/container-search/src/test/java/com/yahoo/search/query/profile/types/test/NativePropertiesTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/query/profile/types/test/NativePropertiesTestCase.java
@@ -7,10 +7,10 @@ import com.yahoo.search.Query;
 import com.yahoo.search.query.profile.QueryProfile;
 import com.yahoo.search.query.profile.types.QueryProfileType;
 import com.yahoo.yolean.Exceptions;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 /**
  * Tests that properties can not be set even if they are native, if declared not settable in the query profile
@@ -20,7 +20,7 @@ import static org.junit.Assert.fail;
 public class NativePropertiesTestCase {
 
     @Test
-    public void testNativeInStrict() {
+    void testNativeInStrict() {
         QueryProfileType strictType = new QueryProfileType("strict");
         strictType.setStrict(true);
         QueryProfile strict = new QueryProfile("profile");
@@ -39,7 +39,7 @@ public class NativePropertiesTestCase {
         } catch (IllegalArgumentException e) {
             // As expected.
             assertTrue(Exceptions.toMessageString(e).contains(
-                            "Could not set 'notnative' to '5':"
+                    "Could not set 'notnative' to '5':"
                             + " 'notnative' is not declared in query profile type 'strict', and the type is strict"));
         }
     }
diff --git a/container-search/src/test/java/com/yahoo/search/query/profile/types/test/OverrideTestCase.java b/container-search/src/test/java/com/yahoo/search/query/profile/types/test/OverrideTestCase.java
index 906d43790bd..69d577719c5 100644
--- a/container-search/src/test/java/com/yahoo/search/query/profile/types/test/OverrideTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/query/profile/types/test/OverrideTestCase.java
@@ -13,10 +13,10 @@ import com.yahoo.search.query.profile.types.FieldDescription;
 import com.yahoo.search.query.profile.types.FieldType;
 import com.yahoo.search.query.profile.types.QueryProfileType;
 import com.yahoo.search.query.profile.types.QueryProfileTypeRegistry;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * Tests overriding of field values
@@ -29,7 +29,7 @@ public class OverrideTestCase {
 
     private QueryProfileType type, user;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         type=new QueryProfileType(new ComponentId("testtype"));
         user=new QueryProfileType(new ComponentId("user"));
@@ -60,38 +60,38 @@ public class OverrideTestCase {
 
     /** Check that a simple non-overridable string cannot be overridden */
     @Test
-    public void testSimpleUnoverridable() {
+    void testSimpleUnoverridable() {
         QueryProfileRegistry registry = new QueryProfileRegistry();
-        QueryProfile test=new QueryProfile("test");
+        QueryProfile test = new QueryProfile("test");
         test.setType(type);
-        test.set("myString","finalString", (QueryProfileRegistry)null);
+        test.set("myString", "finalString", (QueryProfileRegistry) null);
         registry.register(test);
         registry.freeze();
 
         // Assert request assignment does not work
         Query query = new Query(HttpRequest.createTestRequest("?myString=newValue", Method.GET), registry.compile().getComponent("test"));
-        assertEquals(0,query.errors().size());
-        assertEquals("finalString",query.properties().get("myString"));
+        assertEquals(0, query.errors().size());
+        assertEquals("finalString", query.properties().get("myString"));
 
         // Assert direct assignment does not work
-        query.properties().set("myString","newValue");
-        assertEquals("finalString",query.properties().get("myString"));
+        query.properties().set("myString", "newValue");
+        assertEquals("finalString", query.properties().get("myString"));
     }
 
     /** Check that a query profile cannot be overridden */
     @Test
-    public void testUnoverridableQueryProfile() {
+    void testUnoverridableQueryProfile() {
         QueryProfileRegistry registry = new QueryProfileRegistry();
 
         QueryProfile test = new QueryProfile("test");
         test.setType(type);
         registry.register(test);
 
-        QueryProfile myUser=new QueryProfile("user");
+        QueryProfile myUser = new QueryProfile("user");
         myUser.setType(user);
-        myUser.set("myUserInteger",1, registry);
-        myUser.set("myUserString","userValue", registry);
-        test.set("myUserQueryProfile",myUser, registry);
+        myUser.set("myUserInteger", 1, registry);
+        myUser.set("myUserString", "userValue", registry);
+        test.set("myUserQueryProfile", myUser, registry);
         registry.register(myUser);
 
         QueryProfile otherUser = new QueryProfile("otherUser");
@@ -102,52 +102,52 @@ public class OverrideTestCase {
         CompiledQueryProfileRegistry cRegistry = registry.compile();
 
         Query query = new Query(HttpRequest.createTestRequest("?myUserQueryprofile=otherUser", Method.GET), cRegistry.getComponent("test"));
-        assertEquals(0,query.errors().size());
-        assertEquals(1,query.properties().get("myUserQueryProfile.myUserInteger"));
+        assertEquals(0, query.errors().size());
+        assertEquals(1, query.properties().get("myUserQueryProfile.myUserInteger"));
     }
 
     /** Check that non-overridables are protected also in nested untyped references */
     @Test
-    public void testUntypedNestedUnoverridable() {
+    void testUntypedNestedUnoverridable() {
         QueryProfileRegistry registry = new QueryProfileRegistry();
         QueryProfile topMap = new QueryProfile("topMap");
         registry.register(topMap);
 
-        QueryProfile subMap=new QueryProfile("topSubMap");
-        topMap.set("subMap",subMap, registry);
+        QueryProfile subMap = new QueryProfile("topSubMap");
+        topMap.set("subMap", subMap, registry);
         registry.register(subMap);
 
         QueryProfile test = new QueryProfile("test");
         test.setType(type);
-        subMap.set("test",test, registry);
+        subMap.set("test", test, registry);
         registry.register(test);
 
-        QueryProfile myUser=new QueryProfile("user");
+        QueryProfile myUser = new QueryProfile("user");
         myUser.setType(user);
-        myUser.set("myUserString","finalValue", registry);
-        test.set("myUserQueryProfile",myUser, registry);
+        myUser.set("myUserString", "finalValue", registry);
+        test.set("myUserQueryProfile", myUser, registry);
         registry.register(myUser);
 
         registry.freeze();
         Query query = new Query(HttpRequest.createTestRequest("?subMap.test.myUserQueryProfile.myUserString=newValue", Method.GET), registry.compile().getComponent("topMap"));
-        assertEquals(0,query.errors().size());
-        assertEquals("finalValue",query.properties().get("subMap.test.myUserQueryProfile.myUserString"));
+        assertEquals(0, query.errors().size());
+        assertEquals("finalValue", query.properties().get("subMap.test.myUserQueryProfile.myUserString"));
 
-        query.properties().set("subMap.test.myUserQueryProfile.myUserString","newValue");
-        assertEquals("finalValue",query.properties().get("subMap.test.myUserQueryProfile.myUserString"));
+        query.properties().set("subMap.test.myUserQueryProfile.myUserString", "newValue");
+        assertEquals("finalValue", query.properties().get("subMap.test.myUserQueryProfile.myUserString"));
     }
 
     /** Tests overridability in an inherited field */
     @Test
-    public void testInheritedNonOverridableInType() {
+    void testInheritedNonOverridableInType() {
         QueryProfileRegistry registry = new QueryProfileRegistry();
 
-        QueryProfile test=new QueryProfile("test");
+        QueryProfile test = new QueryProfile("test");
         test.setType(type);
-        test.set("myString","finalString", (QueryProfileRegistry)null);
+        test.set("myString", "finalString", (QueryProfileRegistry) null);
         registry.register(test);
 
-        QueryProfile profile=new QueryProfile("profile");
+        QueryProfile profile = new QueryProfile("profile");
         profile.addInherited(test);
         registry.register(profile);
 
@@ -155,16 +155,16 @@ public class OverrideTestCase {
 
         Query query = new Query(HttpRequest.createTestRequest("?myString=newString", Method.GET), registry.compile().getComponent("test"));
 
-        assertEquals(0,query.errors().size());
-        assertEquals("finalString",query.properties().get("myString"));
+        assertEquals(0, query.errors().size());
+        assertEquals("finalString", query.properties().get("myString"));
 
-        query.properties().set("myString","newString");
-        assertEquals("finalString",query.properties().get("myString"));
+        query.properties().set("myString", "newString");
+        assertEquals("finalString", query.properties().get("myString"));
     }
 
     /** Tests overridability in an inherited field */
     @Test
-    public void testInheritedNonOverridableInProfile() {
+    void testInheritedNonOverridableInProfile() {
         QueryProfileRegistry registry = new QueryProfileRegistry();
         QueryProfile test = new QueryProfile("test");
         test.setType(type);
@@ -172,7 +172,7 @@ public class OverrideTestCase {
         test.setOverridable("myInteger", false, DimensionValues.empty);
         registry.register(test);
 
-        QueryProfile profile=new QueryProfile("profile");
+        QueryProfile profile = new QueryProfile("profile");
         profile.addInherited(test);
         registry.register(profile);
 
@@ -180,11 +180,11 @@ public class OverrideTestCase {
 
         Query query = new Query(HttpRequest.createTestRequest("?myInteger=32", Method.GET), registry.compile().getComponent("test"));
 
-        assertEquals(0,query.errors().size());
-        assertEquals(1,query.properties().get("myInteger"));
+        assertEquals(0, query.errors().size());
+        assertEquals(1, query.properties().get("myInteger"));
 
-        query.properties().set("myInteger",32);
-        assertEquals(1,query.properties().get("myInteger"));
+        query.properties().set("myInteger", 32);
+        assertEquals(1, query.properties().get("myInteger"));
     }
 
 }
diff --git a/container-search/src/test/java/com/yahoo/search/query/profile/types/test/PatchMatchingTestCase.java b/container-search/src/test/java/com/yahoo/search/query/profile/types/test/PatchMatchingTestCase.java
index d39bfa13126..58d92d84e94 100644
--- a/container-search/src/test/java/com/yahoo/search/query/profile/types/test/PatchMatchingTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/query/profile/types/test/PatchMatchingTestCase.java
@@ -4,10 +4,10 @@ package com.yahoo.search.query.profile.types.test;
 import com.yahoo.search.query.profile.QueryProfile;
 import com.yahoo.search.query.profile.QueryProfileRegistry;
 import com.yahoo.search.query.profile.types.QueryProfileType;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 /**
  * Tests that matching query profiles by path name works
@@ -17,62 +17,62 @@ import static org.junit.Assert.assertNull;
 public class PatchMatchingTestCase {
 
     @Test
-    public void testPatchMatching() {
-        QueryProfileType type=new QueryProfileType("type");
+    void testPatchMatching() {
+        QueryProfileType type = new QueryProfileType("type");
 
         type.setMatchAsPath(true);
 
-        QueryProfile a=new QueryProfile("a");
+        QueryProfile a = new QueryProfile("a");
         a.setType(type);
-        QueryProfile abee=new QueryProfile("a/bee");
+        QueryProfile abee = new QueryProfile("a/bee");
         abee.setType(type);
         abee.addInherited(a);
-        QueryProfile abeece=new QueryProfile("a/bee/ce");
+        QueryProfile abeece = new QueryProfile("a/bee/ce");
         abeece.setType(type);
         abeece.addInherited(abee);
 
-        QueryProfileRegistry registry=new QueryProfileRegistry();
+        QueryProfileRegistry registry = new QueryProfileRegistry();
         registry.register(a);
         registry.register(abee);
         registry.register(abeece);
         registry.freeze();
 
         assertNull(registry.findQueryProfile(null)); // No "default" registered
-        assertEquals("a",registry.findQueryProfile("a").getId().getName());
-        assertEquals("a/bee",registry.findQueryProfile("a/bee").getId().getName());
-        assertEquals("a/bee/ce",registry.findQueryProfile("a/bee/ce").getId().getName());
-        assertEquals("a/bee/ce",registry.findQueryProfile("a/bee/ce/dee").getId().getName());
-        assertEquals("a/bee/ce",registry.findQueryProfile("a/bee/ce/dee/eee/").getId().getName());
-        assertEquals("a/bee",registry.findQueryProfile("a/bee/cede").getId().getName());
-        assertEquals("a",registry.findQueryProfile("a/foo/bee/cede").getId().getName());
+        assertEquals("a", registry.findQueryProfile("a").getId().getName());
+        assertEquals("a/bee", registry.findQueryProfile("a/bee").getId().getName());
+        assertEquals("a/bee/ce", registry.findQueryProfile("a/bee/ce").getId().getName());
+        assertEquals("a/bee/ce", registry.findQueryProfile("a/bee/ce/dee").getId().getName());
+        assertEquals("a/bee/ce", registry.findQueryProfile("a/bee/ce/dee/eee/").getId().getName());
+        assertEquals("a/bee", registry.findQueryProfile("a/bee/cede").getId().getName());
+        assertEquals("a", registry.findQueryProfile("a/foo/bee/cede").getId().getName());
         assertNull(registry.findQueryProfile("abee"));
     }
 
     @Test
-    public void testNoPatchMatching() {
-        QueryProfileType type=new QueryProfileType("type");
+    void testNoPatchMatching() {
+        QueryProfileType type = new QueryProfileType("type");
 
         type.setMatchAsPath(false); // Default, but set here for clarity
 
-        QueryProfile a=new QueryProfile("a");
+        QueryProfile a = new QueryProfile("a");
         a.setType(type);
-        QueryProfile abee=new QueryProfile("a/bee");
+        QueryProfile abee = new QueryProfile("a/bee");
         abee.setType(type);
         abee.addInherited(a);
-        QueryProfile abeece=new QueryProfile("a/bee/ce");
+        QueryProfile abeece = new QueryProfile("a/bee/ce");
         abeece.setType(type);
         abeece.addInherited(abee);
 
-        QueryProfileRegistry registry=new QueryProfileRegistry();
+        QueryProfileRegistry registry = new QueryProfileRegistry();
         registry.register(a);
         registry.register(abee);
         registry.register(abeece);
         registry.freeze();
 
         assertNull(registry.findQueryProfile(null)); // No "default" registered
-        assertEquals("a",registry.findQueryProfile("a").getId().getName());
-        assertEquals("a/bee",registry.findQueryProfile("a/bee").getId().getName());
-        assertEquals("a/bee/ce",registry.findQueryProfile("a/bee/ce").getId().getName());
+        assertEquals("a", registry.findQueryProfile("a").getId().getName());
+        assertEquals("a/bee", registry.findQueryProfile("a/bee").getId().getName());
+        assertEquals("a/bee/ce", registry.findQueryProfile("a/bee/ce").getId().getName());
         assertNull(registry.findQueryProfile("a/bee/ce/dee")); // Different from test above
         assertNull(registry.findQueryProfile("a/bee/ce/dee/eee/")); // Different from test above
         assertNull(registry.findQueryProfile("a/bee/cede")); // Different from test above
@@ -82,59 +82,59 @@ public class PatchMatchingTestCase {
 
     /** Check that the path matching property is inherited to subtypes */
     @Test
-    public void testPatchMatchingInheritance() {
-        QueryProfileType type=new QueryProfileType("type");
-        QueryProfileType subType=new QueryProfileType("subType");
+    void testPatchMatchingInheritance() {
+        QueryProfileType type = new QueryProfileType("type");
+        QueryProfileType subType = new QueryProfileType("subType");
         subType.inherited().add(type);
 
         type.setMatchAsPath(true); // Supertype only
 
-        QueryProfile a=new QueryProfile("a");
+        QueryProfile a = new QueryProfile("a");
         a.setType(type);
-        QueryProfile abee=new QueryProfile("a/bee");
+        QueryProfile abee = new QueryProfile("a/bee");
         abee.setType(subType);
         abee.addInherited(a);
-        QueryProfile abeece=new QueryProfile("a/bee/ce");
+        QueryProfile abeece = new QueryProfile("a/bee/ce");
         abeece.setType(subType);
         abeece.addInherited(abee);
 
-        QueryProfileRegistry registry=new QueryProfileRegistry();
+        QueryProfileRegistry registry = new QueryProfileRegistry();
         registry.register(a);
         registry.register(abee);
         registry.register(abeece);
         registry.freeze();
 
         assertNull(registry.findQueryProfile(null)); // No "default" registered
-        assertEquals("a",registry.findQueryProfile("a").getId().getName());
-        assertEquals("a/bee",registry.findQueryProfile("a/bee").getId().getName());
-        assertEquals("a/bee/ce",registry.findQueryProfile("a/bee/ce").getId().getName());
-        assertEquals("a/bee/ce",registry.findQueryProfile("a/bee/ce/dee").getId().getName());
-        assertEquals("a/bee/ce",registry.findQueryProfile("a/bee/ce/dee/eee/").getId().getName());
-        assertEquals("a/bee",registry.findQueryProfile("a/bee/cede").getId().getName());
-        assertEquals("a",registry.findQueryProfile("a/foo/bee/cede").getId().getName());
+        assertEquals("a", registry.findQueryProfile("a").getId().getName());
+        assertEquals("a/bee", registry.findQueryProfile("a/bee").getId().getName());
+        assertEquals("a/bee/ce", registry.findQueryProfile("a/bee/ce").getId().getName());
+        assertEquals("a/bee/ce", registry.findQueryProfile("a/bee/ce/dee").getId().getName());
+        assertEquals("a/bee/ce", registry.findQueryProfile("a/bee/ce/dee/eee/").getId().getName());
+        assertEquals("a/bee", registry.findQueryProfile("a/bee/cede").getId().getName());
+        assertEquals("a", registry.findQueryProfile("a/foo/bee/cede").getId().getName());
         assertNull(registry.findQueryProfile("abee"));
     }
 
     /** Check that the path matching works with versioned profiles */
     @Test
-    public void testPatchMatchingVersions() {
-        QueryProfileType type=new QueryProfileType("type");
+    void testPatchMatchingVersions() {
+        QueryProfileType type = new QueryProfileType("type");
 
         type.setMatchAsPath(true);
 
-        QueryProfile a=new QueryProfile("a");
+        QueryProfile a = new QueryProfile("a");
         a.setType(type);
-        QueryProfile abee11=new QueryProfile("a/bee:1.1");
+        QueryProfile abee11 = new QueryProfile("a/bee:1.1");
         abee11.setType(type);
         abee11.addInherited(a);
-        QueryProfile abee13=new QueryProfile("a/bee:1.3");
+        QueryProfile abee13 = new QueryProfile("a/bee:1.3");
         abee13.setType(type);
         abee13.addInherited(a);
-        QueryProfile abeece=new QueryProfile("a/bee/ce");
+        QueryProfile abeece = new QueryProfile("a/bee/ce");
         abeece.setType(type);
         abeece.addInherited(abee13);
 
-        QueryProfileRegistry registry=new QueryProfileRegistry();
+        QueryProfileRegistry registry = new QueryProfileRegistry();
         registry.register(a);
         registry.register(abee11);
         registry.register(abee13);
@@ -142,52 +142,52 @@ public class PatchMatchingTestCase {
         registry.freeze();
 
         assertNull(registry.findQueryProfile(null)); // No "default" registered
-        assertEquals("a",registry.findQueryProfile("a").getId().getName());
-        assertEquals("a/bee:1.1",registry.findQueryProfile("a/bee:1.1").getId().toString());
-        assertEquals("a/bee:1.3",registry.findQueryProfile("a/bee").getId().toString());
-        assertEquals("a/bee:1.3",registry.findQueryProfile("a/bee:1").getId().toString());
-        assertEquals("a/bee/ce",registry.findQueryProfile("a/bee/ce").getId().getName());
-        assertEquals("a/bee/ce",registry.findQueryProfile("a/bee/ce/dee").getId().getName());
-        assertEquals("a/bee/ce",registry.findQueryProfile("a/bee/ce/dee/eee/").getId().getName());
-        assertEquals("a/bee:1.1",registry.findQueryProfile("a/bee/cede:1.1").getId().toString());
-        assertEquals("a/bee:1.3",registry.findQueryProfile("a/bee/cede").getId().toString());
-        assertEquals("a/bee:1.3",registry.findQueryProfile("a/bee/cede:1").getId().toString());
-        assertEquals("a",registry.findQueryProfile("a/foo/bee/cede").getId().getName());
+        assertEquals("a", registry.findQueryProfile("a").getId().getName());
+        assertEquals("a/bee:1.1", registry.findQueryProfile("a/bee:1.1").getId().toString());
+        assertEquals("a/bee:1.3", registry.findQueryProfile("a/bee").getId().toString());
+        assertEquals("a/bee:1.3", registry.findQueryProfile("a/bee:1").getId().toString());
+        assertEquals("a/bee/ce", registry.findQueryProfile("a/bee/ce").getId().getName());
+        assertEquals("a/bee/ce", registry.findQueryProfile("a/bee/ce/dee").getId().getName());
+        assertEquals("a/bee/ce", registry.findQueryProfile("a/bee/ce/dee/eee/").getId().getName());
+        assertEquals("a/bee:1.1", registry.findQueryProfile("a/bee/cede:1.1").getId().toString());
+        assertEquals("a/bee:1.3", registry.findQueryProfile("a/bee/cede").getId().toString());
+        assertEquals("a/bee:1.3", registry.findQueryProfile("a/bee/cede:1").getId().toString());
+        assertEquals("a", registry.findQueryProfile("a/foo/bee/cede").getId().getName());
         assertNull(registry.findQueryProfile("abee"));
     }
 
     @Test
-    public void testQuirkyNames() {
-        QueryProfileType type=new QueryProfileType("type");
+    void testQuirkyNames() {
+        QueryProfileType type = new QueryProfileType("type");
 
         type.setMatchAsPath(true);
 
-        QueryProfile a=new QueryProfile("/a");
+        QueryProfile a = new QueryProfile("/a");
         a.setType(type);
-        QueryProfile abee=new QueryProfile("/a//bee");
+        QueryProfile abee = new QueryProfile("/a//bee");
         abee.setType(type);
         abee.addInherited(a);
-        QueryProfile abeece=new QueryProfile("/a//bee/ce/");
+        QueryProfile abeece = new QueryProfile("/a//bee/ce/");
         abeece.setType(type);
         abeece.addInherited(abee);
 
-        QueryProfileRegistry registry=new QueryProfileRegistry();
+        QueryProfileRegistry registry = new QueryProfileRegistry();
         registry.register(a);
         registry.register(abee);
         registry.register(abeece);
         registry.freeze();
 
         assertNull(registry.findQueryProfile(null)); // No "default" registered
-        assertEquals("/a",registry.findQueryProfile("/a").getId().getName());
+        assertEquals("/a", registry.findQueryProfile("/a").getId().getName());
         assertNull(registry.findQueryProfile("a"));
-        assertEquals("/a//bee",registry.findQueryProfile("/a//bee").getId().getName());
-        assertEquals("/a//bee/ce/",registry.findQueryProfile("/a//bee/ce/").getId().getName());
-        assertEquals("/a//bee/ce/",registry.findQueryProfile("/a//bee/ce").getId().getName());
-        assertEquals("/a//bee/ce/",registry.findQueryProfile("/a//bee/ce/dee").getId().getName());
-        assertEquals("/a//bee/ce/",registry.findQueryProfile("/a//bee/ce/dee/eee/").getId().getName());
-        assertEquals("/a//bee",registry.findQueryProfile("/a//bee/cede").getId().getName());
-        assertEquals("/a",registry.findQueryProfile("/a/foo/bee/cede").getId().getName());
-        assertEquals("/a",registry.findQueryProfile("/a/bee").getId().getName());
+        assertEquals("/a//bee", registry.findQueryProfile("/a//bee").getId().getName());
+        assertEquals("/a//bee/ce/", registry.findQueryProfile("/a//bee/ce/").getId().getName());
+        assertEquals("/a//bee/ce/", registry.findQueryProfile("/a//bee/ce").getId().getName());
+        assertEquals("/a//bee/ce/", registry.findQueryProfile("/a//bee/ce/dee").getId().getName());
+        assertEquals("/a//bee/ce/", registry.findQueryProfile("/a//bee/ce/dee/eee/").getId().getName());
+        assertEquals("/a//bee", registry.findQueryProfile("/a//bee/cede").getId().getName());
+        assertEquals("/a", registry.findQueryProfile("/a/foo/bee/cede").getId().getName());
+        assertEquals("/a", registry.findQueryProfile("/a/bee").getId().getName());
         assertNull(registry.findQueryProfile("abee"));
     }
 
diff --git a/container-search/src/test/java/com/yahoo/search/query/profile/types/test/QueryProfileTypeInheritanceTestCase.java b/container-search/src/test/java/com/yahoo/search/query/profile/types/test/QueryProfileTypeInheritanceTestCase.java
index 62551447017..cc7b5c4d666 100644
--- a/container-search/src/test/java/com/yahoo/search/query/profile/types/test/QueryProfileTypeInheritanceTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/query/profile/types/test/QueryProfileTypeInheritanceTestCase.java
@@ -9,13 +9,10 @@ import com.yahoo.search.query.profile.types.FieldDescription;
 import com.yahoo.search.query.profile.types.FieldType;
 import com.yahoo.search.query.profile.types.QueryProfileType;
 import com.yahoo.search.query.profile.types.QueryProfileTypeRegistry;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.*;
 
 /**
  * @author bratseth
@@ -26,7 +23,7 @@ public class QueryProfileTypeInheritanceTestCase {
 
     private QueryProfileType type, typeStrict, user, userStrict;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         type=new QueryProfileType(new ComponentId("testtype"));
         typeStrict=new QueryProfileType(new ComponentId("testtypeStrict"));
@@ -63,7 +60,7 @@ public class QueryProfileTypeInheritanceTestCase {
     }
 
     @Test
-    public void testInheritance() {
+    void testInheritance() {
         type.inherited().add(user);
         type.freeze();
         user.freeze();
@@ -71,11 +68,11 @@ public class QueryProfileTypeInheritanceTestCase {
         assertFalse(type.isOverridable("myUserString"));
         assertEquals("myUserInteger", type.getField("myUserInteger").getName());
 
-        QueryProfile test=new QueryProfile("test");
+        QueryProfile test = new QueryProfile("test");
         test.setType(type);
 
-        test.set("myUserInteger","37", (QueryProfileRegistry)null);
-        test.set("myUnknownInteger","38", (QueryProfileRegistry)null);
+        test.set("myUserInteger", "37", (QueryProfileRegistry) null);
+        test.set("myUnknownInteger", "38", (QueryProfileRegistry) null);
         CompiledQueryProfile ctest = test.compile(null);
 
         assertEquals(37, ctest.get("myUserInteger"));
@@ -83,45 +80,45 @@ public class QueryProfileTypeInheritanceTestCase {
     }
 
     @Test
-    public void testInheritanceStrict() {
+    void testInheritanceStrict() {
         typeStrict.inherited().add(userStrict);
         typeStrict.freeze();
         userStrict.freeze();
 
-        QueryProfile test=new QueryProfile("test");
+        QueryProfile test = new QueryProfile("test");
         test.setType(typeStrict);
 
-        test.set("myUserInteger","37", (QueryProfileRegistry)null);
+        test.set("myUserInteger", "37", (QueryProfileRegistry) null);
         try {
-            test.set("myUnknownInteger","38", (QueryProfileRegistry)null);
+            test.set("myUnknownInteger", "38", (QueryProfileRegistry) null);
             fail("Should have failed");
         }
         catch (IllegalArgumentException e) {
             assertEquals("'myUnknownInteger' is not declared in query profile type 'testtypeStrict', and the type is strict",
-                         e.getCause().getMessage());
+                    e.getCause().getMessage());
         }
 
-        assertEquals(37,test.get("myUserInteger"));
+        assertEquals(37, test.get("myUserInteger"));
         assertNull(test.get("myUnknownInteger"));
     }
 
     @Test
-    public void testStrictIsInherited() {
+    void testStrictIsInherited() {
         type.inherited().add(userStrict);
         type.freeze();
         userStrict.freeze();
 
-        QueryProfile test=new QueryProfile("test");
+        QueryProfile test = new QueryProfile("test");
         test.setType(type);
 
-        test.set("myUserInteger","37", (QueryProfileRegistry)null);
+        test.set("myUserInteger", "37", (QueryProfileRegistry) null);
         try {
-            test.set("myUnknownInteger","38", (QueryProfileRegistry)null);
+            test.set("myUnknownInteger", "38", (QueryProfileRegistry) null);
             fail("Should have failed");
         }
         catch (IllegalArgumentException e) {
             assertEquals("'myUnknownInteger' is not declared in query profile type 'testtype', and the type is strict",
-                         e.getCause().getMessage());
+                    e.getCause().getMessage());
         }
 
         CompiledQueryProfile ctest = test.compile(null);
diff --git a/container-search/src/test/java/com/yahoo/search/query/profile/types/test/QueryProfileTypeTestCase.java b/container-search/src/test/java/com/yahoo/search/query/profile/types/test/QueryProfileTypeTestCase.java
index a77de954b3a..21a9b2fe399 100644
--- a/container-search/src/test/java/com/yahoo/search/query/profile/types/test/QueryProfileTypeTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/query/profile/types/test/QueryProfileTypeTestCase.java
@@ -19,19 +19,15 @@ import com.yahoo.search.query.profile.types.FieldDescription;
 import com.yahoo.search.query.profile.types.FieldType;
 import com.yahoo.search.query.profile.types.QueryProfileType;
 import com.yahoo.search.query.profile.types.QueryProfileTypeRegistry;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
 import java.util.List;
 import java.util.Map;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertThrows;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.*;
 
 /**
  * tests query profiles with/and types
@@ -44,7 +40,7 @@ public class QueryProfileTypeTestCase {
 
     private QueryProfileType testtype, emptyInheritingTesttype, testtypeStrict, user, userStrict;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         registry = new QueryProfileRegistry();
 
@@ -95,24 +91,24 @@ public class QueryProfileTypeTestCase {
     }
 
     @Test
-    public void testTypedOfPrimitivesAssignmentNonStrict() {
+    void testTypedOfPrimitivesAssignmentNonStrict() {
         QueryProfile profile = new QueryProfile("test");
         profile.setType(testtype);
         registry.register(profile);
 
         profile.set("myString", "anyValue", registry);
         profile.set("nontypedString", "anyValueToo", registry); // legal because this is not strict
-        assertWrongType(profile,"integer", "myInteger","notInteger");
+        assertWrongType(profile, "integer", "myInteger", "notInteger");
         assertWrongType(profile, "integer", "myInteger", "1.5");
         profile.set("myInteger", 3, registry);
-        assertWrongType(profile,"long","myLong","notLong");
+        assertWrongType(profile, "long", "myLong", "notLong");
         assertWrongType(profile, "long", "myLong", "1.5");
         profile.set("myLong", 4000000000000L, registry);
         assertWrongType(profile, "float", "myFloat", "notFloat");
         profile.set("myFloat", 3.14f, registry);
         assertWrongType(profile, "double", "myDouble", "notDouble");
-        profile.set("myDouble",2.18, registry);
-        profile.set("myBoolean",true, registry);
+        profile.set("myDouble", 2.18, registry);
+        profile.set("myBoolean", true, registry);
 
         String tensorString1 = "{{a:a1, b:b1}:1.0, {a:a2, b:b1}:2.0}}";
         profile.set("ranking.features.query(myTensor1)", tensorString1, registry);
@@ -122,12 +118,12 @@ public class QueryProfileTypeTestCase {
         profile.set("ranking.features.query(myTensor3)", tensorString3, registry);
 
         profile.set("myQuery", "...", registry); // TODO
-        profile.set("myQueryProfile.anyString","value1", registry);
-        profile.set("myQueryProfile.anyDouble",8.76, registry);
-        profile.set("myUserQueryProfile.myUserString","value2", registry);
+        profile.set("myQueryProfile.anyString", "value1", registry);
+        profile.set("myQueryProfile.anyDouble", 8.76, registry);
+        profile.set("myUserQueryProfile.myUserString", "value2", registry);
         profile.set("myUserQueryProfile.anyString", "value3", registry); // Legal because user is not strict
         assertWrongType(profile, "integer", "myUserQueryProfile.myUserInteger", "notInteger");
-        profile.set("myUserQueryProfile.uint",1337, registry); // Set using alias
+        profile.set("myUserQueryProfile.uint", 1337, registry); // Set using alias
         profile.set("myUserQueryProfile.anyDouble", 9.13, registry); // Legal because user is not strict
 
         CompiledQueryProfileRegistry cRegistry = registry.compile();
@@ -162,22 +158,22 @@ public class QueryProfileTypeTestCase {
     }
 
     @Test
-    public void testTypedOfPrimitivesAssignmentStrict() {
+    void testTypedOfPrimitivesAssignmentStrict() {
         QueryProfile profile = new QueryProfile("test");
         profile.setType(testtypeStrict);
 
         profile.set("myString", "anyValue", registry);
         assertNotPermitted(profile, "nontypedString", "anyValueToo"); // Illegal because this is strict
-        assertWrongType(profile,"integer","myInteger","notInteger");
+        assertWrongType(profile, "integer", "myInteger", "notInteger");
         assertWrongType(profile, "integer", "myInteger", "1.5");
         profile.set("myInteger", 3, registry);
-        assertWrongType(profile,"long","myLong","notLong");
+        assertWrongType(profile, "long", "myLong", "notLong");
         assertWrongType(profile, "long", "myLong", "1.5");
         profile.set("myLong", 4000000000000L, registry);
         assertWrongType(profile, "float", "myFloat", "notFloat");
         profile.set("myFloat", 3.14f, registry);
         assertWrongType(profile, "double", "myDouble", "notDouble");
-        profile.set("myDouble",2.18, registry);
+        profile.set("myDouble", 2.18, registry);
         profile.set("myQueryProfile.anyString", "value1", registry);
         profile.set("myQueryProfile.anyDouble", 8.76, registry);
         profile.set("myUserQueryProfile.myUserString", "value2", registry);
@@ -204,22 +200,22 @@ public class QueryProfileTypeTestCase {
 
     /** Tests assigning a subprofile directly */
     @Test
-    public void testTypedAssignmentOfQueryProfilesNonStrict() {
+    void testTypedAssignmentOfQueryProfilesNonStrict() {
         QueryProfile profile = new QueryProfile("test");
         profile.setType(testtype);
 
-        QueryProfile map1=new QueryProfile("myMap1");
+        QueryProfile map1 = new QueryProfile("myMap1");
         map1.set("key1", "value1", registry);
 
-        QueryProfile map2=new QueryProfile("myMap2");
+        QueryProfile map2 = new QueryProfile("myMap2");
         map2.set("key2", "value2", registry);
 
-        QueryProfile myUser=new QueryProfile("myUser");
+        QueryProfile myUser = new QueryProfile("myUser");
         myUser.setType(user);
         myUser.set("myUserString", "userValue1", registry);
         myUser.set("myUserInteger", 442, registry);
 
-        assertWrongType(profile,"reference to a query profile","myQueryProfile","aString");
+        assertWrongType(profile, "reference to a query profile", "myQueryProfile", "aString");
         profile.set("myQueryProfile", map1, registry);
         profile.set("someMap", map2, registry); // Legal because this is not strict
         assertWrongType(profile, "reference to a query profile of type 'user'", "myUserQueryProfile", map1);
@@ -235,14 +231,14 @@ public class QueryProfileTypeTestCase {
 
     /** Tests assigning a subprofile directly */
     @Test
-    public void testTypedAssignmentOfQueryProfilesStrict() {
+    void testTypedAssignmentOfQueryProfilesStrict() {
         QueryProfile profile = new QueryProfile("test");
         profile.setType(testtypeStrict);
 
-        QueryProfile map1=new QueryProfile("myMap1");
+        QueryProfile map1 = new QueryProfile("myMap1");
         map1.set("key1", "value1", registry);
 
-        QueryProfile map2=new QueryProfile("myMap2");
+        QueryProfile map2 = new QueryProfile("myMap2");
         map2.set("key2", "value2", registry);
 
         QueryProfile myUser = new QueryProfile("myUser");
@@ -250,10 +246,10 @@ public class QueryProfileTypeTestCase {
         myUser.set("myUserString", "userValue1", registry);
         myUser.set("myUserInteger", 442, registry);
 
-        assertWrongType(profile,"reference to a query profile","myQueryProfile","aString");
+        assertWrongType(profile, "reference to a query profile", "myQueryProfile", "aString");
         profile.set("myQueryProfile", map1, registry);
-        assertNotPermitted(profile,"someMap", map2);
-        assertWrongType(profile,"reference to a query profile of type 'userStrict'", "myUserQueryProfile", map1);
+        assertNotPermitted(profile, "someMap", map2);
+        assertWrongType(profile, "reference to a query profile of type 'userStrict'", "myUserQueryProfile", map1);
         profile.set("myUserQueryProfile", myUser, registry);
 
         CompiledQueryProfile cprofile = profile.compile(null);
@@ -266,7 +262,7 @@ public class QueryProfileTypeTestCase {
 
     /** Tests assigning a subprofile as an id string */
     @Test
-    public void testTypedAssignmentOfQueryProfileReferencesNonStrict() {
+    void testTypedAssignmentOfQueryProfileReferencesNonStrict() {
         QueryProfile profile = new QueryProfile("test");
         profile.setType(testtype);
 
@@ -286,21 +282,21 @@ public class QueryProfileTypeTestCase {
         registry.register(map2);
         registry.register(myUser);
 
-        assertWrongType(profile,"reference to a query profile", "myQueryProfile", "aString");
+        assertWrongType(profile, "reference to a query profile", "myQueryProfile", "aString");
         registry.register(map1);
         profile.set("myQueryProfile", "myMap1", registry);
         registry.register(map2);
         profile.set("someMap", "myMap2", registry); // NOTICE: Will set as a string because we cannot know this is a reference
         assertWrongType(profile, "reference to a query profile of type 'user'", "myUserQueryProfile", "myMap1");
         registry.register(myUser);
-        profile.set("myUserQueryProfile","myUser", registry);
+        profile.set("myUserQueryProfile", "myUser", registry);
 
         CompiledQueryProfileRegistry cRegistry = registry.compile();
         CompiledQueryProfile cprofile = cRegistry.getComponent("test");
 
         assertEquals("value1", cprofile.get("myQueryProfile.key1"));
         assertEquals("myMap2", cprofile.get("someMap"));
-        assertNull("Asking for an value which cannot be completely resolved returns null", cprofile.get("someMap.key2"));
+        assertNull(cprofile.get("someMap.key2"), "Asking for an value which cannot be completely resolved returns null");
         assertEquals("userValue1", cprofile.get("myUserQueryProfile.myUserString"));
         assertEquals(442, cprofile.get("myUserQueryProfile.myUserInteger"));
     }
@@ -310,11 +306,11 @@ public class QueryProfileTypeTestCase {
      * Here there exists a user profile already, and then a new one is overwritten
      */
     @Test
-    public void testTypedOverridingOfQueryProfileReferencesNonStrictThroughQuery() {
+    void testTypedOverridingOfQueryProfileReferencesNonStrictThroughQuery() {
         QueryProfile profile = new QueryProfile("test");
         profile.setType(testtype);
 
-        QueryProfile myUser=new QueryProfile("myUser");
+        QueryProfile myUser = new QueryProfile("myUser");
         myUser.setType(user);
         myUser.set("myUserString", "userValue1", registry);
         myUser.set("myUserInteger", 442, registry);
@@ -332,8 +328,8 @@ public class QueryProfileTypeTestCase {
         CompiledQueryProfile cprofile = cRegistry.getComponent("test");
 
         Query query = new Query(HttpRequest.createTestRequest("?myUserQueryProfile=newUser",
-                                                              com.yahoo.jdisc.http.HttpRequest.Method.GET),
-                                cprofile);
+                        com.yahoo.jdisc.http.HttpRequest.Method.GET),
+                cprofile);
 
         assertEquals(0, query.errors().size());
 
@@ -346,7 +342,7 @@ public class QueryProfileTypeTestCase {
      * Here no user profile is set before it is assigned in the query
      */
     @Test
-    public void testTypedAssignmentOfQueryProfileReferencesNonStrictThroughQuery() {
+    void testTypedAssignmentOfQueryProfileReferencesNonStrictThroughQuery() {
         QueryProfile profile = new QueryProfile("test");
         profile.setType(testtype);
 
@@ -361,8 +357,8 @@ public class QueryProfileTypeTestCase {
         CompiledQueryProfile cprofile = cRegistry.getComponent("test");
 
         Query query = new Query(HttpRequest.createTestRequest("?myUserQueryProfile=newUser",
-                                                              com.yahoo.jdisc.http.HttpRequest.Method.GET),
-                                cprofile);
+                        com.yahoo.jdisc.http.HttpRequest.Method.GET),
+                cprofile);
 
         assertEquals(0, query.errors().size());
 
@@ -375,7 +371,7 @@ public class QueryProfileTypeTestCase {
      * Here no user profile is set before it is assigned in the query
      */
     @Test
-    public void testTypedAssignmentOfQueryProfileReferencesStrictThroughQuery() {
+    void testTypedAssignmentOfQueryProfileReferencesStrictThroughQuery() {
         QueryProfile profile = new QueryProfile("test");
         profile.setType(testtypeStrict);
 
@@ -401,13 +397,13 @@ public class QueryProfileTypeTestCase {
         }
         catch (IllegalArgumentException e) {
             assertEquals("Could not set 'myUserQueryProfile.someKey' to 'value': 'someKey' is not declared in query profile type 'userStrict', and the type is strict",
-                         Exceptions.toMessageString(e));
+                    Exceptions.toMessageString(e));
         }
 
     }
 
     @Test
-    public void testTensorRankFeatureInRequest() {
+    void testTensorRankFeatureInRequest() {
         QueryProfile profile = new QueryProfile("test");
         profile.setType(testtype);
         registry.register(profile);
@@ -415,16 +411,16 @@ public class QueryProfileTypeTestCase {
         CompiledQueryProfileRegistry cRegistry = registry.compile();
         String tensorString = "{{a:a1, b:b1}:1.0, {a:a2, b:b1}:2.0}}";
         Query query = new Query(HttpRequest.createTestRequest("?" + urlEncode("ranking.features.query(myTensor1)") +
-                                                              "=" + urlEncode(tensorString),
-                                                              com.yahoo.jdisc.http.HttpRequest.Method.GET),
-                                cRegistry.getComponent("test"));
+                        "=" + urlEncode(tensorString),
+                        com.yahoo.jdisc.http.HttpRequest.Method.GET),
+                cRegistry.getComponent("test"));
         assertEquals(0, query.errors().size());
         assertEquals(Tensor.from(tensorString), query.properties().get("ranking.features.query(myTensor1)"));
         assertEquals(Tensor.from(tensorString), query.getRanking().getFeatures().getTensor("query(myTensor1)").get());
     }
 
     @Test
-    public void testTensorRankFeatureSetProgrammatically() {
+    void testTensorRankFeatureSetProgrammatically() {
         QueryProfile profile = new QueryProfile("test");
         profile.setType(testtype);
         registry.register(profile);
@@ -432,13 +428,13 @@ public class QueryProfileTypeTestCase {
         CompiledQueryProfileRegistry cRegistry = registry.compile();
         String tensorString = "{{a:a1, b:b1}:1.0, {a:a2, b:b1}:2.0}}";
         Query query = new Query(HttpRequest.createTestRequest("?", com.yahoo.jdisc.http.HttpRequest.Method.GET),
-                                cRegistry.getComponent("test"));
+                cRegistry.getComponent("test"));
         query.properties().set("ranking.features.query(myTensor1)", Tensor.from(tensorString));
         assertEquals(Tensor.from(tensorString), query.getRanking().getFeatures().getTensor("query(myTensor1)").get());
     }
 
     @Test
-    public void testTensorRankFeatureSetProgrammaticallyWithWrongType() {
+    void testTensorRankFeatureSetProgrammaticallyWithWrongType() {
         QueryProfile profile = new QueryProfile("test");
         profile.setType(testtype);
         registry.register(profile);
@@ -446,15 +442,15 @@ public class QueryProfileTypeTestCase {
         CompiledQueryProfileRegistry cRegistry = registry.compile();
         String tensorString = "tensor(x[3]):[0.1, 0.2, 0.3]";
         Query query = new Query(HttpRequest.createTestRequest("?", com.yahoo.jdisc.http.HttpRequest.Method.GET),
-                                cRegistry.getComponent("test"));
+                cRegistry.getComponent("test"));
         try {
-            query.getRanking().getFeatures().put("query(myTensor1)",Tensor.from(tensorString));
+            query.getRanking().getFeatures().put("query(myTensor1)", Tensor.from(tensorString));
             fail("Expected exception");
         }
         catch (IllegalArgumentException e) {
             assertEquals("Could not set 'ranking.features.query(myTensor1)' to 'tensor(x[3]):[0.1, 0.2, 0.3]': " +
-                         "Require a tensor of type tensor(a{},b{})",
-                         Exceptions.toMessageString(e));
+                    "Require a tensor of type tensor(a{},b{})",
+                    Exceptions.toMessageString(e));
         }
         try {
             query.properties().set("ranking.features.query(myTensor1)", Tensor.from(tensorString));
@@ -462,14 +458,14 @@ public class QueryProfileTypeTestCase {
         }
         catch (IllegalArgumentException e) {
             assertEquals("Could not set 'ranking.features.query(myTensor1)' to 'tensor(x[3]):[0.1, 0.2, 0.3]': " +
-                         "Require a tensor of type tensor(a{},b{})",
-                         Exceptions.toMessageString(e));
+                    "Require a tensor of type tensor(a{},b{})",
+                    Exceptions.toMessageString(e));
         }
     }
 
     // Expected to work exactly as testTensorRankFeatureInRequest
     @Test
-    public void testTensorRankFeatureInRequestWithInheritedQueryProfileType() {
+    void testTensorRankFeatureInRequestWithInheritedQueryProfileType() {
         QueryProfile profile = new QueryProfile("test");
         profile.setType(emptyInheritingTesttype);
         registry.register(profile);
@@ -477,16 +473,16 @@ public class QueryProfileTypeTestCase {
         CompiledQueryProfileRegistry cRegistry = registry.compile();
         String tensorString = "{{a:a1, b:b1}:1.0, {a:a2, b:b1}:2.0}}";
         Query query = new Query(HttpRequest.createTestRequest("?" + urlEncode("ranking.features.query(myTensor1)") +
-                                                              "=" + urlEncode(tensorString),
-                                                              com.yahoo.jdisc.http.HttpRequest.Method.GET),
-                                cRegistry.getComponent("test"));
+                        "=" + urlEncode(tensorString),
+                        com.yahoo.jdisc.http.HttpRequest.Method.GET),
+                cRegistry.getComponent("test"));
         assertEquals(0, query.errors().size());
         assertEquals(Tensor.from(tensorString), query.properties().get("ranking.features.query(myTensor1)"));
         assertEquals(Tensor.from(tensorString), query.getRanking().getFeatures().getTensor("query(myTensor1)").get());
     }
 
     @Test
-    public void testUnembeddedTensorRankFeatureInRequest() {
+    void testUnembeddedTensorRankFeatureInRequest() {
         String text = "text to embed into a tensor";
         Tensor embedding1 = Tensor.from("tensor<float>(x[5]):[3,7,4,0,0]]");
         Tensor embedding2 = Tensor.from("tensor<float>(x[5]):[1,2,3,4,0]]");
@@ -500,7 +496,7 @@ public class QueryProfileTypeTestCase {
         assertEmbedQuery("embed(emb1, '" + text + "')", embedding1, embedders);
         assertEmbedQuery("embed(emb1, \"" + text + "\")", embedding1, embedders);
         assertEmbedQueryFails("embed(emb2, \"" + text + "\")", embedding1, embedders,
-                              "Can't find embedder 'emb2'. Valid embedders are emb1");
+                "Can't find embedder 'emb2'. Valid embedders are emb1");
 
         embedders = Map.of(
                 "emb1", new MockEmbedder(text, Language.UNKNOWN, embedding1),
@@ -530,7 +526,7 @@ public class QueryProfileTypeTestCase {
     }
 
     @Test
-    public void testIllegalStrictAssignmentFromRequest() {
+    void testIllegalStrictAssignmentFromRequest() {
         QueryProfile profile = new QueryProfile("test");
         profile.setType(testtypeStrict);
 
@@ -541,13 +537,13 @@ public class QueryProfileTypeTestCase {
 
         try {
             new Query(HttpRequest.createTestRequest("?myUserQueryProfile.nondeclared=someValue",
-                                                    com.yahoo.jdisc.http.HttpRequest.Method.GET),
-                      profile.compile(null));
+                            com.yahoo.jdisc.http.HttpRequest.Method.GET),
+                    profile.compile(null));
             fail("Above statement should throw");
         } catch (IllegalArgumentException e) {
             // As expected.
             assertTrue(Exceptions.toMessageString(e).contains(
-                       "Could not set 'myUserQueryProfile.nondeclared' to 'someValue': 'nondeclared' is not declared in query profile type 'userStrict', and the type is strict"));
+                    "Could not set 'myUserQueryProfile.nondeclared' to 'someValue': 'nondeclared' is not declared in query profile type 'userStrict', and the type is strict"));
         }
     }
 
@@ -557,7 +553,7 @@ public class QueryProfileTypeTestCase {
      * The whole thing is accessed through a two levels of nontyped top-level profiles
      */
     @Test
-    public void testTypedOverridingOfQueryProfileReferencesNonStrictThroughQueryNestedInAnUntypedProfile() {
+    void testTypedOverridingOfQueryProfileReferencesNonStrictThroughQueryNestedInAnUntypedProfile() {
         QueryProfile topMap = new QueryProfile("topMap");
 
         QueryProfile subMap = new QueryProfile("topSubMap");
@@ -586,8 +582,8 @@ public class QueryProfileTypeTestCase {
         CompiledQueryProfileRegistry cRegistry = registry.compile();
 
         Query query = new Query(HttpRequest.createTestRequest("?subMap.typeProfile.myUserQueryProfile=newUser",
-                                                              com.yahoo.jdisc.http.HttpRequest.Method.GET),
-                                cRegistry.getComponent("topMap"));
+                        com.yahoo.jdisc.http.HttpRequest.Method.GET),
+                cRegistry.getComponent("topMap"));
 
         assertEquals(0, query.errors().size());
 
@@ -599,7 +595,7 @@ public class QueryProfileTypeTestCase {
      * Same as previous test but using the untyped myQueryProfile reference instead of the typed myUserQueryProfile
      */
     @Test
-    public void testAnonTypedOverridingOfQueryProfileReferencesNonStrictThroughQueryNestedInAnUntypedProfile() {
+    void testAnonTypedOverridingOfQueryProfileReferencesNonStrictThroughQueryNestedInAnUntypedProfile() {
         QueryProfile topMap = new QueryProfile("topMap");
 
         QueryProfile subMap = new QueryProfile("topSubMap");
@@ -630,15 +626,15 @@ public class QueryProfileTypeTestCase {
         Query query = new Query(HttpRequest.createTestRequest("?subMap.typeProfile.myQueryProfile=newUser", com.yahoo.jdisc.http.HttpRequest.Method.GET), cRegistry.getComponent("topMap"));
         assertEquals(0, query.errors().size());
 
-        assertEquals("newUserValue1",query.properties().get("subMap.typeProfile.myQueryProfile.myUserString"));
-        assertEquals(845,query.properties().get("subMap.typeProfile.myQueryProfile.myUserInteger"));
+        assertEquals("newUserValue1", query.properties().get("subMap.typeProfile.myQueryProfile.myUserString"));
+        assertEquals(845, query.properties().get("subMap.typeProfile.myQueryProfile.myUserInteger"));
     }
 
     /**
      * Tests setting a illegal value in a strict profile nested under untyped maps
      */
     @Test
-    public void testSettingValueInStrictTypeNestedUnderUntypedMaps() {
+    void testSettingValueInStrictTypeNestedUnderUntypedMaps() {
         QueryProfile topMap = new QueryProfile("topMap");
 
         QueryProfile subMap = new QueryProfile("topSubMap");
@@ -656,13 +652,13 @@ public class QueryProfileTypeTestCase {
         try {
             new Query(
                     HttpRequest.createTestRequest("?subMap.typeProfile.someValue=value",
-                                                  com.yahoo.jdisc.http.HttpRequest.Method.GET),
+                            com.yahoo.jdisc.http.HttpRequest.Method.GET),
                     cRegistry.getComponent("topMap"));
             fail("Above statement should throw");
         } catch (IllegalArgumentException e) {
             // As expected.
             assertTrue(Exceptions.toMessageString(e).contains(
-                       "Could not set 'subMap.typeProfile.someValue' to 'value': 'someValue' is not declared in query profile type 'testtypeStrict', and the type is strict"));
+                    "Could not set 'subMap.typeProfile.someValue' to 'value': 'someValue' is not declared in query profile type 'testtypeStrict', and the type is strict"));
         }
     }
 
@@ -672,15 +668,15 @@ public class QueryProfileTypeTestCase {
      * The whole thing is accessed through a two levels of nontyped top-level profiles
      */
     @Test
-    public void testTypedSettingOfQueryProfileReferencesNonStrictThroughQueryNestedInAnUntypedProfile() {
+    void testTypedSettingOfQueryProfileReferencesNonStrictThroughQueryNestedInAnUntypedProfile() {
         QueryProfile topMap = new QueryProfile("topMap");
 
         QueryProfile subMap = new QueryProfile("topSubMap");
-        topMap.set("subMap",subMap, registry);
+        topMap.set("subMap", subMap, registry);
 
         QueryProfile test = new QueryProfile("test");
         test.setType(testtype);
-        subMap.set("typeProfile",test, registry);
+        subMap.set("typeProfile", test, registry);
 
         QueryProfile newUser = new QueryProfile("newUser");
         newUser.setType(user);
@@ -694,8 +690,8 @@ public class QueryProfileTypeTestCase {
         CompiledQueryProfileRegistry cRegistry = registry.compile();
 
         Query query = new Query(HttpRequest.createTestRequest("?subMap.typeProfile.myUserQueryProfile=newUser",
-                                                              com.yahoo.jdisc.http.HttpRequest.Method.GET),
-                                cRegistry.getComponent("topMap"));
+                        com.yahoo.jdisc.http.HttpRequest.Method.GET),
+                cRegistry.getComponent("topMap"));
         assertEquals(0, query.errors().size());
 
         assertEquals("newUserValue1", query.properties().get("subMap.typeProfile.myUserQueryProfile.myUserString"));
@@ -703,14 +699,14 @@ public class QueryProfileTypeTestCase {
     }
 
     @Test
-    public void testNestedTypeName() {
+    void testNestedTypeName() {
         ComponentId.resetGlobalCountersForTests();
         QueryProfileRegistry registry = new QueryProfileRegistry();
         QueryProfileType type = new QueryProfileType("testType");
         registry.getTypeRegistry().register(type);
         type.addField(new FieldDescription("ranking.features.query(embedding_profile)",
-                                           "tensor<float>(model{},x[128])"),
-                      registry.getTypeRegistry());
+                        "tensor<float>(model{},x[128])"),
+                registry.getTypeRegistry());
         QueryProfile test = new QueryProfile("test");
         registry.register(test);
         test.setType(type);
@@ -723,15 +719,15 @@ public class QueryProfileTypeTestCase {
     }
 
     @Test
-    public void testNestedTypeNameUsingBuiltInTypes() {
+    void testNestedTypeNameUsingBuiltInTypes() {
         ComponentId.resetGlobalCountersForTests();
         QueryProfileRegistry registry = new QueryProfileRegistry();
         QueryProfileType type = new QueryProfileType("testType");
         type.inherited().add(Query.getArgumentType()); // Include native type checking
         registry.getTypeRegistry().register(type);
         type.addField(new FieldDescription("ranking.features.query(embedding_profile)",
-                                           "tensor<float>(model{},x[128])"),
-                      registry.getTypeRegistry());
+                        "tensor<float>(model{},x[128])"),
+                registry.getTypeRegistry());
         QueryProfile test = new QueryProfile("test");
         registry.register(test);
         test.setType(type);
@@ -745,7 +741,7 @@ public class QueryProfileTypeTestCase {
         }
         catch (IllegalArgumentException e) {
             assertEquals("'foo' is not a valid property in 'ranking'. See the query api for valid keys starting by 'ranking'.",
-                         e.getCause().getMessage());
+                    e.getCause().getMessage());
         }
 
         // With a prefix we're not in the built-in type space