From 719ec185675cd4f39dc777da368dec5902459b68 Mon Sep 17 00:00:00 2001 From: chenganj Date: Fri, 9 Feb 2024 17:44:52 -0500 Subject: [PATCH] sp custom version 6.1 - compilation errors corrected --- pom.xml | 37 ++----------------- .../iq/dataverse/SendFeedbackDialog.java | 12 ++---- .../edu/harvard/iq/dataverse/api/Groups.java | 21 +++++------ .../edu/harvard/iq/dataverse/api/Info.java | 14 +++---- .../AuthenticationServiceBean.java | 32 ++++++++-------- .../impl/affiliation/AffiliationGroup.java | 8 ++-- .../AffiliationGroupServiceBean.java | 8 ++-- .../affiliation/AffiliationServiceBean.java | 14 +++---- .../dashboard/DashboardUsersPage.java | 16 ++++---- .../dataverse/externaltools/ExternalTool.java | 29 ++++++++------- .../iq/dataverse/util/json/JsonParser.java | 14 +++---- .../iq/dataverse/api/AffiliationGroupsIT.java | 24 ++++++------ .../AffiliationGroupProviderTest.java | 10 ++--- .../affiliation/AffiliationGroupTest.java | 10 ++--- 14 files changed, 106 insertions(+), 143 deletions(-) diff --git a/pom.xml b/pom.xml index 76f269b4709..1be77d5662e 100644 --- a/pom.xml +++ b/pom.xml @@ -383,18 +383,8 @@ jsoup 1.15.3 - - org.powermock - powermock-api-mockito2 - 2.0.0 - test - - - org.powermock - powermock-module-junit4 - 1.6.2 - test - + + io.searchbox jest @@ -607,7 +597,7 @@ 4.0.4 test - + org.mockito mockito-core @@ -864,27 +854,6 @@ true - - org.codehaus.mojo - build-helper-maven-plugin - 3.0.0 - - - add-test-resource - generate-test-sources - - add-test-resource - - - - - src/test/resources - - - - - - diff --git a/src/main/java/edu/harvard/iq/dataverse/SendFeedbackDialog.java b/src/main/java/edu/harvard/iq/dataverse/SendFeedbackDialog.java index 099c53e0dae..6e36bfb1c35 100644 --- a/src/main/java/edu/harvard/iq/dataverse/SendFeedbackDialog.java +++ b/src/main/java/edu/harvard/iq/dataverse/SendFeedbackDialog.java @@ -231,18 +231,14 @@ public void validateUserEmail(FacesContext context, UIComponent component, Objec public String sendMessage() { String installationBrandName = BrandingUtil.getInstallationBrandName(); String supportTeamName = BrandingUtil.getSupportTeamName(systemAddress); - List feedbacks = FeedbackUtil.gatherFeedback(recipient, dataverseSession, messageAffiliation + " - " + messageSubject , userMessage, systemAddress, userEmail, systemConfig.getDataverseSiteUrl(), installationBrandName, supportTeamName); - // to be tested JC - new code - //Feedback feedback = FeedbackUtil.gatherFeedback(feedbackTarget, dataverseSession, messageSubject, userMessage, systemAddress, userEmail, systemConfig.getDataverseSiteUrl(), installationBrandName, supportTeamName, ccSupport()); - //if (feedback==null) { - - if (feedbacks.isEmpty()) { + Feedback feedback = FeedbackUtil.gatherFeedback(feedbackTarget, dataverseSession, messageAffiliation + " - " + messageSubject, userMessage, systemAddress, userEmail, systemConfig.getDataverseSiteUrl(), installationBrandName, supportTeamName, ccSupport()); + if (feedback==null) { logger.warning("No feedback has been sent!"); return null; } - logger.fine("sending feedback: " + feedback); - mailService.sendMail(feedback.getFromEmail(), feedback.getToEmail(), feedback.getCcEmail(), feedback.getSubject(), feedback.getBody()); + logger.fine("sending feedback: " + feedback); + mailService.sendMail(feedback.getFromEmail(), feedback.getToEmail(), feedback.getCcEmail(), feedback.getSubject(), feedback.getBody()); return null; } diff --git a/src/main/java/edu/harvard/iq/dataverse/api/Groups.java b/src/main/java/edu/harvard/iq/dataverse/api/Groups.java index 67315478254..97bc4767fa3 100644 --- a/src/main/java/edu/harvard/iq/dataverse/api/Groups.java +++ b/src/main/java/edu/harvard/iq/dataverse/api/Groups.java @@ -11,17 +11,16 @@ import edu.harvard.iq.dataverse.util.json.JsonParseException; import edu.harvard.iq.dataverse.util.json.JsonParser; -import javax.annotation.PostConstruct; -import javax.ejb.Stateless; -import javax.interceptor.Interceptors; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.json.Json; -import javax.json.JsonArrayBuilder; -import javax.json.JsonObject; -import javax.json.JsonString; -import javax.ws.rs.*; -import javax.ws.rs.core.Response; +import jakarta.ejb.Stateless; +import jakarta.interceptor.Interceptors; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.json.Json; +import jakarta.json.JsonArrayBuilder; +import jakarta.json.JsonObject; +import jakarta.json.JsonString; +import jakarta.ws.rs.*; +import jakarta.ws.rs.core.Response; import java.util.List; import static edu.harvard.iq.dataverse.util.json.JsonPrinter.*; diff --git a/src/main/java/edu/harvard/iq/dataverse/api/Info.java b/src/main/java/edu/harvard/iq/dataverse/api/Info.java index 9b36635fec8..c69f7ccd2b2 100644 --- a/src/main/java/edu/harvard/iq/dataverse/api/Info.java +++ b/src/main/java/edu/harvard/iq/dataverse/api/Info.java @@ -3,13 +3,13 @@ import edu.harvard.iq.dataverse.settings.JvmSettings; import edu.harvard.iq.dataverse.settings.SettingsServiceBean; import edu.harvard.iq.dataverse.util.SystemConfig; -import javax.ejb.EJB; -import javax.json.Json; -import javax.json.JsonArrayBuilder; -import javax.json.JsonValue; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.core.Response; +import jakarta.ejb.EJB; +import jakarta.json.Json; +import jakarta.json.JsonArrayBuilder; +import jakarta.json.JsonValue; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.Response; import java.util.Arrays; import java.util.List; diff --git a/src/main/java/edu/harvard/iq/dataverse/authorization/AuthenticationServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/authorization/AuthenticationServiceBean.java index a7474b2886d..ffba9181a26 100644 --- a/src/main/java/edu/harvard/iq/dataverse/authorization/AuthenticationServiceBean.java +++ b/src/main/java/edu/harvard/iq/dataverse/authorization/AuthenticationServiceBean.java @@ -53,22 +53,22 @@ import java.util.logging.Logger; import java.util.stream.Collectors; import javax.annotation.PostConstruct; -import javax.ejb.EJB; -import javax.ejb.EJBException; -import javax.ejb.Stateless; -import javax.ejb.Singleton; -import javax.inject.Inject; -import javax.inject.Named; -import javax.persistence.EntityManager; -import javax.persistence.NoResultException; -import javax.persistence.NonUniqueResultException; -import javax.persistence.PersistenceContext; -import javax.persistence.Query; -import javax.persistence.TypedQuery; -import javax.validation.ConstraintViolation; -import javax.validation.Validation; -import javax.validation.Validator; -import javax.validation.ValidatorFactory; +import jakarta.ejb.EJB; +import jakarta.ejb.EJBException; +import jakarta.ejb.Stateless; +import jakarta.ejb.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Named; +import jakarta.persistence.EntityManager; +import jakarta.persistence.NoResultException; +import jakarta.persistence.NonUniqueResultException; +import jakarta.persistence.PersistenceContext; +import jakarta.persistence.Query; +import jakarta.persistence.TypedQuery; +import jakarta.validation.ConstraintViolation; +import jakarta.validation.Validation; +import jakarta.validation.Validator; +import jakarta.validation.ValidatorFactory; import org.apache.commons.lang.StringUtils; /** diff --git a/src/main/java/edu/harvard/iq/dataverse/authorization/groups/impl/affiliation/AffiliationGroup.java b/src/main/java/edu/harvard/iq/dataverse/authorization/groups/impl/affiliation/AffiliationGroup.java index d003d668d48..3288fd56f2e 100644 --- a/src/main/java/edu/harvard/iq/dataverse/authorization/groups/impl/affiliation/AffiliationGroup.java +++ b/src/main/java/edu/harvard/iq/dataverse/authorization/groups/impl/affiliation/AffiliationGroup.java @@ -6,10 +6,10 @@ import edu.harvard.iq.dataverse.engine.command.DataverseRequest; import org.apache.commons.lang.StringUtils; -import javax.persistence.Entity; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; -import javax.persistence.Transient; +import jakarta.persistence.Entity; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.Transient; import java.text.Normalizer; @NamedQueries({ diff --git a/src/main/java/edu/harvard/iq/dataverse/authorization/groups/impl/affiliation/AffiliationGroupServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/authorization/groups/impl/affiliation/AffiliationGroupServiceBean.java index 0b0f9b3c34d..b1d0ad73890 100644 --- a/src/main/java/edu/harvard/iq/dataverse/authorization/groups/impl/affiliation/AffiliationGroupServiceBean.java +++ b/src/main/java/edu/harvard/iq/dataverse/authorization/groups/impl/affiliation/AffiliationGroupServiceBean.java @@ -5,10 +5,10 @@ import edu.harvard.iq.dataverse.actionlogging.ActionLogServiceBean; import org.apache.commons.lang.StringUtils; -import javax.ejb.EJB; -import javax.ejb.Stateless; -import javax.inject.Named; -import javax.persistence.*; +import jakarta.ejb.EJB; +import jakarta.ejb.Stateless; +import jakarta.inject.Named; +import jakarta.persistence.*; import java.util.List; import java.util.logging.Logger; diff --git a/src/main/java/edu/harvard/iq/dataverse/authorization/groups/impl/affiliation/AffiliationServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/authorization/groups/impl/affiliation/AffiliationServiceBean.java index b483a245b4b..ca5ed5e5832 100644 --- a/src/main/java/edu/harvard/iq/dataverse/authorization/groups/impl/affiliation/AffiliationServiceBean.java +++ b/src/main/java/edu/harvard/iq/dataverse/authorization/groups/impl/affiliation/AffiliationServiceBean.java @@ -13,13 +13,13 @@ import edu.harvard.iq.dataverse.util.BundleUtil; import org.apache.commons.lang.StringUtils; -import javax.ejb.EJB; -import javax.ejb.Stateless; -import javax.faces.context.ExternalContext; -import javax.faces.context.FacesContext; -import javax.inject.Inject; -import javax.inject.Named; -import javax.servlet.http.HttpServletRequest; +import jakarta.ejb.EJB; +import jakarta.ejb.Stateless; +import jakarta.faces.context.ExternalContext; +import jakarta.faces.context.FacesContext; +import jakarta.inject.Inject; +import jakarta.inject.Named; +import jakarta.servlet.http.HttpServletRequest; import java.io.Serializable; import java.util.*; import java.util.logging.Level; diff --git a/src/main/java/edu/harvard/iq/dataverse/dashboard/DashboardUsersPage.java b/src/main/java/edu/harvard/iq/dataverse/dashboard/DashboardUsersPage.java index 97a5b27b4e8..70f11aa3511 100644 --- a/src/main/java/edu/harvard/iq/dataverse/dashboard/DashboardUsersPage.java +++ b/src/main/java/edu/harvard/iq/dataverse/dashboard/DashboardUsersPage.java @@ -34,14 +34,14 @@ import org.apache.commons.lang3.StringUtils; import javax.annotation.PostConstruct; -import javax.ejb.EJB; -import javax.faces.application.FacesMessage; -import javax.faces.component.UIComponent; -import javax.faces.component.UIInput; -import javax.faces.context.FacesContext; -import javax.faces.view.ViewScoped; -import javax.inject.Inject; -import javax.inject.Named; +import jakarta.ejb.EJB; +import jakarta.faces.application.FacesMessage; +import jakarta.faces.component.UIComponent; +import jakarta.faces.component.UIInput; +import jakarta.faces.context.FacesContext; +import jakarta.faces.view.ViewScoped; +import jakarta.inject.Inject; +import jakarta.inject.Named; import java.text.Normalizer; import java.text.NumberFormat; import java.util.*; diff --git a/src/main/java/edu/harvard/iq/dataverse/externaltools/ExternalTool.java b/src/main/java/edu/harvard/iq/dataverse/externaltools/ExternalTool.java index 374687ede35..0d75a79e3b9 100644 --- a/src/main/java/edu/harvard/iq/dataverse/externaltools/ExternalTool.java +++ b/src/main/java/edu/harvard/iq/dataverse/externaltools/ExternalTool.java @@ -7,20 +7,21 @@ import java.util.Arrays; import java.util.List; import java.util.logging.Logger; -import javax.json.Json; -import javax.json.JsonArrayBuilder; -import javax.json.JsonObjectBuilder; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToMany; -import javax.persistence.Transient; + +import jakarta.json.Json; +import jakarta.json.JsonArrayBuilder; +import jakarta.json.JsonObjectBuilder; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Transient; /** * A specification or definition for how an external tool is intended to diff --git a/src/main/java/edu/harvard/iq/dataverse/util/json/JsonParser.java b/src/main/java/edu/harvard/iq/dataverse/util/json/JsonParser.java index 4cd32227050..19eb6188703 100644 --- a/src/main/java/edu/harvard/iq/dataverse/util/json/JsonParser.java +++ b/src/main/java/edu/harvard/iq/dataverse/util/json/JsonParser.java @@ -52,13 +52,13 @@ import java.util.logging.Logger; import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.json.Json; -import javax.json.JsonArray; -import javax.json.JsonObject; -import javax.json.JsonReader; -import javax.json.JsonString; -import javax.json.JsonValue; -import javax.json.JsonValue.ValueType; +import jakarta.json.Json; +import jakarta.json.JsonArray; +import jakarta.json.JsonObject; +import jakarta.json.JsonReader; +import jakarta.json.JsonString; +import jakarta.json.JsonValue; +import jakarta.json.JsonValue.ValueType; /** * Parses JSON objects into domain objects. diff --git a/src/test/java/edu/harvard/iq/dataverse/api/AffiliationGroupsIT.java b/src/test/java/edu/harvard/iq/dataverse/api/AffiliationGroupsIT.java index ed67c089ac1..1a2f9a79792 100644 --- a/src/test/java/edu/harvard/iq/dataverse/api/AffiliationGroupsIT.java +++ b/src/test/java/edu/harvard/iq/dataverse/api/AffiliationGroupsIT.java @@ -1,21 +1,19 @@ package edu.harvard.iq.dataverse.api; -import com.jayway.restassured.RestAssured; -import com.jayway.restassured.response.Response; -import org.junit.BeforeClass; -import org.junit.Test; - -import javax.json.Json; -import javax.json.JsonArrayBuilder; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; - -import static javax.ws.rs.core.Response.Status.CREATED; -import static javax.ws.rs.core.Response.Status.OK; +import io.restassured.RestAssured; +import io.restassured.response.Response; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.BeforeEach; +import jakarta.json.Json; +import jakarta.json.JsonObjectBuilder; +import jakarta.json.JsonArrayBuilder; +import jakarta.json.JsonObject; +import static jakarta.ws.rs.core.Response.Status.CREATED; +import static jakarta.ws.rs.core.Response.Status.OK; public class AffiliationGroupsIT { - @BeforeClass + @BeforeEach public static void setUpClass() { RestAssured.baseURI = UtilIT.getRestAssuredBaseUri(); } diff --git a/src/test/java/edu/harvard/iq/dataverse/authorization/groups/impl/affiliation/AffiliationGroupProviderTest.java b/src/test/java/edu/harvard/iq/dataverse/authorization/groups/impl/affiliation/AffiliationGroupProviderTest.java index eb78ab6dd0c..1415b7f429a 100644 --- a/src/test/java/edu/harvard/iq/dataverse/authorization/groups/impl/affiliation/AffiliationGroupProviderTest.java +++ b/src/test/java/edu/harvard/iq/dataverse/authorization/groups/impl/affiliation/AffiliationGroupProviderTest.java @@ -3,14 +3,14 @@ import edu.harvard.iq.dataverse.authorization.RoleAssignee; import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser; import edu.harvard.iq.dataverse.mocks.MocksFactory; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.sql.Timestamp; import java.util.*; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -18,7 +18,7 @@ public class AffiliationGroupProviderTest { private AffiliationGroupServiceBean mockAffiliationGroupService; - @Before + @BeforeEach public void setUp() { mockAffiliationGroupService = mock(AffiliationGroupServiceBean.class); } diff --git a/src/test/java/edu/harvard/iq/dataverse/authorization/groups/impl/affiliation/AffiliationGroupTest.java b/src/test/java/edu/harvard/iq/dataverse/authorization/groups/impl/affiliation/AffiliationGroupTest.java index 1115ec5e0f1..fbb7a5eac01 100644 --- a/src/test/java/edu/harvard/iq/dataverse/authorization/groups/impl/affiliation/AffiliationGroupTest.java +++ b/src/test/java/edu/harvard/iq/dataverse/authorization/groups/impl/affiliation/AffiliationGroupTest.java @@ -1,7 +1,7 @@ package edu.harvard.iq.dataverse.authorization.groups.impl.affiliation; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; public class AffiliationGroupTest { @@ -11,10 +11,10 @@ public void testSortByRearrangingAccentsBasedOnProperCanonicalOrder() { AffiliationGroup group2 = new AffiliationGroup(); group1.setDisplayName("École de technologie supérieure"); group2.setDisplayName("École nationale d’administration publique"); - Assert.assertEquals(-10, group1.compare(group2)); + assertEquals(-10, group1.compare(group2)); group1.setDisplayName("Université du Québec à Trois-Rivières"); group2.setDisplayName("Université du Québec en Abitibi-Témiscamingue"); - Assert.assertEquals(-4, group1.compare(group2)); - Assert.assertEquals(4, group2.compare(group1)); + assertEquals(-4, group1.compare(group2)); + assertEquals(4, group2.compare(group1)); } }