Use 'package' as namespace for config-application-package:Bundle.DefEntry

- If both 'package' and 'namespace' are present, the package will
  be used as namespace.

4 files changed, 32 insertions, 14 deletions

diff --git a/config-model/src/test/cfg/application/app1/components/defs-only.jar b/config-model/src/test/cfg/application/app1/components/defs-only.jar
index c0cf0397c97..88a51ff82f7 100644
--- a/config-model/src/test/cfg/application/app1/components/defs-only.jar
+++ b/config-model/src/test/cfg/application/app1/components/defs-only.jar
diff --git a/config-model/src/test/java/com/yahoo/config/model/ApplicationDeployTest.java b/config-model/src/test/java/com/yahoo/config/model/ApplicationDeployTest.java
index bc84e109d7e..ee2e6ffcc74 100644
--- a/config-model/src/test/java/com/yahoo/config/model/ApplicationDeployTest.java
+++ b/config-model/src/test/java/com/yahoo/config/model/ApplicationDeployTest.java
@@ -93,15 +93,17 @@ public class ApplicationDeployTest {
 
         List<FilesApplicationPackage.Component> components = app.getComponents();
         assertEquals(1, components.size());
-        Map<String, Bundle.DefEntry> defEntries =
+        Map<String, Bundle.DefEntry> defEntriesByName =
                 defEntries2map(components.get(0).getDefEntries());
-        assertEquals(2, defEntries.size());
-        System.out.println(defEntries);
-        Bundle.DefEntry def1 = defEntries.get("test1");
-        Bundle.DefEntry def2 = defEntries.get("test2");
+        assertEquals(5, defEntriesByName.size());
+        System.out.println(defEntriesByName);
+
+        Bundle.DefEntry def1 = defEntriesByName.get("test-namespace");
         assertNotNull(def1);
-        assertNotNull(def2);
         assertEquals("namespace=config\nintVal int default=0", def1.contents);
+
+        Bundle.DefEntry def2 = defEntriesByName.get("namespace-in-filename");
+        assertNotNull(def2);
         assertEquals("namespace=a.b\n\ndoubleVal double default=0.0", def2.contents);
 
         // Check that getFilename works
@@ -280,7 +282,7 @@ public class ApplicationDeployTest {
         String appName = "src/test/cfg//application/app1";
         FilesApplicationPackage app = FilesApplicationPackage.fromFile(new File(appName), false);
         Map<ConfigDefinitionKey, UnparsedConfigDefinition> defs = app.getAllExistingConfigDefs();
-        assertThat(defs.size(), is(2));
+        assertThat(defs.size(), is(5));
     }
 
     @Test
diff --git a/config-model/src/test/java/com/yahoo/config/model/ConfigModelUtilsTest.java b/config-model/src/test/java/com/yahoo/config/model/ConfigModelUtilsTest.java
index 300e26d84a7..883e63a9c7e 100644
--- a/config-model/src/test/java/com/yahoo/config/model/ConfigModelUtilsTest.java
+++ b/config-model/src/test/java/com/yahoo/config/model/ConfigModelUtilsTest.java
@@ -24,23 +24,39 @@ public class ConfigModelUtilsTest {
     public void all_def_files_in_correct_directory_are_handled_and_files_outside_are_ignored() {
         List<Bundle> bundles = Bundle.getBundles(new File(VALID_TEST_BUNDLE));
         assertThat(bundles.size(), is(1));
-        assertThat(bundles.get(0).getDefEntries().size(), is(2));
+        assertThat(bundles.get(0).getDefEntries().size(), is(5));
     }
 
     @Test
     public void def_file_with_namespace_is_handled() {
-        Bundle.DefEntry defEntry = getDefEntry("test1");
-        assertThat(defEntry.defName, is("test1"));
+        Bundle.DefEntry defEntry = getDefEntry("test-namespace");
         assertThat(defEntry.defNamespace, is("config"));
     }
 
     @Test
     public void def_file_with_namespace_and_namespace_in_filename_is_handled() {
-        Bundle.DefEntry defEntry = getDefEntry("test2");
-        assertThat(defEntry.defName, is("test2"));
+        Bundle.DefEntry defEntry = getDefEntry("namespace-in-filename");
         assertThat(defEntry.defNamespace, is("a.b"));
     }
 
+    @Test
+    public void def_file_with_package_is_handled() {
+        Bundle.DefEntry defEntry = getDefEntry("test-package");
+        assertThat(defEntry.defNamespace, is("com.mydomain.mypackage"));
+    }
+
+    @Test
+    public void def_file_with_package_and_pacakage_in_filename_is_handled() {
+        Bundle.DefEntry defEntry = getDefEntry("package-in-filename");
+        assertThat(defEntry.defNamespace, is("com.mydomain.mypackage"));
+    }
+
+    @Test
+    public void def_file_with_both_package_and_namespace_gets_package_as_namespace() {
+        Bundle.DefEntry defEntry = getDefEntry("namespace-and-package");
+        assertThat(defEntry.defNamespace, is("com.mydomain.mypackage"));
+    }
+
     private static Bundle.DefEntry getDefEntry(String defName) {
         Bundle bundle = Bundle.getBundles(new File(VALID_TEST_BUNDLE)).get(0);
 
diff --git a/config-model/src/test/java/com/yahoo/config/model/deploy/DeployStateTest.java b/config-model/src/test/java/com/yahoo/config/model/deploy/DeployStateTest.java
index e64f45831ff..5896cdfa495 100644
--- a/config-model/src/test/java/com/yahoo/config/model/deploy/DeployStateTest.java
+++ b/config-model/src/test/java/com/yahoo/config/model/deploy/DeployStateTest.java
@@ -81,12 +81,12 @@ public class DeployStateTest {
         Map<ConfigDefinitionKey, com.yahoo.vespa.config.buildergen.ConfigDefinition> defs = new LinkedHashMap<>();
         defs.put(new ConfigDefinitionKey("foo", "bar"), new com.yahoo.vespa.config.buildergen.ConfigDefinition("foo", new String[]{"namespace=bar", "foo int default=0"}));
         defs.put(new ConfigDefinitionKey("test2", "a.b"),
-                 new com.yahoo.vespa.config.buildergen.ConfigDefinition("test2", new String[]{"namespace=a.b", "doubleVal double default=1.0"}));
+                 new com.yahoo.vespa.config.buildergen.ConfigDefinition("namespace-in-filename", new String[]{"namespace=a.b", "doubleVal double default=1.0"}));
         ApplicationPackage app = FilesApplicationPackage.fromFile(new File("src/test/cfg//application/app1"));
         DeployState state = createDeployState(app, defs);
 
         assertNotNull(state.getConfigDefinition(new ConfigDefinitionKey("foo", "bar")));
-        ConfigDefinition overridden = state.getConfigDefinition(new ConfigDefinitionKey("test2", "a.b")).get();
+        ConfigDefinition overridden = state.getConfigDefinition(new ConfigDefinitionKey("namespace-in-filename", "a.b")).get();
         assertNotNull(overridden);
         Double defaultValue = overridden.getDoubleDefs().get("doubleVal").getDefVal();
         assertNotNull(defaultValue);