Skip to content

Commit

Permalink
undid that *Config classes were Java Serializable
Browse files Browse the repository at this point in the history
* removed them from Akka "Props" for actors whose props must be serializable (e.g. sharded actors)
* replaced Props "Creator" (and lambda) approach (which is not per default serializable) with "props with varargs" approach
* moved common "health-check", "cluster", "http", "metrics" configs to toplevel "ditto" - extracted those as separate files included in ditto-service-base.conf
* removed "testSerializationAndDeserialization" tests

Signed-off-by: Thomas Jaeckle <thomas.jaeckle@bosch-si.com>
  • Loading branch information
thjaeckle committed Jun 3, 2019
1 parent 607381b commit fbda2ba
Show file tree
Hide file tree
Showing 273 changed files with 1,847 additions and 2,729 deletions.
4 changes: 2 additions & 2 deletions bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@
<minimal-json.version>0.9.5</minimal-json.version>
<typesafe-config.version>1.3.3</typesafe-config.version>
<ssl-config-core.version>0.3.7</ssl-config-core.version>
<akka.version>2.5.22</akka.version>
<akka-http.version>10.1.7</akka-http.version>
<akka.version>2.5.23</akka.version>
<akka-http.version>10.1.8</akka-http.version>
<akka-persistence-mongo.version>2.2.4</akka-persistence-mongo.version>
<akka-management.version>1.0.0</akka-management.version>
<simple-akka-downing.version>0.9.2</simple-akka-downing.version>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ public abstract class DittoService<C extends ServiceSpecificConfig> {
/**
* The config path expression which points to the supposed nested config with the Ditto settings.
*/
public static final String DITTO_CONFIG_PATH = "ditto";
public static final String DITTO_CONFIG_PATH = ScopedConfig.DITTO_SCOPE;

private final Logger logger;
private final String serviceName;
Expand Down Expand Up @@ -163,7 +163,7 @@ private static ScopedConfig tryToGetDittoConfigOrEmpty(final Config rawConfig) {

private static ScopedConfig getDittoConfigOrEmpty(final Config rawConfig) {
if (rawConfig.hasPath(DITTO_CONFIG_PATH)) {
return DefaultScopedConfig.newInstance(rawConfig, DITTO_CONFIG_PATH);
return DefaultScopedConfig.dittoScoped(rawConfig);
}
return DefaultScopedConfig.empty(DITTO_CONFIG_PATH);
}
Expand Down
Loading

0 comments on commit fbda2ba

Please sign in to comment.