Change DUMMY_ID for namespaced entity IDs to ":_"

Signed-off-by: Klem Yannic (INST/ECS1) <yannic.klem@bosch-si.com>
eclipse-ditto · Aug 23, 2019 · cdd8bb1 · cdd8bb1
1 parent 3c00d11
commit cdd8bb1
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 7 deletions.
diff --git a/.../base/src/main/java/org/eclipse/ditto/model/base/entity/id/DefaultNamespacedEntityId.java b/.../base/src/main/java/org/eclipse/ditto/model/base/entity/id/DefaultNamespacedEntityId.java
@@ -31,7 +31,7 @@
  @Immutable
  public final class DefaultNamespacedEntityId implements NamespacedEntityId {
 
-     private static final NamespacedEntityId DUMMY_ID = DefaultNamespacedEntityId.of("unknown:unknown");
+     private static final NamespacedEntityId DUMMY_ID = DefaultNamespacedEntityId.of(":_");
      private static final String DEFAULT_NAMESPACE = "";
 
      private final String namespace;

diff --git a/...e/src/test/java/org/eclipse/ditto/model/base/entity/id/DefaultNamespacedEntityIdTest.java b/...e/src/test/java/org/eclipse/ditto/model/base/entity/id/DefaultNamespacedEntityIdTest.java
@@ -131,8 +131,8 @@ public void placeholderIsPlaceholder() {
 
     @Test
     public void manuallyCreatedPlaceholderIsPlaceholder() {
-        assertThat(DefaultNamespacedEntityId.of("unknown:unknown").isDummy()).isTrue();
-        assertThat(DefaultNamespacedEntityId.of("unknown", "unknown").isDummy()).isTrue();
+        assertThat(DefaultNamespacedEntityId.of(":_").isDummy()).isTrue();
+        assertThat(DefaultNamespacedEntityId.of("", "_").isDummy()).isTrue();
     }
 
     @Test

diff --git a/model/policies/src/main/java/org/eclipse/ditto/model/policies/PolicyId.java b/model/policies/src/main/java/org/eclipse/ditto/model/policies/PolicyId.java
@@ -54,6 +54,10 @@ public static PolicyId of(final CharSequence policyId) {
         return wrapInPolicyIdInvalidException(() -> new PolicyId(DefaultNamespacedEntityId.of(policyId)));
     }
 
+    public static PolicyId of(PolicyId policyId) {
+        return policyId;
+    }
+
     /**
      * Creates a new {@link PolicyId} with the given namespace and name.
      *

diff --git a/model/policies/src/test/java/org/eclipse/ditto/model/policies/PolicyIdTest.java b/model/policies/src/test/java/org/eclipse/ditto/model/policies/PolicyIdTest.java
@@ -63,8 +63,8 @@ public void dummyIsDummy() {
 
     @Test
     public void manuallyCreatedDummyIsDummy() {
-        assertThat(PolicyId.of("unknown", "unknown").isDummy()).isTrue();
-        assertThat(PolicyId.of("unknown:unknown").isDummy()).isTrue();
+        assertThat(PolicyId.of("", "_").isDummy()).isTrue();
+        assertThat(PolicyId.of(":_").isDummy()).isTrue();
     }
 
     @Test

diff --git a/model/things/src/test/java/org/eclipse/ditto/model/things/ThingIdTest.java b/model/things/src/test/java/org/eclipse/ditto/model/things/ThingIdTest.java
@@ -63,8 +63,8 @@ public void dummyIsDummy() {
 
     @Test
     public void manuallyCreatedDummyIsDummy() {
-        assertThat(ThingId.of("unknown", "unknown").isDummy()).isTrue();
-        assertThat(ThingId.of("unknown:unknown").isDummy()).isTrue();
+        assertThat(ThingId.of("", "_").isDummy()).isTrue();
+        assertThat(ThingId.of(":_").isDummy()).isTrue();
     }
 
     @Test