diff --git a/dspace-api/src/main/java/org/dspace/content/clarin/ClarinUserRegistration.java b/dspace-api/src/main/java/org/dspace/content/clarin/ClarinUserRegistration.java index 8c8fd8def9b6..a3e3666a01f4 100644 --- a/dspace-api/src/main/java/org/dspace/content/clarin/ClarinUserRegistration.java +++ b/dspace-api/src/main/java/org/dspace/content/clarin/ClarinUserRegistration.java @@ -28,12 +28,8 @@ @Table(name = "user_registration") public class ClarinUserRegistration implements ReloadableEntity { - // Anonymous user public static final String ANONYMOUS_USER_REGISTRATION = "anonymous"; - // Registered user without organization - public static final String UNKNOWN_USER_REGISTRATION = "Unknown"; - private static Logger log = org.apache.logging.log4j.LogManager.getLogger(ClarinUserRegistration.class); @Id diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/EPersonRestRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/EPersonRestRepository.java index 2d381a6abb55..8dd6ed90b1b0 100644 --- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/EPersonRestRepository.java +++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/EPersonRestRepository.java @@ -7,8 +7,6 @@ */ package org.dspace.app.rest.repository; -import static org.dspace.content.clarin.ClarinUserRegistration.UNKNOWN_USER_REGISTRATION; - import java.io.IOException; import java.sql.SQLException; import java.util.Arrays; @@ -37,8 +35,6 @@ import org.dspace.authorize.AuthorizeException; import org.dspace.authorize.service.AuthorizeService; import org.dspace.authorize.service.ValidatePasswordService; -import org.dspace.content.clarin.ClarinUserRegistration; -import org.dspace.content.service.clarin.ClarinUserRegistrationService; import org.dspace.core.Context; import org.dspace.eperson.EPerson; import org.dspace.eperson.EmptyWorkflowGroupException; @@ -83,9 +79,6 @@ public class EPersonRestRepository extends DSpaceObjectRestRepository idRef = new AtomicReference(); AtomicReference idRefNoEmbeds = new AtomicReference(); - AtomicReference idRefUserDataReg = new AtomicReference(); - AtomicReference idRefUserDataFullReg = new AtomicReference(); String authToken = getAuthToken(admin.getEmail(), password); @@ -158,51 +155,11 @@ public void createTest() throws Exception { .andExpect(content().contentType(contentType)) .andExpect(jsonPath("$", HalMatcher.matchNoEmbeds())) .andDo(result -> idRefNoEmbeds - .set(UUID.fromString(read(result.getResponse().getContentAsString(), "$.id")))); - - // Check that the user registration for test data user has been created - getClient(authToken).perform(get("/api/core/clarinuserregistration/search/byEPerson") - .param("userUUID", String.valueOf(idRef.get())) - .contentType(contentType)) - .andExpect(status().isOk()) - .andExpect(jsonPath("$.page.totalElements", is(1))) - .andExpect(jsonPath( - "$._embedded.clarinuserregistrations[0].id", is(not(empty())))) - .andExpect(jsonPath( - "$._embedded.clarinuserregistrations[0].email", is("createtest@example.com"))) - .andExpect(jsonPath( - "$._embedded.clarinuserregistrations[0].confirmation", is(true))) - .andExpect(jsonPath( - "$._embedded.clarinuserregistrations[0].ePersonID", is(idRef.get().toString()))) - .andDo(result -> idRefUserDataReg - .set(read(result.getResponse().getContentAsString(), - "$._embedded.clarinuserregistrations[0].id"))); - - // Check that the user registration for test data full user has been created - getClient(authToken).perform(get("/api/core/clarinuserregistration/search/byEPerson") - .param("userUUID", String.valueOf(idRefNoEmbeds.get())) - .contentType(contentType)) - .andExpect(status().isOk()) - .andExpect(jsonPath("$.page.totalElements", is(1))) - .andExpect(jsonPath( - "$._embedded.clarinuserregistrations[0].id", is(not(empty())))) - .andExpect(jsonPath( - "$._embedded.clarinuserregistrations[0].email", - is("createtestfull@example.com"))) - .andExpect(jsonPath( - "$._embedded.clarinuserregistrations[0].confirmation", is(true))) - .andExpect(jsonPath( - "$._embedded.clarinuserregistrations[0].ePersonID", - is(idRefNoEmbeds.get().toString()))) - .andDo(result -> idRefUserDataFullReg - .set(read(result.getResponse().getContentAsString(), - "$._embedded.clarinuserregistrations[0].id"))); + .set(UUID.fromString(read(result.getResponse().getContentAsString(), "$.id"))));; } finally { EPersonBuilder.deleteEPerson(idRef.get()); EPersonBuilder.deleteEPerson(idRefNoEmbeds.get()); - ClarinUserRegistrationBuilder.deleteClarinUserRegistration(idRefUserDataReg.get()); - ClarinUserRegistrationBuilder.deleteClarinUserRegistration(idRefUserDataFullReg.get()); } }