From 33067868f0b6b4768addc691db45202c84914c49 Mon Sep 17 00:00:00 2001 From: Boubaker Khanfir Date: Fri, 12 Jan 2024 14:45:49 +0100 Subject: [PATCH] feat: Cleanup Dependencies to rely on Spring Dependencies Tree - Meeds-io/MIPs#57 (#50) Upgrade from Commons Lang to apache Lang 3. --- .../exoplatform/dlp/domain/DlpOperation.java | 20 +++++++++---------- .../dlp/domain/DlpPositiveItemEntity.java | 2 +- .../dlp/domain/RestoredDlpItemEntity.java | 2 +- .../dlp/connector/DlpServiceConnector.java | 2 +- .../dlp/connector/FileDlpConnector.java | 2 +- .../dlp/dao/DlpPositiveItemDAOImpl.java | 4 ++-- .../dlp/dao/RestoredDlpItemDAOImpl.java | 4 ++-- .../impl/DlpOperationProcessorImpl.java | 2 +- .../dlp/queue/impl/QueueDlpServiceImpl.java | 2 +- 9 files changed, 20 insertions(+), 20 deletions(-) diff --git a/dlp-api/src/main/java/org/exoplatform/dlp/domain/DlpOperation.java b/dlp-api/src/main/java/org/exoplatform/dlp/domain/DlpOperation.java index 145909c4..fcb0e42f 100644 --- a/dlp-api/src/main/java/org/exoplatform/dlp/domain/DlpOperation.java +++ b/dlp-api/src/main/java/org/exoplatform/dlp/domain/DlpOperation.java @@ -4,16 +4,16 @@ import java.util.Date; import java.util.Objects; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.NamedQuery; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.SequenceGenerator; +import jakarta.persistence.Table; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; import org.exoplatform.commons.api.persistence.ExoEntity; diff --git a/dlp-api/src/main/java/org/exoplatform/dlp/domain/DlpPositiveItemEntity.java b/dlp-api/src/main/java/org/exoplatform/dlp/domain/DlpPositiveItemEntity.java index 32023e01..6cba328c 100644 --- a/dlp-api/src/main/java/org/exoplatform/dlp/domain/DlpPositiveItemEntity.java +++ b/dlp-api/src/main/java/org/exoplatform/dlp/domain/DlpPositiveItemEntity.java @@ -2,7 +2,7 @@ import org.exoplatform.commons.api.persistence.ExoEntity; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.Calendar; /** diff --git a/dlp-api/src/main/java/org/exoplatform/dlp/domain/RestoredDlpItemEntity.java b/dlp-api/src/main/java/org/exoplatform/dlp/domain/RestoredDlpItemEntity.java index a1e7197a..91258864 100644 --- a/dlp-api/src/main/java/org/exoplatform/dlp/domain/RestoredDlpItemEntity.java +++ b/dlp-api/src/main/java/org/exoplatform/dlp/domain/RestoredDlpItemEntity.java @@ -2,7 +2,7 @@ import org.exoplatform.commons.api.persistence.ExoEntity; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.Calendar; /** diff --git a/dlp-services/src/main/java/org/exoplatform/dlp/connector/DlpServiceConnector.java b/dlp-services/src/main/java/org/exoplatform/dlp/connector/DlpServiceConnector.java index 740a682e..88f30075 100644 --- a/dlp-services/src/main/java/org/exoplatform/dlp/connector/DlpServiceConnector.java +++ b/dlp-services/src/main/java/org/exoplatform/dlp/connector/DlpServiceConnector.java @@ -1,6 +1,6 @@ package org.exoplatform.dlp.connector; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.exoplatform.container.component.BaseComponentPlugin; import org.exoplatform.container.xml.InitParams; diff --git a/dlp-services/src/main/java/org/exoplatform/dlp/connector/FileDlpConnector.java b/dlp-services/src/main/java/org/exoplatform/dlp/connector/FileDlpConnector.java index 4afddc5a..aad7512b 100644 --- a/dlp-services/src/main/java/org/exoplatform/dlp/connector/FileDlpConnector.java +++ b/dlp-services/src/main/java/org/exoplatform/dlp/connector/FileDlpConnector.java @@ -21,7 +21,7 @@ import java.util.*; import java.util.stream.Collectors; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.exoplatform.commons.search.index.IndexingService; import org.exoplatform.commons.utils.CommonsUtils; import org.exoplatform.container.xml.InitParams; diff --git a/dlp-services/src/main/java/org/exoplatform/dlp/dao/DlpPositiveItemDAOImpl.java b/dlp-services/src/main/java/org/exoplatform/dlp/dao/DlpPositiveItemDAOImpl.java index 99e54cf4..fc880891 100644 --- a/dlp-services/src/main/java/org/exoplatform/dlp/dao/DlpPositiveItemDAOImpl.java +++ b/dlp-services/src/main/java/org/exoplatform/dlp/dao/DlpPositiveItemDAOImpl.java @@ -2,8 +2,8 @@ import java.util.List; -import javax.persistence.NoResultException; -import javax.persistence.TypedQuery; +import jakarta.persistence.NoResultException; +import jakarta.persistence.TypedQuery; import org.exoplatform.commons.persistence.impl.GenericDAOJPAImpl; import org.exoplatform.dlp.domain.DlpPositiveItemEntity; diff --git a/dlp-services/src/main/java/org/exoplatform/dlp/dao/RestoredDlpItemDAOImpl.java b/dlp-services/src/main/java/org/exoplatform/dlp/dao/RestoredDlpItemDAOImpl.java index b1f2072d..b0239ef6 100644 --- a/dlp-services/src/main/java/org/exoplatform/dlp/dao/RestoredDlpItemDAOImpl.java +++ b/dlp-services/src/main/java/org/exoplatform/dlp/dao/RestoredDlpItemDAOImpl.java @@ -1,7 +1,7 @@ package org.exoplatform.dlp.dao; -import javax.persistence.NoResultException; -import javax.persistence.TypedQuery; +import jakarta.persistence.NoResultException; +import jakarta.persistence.TypedQuery; import org.exoplatform.commons.persistence.impl.GenericDAOJPAImpl; import org.exoplatform.dlp.domain.RestoredDlpItemEntity; diff --git a/dlp-services/src/main/java/org/exoplatform/dlp/processor/impl/DlpOperationProcessorImpl.java b/dlp-services/src/main/java/org/exoplatform/dlp/processor/impl/DlpOperationProcessorImpl.java index be031d80..1e77e42b 100644 --- a/dlp-services/src/main/java/org/exoplatform/dlp/processor/impl/DlpOperationProcessorImpl.java +++ b/dlp-services/src/main/java/org/exoplatform/dlp/processor/impl/DlpOperationProcessorImpl.java @@ -9,7 +9,7 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.picocontainer.Startable; import org.exoplatform.commons.api.settings.SettingService; diff --git a/dlp-services/src/main/java/org/exoplatform/dlp/queue/impl/QueueDlpServiceImpl.java b/dlp-services/src/main/java/org/exoplatform/dlp/queue/impl/QueueDlpServiceImpl.java index 9efad05f..57430cd8 100644 --- a/dlp-services/src/main/java/org/exoplatform/dlp/queue/impl/QueueDlpServiceImpl.java +++ b/dlp-services/src/main/java/org/exoplatform/dlp/queue/impl/QueueDlpServiceImpl.java @@ -1,6 +1,6 @@ package org.exoplatform.dlp.queue.impl; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.exoplatform.dlp.dao.DlpOperationDAO; import org.exoplatform.dlp.domain.DlpOperation;