fix test

Author: hu-ahmed

things/service/src/main/java/org/eclipse/ditto/things/service/persistence/actors/ThingPersistenceActor.java

@@ -93,8 +93,7 @@ public final class ThingPersistenceActor
     private final ThingConfig thingConfig;
     private final DistributedPub<ThingEvent<?>> distributedPub;
     @Nullable private final ActorRef searchShardRegionProxy;
-    private final ThingEventEnricher eventPreDefinedExtraFieldsEnricher;
-    private final ThingEventEnricher messagePreDefinedExtraFieldsEnricher;
+    private final ThingEventEnricher eventEnricher;
 
     @SuppressWarnings("unused")
     private ThingPersistenceActor(final ThingId thingId,
@@ -108,11 +107,8 @@ private ThingPersistenceActor(final ThingId thingId,
         this.thingConfig = thingConfig;
         this.distributedPub = distributedPub;
         this.searchShardRegionProxy = searchShardRegionProxy;
-        this.eventPreDefinedExtraFieldsEnricher = new ThingEventEnricher(
-                thingConfig.getEventConfig().getPredefinedExtraFieldsConfigs(),
-                policyEnforcerProvider
-        );
-        this.messagePreDefinedExtraFieldsEnricher = new ThingEventEnricher(
+
+        this.eventEnricher = new ThingEventEnricher(
                 thingConfig.getMessageConfig().getPredefinedExtraFieldsConfigs(),
                 policyEnforcerProvider
         );
@@ -279,7 +275,7 @@ protected void recoveryCompleted(final RecoveryCompleted event) {
 
     @Override
     protected void publishEvent(@Nullable final Thing previousEntity, final ThingEvent<?> event) {
-        final CompletionStage<ThingEvent<?>> stage = eventPreDefinedExtraFieldsEnricher.enrichWithPredefinedExtraFields(
+        final CompletionStage<ThingEvent<?>> stage = eventEnricher.enrichWithPredefinedExtraFields(
                 entityId,
                 entity,
                 Optional.ofNullable(entity).flatMap(Thing::getPolicyId)
@@ -338,14 +334,14 @@ private void enrichSignalWithPreDefinedExtraFields(
         final CompletionStage<Signal<?>> stage;
         switch (signal) {
             case MessageCommand<?, ?> messageCommand ->
-                stage = messagePreDefinedExtraFieldsEnricher.enrichWithPredefinedExtraFields(
+                stage = eventEnricher.enrichWithPredefinedExtraFields(
                         entityId,
                         entity,
                         Optional.ofNullable(entity).flatMap(Thing::getPolicyId).orElse(null),
                         messageCommand
                 );
             case ThingEvent<?> thingEvent ->
-                stage = eventPreDefinedExtraFieldsEnricher.enrichWithPredefinedExtraFields(
+                stage = eventEnricher.enrichWithPredefinedExtraFields(
                         entityId,
                         entity,
                         Optional.ofNullable(entity).flatMap(Thing::getPolicyId).orElse(null),

things/service/src/main/java/org/eclipse/ditto/things/service/persistence/actors/enrichment/ThingEventEnricher.java

@@ -131,6 +131,11 @@ public <T extends DittoHeadersSettable<? extends T>> CompletionStage<T> enrichWi
                         combinedPointerSet.addAll(b.getPointers());
                         return JsonFactory.newFieldSelector(combinedPointerSet);
                     });
+            
+            if (combinedPredefinedExtraFields.isEmpty()) {
+                return partialAccessPathsStage;
+            }
+            
             return partialAccessPathsStage.thenCompose(enrichedWithPartialAccessPaths ->
                     buildPredefinedExtraFieldsHeaderReadGrantObject(policyId, combinedPredefinedExtraFields, thing)
                             .thenApply(indexedGrants -> {

things/service/src/test/java/org/eclipse/ditto/things/service/persistence/actors/enrichment/ThingEventEnricherTest.java

@@ -121,18 +121,7 @@ public void ensureDefinitionIsEnrichedAsPreDefinedFromConfiguration() {
         final var sut = providePreDefinedFieldsEnricher();
 
         // WHEN: enriched headers are getting calculated
-        final CompletionStage<DittoHeaders> resultHeadersStage = calculateEnrichedSignalHeaders(sut,
-                """
-                {
-                  namespaces = [
-                    "*"
-                  ]
-                  extra-fields = [
-                    "definition"
-                  ]
-                }
-                """
-        );
+        final CompletionStage<DittoHeaders> resultHeadersStage = calculateEnrichedSignalHeaders(sut);
 
         // THEN: the expected pre-defined fields are present in the headers
         assertExpectations(resultHeadersStage,
@@ -152,38 +141,7 @@ public void ensureDefinitionAndAdditionalNamespaceSpecificIsEnrichedAsPreDefined
         final var sut = providePreDefinedFieldsEnricher();
 
         // WHEN: enriched headers are getting calculated
-        final CompletionStage<DittoHeaders> resultHeadersStage = calculateEnrichedSignalHeaders(sut,
-                """
-                {
-                  namespaces = [
-                    "*"
-                  ]
-                  extra-fields = [
-                    "definition"
-                  ]
-                }
-                """,
-                """
-                {
-                  namespaces = [
-                    "org.eclipse.ditto.some"
-                  ]
-                  extra-fields = [
-                    "attributes/public1"
-                  ]
-                }
-                """,
-                """
-                {
-                  namespaces = [
-                    "org.eclipse.ditto*"
-                  ]
-                  extra-fields = [
-                    "attributes/private"
-                  ]
-                }
-                """
-        );
+        final CompletionStage<DittoHeaders> resultHeadersStage = calculateEnrichedSignalHeaders(sut);
 
         // THEN: the expected pre-defined fields are present in the headers
         assertExpectations(resultHeadersStage,
@@ -278,41 +236,7 @@ public void ensureConditionBasedEnrichmentAsPreDefinedFromConfiguration() {
         final var sut = providePreDefinedFieldsEnricher();
 
         // WHEN: enriched headers are getting calculated
-        final CompletionStage<DittoHeaders> resultHeadersStage = calculateEnrichedSignalHeaders(sut,
-                """
-                {
-                  namespaces = [
-                    "*"
-                  ]
-                  condition = "eq(attributes/public1,true)"
-                  extra-fields = [
-                    "attributes/public1"
-                  ]
-                }
-                """,
-                """
-                {
-                  namespaces = [
-                    "org.eclipse.ditto.some"
-                  ]
-                  condition = "eq(attributes/folder/private,false)"
-                  extra-fields = [
-                    "attributes/folder"
-                  ]
-                }
-                """,
-                """
-                {
-                  namespaces = [
-                    "org.eclipse.ditto*"
-                  ]
-                  condition = "eq(attributes/private,'bumlux')"
-                  extra-fields = [
-                    "attributes/private"
-                  ]
-                }
-                """
-        );
+        final CompletionStage<DittoHeaders> resultHeadersStage = calculateEnrichedSignalHeaders(sut);
 
         // THEN: the expected pre-defined fields are present in the headers
         assertExpectations(resultHeadersStage,
@@ -362,7 +286,7 @@ private static CompletionStage<DittoHeaders> calculateEnrichedSignalHeaders(
                 Instant.now(), DittoHeaders.empty(), null);
 
         final CompletionStage<AttributeModified> resultStage =
-                sut.enrichWithPredefinedExtraFields(getPreDefinedExtraFieldsConfigs(configurations),
+                sut.enrichWithPredefinedExtraFields(
                         KNOWN_THING_ID, KNOWN_THING, KNOWN_POLICY_ID, event);
         return resultStage.thenApply(AttributeModified::getDittoHeaders);
     }