Skip to content

Commit

Permalink
Move knowledge about ditto.extensions root key into DittoExtensionPoint
Browse files Browse the repository at this point in the history 
Signed-off-by: Yannic Klem <yannic.klem@bosch.io>
  • Loading branch information
@Yannic92
Yannic92 committed Jul 13, 2022
1 parent a4b31fa commit 71c9d57
Show file tree
Hide file tree
Showing 29 changed files with 66 additions and 89 deletions.
8 changes: 6 additions & 2 deletions base/service/src/main/java/org/eclipse/ditto/base/service/DittoExtensionPoint.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@

import org.eclipse.ditto.internal.utils.akka.AkkaClassLoader;
import org.eclipse.ditto.internal.utils.config.DittoConfigError;
import org.eclipse.ditto.internal.utils.config.ScopedConfig;

import com.typesafe.config.Config;
import com.typesafe.config.ConfigFactory;
Expand Down Expand Up @@ -76,7 +77,6 @@ protected String getImplementation(final ExtendedActorSystem actorSystem) {
final String extensionClass;
if (extensionIdConfig.extensionClass() == null) {
// Resolve from default extension config
//TODO: Yannic make getConfigPath returning just the config key and define the constant "ditto.extensions." just one time in this class.
final ExtensionIdConfig<T> globalConfig = globalConfig(actorSystem);
extensionClass = globalConfig.extensionClass();
if (extensionClass == null) {
Expand All @@ -91,7 +91,11 @@ protected String getImplementation(final ExtendedActorSystem actorSystem) {
return extensionClass;
}

protected abstract String getConfigPath();
private String getConfigPath() {
return ScopedConfig.DITTO_EXTENSIONS_SCOPE + "." + getConfigKey();
}

protected abstract String getConfigKey();

public record ExtensionIdConfig<T extends Extension>(Class<T> parentClass,
@Nullable String extensionClass,
Expand Down
5 changes: 2 additions & 3 deletions base/service/src/main/java/org/eclipse/ditto/base/service/RootActorStarter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ static RootActorStarter get(final ActorSystem actorSystem, final Config config)
final class ExtensionId extends DittoExtensionPoint.ExtensionId<RootActorStarter> {

private static final String CONFIG_KEY = "root-actor-starter";
private static final String CONFIG_PATH = "ditto.extensions." + CONFIG_KEY;

private ExtensionId(final ExtensionIdConfig<RootActorStarter> extensionIdConfig) {
super(extensionIdConfig);
Expand All @@ -62,8 +61,8 @@ static ExtensionIdConfig<RootActorStarter> computeConfig(final Config config) {
}

@Override
protected String getConfigPath() {
return CONFIG_PATH;
protected String getConfigKey() {
return CONFIG_KEY;
}

}
Expand Down
5 changes: 2 additions & 3 deletions base/service/src/main/java/org/eclipse/ditto/base/service/RootChildActorStarter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@ static RootChildActorStarter get(final ActorSystem actorSystem, final Config con
final class ExtensionId extends DittoExtensionPoint.ExtensionId<RootChildActorStarter> {

private static final String CONFIG_KEY = "root-child-actor-starter";
private static final String CONFIG_PATH = "ditto.extensions." + CONFIG_KEY;

private ExtensionId(final ExtensionIdConfig<RootChildActorStarter> extensionIdConfig) {
super(extensionIdConfig);
Expand All @@ -65,8 +64,8 @@ static ExtensionIdConfig<RootChildActorStarter> computeConfig(final Config confi
}

@Override
protected String getConfigPath() {
return CONFIG_PATH;
protected String getConfigKey() {
return CONFIG_KEY;
}

}
Expand Down
5 changes: 2 additions & 3 deletions ...g/eclipse/ditto/connectivity/service/enforcement/ConnectionEnforcerActorPropsFactory.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ static ConnectionEnforcerActorPropsFactory get(final ActorSystem actorSystem, fi
final class ExtensionId extends DittoExtensionPoint.ExtensionId<ConnectionEnforcerActorPropsFactory> {

private static final String CONFIG_KEY = "connection-enforcer-actor-props-factory";
private static final String CONFIG_PATH = "ditto.extensions." + CONFIG_KEY;

private ExtensionId(final ExtensionIdConfig<ConnectionEnforcerActorPropsFactory> extensionIdConfig) {
super(extensionIdConfig);
Expand All @@ -57,8 +56,8 @@ static ExtensionIdConfig<ConnectionEnforcerActorPropsFactory> computeConfig(fina
}

@Override
protected String getConfigPath() {
return CONFIG_PATH;
protected String getConfigKey() {
return CONFIG_KEY;
}

}
Expand Down
5 changes: 2 additions & 3 deletions .../org/eclipse/ditto/connectivity/service/mapping/ConnectivitySignalEnrichmentProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ static ConnectivitySignalEnrichmentProvider get(final ActorSystem actorSystem, f
final class ExtensionId extends DittoExtensionPoint.ExtensionId<ConnectivitySignalEnrichmentProvider> {

private static final String CONFIG_KEY = "signal-enrichment-provider";
private static final String CONFIG_PATH = "ditto.extensions." + CONFIG_KEY;

private ExtensionId(final ExtensionIdConfig<ConnectivitySignalEnrichmentProvider> extensionIdConfig) {
super(extensionIdConfig);
Expand All @@ -74,8 +73,8 @@ static ExtensionIdConfig<ConnectivitySignalEnrichmentProvider> computeConfig(fin
}

@Override
protected String getConfigPath() {
return CONFIG_PATH;
protected String getConfigKey() {
return CONFIG_KEY;
}

}
Expand Down
5 changes: 2 additions & 3 deletions ...c/main/java/org/eclipse/ditto/connectivity/service/messaging/ClientActorPropsFactory.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@ static ClientActorPropsFactory get(final ActorSystem actorSystem, final Config c
final class ExtensionId extends DittoExtensionPoint.ExtensionId<ClientActorPropsFactory> {

private static final String CONFIG_KEY = "client-actor-props-factory";
private static final String CONFIG_PATH = "ditto.extensions." + CONFIG_KEY;

private ExtensionId(final ExtensionIdConfig<ClientActorPropsFactory> extensionIdConfig) {
super(extensionIdConfig);
Expand All @@ -79,8 +78,8 @@ static ExtensionIdConfig<ClientActorPropsFactory> computeConfig(final Config con
}

@Override
protected String getConfigPath() {
return CONFIG_PATH;
protected String getConfigKey() {
return CONFIG_KEY;
}

}
Expand Down
5 changes: 2 additions & 3 deletions ...e/ditto/connectivity/service/messaging/persistence/ConnectionPriorityProviderFactory.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@ static ConnectionPriorityProviderFactory get(final ActorSystem actorSystem, fina
final class ExtensionId extends DittoExtensionPoint.ExtensionId<ConnectionPriorityProviderFactory> {

private static final String CONFIG_KEY = "connection-priority-provider-factory";
private static final String CONFIG_PATH = "ditto.extensions." + CONFIG_KEY;

private ExtensionId(final ExtensionIdConfig<ConnectionPriorityProviderFactory> extensionIdConfig) {
super(extensionIdConfig);
Expand All @@ -70,8 +69,8 @@ static ExtensionIdConfig<ConnectionPriorityProviderFactory> computeConfig(final
}

@Override
protected String getConfigPath() {
return CONFIG_PATH;
protected String getConfigKey() {
return CONFIG_KEY;
}

}
Expand Down
5 changes: 2 additions & 3 deletions ...nnectivity/service/messaging/validation/CustomConnectivityCommandInterceptorProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ static CustomConnectivityCommandInterceptorProvider get(final ActorSystem actorS
final class ExtensionId extends DittoExtensionPoint.ExtensionId<CustomConnectivityCommandInterceptorProvider> {

private static final String CONFIG_KEY = "custom-connectivity-command-interceptor-provider";
private static final String CONFIG_PATH = "ditto.extensions." + CONFIG_KEY;

private ExtensionId(final ExtensionIdConfig<CustomConnectivityCommandInterceptorProvider> extensionIdConfig) {
super(extensionIdConfig);
Expand All @@ -58,8 +57,8 @@ static ExtensionIdConfig<CustomConnectivityCommandInterceptorProvider> computeCo
}

@Override
protected String getConfigPath() {
return CONFIG_PATH;
protected String getConfigKey() {
return CONFIG_KEY;
}

}
Expand Down
5 changes: 2 additions & 3 deletions ...c/main/java/org/eclipse/ditto/edge/service/dispatching/EdgeCommandForwarderExtension.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@ static EdgeCommandForwarderExtension get(final ActorSystem actorSystem, final Co
final class ExtensionId extends DittoExtensionPoint.ExtensionId<EdgeCommandForwarderExtension> {

private static final String CONFIG_KEY = "edge-command-forwarder-extension";
private static final String CONFIG_PATH = "ditto.extensions." + CONFIG_KEY;

private ExtensionId(final ExtensionIdConfig<EdgeCommandForwarderExtension> extensionIdConfig) {
super(extensionIdConfig);
Expand All @@ -70,8 +69,8 @@ static ExtensionIdConfig<EdgeCommandForwarderExtension> computeConfig(final Conf
}

@Override
protected String getConfigPath() {
return CONFIG_PATH;
protected String getConfigKey() {
return CONFIG_KEY;
}

}
Expand Down
5 changes: 2 additions & 3 deletions edge/service/src/main/java/org/eclipse/ditto/edge/service/dispatching/SignalTransformer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ static SignalTransformer get(final ActorSystem actorSystem, final Config config)
final class ExtensionId extends DittoExtensionPoint.ExtensionId<SignalTransformer> {

private static final String CONFIG_KEY = "signal-transformer";
private static final String CONFIG_PATH = "ditto.extensions." + CONFIG_KEY;

private ExtensionId(final ExtensionIdConfig<SignalTransformer> extensionIdConfig) {
super(extensionIdConfig);
Expand All @@ -64,8 +63,8 @@ static ExtensionIdConfig<SignalTransformer> computeConfig(final Config config) {
}

@Override
protected String getConfigPath() {
return CONFIG_PATH;
protected String getConfigKey() {
return CONFIG_KEY;
}

}
Expand Down
5 changes: 2 additions & 3 deletions ...java/org/eclipse/ditto/gateway/service/endpoints/actors/HttpRequestActorPropsFactory.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@ static HttpRequestActorPropsFactory get(final ActorSystem actorSystem, final Con
final class ExtensionId extends DittoExtensionPoint.ExtensionId<HttpRequestActorPropsFactory> {

private static final String CONFIG_KEY = "http-request-actor-props-factory";
private static final String CONFIG_PATH = "ditto.extensions." + CONFIG_KEY;

private ExtensionId(final ExtensionIdConfig<HttpRequestActorPropsFactory> extensionIdConfig) {
super(extensionIdConfig);
Expand All @@ -79,8 +78,8 @@ static ExtensionIdConfig<HttpRequestActorPropsFactory> computeConfig(final Confi
}

@Override
protected String getConfigPath() {
return CONFIG_PATH;
protected String getConfigKey() {
return CONFIG_KEY;
}

}
Expand Down
5 changes: 2 additions & 3 deletions ...itto/gateway/service/endpoints/directives/auth/GatewayAuthenticationDirectiveFactory.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@ static GatewayAuthenticationDirectiveFactory get(final ActorSystem actorSystem,
final class ExtensionId extends DittoExtensionPoint.ExtensionId<GatewayAuthenticationDirectiveFactory> {

private static final String CONFIG_KEY = "gateway-authentication-directive-factory";
private static final String CONFIG_PATH = "ditto.extensions." + CONFIG_KEY;

private ExtensionId(final ExtensionIdConfig<GatewayAuthenticationDirectiveFactory> extensionIdConfig) {
super(extensionIdConfig);
Expand All @@ -75,8 +74,8 @@ static ExtensionIdConfig<GatewayAuthenticationDirectiveFactory> computeConfig(fi
}

@Override
protected String getConfigPath() {
return CONFIG_PATH;
protected String getConfigKey() {
return CONFIG_KEY;
}

}
Expand Down
5 changes: 2 additions & 3 deletions ...main/java/org/eclipse/ditto/gateway/service/endpoints/routes/CustomApiRoutesProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,6 @@ static CustomApiRoutesProvider get(final ActorSystem actorSystem, final Config c
final class ExtensionId extends DittoExtensionPoint.ExtensionId<CustomApiRoutesProvider> {

private static final String CONFIG_KEY = "custom-api-routes-provider";
private static final String CONFIG_PATH = "ditto.extensions." + CONFIG_KEY;

private ExtensionId(final ExtensionIdConfig<CustomApiRoutesProvider> extensionIdConfig) {
super(extensionIdConfig);
Expand All @@ -82,8 +81,8 @@ static ExtensionIdConfig<CustomApiRoutesProvider> computeConfig(final Config con
}

@Override
protected String getConfigPath() {
return CONFIG_PATH;
protected String getConfigKey() {
return CONFIG_KEY;
}

}
Expand Down
5 changes: 2 additions & 3 deletions ...rc/main/java/org/eclipse/ditto/gateway/service/endpoints/routes/HttpBindFlowProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@ static HttpBindFlowProvider get(final ActorSystem actorSystem, final Config conf
final class ExtensionId extends DittoExtensionPoint.ExtensionId<HttpBindFlowProvider> {

private static final String CONFIG_KEY = "http-bind-flow-provider";
private static final String CONFIG_PATH = "ditto.extensions." + CONFIG_KEY;

private ExtensionId(final ExtensionIdConfig<HttpBindFlowProvider> extensionIdConfig) {
super(extensionIdConfig);
Expand All @@ -72,8 +71,8 @@ static ExtensionIdConfig<HttpBindFlowProvider> computeConfig(final Config config
}

@Override
protected String getConfigPath() {
return CONFIG_PATH;
protected String getConfigKey() {
return CONFIG_KEY;
}

}
Expand Down
5 changes: 2 additions & 3 deletions .../java/org/eclipse/ditto/gateway/service/endpoints/routes/sse/SseConnectionSupervisor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ static SseConnectionSupervisor get(final ActorSystem actorSystem, final Config c
final class ExtensionId extends DittoExtensionPoint.ExtensionId<SseConnectionSupervisor> {

private static final String CONFIG_KEY = "sse-connection-supervisor";
private static final String CONFIG_PATH = "ditto.extensions." + CONFIG_KEY;

private ExtensionId(final ExtensionIdConfig<SseConnectionSupervisor> extensionIdConfig) {
super(extensionIdConfig);
Expand All @@ -60,8 +59,8 @@ static ExtensionIdConfig<SseConnectionSupervisor> computeConfig(final Config con
}

@Override
protected String getConfigPath() {
return CONFIG_PATH;
protected String getConfigKey() {
return CONFIG_KEY;
}

}
Expand Down
5 changes: 2 additions & 3 deletions ...src/main/java/org/eclipse/ditto/gateway/service/endpoints/routes/sse/SseEventSniffer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ static SseEventSniffer get(final ActorSystem actorSystem, final Config config) {
final class ExtensionId extends DittoExtensionPoint.ExtensionId<SseEventSniffer> {

private static final String CONFIG_KEY = "sse-event-sniffer";
private static final String CONFIG_PATH = "ditto.extensions." + CONFIG_KEY;

private ExtensionId(final ExtensionIdConfig<SseEventSniffer> extensionIdConfig) {
super(extensionIdConfig);
Expand All @@ -71,8 +70,8 @@ static ExtensionIdConfig<SseEventSniffer> computeConfig(final Config config) {
}

@Override
protected String getConfigPath() {
return CONFIG_PATH;
protected String getConfigKey() {
return CONFIG_KEY;
}

}
Expand Down
5 changes: 2 additions & 3 deletions ...lipse/ditto/gateway/service/endpoints/routes/websocket/IncomingWebSocketEventSniffer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@ static IncomingWebSocketEventSniffer get(final ActorSystem actorSystem, final Co
final class ExtensionId extends DittoExtensionPoint.ExtensionId<IncomingWebSocketEventSniffer> {

private static final String CONFIG_KEY = "incoming-websocket-event-sniffer";
private static final String CONFIG_PATH = "ditto.extensions." + CONFIG_KEY;

private ExtensionId(final ExtensionIdConfig<IncomingWebSocketEventSniffer> extensionIdConfig) {
super(extensionIdConfig);
Expand All @@ -70,8 +69,8 @@ static ExtensionIdConfig<IncomingWebSocketEventSniffer> computeConfig(final Conf
}

@Override
protected String getConfigPath() {
return CONFIG_PATH;
protected String getConfigKey() {
return CONFIG_KEY;
}

}
Expand Down
5 changes: 2 additions & 3 deletions ...lipse/ditto/gateway/service/endpoints/routes/websocket/OutgoingWebSocketEventSniffer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@ static OutgoingWebSocketEventSniffer get(final ActorSystem actorSystem, final Co
final class ExtensionId extends DittoExtensionPoint.ExtensionId<OutgoingWebSocketEventSniffer> {

private static final String CONFIG_KEY = "outgoing-websocket-event-sniffer";
private static final String CONFIG_PATH = "ditto.extensions." + CONFIG_KEY;

private ExtensionId(final ExtensionIdConfig<OutgoingWebSocketEventSniffer> extensionIdConfig) {
super(extensionIdConfig);
Expand All @@ -70,8 +69,8 @@ static ExtensionIdConfig<OutgoingWebSocketEventSniffer> computeConfig(final Conf
}

@Override
protected String getConfigPath() {
return CONFIG_PATH;
protected String getConfigKey() {
return CONFIG_KEY;
}

}
Expand Down
5 changes: 2 additions & 3 deletions ...org/eclipse/ditto/gateway/service/endpoints/routes/websocket/WebSocketConfigProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ static WebSocketConfigProvider get(final ActorSystem actorSystem, final Config c
final class ExtensionId extends DittoExtensionPoint.ExtensionId<WebSocketConfigProvider> {

private static final String CONFIG_KEY = "websocket-config-provider";
private static final String CONFIG_PATH = "ditto.extensions." + CONFIG_KEY;

private ExtensionId(final ExtensionIdConfig<WebSocketConfigProvider> extensionIdConfig) {
super(extensionIdConfig);
Expand All @@ -64,8 +63,8 @@ static ExtensionIdConfig<WebSocketConfigProvider> computeConfig(final Config con
}

@Override
protected String getConfigPath() {
return CONFIG_PATH;
protected String getConfigKey() {
return CONFIG_KEY;
}

}
Expand Down
5 changes: 2 additions & 3 deletions ...ava/org/eclipse/ditto/gateway/service/endpoints/routes/websocket/WebSocketSupervisor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ static WebSocketSupervisor get(final ActorSystem actorSystem, final Config confi
final class ExtensionId extends DittoExtensionPoint.ExtensionId<WebSocketSupervisor> {

private static final String CONFIG_KEY = "websocket-connection-supervisor";
private static final String CONFIG_PATH = "ditto.extensions." + CONFIG_KEY;

private ExtensionId(final ExtensionIdConfig<WebSocketSupervisor> extensionIdConfig) {
super(extensionIdConfig);
Expand All @@ -59,8 +58,8 @@ static ExtensionIdConfig<WebSocketSupervisor> computeConfig(final Config config)
}

@Override
protected String getConfigPath() {
return CONFIG_PATH;
protected String getConfigKey() {
return CONFIG_KEY;
}

}
Expand Down
Loading

0 comments on commit 71c9d57

Please sign in to comment.