MET-6342 Cleanup

europeana · Feb 6, 2025 · 2c71e35 · 2c71e35
1 parent 06b0054
commit 2c71e35
Show file tree

Hide file tree

Showing 13 changed files with 9 additions and 487 deletions.
diff --git a/metis-core-rest/pom.xml b/metis-core-rest/pom.xml
@@ -16,11 +16,6 @@
     </dependency>
 
     <!-- Owned -->
-    <dependency>
-      <groupId>eu.europeana.metis</groupId>
-      <artifactId>metis-authentication-rest-client</artifactId>
-      <version>${version.metis-framework}</version>
-    </dependency>
     <dependency>
       <groupId>eu.europeana.metis</groupId>
       <artifactId>metis-common-spring-properties</artifactId>

diff --git a/...core-rest/src/main/java/eu/europeana/metis/core/rest/config/ApplicationConfiguration.java b/...core-rest/src/main/java/eu/europeana/metis/core/rest/config/ApplicationConfiguration.java
@@ -2,7 +2,6 @@
 
 import com.mongodb.client.MongoClient;
 import eu.europeana.cloud.mcs.driver.DataSetServiceClient;
-import eu.europeana.metis.authentication.rest.client.AuthenticationClient;
 import eu.europeana.metis.core.dao.DatasetDao;
 import eu.europeana.metis.core.dao.DatasetXsltDao;
 import eu.europeana.metis.core.dao.DepublishRecordIdDao;
@@ -13,7 +12,6 @@
 import eu.europeana.metis.core.mongo.MorphiaDatastoreProviderImpl;
 import eu.europeana.metis.core.rest.RequestLimits;
 import eu.europeana.metis.core.rest.config.properties.MetisCoreConfigurationProperties;
-import eu.europeana.metis.core.service.Authorizer;
 import eu.europeana.metis.core.service.DatasetService;
 import eu.europeana.metis.core.service.DepublishRecordIdService;
 import eu.europeana.metis.core.service.OrchestratorService;
@@ -115,23 +113,13 @@ public StandardServletMultipartResolver getMultipartResolver() {
     return new StandardServletMultipartResolver();
   }
 
-  @Bean
-  AuthenticationClient getAuthenticationClient(MetisCoreConfigurationProperties metisCoreConfigurationProperties) {
-    return new AuthenticationClient(metisCoreConfigurationProperties.getAuthenticationBaseUrl());
-  }
-
   @Bean
   MorphiaDatastoreProvider getMorphiaDatastoreProvider(MongoConfigurationProperties mongoConfigurationProperties)
       throws IOException {
     return new MorphiaDatastoreProviderImpl(mongoClient, mongoConfigurationProperties.getDatabase(),
         defaultTransformation::getInputStream);
   }
 
-  @Bean
-  Authorizer geAuthorizer(DatasetDao datasetDao) {
-    return new Authorizer(datasetDao);
-  }
-
   /**
    * Get the DAO for datasets.
    *

diff --git a/...java/eu/europeana/metis/core/rest/config/properties/MetisCoreConfigurationProperties.java b/...java/eu/europeana/metis/core/rest/config/properties/MetisCoreConfigurationProperties.java
@@ -28,7 +28,6 @@ public class MetisCoreConfigurationProperties {
     private int linkCheckingDefaultSamplingSize;
     private int solrCommitPeriodInMinutes;
 
-    private String authenticationBaseUrl;
     private String[] allowedCorsHosts;
 
 
@@ -169,14 +168,6 @@ public void setSolrCommitPeriodInMinutes(int solrCommitPeriodInMinutes) {
         this.solrCommitPeriodInMinutes = solrCommitPeriodInMinutes;
     }
 
-    public String getAuthenticationBaseUrl() {
-        return authenticationBaseUrl;
-    }
-
-    public void setAuthenticationBaseUrl(String authenticationBaseUrl) {
-        this.authenticationBaseUrl = authenticationBaseUrl;
-    }
-
     public String[] getAllowedCorsHosts() {
       return allowedCorsHosts == null ? null : allowedCorsHosts.clone();
     }

diff --git a/metis-core-rest/src/main/resources/application.properties.example b/metis-core-rest/src/main/resources/application.properties.example
@@ -43,8 +43,6 @@ metis-core.maxDepublishRecordIdsPerDataset=1000
 metis-core.linkCheckingDefaultSamplingSize=1000
 #Solr
 metis-core.solrCommitPeriodInMinutes=15
-# Authentication
-metis-core.authenticationBaseUrl=
 # CORS
 metis-core.allowedCorsHosts=
 

diff --git a/metis-core-rest/src/test/java/eu/europeana/metis/core/rest/utils/TestObjectFactory.java b/metis-core-rest/src/test/java/eu/europeana/metis/core/rest/utils/TestObjectFactory.java
@@ -1,16 +1,10 @@
 package eu.europeana.metis.core.rest.utils;
 
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.spy;
-
 import eu.europeana.cloud.common.model.dps.ErrorDetails;
 import eu.europeana.cloud.common.model.dps.RecordState;
 import eu.europeana.cloud.common.model.dps.SubTaskInfo;
 import eu.europeana.cloud.common.model.dps.TaskErrorInfo;
 import eu.europeana.cloud.common.model.dps.TaskErrorsInfo;
-import eu.europeana.metis.authentication.user.AccountRole;
-import eu.europeana.metis.authentication.user.MetisUserView;
-import eu.europeana.metis.utils.Country;
 import eu.europeana.metis.core.common.Language;
 import eu.europeana.metis.core.dao.WorkflowExecutionDao.ExecutionDatasetPair;
 import eu.europeana.metis.core.dataset.Dataset;
@@ -33,24 +27,19 @@
 import eu.europeana.metis.core.workflow.plugins.TransformationPluginMetadata;
 import eu.europeana.metis.core.workflow.plugins.ValidationExternalPluginMetadata;
 import eu.europeana.metis.core.workflow.plugins.ValidationInternalPluginMetadata;
+import eu.europeana.metis.utils.Country;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.UUID;
 import org.bson.types.ObjectId;
 
-/**
- * @author Simon Tzanakis ([email protected])
- * @since 2019-03-15
- */
 public class TestObjectFactory {
 
   public static final int DATASETID = 100;
   public static final String XSLTID = "5a9821af34f04b794dcf63df";
   public static final String EXECUTIONID = "5a5dc67ba458bb00083d49e3";
   public static final String DATASETNAME = "datasetName";
-  public static final String EMAIL = "[email protected]";
-  public static final String AUTHORIZATION_HEADER = "Bearer 1234567890qwertyuiopasdfghjklQWE";
   public static final String TOPOLOGY_NAME = "topology_name";
   public static final long EXTERNAL_TASK_ID = 2_070_373_127_078_497_810L;
   private static final int OCCURRENCES = 2;
@@ -227,28 +216,9 @@ public static Dataset createDataset(String datasetName) {
   }
 
   /**
-   * Create a dummy metis user
-   *
-   * @param email the email for the dummy user
-   * @return the created metis user
-   */
-  public static MetisUserView createMetisUser(String email) {
-    MetisUserView metisUserView = spy(new MetisUserView());
-    doReturn(email).when(metisUserView).getEmail();
-    doReturn(AccountRole.EUROPEANA_DATA_OFFICER).when(metisUserView).getAccountRole();
-    doReturn("Organization_12345").when(metisUserView).getOrganizationId();
-    doReturn("OrganizationName").when(metisUserView).getOrganizationName();
-    doReturn(true).when(metisUserView).isMetisUserFlag();
-    doReturn("FirstName").when(metisUserView).getFirstName();
-    doReturn("LastName").when(metisUserView).getLastName();
-    doReturn("User_12345").when(metisUserView).getUserId();
-    return metisUserView;
-  }
-
-  /**
-   * Create a dummy sub task info
+   * Create a dummy subtask info
    *
-   * @return the created sub task info
+   * @return the created subtask info
    */
   public static List<SubTaskInfo> createListOfSubTaskInfo() {
 

diff --git a/metis-core-rest/src/test/resources/application.properties b/metis-core-rest/src/test/resources/application.properties
@@ -42,8 +42,6 @@ metis-core.maxDepublishRecordIdsPerDataset=1000
 metis-core.linkCheckingDefaultSamplingSize=1000
 #Solr
 metis-core.solrCommitPeriodInMinutes=15
-# Authentication
-metis-core.authenticationBaseUrl=
 # CORS
 metis-core.allowedCorsHosts=
 

diff --git a/metis-core-service/pom.xml b/metis-core-service/pom.xml
@@ -17,11 +17,6 @@
     </dependency>
 
     <!-- Owned -->
-    <dependency>
-      <groupId>eu.europeana.metis</groupId>
-      <artifactId>metis-authentication-common</artifactId>
-      <version>${version.metis-framework}</version>
-    </dependency>
     <dependency>
       <artifactId>metis-transformation-service</artifactId>
       <groupId>eu.europeana.metis</groupId>

diff --git a/metis-core-service/src/main/java/eu/europeana/metis/core/dao/WorkflowExecutionDao.java b/metis-core-service/src/main/java/eu/europeana/metis/core/dao/WorkflowExecutionDao.java
@@ -36,7 +36,6 @@
 import dev.morphia.query.filters.Filters;
 import dev.morphia.query.updates.UpdateOperator;
 import dev.morphia.query.updates.UpdateOperators;
-import eu.europeana.metis.authentication.user.MetisUserView;
 import eu.europeana.metis.core.common.DaoFieldNames;
 import eu.europeana.metis.core.dataset.Dataset;
 import eu.europeana.metis.core.mongo.MorphiaDatastoreProvider;
@@ -175,39 +174,6 @@ public void updateMonitorInformation(WorkflowExecution workflowExecution) {
         updateResult == null ? 0 : updateResult.getModifiedCount());
   }
 
-  /**
-   * Set the cancelling field in the database.
-   * <p>Also adds information of the user identifier that cancelled the execution or if it was by a
-   * system operation, using {@link SystemId} values as identifiers. For historical executions the value of the
-   * <code>cancelledBy</code> field will remain <code>null</code></p>
-   *
-   * @param workflowExecution the workflowExecution to be cancelled
-   * @param metisUserView the user that triggered the cancellation or null if it was the system
-   *
-   * @deprecated replaced by {@link #setCancellingState(WorkflowExecution, String)}
-   */
-  @Deprecated(forRemoval = true)
-  public void setCancellingState(WorkflowExecution workflowExecution, MetisUserView metisUserView) {
-    Query<WorkflowExecution> query = morphiaDatastoreProvider.getDatastore()
-                                                             .find(WorkflowExecution.class)
-                                                             .filter(Filters.eq(ID.getFieldName(), workflowExecution.getId()));
-    String cancelledBy;
-    if (metisUserView == null || metisUserView.getUserId() == null) {
-      cancelledBy = SystemId.SYSTEM_MINUTE_CAP_EXPIRE.name();
-    } else {
-      cancelledBy = metisUserView.getUserId();
-    }
-    final UpdateOperator setCancellingOperator = UpdateOperators.set(CANCELLING, Boolean.TRUE);
-    final UpdateOperator setCancelledByOperator = UpdateOperators.set(CANCELLED_BY, cancelledBy);
-
-    UpdateResult updateResult = retryableExternalRequestForNetworkExceptions(
-        () -> query.update(new UpdateOptions(), setCancellingOperator, setCancelledByOperator));
-    LOGGER.debug(
-        "WorkflowExecution cancelling for datasetId '{}' set to true in Mongo. (UpdateResults: {})",
-        workflowExecution.getDatasetId(),
-        updateResult == null ? 0 : updateResult.getModifiedCount());
-  }
-
   /**
    * Set the cancelling field in the database.
    * <p>Also adds information of the user identifier that cancelled the execution or if it was by a

diff --git a/metis-core-service/src/main/java/eu/europeana/metis/core/service/Authorizer.java b/metis-core-service/src/main/java/eu/europeana/metis/core/service/Authorizer.java