Fixing auto-wiring issues for testing, adding incidents to test entit…

…y registry
datahub-project · Jan 24, 2024 · 8ad46cc · 8ad46cc
1 parent bdea3b9
commit 8ad46cc
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/metadata-jobs/mae-consumer/src/test/resources/test-entity-registry.yml b/metadata-jobs/mae-consumer/src/test/resources/test-entity-registry.yml
@@ -26,6 +26,11 @@ entities:
     keyAspect: chartKey
     aspects:
       - domains
+  - name: incident
+    keyAspect: incidentKey
+    aspects:
+      - incidentInfo
+      - status
   - name: schemaField
     category: core
     keyAspect: schemaFieldKey

diff --git a/...ice/factories/src/main/java/com/linkedin/gms/factory/incident/IncidentServiceFactory.java b/...ice/factories/src/main/java/com/linkedin/gms/factory/incident/IncidentServiceFactory.java
@@ -1,9 +1,8 @@
 package com.linkedin.gms.factory.incident;
 
 import com.datahub.authentication.Authentication;
-import com.linkedin.entity.client.EntityClient;
+import com.linkedin.entity.client.SystemEntityClient;
 import com.linkedin.gms.factory.auth.SystemAuthenticationFactory;
-import com.linkedin.gms.factory.entityclient.RestliEntityClientFactory;
 import com.linkedin.metadata.service.IncidentService;
 import com.linkedin.metadata.spring.YamlPropertySourceFactory;
 import javax.annotation.Nonnull;
@@ -17,11 +16,8 @@
 
 @Configuration
 @PropertySource(value = "classpath:/application.yml", factory = YamlPropertySourceFactory.class)
-@Import({SystemAuthenticationFactory.class, RestliEntityClientFactory.class})
+@Import({SystemAuthenticationFactory.class})
 public class IncidentServiceFactory {
-  @Autowired
-  @Qualifier("entityClient")
-  private EntityClient _entityClient;
 
   @Autowired
   @Qualifier("systemAuthentication")
@@ -30,7 +26,7 @@ public class IncidentServiceFactory {
   @Bean(name = "incidentService")
   @Scope("singleton")
   @Nonnull
-  protected IncidentService getInstance() throws Exception {
-    return new IncidentService(_entityClient, _authentication);
+  protected IncidentService getInstance(final SystemEntityClient entityClient) throws Exception {
+    return new IncidentService(entityClient, _authentication);
   }
 }