chore: remove the checks for empty trusted issuers in config (#4093)

eclipse-edc · Apr 5, 2024 · f137640 · f137640
1 parent 316fa3a
commit f137640
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/...lipse/edc/iam/identitytrust/issuer/configuration/TrustedIssuerConfigurationExtension.java b/...lipse/edc/iam/identitytrust/issuer/configuration/TrustedIssuerConfigurationExtension.java
@@ -20,7 +20,7 @@
 import org.eclipse.edc.runtime.metamodel.annotation.Extension;
 import org.eclipse.edc.runtime.metamodel.annotation.Inject;
 import org.eclipse.edc.runtime.metamodel.annotation.Setting;
-import org.eclipse.edc.spi.EdcException;
+import org.eclipse.edc.spi.monitor.Monitor;
 import org.eclipse.edc.spi.system.ServiceExtension;
 import org.eclipse.edc.spi.system.ServiceExtensionContext;
 import org.eclipse.edc.spi.system.configuration.Config;
@@ -50,13 +50,15 @@ public class TrustedIssuerConfigurationExtension implements ServiceExtension {
     private TrustedIssuerRegistry trustedIssuerRegistry;
     @Inject
     private TypeManager typeManager;
+    @Inject
+    private Monitor monitor;
 
     @Override
     public void initialize(ServiceExtensionContext context) {
         var config = context.getConfig(CONFIG_PREFIX);
         var issuers = config.partition().map(this::configureIssuer).toList();
         if (issuers.isEmpty()) {
-            throw new EdcException("The list of trusted issuers is empty");
+            monitor.warning("The list of trusted issuers is empty");
         }
         issuers.forEach(issuer -> trustedIssuerRegistry.addIssuer(issuer));
     }

diff --git a/...e/edc/iam/identitytrust/issuer/configuration/TrustedIssuerConfigurationExtensionTest.java b/...e/edc/iam/identitytrust/issuer/configuration/TrustedIssuerConfigurationExtensionTest.java
@@ -17,7 +17,7 @@
 import org.eclipse.edc.iam.identitytrust.spi.TrustedIssuerRegistry;
 import org.eclipse.edc.iam.verifiablecredentials.spi.model.Issuer;
 import org.eclipse.edc.junit.extensions.DependencyInjectionExtension;
-import org.eclipse.edc.spi.EdcException;
+import org.eclipse.edc.spi.monitor.Monitor;
 import org.eclipse.edc.spi.system.ServiceExtensionContext;
 import org.eclipse.edc.spi.system.configuration.ConfigFactory;
 import org.eclipse.edc.spi.types.TypeManager;
@@ -29,11 +29,11 @@
 import java.util.Map;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.mockito.ArgumentMatchers.argThat;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
 
 @ExtendWith(DependencyInjectionExtension.class)
@@ -58,11 +58,16 @@ void initialize(ServiceExtensionContext context, TrustedIssuerConfigurationExten
     }
 
     @Test
-    void initialize_failure_WithNoIssuer(ServiceExtensionContext context, TrustedIssuerConfigurationExtension ext) {
+    void initialize_WithNoIssuer(ServiceExtensionContext context, TrustedIssuerConfigurationExtension ext, Monitor monitor) {
         var cfg = ConfigFactory.fromMap(Map.of());
         when(context.getConfig("edc.iam.trusted-issuer")).thenReturn(cfg);
 
-        assertThatThrownBy(() -> ext.initialize(context)).isInstanceOf(EdcException.class);
+        ext.initialize(context);
+
+        verifyNoMoreInteractions(trustedIssuerRegistry);
+
+        verify(monitor).warning("The list of trusted issuers is empty");
+
     }
 
     @Test