Define PreEnforcerProvider in reference.conf in order to reduce confi…

…g for services Signed-off-by: Yannic Klem <yannic.klem@bosch.io>
eclipse-ditto · Jul 19, 2022 · 3baf4e8 · 3baf4e8
1 parent 14ca298
commit 3baf4e8
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 34 deletions.
diff --git a/connectivity/service/src/main/resources/connectivity.conf b/connectivity/service/src/main/resources/connectivity.conf
@@ -40,14 +40,9 @@ ditto {
     # Provider for a custom connectivity-command interceptor.
     custom-connectivity-command-interceptor-provider = "org.eclipse.ditto.connectivity.service.messaging.validation.NoOpConnectivityCommandInterceptorProvider"
 
-    pre-enforcer-provider {
-      extension-class = org.eclipse.ditto.policies.enforcement.pre.PreEnforcerProvider
-      extension-config = {
-        pre-enforcers = [
-          "org.eclipse.ditto.policies.enforcement.pre.CommandWithOptionalEntityPreEnforcer"
-        ]
-      }
-    }
+    pre-enforcer-provider.extension-config.pre-enforcers = [
+      "org.eclipse.ditto.policies.enforcement.pre.CommandWithOptionalEntityPreEnforcer"
+    ]
   }
 
   persistence.operations.delay-after-persistence-actor-shutdown = 5s

diff --git a/policies/enforcement/src/main/resources/reference.conf b/policies/enforcement/src/main/resources/reference.conf
@@ -11,6 +11,15 @@ enforcement-dispatcher {
   executor = "thread-pool-executor"
 }
 
+ditto.extensions {
+  pre-enforcer-provider {
+    extension-class = org.eclipse.ditto.policies.enforcement.pre.PreEnforcerProvider
+    extension-config {
+      pre-enforcers = []
+    }
+  }
+}
+
 ditto.policies-enforcer-cache {
   enabled = false
   enabled = ${?POLICIES_ENFORCER_CACHING_ENABLED}

diff --git a/policies/service/src/main/resources/policies.conf b/policies/service/src/main/resources/policies.conf
@@ -2,16 +2,11 @@ ditto {
   service-name = "policies"
   mapping-strategy.implementation = "org.eclipse.ditto.policies.api.PoliciesMappingStrategies"
   extensions {
-    pre-enforcer-provider {
-      extension-class = org.eclipse.ditto.policies.enforcement.pre.PreEnforcerProvider
-      extension-config = {
-        pre-enforcers = [
-          "org.eclipse.ditto.policies.enforcement.pre.BlockedNamespacePreEnforcer",
-          "org.eclipse.ditto.policies.enforcement.pre.CommandWithOptionalEntityPreEnforcer",
-          "org.eclipse.ditto.policies.enforcement.pre.CreationRestrictionPreEnforcer"
-        ]
-      }
-    },
+    pre-enforcer-provider.extension-config.pre-enforcers = [
+      "org.eclipse.ditto.policies.enforcement.pre.BlockedNamespacePreEnforcer",
+      "org.eclipse.ditto.policies.enforcement.pre.CommandWithOptionalEntityPreEnforcer",
+      "org.eclipse.ditto.policies.enforcement.pre.CreationRestrictionPreEnforcer"
+    ]
     signal-transformers-provider.extension-config.signal-transformers = [
       "org.eclipse.ditto.policies.service.enforcement.pre.ModifyToCreatePolicyTransformer" // always keep this as first transformer in order to guarantee that all following transformers know that the command is creating a policy instead of modifying it
     ]

diff --git a/things/service/src/main/resources/things.conf b/things/service/src/main/resources/things.conf
@@ -3,16 +3,11 @@ ditto {
   mapping-strategy.implementation = "org.eclipse.ditto.things.api.ThingsMappingStrategies"
 
   extensions {
-    pre-enforcer-provider {
-      extension-class = org.eclipse.ditto.policies.enforcement.pre.PreEnforcerProvider
-      extension-config = {
-        pre-enforcers = [
-          "org.eclipse.ditto.policies.enforcement.pre.BlockedNamespacePreEnforcer",
-          "org.eclipse.ditto.policies.enforcement.pre.CommandWithOptionalEntityPreEnforcer",
-          "org.eclipse.ditto.policies.enforcement.pre.CreationRestrictionPreEnforcer"
-        ]
-      }
-    }
+    pre-enforcer-provider.extension-config.pre-enforcers = [
+      "org.eclipse.ditto.policies.enforcement.pre.BlockedNamespacePreEnforcer",
+      "org.eclipse.ditto.policies.enforcement.pre.CommandWithOptionalEntityPreEnforcer",
+      "org.eclipse.ditto.policies.enforcement.pre.CreationRestrictionPreEnforcer"
+    ]
     signal-transformers-provider.extension-config.signal-transformers = [
       "org.eclipse.ditto.things.service.enforcement.pre.ModifyToCreateThingTransformer" // always keep this as first transformer in order to guarantee that all following transformers know that the command is creating a policy instead of modifying it
     ]

diff --git a/thingsearch/service/src/main/resources/search.conf b/thingsearch/service/src/main/resources/search.conf
@@ -9,12 +9,6 @@ ditto {
     search-update-observer = org.eclipse.ditto.thingsearch.service.updater.actors.DefaultSearchUpdateObserver
     query-criteria-validator = org.eclipse.ditto.thingsearch.service.persistence.query.validation.DefaultQueryCriteriaValidator
     caching-signal-enrichment-facade-provider = org.eclipse.ditto.thingsearch.service.persistence.write.streaming.DittoCachingSignalEnrichmentFacadeProvider
-    pre-enforcer-provider {
-      extension-class = org.eclipse.ditto.policies.enforcement.pre.PreEnforcerProvider
-      extension-config = {
-        pre-enforcers = []
-      }
-    }
     search-update-mapper = org.eclipse.ditto.thingsearch.service.persistence.write.streaming.DefaultSearchUpdateMapper
   }