remove identityFactoryProvider

goldmansachs · May 29, 2024 · a398b38 · a398b38
1 parent 8c0a5b6
commit a398b38
Show file tree

Hide file tree

Showing 80 changed files with 329 additions and 446 deletions.
diff --git a/...n-query/src/main/java/org/finos/legend/engine/application/query/api/ApplicationQuery.java b/...n-query/src/main/java/org/finos/legend/engine/application/query/api/ApplicationQuery.java
@@ -25,7 +25,6 @@
 import org.finos.legend.engine.application.query.model.QueryEvent;
 import org.finos.legend.engine.application.query.model.QuerySearchSpecification;
 import org.finos.legend.engine.shared.core.identity.Identity;
-import org.finos.legend.engine.shared.core.identity.factory.IdentityFactoryProvider;
 import org.finos.legend.engine.shared.core.kerberos.ProfileManagerHelper;
 import org.finos.legend.engine.shared.core.operational.errorManagement.ExceptionTool;
 import org.finos.legend.engine.shared.core.operational.logs.LoggingEventType;
@@ -150,7 +149,7 @@ public Response getQueryCount()
     public Response createQuery(Query query, @ApiParam(hidden = true) @Pac4JProfileManager ProfileManager<CommonProfile> profileManager)
     {
         MutableList<CommonProfile> profiles = ProfileManagerHelper.extractProfiles(profileManager);
-        Identity identity = IdentityFactoryProvider.getInstance().makeIdentity(profiles);
+        Identity identity = Identity.makeIdentity(profiles);
         try (Scope scope = GlobalTracer.get().buildSpan("Query: Create Query").startActive(true))
         {
             return Response.ok().entity(this.queryStoreManager.createQuery(query, getCurrentUser(profileManager))).build();
@@ -172,7 +171,7 @@ public Response createQuery(Query query, @ApiParam(hidden = true) @Pac4JProfileM
     public Response updateQuery(@PathParam("queryId") String queryId, Query query, @ApiParam(hidden = true) @Pac4JProfileManager ProfileManager<CommonProfile> profileManager)
     {
         MutableList<CommonProfile> profiles = ProfileManagerHelper.extractProfiles(profileManager);
-        Identity identity = IdentityFactoryProvider.getInstance().makeIdentity(profiles);
+        Identity identity = Identity.makeIdentity(profiles);
         try (Scope scope = GlobalTracer.get().buildSpan("Query: Update Query").startActive(true))
         {
             return Response.ok().entity(this.queryStoreManager.updateQuery(queryId, query, getCurrentUser(profileManager))).build();
@@ -194,7 +193,7 @@ public Response updateQuery(@PathParam("queryId") String queryId, Query query, @
     public Response patchQuery(@PathParam("queryId") String queryId, Query query, @ApiParam(hidden = true) @Pac4JProfileManager ProfileManager<CommonProfile> profileManager)
     {
         MutableList<CommonProfile> profiles = ProfileManagerHelper.extractProfiles(profileManager);
-        Identity identity = IdentityFactoryProvider.getInstance().makeIdentity(profiles);
+        Identity identity = Identity.makeIdentity(profiles);
         try (Scope scope = GlobalTracer.get().buildSpan("Patch Query - update selected query fields").startActive(true))
         {
             return Response.ok().entity(this.queryStoreManager.patchQuery(queryId, query, getCurrentUser(profileManager))).build();
@@ -216,7 +215,7 @@ public Response patchQuery(@PathParam("queryId") String queryId, Query query, @A
     public Response deleteQuery(@PathParam("queryId") String queryId, @ApiParam(hidden = true) @Pac4JProfileManager ProfileManager<CommonProfile> profileManager)
     {
         MutableList<CommonProfile> profiles = ProfileManagerHelper.extractProfiles(profileManager);
-        Identity identity = IdentityFactoryProvider.getInstance().makeIdentity(profiles);
+        Identity identity = Identity.makeIdentity(profiles);
         try (Scope scope = GlobalTracer.get().buildSpan("Query: Delete Query").startActive(true))
         {
             this.queryStoreManager.deleteQuery(queryId, getCurrentUser(profileManager));

diff --git a/...pl/legend-engine-repl-client/src/main/java/org/finos/legend/engine/repl/core/Helpers.java b/...pl/legend-engine-repl-client/src/main/java/org/finos/legend/engine/repl/core/Helpers.java
@@ -16,7 +16,6 @@
 
 import org.finos.legend.engine.repl.client.Client;
 import org.finos.legend.engine.shared.core.identity.Identity;
-import org.finos.legend.engine.shared.core.identity.factory.IdentityFactoryProvider;
 import org.finos.legend.engine.shared.core.kerberos.SubjectTools;
 
 public class Helpers
@@ -25,7 +24,7 @@ public static Identity resolveIdentityFromLocalSubject(Client client)
     {
         try
         {
-            return IdentityFactoryProvider.getInstance().makeIdentity(SubjectTools.getLocalSubject());
+            return Identity.makeIdentity(SubjectTools.getLocalSubject());
         }
         catch (Exception e)
         {

diff --git a/legend-engine-config/legend-engine-server/legend-engine-server-http-server/pom.xml b/legend-engine-config/legend-engine-server/legend-engine-server-http-server/pom.xml
@@ -908,6 +908,17 @@
                 </exclusion>
             </exclusions>
         </dependency>
+
+        <dependency>
+            <groupId>org.finos.legend.engine</groupId>
+            <artifactId>legend-engine-xt-identity-pac4j</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.finos.legend.engine</groupId>
+            <artifactId>legend-engine-xt-identity-kerberos</artifactId>
+            <scope>runtime</scope>
+        </dependency>
         <!-- Authentication -->
 
         <!-- In order to access Version for Pure platform -->

diff --git a/...ava/org/finos/legend/engine/server/integration/tests/AbstractMiddleTierExecutionTest.java b/...ava/org/finos/legend/engine/server/integration/tests/AbstractMiddleTierExecutionTest.java
@@ -30,7 +30,6 @@
 import org.finos.legend.engine.plan.execution.stores.relational.plugin.Relational;
 import org.finos.legend.engine.shared.core.identity.Identity;
 import org.finos.legend.engine.shared.core.identity.credential.middletier.MiddleTierUserPasswordCredential;
-import org.finos.legend.engine.shared.core.identity.factory.DefaultIdentityFactory;
 import org.finos.legend.engine.shared.core.operational.errorManagement.ExceptionError;
 import org.finos.legend.engine.shared.core.vault.TestVaultImplementation;
 import org.finos.legend.engine.shared.core.vault.Vault;
@@ -106,8 +105,7 @@ public static void shutdownClass()
     @Before
     public void setup() throws Exception
     {
-        DefaultIdentityFactory defaultIdentityFactory = new DefaultIdentityFactory();
-        this.identity = defaultIdentityFactory.makeUnknownIdentity();
+        this.identity = Identity.makeUnknownIdentity();
 
         this.testVaultImplementation = new TestVaultImplementation();
         MiddleTierUserPasswordCredential middleTierUserPasswordCredential = new MiddleTierUserPasswordCredential(postgresTestContainerWrapper.getUser(), postgresTestContainerWrapper.getPassword(), "unused");

diff --git a/.../finos/legend/engine/server/integration/tests/TestExecutionWithMiddleTierConnections.java b/.../finos/legend/engine/server/integration/tests/TestExecutionWithMiddleTierConnections.java
@@ -22,7 +22,6 @@
 import org.finos.legend.engine.plan.execution.result.serialization.SerializationFormat;
 import org.finos.legend.engine.protocol.pure.v1.model.executionPlan.SingleExecutionPlan;
 import org.finos.legend.engine.shared.core.ObjectMapperFactory;
-import org.finos.legend.engine.shared.core.identity.factory.DefaultIdentityFactory;
 import org.junit.Test;
 
 import javax.ws.rs.core.Response;
@@ -47,7 +46,7 @@ public void testWithExecutePlan_ExecutionAuthorized() throws Exception
         RootMiddleTierPlanExecutionAuthorizer planExecutionAuthorizer = new RootMiddleTierPlanExecutionAuthorizer(Lists.immutable.of(relationalMiddleTierPlanExecutionAuthorizer));
 
         SingleExecutionPlan executionPlan = this.loadPlanFromFile("/plans/planWithSingleMiddleTierConnection.json", postgresTestContainerWrapper.getPort());
-        Response response = new ExecutePlan(buildPlanExecutor(), planExecutionAuthorizer, new DefaultIdentityFactory()).doExecutePlanImpl(new ExecutionRequest(executionPlan), SerializationFormat.defaultFormat, identity);
+        Response response = new ExecutePlan(buildPlanExecutor(), planExecutionAuthorizer).doExecutePlanImpl(new ExecutionRequest(executionPlan), SerializationFormat.defaultFormat, identity);
 
         assertEquals(Response.Status.OK.getStatusCode(), response.getStatus());
 
@@ -64,7 +63,7 @@ public void testWithExecutePlan_ExecutionNotAuthorized() throws Exception
         RootMiddleTierPlanExecutionAuthorizer planExecutionAuthorizer = new RootMiddleTierPlanExecutionAuthorizer(Lists.immutable.of(relationalMiddleTierPlanExecutionAuthorizer));
 
         SingleExecutionPlan executionPlan = this.loadPlanFromFile("/plans/planWithSingleMiddleTierConnection.json", postgresTestContainerWrapper.getPort());
-        Response response = new ExecutePlan(buildPlanExecutor(), planExecutionAuthorizer, new DefaultIdentityFactory()).doExecutePlanImpl(new ExecutionRequest(executionPlan), SerializationFormat.defaultFormat, identity);
+        Response response = new ExecutePlan(buildPlanExecutor(), planExecutionAuthorizer).doExecutePlanImpl(new ExecutionRequest(executionPlan), SerializationFormat.defaultFormat, identity);
 
         assertEquals(Response.Status.INTERNAL_SERVER_ERROR.getStatusCode(), response.getStatus());
 

diff --git a/...nos/legend/engine/server/integration/tests/TestExecutionWithoutMiddleTierConnections.java b/...nos/legend/engine/server/integration/tests/TestExecutionWithoutMiddleTierConnections.java
@@ -23,7 +23,6 @@
 import org.finos.legend.engine.protocol.pure.v1.model.executionPlan.SingleExecutionPlan;
 import org.finos.legend.engine.shared.core.ObjectMapperFactory;
 import org.finos.legend.engine.shared.core.identity.Identity;
-import org.finos.legend.engine.shared.core.identity.factory.DefaultIdentityFactory;
 import org.finos.legend.engine.shared.core.vault.TestVaultImplementation;
 import org.finos.legend.engine.shared.core.vault.Vault;
 import org.junit.After;
@@ -88,8 +87,7 @@ public String getRemoteUser()
     @Before
     public void setup() throws Exception
     {
-        DefaultIdentityFactory defaultIdentityFactory = new DefaultIdentityFactory();
-        this.identity = defaultIdentityFactory.makeUnknownIdentity();
+        this.identity = Identity.makeUnknownIdentity();
 
         this.testVaultImplementation = new TestVaultImplementation();
         Vault.INSTANCE.registerImplementation(testVaultImplementation);

diff --git a/...cution-http-api/src/main/java/org/finos/legend/engine/plan/execution/api/ExecutePlan.java b/...cution-http-api/src/main/java/org/finos/legend/engine/plan/execution/api/ExecutePlan.java
@@ -37,9 +37,7 @@
 import org.finos.legend.engine.plan.execution.stores.StoreType;
 import org.finos.legend.engine.protocol.pure.v1.model.executionPlan.SingleExecutionPlan;
 import org.finos.legend.engine.shared.core.identity.Identity;
-import org.finos.legend.engine.shared.core.identity.factory.DefaultIdentityFactory;
 import org.finos.legend.engine.shared.core.identity.factory.IdentityFactory;
-import org.finos.legend.engine.shared.core.identity.factory.IdentityFactoryProvider;
 import org.finos.legend.engine.shared.core.kerberos.ProfileManagerHelper;
 import org.finos.legend.engine.shared.core.operational.errorManagement.ExceptionTool;
 import org.finos.legend.engine.shared.core.operational.logs.LogInfo;
@@ -57,18 +55,16 @@ public class ExecutePlan
 {
     private static final Logger LOGGER = org.slf4j.LoggerFactory.getLogger(ExecutePlan.class);
     private final PlanExecutor planExecutor;
-    private IdentityFactory identityFactory;
     private final PlanExecutionAuthorizer planExecutionAuthorizer;
 
     public ExecutePlan(PlanExecutor planExecutor)
     {
-        this(planExecutor, null, new DefaultIdentityFactory());
+        this(planExecutor, null);
     }
 
-    public ExecutePlan(PlanExecutor planExecutor, PlanExecutionAuthorizer planExecutionAuthorizer, IdentityFactory identityFactory)
+    public ExecutePlan(PlanExecutor planExecutor, PlanExecutionAuthorizer planExecutionAuthorizer)
     {
         this.planExecutor = planExecutor;
-        this.identityFactory = identityFactory;
         this.planExecutionAuthorizer = planExecutionAuthorizer;
     }
 
@@ -81,7 +77,7 @@ public Response doExecutePlan(@Context HttpServletRequest request, ExecutionRequ
          */
 
         MutableList<CommonProfile> profiles = ProfileManagerHelper.extractProfiles(pm);
-        Identity identity = IdentityFactoryProvider.getInstance().makeIdentity(profiles);
+        Identity identity = Identity.makeIdentity(profiles);
         if (this.planExecutionAuthorizer == null)
         {
             return this.doExecutePlanLegacy(request, executionRequest, format, identity);

diff --git a/...tp-api/src/main/java/org/finos/legend/engine/plan/execution/api/ExecutePlanStrategic.java b/...tp-api/src/main/java/org/finos/legend/engine/plan/execution/api/ExecutePlanStrategic.java
@@ -31,7 +31,6 @@
 import org.finos.legend.engine.plan.execution.authorization.PlanExecutionAuthorizer;
 import org.finos.legend.engine.plan.execution.result.serialization.SerializationFormat;
 import org.finos.legend.engine.protocol.pure.v1.model.executionPlan.ExecutionPlan;
-import org.finos.legend.engine.shared.core.identity.factory.IdentityFactory;
 import org.pac4j.core.profile.CommonProfile;
 import org.pac4j.core.profile.ProfileManager;
 import org.pac4j.jax.rs.annotations.Pac4JProfileManager;
@@ -48,9 +47,9 @@ public ExecutePlanStrategic(PlanExecutor planExecutor)
         super(planExecutor);
     }
 
-    public ExecutePlanStrategic(PlanExecutor planExecutor, PlanExecutionAuthorizer planExecutionAuthorizer, IdentityFactory identityFactory)
+    public ExecutePlanStrategic(PlanExecutor planExecutor, PlanExecutionAuthorizer planExecutionAuthorizer)
     {
-        super(planExecutor, planExecutionAuthorizer, identityFactory);
+        super(planExecutor, planExecutionAuthorizer);
     }
 
     @POST

diff --git a/.../legend-engine-core-executionPlan-execution/legend-engine-executionPlan-execution/pom.xml b/.../legend-engine-core-executionPlan-execution/legend-engine-executionPlan-execution/pom.xml
@@ -66,6 +66,10 @@
             <groupId>org.finos.legend.engine</groupId>
             <artifactId>legend-engine-xt-identity-kerberos</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.finos.legend.engine</groupId>
+            <artifactId>legend-engine-xt-identity-pac4j</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.finos.legend.engine</groupId>
             <artifactId>legend-engine-protocol</artifactId>

diff --git a/...ion/src/main/java/org/finos/legend/engine/plan/execution/nodes/ExecutionNodeExecutor.java b/...ion/src/main/java/org/finos/legend/engine/plan/execution/nodes/ExecutionNodeExecutor.java
@@ -21,6 +21,7 @@
 import org.eclipse.collections.impl.factory.Maps;
 import org.eclipse.collections.impl.factory.Sets;
 import org.eclipse.collections.impl.utility.ListIterate;
+import org.finos.legend.engine.identity.extensions.pac4j.Pac4jUtils;
 import org.finos.legend.engine.plan.dependencies.domain.dataQuality.Constrained;
 import org.finos.legend.engine.plan.dependencies.domain.dataQuality.IChecked;
 import org.finos.legend.engine.plan.dependencies.domain.graphFetch.IGraphInstance;
@@ -86,7 +87,6 @@
 import org.finos.legend.engine.protocol.pure.v1.model.valueSpecification.raw.classInstance.SerializationConfig;
 import org.finos.legend.engine.protocol.pure.v1.model.valueSpecification.raw.classInstance.graph.PropertyGraphFetchTree;
 import org.finos.legend.engine.shared.core.identity.Identity;
-import org.finos.legend.engine.shared.core.identity.factory.IdentityFactoryProvider;
 import org.pac4j.core.profile.ProfileManager;
 
 import java.util.Arrays;
@@ -368,7 +368,7 @@ public Result visit(GraphFetchExecutionNode graphFetchExecutionNode)
                     String executionClassName = JavaHelper.getExecutionClassFullName(javaPlatformImpl);
                     String executionMethodName = JavaHelper.getExecutionMethodName(javaPlatformImpl);
 
-                    Stream<?> transformedResult = ExecutionNodeJavaPlatformHelper.executeStaticJavaMethod(graphFetchExecutionNode, executionClassName, executionMethodName, Arrays.asList(StreamingObjectResult.class, ExecutionNode.class, ExecutionState.class, ProfileManager.class), Arrays.asList(objectResult, graphFetchExecutionNode, this.executionState, Lists.mutable.withAll(IdentityFactoryProvider.getInstance().adapt(identity))), this.executionState, this.identity);
+                    Stream<?> transformedResult = ExecutionNodeJavaPlatformHelper.executeStaticJavaMethod(graphFetchExecutionNode, executionClassName, executionMethodName, Arrays.asList(StreamingObjectResult.class, ExecutionNode.class, ExecutionState.class, ProfileManager.class), Arrays.asList(objectResult, graphFetchExecutionNode, this.executionState, Pac4jUtils.getProfilesFromIdentity(identity)), this.executionState, this.identity);
                     return new StreamingObjectResult<>(transformedResult, objectResult.getResultBuilder(), objectResult);
                 }
                 catch (Exception e)

diff --git a/...er-http-api/src/main/java/org/finos/legend/engine/language/pure/compiler/api/Compile.java b/...er-http-api/src/main/java/org/finos/legend/engine/language/pure/compiler/api/Compile.java
@@ -29,7 +29,6 @@
 import org.finos.legend.engine.protocol.pure.v1.model.context.PureModelContextPointer;
 import org.finos.legend.engine.protocol.pure.v1.model.valueSpecification.raw.Lambda;
 import org.finos.legend.engine.shared.core.identity.Identity;
-import org.finos.legend.engine.shared.core.identity.factory.IdentityFactoryProvider;
 import org.finos.legend.engine.shared.core.kerberos.ProfileManagerHelper;
 import org.finos.legend.engine.shared.core.operational.errorManagement.EngineException;
 import org.finos.legend.engine.shared.core.operational.errorManagement.ExceptionTool;
@@ -74,7 +73,7 @@ public Compile(ModelManager modelManager)
     public Response compile(PureModelContext model, @ApiParam(hidden = true) @Pac4JProfileManager ProfileManager<CommonProfile> pm, @Context UriInfo uriInfo)
     {
         MutableList<CommonProfile> profiles = ProfileManagerHelper.extractProfiles(pm);
-        Identity identity = IdentityFactoryProvider.getInstance().makeIdentity(profiles);
+        Identity identity = Identity.makeIdentity(profiles);
         long start = System.currentTimeMillis();
         try (Scope scope = GlobalTracer.get().buildSpan("Service: compile").startActive(true))
         {
@@ -102,7 +101,7 @@ public Response compile(PureModelContext model, @ApiParam(hidden = true) @Pac4JP
     public Response lambdaReturnType(LambdaReturnTypeInput lambdaReturnTypeInput, @ApiParam(hidden = true) @Pac4JProfileManager ProfileManager<CommonProfile> pm, @Context UriInfo uriInfo)
     {
         MutableList<CommonProfile> profiles = ProfileManagerHelper.extractProfiles(pm);
-        Identity identity = IdentityFactoryProvider.getInstance().makeIdentity(profiles);
+        Identity identity = Identity.makeIdentity(profiles);
         long start = System.currentTimeMillis();
         try
         {

diff --git a/...g/finos/legend/engine/language/pure/grammar/api/grammarToJson/TransformGrammarToJson.java b/...g/finos/legend/engine/language/pure/grammar/api/grammarToJson/TransformGrammarToJson.java
@@ -31,7 +31,6 @@
 import org.finos.legend.engine.shared.core.api.grammar.ParserError;
 import org.finos.legend.engine.shared.core.api.result.ManageConstantResult;
 import org.finos.legend.engine.shared.core.identity.Identity;
-import org.finos.legend.engine.shared.core.identity.factory.IdentityFactoryProvider;
 import org.finos.legend.engine.shared.core.kerberos.ProfileManagerHelper;
 import org.finos.legend.engine.shared.core.operational.errorManagement.EngineException;
 import org.finos.legend.engine.shared.core.operational.errorManagement.ExceptionTool;
@@ -69,7 +68,7 @@ public class TransformGrammarToJson
     public Response transformGrammarToJson(GrammarToJsonInput grammarInput, @ApiParam(hidden = true) @Pac4JProfileManager ProfileManager<CommonProfile> pm, @DefaultValue("true") @QueryParam("returnSourceInfo") boolean returnSourceInfo)
     {
         MutableList<CommonProfile> profiles = ProfileManagerHelper.extractProfiles(pm);
-        Identity identity = IdentityFactoryProvider.getInstance().makeIdentity(profiles);
+        Identity identity = Identity.makeIdentity(profiles);
         try (Scope scope = GlobalTracer.get().buildSpan("Service: transformJsonToGrammar").startActive(true))
         {
             PureGrammarParserExtensions.logExtensionList();

diff --git a/...g/finos/legend/engine/language/pure/grammar/api/jsonToGrammar/TransformJsonToGrammar.java b/...g/finos/legend/engine/language/pure/grammar/api/jsonToGrammar/TransformJsonToGrammar.java
@@ -33,7 +33,6 @@
 import org.finos.legend.engine.language.pure.grammar.to.extension.PureGrammarComposerExtensionLoader;
 import org.finos.legend.engine.shared.core.api.result.ManageConstantResult;
 import org.finos.legend.engine.shared.core.identity.Identity;
-import org.finos.legend.engine.shared.core.identity.factory.IdentityFactoryProvider;
 import org.finos.legend.engine.shared.core.kerberos.ProfileManagerHelper;
 import org.finos.legend.engine.shared.core.operational.errorManagement.ExceptionTool;
 import org.finos.legend.engine.shared.core.operational.logs.LoggingEventType;
@@ -64,7 +63,7 @@ public class TransformJsonToGrammar
     public Response transformJsonToGrammar(JsonToGrammarInput jsonInput, @ApiParam(hidden = true) @Pac4JProfileManager ProfileManager<CommonProfile> pm)
     {
         MutableList<CommonProfile> profiles = ProfileManagerHelper.extractProfiles(pm);
-        Identity identity = IdentityFactoryProvider.getInstance().makeIdentity(profiles);
+        Identity identity = Identity.makeIdentity(profiles);
         try (Scope scope = GlobalTracer.get().buildSpan("Service: transformJsonToGrammar").startActive(true))
         {
             PureGrammarComposerExtensionLoader.logExtensionList();