Remove starter.jar link, as the service now gets started via classpath

Signed-off-by: David Schwilk <david.schwilk@bosch.io>
eclipse-ditto · Jul 18, 2022 · 988377f · 988377f
1 parent 383602e
commit 988377f
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 25 deletions.
diff --git a/...org/eclipse/ditto/connectivity/service/messaging/persistence/UpdatedConnectionTester.java b/...org/eclipse/ditto/connectivity/service/messaging/persistence/UpdatedConnectionTester.java
@@ -18,11 +18,10 @@
 import java.util.concurrent.CompletionStage;
 
 import org.eclipse.ditto.base.model.headers.DittoHeaders;
-import org.eclipse.ditto.base.service.DittoExtensionIds;
-import org.eclipse.ditto.base.service.DittoExtensionPoint;
-import org.eclipse.ditto.base.service.RootActorStarter;
 import org.eclipse.ditto.connectivity.model.Connection;
 import org.eclipse.ditto.connectivity.model.signals.commands.modify.TestConnectionResponse;
+import org.eclipse.ditto.internal.utils.extension.DittoExtensionIds;
+import org.eclipse.ditto.internal.utils.extension.DittoExtensionPoint;
 
 import com.typesafe.config.Config;
 

diff --git a/dockerfile-release b/dockerfile-release
@@ -39,7 +39,6 @@ RUN set -x \
     && mkdir -p $DITTO_LOGS \
     && cd $DITTO_HOME \
     && wget -q --show-progress -O ${SERVICE_STARTER}-${SERVICE_VERSION}-allinone.jar "${MAVEN_REPO}?r=ditto&g=org.eclipse.ditto&a=${SERVICE_STARTER}&v=${SERVICE_VERSION}&c=allinone" \
-    && ln -s ${SERVICE_STARTER}-${SERVICE_VERSION}-allinone.jar starter.jar \
     && chown -R ditto:ditto $DITTO_HOME \
     && cd $DITTO_LOGS \
     && chown -R ditto:ditto $DITTO_LOGS \

diff --git a/dockerfile-snapshot b/dockerfile-snapshot
@@ -36,7 +36,6 @@ RUN set -x \
     && mkdir -p $DITTO_HOME \
     && mkdir -p $DITTO_LOGS \
     && cd $DITTO_HOME \
-    && ln -s ${SERVICE_STARTER}-${SERVICE_VERSION}-allinone.jar starter.jar \
     && chown -R ditto:ditto $DITTO_HOME \
     && cd $DITTO_LOGS \
     && chown -R ditto:ditto $DITTO_LOGS

diff --git a/dockerfile-snapshot-arm64 b/dockerfile-snapshot-arm64
@@ -36,7 +36,6 @@ RUN set -x \
     && mkdir -p $DITTO_HOME \
     && mkdir -p $DITTO_LOGS \
     && cd $DITTO_HOME \
-    && ln -s ${SERVICE_STARTER}-${SERVICE_VERSION}-allinone.jar starter.jar \
     && chown -R ditto:ditto $DITTO_HOME \
     && cd $DITTO_LOGS \
     && chown -R ditto:ditto $DITTO_LOGS

diff --git a/.../service/src/main/java/org/eclipse/ditto/edge/service/dispatching/SignalTransformers.java b/.../service/src/main/java/org/eclipse/ditto/edge/service/dispatching/SignalTransformers.java
@@ -19,9 +19,9 @@
 import java.util.concurrent.CompletionStage;
 
 import org.eclipse.ditto.base.model.signals.Signal;
-import org.eclipse.ditto.base.service.DittoExtensionIds;
-import org.eclipse.ditto.base.service.DittoExtensionPoint;
-import org.eclipse.ditto.base.service.DittoExtensionPoint.ExtensionId.ExtensionIdConfig;
+import org.eclipse.ditto.internal.utils.extension.DittoExtensionIds;
+import org.eclipse.ditto.internal.utils.extension.DittoExtensionPoint;
+import org.eclipse.ditto.internal.utils.extension.DittoExtensionPoint.ExtensionId.ExtensionIdConfig;
 
 import com.typesafe.config.Config;
 import com.typesafe.config.ConfigValue;

diff --git a/...rsistence/src/main/java/org/eclipse/ditto/internal/utils/persistence/SnapshotAdapter.java b/...rsistence/src/main/java/org/eclipse/ditto/internal/utils/persistence/SnapshotAdapter.java
@@ -81,23 +81,24 @@ static <T> SnapshotAdapter<T> get(final ActorSystem actorSystem, final Config co
                 .get(actorSystem);
     }
 
+    /**
+     * ID of the actor system extension to provide signal enrichment for connectivity.
+     */
     final class ExtensionId extends DittoExtensionPoint.ExtensionId<SnapshotAdapter> {
 
         private static final String CONFIG_KEY = "snapshot-adapter";
-        private static final String CONFIG_PATH = "ditto.extensions." + CONFIG_KEY;
 
-        private ExtensionId (final ExtensionIdConfig<SnapshotAdapter> extensionIdConfig) {
+        private ExtensionId(final ExtensionIdConfig<SnapshotAdapter> extensionIdConfig) {
             super(extensionIdConfig);
         }
 
         static ExtensionIdConfig<SnapshotAdapter> computeConfig(final Config config) {
-            return ExtensionIdConfig.of(SnapshotAdapter.class, config,
-                    CONFIG_KEY);
+            return ExtensionIdConfig.of(SnapshotAdapter.class, config, CONFIG_KEY);
         }
 
         @Override
-        protected String getConfigPath() {
-            return CONFIG_PATH;
+        protected String getConfigKey() {
+            return CONFIG_KEY;
         }
 
     }

diff --git a/policies/service/src/main/resources/policies.conf b/policies/service/src/main/resources/policies.conf
@@ -13,13 +13,12 @@ ditto {
           "org.eclipse.ditto.policies.enforcement.pre.CreationRestrictionPreEnforcer"
         ]
       }
+    },
+    snapshot-adapter = {
+      extension-class = "org.eclipse.ditto.policies.service.persistence.serializer.PolicyMongoSnapshotAdapter"
     }
   }
 
-  extensions.snapshot-adapter = {
-    extension-class = "org.eclipse.ditto.policies.service.persistence.serializer.PolicyMongoSnapshotAdapter"
-  }
-
   mongodb {
     database = "policies"
     database = ${?MONGO_DB_DATABASE}

diff --git a/things/service/src/main/resources/things.conf b/things/service/src/main/resources/things.conf
@@ -15,10 +15,9 @@ ditto {
         ]
       }
     }
-  }
-
-  extensions.snapshot-adapter = {
-    extension-class = "org.eclipse.ditto.things.service.persistence.serializer.ThingMongoSnapshotAdapter"
+    snapshot-adapter = {
+      extension-class = "org.eclipse.ditto.things.service.persistence.serializer.ThingMongoSnapshotAdapter"
+    }
   }
 
   mongodb {

diff --git a/...hingsearch/service/persistence/write/streaming/CachingSignalEnrichmentFacadeProvider.java b/...hingsearch/service/persistence/write/streaming/CachingSignalEnrichmentFacadeProvider.java
@@ -16,11 +16,11 @@
 
 import java.util.concurrent.Executor;
 
-import org.eclipse.ditto.base.service.DittoExtensionIds;
-import org.eclipse.ditto.base.service.DittoExtensionPoint;
 import org.eclipse.ditto.internal.models.signalenrichment.CachingSignalEnrichmentFacade;
 import org.eclipse.ditto.internal.models.signalenrichment.SignalEnrichmentFacade;
 import org.eclipse.ditto.internal.utils.cache.config.CacheConfig;
+import org.eclipse.ditto.internal.utils.extension.DittoExtensionIds;
+import org.eclipse.ditto.internal.utils.extension.DittoExtensionPoint;
 
 import com.typesafe.config.Config;