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 a650ea74df7722fcb7b1eb4272ac3d7d8828eeeb Author: yasith <[email protected]> AuthorDate: Thu Apr 24 02:11:32 2025 -0500 fix dozer deprecations, add httpclient dep --- airavata-services/services-security/pom.xml | 5 ++++- modules/airavata-helix/helix-spectator/pom.xml | 1 - modules/distribution/pom.xml | 1 - .../core/repositories/AbstractRepository.java | 2 +- .../registry/core/utils/ObjectMapperSingleton.java | 25 +++++++++++----------- pom.xml | 6 ++++++ tools/load-client/pom.xml | 4 ++++ 7 files changed, 27 insertions(+), 17 deletions(-) diff --git a/airavata-services/services-security/pom.xml b/airavata-services/services-security/pom.xml index e289ded7d7..5c2b032fe7 100644 --- a/airavata-services/services-security/pom.xml +++ b/airavata-services/services-security/pom.xml @@ -96,6 +96,10 @@ <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-slf4j2-impl</artifactId> </dependency> + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient</artifactId> + </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> @@ -108,7 +112,6 @@ <dependency> <groupId>org.json</groupId> <artifactId>json</artifactId> - <version>${json.version}</version> </dependency> <dependency> <groupId>org.apache.airavata</groupId> diff --git a/modules/airavata-helix/helix-spectator/pom.xml b/modules/airavata-helix/helix-spectator/pom.xml index 021a06f9ac..028f96e020 100644 --- a/modules/airavata-helix/helix-spectator/pom.xml +++ b/modules/airavata-helix/helix-spectator/pom.xml @@ -31,7 +31,6 @@ <name>Helix Spectator</name> <artifactId>helix-spectator</artifactId> - <dependencies> <dependency> <groupId>org.apache.airavata</groupId> diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index dfc9b1b9b9..7dc54ff74f 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -146,7 +146,6 @@ <dependency> <groupId>org.json</groupId> <artifactId>json</artifactId> - <version>${json.version}</version> </dependency> <dependency> <groupId>commons-io</groupId> diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/repositories/AbstractRepository.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/repositories/AbstractRepository.java index ab404f4d0c..4d2ebc1165 100644 --- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/repositories/AbstractRepository.java +++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/repositories/AbstractRepository.java @@ -22,7 +22,7 @@ package org.apache.airavata.registry.core.repositories; import org.apache.airavata.registry.core.utils.Committer; import org.apache.airavata.registry.core.utils.DBConstants; import org.apache.airavata.registry.core.utils.ObjectMapperSingleton; -import org.dozer.Mapper; +import com.github.dozermapper.core.Mapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/utils/ObjectMapperSingleton.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/utils/ObjectMapperSingleton.java index 16896e3d7f..e219ebe94b 100644 --- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/utils/ObjectMapperSingleton.java +++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/utils/ObjectMapperSingleton.java @@ -23,30 +23,29 @@ package org.apache.airavata.registry.core.utils; import org.apache.commons.lang3.ClassUtils; import org.apache.thrift.TBase; import org.apache.thrift.TFieldIdEnum; -import org.dozer.CustomFieldMapper; -import org.dozer.DozerBeanMapper; -import org.dozer.classmap.ClassMap; -import org.dozer.fieldmap.FieldMap; +import com.github.dozermapper.core.CustomFieldMapper; +import com.github.dozermapper.core.DozerBeanMapperBuilder; +import com.github.dozermapper.core.Mapper; +import com.github.dozermapper.core.classmap.ClassMap; +import com.github.dozermapper.core.fieldmap.FieldMap; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.util.ArrayList; -public class ObjectMapperSingleton extends DozerBeanMapper{ +public class ObjectMapperSingleton { private final static Logger logger = LoggerFactory.getLogger(ObjectMapperSingleton.class); - private static ObjectMapperSingleton instance; + private static Mapper instance; private ObjectMapperSingleton(){} - public static ObjectMapperSingleton getInstance(){ + public static Mapper getInstance(){ if(instance == null) { - instance = new ObjectMapperSingleton(); - instance.setMappingFiles( - new ArrayList<String>(){{ - add("dozer_mapping.xml"); - }}); - instance.setCustomFieldMapper(new SkipUnsetPrimitiveFieldMapper()); + instance = DozerBeanMapperBuilder.create() + .withMappingFiles("dozer_mapping.xml") + .withCustomFieldMapper(new SkipUnsetPrimitiveFieldMapper()) + .build(); } return instance; } diff --git a/pom.xml b/pom.xml index 652fed46fc..92ddb69f5c 100644 --- a/pom.xml +++ b/pom.xml @@ -230,6 +230,7 @@ <netty.version>4.1.106.Final</netty.version> <reactor.version>3.6.3</reactor.version> <httpclient.version>4.5.14</httpclient.version> + <httpclient5.version>5.4.3</httpclient5.version> <maven-remote-resources-plugin.version>3.3.0</maven-remote-resources-plugin.version> </properties> @@ -870,6 +871,11 @@ <artifactId>protobuf-java</artifactId> <version>${protobuf-java.version}</version> </dependency> + <dependency> + <groupId>org.apache.httpcomponents.client5</groupId> + <artifactId>httpclient5</artifactId> + <version>${httpclient5.version}</version> + </dependency> <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient</artifactId> diff --git a/tools/load-client/pom.xml b/tools/load-client/pom.xml index 28ca6b3466..8d23be03eb 100644 --- a/tools/load-client/pom.xml +++ b/tools/load-client/pom.xml @@ -40,6 +40,10 @@ <groupId>org.keycloak</groupId> <artifactId>keycloak-authz-client</artifactId> </dependency> + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient</artifactId> + </dependency> </dependencies> <build> <plugins>
