From 0da5a8dc555f35a1da8c9a3205734e9218229cd2 Mon Sep 17 00:00:00 2001 From: Sebastian Ibanez Date: Fri, 13 Dec 2024 13:04:38 -0500 Subject: [PATCH 1/3] fix: use apache.commons.lang3 stringbuilder and reflectiontostringbuilder --- src/main/java/org/oscarehr/common/model/AbstractModel.java | 2 +- src/main/java/org/oscarehr/common/model/Drug.java | 4 ++-- .../org/oscarehr/ws/rest/to/model/PreventionSearchTo1.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/oscarehr/common/model/AbstractModel.java b/src/main/java/org/oscarehr/common/model/AbstractModel.java index 4890e7fe1a3..a2f32957485 100644 --- a/src/main/java/org/oscarehr/common/model/AbstractModel.java +++ b/src/main/java/org/oscarehr/common/model/AbstractModel.java @@ -25,7 +25,7 @@ import java.util.List; -import org.apache.commons.lang.builder.ReflectionToStringBuilder; +import org.apache.commons.lang3.builder.ReflectionToStringBuilder; import org.oscarehr.util.MiscUtils; public abstract class AbstractModel implements java.io.Serializable { diff --git a/src/main/java/org/oscarehr/common/model/Drug.java b/src/main/java/org/oscarehr/common/model/Drug.java index ca0e8c2bacf..214f75ce63f 100644 --- a/src/main/java/org/oscarehr/common/model/Drug.java +++ b/src/main/java/org/oscarehr/common/model/Drug.java @@ -42,8 +42,8 @@ import javax.persistence.TemporalType; import javax.persistence.Transient; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.builder.ToStringBuilder; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.builder.ToStringBuilder; import oscar.oscarRx.data.RxPrescriptionData; import oscar.oscarRx.util.RxUtil; diff --git a/src/main/java/org/oscarehr/ws/rest/to/model/PreventionSearchTo1.java b/src/main/java/org/oscarehr/ws/rest/to/model/PreventionSearchTo1.java index f739ac3cad3..5329758dcb4 100644 --- a/src/main/java/org/oscarehr/ws/rest/to/model/PreventionSearchTo1.java +++ b/src/main/java/org/oscarehr/ws/rest/to/model/PreventionSearchTo1.java @@ -28,7 +28,7 @@ import java.util.Date; import java.util.List; -import org.apache.commons.lang.builder.ReflectionToStringBuilder; +import org.apache.commons.lang3.builder.ReflectionToStringBuilder; public class PreventionSearchTo1 { From 153457262ea2f0c8b7544044bba99b09622b9af7 Mon Sep 17 00:00:00 2001 From: Sebastian Ibanez Date: Fri, 13 Dec 2024 13:04:54 -0500 Subject: [PATCH 2/3] fix: remove double ;; --- .../config/pageUtil/EctConAddSpecialist2Action.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/oscar/oscarEncounter/oscarConsultationRequest/config/pageUtil/EctConAddSpecialist2Action.java b/src/main/java/oscar/oscarEncounter/oscarConsultationRequest/config/pageUtil/EctConAddSpecialist2Action.java index 0af7e74d2cc..633f3b34001 100644 --- a/src/main/java/oscar/oscarEncounter/oscarConsultationRequest/config/pageUtil/EctConAddSpecialist2Action.java +++ b/src/main/java/oscar/oscarEncounter/oscarConsultationRequest/config/pageUtil/EctConAddSpecialist2Action.java @@ -32,7 +32,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.logging.log4j.Logger;; +import org.apache.logging.log4j.Logger; import org.oscarehr.common.dao.ProfessionalSpecialistDao; import org.oscarehr.common.model.ProfessionalSpecialist; import org.oscarehr.managers.SecurityInfoManager; From 63a300c4f0d0e525cc77fc0c071bd76976f70641 Mon Sep 17 00:00:00 2001 From: Sebastian Ibanez Date: Fri, 13 Dec 2024 13:05:39 -0500 Subject: [PATCH 3/3] update: target java 21 in maven compiler plugin --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 2522d352c84..8f3f76507c5 100644 --- a/pom.xml +++ b/pom.xml @@ -1524,8 +1524,8 @@ maven-compiler-plugin 3.8.1 - 11 - 11 + 21 + 21