relaxed some checks for reading config values;

Signed-off-by: Stefan Maute <stefan.maute@bosch.io>
eclipse-ditto · Jul 5, 2021 · fc7f7a5 · fc7f7a5
1 parent 15431ea
commit fc7f7a5
Show file tree

Hide file tree

Showing 7 changed files with 48 additions and 46 deletions.
diff --git a/base/service/src/main/java/org/eclipse/ditto/base/service/config/http/DefaultHttpConfig.java b/base/service/src/main/java/org/eclipse/ditto/base/service/config/http/DefaultHttpConfig.java
@@ -37,7 +37,7 @@ public final class DefaultHttpConfig implements HttpConfig, WithConfigPath {
 
     private DefaultHttpConfig(final ConfigWithFallback config) {
         hostname = config.getString(HttpConfigValue.HOSTNAME.getConfigPath());
-        port = config.getPositiveIntOrThrow(HttpConfigValue.PORT);
+        port = config.getNonNegativeIntOrThrow(HttpConfigValue.PORT);
         coordinatedShutdownTimeout =
                 config.getNonNegativeAndNonZeroDurationOrThrow(HttpConfigValue.COORDINATED_SHUTDOWN_TIMEOUT);
     }

diff --git a/...ils/config/src/main/java/org/eclipse/ditto/internal/utils/config/DefaultScopedConfig.java b/...ils/config/src/main/java/org/eclipse/ditto/internal/utils/config/DefaultScopedConfig.java
diff --git a/...s/src/main/java/org/eclipse/ditto/internal/utils/metrics/config/DefaultMetricsConfig.java b/...s/src/main/java/org/eclipse/ditto/internal/utils/metrics/config/DefaultMetricsConfig.java
@@ -38,7 +38,7 @@ private DefaultMetricsConfig(final ConfigWithFallback metricsScopedConfig) {
         systemMetricEnabled = metricsScopedConfig.getBoolean(MetricsConfigValue.SYSTEM_METRICS_ENABLED.getConfigPath());
         prometheusEnabled = metricsScopedConfig.getBoolean(MetricsConfigValue.PROMETHEUS_ENABLED.getConfigPath());
         prometheusHostname = metricsScopedConfig.getString(MetricsConfigValue.PROMETHEUS_HOSTNAME.getConfigPath());
-        prometheusPort = metricsScopedConfig.getPositiveIntOrThrow(MetricsConfigValue.PROMETHEUS_PORT);
+        prometheusPort = metricsScopedConfig.getNonNegativeIntOrThrow(MetricsConfigValue.PROMETHEUS_PORT);
     }
 
     /**

diff --git a/...org/eclipse/ditto/internal/utils/persistence/mongo/config/DefaultActivityCheckConfig.java b/...org/eclipse/ditto/internal/utils/persistence/mongo/config/DefaultActivityCheckConfig.java
@@ -35,9 +35,9 @@ public final class DefaultActivityCheckConfig implements ActivityCheckConfig {
 
     private DefaultActivityCheckConfig(final ScopedConfig scopedConfig) {
         inactiveInterval =
-                scopedConfig.getNonNegativeAndNonZeroDurationOrThrow(ActivityCheckConfigValue.INACTIVE_INTERVAL);
+                scopedConfig.getNonNegativeDurationOrThrow(ActivityCheckConfigValue.INACTIVE_INTERVAL);
         deletedInterval =
-                scopedConfig.getNonNegativeAndNonZeroDurationOrThrow(ActivityCheckConfigValue.DELETED_INTERVAL);
+                scopedConfig.getNonNegativeDurationOrThrow(ActivityCheckConfigValue.DELETED_INTERVAL);
     }
 
     /**

diff --git a/...java/org/eclipse/ditto/internal/utils/persistence/mongo/config/DefaultSnapshotConfig.java b/...java/org/eclipse/ditto/internal/utils/persistence/mongo/config/DefaultSnapshotConfig.java
@@ -35,7 +35,7 @@ public final class DefaultSnapshotConfig implements SnapshotConfig {
 
     private DefaultSnapshotConfig(final ScopedConfig config) {
         interval = config.getNonNegativeAndNonZeroDurationOrThrow(SnapshotConfigValue.INTERVAL);
-        threshold = config.getNonNegativeIntOrThrow((SnapshotConfigValue.THRESHOLD));
+        threshold = config.getNonNegativeLongOrThrow((SnapshotConfigValue.THRESHOLD));
     }
 
     /**

diff --git a/...e/src/main/java/org/eclipse/ditto/policies/service/common/config/DefaultPolicyConfig.java b/...e/src/main/java/org/eclipse/ditto/policies/service/common/config/DefaultPolicyConfig.java
@@ -48,9 +48,9 @@ private DefaultPolicyConfig(final ScopedConfig scopedConfig) {
         activityCheckConfig = DefaultActivityCheckConfig.of(scopedConfig);
         snapshotConfig = DefaultSnapshotConfig.of(scopedConfig);
         policySubjectExpiryGranularity =
-                scopedConfig.getNonNegativeAndNonZeroDurationOrThrow(PolicyConfigValue.SUBJECT_EXPIRY_GRANULARITY);
+                scopedConfig.getNonNegativeDurationOrThrow(PolicyConfigValue.SUBJECT_EXPIRY_GRANULARITY);
         policySubjectDeletionAnnouncementGranularity =
-                scopedConfig.getNonNegativeAndNonZeroDurationOrThrow(
+                scopedConfig.getNonNegativeDurationOrThrow(
                         PolicyConfigValue.SUBJECT_DELETION_ANNOUNCEMENT_GRANULARITY);
         subjectIdResolver = scopedConfig.getString(PolicyConfigValue.SUBJECT_ID_RESOLVER.getConfigPath());
     }
@@ -63,8 +63,9 @@ private DefaultPolicyConfig(final ScopedConfig scopedConfig) {
      * @throws org.eclipse.ditto.internal.utils.config.DittoConfigError if {@code config} is invalid.
      */
     public static DefaultPolicyConfig of(final Config config) {
-        final ConfigWithFallback mappingScopedConfig =
+        final var mappingScopedConfig =
                 ConfigWithFallback.newInstance(config, CONFIG_PATH, PolicyConfigValue.values());
+
         return new DefaultPolicyConfig(mappingScopedConfig);
     }
 

diff --git a/...rvice/src/test/java/org/eclipse/ditto/policies/service/starter/PoliciesRootActorTest.java b/...rvice/src/test/java/org/eclipse/ditto/policies/service/starter/PoliciesRootActorTest.java
@@ -13,10 +13,10 @@
 package org.eclipse.ditto.policies.service.starter;
 
 import org.eclipse.ditto.base.service.actors.AbstractDittoRootActorTest;
+import org.eclipse.ditto.internal.utils.config.DefaultScopedConfig;
 import org.eclipse.ditto.policies.service.common.config.DittoPoliciesConfig;
 import org.eclipse.ditto.policies.service.common.config.PoliciesConfig;
 import org.eclipse.ditto.policies.service.persistence.serializer.PolicyMongoSnapshotAdapter;
-import org.eclipse.ditto.internal.utils.config.DefaultScopedConfig;
 
 import akka.actor.ActorSystem;
 import akka.actor.Props;
@@ -35,6 +35,7 @@ protected String serviceName() {
     protected Props getRootActorProps(final ActorSystem system) {
         final PoliciesConfig config =
                 DittoPoliciesConfig.of(DefaultScopedConfig.dittoScoped(system.settings().config()));
+
         return PoliciesRootActor.props(config, new PolicyMongoSnapshotAdapter(), system.deadLetters());
     }
 }