Changed: Rename token package as datashield

samply · Feb 10, 2025 · 92286b5 · 92286b5
1 parent f09a2fb
commit 92286b5
Show file tree

Hide file tree

Showing 10 changed files with 15 additions and 16 deletions.
diff --git 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/...mply/token/DataShieldTokenManagerJob.java → ...datashield/DataShieldTokenManagerJob.java b/...mply/token/DataShieldTokenManagerJob.java → ...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/.../token/DataShieldTokenManagerService.java → ...shield/DataShieldTokenManagerService.java b/.../token/DataShieldTokenManagerService.java → ...shield/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/...taShieldTokenManagerServiceException.java → ...taShieldTokenManagerServiceException.java b/...taShieldTokenManagerServiceException.java → ...taShieldTokenManagerServiceException.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/...in/java/de/samply/token/ProjectEmail.java → ...va/de/samply/datashield/ProjectEmail.java b/...in/java/de/samply/token/ProjectEmail.java → ...va/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/...ly/token/dto/DataShieldProjectStatus.java → ...tashield/dto/DataShieldProjectStatus.java b/...ly/token/dto/DataShieldProjectStatus.java → ...tashield/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/.../DataShieldTokenManagerProjectStatus.java → .../DataShieldTokenManagerProjectStatus.java b/.../DataShieldTokenManagerProjectStatus.java → .../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/...to/DataShieldTokenManagerTokenStatus.java → ...to/DataShieldTokenManagerTokenStatus.java b/...to/DataShieldTokenManagerTokenStatus.java → ...to/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/...mply/token/dto/DataShieldTokenStatus.java → ...datashield/dto/DataShieldTokenStatus.java b/...mply/token/dto/DataShieldTokenStatus.java → ...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/...java/de/samply/token/dto/TokenParams.java → ...de/samply/datashield/dto/TokenParams.java b/...java/de/samply/token/dto/TokenParams.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;