[frontend/backend] feat : clean code

Signed-off-by: Marine LM <[email protected]>

Author: MarineLeM

openaev-api/src/main/java/io/openaev/service/catalog_connectors/CatalogConnectorIngestionService.java

@@ -192,6 +192,9 @@ public Set<CatalogConnectorConfiguration> buildConnectorConfigurations(
 
     for (Iterator<String> it = properties.fieldNames(); it.hasNext(); ) {
       String key = it.next();
+      if ("OPENAEV_URL".equals(key)) {
+        continue;
+      }
       JsonNode prop = properties.get(key);
 
       CatalogConnectorConfiguration conf =

openaev-api/src/main/java/io/openaev/service/connector_instances/ConnectorInstanceService.java

@@ -114,6 +114,7 @@ private ConnectorInstance buildNewConnectorInstanceFromCatalog(
     newInstance.setCatalogConnector(catalogConnector);
     newInstance.setRequestedStatus(ConnectorInstance.REQUESTED_STATUS_TYPE.stopping);
     newInstance.setCurrentStatus(ConnectorInstance.CURRENT_STATUS_TYPE.stopped);
+    newInstance.setSource(ConnectorInstance.SOURCE.CATALOG_DEPLOYMENT);
     return newInstance;
   }
 

openaev-api/src/test/java/io/openaev/service/CatalogConnectorIngestionServiceTest.java

@@ -7,9 +7,9 @@
 import io.openaev.database.model.CatalogConnector;
 import io.openaev.database.model.CatalogConnectorConfiguration;
 import io.openaev.database.repository.ConnectorInstanceConfigurationRepository;
-import io.openaev.rest.connector_instance.service.ConnectorInstanceService;
 import io.openaev.service.catalog_connectors.CatalogConnectorIngestionService;
 import io.openaev.service.catalog_connectors.CatalogConnectorService;
+import io.openaev.service.connector_instances.ConnectorInstanceService;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;

openaev-api/src/test/java/io/openaev/service/ScenarioServiceTest.java

@@ -18,7 +18,6 @@
 import io.openaev.healthcheck.dto.HealthCheck;
 import io.openaev.healthcheck.enums.ExternalServiceDependency;
 import io.openaev.healthcheck.utils.HealthCheckUtils;
-import io.openaev.rest.collector.service.CollectorService;
 import io.openaev.rest.inject.service.InjectDuplicateService;
 import io.openaev.rest.inject.service.InjectService;
 import io.openaev.telemetry.metric_collectors.ActionMetricCollector;
@@ -56,7 +55,6 @@ class ScenarioServiceTest extends IntegrationTest {
   @Autowired private HealthCheckUtils healthCheckUtils;
 
   @Mock Ee eeService;
-  @Mock GrantService grantService;
   @Mock VariableService variableService;
   @Mock ChallengeService challengeService;
   @Autowired private TeamService teamService;
@@ -65,7 +63,6 @@ class ScenarioServiceTest extends IntegrationTest {
   @Mock private InjectService injectService;
   @Mock private TagRuleService tagRuleService;
   @Mock private UserService userService;
-  @Mock private CollectorService collectorService;
   @InjectMocks private ScenarioService scenarioService;
   @Autowired private ScenarioMapper scenarioMapper;
 

openaev-front/src/admin/components/integrations/common/ConnectorContext.ts

@@ -62,6 +62,7 @@ export const injectorConfig: ConnectorContextType<InjectorOutput> = {
   }),
 };
 
+type ConnectorUnion = ExecutorOutput | InjectorOutput | CollectorOutput;
 export const collectorConfig: ConnectorContextType<CollectorOutput> = {
   connectorType: 'collector',
   apiRequest: {
@@ -106,10 +107,7 @@ export const executorConfig: ConnectorContextType<ExecutorOutput> = {
   }),
 };
 
-export const ConnectorContext = createContext<
-  ConnectorContextType<ExecutorOutput>
-  | ConnectorContextType<CollectorOutput>
-  | ConnectorContextType<InjectorOutput>>({
+export const ConnectorContext = createContext<ConnectorContextType<ConnectorUnion>>({
   connectorType: 'collector',
   logoUrl: _type => '',
   apiRequest: {
@@ -121,5 +119,5 @@ export const ConnectorContext = createContext<
     list: '/admin/integrations',
     detail: (_id: string) => '/admin/integrations',
   },
-  normalizeSingle: (_data: ExecutorOutput | InjectorOutput | CollectorOutput) => ({} as ConnectorOutput),
+  normalizeSingle: (_data: ConnectorUnion) => ({} as ConnectorOutput),
 });

openaev-model/src/main/java/io/openaev/database/model/ConnectorInstance.java

@@ -62,7 +62,7 @@ public enum SOURCE {
   @JdbcTypeCode(SqlTypes.NAMED_ENUM)
   @Column(name = "connector_instance_source")
   @JsonProperty("connector_instance_source")
-  @NotBlank
+  @NotNull
   private SOURCE source = SOURCE.OTHER;
 
   @Enumerated(EnumType.STRING)