From 92286b5fef0835b04055352abd895649633e0a37 Mon Sep 17 00:00:00 2001 From: djuarezgf Date: Mon, 10 Feb 2025 11:22:45 +0100 Subject: [PATCH] Changed: Rename token package as datashield --- .../java/de/samply/app/ProjectManagerController.java | 2 +- .../DataShieldTokenManagerJob.java | 10 +++++----- .../DataShieldTokenManagerService.java | 4 ++-- .../DataShieldTokenManagerServiceException.java | 2 +- .../de/samply/{token => datashield}/ProjectEmail.java | 3 +-- .../dto/DataShieldProjectStatus.java | 2 +- .../dto/DataShieldTokenManagerProjectStatus.java | 2 +- .../dto/DataShieldTokenManagerTokenStatus.java | 2 +- .../dto/DataShieldTokenStatus.java | 2 +- .../samply/{token => datashield}/dto/TokenParams.java | 2 +- 10 files changed, 15 insertions(+), 16 deletions(-) rename src/main/java/de/samply/{token => datashield}/DataShieldTokenManagerJob.java (98%) rename src/main/java/de/samply/{token => datashield}/DataShieldTokenManagerService.java (99%) rename src/main/java/de/samply/{token => datashield}/DataShieldTokenManagerServiceException.java (90%) rename src/main/java/de/samply/{token => datashield}/ProjectEmail.java (83%) rename src/main/java/de/samply/{token => datashield}/dto/DataShieldProjectStatus.java (91%) rename src/main/java/de/samply/{token => datashield}/dto/DataShieldTokenManagerProjectStatus.java (93%) rename src/main/java/de/samply/{token => datashield}/dto/DataShieldTokenManagerTokenStatus.java (95%) rename src/main/java/de/samply/{token => datashield}/dto/DataShieldTokenStatus.java (75%) rename src/main/java/de/samply/{token => datashield}/dto/TokenParams.java (89%) diff --git a/src/main/java/de/samply/app/ProjectManagerController.java b/src/main/java/de/samply/app/ProjectManagerController.java index 6e052ce..35e91bb 100644 --- a/src/main/java/de/samply/app/ProjectManagerController.java +++ b/src/main/java/de/samply/app/ProjectManagerController.java @@ -30,7 +30,7 @@ import de.samply.query.QueryFormat; import de.samply.query.QueryService; import de.samply.query.QueryState; -import de.samply.token.DataShieldTokenManagerService; +import de.samply.datashield.DataShieldTokenManagerService; import de.samply.user.UserService; import de.samply.user.roles.OrganisationRole; import de.samply.user.roles.ProjectRole; diff --git a/src/main/java/de/samply/token/DataShieldTokenManagerJob.java b/src/main/java/de/samply/datashield/DataShieldTokenManagerJob.java similarity index 98% rename from src/main/java/de/samply/token/DataShieldTokenManagerJob.java rename to src/main/java/de/samply/datashield/DataShieldTokenManagerJob.java index 67e67c7..ebc7673 100644 --- a/src/main/java/de/samply/token/DataShieldTokenManagerJob.java +++ b/src/main/java/de/samply/datashield/DataShieldTokenManagerJob.java @@ -1,4 +1,4 @@ -package de.samply.token; +package de.samply.datashield; import de.samply.app.ProjectManagerConst; import de.samply.bridgehead.BridgeheadConfiguration; @@ -17,10 +17,10 @@ import de.samply.project.state.ProjectState; import de.samply.register.AppRegisterService; import de.samply.rstudio.group.RstudioGroupService; -import de.samply.token.dto.DataShieldProjectStatus; -import de.samply.token.dto.DataShieldTokenManagerProjectStatus; -import de.samply.token.dto.DataShieldTokenManagerTokenStatus; -import de.samply.token.dto.DataShieldTokenStatus; +import de.samply.datashield.dto.DataShieldProjectStatus; +import de.samply.datashield.dto.DataShieldTokenManagerProjectStatus; +import de.samply.datashield.dto.DataShieldTokenManagerTokenStatus; +import de.samply.datashield.dto.DataShieldTokenStatus; import de.samply.user.roles.ProjectRole; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; diff --git a/src/main/java/de/samply/token/DataShieldTokenManagerService.java b/src/main/java/de/samply/datashield/DataShieldTokenManagerService.java similarity index 99% rename from src/main/java/de/samply/token/DataShieldTokenManagerService.java rename to src/main/java/de/samply/datashield/DataShieldTokenManagerService.java index 24f40ca..5d1f4a8 100644 --- a/src/main/java/de/samply/token/DataShieldTokenManagerService.java +++ b/src/main/java/de/samply/datashield/DataShieldTokenManagerService.java @@ -1,4 +1,4 @@ -package de.samply.token; +package de.samply.datashield; import de.samply.app.ProjectManagerConst; import de.samply.bridgehead.BridgeheadConfiguration; @@ -11,7 +11,7 @@ import de.samply.notification.NotificationService; import de.samply.notification.OperationType; import de.samply.security.SessionUser; -import de.samply.token.dto.*; +import de.samply.datashield.dto.*; import de.samply.user.roles.ProjectRole; import de.samply.utils.WebClientFactory; import jakarta.validation.constraints.NotNull; diff --git a/src/main/java/de/samply/token/DataShieldTokenManagerServiceException.java b/src/main/java/de/samply/datashield/DataShieldTokenManagerServiceException.java similarity index 90% rename from src/main/java/de/samply/token/DataShieldTokenManagerServiceException.java rename to src/main/java/de/samply/datashield/DataShieldTokenManagerServiceException.java index b7ef44e..687bb53 100644 --- a/src/main/java/de/samply/token/DataShieldTokenManagerServiceException.java +++ b/src/main/java/de/samply/datashield/DataShieldTokenManagerServiceException.java @@ -1,4 +1,4 @@ -package de.samply.token; +package de.samply.datashield; public class DataShieldTokenManagerServiceException extends RuntimeException { public DataShieldTokenManagerServiceException(Throwable cause) { diff --git a/src/main/java/de/samply/token/ProjectEmail.java b/src/main/java/de/samply/datashield/ProjectEmail.java similarity index 83% rename from src/main/java/de/samply/token/ProjectEmail.java rename to src/main/java/de/samply/datashield/ProjectEmail.java index ea04cf4..d12c5b0 100644 --- a/src/main/java/de/samply/token/ProjectEmail.java +++ b/src/main/java/de/samply/datashield/ProjectEmail.java @@ -1,6 +1,5 @@ -package de.samply.token; +package de.samply.datashield; -import de.samply.user.roles.ProjectRole; import lombok.EqualsAndHashCode; import lombok.Getter; diff --git a/src/main/java/de/samply/token/dto/DataShieldProjectStatus.java b/src/main/java/de/samply/datashield/dto/DataShieldProjectStatus.java similarity index 91% rename from src/main/java/de/samply/token/dto/DataShieldProjectStatus.java rename to src/main/java/de/samply/datashield/dto/DataShieldProjectStatus.java index 2b3b6b3..84aae20 100644 --- a/src/main/java/de/samply/token/dto/DataShieldProjectStatus.java +++ b/src/main/java/de/samply/datashield/dto/DataShieldProjectStatus.java @@ -1,4 +1,4 @@ -package de.samply.token.dto; +package de.samply.datashield.dto; public enum DataShieldProjectStatus { CREATED, // The project exists in the bridgehead opal diff --git a/src/main/java/de/samply/token/dto/DataShieldTokenManagerProjectStatus.java b/src/main/java/de/samply/datashield/dto/DataShieldTokenManagerProjectStatus.java similarity index 93% rename from src/main/java/de/samply/token/dto/DataShieldTokenManagerProjectStatus.java rename to src/main/java/de/samply/datashield/dto/DataShieldTokenManagerProjectStatus.java index 3ab4106..2ad2ff7 100644 --- a/src/main/java/de/samply/token/dto/DataShieldTokenManagerProjectStatus.java +++ b/src/main/java/de/samply/datashield/dto/DataShieldTokenManagerProjectStatus.java @@ -1,4 +1,4 @@ -package de.samply.token.dto; +package de.samply.datashield.dto; import com.fasterxml.jackson.annotation.JsonProperty; import de.samply.app.ProjectManagerConst; diff --git a/src/main/java/de/samply/token/dto/DataShieldTokenManagerTokenStatus.java b/src/main/java/de/samply/datashield/dto/DataShieldTokenManagerTokenStatus.java similarity index 95% rename from src/main/java/de/samply/token/dto/DataShieldTokenManagerTokenStatus.java rename to src/main/java/de/samply/datashield/dto/DataShieldTokenManagerTokenStatus.java index ed29143..65226d8 100644 --- a/src/main/java/de/samply/token/dto/DataShieldTokenManagerTokenStatus.java +++ b/src/main/java/de/samply/datashield/dto/DataShieldTokenManagerTokenStatus.java @@ -1,4 +1,4 @@ -package de.samply.token.dto; +package de.samply.datashield.dto; import com.fasterxml.jackson.annotation.JsonProperty; import de.samply.app.ProjectManagerConst; diff --git a/src/main/java/de/samply/token/dto/DataShieldTokenStatus.java b/src/main/java/de/samply/datashield/dto/DataShieldTokenStatus.java similarity index 75% rename from src/main/java/de/samply/token/dto/DataShieldTokenStatus.java rename to src/main/java/de/samply/datashield/dto/DataShieldTokenStatus.java index 244eea4..ed04766 100644 --- a/src/main/java/de/samply/token/dto/DataShieldTokenStatus.java +++ b/src/main/java/de/samply/datashield/dto/DataShieldTokenStatus.java @@ -1,4 +1,4 @@ -package de.samply.token.dto; +package de.samply.datashield.dto; public enum DataShieldTokenStatus { CREATED, diff --git a/src/main/java/de/samply/token/dto/TokenParams.java b/src/main/java/de/samply/datashield/dto/TokenParams.java similarity index 89% rename from src/main/java/de/samply/token/dto/TokenParams.java rename to src/main/java/de/samply/datashield/dto/TokenParams.java index fc85b48..a4dc042 100644 --- a/src/main/java/de/samply/token/dto/TokenParams.java +++ b/src/main/java/de/samply/datashield/dto/TokenParams.java @@ -1,4 +1,4 @@ -package de.samply.token.dto; +package de.samply.datashield.dto; import com.fasterxml.jackson.annotation.JsonProperty;