fixed compile error in DefaultCachesConfig;

removed caches-test.conf and test cases in DefaultCachesConfigTest;

Signed-off-by: Stefan Maute <stefan.maute@bosch.io>

concierge/service/src/main/java/org/eclipse/ditto/concierge/service/common/DefaultCachesConfig.java

@@ -20,7 +20,7 @@
 import org.eclipse.ditto.internal.utils.cache.config.DefaultCacheConfig;
 import org.eclipse.ditto.internal.utils.cacheloaders.config.AskWithRetryConfig;
 import org.eclipse.ditto.internal.utils.cacheloaders.config.DefaultAskWithRetryConfig;
-import org.eclipse.ditto.internal.utils.config.ConfigWithFallback;
+import org.eclipse.ditto.internal.utils.config.DefaultScopedConfig;
 import org.eclipse.ditto.internal.utils.config.ScopedConfig;
 
 import com.typesafe.config.Config;
@@ -52,7 +52,7 @@ private DefaultCachesConfig(final ScopedConfig config) {
      * @throws org.eclipse.ditto.internal.utils.config.DittoConfigError if {@code config} is invalid.
      */
     public static DefaultCachesConfig of(final Config config) {
-        return new DefaultCachesConfig(ConfigWithFallback.newInstance(config, CONFIG_PATH, CachesConfigValue.values()));
+        return new DefaultCachesConfig(DefaultScopedConfig.newInstance(config, CONFIG_PATH));
     }
 
     @Override

concierge/service/src/test/java/org/eclipse/ditto/concierge/service/common/DefaultCachesConfigTest.java

@@ -15,35 +15,15 @@
 import static org.mutabilitydetector.unittesting.MutabilityAssert.assertInstancesOf;
 import static org.mutabilitydetector.unittesting.MutabilityMatchers.areImmutable;
 
-import java.time.Duration;
-
-import org.assertj.core.api.JUnitSoftAssertions;
-import org.eclipse.ditto.internal.utils.cache.config.CacheConfig;
-import org.eclipse.ditto.internal.utils.cacheloaders.config.AskWithRetryConfig;
-import org.junit.BeforeClass;
-import org.junit.Rule;
 import org.junit.Test;
 
-import com.typesafe.config.Config;
-import com.typesafe.config.ConfigFactory;
-
 import nl.jqno.equalsverifier.EqualsVerifier;
 
 /**
  * Unit test for {@link DefaultCachesConfig}.
  */
 public final class DefaultCachesConfigTest {
 
-    private static Config cachesTestConf;
-
-    @Rule
-    public final JUnitSoftAssertions softly = new JUnitSoftAssertions();
-
-    @BeforeClass
-    public static void initTestFixture() {
-        cachesTestConf = ConfigFactory.load("caches-test");
-    }
-
     @Test
     public void assertImmutability() {
         assertInstancesOf(DefaultCachesConfig.class, areImmutable());
@@ -56,43 +36,4 @@ public void testHashCodeAndEquals() {
                 .verify();
     }
 
-    @Test
-    public void underTestReturnsDefaultValuesIfBaseConfigWasEmpty() {
-        final DefaultCachesConfig underTest = DefaultCachesConfig.of(ConfigFactory.empty());
-
-        softly.assertThat(underTest.getAskWithRetryConfig().getAskTimeout())
-                .as("getAskTimeout")
-                .isEqualTo(AskWithRetryConfig.AskWithRetryConfigValue.ASK_TIMEOUT.getDefaultValue());
-    }
-
-    @Test
-    public void underTestReturnsValuesOfConfigFile() {
-        final DefaultCachesConfig underTest = DefaultCachesConfig.of(cachesTestConf);
-
-        softly.assertThat(underTest.getAskWithRetryConfig().getAskTimeout())
-                .as(AskWithRetryConfig.AskWithRetryConfigValue.ASK_TIMEOUT.getConfigPath())
-                .isEqualTo(Duration.ofSeconds(34L));
-
-        softly.assertThat(underTest.getEnforcerCacheConfig())
-                .as("enforcerCacheConfig")
-                .satisfies(enforcerCacheConfig -> {
-                    softly.assertThat(enforcerCacheConfig.getMaximumSize())
-                            .as(CacheConfig.CacheConfigValue.MAXIMUM_SIZE.getConfigPath())
-                            .isEqualTo(20000);
-                    softly.assertThat(enforcerCacheConfig.getExpireAfterWrite())
-                            .as(CacheConfig.CacheConfigValue.EXPIRE_AFTER_WRITE.getConfigPath())
-                            .isEqualTo(Duration.ofMinutes(15L));
-                });
-
-        softly.assertThat(underTest.getIdCacheConfig())
-                .as("idCacheConfig")
-                .satisfies(idCacheConfig -> {
-                    softly.assertThat(idCacheConfig.getMaximumSize())
-                            .as(CacheConfig.CacheConfigValue.MAXIMUM_SIZE.getConfigPath())
-                            .isEqualTo(80000);
-                    softly.assertThat(idCacheConfig.getExpireAfterWrite())
-                            .as(CacheConfig.CacheConfigValue.EXPIRE_AFTER_WRITE.getConfigPath())
-                            .isEqualTo(Duration.ofMinutes(15L));
-                });
-    }
 }