This is an automated email from the ASF dual-hosted git repository. yasith pushed a commit to branch cybershuttle-dev in repository https://gitbox.apache.org/repos/asf/airavata.git
commit 46197be2ea154b25f911c9066c580e8f917e3d6d Author: yasith <[email protected]> AuthorDate: Thu Apr 24 00:34:59 2025 -0500 partially update deprecated code --- .../commons/repositories/AbstractRepository.java | 14 +++--- .../commons/utils/ObjectMapperSingleton.java | 18 ++++++-- .../core/repositories/UserProfileRepository.java | 4 +- .../service/models/AgentLaunchRequest.java | 4 +- .../apache/airavata/agents/api/AdaptorParams.java | 2 +- .../apache/airavata/agents/api/AgentAdaptor.java | 3 -- .../apache/airavata/agents/api/CommandOutput.java | 2 - .../airavata/helix/impl/task/AiravataTask.java | 44 +++++++++--------- .../ApplicationDeploymentRepositoryTest.java | 53 ++++++++++++++++------ .../appcatalog/GatewayProfileRepositoryTest.java | 4 +- .../GroupResourceProfileRepositoryTest.java | 12 ++--- .../appcatalog/StorageResourceRepositoryTest.java | 6 +-- .../UserResourceProfileRepositoryTest.java | 4 +- .../core/repositories/common/TestBase.java | 6 +-- .../expcatalog/ExperimentErrorRepositoryTest.java | 1 + .../expcatalog/ExperimentInputRepositoryTest.java | 1 + .../expcatalog/ExperimentOutputRepositoryTest.java | 1 + .../expcatalog/GatewayRepositoryTest.java | 4 +- .../repositories/expcatalog/JobRepositoryTest.java | 5 +- .../expcatalog/ProcessErrorRepositoryTest.java | 1 + .../expcatalog/ProcessInputRepositoryTest.java | 1 + .../expcatalog/ProcessOutputRepositoryTest.java | 1 + .../expcatalog/ProcessStatusRepositoryTest.java | 4 +- .../expcatalog/QueueStatusRepositoryTest.java | 1 + .../replicacatalog/DataProductRepositoryTest.java | 10 +--- .../DataReplicaLocationRepositoryTest.java | 1 - .../core/utils/ObjectMapperSingletonTest.java | 25 ++++++++++ .../airavata/registry/cpi/UsrResourceProfile.java | 3 +- .../airavata/registry/cpi/WorkflowCatalog.java | 3 -- .../registry/api/service/RegistryAPIServer.java | 8 ++-- .../api/service/handler/RegistryServerHandler.java | 3 +- .../computeresource/BatchQueueGenerator.java | 5 +- .../ComputeResourceDescriptionGenerator.java | 5 +- .../DataMovementInterfaceGenerator.java | 5 +- .../computeresource/FileSystemsGenerator.java | 5 +- .../GridFTPDataMovementGenerator.java | 5 +- .../computeresource/GridFTPEndpointsGenerator.java | 5 +- .../JobManagerCommandGenerator.java | 5 +- .../JobSubmissionInterfaceGenerator.java | 5 +- .../LocalDataMovementGenerator.java | 5 +- .../computeresource/LocalSubmissionGenerator.java | 5 +- .../ResourceJobManagerGenerator.java | 5 +- .../computeresource/SCPDataMovementGenerator.java | 5 +- .../computeresource/SSHJobSubmissionGenerator.java | 5 +- .../main/java/generators/JPAClassGenerator.java | 5 +- .../java/generators/JPAResourceClassGenerator.java | 5 +- .../src/main/java/generators/SQLGenerator.java | 6 +-- .../jpa-gen/src/main/java/test/Test.java | 5 +- .../apache/airavata/registry/tool/DBMigrator.java | 4 +- .../airavata/security/AbstractAuthenticator.java | 2 - .../security/userstore/AbstractJDBCUserStore.java | 1 - .../airavata/security/userstore/JDBCUserStore.java | 2 +- .../security/userstore/SessionDBUserStore.java | 2 +- .../airavata/security/util/TrustStoreManager.java | 4 +- .../org/apache/airavata/server/ServerMain.java | 8 ++-- .../db/repositories/AbstractRepository.java | 10 ++-- .../registry/db/utils/ObjectMapperSingleton.java | 18 ++++++-- .../server/SharingRegistryServerHandler.java | 2 +- .../apache/airavata/tools/load/Configurations.java | 2 - .../org/apache/airavata/tools/load/LoadClient.java | 8 ++-- .../airavata/tools/load/SecurityManager.java | 10 +++- .../org/apache/airavata/tools/load/UnitLoad.java | 2 - 62 files changed, 218 insertions(+), 192 deletions(-) diff --git a/airavata-services/profile-service/profile-service-commons/src/main/java/org/apache/airavata/service/profile/commons/repositories/AbstractRepository.java b/airavata-services/profile-service/profile-service-commons/src/main/java/org/apache/airavata/service/profile/commons/repositories/AbstractRepository.java index f616a87a0f..4b4d99a8ae 100644 --- a/airavata-services/profile-service/profile-service-commons/src/main/java/org/apache/airavata/service/profile/commons/repositories/AbstractRepository.java +++ b/airavata-services/profile-service/profile-service-commons/src/main/java/org/apache/airavata/service/profile/commons/repositories/AbstractRepository.java @@ -21,7 +21,7 @@ package org.apache.airavata.service.profile.commons.repositories; import org.apache.airavata.service.profile.commons.utils.JPAUtils; import org.apache.airavata.service.profile.commons.utils.ObjectMapperSingleton; -import org.dozer.Mapper; +import com.github.dozermapper.core.Mapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -46,7 +46,7 @@ public abstract class AbstractRepository<T, E, Id> { } public T update(T t) { - Mapper mapper = ObjectMapperSingleton.getInstance(); + Mapper mapper = ObjectMapperSingleton.getInstance().getMapper(); E entity = mapper.map(t, dbEntityGenericClass); E persistedCopy = JPAUtils.execute(entityManager -> entityManager.merge(entity)); return mapper.map(persistedCopy, thriftGenericClass); @@ -64,13 +64,13 @@ public abstract class AbstractRepository<T, E, Id> { public T get(Id id) { E entity = JPAUtils.execute(entityManager -> entityManager .find(dbEntityGenericClass, id)); - Mapper mapper = ObjectMapperSingleton.getInstance(); + Mapper mapper = ObjectMapperSingleton.getInstance().getMapper(); return mapper.map(entity, thriftGenericClass); } public List<T> select(String query) { List resultSet = (List) JPAUtils.execute(entityManager -> entityManager.createQuery(query).getResultList()); - Mapper mapper = ObjectMapperSingleton.getInstance(); + Mapper mapper = ObjectMapperSingleton.getInstance().getMapper(); List<T> resultList = new ArrayList<>(); resultSet.stream().forEach(rs -> resultList.add(mapper.map(rs, thriftGenericClass))); return resultList; @@ -79,7 +79,7 @@ public abstract class AbstractRepository<T, E, Id> { public List<T> select(String query, int limit, int offset) { List resultSet = (List) JPAUtils.execute(entityManager -> entityManager.createQuery(query).setFirstResult(offset) .setMaxResults(limit).getResultList()); - Mapper mapper = ObjectMapperSingleton.getInstance(); + Mapper mapper = ObjectMapperSingleton.getInstance().getMapper(); List<T> resultList = new ArrayList<>(); resultSet.stream().forEach(rs -> resultList.add(mapper.map(rs, thriftGenericClass))); return resultList; @@ -97,7 +97,7 @@ public abstract class AbstractRepository<T, E, Id> { return jpaQuery.setFirstResult(offset).setMaxResults(limit).getResultList(); }); - Mapper mapper = ObjectMapperSingleton.getInstance(); + Mapper mapper = ObjectMapperSingleton.getInstance().getMapper(); List<T> resultList = new ArrayList<>(); resultSet.stream().forEach(rs -> resultList.add(mapper.map(rs, thriftGenericClass))); return resultList; @@ -115,7 +115,7 @@ public abstract class AbstractRepository<T, E, Id> { return jpaQuery.getResultList(); }); - Mapper mapper = ObjectMapperSingleton.getInstance(); + Mapper mapper = ObjectMapperSingleton.getInstance().getMapper(); List<T> resultList = new ArrayList<>(); resultSet.stream().forEach(rs -> resultList.add(mapper.map(rs, thriftGenericClass))); return resultList; diff --git a/airavata-services/profile-service/profile-service-commons/src/main/java/org/apache/airavata/service/profile/commons/utils/ObjectMapperSingleton.java b/airavata-services/profile-service/profile-service-commons/src/main/java/org/apache/airavata/service/profile/commons/utils/ObjectMapperSingleton.java index ec54c6b5ec..d6ffd596e0 100644 --- a/airavata-services/profile-service/profile-service-commons/src/main/java/org/apache/airavata/service/profile/commons/utils/ObjectMapperSingleton.java +++ b/airavata-services/profile-service/profile-service-commons/src/main/java/org/apache/airavata/service/profile/commons/utils/ObjectMapperSingleton.java @@ -19,20 +19,28 @@ */ package org.apache.airavata.service.profile.commons.utils; -import org.dozer.DozerBeanMapper; +import com.github.dozermapper.core.DozerBeanMapperBuilder; +import com.github.dozermapper.core.Mapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class ObjectMapperSingleton extends DozerBeanMapper{ +public class ObjectMapperSingleton { private final static Logger logger = LoggerFactory.getLogger(ObjectMapperSingleton.class); private static ObjectMapperSingleton instance; + private final Mapper mapper; - private ObjectMapperSingleton(){} + private ObjectMapperSingleton() { + mapper = DozerBeanMapperBuilder.buildDefault(); + } - public static ObjectMapperSingleton getInstance(){ - if(instance == null) + public static ObjectMapperSingleton getInstance() { + if (instance == null) instance = new ObjectMapperSingleton(); return instance; } + + public Mapper getMapper() { + return mapper; + } } \ No newline at end of file diff --git a/airavata-services/profile-service/profile-user-core/src/main/java/org/apache/airavata/service/profile/user/core/repositories/UserProfileRepository.java b/airavata-services/profile-service/profile-user-core/src/main/java/org/apache/airavata/service/profile/user/core/repositories/UserProfileRepository.java index b39a1f060a..86e91fe3b9 100644 --- a/airavata-services/profile-service/profile-user-core/src/main/java/org/apache/airavata/service/profile/user/core/repositories/UserProfileRepository.java +++ b/airavata-services/profile-service/profile-user-core/src/main/java/org/apache/airavata/service/profile/user/core/repositories/UserProfileRepository.java @@ -25,7 +25,7 @@ import org.apache.airavata.service.profile.commons.user.entities.UserProfileEnti import org.apache.airavata.service.profile.commons.utils.JPAUtils; import org.apache.airavata.service.profile.commons.utils.ObjectMapperSingleton; import org.apache.airavata.service.profile.commons.utils.QueryConstants; -import org.dozer.Mapper; +import com.github.dozermapper.core.Mapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -95,7 +95,7 @@ public class UserProfileRepository extends AbstractRepository<UserProfile, UserP public UserProfile updateUserProfile(UserProfile userProfile, Runnable postUpdateAction) { - Mapper mapper = ObjectMapperSingleton.getInstance(); + Mapper mapper = ObjectMapperSingleton.getInstance().getMapper(); UserProfileEntity entity = mapper.map(userProfile, UserProfileEntity.class); UserProfileEntity persistedCopy = JPAUtils.execute(entityManager -> { UserProfileEntity result = entityManager.merge(entity); diff --git a/modules/agent-framework/agent-service/src/main/java/org/apache/airavata/agent/connection/service/models/AgentLaunchRequest.java b/modules/agent-framework/agent-service/src/main/java/org/apache/airavata/agent/connection/service/models/AgentLaunchRequest.java index 7934ddf74e..fb24aecf31 100644 --- a/modules/agent-framework/agent-service/src/main/java/org/apache/airavata/agent/connection/service/models/AgentLaunchRequest.java +++ b/modules/agent-framework/agent-service/src/main/java/org/apache/airavata/agent/connection/service/models/AgentLaunchRequest.java @@ -3,8 +3,6 @@ package org.apache.airavata.agent.connection.service.models; import java.util.ArrayList; import java.util.List; -import org.apache.commons.lang3.StringUtils; - public class AgentLaunchRequest { private String experimentName; @@ -86,7 +84,7 @@ public class AgentLaunchRequest { } public String getApplicationInterfaceName() { - return remoteCluster + (StringUtils.isNotBlank(group) ? ("_" + group) : ""); + return remoteCluster + (group != null && !group.trim().isEmpty() ? ("_" + group) : ""); } public String getProjectName() { diff --git a/modules/airavata-helix/agent-api/src/main/java/org/apache/airavata/agents/api/AdaptorParams.java b/modules/airavata-helix/agent-api/src/main/java/org/apache/airavata/agents/api/AdaptorParams.java index beab284b45..f177282e02 100644 --- a/modules/airavata-helix/agent-api/src/main/java/org/apache/airavata/agents/api/AdaptorParams.java +++ b/modules/airavata-helix/agent-api/src/main/java/org/apache/airavata/agents/api/AdaptorParams.java @@ -19,7 +19,7 @@ */ package org.apache.airavata.agents.api; -import org.codehaus.jackson.map.ObjectMapper; +import com.fasterxml.jackson.databind.ObjectMapper; import java.io.File; import java.io.IOException; diff --git a/modules/airavata-helix/agent-api/src/main/java/org/apache/airavata/agents/api/AgentAdaptor.java b/modules/airavata-helix/agent-api/src/main/java/org/apache/airavata/agents/api/AgentAdaptor.java index 107b9ff617..1fcd0c2423 100644 --- a/modules/airavata-helix/agent-api/src/main/java/org/apache/airavata/agents/api/AgentAdaptor.java +++ b/modules/airavata-helix/agent-api/src/main/java/org/apache/airavata/agents/api/AgentAdaptor.java @@ -19,11 +19,8 @@ */ package org.apache.airavata.agents.api; -import java.io.File; import java.io.InputStream; import java.io.OutputStream; -import java.nio.channels.ReadableByteChannel; -import java.nio.channels.WritableByteChannel; import java.util.List; /** diff --git a/modules/airavata-helix/agent-api/src/main/java/org/apache/airavata/agents/api/CommandOutput.java b/modules/airavata-helix/agent-api/src/main/java/org/apache/airavata/agents/api/CommandOutput.java index e91dcb630d..e89c5c0c0d 100644 --- a/modules/airavata-helix/agent-api/src/main/java/org/apache/airavata/agents/api/CommandOutput.java +++ b/modules/airavata-helix/agent-api/src/main/java/org/apache/airavata/agents/api/CommandOutput.java @@ -19,8 +19,6 @@ */ package org.apache.airavata.agents.api; -import java.io.OutputStream; - /** * TODO: Class level comments please * diff --git a/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/AiravataTask.java b/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/AiravataTask.java index 86dcdf7697..2007082fd9 100644 --- a/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/AiravataTask.java +++ b/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/AiravataTask.java @@ -46,8 +46,6 @@ import org.apache.airavata.registry.api.exception.RegistryServiceException; import org.apache.airavata.service.profile.client.ProfileServiceClientFactory; import org.apache.airavata.service.profile.user.cpi.UserProfileService; import org.apache.airavata.service.profile.user.cpi.exception.UserProfileServiceException; -import org.apache.commons.io.FileUtils; -import org.apache.commons.lang3.exception.ExceptionUtils; import org.apache.helix.HelixManager; import org.apache.helix.task.TaskResult; import org.json.JSONException; @@ -58,11 +56,11 @@ import org.slf4j.MDC; import java.io.File; import java.io.IOException; +import java.io.PrintWriter; import java.io.StringWriter; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.UUID; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.*; public abstract class AiravataTask extends AbstractTask { @@ -140,18 +138,9 @@ public abstract class AiravataTask extends AbstractTask { if (currentRetryCount >= getRetryCount() || fatal) { ProcessStatus status = new ProcessStatus(ProcessState.FAILED); StringWriter errors = new StringWriter(); - - String errorCode = UUID.randomUUID().toString(); - String errorMessage = "Error Code : " + errorCode + ", Task " + getTaskId() + " failed due to " + reason + - (error == null ? "" : ", " + error.getMessage()); - - // wrapping from new error object with error code - error = new TaskOnFailException(errorMessage, true, error); - - status.setReason(errorMessage); - errors.write(ExceptionUtils.getStackTrace(error)); - logger.error(errorMessage, error); - + PrintWriter pw = new PrintWriter(errors); + error.printStackTrace(pw); + status.setReason(errors.toString()); status.setTimeOfStateChange(AiravataUtils.getCurrentTimestamp().getTime()); if (getTaskContext() != null) { // task context could be null if the initialization failed getTaskContext().setProcessStatus(status); @@ -192,14 +181,13 @@ public abstract class AiravataTask extends AbstractTask { saveAndPublishProcessStatus(requeueStatus); } - return onFail(errorMessage, fatal); + return onFail(reason, fatal, error); } else { - return onFail("Handover back to helix engine to retry", fatal); + return onFail("Handover back to helix engine to retry", fatal, error); } } protected void cleanup() { - try { // cleaning up local data directory String localDataPath = ServerSettings.getLocalDataLocation(); @@ -207,14 +195,24 @@ public abstract class AiravataTask extends AbstractTask { localDataPath = localDataPath + getProcessId(); try { - FileUtils.deleteDirectory(new File(localDataPath)); + Path directory = Path.of(localDataPath); + if (Files.exists(directory)) { + Files.walk(directory) + .sorted(Comparator.reverseOrder()) + .forEach(path -> { + try { + Files.delete(path); + } catch (IOException e) { + logger.error("Failed to delete path " + path, e); + } + }); + } } catch (IOException e) { logger.error("Failed to delete local data directory " + localDataPath, e); } } catch (Exception e) { logger.error("Failed to clean up", e); } - } protected void saveAndPublishProcessStatus(ProcessState state) { diff --git a/modules/registry/registry-core/src/test/java/org/apache/airavata/registry/core/repositories/appcatalog/ApplicationDeploymentRepositoryTest.java b/modules/registry/registry-core/src/test/java/org/apache/airavata/registry/core/repositories/appcatalog/ApplicationDeploymentRepositoryTest.java index 8794091804..acecc1b8e8 100644 --- a/modules/registry/registry-core/src/test/java/org/apache/airavata/registry/core/repositories/appcatalog/ApplicationDeploymentRepositoryTest.java +++ b/modules/registry/registry-core/src/test/java/org/apache/airavata/registry/core/repositories/appcatalog/ApplicationDeploymentRepositoryTest.java @@ -23,13 +23,12 @@ import org.apache.airavata.model.appcatalog.appdeployment.ApplicationDeploymentD import org.apache.airavata.model.appcatalog.appdeployment.ApplicationModule; import org.apache.airavata.model.appcatalog.appdeployment.CommandObject; import org.apache.airavata.model.appcatalog.appdeployment.SetEnvPaths; -import org.apache.airavata.model.commons.airavata_commonsConstants; import org.apache.airavata.model.appcatalog.computeresource.ComputeResourceDescription; +import org.apache.airavata.model.commons.airavata_commonsConstants; import org.apache.airavata.model.parallelism.ApplicationParallelismType; import org.apache.airavata.registry.core.repositories.common.TestBase; import org.apache.airavata.registry.core.utils.DBConstants; import org.apache.airavata.registry.cpi.AppCatalogException; -import org.apache.commons.lang3.builder.EqualsBuilder; import org.junit.Assert; import org.junit.Test; import org.slf4j.Logger; @@ -70,26 +69,50 @@ public class ApplicationDeploymentRepositoryTest extends TestBase { } private boolean deepCompareDeployment(ApplicationDeploymentDescription expected, ApplicationDeploymentDescription actual) { - boolean equals = true; - equals = equals && EqualsBuilder.reflectionEquals(expected, actual, - "moduleLoadCmds", "libPrependPaths", "libAppendPaths" ,"setEnvironment" ,"preJobCommands" - ,"postJobCommands", "__isset_bitfield"); - equals = equals && deepCompareLists(expected.getSetEnvironment(), actual.getSetEnvironment(), Comparator.comparingInt(SetEnvPaths::getEnvPathOrder)); - equals = equals && deepCompareLists(expected.getLibPrependPaths(), actual.getLibPrependPaths(), Comparator.comparingInt(SetEnvPaths::getEnvPathOrder)); - equals = equals && deepCompareLists(expected.getLibAppendPaths(), actual.getLibAppendPaths(), Comparator.comparingInt(SetEnvPaths::getEnvPathOrder)); - equals = equals && deepCompareLists(expected.getModuleLoadCmds(), actual.getModuleLoadCmds(), Comparator.comparingInt(CommandObject::getCommandOrder)); - equals = equals && deepCompareLists(expected.getPreJobCommands(), actual.getPreJobCommands(), Comparator.comparingInt(CommandObject::getCommandOrder)); - equals = equals && deepCompareLists(expected.getPostJobCommands(), actual.getPostJobCommands(), Comparator.comparingInt(CommandObject::getCommandOrder)); - return equals; + if (expected == actual) return true; + if (expected == null || actual == null) return false; + + return Objects.equals(expected.getAppDeploymentId(), actual.getAppDeploymentId()) && + Objects.equals(expected.getAppDeploymentDescription(), actual.getAppDeploymentDescription()) && + Objects.equals(expected.getAppModuleId(), actual.getAppModuleId()) && + Objects.equals(expected.getComputeHostId(), actual.getComputeHostId()) && + Objects.equals(expected.getExecutablePath(), actual.getExecutablePath()) && + Objects.equals(expected.getParallelism(), actual.getParallelism()) && + Objects.equals(expected.getDefaultQueueName(), actual.getDefaultQueueName()) && + expected.getDefaultCPUCount() == actual.getDefaultCPUCount() && + expected.getDefaultNodeCount() == actual.getDefaultNodeCount() && + expected.getDefaultWalltime() == actual.getDefaultWalltime() && + expected.isEditableByUser() == actual.isEditableByUser() && + deepCompareLists(expected.getSetEnvironment(), actual.getSetEnvironment(), + Comparator.comparingInt(SetEnvPaths::getEnvPathOrder)) && + deepCompareLists(expected.getLibPrependPaths(), actual.getLibPrependPaths(), + Comparator.comparingInt(SetEnvPaths::getEnvPathOrder)) && + deepCompareLists(expected.getLibAppendPaths(), actual.getLibAppendPaths(), + Comparator.comparingInt(SetEnvPaths::getEnvPathOrder)) && + deepCompareLists(expected.getModuleLoadCmds(), actual.getModuleLoadCmds(), + Comparator.comparingInt(CommandObject::getCommandOrder)) && + deepCompareLists(expected.getPreJobCommands(), actual.getPreJobCommands(), + Comparator.comparingInt(CommandObject::getCommandOrder)) && + deepCompareLists(expected.getPostJobCommands(), actual.getPostJobCommands(), + Comparator.comparingInt(CommandObject::getCommandOrder)); } private <T> boolean deepCompareLists(List<T> expected, List<T> actual, Comparator<? super T> c) { + if (expected == actual) return true; + if (expected == null || actual == null) return false; + if (expected.size() != actual.size()) return false; List<T> expectedCopy = new ArrayList<>(expected); - expectedCopy.sort(c); List<T> actualCopy = new ArrayList<>(actual); + expectedCopy.sort(c); actualCopy.sort(c); - return EqualsBuilder.reflectionEquals(expectedCopy, actualCopy); + + for (int i = 0; i < expectedCopy.size(); i++) { + if (!Objects.equals(expectedCopy.get(i), actualCopy.get(i))) { + return false; + } + } + return true; } private ApplicationDeploymentDescription prepareSampleDeployment(String tag, String applicationModule, String computeResource) { diff --git a/modules/registry/registry-core/src/test/java/org/apache/airavata/registry/core/repositories/appcatalog/GatewayProfileRepositoryTest.java b/modules/registry/registry-core/src/test/java/org/apache/airavata/registry/core/repositories/appcatalog/GatewayProfileRepositoryTest.java index a28cb4ecdd..4423bce495 100644 --- a/modules/registry/registry-core/src/test/java/org/apache/airavata/registry/core/repositories/appcatalog/GatewayProfileRepositoryTest.java +++ b/modules/registry/registry-core/src/test/java/org/apache/airavata/registry/core/repositories/appcatalog/GatewayProfileRepositoryTest.java @@ -37,9 +37,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.Assert.*; public class GatewayProfileRepositoryTest extends TestBase { diff --git a/modules/registry/registry-core/src/test/java/org/apache/airavata/registry/core/repositories/appcatalog/GroupResourceProfileRepositoryTest.java b/modules/registry/registry-core/src/test/java/org/apache/airavata/registry/core/repositories/appcatalog/GroupResourceProfileRepositoryTest.java index f10575f71c..6cef73e8f1 100644 --- a/modules/registry/registry-core/src/test/java/org/apache/airavata/registry/core/repositories/appcatalog/GroupResourceProfileRepositoryTest.java +++ b/modules/registry/registry-core/src/test/java/org/apache/airavata/registry/core/repositories/appcatalog/GroupResourceProfileRepositoryTest.java @@ -30,15 +30,9 @@ import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.HashSet; -import java.util.List; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import java.util.*; + +import static org.junit.Assert.*; public class GroupResourceProfileRepositoryTest extends TestBase { diff --git a/modules/registry/registry-core/src/test/java/org/apache/airavata/registry/core/repositories/appcatalog/StorageResourceRepositoryTest.java b/modules/registry/registry-core/src/test/java/org/apache/airavata/registry/core/repositories/appcatalog/StorageResourceRepositoryTest.java index 9de870202b..26847a429a 100644 --- a/modules/registry/registry-core/src/test/java/org/apache/airavata/registry/core/repositories/appcatalog/StorageResourceRepositoryTest.java +++ b/modules/registry/registry-core/src/test/java/org/apache/airavata/registry/core/repositories/appcatalog/StorageResourceRepositoryTest.java @@ -20,11 +20,7 @@ package org.apache.airavata.registry.core.repositories.appcatalog; import org.apache.airavata.model.appcatalog.storageresource.StorageResourceDescription; -import org.apache.airavata.model.data.movement.DataMovementInterface; -import org.apache.airavata.model.data.movement.DataMovementProtocol; -import org.apache.airavata.model.data.movement.GridFTPDataMovement; -import org.apache.airavata.model.data.movement.SCPDataMovement; -import org.apache.airavata.model.data.movement.SecurityProtocol; +import org.apache.airavata.model.data.movement.*; import org.apache.airavata.registry.core.repositories.common.TestBase; import org.apache.airavata.registry.cpi.AppCatalogException; import org.junit.Test; diff --git a/modules/registry/registry-core/src/test/java/org/apache/airavata/registry/core/repositories/appcatalog/UserResourceProfileRepositoryTest.java b/modules/registry/registry-core/src/test/java/org/apache/airavata/registry/core/repositories/appcatalog/UserResourceProfileRepositoryTest.java index 470fb0d05b..13918a4a6f 100644 --- a/modules/registry/registry-core/src/test/java/org/apache/airavata/registry/core/repositories/appcatalog/UserResourceProfileRepositoryTest.java +++ b/modules/registry/registry-core/src/test/java/org/apache/airavata/registry/core/repositories/appcatalog/UserResourceProfileRepositoryTest.java @@ -9,11 +9,11 @@ import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.util.Arrays; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import java.util.*; - public class UserResourceProfileRepositoryTest extends TestBase { private static final Logger logger = LoggerFactory.getLogger(UserResourceProfileRepositoryTest.class); diff --git a/modules/registry/registry-core/src/test/java/org/apache/airavata/registry/core/repositories/common/TestBase.java b/modules/registry/registry-core/src/test/java/org/apache/airavata/registry/core/repositories/common/TestBase.java index 927538d5fa..5edce87b0e 100644 --- a/modules/registry/registry-core/src/test/java/org/apache/airavata/registry/core/repositories/common/TestBase.java +++ b/modules/registry/registry-core/src/test/java/org/apache/airavata/registry/core/repositories/common/TestBase.java @@ -1,10 +1,6 @@ package org.apache.airavata.registry.core.repositories.common; -import org.apache.airavata.common.utils.DBInitConfig; -import org.apache.airavata.common.utils.DBInitializer; -import org.apache.airavata.common.utils.DerbyTestUtil; -import org.apache.airavata.common.utils.DerbyUtil; -import org.apache.airavata.common.utils.JDBCConfig; +import org.apache.airavata.common.utils.*; import org.apache.airavata.registry.core.utils.AppCatalogDBInitConfig; import org.apache.airavata.registry.core.utils.ExpCatalogDBInitConfig; import org.apache.airavata.registry.core.utils.ReplicaCatalogDBInitConfig; diff --git a/modules/registry/registry-core/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/ExperimentErrorRepositoryTest.java b/modules/registry/registry-core/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/ExperimentErrorRepositoryTest.java index 395aa1484c..da94461cee 100644 --- a/modules/registry/registry-core/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/ExperimentErrorRepositoryTest.java +++ b/modules/registry/registry-core/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/ExperimentErrorRepositoryTest.java @@ -32,6 +32,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.util.List; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/modules/registry/registry-core/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/ExperimentInputRepositoryTest.java b/modules/registry/registry-core/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/ExperimentInputRepositoryTest.java index 861b766c70..d4106adbed 100644 --- a/modules/registry/registry-core/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/ExperimentInputRepositoryTest.java +++ b/modules/registry/registry-core/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/ExperimentInputRepositoryTest.java @@ -34,6 +34,7 @@ import org.slf4j.LoggerFactory; import java.util.ArrayList; import java.util.List; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/modules/registry/registry-core/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/ExperimentOutputRepositoryTest.java b/modules/registry/registry-core/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/ExperimentOutputRepositoryTest.java index 4321fa3671..4049973fcd 100644 --- a/modules/registry/registry-core/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/ExperimentOutputRepositoryTest.java +++ b/modules/registry/registry-core/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/ExperimentOutputRepositoryTest.java @@ -34,6 +34,7 @@ import org.slf4j.LoggerFactory; import java.util.ArrayList; import java.util.List; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/modules/registry/registry-core/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/GatewayRepositoryTest.java b/modules/registry/registry-core/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/GatewayRepositoryTest.java index 5763c76ca1..626ec3ccef 100644 --- a/modules/registry/registry-core/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/GatewayRepositoryTest.java +++ b/modules/registry/registry-core/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/GatewayRepositoryTest.java @@ -27,9 +27,11 @@ import org.apache.airavata.model.workspace.GatewayApprovalStatus; import org.apache.airavata.registry.core.repositories.common.TestBase; import org.apache.airavata.registry.cpi.RegistryException; import org.junit.Test; + +import java.util.List; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; -import java.util.List; public class GatewayRepositoryTest extends TestBase { diff --git a/modules/registry/registry-core/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/JobRepositoryTest.java b/modules/registry/registry-core/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/JobRepositoryTest.java index 998390f8e5..d221eed481 100644 --- a/modules/registry/registry-core/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/JobRepositoryTest.java +++ b/modules/registry/registry-core/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/JobRepositoryTest.java @@ -39,9 +39,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.util.List; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.assertFalse; + +import static org.junit.Assert.*; public class JobRepositoryTest extends TestBase { diff --git a/modules/registry/registry-core/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/ProcessErrorRepositoryTest.java b/modules/registry/registry-core/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/ProcessErrorRepositoryTest.java index 6080c01ca5..a397aedf80 100644 --- a/modules/registry/registry-core/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/ProcessErrorRepositoryTest.java +++ b/modules/registry/registry-core/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/ProcessErrorRepositoryTest.java @@ -33,6 +33,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.util.List; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/modules/registry/registry-core/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/ProcessInputRepositoryTest.java b/modules/registry/registry-core/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/ProcessInputRepositoryTest.java index 5db397f13d..6252e5c344 100644 --- a/modules/registry/registry-core/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/ProcessInputRepositoryTest.java +++ b/modules/registry/registry-core/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/ProcessInputRepositoryTest.java @@ -35,6 +35,7 @@ import org.slf4j.LoggerFactory; import java.util.ArrayList; import java.util.List; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/modules/registry/registry-core/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/ProcessOutputRepositoryTest.java b/modules/registry/registry-core/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/ProcessOutputRepositoryTest.java index 43a6f82b90..04767e45e6 100644 --- a/modules/registry/registry-core/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/ProcessOutputRepositoryTest.java +++ b/modules/registry/registry-core/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/ProcessOutputRepositoryTest.java @@ -35,6 +35,7 @@ import org.slf4j.LoggerFactory; import java.util.ArrayList; import java.util.List; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/modules/registry/registry-core/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/ProcessStatusRepositoryTest.java b/modules/registry/registry-core/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/ProcessStatusRepositoryTest.java index 32d939a425..7fb2b8ba1e 100644 --- a/modules/registry/registry-core/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/ProcessStatusRepositoryTest.java +++ b/modules/registry/registry-core/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/ProcessStatusRepositoryTest.java @@ -33,9 +33,7 @@ import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import static org.junit.Assert.*; public class ProcessStatusRepositoryTest extends TestBase { diff --git a/modules/registry/registry-core/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/QueueStatusRepositoryTest.java b/modules/registry/registry-core/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/QueueStatusRepositoryTest.java index 0f06631316..778f7efb0e 100644 --- a/modules/registry/registry-core/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/QueueStatusRepositoryTest.java +++ b/modules/registry/registry-core/src/test/java/org/apache/airavata/registry/core/repositories/expcatalog/QueueStatusRepositoryTest.java @@ -29,6 +29,7 @@ import org.slf4j.LoggerFactory; import java.util.Arrays; import java.util.List; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/modules/registry/registry-core/src/test/java/org/apache/airavata/registry/core/repositories/replicacatalog/DataProductRepositoryTest.java b/modules/registry/registry-core/src/test/java/org/apache/airavata/registry/core/repositories/replicacatalog/DataProductRepositoryTest.java index 2e191c7ef5..89377292c7 100644 --- a/modules/registry/registry-core/src/test/java/org/apache/airavata/registry/core/repositories/replicacatalog/DataProductRepositoryTest.java +++ b/modules/registry/registry-core/src/test/java/org/apache/airavata/registry/core/repositories/replicacatalog/DataProductRepositoryTest.java @@ -19,11 +19,7 @@ */ package org.apache.airavata.registry.core.repositories.replicacatalog; -import org.apache.airavata.model.data.replica.DataProductModel; -import org.apache.airavata.model.data.replica.DataProductType; -import org.apache.airavata.model.data.replica.DataReplicaLocationModel; -import org.apache.airavata.model.data.replica.ReplicaLocationCategory; -import org.apache.airavata.model.data.replica.ReplicaPersistentType; +import org.apache.airavata.model.data.replica.*; import org.apache.airavata.registry.core.entities.replicacatalog.DataProductMetadataEntity; import org.apache.airavata.registry.core.repositories.common.TestBase; import org.apache.airavata.registry.cpi.ReplicaCatalogException; @@ -33,9 +29,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.Assert.*; public class DataProductRepositoryTest extends TestBase { diff --git a/modules/registry/registry-core/src/test/java/org/apache/airavata/registry/core/repositories/replicacatalog/DataReplicaLocationRepositoryTest.java b/modules/registry/registry-core/src/test/java/org/apache/airavata/registry/core/repositories/replicacatalog/DataReplicaLocationRepositoryTest.java index 0082473344..21a5e3f43d 100644 --- a/modules/registry/registry-core/src/test/java/org/apache/airavata/registry/core/repositories/replicacatalog/DataReplicaLocationRepositoryTest.java +++ b/modules/registry/registry-core/src/test/java/org/apache/airavata/registry/core/repositories/replicacatalog/DataReplicaLocationRepositoryTest.java @@ -34,7 +34,6 @@ import java.util.List; import java.util.Map; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; public class DataReplicaLocationRepositoryTest extends TestBase { diff --git a/modules/registry/registry-core/src/test/java/org/apache/airavata/registry/core/utils/ObjectMapperSingletonTest.java b/modules/registry/registry-core/src/test/java/org/apache/airavata/registry/core/utils/ObjectMapperSingletonTest.java index 9d29b84bd7..604873d216 100644 --- a/modules/registry/registry-core/src/test/java/org/apache/airavata/registry/core/utils/ObjectMapperSingletonTest.java +++ b/modules/registry/registry-core/src/test/java/org/apache/airavata/registry/core/utils/ObjectMapperSingletonTest.java @@ -21,6 +21,7 @@ package org.apache.airavata.registry.core.utils; +import org.apache.airavata.model.data.movement.SecurityProtocol; import org.apache.airavata.model.experiment.UserConfigurationDataModel; import org.junit.Assert; import org.junit.Test; @@ -39,6 +40,18 @@ public class ObjectMapperSingletonTest { } } + public static class TestSecurityProtocolModel { + private SecurityProtocol securityProtocol; + + public SecurityProtocol getSecurityProtocol() { + return securityProtocol; + } + + public void setSecurityProtocol(SecurityProtocol securityProtocol) { + this.securityProtocol = securityProtocol; + } + } + @Test public void testCopyBooleanFieldsWithDefaultValue() { @@ -63,4 +76,16 @@ public class ObjectMapperSingletonTest { userConfigurationDataModel.isSetShareExperimentPublicly()); Assert.assertFalse(userConfigurationDataModel.isShareExperimentPublicly()); } + + @Test + public void testEnumMapping() { + TestSecurityProtocolModel source = new TestSecurityProtocolModel(); + source.setSecurityProtocol(SecurityProtocol.SSH_KEYS); + + TestSecurityProtocolModel target = ObjectMapperSingleton.getInstance() + .map(source, TestSecurityProtocolModel.class); + + Assert.assertNotNull("Mapped enum should not be null", target.getSecurityProtocol()); + Assert.assertEquals("Mapped enum should match source", SecurityProtocol.SSH_KEYS, target.getSecurityProtocol()); + } } diff --git a/modules/registry/registry-cpi/src/main/java/org/apache/airavata/registry/cpi/UsrResourceProfile.java b/modules/registry/registry-cpi/src/main/java/org/apache/airavata/registry/cpi/UsrResourceProfile.java index ff31d712ea..9a697912c4 100644 --- a/modules/registry/registry-cpi/src/main/java/org/apache/airavata/registry/cpi/UsrResourceProfile.java +++ b/modules/registry/registry-cpi/src/main/java/org/apache/airavata/registry/cpi/UsrResourceProfile.java @@ -19,9 +19,10 @@ */ package org.apache.airavata.registry.cpi; -import org.apache.airavata.model.appcatalog.userresourceprofile.UserResourceProfile; import org.apache.airavata.model.appcatalog.userresourceprofile.UserComputeResourcePreference; +import org.apache.airavata.model.appcatalog.userresourceprofile.UserResourceProfile; import org.apache.airavata.model.appcatalog.userresourceprofile.UserStoragePreference; + import java.util.List; public interface UsrResourceProfile { diff --git a/modules/registry/registry-cpi/src/main/java/org/apache/airavata/registry/cpi/WorkflowCatalog.java b/modules/registry/registry-cpi/src/main/java/org/apache/airavata/registry/cpi/WorkflowCatalog.java index 26f1554b1f..a40b9eefe8 100644 --- a/modules/registry/registry-cpi/src/main/java/org/apache/airavata/registry/cpi/WorkflowCatalog.java +++ b/modules/registry/registry-cpi/src/main/java/org/apache/airavata/registry/cpi/WorkflowCatalog.java @@ -19,11 +19,8 @@ */ package org.apache.airavata.registry.cpi; -import org.apache.airavata.model.application.io.OutputDataObjectType; import org.apache.airavata.model.workflow.AiravataWorkflow; -import java.util.List; - public interface WorkflowCatalog { // public List<String> getAllWorkflows(String gatewayId) throws WorkflowCatalogException; diff --git a/modules/registry/registry-server/registry-api-service/src/main/java/org/apache/airavata/registry/api/service/RegistryAPIServer.java b/modules/registry/registry-server/registry-api-service/src/main/java/org/apache/airavata/registry/api/service/RegistryAPIServer.java index 37eb49ae8a..37a1bf3852 100644 --- a/modules/registry/registry-server/registry-api-service/src/main/java/org/apache/airavata/registry/api/service/RegistryAPIServer.java +++ b/modules/registry/registry-server/registry-api-service/src/main/java/org/apache/airavata/registry/api/service/RegistryAPIServer.java @@ -19,10 +19,6 @@ */ package org.apache.airavata.registry.api.service; -import java.net.InetSocketAddress; -import java.util.Arrays; -import java.util.List; - import org.apache.airavata.common.utils.DBInitConfig; import org.apache.airavata.common.utils.DBInitializer; import org.apache.airavata.common.utils.IServer; @@ -42,6 +38,10 @@ import org.apache.thrift.transport.TTransportException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.net.InetSocketAddress; +import java.util.Arrays; +import java.util.List; + public class RegistryAPIServer implements IServer { private final static Logger logger = LoggerFactory.getLogger(RegistryAPIServer.class); diff --git a/modules/registry/registry-server/registry-api-service/src/main/java/org/apache/airavata/registry/api/service/handler/RegistryServerHandler.java b/modules/registry/registry-server/registry-api-service/src/main/java/org/apache/airavata/registry/api/service/handler/RegistryServerHandler.java index 4464b2a8e8..dddf388125 100644 --- a/modules/registry/registry-server/registry-api-service/src/main/java/org/apache/airavata/registry/api/service/handler/RegistryServerHandler.java +++ b/modules/registry/registry-server/registry-api-service/src/main/java/org/apache/airavata/registry/api/service/handler/RegistryServerHandler.java @@ -43,8 +43,8 @@ import org.apache.airavata.model.appcatalog.userresourceprofile.UserStoragePrefe import org.apache.airavata.model.application.io.InputDataObjectType; import org.apache.airavata.model.application.io.OutputDataObjectType; import org.apache.airavata.model.commons.ErrorModel; -import org.apache.airavata.model.data.movement.DMType; import org.apache.airavata.model.data.movement.*; +import org.apache.airavata.model.data.movement.DMType; import org.apache.airavata.model.data.replica.DataProductModel; import org.apache.airavata.model.data.replica.DataReplicaLocationModel; import org.apache.airavata.model.error.*; @@ -63,7 +63,6 @@ import org.apache.airavata.model.workspace.Project; import org.apache.airavata.registry.api.RegistryService; import org.apache.airavata.registry.api.exception.RegistryServiceException; import org.apache.airavata.registry.api.registry_apiConstants; -import org.apache.airavata.registry.core.entities.expcatalog.ComputationalResourceSchedulingEntity; import org.apache.airavata.registry.core.entities.expcatalog.JobPK; import org.apache.airavata.registry.core.repositories.appcatalog.*; import org.apache.airavata.registry.core.repositories.expcatalog.*; diff --git a/modules/registry/registry-tools/jpa-gen/src/main/java/appcatalog/computeresource/BatchQueueGenerator.java b/modules/registry/registry-tools/jpa-gen/src/main/java/appcatalog/computeresource/BatchQueueGenerator.java index e3cdcf78f7..db94730589 100644 --- a/modules/registry/registry-tools/jpa-gen/src/main/java/appcatalog/computeresource/BatchQueueGenerator.java +++ b/modules/registry/registry-tools/jpa-gen/src/main/java/appcatalog/computeresource/BatchQueueGenerator.java @@ -22,13 +22,12 @@ package appcatalog.computeresource; import generators.JPAClassGenerator; import generators.JPAResourceClassGenerator; import generators.SQLGenerator; - -import java.util.Arrays; - import model.JPAClassModel; import model.JPAResourceClassModel; import model.SQLData; +import java.util.Arrays; + public class BatchQueueGenerator { private static SQLData createSQLData() { SQLData data = new SQLData(); diff --git a/modules/registry/registry-tools/jpa-gen/src/main/java/appcatalog/computeresource/ComputeResourceDescriptionGenerator.java b/modules/registry/registry-tools/jpa-gen/src/main/java/appcatalog/computeresource/ComputeResourceDescriptionGenerator.java index 4b4b6bd4d3..990c05d913 100644 --- a/modules/registry/registry-tools/jpa-gen/src/main/java/appcatalog/computeresource/ComputeResourceDescriptionGenerator.java +++ b/modules/registry/registry-tools/jpa-gen/src/main/java/appcatalog/computeresource/ComputeResourceDescriptionGenerator.java @@ -22,13 +22,12 @@ package appcatalog.computeresource; import generators.JPAClassGenerator; import generators.JPAResourceClassGenerator; import generators.SQLGenerator; - -import java.util.Arrays; - import model.JPAClassModel; import model.JPAResourceClassModel; import model.SQLData; +import java.util.Arrays; + public class ComputeResourceDescriptionGenerator { private static SQLData createSQLData() { SQLData data = new SQLData(); diff --git a/modules/registry/registry-tools/jpa-gen/src/main/java/appcatalog/computeresource/DataMovementInterfaceGenerator.java b/modules/registry/registry-tools/jpa-gen/src/main/java/appcatalog/computeresource/DataMovementInterfaceGenerator.java index 4f805d18cc..61ac09b1e7 100644 --- a/modules/registry/registry-tools/jpa-gen/src/main/java/appcatalog/computeresource/DataMovementInterfaceGenerator.java +++ b/modules/registry/registry-tools/jpa-gen/src/main/java/appcatalog/computeresource/DataMovementInterfaceGenerator.java @@ -22,13 +22,12 @@ package appcatalog.computeresource; import generators.JPAClassGenerator; import generators.JPAResourceClassGenerator; import generators.SQLGenerator; - -import java.util.Arrays; - import model.JPAClassModel; import model.JPAResourceClassModel; import model.SQLData; +import java.util.Arrays; + public class DataMovementInterfaceGenerator { private static SQLData createSQLData() { SQLData data = new SQLData(); diff --git a/modules/registry/registry-tools/jpa-gen/src/main/java/appcatalog/computeresource/FileSystemsGenerator.java b/modules/registry/registry-tools/jpa-gen/src/main/java/appcatalog/computeresource/FileSystemsGenerator.java index 5fa132f474..d9f0b257c1 100644 --- a/modules/registry/registry-tools/jpa-gen/src/main/java/appcatalog/computeresource/FileSystemsGenerator.java +++ b/modules/registry/registry-tools/jpa-gen/src/main/java/appcatalog/computeresource/FileSystemsGenerator.java @@ -22,13 +22,12 @@ package appcatalog.computeresource; import generators.JPAClassGenerator; import generators.JPAResourceClassGenerator; import generators.SQLGenerator; - -import java.util.Arrays; - import model.JPAClassModel; import model.JPAResourceClassModel; import model.SQLData; +import java.util.Arrays; + public class FileSystemsGenerator { private static SQLData createSQLData() { SQLData data = new SQLData(); diff --git a/modules/registry/registry-tools/jpa-gen/src/main/java/appcatalog/computeresource/GridFTPDataMovementGenerator.java b/modules/registry/registry-tools/jpa-gen/src/main/java/appcatalog/computeresource/GridFTPDataMovementGenerator.java index 85e9cc7b6e..97a7c6672d 100644 --- a/modules/registry/registry-tools/jpa-gen/src/main/java/appcatalog/computeresource/GridFTPDataMovementGenerator.java +++ b/modules/registry/registry-tools/jpa-gen/src/main/java/appcatalog/computeresource/GridFTPDataMovementGenerator.java @@ -22,13 +22,12 @@ package appcatalog.computeresource; import generators.JPAClassGenerator; import generators.JPAResourceClassGenerator; import generators.SQLGenerator; - -import java.util.Arrays; - import model.JPAClassModel; import model.JPAResourceClassModel; import model.SQLData; +import java.util.Arrays; + public class GridFTPDataMovementGenerator { private static SQLData createSQLData() { SQLData data = new SQLData(); diff --git a/modules/registry/registry-tools/jpa-gen/src/main/java/appcatalog/computeresource/GridFTPEndpointsGenerator.java b/modules/registry/registry-tools/jpa-gen/src/main/java/appcatalog/computeresource/GridFTPEndpointsGenerator.java index 73feda9acb..faff90bd22 100644 --- a/modules/registry/registry-tools/jpa-gen/src/main/java/appcatalog/computeresource/GridFTPEndpointsGenerator.java +++ b/modules/registry/registry-tools/jpa-gen/src/main/java/appcatalog/computeresource/GridFTPEndpointsGenerator.java @@ -22,13 +22,12 @@ package appcatalog.computeresource; import generators.JPAClassGenerator; import generators.JPAResourceClassGenerator; import generators.SQLGenerator; - -import java.util.Arrays; - import model.JPAClassModel; import model.JPAResourceClassModel; import model.SQLData; +import java.util.Arrays; + public class GridFTPEndpointsGenerator { private static SQLData createSQLData() { SQLData data = new SQLData(); diff --git a/modules/registry/registry-tools/jpa-gen/src/main/java/appcatalog/computeresource/JobManagerCommandGenerator.java b/modules/registry/registry-tools/jpa-gen/src/main/java/appcatalog/computeresource/JobManagerCommandGenerator.java index 3e022925ff..9215d69c6e 100644 --- a/modules/registry/registry-tools/jpa-gen/src/main/java/appcatalog/computeresource/JobManagerCommandGenerator.java +++ b/modules/registry/registry-tools/jpa-gen/src/main/java/appcatalog/computeresource/JobManagerCommandGenerator.java @@ -22,13 +22,12 @@ package appcatalog.computeresource; import generators.JPAClassGenerator; import generators.JPAResourceClassGenerator; import generators.SQLGenerator; - -import java.util.Arrays; - import model.JPAClassModel; import model.JPAResourceClassModel; import model.SQLData; +import java.util.Arrays; + public class JobManagerCommandGenerator { private static SQLData createSQLData() { SQLData data = new SQLData(); diff --git a/modules/registry/registry-tools/jpa-gen/src/main/java/appcatalog/computeresource/JobSubmissionInterfaceGenerator.java b/modules/registry/registry-tools/jpa-gen/src/main/java/appcatalog/computeresource/JobSubmissionInterfaceGenerator.java index 650a6ade12..ece7da032d 100644 --- a/modules/registry/registry-tools/jpa-gen/src/main/java/appcatalog/computeresource/JobSubmissionInterfaceGenerator.java +++ b/modules/registry/registry-tools/jpa-gen/src/main/java/appcatalog/computeresource/JobSubmissionInterfaceGenerator.java @@ -22,13 +22,12 @@ package appcatalog.computeresource; import generators.JPAClassGenerator; import generators.JPAResourceClassGenerator; import generators.SQLGenerator; - -import java.util.Arrays; - import model.JPAClassModel; import model.JPAResourceClassModel; import model.SQLData; +import java.util.Arrays; + public class JobSubmissionInterfaceGenerator { private static SQLData createSQLData() { SQLData data = new SQLData(); diff --git a/modules/registry/registry-tools/jpa-gen/src/main/java/appcatalog/computeresource/LocalDataMovementGenerator.java b/modules/registry/registry-tools/jpa-gen/src/main/java/appcatalog/computeresource/LocalDataMovementGenerator.java index 01c664641a..99ede01937 100644 --- a/modules/registry/registry-tools/jpa-gen/src/main/java/appcatalog/computeresource/LocalDataMovementGenerator.java +++ b/modules/registry/registry-tools/jpa-gen/src/main/java/appcatalog/computeresource/LocalDataMovementGenerator.java @@ -22,13 +22,12 @@ package appcatalog.computeresource; import generators.JPAClassGenerator; import generators.JPAResourceClassGenerator; import generators.SQLGenerator; - -import java.util.Arrays; - import model.JPAClassModel; import model.JPAResourceClassModel; import model.SQLData; +import java.util.Arrays; + public class LocalDataMovementGenerator { private static SQLData createSQLData() { SQLData data = new SQLData(); diff --git a/modules/registry/registry-tools/jpa-gen/src/main/java/appcatalog/computeresource/LocalSubmissionGenerator.java b/modules/registry/registry-tools/jpa-gen/src/main/java/appcatalog/computeresource/LocalSubmissionGenerator.java index cbb6b7f503..b3189796c9 100644 --- a/modules/registry/registry-tools/jpa-gen/src/main/java/appcatalog/computeresource/LocalSubmissionGenerator.java +++ b/modules/registry/registry-tools/jpa-gen/src/main/java/appcatalog/computeresource/LocalSubmissionGenerator.java @@ -22,13 +22,12 @@ package appcatalog.computeresource; import generators.JPAClassGenerator; import generators.JPAResourceClassGenerator; import generators.SQLGenerator; - -import java.util.Arrays; - import model.JPAClassModel; import model.JPAResourceClassModel; import model.SQLData; +import java.util.Arrays; + public class LocalSubmissionGenerator { private static SQLData createSQLData() { SQLData data = new SQLData(); diff --git a/modules/registry/registry-tools/jpa-gen/src/main/java/appcatalog/computeresource/ResourceJobManagerGenerator.java b/modules/registry/registry-tools/jpa-gen/src/main/java/appcatalog/computeresource/ResourceJobManagerGenerator.java index 375f007ad1..bce41045bc 100644 --- a/modules/registry/registry-tools/jpa-gen/src/main/java/appcatalog/computeresource/ResourceJobManagerGenerator.java +++ b/modules/registry/registry-tools/jpa-gen/src/main/java/appcatalog/computeresource/ResourceJobManagerGenerator.java @@ -22,13 +22,12 @@ package appcatalog.computeresource; import generators.JPAClassGenerator; import generators.JPAResourceClassGenerator; import generators.SQLGenerator; - -import java.util.Arrays; - import model.JPAClassModel; import model.JPAResourceClassModel; import model.SQLData; +import java.util.Arrays; + public class ResourceJobManagerGenerator { private static SQLData createSQLData() { SQLData data = new SQLData(); diff --git a/modules/registry/registry-tools/jpa-gen/src/main/java/appcatalog/computeresource/SCPDataMovementGenerator.java b/modules/registry/registry-tools/jpa-gen/src/main/java/appcatalog/computeresource/SCPDataMovementGenerator.java index f77d082651..cb91ec3c59 100644 --- a/modules/registry/registry-tools/jpa-gen/src/main/java/appcatalog/computeresource/SCPDataMovementGenerator.java +++ b/modules/registry/registry-tools/jpa-gen/src/main/java/appcatalog/computeresource/SCPDataMovementGenerator.java @@ -22,13 +22,12 @@ package appcatalog.computeresource; import generators.JPAClassGenerator; import generators.JPAResourceClassGenerator; import generators.SQLGenerator; - -import java.util.Arrays; - import model.JPAClassModel; import model.JPAResourceClassModel; import model.SQLData; +import java.util.Arrays; + public class SCPDataMovementGenerator { private static SQLData createSQLData() { SQLData data = new SQLData(); diff --git a/modules/registry/registry-tools/jpa-gen/src/main/java/appcatalog/computeresource/SSHJobSubmissionGenerator.java b/modules/registry/registry-tools/jpa-gen/src/main/java/appcatalog/computeresource/SSHJobSubmissionGenerator.java index a37be9c912..cd8dbc7314 100644 --- a/modules/registry/registry-tools/jpa-gen/src/main/java/appcatalog/computeresource/SSHJobSubmissionGenerator.java +++ b/modules/registry/registry-tools/jpa-gen/src/main/java/appcatalog/computeresource/SSHJobSubmissionGenerator.java @@ -22,13 +22,12 @@ package appcatalog.computeresource; import generators.JPAClassGenerator; import generators.JPAResourceClassGenerator; import generators.SQLGenerator; - -import java.util.Arrays; - import model.JPAClassModel; import model.JPAResourceClassModel; import model.SQLData; +import java.util.Arrays; + public class SSHJobSubmissionGenerator { private static SQLData createSQLData() { SQLData data = new SQLData(); diff --git a/modules/registry/registry-tools/jpa-gen/src/main/java/generators/JPAClassGenerator.java b/modules/registry/registry-tools/jpa-gen/src/main/java/generators/JPAClassGenerator.java index 734daf9c02..3d60a46431 100644 --- a/modules/registry/registry-tools/jpa-gen/src/main/java/generators/JPAClassGenerator.java +++ b/modules/registry/registry-tools/jpa-gen/src/main/java/generators/JPAClassGenerator.java @@ -18,14 +18,15 @@ * under the License. */ package generators; -import java.util.ArrayList; -import java.util.List; import model.JPAClassField; import model.JPAClassModel; import model.JPAPKClassModel; import model.SQLData; +import java.util.ArrayList; +import java.util.List; + /* * diff --git a/modules/registry/registry-tools/jpa-gen/src/main/java/generators/JPAResourceClassGenerator.java b/modules/registry/registry-tools/jpa-gen/src/main/java/generators/JPAResourceClassGenerator.java index 84993c3c00..4a0a96599a 100644 --- a/modules/registry/registry-tools/jpa-gen/src/main/java/generators/JPAResourceClassGenerator.java +++ b/modules/registry/registry-tools/jpa-gen/src/main/java/generators/JPAResourceClassGenerator.java @@ -18,13 +18,14 @@ * under the License. */ package generators; -import java.util.ArrayList; -import java.util.List; import model.JPAClassField; import model.JPAClassModel; import model.JPAResourceClassModel; +import java.util.ArrayList; +import java.util.List; + /* * diff --git a/modules/registry/registry-tools/jpa-gen/src/main/java/generators/SQLGenerator.java b/modules/registry/registry-tools/jpa-gen/src/main/java/generators/SQLGenerator.java index c329ca967e..1504e08ff7 100644 --- a/modules/registry/registry-tools/jpa-gen/src/main/java/generators/SQLGenerator.java +++ b/modules/registry/registry-tools/jpa-gen/src/main/java/generators/SQLGenerator.java @@ -18,14 +18,14 @@ * under the License. */ package generators; -import java.util.ArrayList; -import java.util.List; import model.SQLData; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.util.ArrayList; +import java.util.List; + /* * * Licensed to the Apache Software Foundation (ASF) under one diff --git a/modules/registry/registry-tools/jpa-gen/src/main/java/test/Test.java b/modules/registry/registry-tools/jpa-gen/src/main/java/test/Test.java index d5a73a2022..f4288801f0 100644 --- a/modules/registry/registry-tools/jpa-gen/src/main/java/test/Test.java +++ b/modules/registry/registry-tools/jpa-gen/src/main/java/test/Test.java @@ -22,13 +22,12 @@ package test; import generators.JPAClassGenerator; import generators.JPAResourceClassGenerator; import generators.SQLGenerator; - -import java.util.Arrays; - import model.JPAClassModel; import model.JPAResourceClassModel; import model.SQLData; +import java.util.Arrays; + /* * * Licensed to the Apache Software Foundation (ASF) under one diff --git a/modules/registry/registry-tools/registry-tool/src/main/java/org/apache/airavata/registry/tool/DBMigrator.java b/modules/registry/registry-tools/registry-tool/src/main/java/org/apache/airavata/registry/tool/DBMigrator.java index 2be51c31dd..609097d66e 100644 --- a/modules/registry/registry-tools/registry-tool/src/main/java/org/apache/airavata/registry/tool/DBMigrator.java +++ b/modules/registry/registry-tools/registry-tool/src/main/java/org/apache/airavata/registry/tool/DBMigrator.java @@ -27,8 +27,10 @@ import java.io.*; import java.net.URI; import java.sql.*; import java.text.DecimalFormat; -import java.util.*; +import java.util.Calendar; import java.util.Date; +import java.util.Scanner; +import java.util.StringTokenizer; public class DBMigrator { private static final Logger logger = LoggerFactory.getLogger(DBMigrator.class); diff --git a/modules/security/src/main/java/org/apache/airavata/security/AbstractAuthenticator.java b/modules/security/src/main/java/org/apache/airavata/security/AbstractAuthenticator.java index ec79fcd2de..9aa175bc7b 100644 --- a/modules/security/src/main/java/org/apache/airavata/security/AbstractAuthenticator.java +++ b/modules/security/src/main/java/org/apache/airavata/security/AbstractAuthenticator.java @@ -19,8 +19,6 @@ */ package org.apache.airavata.security; -import org.apache.airavata.common.context.RequestContext; -import org.apache.airavata.common.context.WorkflowContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/modules/security/src/main/java/org/apache/airavata/security/userstore/AbstractJDBCUserStore.java b/modules/security/src/main/java/org/apache/airavata/security/userstore/AbstractJDBCUserStore.java index 75e69d04cf..29efcfdaa9 100644 --- a/modules/security/src/main/java/org/apache/airavata/security/userstore/AbstractJDBCUserStore.java +++ b/modules/security/src/main/java/org/apache/airavata/security/userstore/AbstractJDBCUserStore.java @@ -20,7 +20,6 @@ package org.apache.airavata.security.userstore; import org.apache.airavata.common.exception.ApplicationSettingsException; -import org.apache.airavata.common.utils.ApplicationSettings; import org.apache.airavata.common.utils.ServerSettings; import org.apache.airavata.security.UserStore; import org.apache.airavata.security.UserStoreException; diff --git a/modules/security/src/main/java/org/apache/airavata/security/userstore/JDBCUserStore.java b/modules/security/src/main/java/org/apache/airavata/security/userstore/JDBCUserStore.java index c94ddcd029..53c55c2117 100644 --- a/modules/security/src/main/java/org/apache/airavata/security/userstore/JDBCUserStore.java +++ b/modules/security/src/main/java/org/apache/airavata/security/userstore/JDBCUserStore.java @@ -19,8 +19,8 @@ */ package org.apache.airavata.security.userstore; -import org.apache.airavata.security.UserStoreException; import org.apache.airavata.common.utils.DBUtil; +import org.apache.airavata.security.UserStoreException; import org.apache.airavata.security.util.PasswordDigester; import org.apache.shiro.authc.AuthenticationException; import org.apache.shiro.authc.AuthenticationInfo; diff --git a/modules/security/src/main/java/org/apache/airavata/security/userstore/SessionDBUserStore.java b/modules/security/src/main/java/org/apache/airavata/security/userstore/SessionDBUserStore.java index b09a0f46c9..5f9dba000d 100644 --- a/modules/security/src/main/java/org/apache/airavata/security/userstore/SessionDBUserStore.java +++ b/modules/security/src/main/java/org/apache/airavata/security/userstore/SessionDBUserStore.java @@ -19,8 +19,8 @@ */ package org.apache.airavata.security.userstore; -import org.apache.airavata.security.UserStoreException; import org.apache.airavata.common.utils.DBUtil; +import org.apache.airavata.security.UserStoreException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.w3c.dom.Element; diff --git a/modules/security/src/main/java/org/apache/airavata/security/util/TrustStoreManager.java b/modules/security/src/main/java/org/apache/airavata/security/util/TrustStoreManager.java index 165b39e19d..3c857b42ba 100644 --- a/modules/security/src/main/java/org/apache/airavata/security/util/TrustStoreManager.java +++ b/modules/security/src/main/java/org/apache/airavata/security/util/TrustStoreManager.java @@ -21,6 +21,8 @@ package org.apache.airavata.security.util; import org.apache.airavata.common.utils.SecurityUtil; import org.apache.airavata.security.AiravataSecurityException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import javax.net.ssl.SSLContext; import javax.net.ssl.TrustManager; @@ -31,8 +33,6 @@ import java.security.KeyStore; import java.security.KeyStoreException; import java.security.NoSuchAlgorithmException; import java.security.cert.CertificateException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; public class TrustStoreManager { private final static Logger logger = LoggerFactory.getLogger(TrustStoreManager.class); diff --git a/modules/server/src/main/java/org/apache/airavata/server/ServerMain.java b/modules/server/src/main/java/org/apache/airavata/server/ServerMain.java index 81be315cce..1de90eac72 100644 --- a/modules/server/src/main/java/org/apache/airavata/server/ServerMain.java +++ b/modules/server/src/main/java/org/apache/airavata/server/ServerMain.java @@ -21,14 +21,16 @@ package org.apache.airavata.server; import org.apache.airavata.common.exception.AiravataException; import org.apache.airavata.common.exception.ApplicationSettingsException; -import org.apache.airavata.common.utils.*; +import org.apache.airavata.common.utils.ApplicationSettings; import org.apache.airavata.common.utils.ApplicationSettings.ShutdownStrategy; +import org.apache.airavata.common.utils.IServer; import org.apache.airavata.common.utils.IServer.ServerStatus; +import org.apache.airavata.common.utils.ServerSettings; +import org.apache.airavata.common.utils.StringUtil; import org.apache.airavata.common.utils.StringUtil.CommandLineParameters; import org.apache.airavata.patform.monitoring.MonitoringServer; import org.apache.commons.cli.ParseException; import org.apache.zookeeper.server.ServerCnxnFactory; -import org.slf4j.ILoggerFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -181,7 +183,7 @@ public class ServerMain { Runtime.getRuntime().addShutdownHook(new Thread(monitoringServer::stop)); } - CommandLineParameters commandLineParameters = StringUtil.getCommandLineParser(args); + CommandLineParameters commandLineParameters = new StringUtil.CommandLineParameters(args); if (commandLineParameters.getArguments().contains(STOP_COMMAND_STR)){ performServerStopRequest(commandLineParameters); } else { diff --git a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/AbstractRepository.java b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/AbstractRepository.java index 1e6c9b143a..0c2297a377 100644 --- a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/AbstractRepository.java +++ b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/AbstractRepository.java @@ -24,7 +24,7 @@ import org.apache.airavata.sharing.registry.db.utils.DBConstants; import org.apache.airavata.sharing.registry.db.utils.JPAUtils; import org.apache.airavata.sharing.registry.db.utils.ObjectMapperSingleton; import org.apache.airavata.sharing.registry.models.SharingRegistryException; -import org.dozer.Mapper; +import com.github.dozermapper.core.Mapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -55,7 +55,7 @@ public abstract class AbstractRepository<T, E, Id> { } public T update(T t) throws SharingRegistryException { - Mapper mapper = ObjectMapperSingleton.getInstance(); + Mapper mapper = ObjectMapperSingleton.getInstance().getMapper(); E entity = mapper.map(t, dbEntityGenericClass); E persistedCopy = execute(entityManager -> entityManager.merge(entity)); return mapper.map(persistedCopy, thriftGenericClass); @@ -87,7 +87,7 @@ public abstract class AbstractRepository<T, E, Id> { public T get(Id id) throws SharingRegistryException { E entity = execute(entityManager -> entityManager .find(dbEntityGenericClass, id)); - Mapper mapper = ObjectMapperSingleton.getInstance(); + Mapper mapper = ObjectMapperSingleton.getInstance().getMapper(); if(entity == null) return null; return mapper.map(entity, thriftGenericClass); @@ -128,7 +128,7 @@ public abstract class AbstractRepository<T, E, Id> { } return q.setFirstResult(offset).setMaxResults(newLimit).getResultList(); }); - Mapper mapper = ObjectMapperSingleton.getInstance(); + Mapper mapper = ObjectMapperSingleton.getInstance().getMapper(); List<T> gatewayList = new ArrayList<>(); resultSet.stream().forEach(rs -> gatewayList.add(mapper.map(rs, thriftGenericClass))); return gatewayList; @@ -143,7 +143,7 @@ public abstract class AbstractRepository<T, E, Id> { } return q.setFirstResult(offset).setMaxResults(newLimit).getResultList(); }); - Mapper mapper = ObjectMapperSingleton.getInstance(); + Mapper mapper = ObjectMapperSingleton.getInstance().getMapper(); List<T> gatewayList = new ArrayList<>(); resultSet.stream().forEach(rs -> gatewayList.add(mapper.map(rs, thriftGenericClass))); return gatewayList; diff --git a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/utils/ObjectMapperSingleton.java b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/utils/ObjectMapperSingleton.java index 9433359bb1..a77e08195e 100644 --- a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/utils/ObjectMapperSingleton.java +++ b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/utils/ObjectMapperSingleton.java @@ -19,20 +19,28 @@ */ package org.apache.airavata.sharing.registry.db.utils; -import org.dozer.DozerBeanMapper; +import com.github.dozermapper.core.DozerBeanMapperBuilder; +import com.github.dozermapper.core.Mapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class ObjectMapperSingleton extends DozerBeanMapper{ +public class ObjectMapperSingleton { private final static Logger logger = LoggerFactory.getLogger(ObjectMapperSingleton.class); private static ObjectMapperSingleton instance; + private final Mapper mapper; - private ObjectMapperSingleton(){} + private ObjectMapperSingleton() { + mapper = DozerBeanMapperBuilder.buildDefault(); + } - public static ObjectMapperSingleton getInstance(){ - if(instance == null) + public static ObjectMapperSingleton getInstance() { + if (instance == null) instance = new ObjectMapperSingleton(); return instance; } + + public Mapper getMapper() { + return mapper; + } } \ No newline at end of file diff --git a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/server/SharingRegistryServerHandler.java b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/server/SharingRegistryServerHandler.java index 8ef65307d2..989b023dc7 100644 --- a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/server/SharingRegistryServerHandler.java +++ b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/server/SharingRegistryServerHandler.java @@ -28,7 +28,7 @@ import org.apache.airavata.sharing.registry.db.utils.SharingRegistryDBInitConfig import org.apache.airavata.sharing.registry.models.*; import org.apache.airavata.sharing.registry.service.cpi.SharingRegistryService; import org.apache.airavata.sharing.registry.service.cpi.sharing_cpiConstants; -import org.apache.commons.lang.exception.ExceptionUtils; +import org.apache.commons.lang3.exception.ExceptionUtils; import org.apache.thrift.TException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/tools/load-client/src/main/java/org/apache/airavata/tools/load/Configurations.java b/tools/load-client/src/main/java/org/apache/airavata/tools/load/Configurations.java index ca4c24905b..8d8ef83fdb 100644 --- a/tools/load-client/src/main/java/org/apache/airavata/tools/load/Configurations.java +++ b/tools/load-client/src/main/java/org/apache/airavata/tools/load/Configurations.java @@ -1,7 +1,5 @@ package org.apache.airavata.tools.load; -import org.apache.airavata.tools.load.Configuration; - import java.util.List; public class Configurations { diff --git a/tools/load-client/src/main/java/org/apache/airavata/tools/load/LoadClient.java b/tools/load-client/src/main/java/org/apache/airavata/tools/load/LoadClient.java index 8436887691..9c68897b8c 100644 --- a/tools/load-client/src/main/java/org/apache/airavata/tools/load/LoadClient.java +++ b/tools/load-client/src/main/java/org/apache/airavata/tools/load/LoadClient.java @@ -2,12 +2,12 @@ package org.apache.airavata.tools.load; import org.apache.airavata.api.Airavata; import org.apache.airavata.api.client.AiravataClientFactory; -import org.apache.airavata.common.utils.Constants; import org.apache.airavata.model.appcatalog.gatewayprofile.StoragePreference; import org.apache.airavata.model.appcatalog.storageresource.StorageResourceDescription; -import org.apache.airavata.model.security.AuthzToken; -import org.apache.commons.cli.*; -import org.keycloak.authorization.client.AuthzClient; +import org.apache.commons.cli.CommandLine; +import org.apache.commons.cli.CommandLineParser; +import org.apache.commons.cli.GnuParser; +import org.apache.commons.cli.Options; import org.yaml.snakeyaml.Yaml; import java.io.FileInputStream; diff --git a/tools/load-client/src/main/java/org/apache/airavata/tools/load/SecurityManager.java b/tools/load-client/src/main/java/org/apache/airavata/tools/load/SecurityManager.java index 410c2af424..dde35c259c 100644 --- a/tools/load-client/src/main/java/org/apache/airavata/tools/load/SecurityManager.java +++ b/tools/load-client/src/main/java/org/apache/airavata/tools/load/SecurityManager.java @@ -1,10 +1,16 @@ package org.apache.airavata.tools.load; import javax.net.ssl.*; -import java.io.*; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; import java.net.URISyntaxException; import java.net.URL; -import java.security.*; +import java.security.KeyManagementException; +import java.security.KeyStore; +import java.security.KeyStoreException; +import java.security.NoSuchAlgorithmException; import java.security.cert.Certificate; import java.security.cert.CertificateException; diff --git a/tools/load-client/src/main/java/org/apache/airavata/tools/load/UnitLoad.java b/tools/load-client/src/main/java/org/apache/airavata/tools/load/UnitLoad.java index 6fbbfc43de..9e5cb7d4aa 100644 --- a/tools/load-client/src/main/java/org/apache/airavata/tools/load/UnitLoad.java +++ b/tools/load-client/src/main/java/org/apache/airavata/tools/load/UnitLoad.java @@ -10,8 +10,6 @@ import org.apache.airavata.model.experiment.ExperimentType; import org.apache.airavata.model.experiment.UserConfigurationDataModel; import org.apache.airavata.model.scheduling.ComputationalResourceSchedulingModel; import org.apache.airavata.model.security.AuthzToken; -import org.apache.airavata.tools.load.Configuration; -import org.apache.airavata.tools.load.StorageResourceManager; import org.apache.thrift.TException; import java.io.File;
