From bdea3b99e4a9fe6c51fe8b697b03f3bd6dc82c05 Mon Sep 17 00:00:00 2001
From: John Joyce <john@Johns-MBP.attlocal.net>
Date: Wed, 24 Jan 2024 12:14:26 -0800
Subject: [PATCH] Rebase on the latest, fix spotless issues

---
 .../com/linkedin/datahub/graphql/GmsGraphQLEngine.java    | 4 ++--
 .../java/com/linkedin/metadata/search/utils/ESUtils.java  | 6 ++----
 .../metadata/kafka/hook/spring/MCLSpringTest.java         | 4 ++--
 .../gms/factory/incident/IncidentServiceFactory.java      | 4 ++--
 .../linkedin/metadata/authorization/PoliciesConfig.java   | 8 ++++----
 5 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/GmsGraphQLEngine.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/GmsGraphQLEngine.java
index c07a0570325757..1763b3f0346364 100644
--- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/GmsGraphQLEngine.java
+++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/GmsGraphQLEngine.java
@@ -1205,8 +1205,8 @@ private void configureMutationResolvers(final RuntimeWiring.Builder builder) {
                     "verifyForm", new VerifyFormResolver(this.formService, this.groupService))
                 .dataFetcher("raiseIncident", new RaiseIncidentResolver(this.entityClient))
                 .dataFetcher(
-                        "updateIncidentStatus",
-                        new UpdateIncidentStatusResolver(this.entityClient, this.entityService)));
+                    "updateIncidentStatus",
+                    new UpdateIncidentStatusResolver(this.entityClient, this.entityService)));
   }
 
   private void configureGenericEntityResolvers(final RuntimeWiring.Builder builder) {
diff --git a/metadata-io/src/main/java/com/linkedin/metadata/search/utils/ESUtils.java b/metadata-io/src/main/java/com/linkedin/metadata/search/utils/ESUtils.java
index 21bdccfba444e8..1a0acae0627f80 100644
--- a/metadata-io/src/main/java/com/linkedin/metadata/search/utils/ESUtils.java
+++ b/metadata-io/src/main/java/com/linkedin/metadata/search/utils/ESUtils.java
@@ -101,10 +101,8 @@ public class ESUtils {
       };
 
   // TODO - This has been expanded for has* in another branch
-  public static final Set<String> BOOLEAN_FIELDS = ImmutableSet.of(
-    "removed",
-    "hasActiveIncidents",
-    "hasResolvedIncidents");
+  public static final Set<String> BOOLEAN_FIELDS =
+      ImmutableSet.of("removed", "hasActiveIncidents", "hasResolvedIncidents");
 
   /*
    * Refer to https://www.elastic.co/guide/en/elasticsearch/reference/current/regexp-syntax.html for list of reserved
diff --git a/metadata-jobs/mae-consumer/src/test/java/com/linkedin/metadata/kafka/hook/spring/MCLSpringTest.java b/metadata-jobs/mae-consumer/src/test/java/com/linkedin/metadata/kafka/hook/spring/MCLSpringTest.java
index 130dc024ad5286..44536cd4fc8373 100644
--- a/metadata-jobs/mae-consumer/src/test/java/com/linkedin/metadata/kafka/hook/spring/MCLSpringTest.java
+++ b/metadata-jobs/mae-consumer/src/test/java/com/linkedin/metadata/kafka/hook/spring/MCLSpringTest.java
@@ -48,7 +48,7 @@ public void testHooks() {
     assertEquals(
         1,
         metadataChangeLogProcessor.getHooks().stream()
-                .filter(hook -> hook instanceof IncidentsSummaryHook)
-                .count());
+            .filter(hook -> hook instanceof IncidentsSummaryHook)
+            .count());
   }
 }
diff --git a/metadata-service/factories/src/main/java/com/linkedin/gms/factory/incident/IncidentServiceFactory.java b/metadata-service/factories/src/main/java/com/linkedin/gms/factory/incident/IncidentServiceFactory.java
index 6fc9d6e1d7ad67..7d8c4810d356b0 100644
--- a/metadata-service/factories/src/main/java/com/linkedin/gms/factory/incident/IncidentServiceFactory.java
+++ b/metadata-service/factories/src/main/java/com/linkedin/gms/factory/incident/IncidentServiceFactory.java
@@ -3,7 +3,7 @@
 import com.datahub.authentication.Authentication;
 import com.linkedin.entity.client.EntityClient;
 import com.linkedin.gms.factory.auth.SystemAuthenticationFactory;
-import com.linkedin.gms.factory.entity.RestliEntityClientFactory;
+import com.linkedin.gms.factory.entityclient.RestliEntityClientFactory;
 import com.linkedin.metadata.service.IncidentService;
 import com.linkedin.metadata.spring.YamlPropertySourceFactory;
 import javax.annotation.Nonnull;
@@ -20,7 +20,7 @@
 @Import({SystemAuthenticationFactory.class, RestliEntityClientFactory.class})
 public class IncidentServiceFactory {
   @Autowired
-  @Qualifier("restliEntityClient")
+  @Qualifier("entityClient")
   private EntityClient _entityClient;
 
   @Autowired
diff --git a/metadata-utils/src/main/java/com/linkedin/metadata/authorization/PoliciesConfig.java b/metadata-utils/src/main/java/com/linkedin/metadata/authorization/PoliciesConfig.java
index 7eb5f920958cfb..02c2d9cb6e11e4 100644
--- a/metadata-utils/src/main/java/com/linkedin/metadata/authorization/PoliciesConfig.java
+++ b/metadata-utils/src/main/java/com/linkedin/metadata/authorization/PoliciesConfig.java
@@ -202,10 +202,10 @@ public class PoliciesConfig {
           "The ability to report or edit operations information about an entity.");
 
   public static final Privilege EDIT_ENTITY_INCIDENTS_PRIVILEGE =
-          Privilege.of(
-                  "EDIT_ENTITY_INCIDENTS",
-                  "Edit Incidents",
-                  "The ability to create and remove incidents for an entity.");
+      Privilege.of(
+          "EDIT_ENTITY_INCIDENTS",
+          "Edit Incidents",
+          "The ability to create and remove incidents for an entity.");
 
   public static final Privilege EDIT_ENTITY_PRIVILEGE =
       Privilege.of(