Make review changes

Signed-off-by: David Schwilk <david.schwilk@bosch.io>
eclipse-ditto · Oct 25, 2021 · 1eb7ba1 · 1eb7ba1
1 parent f03b34d
commit 1eb7ba1
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 26 deletions.
diff --git a/...rvice/src/main/java/org/eclipse/ditto/connectivity/service/config/ConnectivityConfig.java b/...rvice/src/main/java/org/eclipse/ditto/connectivity/service/config/ConnectivityConfig.java
@@ -17,7 +17,6 @@
 import org.eclipse.ditto.base.service.config.ServiceSpecificConfig;
 import org.eclipse.ditto.connectivity.service.config.mapping.MappingConfig;
 import org.eclipse.ditto.internal.models.acks.config.AcknowledgementConfig;
-import org.eclipse.ditto.internal.models.signalenrichment.SignalEnrichmentConfig;
 import org.eclipse.ditto.internal.utils.config.DefaultScopedConfig;
 import org.eclipse.ditto.internal.utils.health.config.WithHealthCheckConfig;
 import org.eclipse.ditto.internal.utils.persistence.mongo.config.WithMongoDbConfig;
@@ -76,13 +75,6 @@ public interface ConnectivityConfig extends ServiceSpecificConfig, WithHealthChe
      */
     MappingConfig getMappingConfig();
 
-    /**
-     * Returns the configuration for signal enrichment.
-     *
-     * @return the config.
-     */
-    SignalEnrichmentConfig getSignalEnrichmentConfig();
-
     /**
      * Returns the configuration for acknowledgement handling.
      *

diff --git a/.../src/main/java/org/eclipse/ditto/connectivity/service/config/DittoConnectivityConfig.java b/.../src/main/java/org/eclipse/ditto/connectivity/service/config/DittoConnectivityConfig.java
@@ -24,8 +24,6 @@
 import org.eclipse.ditto.connectivity.service.config.mapping.MappingConfig;
 import org.eclipse.ditto.internal.models.acks.config.AcknowledgementConfig;
 import org.eclipse.ditto.internal.models.acks.config.DefaultAcknowledgementConfig;
-import org.eclipse.ditto.internal.models.signalenrichment.DefaultSignalEnrichmentConfig;
-import org.eclipse.ditto.internal.models.signalenrichment.SignalEnrichmentConfig;
 import org.eclipse.ditto.internal.utils.cluster.config.ClusterConfig;
 import org.eclipse.ditto.internal.utils.config.ScopedConfig;
 import org.eclipse.ditto.internal.utils.health.config.DefaultHealthCheckConfig;
@@ -60,7 +58,6 @@ public final class DittoConnectivityConfig implements ConnectivityConfig {
     private final ProtocolConfig protocolConfig;
     private final MonitoringConfig monitoringConfig;
     private final MappingConfig mappingConfig;
-    private final SignalEnrichmentConfig signalEnrichmentConfig;
     private final AcknowledgementConfig acknowledgementConfig;
     private final TunnelConfig tunnelConfig;
 
@@ -76,7 +73,6 @@ private DittoConnectivityConfig(final ScopedConfig dittoScopedConfig) {
         clientConfig = DefaultClientConfig.of(serviceSpecificConfig);
         monitoringConfig = DefaultMonitoringConfig.of(serviceSpecificConfig);
         mappingConfig = DefaultMappingConfig.of(serviceSpecificConfig);
-        signalEnrichmentConfig = DefaultSignalEnrichmentConfig.of(serviceSpecificConfig);
         acknowledgementConfig = DefaultAcknowledgementConfig.of(serviceSpecificConfig);
         tunnelConfig = DefaultTunnelConfig.of(serviceSpecificConfig);
     }
@@ -168,11 +164,6 @@ public MappingConfig getMappingConfig() {
         return mappingConfig;
     }
 
-    @Override
-    public SignalEnrichmentConfig getSignalEnrichmentConfig() {
-        return signalEnrichmentConfig;
-    }
-
     @Override
     public AcknowledgementConfig getAcknowledgementConfig() {
         return acknowledgementConfig;
@@ -204,7 +195,6 @@ public boolean equals(@Nullable final Object o) {
                 Objects.equals(protocolConfig, that.protocolConfig) &&
                 Objects.equals(monitoringConfig, that.monitoringConfig) &&
                 Objects.equals(mappingConfig, that.mappingConfig) &&
-                Objects.equals(signalEnrichmentConfig, that.signalEnrichmentConfig) &&
                 Objects.equals(acknowledgementConfig, that.acknowledgementConfig) &&
                 Objects.equals(tunnelConfig, that.tunnelConfig);
     }
@@ -213,7 +203,7 @@ public boolean equals(@Nullable final Object o) {
     public int hashCode() {
         return Objects.hash(serviceSpecificConfig, persistenceOperationsConfig, mongoDbConfig, healthCheckConfig,
                 connectionConfig, pingConfig, connectionIdsRetrievalConfig, clientConfig, protocolConfig,
-                monitoringConfig, mappingConfig, signalEnrichmentConfig, acknowledgementConfig, tunnelConfig);
+                monitoringConfig, mappingConfig, acknowledgementConfig, tunnelConfig);
     }
 
     @Override
@@ -230,7 +220,6 @@ public String toString() {
                 ", protocolConfig=" + protocolConfig +
                 ", monitoringConfig=" + monitoringConfig +
                 ", mappingConfig=" + mappingConfig +
-                ", signalEnrichmentConfig" + signalEnrichmentConfig +
                 ", acknowledgementConfig" + acknowledgementConfig +
                 ", tunnelConfig" + tunnelConfig +
                 "]";

diff --git a/...lipse/ditto/connectivity/service/mapping/ConnectivityCachingSignalEnrichmentProvider.java b/...lipse/ditto/connectivity/service/mapping/ConnectivityCachingSignalEnrichmentProvider.java
@@ -40,6 +40,7 @@ public final class ConnectivityCachingSignalEnrichmentProvider extends Connectiv
     @SuppressWarnings("unused")
     public ConnectivityCachingSignalEnrichmentProvider(final ActorSystem actorSystem,
             final SignalEnrichmentConfig signalEnrichmentConfig) {
+
         final ConnectivityByRoundTripSignalEnrichmentProvider cacheLoaderProvider =
                 new ConnectivityByRoundTripSignalEnrichmentProvider(actorSystem, signalEnrichmentConfig);
         final CachingSignalEnrichmentFacadeConfig cachingSignalEnrichmentFacadeConfig =

diff --git a/connectivity/service/src/main/resources/connectivity.conf b/connectivity/service/src/main/resources/connectivity.conf
@@ -9,6 +9,11 @@ ditto {
   persistence.operations.delay-after-persistence-actor-shutdown = 5s
   persistence.operations.delay-after-persistence-actor-shutdown = ${?DELAY_AFTER_PERSISTENCE_ACTOR_SHUTDOWN}
 
+  signal-enrichment {
+    # Which caching signal enrichment facade is used by the signal-enrichment.provider
+    caching-signal-enrichment-facade.provider = ${?CONNECTIVITY_CACHING_SIGNAL_ENRICHMENT_PROVIDER}
+  }
+
   connectivity {
 
     user-indicated-errors-base = [

diff --git a/gateway/service/src/main/resources/gateway.conf b/gateway/service/src/main/resources/gateway.conf
@@ -2,6 +2,11 @@ ditto {
   service-name = "gateway"
   mapping-strategy.implementation = "org.eclipse.ditto.gateway.service.util.GatewayMappingStrategies"
 
+  signal-enrichment {
+    # The caching signal enrichment provider to be used
+    caching-signal-enrichment-facade.provider = ${?GATEWAY_CACHING_SIGNAL_ENRICHMENT_PROVIDER}
+  }
+
   gateway {
     http {
       # InetAddress.getLocalHost.getHostAddress is used if empty
@@ -81,8 +86,6 @@ ditto {
           expire-after-create = 2m
           expire-after-create = ${?GATEWAY_SIGNAL_ENRICHMENT_CACHE_EXPIRE_AFTER_CREATE}
         }
-        # The caching signal enrichment provider to be used
-        caching-signal-enrichment-facade.provider =  ${?GATEWAY_CACHING_SIGNAL_ENRICHMENT_PROVIDER}
       }
 
       acknowledgement {

diff --git a/thingsearch/service/src/main/resources/things-search.conf b/thingsearch/service/src/main/resources/things-search.conf
@@ -44,6 +44,11 @@ ditto {
 
   }
 
+
+  signal-enrichment {
+    caching-signal-enrichment-facade.provider =  ${?THINGS_SEARCH_CACHING_SIGNAL_ENRICHMENT_PROVIDER}
+  }
+
   things-search {
     query-criteria-validator.implementation = ${?QUERY_CRITERIA_VALIDATOR_IMPLEMENTATION}
     search-update-mapper.implementation = ${?SEARCH_UPDATE_MAPPER_IMPLEMENTATION}
@@ -55,10 +60,6 @@ ditto {
       enabled = ${?INDEX_INITIALIZATION_ENABLED}
     }
 
-    signal-enrichment {
-      caching-signal-enrichment-facade.provider =  ${?THINGS_SEARCH_CACHING_SIGNAL_ENRICHMENT_PROVIDER}
-    }
-
     updater {
       max-idle-time = 15m
       max-idle-time = ${?ACTIVITY_CHECK_INTERVAL}