From cc27edc544cec1b892e7c224aec9e6e42342aa39 Mon Sep 17 00:00:00 2001 From: Paul-Christian Volkmer Date: Sat, 21 Sep 2024 22:10:24 +0200 Subject: [PATCH] refactor: use package name following Java guidelines --- README.md | 15 +++++----- .../java/{DNPM => dev/dnpm}/VerweisVon.java | 2 +- .../{DNPM => dev/dnpm}/analyzer/Analyzer.java | 2 +- .../dnpm}/analyzer/AnalyzerUtils.java | 2 +- .../dnpm}/analyzer/BackendService.java | 2 +- .../dnpm}/analyzer/ConsentManager.java | 4 +-- .../dnpm}/analyzer/DNPMHelper.java | 14 ++++----- .../analyzer/EinzelempfehlungAnalyzer.java | 14 ++++----- .../dnpm}/analyzer/FollowUpAnalyzer.java | 2 +- .../dnpm}/analyzer/IPluginPart.java | 2 +- .../dnpm}/analyzer/Merkmalskatalog.java | 2 +- .../analyzer/TherapieMitEcogAnalyzer.java | 8 ++--- .../dnpm}/analyzer/TherapieplanAnalyzer.java | 10 +++---- .../dnpm}/config/PluginConfiguration.java | 30 +++++++++---------- .../dnpm}/database/ReadOnlyRepository.java | 2 +- .../dnpm}/database/SettingsRepository.java | 2 +- .../dnpm}/dto/EcogStatusWithDate.java | 2 +- .../java/{DNPM => dev/dnpm}/dto/Studie.java | 2 +- .../java/{DNPM => dev/dnpm}/dto/Variant.java | 2 +- .../dnpm}/exceptions/FormException.java | 2 +- .../AbstractDelegatedPermissionEvaluator.java | 2 +- ...elegatingDataBasedPermissionEvaluator.java | 2 +- .../FormBasedPermissionEvaluator.java | 2 +- .../security/FormBasedSecurityAspects.java | 6 ++-- .../dnpm}/security/FormSecured.java | 2 +- .../dnpm}/security/FormSecuredResult.java | 2 +- .../IllegalSecuredObjectAccessException.java | 2 +- .../dnpm}/security/PermissionType.java | 2 +- .../PersonPoolBasedPermissionEvaluator.java | 2 +- .../PersonPoolBasedSecurityAspects.java | 10 +++---- .../dnpm}/security/PersonPoolSecured.java | 2 +- .../security/PersonPoolSecuredResult.java | 2 +- .../dnpm}/security/SecurityService.java | 2 +- .../dnpm}/services/DefaultFormService.java | 4 +-- .../dnpm}/services/DefaultStudienService.java | 4 +-- .../dnpm}/services/FormService.java | 4 +-- .../dnpm}/services/SettingsService.java | 4 +-- .../dnpm}/services/StudienService.java | 4 +-- .../services/TherapieMitEcogService.java | 4 +-- .../consent/ConsentManagerService.java | 2 +- .../consent/ConsentManagerServiceFactory.java | 2 +- .../consent/MrConsentManagerService.java | 4 +-- .../consent/UkwConsentManagerService.java | 2 +- .../MolekulargenetikFormService.java | 4 +-- .../OsMolekulargenetikFormService.java | 4 +-- .../dnpm}/services/mtb/DefaultMtbService.java | 2 +- .../mtb/MrMtbAnmeldungToProtocolMapper.java | 2 +- .../dnpm}/services/mtb/MtbService.java | 2 +- .../mtb/OsTumorkonferenzToProtocolMapper.java | 2 +- ...rkonferenzVarianteUkwToProtocolMapper.java | 2 +- .../mtb/ProcedureToProtocolMapper.java | 2 +- .../DefaultStrahlentherapieService.java | 6 ++-- .../StrahlentherapieService.java | 4 +-- .../DefaultSystemtherapieService.java | 6 ++-- ...temischeTherapieToProzedurwerteMapper.java | 2 +- .../ProzedurToProzedurwerteMapper.java | 2 +- .../systemtherapie/SystemtherapieService.java | 4 +-- .../AbstractTherapieplanService.java | 4 +-- .../DefaultTherapieplanService.java | 8 ++--- .../MultipleMtbTherapieplanService.java | 8 ++--- .../therapieplan/TherapieplanService.java | 2 +- .../TherapieplanServiceFactory.java | 6 ++-- .../de/itc/onkostar/library/moduleContext.xml | 6 ++-- .../dnpm}/ConsentManagerTest.java | 8 ++--- .../{DNPM => dev/dnpm}/DNPMHelperTest.java | 12 ++++---- .../dnpm}/MerkmalskatalogTest.java | 4 +-- .../dnpm}/analyzer/AnalyzerUtilsTest.java | 2 +- .../EinzelempfehlungAnalyzerTest.java | 10 +++---- .../dnpm}/analyzer/FollowUpAnalyzerTest.java | 2 +- .../analyzer/TherapieMitEcogAnalyzerTest.java | 8 ++--- .../analyzer/TherapieplanAnalyzerTest.java | 16 +++++----- .../dnpm}/config/PluginConfigurationTest.java | 10 +++---- .../{DNPM => dev/dnpm}/dto/VariantTest.java | 2 +- ...atingDataBasedPermissionEvaluatorTest.java | 2 +- .../FormBasedPermissionEvaluatorTest.java | 2 +- .../FormBasedSecurityAspectsTest.java | 2 +- ...ersonPoolBasedPermissionEvaluatorTest.java | 2 +- .../PersonPoolBasedSecurityAspectsTest.java | 2 +- .../dnpm}/services/SettingsServiceTest.java | 4 +-- .../dnpm}/services/StudieTest.java | 4 +-- .../ConsentManagerServiceFactoryTest.java | 2 +- .../consent/MrConsentManagerServiceTest.java | 2 +- .../consent/UkwConsentManagerServiceTest.java | 2 +- .../OsMolekluargenetikFormServiceTest.java | 2 +- .../services/mtb/DefaultMtbServiceTest.java | 2 +- .../MrMtbAnmeldungToProtocolMapperTest.java | 2 +- .../OsTumorkonferenzToProtocolMapperTest.java | 2 +- ...ferenzVarianteUkwToProtocolMapperTest.java | 2 +- .../DefaultStrahlentherapieServiceTest.java | 4 +-- .../DefaultSystemtherapieServiceTest.java | 4 +-- .../ProzedurToProzedurwerteMapperTest.java | 2 +- .../DefaultTherapieplanServiceTest.java | 4 +-- .../TherapieplanServiceFactoryTest.java | 6 ++-- 93 files changed, 199 insertions(+), 200 deletions(-) rename src/main/java/{DNPM => dev/dnpm}/VerweisVon.java (99%) rename src/main/java/{DNPM => dev/dnpm}/analyzer/Analyzer.java (89%) rename src/main/java/{DNPM => dev/dnpm}/analyzer/AnalyzerUtils.java (99%) rename src/main/java/{DNPM => dev/dnpm}/analyzer/BackendService.java (95%) rename src/main/java/{DNPM => dev/dnpm}/analyzer/ConsentManager.java (95%) rename src/main/java/{DNPM => dev/dnpm}/analyzer/DNPMHelper.java (97%) rename src/main/java/{DNPM => dev/dnpm}/analyzer/EinzelempfehlungAnalyzer.java (93%) rename src/main/java/{DNPM => dev/dnpm}/analyzer/FollowUpAnalyzer.java (99%) rename src/main/java/{DNPM => dev/dnpm}/analyzer/IPluginPart.java (93%) rename src/main/java/{DNPM => dev/dnpm}/analyzer/Merkmalskatalog.java (99%) rename src/main/java/{DNPM => dev/dnpm}/analyzer/TherapieMitEcogAnalyzer.java (96%) rename src/main/java/{DNPM => dev/dnpm}/analyzer/TherapieplanAnalyzer.java (93%) rename src/main/java/{DNPM => dev/dnpm}/config/PluginConfiguration.java (72%) rename src/main/java/{DNPM => dev/dnpm}/database/ReadOnlyRepository.java (95%) rename src/main/java/{DNPM => dev/dnpm}/database/SettingsRepository.java (91%) rename src/main/java/{DNPM => dev/dnpm}/dto/EcogStatusWithDate.java (97%) rename src/main/java/{DNPM => dev/dnpm}/dto/Studie.java (98%) rename src/main/java/{DNPM => dev/dnpm}/dto/Variant.java (99%) rename src/main/java/{DNPM => dev/dnpm}/exceptions/FormException.java (81%) rename src/main/java/{DNPM => dev/dnpm}/security/AbstractDelegatedPermissionEvaluator.java (96%) rename src/main/java/{DNPM => dev/dnpm}/security/DelegatingDataBasedPermissionEvaluator.java (98%) rename src/main/java/{DNPM => dev/dnpm}/security/FormBasedPermissionEvaluator.java (98%) rename src/main/java/{DNPM => dev/dnpm}/security/FormBasedSecurityAspects.java (90%) rename src/main/java/{DNPM => dev/dnpm}/security/FormSecured.java (92%) rename src/main/java/{DNPM => dev/dnpm}/security/FormSecuredResult.java (92%) rename src/main/java/{DNPM => dev/dnpm}/security/IllegalSecuredObjectAccessException.java (90%) rename src/main/java/{DNPM => dev/dnpm}/security/PermissionType.java (67%) rename src/main/java/{DNPM => dev/dnpm}/security/PersonPoolBasedPermissionEvaluator.java (99%) rename src/main/java/{DNPM => dev/dnpm}/security/PersonPoolBasedSecurityAspects.java (87%) rename src/main/java/{DNPM => dev/dnpm}/security/PersonPoolSecured.java (92%) rename src/main/java/{DNPM => dev/dnpm}/security/PersonPoolSecuredResult.java (92%) rename src/main/java/{DNPM => dev/dnpm}/security/SecurityService.java (98%) rename src/main/java/{DNPM => dev/dnpm}/services/DefaultFormService.java (94%) rename src/main/java/{DNPM => dev/dnpm}/services/DefaultStudienService.java (98%) rename src/main/java/{DNPM => dev/dnpm}/services/FormService.java (96%) rename src/main/java/{DNPM => dev/dnpm}/services/SettingsService.java (95%) rename src/main/java/{DNPM => dev/dnpm}/services/StudienService.java (94%) rename src/main/java/{DNPM => dev/dnpm}/services/TherapieMitEcogService.java (92%) rename src/main/java/{DNPM => dev/dnpm}/services/consent/ConsentManagerService.java (95%) rename src/main/java/{DNPM => dev/dnpm}/services/consent/ConsentManagerServiceFactory.java (95%) rename src/main/java/{DNPM => dev/dnpm}/services/consent/MrConsentManagerService.java (98%) rename src/main/java/{DNPM => dev/dnpm}/services/consent/UkwConsentManagerService.java (98%) rename src/main/java/{DNPM => dev/dnpm}/services/molekulargenetik/MolekulargenetikFormService.java (88%) rename src/main/java/{DNPM => dev/dnpm}/services/molekulargenetik/OsMolekulargenetikFormService.java (95%) rename src/main/java/{DNPM => dev/dnpm}/services/mtb/DefaultMtbService.java (98%) rename src/main/java/{DNPM => dev/dnpm}/services/mtb/MrMtbAnmeldungToProtocolMapper.java (98%) rename src/main/java/{DNPM => dev/dnpm}/services/mtb/MtbService.java (97%) rename src/main/java/{DNPM => dev/dnpm}/services/mtb/OsTumorkonferenzToProtocolMapper.java (98%) rename src/main/java/{DNPM => dev/dnpm}/services/mtb/OsTumorkonferenzVarianteUkwToProtocolMapper.java (98%) rename src/main/java/{DNPM => dev/dnpm}/services/mtb/ProcedureToProtocolMapper.java (87%) rename src/main/java/{DNPM => dev/dnpm}/services/strahlentherapie/DefaultStrahlentherapieService.java (95%) rename src/main/java/{DNPM => dev/dnpm}/services/strahlentherapie/StrahlentherapieService.java (60%) rename src/main/java/{DNPM => dev/dnpm}/services/systemtherapie/DefaultSystemtherapieService.java (96%) rename src/main/java/{DNPM => dev/dnpm}/services/systemtherapie/OsSystemischeTherapieToProzedurwerteMapper.java (98%) rename src/main/java/{DNPM => dev/dnpm}/services/systemtherapie/ProzedurToProzedurwerteMapper.java (89%) rename src/main/java/{DNPM => dev/dnpm}/services/systemtherapie/SystemtherapieService.java (89%) rename src/main/java/{DNPM => dev/dnpm}/services/therapieplan/AbstractTherapieplanService.java (94%) rename src/main/java/{DNPM => dev/dnpm}/services/therapieplan/DefaultTherapieplanService.java (97%) rename src/main/java/{DNPM => dev/dnpm}/services/therapieplan/MultipleMtbTherapieplanService.java (92%) rename src/main/java/{DNPM => dev/dnpm}/services/therapieplan/TherapieplanService.java (97%) rename src/main/java/{DNPM => dev/dnpm}/services/therapieplan/TherapieplanServiceFactory.java (87%) rename src/test/java/{DNPM => dev/dnpm}/ConsentManagerTest.java (91%) rename src/test/java/{DNPM => dev/dnpm}/DNPMHelperTest.java (97%) rename src/test/java/{DNPM => dev/dnpm}/MerkmalskatalogTest.java (97%) rename src/test/java/{DNPM => dev/dnpm}/analyzer/AnalyzerUtilsTest.java (99%) rename src/test/java/{DNPM => dev/dnpm}/analyzer/EinzelempfehlungAnalyzerTest.java (93%) rename src/test/java/{DNPM => dev/dnpm}/analyzer/FollowUpAnalyzerTest.java (99%) rename src/test/java/{DNPM => dev/dnpm}/analyzer/TherapieMitEcogAnalyzerTest.java (96%) rename src/test/java/{DNPM => dev/dnpm}/analyzer/TherapieplanAnalyzerTest.java (87%) rename src/test/java/{DNPM => dev/dnpm}/config/PluginConfigurationTest.java (83%) rename src/test/java/{DNPM => dev/dnpm}/dto/VariantTest.java (99%) rename src/test/java/{DNPM => dev/dnpm}/security/DelegatingDataBasedPermissionEvaluatorTest.java (99%) rename src/test/java/{DNPM => dev/dnpm}/security/FormBasedPermissionEvaluatorTest.java (99%) rename src/test/java/{DNPM => dev/dnpm}/security/FormBasedSecurityAspectsTest.java (99%) rename src/test/java/{DNPM => dev/dnpm}/security/PersonPoolBasedPermissionEvaluatorTest.java (99%) rename src/test/java/{DNPM => dev/dnpm}/security/PersonPoolBasedSecurityAspectsTest.java (99%) rename src/test/java/{DNPM => dev/dnpm}/services/SettingsServiceTest.java (95%) rename src/test/java/{DNPM => dev/dnpm}/services/StudieTest.java (95%) rename src/test/java/{DNPM => dev/dnpm}/services/consent/ConsentManagerServiceFactoryTest.java (97%) rename src/test/java/{DNPM => dev/dnpm}/services/consent/MrConsentManagerServiceTest.java (98%) rename src/test/java/{DNPM => dev/dnpm}/services/consent/UkwConsentManagerServiceTest.java (99%) rename src/test/java/{DNPM => dev/dnpm}/services/molekulargenetik/OsMolekluargenetikFormServiceTest.java (97%) rename src/test/java/{DNPM => dev/dnpm}/services/mtb/DefaultMtbServiceTest.java (99%) rename src/test/java/{DNPM => dev/dnpm}/services/mtb/MrMtbAnmeldungToProtocolMapperTest.java (99%) rename src/test/java/{DNPM => dev/dnpm}/services/mtb/OsTumorkonferenzToProtocolMapperTest.java (97%) rename src/test/java/{DNPM => dev/dnpm}/services/mtb/OsTumorkonferenzVarianteUkwToProtocolMapperTest.java (97%) rename src/test/java/{DNPM => dev/dnpm}/services/strahlentherapie/DefaultStrahlentherapieServiceTest.java (97%) rename src/test/java/{DNPM => dev/dnpm}/services/systemtherapie/DefaultSystemtherapieServiceTest.java (98%) rename src/test/java/{DNPM => dev/dnpm}/services/systemtherapie/ProzedurToProzedurwerteMapperTest.java (98%) rename src/test/java/{DNPM => dev/dnpm}/services/therapieplan/DefaultTherapieplanServiceTest.java (98%) rename src/test/java/{DNPM => dev/dnpm}/services/therapieplan/TherapieplanServiceFactoryTest.java (92%) diff --git a/README.md b/README.md index d387784..5b0888e 100644 --- a/README.md +++ b/README.md @@ -209,7 +209,7 @@ ob der aufrufende Benutzer Zugriff auf die Prozedur hat und gibt nur bei vorhand den Namen des Formulars zu dieser prozedur zurück. ```java -import DNPM.security.DelegatingDataBasedPermissionEvaluator; +import dev.dnpm.security.DelegatingDataBasedPermissionEvaluator; import de.itc.onkostar.api.IOnkostarApi; class DemoAnalyzer implements IProcedureAnalyzer { @@ -242,7 +242,7 @@ class DemoAnalyzer implements IProcedureAnalyzer { if ( null != procedure - && permissionEvaluator.hasPermission( + && permissionEvaluator.hasPermission( SecurityContextHolder.getContext().getAuthentication(), procedure, PermissionType.READ @@ -274,9 +274,9 @@ Wird die Methode `getFormName(Procedure)` aufgerufen und der Benutzer hat keinen Prozedur, wird eine Exception geworfen. ```java -import DNPM.security.FormSecured; -import DNPM.security.PermissionType; -import DNPM.security.PersonPoolSecured; +import dev.dnpm.security.FormSecured; +import dev.dnpm.security.PermissionType; +import dev.dnpm.security.PersonPoolSecured; @Service class DemoService { @@ -293,9 +293,8 @@ class DemoService { Der Aufruf im Analyzer kann nun wie folgt aussehen: ```java -import DNPM.security.DelegatingDataBasedPermissionEvaluator; -import DNPM.security.IllegalSecuredObjectAccessException; -import de.itc.onkostar.api.IOnkostarApi; + +import dev.dnpm.security.IllegalSecuredObjectAccessException; class DemoAnalyzer implements IProcedureAnalyzer { diff --git a/src/main/java/DNPM/VerweisVon.java b/src/main/java/dev/dnpm/VerweisVon.java similarity index 99% rename from src/main/java/DNPM/VerweisVon.java rename to src/main/java/dev/dnpm/VerweisVon.java index afb6824..77fd14a 100644 --- a/src/main/java/DNPM/VerweisVon.java +++ b/src/main/java/dev/dnpm/VerweisVon.java @@ -1,4 +1,4 @@ -package DNPM; +package dev.dnpm; import java.text.SimpleDateFormat; import java.util.Date; diff --git a/src/main/java/DNPM/analyzer/Analyzer.java b/src/main/java/dev/dnpm/analyzer/Analyzer.java similarity index 89% rename from src/main/java/DNPM/analyzer/Analyzer.java rename to src/main/java/dev/dnpm/analyzer/Analyzer.java index fd2fdec..7868f32 100644 --- a/src/main/java/DNPM/analyzer/Analyzer.java +++ b/src/main/java/dev/dnpm/analyzer/Analyzer.java @@ -1,4 +1,4 @@ -package DNPM.analyzer; +package dev.dnpm.analyzer; import de.itc.onkostar.api.analysis.OnkostarPluginType; diff --git a/src/main/java/DNPM/analyzer/AnalyzerUtils.java b/src/main/java/dev/dnpm/analyzer/AnalyzerUtils.java similarity index 99% rename from src/main/java/DNPM/analyzer/AnalyzerUtils.java rename to src/main/java/dev/dnpm/analyzer/AnalyzerUtils.java index dfa4c0d..937cc74 100644 --- a/src/main/java/DNPM/analyzer/AnalyzerUtils.java +++ b/src/main/java/dev/dnpm/analyzer/AnalyzerUtils.java @@ -1,4 +1,4 @@ -package DNPM.analyzer; +package dev.dnpm.analyzer; import java.util.Map; import java.util.Optional; diff --git a/src/main/java/DNPM/analyzer/BackendService.java b/src/main/java/dev/dnpm/analyzer/BackendService.java similarity index 95% rename from src/main/java/DNPM/analyzer/BackendService.java rename to src/main/java/dev/dnpm/analyzer/BackendService.java index 84895dd..c5fca5c 100644 --- a/src/main/java/DNPM/analyzer/BackendService.java +++ b/src/main/java/dev/dnpm/analyzer/BackendService.java @@ -1,4 +1,4 @@ -package DNPM.analyzer; +package dev.dnpm.analyzer; import de.itc.onkostar.api.Disease; import de.itc.onkostar.api.Procedure; diff --git a/src/main/java/DNPM/analyzer/ConsentManager.java b/src/main/java/dev/dnpm/analyzer/ConsentManager.java similarity index 95% rename from src/main/java/DNPM/analyzer/ConsentManager.java rename to src/main/java/dev/dnpm/analyzer/ConsentManager.java index 6051bc0..601399d 100644 --- a/src/main/java/DNPM/analyzer/ConsentManager.java +++ b/src/main/java/dev/dnpm/analyzer/ConsentManager.java @@ -1,6 +1,6 @@ -package DNPM.analyzer; +package dev.dnpm.analyzer; -import DNPM.services.consent.ConsentManagerServiceFactory; +import dev.dnpm.services.consent.ConsentManagerServiceFactory; import de.itc.onkostar.api.Disease; import de.itc.onkostar.api.IOnkostarApi; import de.itc.onkostar.api.Procedure; diff --git a/src/main/java/DNPM/analyzer/DNPMHelper.java b/src/main/java/dev/dnpm/analyzer/DNPMHelper.java similarity index 97% rename from src/main/java/DNPM/analyzer/DNPMHelper.java rename to src/main/java/dev/dnpm/analyzer/DNPMHelper.java index bb21fa0..211b3bd 100644 --- a/src/main/java/DNPM/analyzer/DNPMHelper.java +++ b/src/main/java/dev/dnpm/analyzer/DNPMHelper.java @@ -1,11 +1,11 @@ -package DNPM.analyzer; +package dev.dnpm.analyzer; -import DNPM.dto.EcogStatusWithDate; -import DNPM.VerweisVon; -import DNPM.security.DelegatingDataBasedPermissionEvaluator; -import DNPM.security.IllegalSecuredObjectAccessException; -import DNPM.security.PermissionType; -import DNPM.services.systemtherapie.SystemtherapieService; +import dev.dnpm.dto.EcogStatusWithDate; +import dev.dnpm.VerweisVon; +import dev.dnpm.security.DelegatingDataBasedPermissionEvaluator; +import dev.dnpm.security.IllegalSecuredObjectAccessException; +import dev.dnpm.security.PermissionType; +import dev.dnpm.services.systemtherapie.SystemtherapieService; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import de.itc.onkostar.api.Disease; diff --git a/src/main/java/DNPM/analyzer/EinzelempfehlungAnalyzer.java b/src/main/java/dev/dnpm/analyzer/EinzelempfehlungAnalyzer.java similarity index 93% rename from src/main/java/DNPM/analyzer/EinzelempfehlungAnalyzer.java rename to src/main/java/dev/dnpm/analyzer/EinzelempfehlungAnalyzer.java index 1724272..4a6bfdf 100644 --- a/src/main/java/DNPM/analyzer/EinzelempfehlungAnalyzer.java +++ b/src/main/java/dev/dnpm/analyzer/EinzelempfehlungAnalyzer.java @@ -1,11 +1,11 @@ -package DNPM.analyzer; +package dev.dnpm.analyzer; -import DNPM.dto.Studie; -import DNPM.dto.Variant; -import DNPM.security.PermissionType; -import DNPM.security.PersonPoolBasedPermissionEvaluator; -import DNPM.services.StudienService; -import DNPM.services.molekulargenetik.MolekulargenetikFormService; +import dev.dnpm.dto.Studie; +import dev.dnpm.dto.Variant; +import dev.dnpm.security.PermissionType; +import dev.dnpm.security.PersonPoolBasedPermissionEvaluator; +import dev.dnpm.services.StudienService; +import dev.dnpm.services.molekulargenetik.MolekulargenetikFormService; import de.itc.onkostar.api.Disease; import de.itc.onkostar.api.IOnkostarApi; import de.itc.onkostar.api.Procedure; diff --git a/src/main/java/DNPM/analyzer/FollowUpAnalyzer.java b/src/main/java/dev/dnpm/analyzer/FollowUpAnalyzer.java similarity index 99% rename from src/main/java/DNPM/analyzer/FollowUpAnalyzer.java rename to src/main/java/dev/dnpm/analyzer/FollowUpAnalyzer.java index 07b5fa0..1e1bbb9 100644 --- a/src/main/java/DNPM/analyzer/FollowUpAnalyzer.java +++ b/src/main/java/dev/dnpm/analyzer/FollowUpAnalyzer.java @@ -1,4 +1,4 @@ -package DNPM.analyzer; +package dev.dnpm.analyzer; import de.itc.onkostar.api.Disease; import de.itc.onkostar.api.IOnkostarApi; diff --git a/src/main/java/DNPM/analyzer/IPluginPart.java b/src/main/java/dev/dnpm/analyzer/IPluginPart.java similarity index 93% rename from src/main/java/DNPM/analyzer/IPluginPart.java rename to src/main/java/dev/dnpm/analyzer/IPluginPart.java index 31e9fff..23940fa 100644 --- a/src/main/java/DNPM/analyzer/IPluginPart.java +++ b/src/main/java/dev/dnpm/analyzer/IPluginPart.java @@ -1,4 +1,4 @@ -package DNPM.analyzer; +package dev.dnpm.analyzer; import de.itc.onkostar.api.analysis.IProcedureAnalyzer; diff --git a/src/main/java/DNPM/analyzer/Merkmalskatalog.java b/src/main/java/dev/dnpm/analyzer/Merkmalskatalog.java similarity index 99% rename from src/main/java/DNPM/analyzer/Merkmalskatalog.java rename to src/main/java/dev/dnpm/analyzer/Merkmalskatalog.java index 275fccd..76892f3 100644 --- a/src/main/java/DNPM/analyzer/Merkmalskatalog.java +++ b/src/main/java/dev/dnpm/analyzer/Merkmalskatalog.java @@ -1,4 +1,4 @@ -package DNPM.analyzer; +package dev.dnpm.analyzer; import de.itc.onkostar.api.Disease; import de.itc.onkostar.api.IOnkostarApi; diff --git a/src/main/java/DNPM/analyzer/TherapieMitEcogAnalyzer.java b/src/main/java/dev/dnpm/analyzer/TherapieMitEcogAnalyzer.java similarity index 96% rename from src/main/java/DNPM/analyzer/TherapieMitEcogAnalyzer.java rename to src/main/java/dev/dnpm/analyzer/TherapieMitEcogAnalyzer.java index 46841e1..8afa7d8 100644 --- a/src/main/java/DNPM/analyzer/TherapieMitEcogAnalyzer.java +++ b/src/main/java/dev/dnpm/analyzer/TherapieMitEcogAnalyzer.java @@ -1,8 +1,8 @@ -package DNPM.analyzer; +package dev.dnpm.analyzer; -import DNPM.dto.EcogStatusWithDate; -import DNPM.services.strahlentherapie.StrahlentherapieService; -import DNPM.services.systemtherapie.SystemtherapieService; +import dev.dnpm.dto.EcogStatusWithDate; +import dev.dnpm.services.strahlentherapie.StrahlentherapieService; +import dev.dnpm.services.systemtherapie.SystemtherapieService; import de.itc.onkostar.api.Disease; import de.itc.onkostar.api.IOnkostarApi; import de.itc.onkostar.api.Item; diff --git a/src/main/java/DNPM/analyzer/TherapieplanAnalyzer.java b/src/main/java/dev/dnpm/analyzer/TherapieplanAnalyzer.java similarity index 93% rename from src/main/java/DNPM/analyzer/TherapieplanAnalyzer.java rename to src/main/java/dev/dnpm/analyzer/TherapieplanAnalyzer.java index 932cafb..a623a99 100644 --- a/src/main/java/DNPM/analyzer/TherapieplanAnalyzer.java +++ b/src/main/java/dev/dnpm/analyzer/TherapieplanAnalyzer.java @@ -1,9 +1,9 @@ -package DNPM.analyzer; +package dev.dnpm.analyzer; -import DNPM.security.DelegatingDataBasedPermissionEvaluator; -import DNPM.security.PermissionType; -import DNPM.services.mtb.MtbService; -import DNPM.services.therapieplan.TherapieplanServiceFactory; +import dev.dnpm.security.DelegatingDataBasedPermissionEvaluator; +import dev.dnpm.security.PermissionType; +import dev.dnpm.services.mtb.MtbService; +import dev.dnpm.services.therapieplan.TherapieplanServiceFactory; import de.itc.onkostar.api.Disease; import de.itc.onkostar.api.Procedure; import de.itc.onkostar.api.analysis.AnalyseTriggerEvent; diff --git a/src/main/java/DNPM/config/PluginConfiguration.java b/src/main/java/dev/dnpm/config/PluginConfiguration.java similarity index 72% rename from src/main/java/DNPM/config/PluginConfiguration.java rename to src/main/java/dev/dnpm/config/PluginConfiguration.java index 5fcf309..6b20009 100644 --- a/src/main/java/DNPM/config/PluginConfiguration.java +++ b/src/main/java/dev/dnpm/config/PluginConfiguration.java @@ -1,17 +1,17 @@ -package DNPM.config; +package dev.dnpm.config; -import DNPM.database.SettingsRepository; -import DNPM.services.*; -import DNPM.services.consent.ConsentManagerServiceFactory; -import DNPM.services.molekulargenetik.MolekulargenetikFormService; -import DNPM.services.molekulargenetik.OsMolekulargenetikFormService; -import DNPM.services.mtb.DefaultMtbService; -import DNPM.services.mtb.MtbService; -import DNPM.services.strahlentherapie.DefaultStrahlentherapieService; -import DNPM.services.strahlentherapie.StrahlentherapieService; -import DNPM.services.systemtherapie.DefaultSystemtherapieService; -import DNPM.services.systemtherapie.SystemtherapieService; -import DNPM.services.therapieplan.TherapieplanServiceFactory; +import dev.dnpm.database.SettingsRepository; +import dev.dnpm.services.*; +import dev.dnpm.services.consent.ConsentManagerServiceFactory; +import dev.dnpm.services.molekulargenetik.MolekulargenetikFormService; +import dev.dnpm.services.molekulargenetik.OsMolekulargenetikFormService; +import dev.dnpm.services.mtb.DefaultMtbService; +import dev.dnpm.services.mtb.MtbService; +import dev.dnpm.services.strahlentherapie.DefaultStrahlentherapieService; +import dev.dnpm.services.strahlentherapie.StrahlentherapieService; +import dev.dnpm.services.systemtherapie.DefaultSystemtherapieService; +import dev.dnpm.services.systemtherapie.SystemtherapieService; +import dev.dnpm.services.therapieplan.TherapieplanServiceFactory; import de.itc.onkostar.api.IOnkostarApi; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; @@ -26,8 +26,8 @@ import javax.sql.DataSource; * @since 0.0.2 */ @Configuration -@ComponentScan(basePackages = { "DNPM.analyzer", "DNPM.security" }) -@EnableJpaRepositories(basePackages = "DNPM.database") +@ComponentScan(basePackages = { "dev.dnpm.analyzer", "dev.dnpm.security" }) +@EnableJpaRepositories(basePackages = "dev.dnpm.database") public class PluginConfiguration { @Bean diff --git a/src/main/java/DNPM/database/ReadOnlyRepository.java b/src/main/java/dev/dnpm/database/ReadOnlyRepository.java similarity index 95% rename from src/main/java/DNPM/database/ReadOnlyRepository.java rename to src/main/java/dev/dnpm/database/ReadOnlyRepository.java index 3f8509d..8f20f6b 100644 --- a/src/main/java/DNPM/database/ReadOnlyRepository.java +++ b/src/main/java/dev/dnpm/database/ReadOnlyRepository.java @@ -1,4 +1,4 @@ -package DNPM.database; +package dev.dnpm.database; import org.springframework.data.repository.NoRepositoryBean; import org.springframework.data.repository.Repository; diff --git a/src/main/java/DNPM/database/SettingsRepository.java b/src/main/java/dev/dnpm/database/SettingsRepository.java similarity index 91% rename from src/main/java/DNPM/database/SettingsRepository.java rename to src/main/java/dev/dnpm/database/SettingsRepository.java index 9a6e331..e802b1a 100644 --- a/src/main/java/DNPM/database/SettingsRepository.java +++ b/src/main/java/dev/dnpm/database/SettingsRepository.java @@ -1,4 +1,4 @@ -package DNPM.database; +package dev.dnpm.database; import de.itc.db.dnpm.Setting; import org.springframework.stereotype.Repository; diff --git a/src/main/java/DNPM/dto/EcogStatusWithDate.java b/src/main/java/dev/dnpm/dto/EcogStatusWithDate.java similarity index 97% rename from src/main/java/DNPM/dto/EcogStatusWithDate.java rename to src/main/java/dev/dnpm/dto/EcogStatusWithDate.java index a1ec575..8b3140d 100644 --- a/src/main/java/DNPM/dto/EcogStatusWithDate.java +++ b/src/main/java/dev/dnpm/dto/EcogStatusWithDate.java @@ -1,4 +1,4 @@ -package DNPM.dto; +package dev.dnpm.dto; import org.springframework.util.Assert; diff --git a/src/main/java/DNPM/dto/Studie.java b/src/main/java/dev/dnpm/dto/Studie.java similarity index 98% rename from src/main/java/DNPM/dto/Studie.java rename to src/main/java/dev/dnpm/dto/Studie.java index 59d3cfe..2461788 100644 --- a/src/main/java/DNPM/dto/Studie.java +++ b/src/main/java/dev/dnpm/dto/Studie.java @@ -1,4 +1,4 @@ -package DNPM.dto; +package dev.dnpm.dto; public class Studie { private final String kategorieName; diff --git a/src/main/java/DNPM/dto/Variant.java b/src/main/java/dev/dnpm/dto/Variant.java similarity index 99% rename from src/main/java/DNPM/dto/Variant.java rename to src/main/java/dev/dnpm/dto/Variant.java index d3fab9e..a7f75cd 100644 --- a/src/main/java/DNPM/dto/Variant.java +++ b/src/main/java/dev/dnpm/dto/Variant.java @@ -1,4 +1,4 @@ -package DNPM.dto; +package dev.dnpm.dto; import de.itc.onkostar.api.Procedure; diff --git a/src/main/java/DNPM/exceptions/FormException.java b/src/main/java/dev/dnpm/exceptions/FormException.java similarity index 81% rename from src/main/java/DNPM/exceptions/FormException.java rename to src/main/java/dev/dnpm/exceptions/FormException.java index 4d0d6dd..9ce0176 100644 --- a/src/main/java/DNPM/exceptions/FormException.java +++ b/src/main/java/dev/dnpm/exceptions/FormException.java @@ -1,4 +1,4 @@ -package DNPM.exceptions; +package dev.dnpm.exceptions; public class FormException extends RuntimeException { diff --git a/src/main/java/DNPM/security/AbstractDelegatedPermissionEvaluator.java b/src/main/java/dev/dnpm/security/AbstractDelegatedPermissionEvaluator.java similarity index 96% rename from src/main/java/DNPM/security/AbstractDelegatedPermissionEvaluator.java rename to src/main/java/dev/dnpm/security/AbstractDelegatedPermissionEvaluator.java index 60e7ad2..11bdcb6 100644 --- a/src/main/java/DNPM/security/AbstractDelegatedPermissionEvaluator.java +++ b/src/main/java/dev/dnpm/security/AbstractDelegatedPermissionEvaluator.java @@ -1,4 +1,4 @@ -package DNPM.security; +package dev.dnpm.security; import de.itc.onkostar.api.IOnkostarApi; import de.itc.onkostar.api.Patient; diff --git a/src/main/java/DNPM/security/DelegatingDataBasedPermissionEvaluator.java b/src/main/java/dev/dnpm/security/DelegatingDataBasedPermissionEvaluator.java similarity index 98% rename from src/main/java/DNPM/security/DelegatingDataBasedPermissionEvaluator.java rename to src/main/java/dev/dnpm/security/DelegatingDataBasedPermissionEvaluator.java index d8ca92e..09c212b 100644 --- a/src/main/java/DNPM/security/DelegatingDataBasedPermissionEvaluator.java +++ b/src/main/java/dev/dnpm/security/DelegatingDataBasedPermissionEvaluator.java @@ -1,4 +1,4 @@ -package DNPM.security; +package dev.dnpm.security; import org.springframework.security.access.PermissionEvaluator; import org.springframework.security.core.Authentication; diff --git a/src/main/java/DNPM/security/FormBasedPermissionEvaluator.java b/src/main/java/dev/dnpm/security/FormBasedPermissionEvaluator.java similarity index 98% rename from src/main/java/DNPM/security/FormBasedPermissionEvaluator.java rename to src/main/java/dev/dnpm/security/FormBasedPermissionEvaluator.java index 912a19c..64f6833 100644 --- a/src/main/java/DNPM/security/FormBasedPermissionEvaluator.java +++ b/src/main/java/dev/dnpm/security/FormBasedPermissionEvaluator.java @@ -1,4 +1,4 @@ -package DNPM.security; +package dev.dnpm.security; import de.itc.onkostar.api.IOnkostarApi; import de.itc.onkostar.api.Procedure; diff --git a/src/main/java/DNPM/security/FormBasedSecurityAspects.java b/src/main/java/dev/dnpm/security/FormBasedSecurityAspects.java similarity index 90% rename from src/main/java/DNPM/security/FormBasedSecurityAspects.java rename to src/main/java/dev/dnpm/security/FormBasedSecurityAspects.java index 306c062..eb80d47 100644 --- a/src/main/java/DNPM/security/FormBasedSecurityAspects.java +++ b/src/main/java/dev/dnpm/security/FormBasedSecurityAspects.java @@ -1,4 +1,4 @@ -package DNPM.security; +package dev.dnpm.security; import de.itc.onkostar.api.Procedure; import org.aspectj.lang.JoinPoint; @@ -26,7 +26,7 @@ public class FormBasedSecurityAspects { this.permissionEvaluator = permissionEvaluator; } - @AfterReturning(value = "@annotation(FormSecuredResult)", returning = "procedure") + @AfterReturning(value = "@annotation(dev.dnpm.security.FormSecuredResult)", returning = "procedure") public void afterProcedureFormBased(Procedure procedure) { if ( null != procedure @@ -37,7 +37,7 @@ public class FormBasedSecurityAspects { } } - @Before(value = "@annotation(FormSecured)") + @Before(value = "@annotation(dev.dnpm.security.FormSecured)") public void beforeProcedureFormBased(JoinPoint jp) { Arrays.stream(jp.getArgs()) .filter(arg -> arg instanceof Procedure) diff --git a/src/main/java/DNPM/security/FormSecured.java b/src/main/java/dev/dnpm/security/FormSecured.java similarity index 92% rename from src/main/java/DNPM/security/FormSecured.java rename to src/main/java/dev/dnpm/security/FormSecured.java index 2e12667..0ea277e 100644 --- a/src/main/java/DNPM/security/FormSecured.java +++ b/src/main/java/dev/dnpm/security/FormSecured.java @@ -1,4 +1,4 @@ -package DNPM.security; +package dev.dnpm.security; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/main/java/DNPM/security/FormSecuredResult.java b/src/main/java/dev/dnpm/security/FormSecuredResult.java similarity index 92% rename from src/main/java/DNPM/security/FormSecuredResult.java rename to src/main/java/dev/dnpm/security/FormSecuredResult.java index ccfbd24..64f9bce 100644 --- a/src/main/java/DNPM/security/FormSecuredResult.java +++ b/src/main/java/dev/dnpm/security/FormSecuredResult.java @@ -1,4 +1,4 @@ -package DNPM.security; +package dev.dnpm.security; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/main/java/DNPM/security/IllegalSecuredObjectAccessException.java b/src/main/java/dev/dnpm/security/IllegalSecuredObjectAccessException.java similarity index 90% rename from src/main/java/DNPM/security/IllegalSecuredObjectAccessException.java rename to src/main/java/dev/dnpm/security/IllegalSecuredObjectAccessException.java index 542b604..69cd456 100644 --- a/src/main/java/DNPM/security/IllegalSecuredObjectAccessException.java +++ b/src/main/java/dev/dnpm/security/IllegalSecuredObjectAccessException.java @@ -1,4 +1,4 @@ -package DNPM.security; +package dev.dnpm.security; public class IllegalSecuredObjectAccessException extends RuntimeException { diff --git a/src/main/java/DNPM/security/PermissionType.java b/src/main/java/dev/dnpm/security/PermissionType.java similarity index 67% rename from src/main/java/DNPM/security/PermissionType.java rename to src/main/java/dev/dnpm/security/PermissionType.java index 1539aea..da3c471 100644 --- a/src/main/java/DNPM/security/PermissionType.java +++ b/src/main/java/dev/dnpm/security/PermissionType.java @@ -1,4 +1,4 @@ -package DNPM.security; +package dev.dnpm.security; public enum PermissionType { READ, diff --git a/src/main/java/DNPM/security/PersonPoolBasedPermissionEvaluator.java b/src/main/java/dev/dnpm/security/PersonPoolBasedPermissionEvaluator.java similarity index 99% rename from src/main/java/DNPM/security/PersonPoolBasedPermissionEvaluator.java rename to src/main/java/dev/dnpm/security/PersonPoolBasedPermissionEvaluator.java index e3ba16e..293614b 100644 --- a/src/main/java/DNPM/security/PersonPoolBasedPermissionEvaluator.java +++ b/src/main/java/dev/dnpm/security/PersonPoolBasedPermissionEvaluator.java @@ -1,4 +1,4 @@ -package DNPM.security; +package dev.dnpm.security; import de.itc.onkostar.api.IOnkostarApi; import de.itc.onkostar.api.Patient; diff --git a/src/main/java/DNPM/security/PersonPoolBasedSecurityAspects.java b/src/main/java/dev/dnpm/security/PersonPoolBasedSecurityAspects.java similarity index 87% rename from src/main/java/DNPM/security/PersonPoolBasedSecurityAspects.java rename to src/main/java/dev/dnpm/security/PersonPoolBasedSecurityAspects.java index 37c313f..66179f7 100644 --- a/src/main/java/DNPM/security/PersonPoolBasedSecurityAspects.java +++ b/src/main/java/dev/dnpm/security/PersonPoolBasedSecurityAspects.java @@ -1,4 +1,4 @@ -package DNPM.security; +package dev.dnpm.security; import de.itc.onkostar.api.Patient; import de.itc.onkostar.api.Procedure; @@ -25,7 +25,7 @@ public class PersonPoolBasedSecurityAspects { this.permissionEvaluator = permissionEvaluator; } - @AfterReturning(value = "@annotation(PersonPoolSecuredResult) ", returning = "patient") + @AfterReturning(value = "@annotation(dev.dnpm.security.PersonPoolSecuredResult) ", returning = "patient") public void afterPatient(Patient patient) { if ( null != patient @@ -36,7 +36,7 @@ public class PersonPoolBasedSecurityAspects { } } - @AfterReturning(value = "@annotation(PersonPoolSecuredResult)", returning = "procedure") + @AfterReturning(value = "@annotation(dev.dnpm.security.PersonPoolSecuredResult)", returning = "procedure") public void afterProcedure(Procedure procedure) { if ( null != procedure @@ -47,7 +47,7 @@ public class PersonPoolBasedSecurityAspects { } } - @Before(value = "@annotation(PersonPoolSecured)") + @Before(value = "@annotation(dev.dnpm.security.PersonPoolSecured)") public void beforePatient(JoinPoint jp) { Arrays.stream(jp.getArgs()) .filter(arg -> arg instanceof Patient) @@ -59,7 +59,7 @@ public class PersonPoolBasedSecurityAspects { }); } - @Before(value = "@annotation(PersonPoolSecured)") + @Before(value = "@annotation(dev.dnpm.security.PersonPoolSecured)") public void beforeProcedure(JoinPoint jp) { Arrays.stream(jp.getArgs()) .filter(arg -> arg instanceof Procedure) diff --git a/src/main/java/DNPM/security/PersonPoolSecured.java b/src/main/java/dev/dnpm/security/PersonPoolSecured.java similarity index 92% rename from src/main/java/DNPM/security/PersonPoolSecured.java rename to src/main/java/dev/dnpm/security/PersonPoolSecured.java index cac0f78..8a5709c 100644 --- a/src/main/java/DNPM/security/PersonPoolSecured.java +++ b/src/main/java/dev/dnpm/security/PersonPoolSecured.java @@ -1,4 +1,4 @@ -package DNPM.security; +package dev.dnpm.security; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/main/java/DNPM/security/PersonPoolSecuredResult.java b/src/main/java/dev/dnpm/security/PersonPoolSecuredResult.java similarity index 92% rename from src/main/java/DNPM/security/PersonPoolSecuredResult.java rename to src/main/java/dev/dnpm/security/PersonPoolSecuredResult.java index 0ca8edf..36e19da 100644 --- a/src/main/java/DNPM/security/PersonPoolSecuredResult.java +++ b/src/main/java/dev/dnpm/security/PersonPoolSecuredResult.java @@ -1,4 +1,4 @@ -package DNPM.security; +package dev.dnpm.security; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/main/java/DNPM/security/SecurityService.java b/src/main/java/dev/dnpm/security/SecurityService.java similarity index 98% rename from src/main/java/DNPM/security/SecurityService.java rename to src/main/java/dev/dnpm/security/SecurityService.java index 479701f..ba80a9d 100644 --- a/src/main/java/DNPM/security/SecurityService.java +++ b/src/main/java/dev/dnpm/security/SecurityService.java @@ -1,4 +1,4 @@ -package DNPM.security; +package dev.dnpm.security; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.security.core.Authentication; diff --git a/src/main/java/DNPM/services/DefaultFormService.java b/src/main/java/dev/dnpm/services/DefaultFormService.java similarity index 94% rename from src/main/java/DNPM/services/DefaultFormService.java rename to src/main/java/dev/dnpm/services/DefaultFormService.java index 9feaeb2..4240809 100644 --- a/src/main/java/DNPM/services/DefaultFormService.java +++ b/src/main/java/dev/dnpm/services/DefaultFormService.java @@ -1,6 +1,6 @@ -package DNPM.services; +package dev.dnpm.services; -import DNPM.exceptions.FormException; +import dev.dnpm.exceptions.FormException; import org.springframework.jdbc.core.JdbcTemplate; import javax.sql.DataSource; diff --git a/src/main/java/DNPM/services/DefaultStudienService.java b/src/main/java/dev/dnpm/services/DefaultStudienService.java similarity index 98% rename from src/main/java/DNPM/services/DefaultStudienService.java rename to src/main/java/dev/dnpm/services/DefaultStudienService.java index e172cc8..5c65842 100644 --- a/src/main/java/DNPM/services/DefaultStudienService.java +++ b/src/main/java/dev/dnpm/services/DefaultStudienService.java @@ -1,6 +1,6 @@ -package DNPM.services; +package dev.dnpm.services; -import DNPM.dto.Studie; +import dev.dnpm.dto.Studie; import org.springframework.jdbc.core.JdbcTemplate; import javax.sql.DataSource; diff --git a/src/main/java/DNPM/services/FormService.java b/src/main/java/dev/dnpm/services/FormService.java similarity index 96% rename from src/main/java/DNPM/services/FormService.java rename to src/main/java/dev/dnpm/services/FormService.java index f10d6c3..e400516 100644 --- a/src/main/java/DNPM/services/FormService.java +++ b/src/main/java/dev/dnpm/services/FormService.java @@ -1,6 +1,6 @@ -package DNPM.services; +package dev.dnpm.services; -import DNPM.exceptions.FormException; +import dev.dnpm.exceptions.FormException; import de.itc.onkostar.api.Procedure; import de.itc.onkostar.api.constants.JaNeinUnbekannt; diff --git a/src/main/java/DNPM/services/SettingsService.java b/src/main/java/dev/dnpm/services/SettingsService.java similarity index 95% rename from src/main/java/DNPM/services/SettingsService.java rename to src/main/java/dev/dnpm/services/SettingsService.java index 7459d4e..8aa5f6b 100644 --- a/src/main/java/DNPM/services/SettingsService.java +++ b/src/main/java/dev/dnpm/services/SettingsService.java @@ -1,6 +1,6 @@ -package DNPM.services; +package dev.dnpm.services; -import DNPM.database.SettingsRepository; +import dev.dnpm.database.SettingsRepository; import java.util.Optional; diff --git a/src/main/java/DNPM/services/StudienService.java b/src/main/java/dev/dnpm/services/StudienService.java similarity index 94% rename from src/main/java/DNPM/services/StudienService.java rename to src/main/java/dev/dnpm/services/StudienService.java index c82947d..c07b1c7 100644 --- a/src/main/java/DNPM/services/StudienService.java +++ b/src/main/java/dev/dnpm/services/StudienService.java @@ -1,6 +1,6 @@ -package DNPM.services; +package dev.dnpm.services; -import DNPM.dto.Studie; +import dev.dnpm.dto.Studie; import java.util.List; diff --git a/src/main/java/DNPM/services/TherapieMitEcogService.java b/src/main/java/dev/dnpm/services/TherapieMitEcogService.java similarity index 92% rename from src/main/java/DNPM/services/TherapieMitEcogService.java rename to src/main/java/dev/dnpm/services/TherapieMitEcogService.java index e8cbae4..865d11a 100644 --- a/src/main/java/DNPM/services/TherapieMitEcogService.java +++ b/src/main/java/dev/dnpm/services/TherapieMitEcogService.java @@ -1,6 +1,6 @@ -package DNPM.services; +package dev.dnpm.services; -import DNPM.dto.EcogStatusWithDate; +import dev.dnpm.dto.EcogStatusWithDate; import de.itc.onkostar.api.Patient; import java.util.List; diff --git a/src/main/java/DNPM/services/consent/ConsentManagerService.java b/src/main/java/dev/dnpm/services/consent/ConsentManagerService.java similarity index 95% rename from src/main/java/DNPM/services/consent/ConsentManagerService.java rename to src/main/java/dev/dnpm/services/consent/ConsentManagerService.java index c05ad6b..abbc702 100644 --- a/src/main/java/DNPM/services/consent/ConsentManagerService.java +++ b/src/main/java/dev/dnpm/services/consent/ConsentManagerService.java @@ -1,4 +1,4 @@ -package DNPM.services.consent; +package dev.dnpm.services.consent; import de.itc.onkostar.api.Procedure; diff --git a/src/main/java/DNPM/services/consent/ConsentManagerServiceFactory.java b/src/main/java/dev/dnpm/services/consent/ConsentManagerServiceFactory.java similarity index 95% rename from src/main/java/DNPM/services/consent/ConsentManagerServiceFactory.java rename to src/main/java/dev/dnpm/services/consent/ConsentManagerServiceFactory.java index 0ec7a15..b3f9497 100644 --- a/src/main/java/DNPM/services/consent/ConsentManagerServiceFactory.java +++ b/src/main/java/dev/dnpm/services/consent/ConsentManagerServiceFactory.java @@ -1,4 +1,4 @@ -package DNPM.services.consent; +package dev.dnpm.services.consent; import de.itc.onkostar.api.IOnkostarApi; diff --git a/src/main/java/DNPM/services/consent/MrConsentManagerService.java b/src/main/java/dev/dnpm/services/consent/MrConsentManagerService.java similarity index 98% rename from src/main/java/DNPM/services/consent/MrConsentManagerService.java rename to src/main/java/dev/dnpm/services/consent/MrConsentManagerService.java index 20ee4db..e4d88e2 100644 --- a/src/main/java/DNPM/services/consent/MrConsentManagerService.java +++ b/src/main/java/dev/dnpm/services/consent/MrConsentManagerService.java @@ -1,6 +1,6 @@ -package DNPM.services.consent; +package dev.dnpm.services.consent; -import DNPM.VerweisVon; +import dev.dnpm.VerweisVon; import de.itc.onkostar.api.IOnkostarApi; import de.itc.onkostar.api.Item; import de.itc.onkostar.api.Procedure; diff --git a/src/main/java/DNPM/services/consent/UkwConsentManagerService.java b/src/main/java/dev/dnpm/services/consent/UkwConsentManagerService.java similarity index 98% rename from src/main/java/DNPM/services/consent/UkwConsentManagerService.java rename to src/main/java/dev/dnpm/services/consent/UkwConsentManagerService.java index c539e5a..d6697d6 100644 --- a/src/main/java/DNPM/services/consent/UkwConsentManagerService.java +++ b/src/main/java/dev/dnpm/services/consent/UkwConsentManagerService.java @@ -1,4 +1,4 @@ -package DNPM.services.consent; +package dev.dnpm.services.consent; import de.itc.onkostar.api.IOnkostarApi; import de.itc.onkostar.api.Item; diff --git a/src/main/java/DNPM/services/molekulargenetik/MolekulargenetikFormService.java b/src/main/java/dev/dnpm/services/molekulargenetik/MolekulargenetikFormService.java similarity index 88% rename from src/main/java/DNPM/services/molekulargenetik/MolekulargenetikFormService.java rename to src/main/java/dev/dnpm/services/molekulargenetik/MolekulargenetikFormService.java index 60cfaf2..127c24a 100644 --- a/src/main/java/DNPM/services/molekulargenetik/MolekulargenetikFormService.java +++ b/src/main/java/dev/dnpm/services/molekulargenetik/MolekulargenetikFormService.java @@ -1,6 +1,6 @@ -package DNPM.services.molekulargenetik; +package dev.dnpm.services.molekulargenetik; -import DNPM.dto.Variant; +import dev.dnpm.dto.Variant; import de.itc.onkostar.api.Procedure; import java.util.List; diff --git a/src/main/java/DNPM/services/molekulargenetik/OsMolekulargenetikFormService.java b/src/main/java/dev/dnpm/services/molekulargenetik/OsMolekulargenetikFormService.java similarity index 95% rename from src/main/java/DNPM/services/molekulargenetik/OsMolekulargenetikFormService.java rename to src/main/java/dev/dnpm/services/molekulargenetik/OsMolekulargenetikFormService.java index 3bc6000..1a9ed11 100644 --- a/src/main/java/DNPM/services/molekulargenetik/OsMolekulargenetikFormService.java +++ b/src/main/java/dev/dnpm/services/molekulargenetik/OsMolekulargenetikFormService.java @@ -1,6 +1,6 @@ -package DNPM.services.molekulargenetik; +package dev.dnpm.services.molekulargenetik; -import DNPM.dto.Variant; +import dev.dnpm.dto.Variant; import de.itc.onkostar.api.Procedure; import java.util.List; diff --git a/src/main/java/DNPM/services/mtb/DefaultMtbService.java b/src/main/java/dev/dnpm/services/mtb/DefaultMtbService.java similarity index 98% rename from src/main/java/DNPM/services/mtb/DefaultMtbService.java rename to src/main/java/dev/dnpm/services/mtb/DefaultMtbService.java index e14e1d7..d5433b8 100644 --- a/src/main/java/DNPM/services/mtb/DefaultMtbService.java +++ b/src/main/java/dev/dnpm/services/mtb/DefaultMtbService.java @@ -1,4 +1,4 @@ -package DNPM.services.mtb; +package dev.dnpm.services.mtb; import de.itc.onkostar.api.IOnkostarApi; import de.itc.onkostar.api.Procedure; diff --git a/src/main/java/DNPM/services/mtb/MrMtbAnmeldungToProtocolMapper.java b/src/main/java/dev/dnpm/services/mtb/MrMtbAnmeldungToProtocolMapper.java similarity index 98% rename from src/main/java/DNPM/services/mtb/MrMtbAnmeldungToProtocolMapper.java rename to src/main/java/dev/dnpm/services/mtb/MrMtbAnmeldungToProtocolMapper.java index bf22f47..d705606 100644 --- a/src/main/java/DNPM/services/mtb/MrMtbAnmeldungToProtocolMapper.java +++ b/src/main/java/dev/dnpm/services/mtb/MrMtbAnmeldungToProtocolMapper.java @@ -1,4 +1,4 @@ -package DNPM.services.mtb; +package dev.dnpm.services.mtb; import de.itc.onkostar.api.IOnkostarApi; import de.itc.onkostar.api.Procedure; diff --git a/src/main/java/DNPM/services/mtb/MtbService.java b/src/main/java/dev/dnpm/services/mtb/MtbService.java similarity index 97% rename from src/main/java/DNPM/services/mtb/MtbService.java rename to src/main/java/dev/dnpm/services/mtb/MtbService.java index 19a6c3a..bc79b37 100644 --- a/src/main/java/DNPM/services/mtb/MtbService.java +++ b/src/main/java/dev/dnpm/services/mtb/MtbService.java @@ -1,4 +1,4 @@ -package DNPM.services.mtb; +package dev.dnpm.services.mtb; import de.itc.onkostar.api.Procedure; diff --git a/src/main/java/DNPM/services/mtb/OsTumorkonferenzToProtocolMapper.java b/src/main/java/dev/dnpm/services/mtb/OsTumorkonferenzToProtocolMapper.java similarity index 98% rename from src/main/java/DNPM/services/mtb/OsTumorkonferenzToProtocolMapper.java rename to src/main/java/dev/dnpm/services/mtb/OsTumorkonferenzToProtocolMapper.java index dc3d326..1473431 100644 --- a/src/main/java/DNPM/services/mtb/OsTumorkonferenzToProtocolMapper.java +++ b/src/main/java/dev/dnpm/services/mtb/OsTumorkonferenzToProtocolMapper.java @@ -1,4 +1,4 @@ -package DNPM.services.mtb; +package dev.dnpm.services.mtb; import de.itc.onkostar.api.Procedure; diff --git a/src/main/java/DNPM/services/mtb/OsTumorkonferenzVarianteUkwToProtocolMapper.java b/src/main/java/dev/dnpm/services/mtb/OsTumorkonferenzVarianteUkwToProtocolMapper.java similarity index 98% rename from src/main/java/DNPM/services/mtb/OsTumorkonferenzVarianteUkwToProtocolMapper.java rename to src/main/java/dev/dnpm/services/mtb/OsTumorkonferenzVarianteUkwToProtocolMapper.java index e2edd2e..5d1d178 100644 --- a/src/main/java/DNPM/services/mtb/OsTumorkonferenzVarianteUkwToProtocolMapper.java +++ b/src/main/java/dev/dnpm/services/mtb/OsTumorkonferenzVarianteUkwToProtocolMapper.java @@ -1,4 +1,4 @@ -package DNPM.services.mtb; +package dev.dnpm.services.mtb; import de.itc.onkostar.api.Procedure; diff --git a/src/main/java/DNPM/services/mtb/ProcedureToProtocolMapper.java b/src/main/java/dev/dnpm/services/mtb/ProcedureToProtocolMapper.java similarity index 87% rename from src/main/java/DNPM/services/mtb/ProcedureToProtocolMapper.java rename to src/main/java/dev/dnpm/services/mtb/ProcedureToProtocolMapper.java index d4e0e4c..bf3197a 100644 --- a/src/main/java/DNPM/services/mtb/ProcedureToProtocolMapper.java +++ b/src/main/java/dev/dnpm/services/mtb/ProcedureToProtocolMapper.java @@ -1,4 +1,4 @@ -package DNPM.services.mtb; +package dev.dnpm.services.mtb; import de.itc.onkostar.api.Procedure; diff --git a/src/main/java/DNPM/services/strahlentherapie/DefaultStrahlentherapieService.java b/src/main/java/dev/dnpm/services/strahlentherapie/DefaultStrahlentherapieService.java similarity index 95% rename from src/main/java/DNPM/services/strahlentherapie/DefaultStrahlentherapieService.java rename to src/main/java/dev/dnpm/services/strahlentherapie/DefaultStrahlentherapieService.java index a318a81..96a70dd 100644 --- a/src/main/java/DNPM/services/strahlentherapie/DefaultStrahlentherapieService.java +++ b/src/main/java/dev/dnpm/services/strahlentherapie/DefaultStrahlentherapieService.java @@ -1,7 +1,7 @@ -package DNPM.services.strahlentherapie; +package dev.dnpm.services.strahlentherapie; -import DNPM.dto.EcogStatusWithDate; -import DNPM.services.SettingsService; +import dev.dnpm.dto.EcogStatusWithDate; +import dev.dnpm.services.SettingsService; import de.itc.onkostar.api.IOnkostarApi; import de.itc.onkostar.api.Patient; import de.itc.onkostar.api.Procedure; diff --git a/src/main/java/DNPM/services/strahlentherapie/StrahlentherapieService.java b/src/main/java/dev/dnpm/services/strahlentherapie/StrahlentherapieService.java similarity index 60% rename from src/main/java/DNPM/services/strahlentherapie/StrahlentherapieService.java rename to src/main/java/dev/dnpm/services/strahlentherapie/StrahlentherapieService.java index a8de923..80e2db2 100644 --- a/src/main/java/DNPM/services/strahlentherapie/StrahlentherapieService.java +++ b/src/main/java/dev/dnpm/services/strahlentherapie/StrahlentherapieService.java @@ -1,6 +1,6 @@ -package DNPM.services.strahlentherapie; +package dev.dnpm.services.strahlentherapie; -import DNPM.services.TherapieMitEcogService; +import dev.dnpm.services.TherapieMitEcogService; /** * Service für Systemtherapieformulare diff --git a/src/main/java/DNPM/services/systemtherapie/DefaultSystemtherapieService.java b/src/main/java/dev/dnpm/services/systemtherapie/DefaultSystemtherapieService.java similarity index 96% rename from src/main/java/DNPM/services/systemtherapie/DefaultSystemtherapieService.java rename to src/main/java/dev/dnpm/services/systemtherapie/DefaultSystemtherapieService.java index 578613f..143195e 100644 --- a/src/main/java/DNPM/services/systemtherapie/DefaultSystemtherapieService.java +++ b/src/main/java/dev/dnpm/services/systemtherapie/DefaultSystemtherapieService.java @@ -1,7 +1,7 @@ -package DNPM.services.systemtherapie; +package dev.dnpm.services.systemtherapie; -import DNPM.dto.EcogStatusWithDate; -import DNPM.services.SettingsService; +import dev.dnpm.dto.EcogStatusWithDate; +import dev.dnpm.services.SettingsService; import de.itc.onkostar.api.IOnkostarApi; import de.itc.onkostar.api.Patient; import de.itc.onkostar.api.Procedure; diff --git a/src/main/java/DNPM/services/systemtherapie/OsSystemischeTherapieToProzedurwerteMapper.java b/src/main/java/dev/dnpm/services/systemtherapie/OsSystemischeTherapieToProzedurwerteMapper.java similarity index 98% rename from src/main/java/DNPM/services/systemtherapie/OsSystemischeTherapieToProzedurwerteMapper.java rename to src/main/java/dev/dnpm/services/systemtherapie/OsSystemischeTherapieToProzedurwerteMapper.java index f78dde9..162b887 100644 --- a/src/main/java/DNPM/services/systemtherapie/OsSystemischeTherapieToProzedurwerteMapper.java +++ b/src/main/java/dev/dnpm/services/systemtherapie/OsSystemischeTherapieToProzedurwerteMapper.java @@ -1,4 +1,4 @@ -package DNPM.services.systemtherapie; +package dev.dnpm.services.systemtherapie; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/src/main/java/DNPM/services/systemtherapie/ProzedurToProzedurwerteMapper.java b/src/main/java/dev/dnpm/services/systemtherapie/ProzedurToProzedurwerteMapper.java similarity index 89% rename from src/main/java/DNPM/services/systemtherapie/ProzedurToProzedurwerteMapper.java rename to src/main/java/dev/dnpm/services/systemtherapie/ProzedurToProzedurwerteMapper.java index f205554..2e182c0 100644 --- a/src/main/java/DNPM/services/systemtherapie/ProzedurToProzedurwerteMapper.java +++ b/src/main/java/dev/dnpm/services/systemtherapie/ProzedurToProzedurwerteMapper.java @@ -1,4 +1,4 @@ -package DNPM.services.systemtherapie; +package dev.dnpm.services.systemtherapie; import de.itc.onkostar.api.Procedure; diff --git a/src/main/java/DNPM/services/systemtherapie/SystemtherapieService.java b/src/main/java/dev/dnpm/services/systemtherapie/SystemtherapieService.java similarity index 89% rename from src/main/java/DNPM/services/systemtherapie/SystemtherapieService.java rename to src/main/java/dev/dnpm/services/systemtherapie/SystemtherapieService.java index a7ac1bd..8069da6 100644 --- a/src/main/java/DNPM/services/systemtherapie/SystemtherapieService.java +++ b/src/main/java/dev/dnpm/services/systemtherapie/SystemtherapieService.java @@ -1,6 +1,6 @@ -package DNPM.services.systemtherapie; +package dev.dnpm.services.systemtherapie; -import DNPM.services.TherapieMitEcogService; +import dev.dnpm.services.TherapieMitEcogService; import de.itc.onkostar.api.Procedure; import java.util.List; diff --git a/src/main/java/DNPM/services/therapieplan/AbstractTherapieplanService.java b/src/main/java/dev/dnpm/services/therapieplan/AbstractTherapieplanService.java similarity index 94% rename from src/main/java/DNPM/services/therapieplan/AbstractTherapieplanService.java rename to src/main/java/dev/dnpm/services/therapieplan/AbstractTherapieplanService.java index 1cdba18..c59cd42 100644 --- a/src/main/java/DNPM/services/therapieplan/AbstractTherapieplanService.java +++ b/src/main/java/dev/dnpm/services/therapieplan/AbstractTherapieplanService.java @@ -1,6 +1,6 @@ -package DNPM.services.therapieplan; +package dev.dnpm.services.therapieplan; -import DNPM.services.FormService; +import dev.dnpm.services.FormService; import de.itc.onkostar.api.IOnkostarApi; import de.itc.onkostar.api.Procedure; diff --git a/src/main/java/DNPM/services/therapieplan/DefaultTherapieplanService.java b/src/main/java/dev/dnpm/services/therapieplan/DefaultTherapieplanService.java similarity index 97% rename from src/main/java/DNPM/services/therapieplan/DefaultTherapieplanService.java rename to src/main/java/dev/dnpm/services/therapieplan/DefaultTherapieplanService.java index 5338baa..fc30d07 100644 --- a/src/main/java/DNPM/services/therapieplan/DefaultTherapieplanService.java +++ b/src/main/java/dev/dnpm/services/therapieplan/DefaultTherapieplanService.java @@ -1,6 +1,6 @@ -package DNPM.services.therapieplan; +package dev.dnpm.services.therapieplan; -import DNPM.services.FormService; +import dev.dnpm.services.FormService; import de.itc.onkostar.api.IOnkostarApi; import de.itc.onkostar.api.Item; import de.itc.onkostar.api.Procedure; @@ -11,8 +11,8 @@ import java.util.Date; import java.util.List; import java.util.Objects; -import static DNPM.services.FormService.hasValue; -import static DNPM.services.FormService.isYes; +import static dev.dnpm.services.FormService.hasValue; +import static dev.dnpm.services.FormService.isYes; public class DefaultTherapieplanService extends AbstractTherapieplanService { diff --git a/src/main/java/DNPM/services/therapieplan/MultipleMtbTherapieplanService.java b/src/main/java/dev/dnpm/services/therapieplan/MultipleMtbTherapieplanService.java similarity index 92% rename from src/main/java/DNPM/services/therapieplan/MultipleMtbTherapieplanService.java rename to src/main/java/dev/dnpm/services/therapieplan/MultipleMtbTherapieplanService.java index 1627cb4..50bf84f 100644 --- a/src/main/java/DNPM/services/therapieplan/MultipleMtbTherapieplanService.java +++ b/src/main/java/dev/dnpm/services/therapieplan/MultipleMtbTherapieplanService.java @@ -1,6 +1,6 @@ -package DNPM.services.therapieplan; +package dev.dnpm.services.therapieplan; -import DNPM.services.FormService; +import dev.dnpm.services.FormService; import de.itc.onkostar.api.IOnkostarApi; import de.itc.onkostar.api.Procedure; @@ -10,8 +10,8 @@ import java.util.List; import java.util.Objects; import java.util.stream.Collectors; -import static DNPM.services.FormService.hasValue; -import static DNPM.services.FormService.isYes; +import static dev.dnpm.services.FormService.hasValue; +import static dev.dnpm.services.FormService.isYes; public class MultipleMtbTherapieplanService extends AbstractTherapieplanService { diff --git a/src/main/java/DNPM/services/therapieplan/TherapieplanService.java b/src/main/java/dev/dnpm/services/therapieplan/TherapieplanService.java similarity index 97% rename from src/main/java/DNPM/services/therapieplan/TherapieplanService.java rename to src/main/java/dev/dnpm/services/therapieplan/TherapieplanService.java index 957d15c..cf74253 100644 --- a/src/main/java/DNPM/services/therapieplan/TherapieplanService.java +++ b/src/main/java/dev/dnpm/services/therapieplan/TherapieplanService.java @@ -1,4 +1,4 @@ -package DNPM.services.therapieplan; +package dev.dnpm.services.therapieplan; import de.itc.onkostar.api.Procedure; diff --git a/src/main/java/DNPM/services/therapieplan/TherapieplanServiceFactory.java b/src/main/java/dev/dnpm/services/therapieplan/TherapieplanServiceFactory.java similarity index 87% rename from src/main/java/DNPM/services/therapieplan/TherapieplanServiceFactory.java rename to src/main/java/dev/dnpm/services/therapieplan/TherapieplanServiceFactory.java index c109198..59d956c 100644 --- a/src/main/java/DNPM/services/therapieplan/TherapieplanServiceFactory.java +++ b/src/main/java/dev/dnpm/services/therapieplan/TherapieplanServiceFactory.java @@ -1,7 +1,7 @@ -package DNPM.services.therapieplan; +package dev.dnpm.services.therapieplan; -import DNPM.services.FormService; -import DNPM.services.SettingsService; +import dev.dnpm.services.FormService; +import dev.dnpm.services.SettingsService; import de.itc.onkostar.api.IOnkostarApi; public class TherapieplanServiceFactory { diff --git a/src/main/resources/de/itc/onkostar/library/moduleContext.xml b/src/main/resources/de/itc/onkostar/library/moduleContext.xml index e806b99..27035ed 100644 --- a/src/main/resources/de/itc/onkostar/library/moduleContext.xml +++ b/src/main/resources/de/itc/onkostar/library/moduleContext.xml @@ -10,14 +10,14 @@ http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.1.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.1.xsd"> - + - + - + diff --git a/src/test/java/DNPM/ConsentManagerTest.java b/src/test/java/dev/dnpm/ConsentManagerTest.java similarity index 91% rename from src/test/java/DNPM/ConsentManagerTest.java rename to src/test/java/dev/dnpm/ConsentManagerTest.java index cb206db..96d21e5 100644 --- a/src/test/java/DNPM/ConsentManagerTest.java +++ b/src/test/java/dev/dnpm/ConsentManagerTest.java @@ -1,8 +1,8 @@ -package DNPM; +package dev.dnpm; -import DNPM.analyzer.ConsentManager; -import DNPM.services.consent.ConsentManagerServiceFactory; -import DNPM.services.consent.MrConsentManagerService; +import dev.dnpm.analyzer.ConsentManager; +import dev.dnpm.services.consent.ConsentManagerServiceFactory; +import dev.dnpm.services.consent.MrConsentManagerService; import de.itc.onkostar.api.IOnkostarApi; import de.itc.onkostar.api.Procedure; import org.junit.jupiter.api.BeforeEach; diff --git a/src/test/java/DNPM/DNPMHelperTest.java b/src/test/java/dev/dnpm/DNPMHelperTest.java similarity index 97% rename from src/test/java/DNPM/DNPMHelperTest.java rename to src/test/java/dev/dnpm/DNPMHelperTest.java index 203492a..9aa08dd 100644 --- a/src/test/java/DNPM/DNPMHelperTest.java +++ b/src/test/java/dev/dnpm/DNPMHelperTest.java @@ -1,10 +1,10 @@ -package DNPM; +package dev.dnpm; -import DNPM.analyzer.DNPMHelper; -import DNPM.security.DelegatingDataBasedPermissionEvaluator; -import DNPM.security.IllegalSecuredObjectAccessException; -import DNPM.security.PermissionType; -import DNPM.services.systemtherapie.SystemtherapieService; +import dev.dnpm.analyzer.DNPMHelper; +import dev.dnpm.security.DelegatingDataBasedPermissionEvaluator; +import dev.dnpm.security.IllegalSecuredObjectAccessException; +import dev.dnpm.security.PermissionType; +import dev.dnpm.services.systemtherapie.SystemtherapieService; import de.itc.onkostar.api.IOnkostarApi; import de.itc.onkostar.api.Item; import de.itc.onkostar.api.Patient; diff --git a/src/test/java/DNPM/MerkmalskatalogTest.java b/src/test/java/dev/dnpm/MerkmalskatalogTest.java similarity index 97% rename from src/test/java/DNPM/MerkmalskatalogTest.java rename to src/test/java/dev/dnpm/MerkmalskatalogTest.java index ca858ac..bd877f0 100644 --- a/src/test/java/DNPM/MerkmalskatalogTest.java +++ b/src/test/java/dev/dnpm/MerkmalskatalogTest.java @@ -1,6 +1,6 @@ -package DNPM; +package dev.dnpm; -import DNPM.analyzer.Merkmalskatalog; +import dev.dnpm.analyzer.Merkmalskatalog; import de.itc.onkostar.api.IOnkostarApi; import org.hibernate.SQLQuery; import org.hibernate.Session; diff --git a/src/test/java/DNPM/analyzer/AnalyzerUtilsTest.java b/src/test/java/dev/dnpm/analyzer/AnalyzerUtilsTest.java similarity index 99% rename from src/test/java/DNPM/analyzer/AnalyzerUtilsTest.java rename to src/test/java/dev/dnpm/analyzer/AnalyzerUtilsTest.java index c24eddf..2d51bbc 100644 --- a/src/test/java/DNPM/analyzer/AnalyzerUtilsTest.java +++ b/src/test/java/dev/dnpm/analyzer/AnalyzerUtilsTest.java @@ -1,4 +1,4 @@ -package DNPM.analyzer; +package dev.dnpm.analyzer; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; diff --git a/src/test/java/DNPM/analyzer/EinzelempfehlungAnalyzerTest.java b/src/test/java/dev/dnpm/analyzer/EinzelempfehlungAnalyzerTest.java similarity index 93% rename from src/test/java/DNPM/analyzer/EinzelempfehlungAnalyzerTest.java rename to src/test/java/dev/dnpm/analyzer/EinzelempfehlungAnalyzerTest.java index 69ce487..fbc1d92 100644 --- a/src/test/java/DNPM/analyzer/EinzelempfehlungAnalyzerTest.java +++ b/src/test/java/dev/dnpm/analyzer/EinzelempfehlungAnalyzerTest.java @@ -1,9 +1,9 @@ -package DNPM.analyzer; +package dev.dnpm.analyzer; -import DNPM.security.PermissionType; -import DNPM.security.PersonPoolBasedPermissionEvaluator; -import DNPM.services.StudienService; -import DNPM.services.molekulargenetik.MolekulargenetikFormService; +import dev.dnpm.security.PermissionType; +import dev.dnpm.security.PersonPoolBasedPermissionEvaluator; +import dev.dnpm.services.StudienService; +import dev.dnpm.services.molekulargenetik.MolekulargenetikFormService; import de.itc.onkostar.api.IOnkostarApi; import de.itc.onkostar.api.Procedure; import org.junit.jupiter.api.BeforeEach; diff --git a/src/test/java/DNPM/analyzer/FollowUpAnalyzerTest.java b/src/test/java/dev/dnpm/analyzer/FollowUpAnalyzerTest.java similarity index 99% rename from src/test/java/DNPM/analyzer/FollowUpAnalyzerTest.java rename to src/test/java/dev/dnpm/analyzer/FollowUpAnalyzerTest.java index 21db51a..cfe5427 100644 --- a/src/test/java/DNPM/analyzer/FollowUpAnalyzerTest.java +++ b/src/test/java/dev/dnpm/analyzer/FollowUpAnalyzerTest.java @@ -1,4 +1,4 @@ -package DNPM.analyzer; +package dev.dnpm.analyzer; import de.itc.onkostar.api.IOnkostarApi; import de.itc.onkostar.api.Item; diff --git a/src/test/java/DNPM/analyzer/TherapieMitEcogAnalyzerTest.java b/src/test/java/dev/dnpm/analyzer/TherapieMitEcogAnalyzerTest.java similarity index 96% rename from src/test/java/DNPM/analyzer/TherapieMitEcogAnalyzerTest.java rename to src/test/java/dev/dnpm/analyzer/TherapieMitEcogAnalyzerTest.java index 7f5313b..a37ac06 100644 --- a/src/test/java/DNPM/analyzer/TherapieMitEcogAnalyzerTest.java +++ b/src/test/java/dev/dnpm/analyzer/TherapieMitEcogAnalyzerTest.java @@ -1,8 +1,8 @@ -package DNPM.analyzer; +package dev.dnpm.analyzer; -import DNPM.dto.EcogStatusWithDate; -import DNPM.services.strahlentherapie.StrahlentherapieService; -import DNPM.services.systemtherapie.SystemtherapieService; +import dev.dnpm.dto.EcogStatusWithDate; +import dev.dnpm.services.strahlentherapie.StrahlentherapieService; +import dev.dnpm.services.systemtherapie.SystemtherapieService; import de.itc.onkostar.api.*; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/DNPM/analyzer/TherapieplanAnalyzerTest.java b/src/test/java/dev/dnpm/analyzer/TherapieplanAnalyzerTest.java similarity index 87% rename from src/test/java/DNPM/analyzer/TherapieplanAnalyzerTest.java rename to src/test/java/dev/dnpm/analyzer/TherapieplanAnalyzerTest.java index cd5aee1..2f22e37 100644 --- a/src/test/java/DNPM/analyzer/TherapieplanAnalyzerTest.java +++ b/src/test/java/dev/dnpm/analyzer/TherapieplanAnalyzerTest.java @@ -1,12 +1,12 @@ -package DNPM.analyzer; +package dev.dnpm.analyzer; -import DNPM.security.DelegatingDataBasedPermissionEvaluator; -import DNPM.security.PermissionType; -import DNPM.services.FormService; -import DNPM.services.mtb.MtbService; -import DNPM.services.therapieplan.MultipleMtbTherapieplanService; -import DNPM.services.therapieplan.TherapieplanService; -import DNPM.services.therapieplan.TherapieplanServiceFactory; +import dev.dnpm.security.DelegatingDataBasedPermissionEvaluator; +import dev.dnpm.security.PermissionType; +import dev.dnpm.services.FormService; +import dev.dnpm.services.mtb.MtbService; +import dev.dnpm.services.therapieplan.MultipleMtbTherapieplanService; +import dev.dnpm.services.therapieplan.TherapieplanService; +import dev.dnpm.services.therapieplan.TherapieplanServiceFactory; import de.itc.onkostar.api.IOnkostarApi; import de.itc.onkostar.api.Item; import de.itc.onkostar.api.Procedure; diff --git a/src/test/java/DNPM/config/PluginConfigurationTest.java b/src/test/java/dev/dnpm/config/PluginConfigurationTest.java similarity index 83% rename from src/test/java/DNPM/config/PluginConfigurationTest.java rename to src/test/java/dev/dnpm/config/PluginConfigurationTest.java index 87a4e19..a71630f 100644 --- a/src/test/java/DNPM/config/PluginConfigurationTest.java +++ b/src/test/java/dev/dnpm/config/PluginConfigurationTest.java @@ -1,9 +1,9 @@ -package DNPM.config; +package dev.dnpm.config; -import DNPM.services.FormService; -import DNPM.services.SettingsService; -import DNPM.services.therapieplan.TherapieplanServiceFactory; -import DNPM.services.consent.ConsentManagerServiceFactory; +import dev.dnpm.services.FormService; +import dev.dnpm.services.SettingsService; +import dev.dnpm.services.therapieplan.TherapieplanServiceFactory; +import dev.dnpm.services.consent.ConsentManagerServiceFactory; import de.itc.onkostar.api.IOnkostarApi; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/DNPM/dto/VariantTest.java b/src/test/java/dev/dnpm/dto/VariantTest.java similarity index 99% rename from src/test/java/DNPM/dto/VariantTest.java rename to src/test/java/dev/dnpm/dto/VariantTest.java index 3242852..f699f0c 100644 --- a/src/test/java/DNPM/dto/VariantTest.java +++ b/src/test/java/dev/dnpm/dto/VariantTest.java @@ -1,4 +1,4 @@ -package DNPM.dto; +package dev.dnpm.dto; import de.itc.onkostar.api.Item; import de.itc.onkostar.api.Procedure; diff --git a/src/test/java/DNPM/security/DelegatingDataBasedPermissionEvaluatorTest.java b/src/test/java/dev/dnpm/security/DelegatingDataBasedPermissionEvaluatorTest.java similarity index 99% rename from src/test/java/DNPM/security/DelegatingDataBasedPermissionEvaluatorTest.java rename to src/test/java/dev/dnpm/security/DelegatingDataBasedPermissionEvaluatorTest.java index 1d8ecf8..c1e71db 100644 --- a/src/test/java/DNPM/security/DelegatingDataBasedPermissionEvaluatorTest.java +++ b/src/test/java/dev/dnpm/security/DelegatingDataBasedPermissionEvaluatorTest.java @@ -1,4 +1,4 @@ -package DNPM.security; +package dev.dnpm.security; import de.itc.onkostar.api.IOnkostarApi; import de.itc.onkostar.api.Patient; diff --git a/src/test/java/DNPM/security/FormBasedPermissionEvaluatorTest.java b/src/test/java/dev/dnpm/security/FormBasedPermissionEvaluatorTest.java similarity index 99% rename from src/test/java/DNPM/security/FormBasedPermissionEvaluatorTest.java rename to src/test/java/dev/dnpm/security/FormBasedPermissionEvaluatorTest.java index ca3d314..2ce938f 100644 --- a/src/test/java/DNPM/security/FormBasedPermissionEvaluatorTest.java +++ b/src/test/java/dev/dnpm/security/FormBasedPermissionEvaluatorTest.java @@ -1,4 +1,4 @@ -package DNPM.security; +package dev.dnpm.security; import de.itc.onkostar.api.IOnkostarApi; import de.itc.onkostar.api.Patient; diff --git a/src/test/java/DNPM/security/FormBasedSecurityAspectsTest.java b/src/test/java/dev/dnpm/security/FormBasedSecurityAspectsTest.java similarity index 99% rename from src/test/java/DNPM/security/FormBasedSecurityAspectsTest.java rename to src/test/java/dev/dnpm/security/FormBasedSecurityAspectsTest.java index 6624caa..ee57688 100644 --- a/src/test/java/DNPM/security/FormBasedSecurityAspectsTest.java +++ b/src/test/java/dev/dnpm/security/FormBasedSecurityAspectsTest.java @@ -1,4 +1,4 @@ -package DNPM.security; +package dev.dnpm.security; import de.itc.onkostar.api.IOnkostarApi; import de.itc.onkostar.api.Patient; diff --git a/src/test/java/DNPM/security/PersonPoolBasedPermissionEvaluatorTest.java b/src/test/java/dev/dnpm/security/PersonPoolBasedPermissionEvaluatorTest.java similarity index 99% rename from src/test/java/DNPM/security/PersonPoolBasedPermissionEvaluatorTest.java rename to src/test/java/dev/dnpm/security/PersonPoolBasedPermissionEvaluatorTest.java index 8e8204a..a5f39e3 100644 --- a/src/test/java/DNPM/security/PersonPoolBasedPermissionEvaluatorTest.java +++ b/src/test/java/dev/dnpm/security/PersonPoolBasedPermissionEvaluatorTest.java @@ -1,4 +1,4 @@ -package DNPM.security; +package dev.dnpm.security; import de.itc.onkostar.api.IOnkostarApi; import de.itc.onkostar.api.Patient; diff --git a/src/test/java/DNPM/security/PersonPoolBasedSecurityAspectsTest.java b/src/test/java/dev/dnpm/security/PersonPoolBasedSecurityAspectsTest.java similarity index 99% rename from src/test/java/DNPM/security/PersonPoolBasedSecurityAspectsTest.java rename to src/test/java/dev/dnpm/security/PersonPoolBasedSecurityAspectsTest.java index 294c39e..333a8f3 100644 --- a/src/test/java/DNPM/security/PersonPoolBasedSecurityAspectsTest.java +++ b/src/test/java/dev/dnpm/security/PersonPoolBasedSecurityAspectsTest.java @@ -1,4 +1,4 @@ -package DNPM.security; +package dev.dnpm.security; import de.itc.onkostar.api.IOnkostarApi; import de.itc.onkostar.api.Patient; diff --git a/src/test/java/DNPM/services/SettingsServiceTest.java b/src/test/java/dev/dnpm/services/SettingsServiceTest.java similarity index 95% rename from src/test/java/DNPM/services/SettingsServiceTest.java rename to src/test/java/dev/dnpm/services/SettingsServiceTest.java index 82f6f34..c5fd26e 100644 --- a/src/test/java/DNPM/services/SettingsServiceTest.java +++ b/src/test/java/dev/dnpm/services/SettingsServiceTest.java @@ -1,6 +1,6 @@ -package DNPM.services; +package dev.dnpm.services; -import DNPM.database.SettingsRepository; +import dev.dnpm.database.SettingsRepository; import de.itc.db.dnpm.Setting; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/DNPM/services/StudieTest.java b/src/test/java/dev/dnpm/services/StudieTest.java similarity index 95% rename from src/test/java/DNPM/services/StudieTest.java rename to src/test/java/dev/dnpm/services/StudieTest.java index a6b8ccf..debf6b9 100644 --- a/src/test/java/DNPM/services/StudieTest.java +++ b/src/test/java/dev/dnpm/services/StudieTest.java @@ -1,6 +1,6 @@ -package DNPM.services; +package dev.dnpm.services; -import DNPM.dto.Studie; +import dev.dnpm.dto.Studie; import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/src/test/java/DNPM/services/consent/ConsentManagerServiceFactoryTest.java b/src/test/java/dev/dnpm/services/consent/ConsentManagerServiceFactoryTest.java similarity index 97% rename from src/test/java/DNPM/services/consent/ConsentManagerServiceFactoryTest.java rename to src/test/java/dev/dnpm/services/consent/ConsentManagerServiceFactoryTest.java index 01d5488..b0d76e3 100644 --- a/src/test/java/DNPM/services/consent/ConsentManagerServiceFactoryTest.java +++ b/src/test/java/dev/dnpm/services/consent/ConsentManagerServiceFactoryTest.java @@ -1,4 +1,4 @@ -package DNPM.services.consent; +package dev.dnpm.services.consent; import de.itc.onkostar.api.IOnkostarApi; import org.junit.jupiter.api.BeforeEach; diff --git a/src/test/java/DNPM/services/consent/MrConsentManagerServiceTest.java b/src/test/java/dev/dnpm/services/consent/MrConsentManagerServiceTest.java similarity index 98% rename from src/test/java/DNPM/services/consent/MrConsentManagerServiceTest.java rename to src/test/java/dev/dnpm/services/consent/MrConsentManagerServiceTest.java index bfc32f5..0f06dc4 100644 --- a/src/test/java/DNPM/services/consent/MrConsentManagerServiceTest.java +++ b/src/test/java/dev/dnpm/services/consent/MrConsentManagerServiceTest.java @@ -1,4 +1,4 @@ -package DNPM.services.consent; +package dev.dnpm.services.consent; import de.itc.onkostar.api.IOnkostarApi; import de.itc.onkostar.api.Procedure; diff --git a/src/test/java/DNPM/services/consent/UkwConsentManagerServiceTest.java b/src/test/java/dev/dnpm/services/consent/UkwConsentManagerServiceTest.java similarity index 99% rename from src/test/java/DNPM/services/consent/UkwConsentManagerServiceTest.java rename to src/test/java/dev/dnpm/services/consent/UkwConsentManagerServiceTest.java index 3d1ef1d..28a76e0 100644 --- a/src/test/java/DNPM/services/consent/UkwConsentManagerServiceTest.java +++ b/src/test/java/dev/dnpm/services/consent/UkwConsentManagerServiceTest.java @@ -1,4 +1,4 @@ -package DNPM.services.consent; +package dev.dnpm.services.consent; import de.itc.onkostar.api.IOnkostarApi; import de.itc.onkostar.api.Item; diff --git a/src/test/java/DNPM/services/molekulargenetik/OsMolekluargenetikFormServiceTest.java b/src/test/java/dev/dnpm/services/molekulargenetik/OsMolekluargenetikFormServiceTest.java similarity index 97% rename from src/test/java/DNPM/services/molekulargenetik/OsMolekluargenetikFormServiceTest.java rename to src/test/java/dev/dnpm/services/molekulargenetik/OsMolekluargenetikFormServiceTest.java index 4e11341..5f2b30d 100644 --- a/src/test/java/DNPM/services/molekulargenetik/OsMolekluargenetikFormServiceTest.java +++ b/src/test/java/dev/dnpm/services/molekulargenetik/OsMolekluargenetikFormServiceTest.java @@ -1,4 +1,4 @@ -package DNPM.services.molekulargenetik; +package dev.dnpm.services.molekulargenetik; import de.itc.onkostar.api.Item; import de.itc.onkostar.api.Procedure; diff --git a/src/test/java/DNPM/services/mtb/DefaultMtbServiceTest.java b/src/test/java/dev/dnpm/services/mtb/DefaultMtbServiceTest.java similarity index 99% rename from src/test/java/DNPM/services/mtb/DefaultMtbServiceTest.java rename to src/test/java/dev/dnpm/services/mtb/DefaultMtbServiceTest.java index 6721ba3..0919d89 100644 --- a/src/test/java/DNPM/services/mtb/DefaultMtbServiceTest.java +++ b/src/test/java/dev/dnpm/services/mtb/DefaultMtbServiceTest.java @@ -1,4 +1,4 @@ -package DNPM.services.mtb; +package dev.dnpm.services.mtb; import de.itc.onkostar.api.IOnkostarApi; import de.itc.onkostar.api.Item; diff --git a/src/test/java/DNPM/services/mtb/MrMtbAnmeldungToProtocolMapperTest.java b/src/test/java/dev/dnpm/services/mtb/MrMtbAnmeldungToProtocolMapperTest.java similarity index 99% rename from src/test/java/DNPM/services/mtb/MrMtbAnmeldungToProtocolMapperTest.java rename to src/test/java/dev/dnpm/services/mtb/MrMtbAnmeldungToProtocolMapperTest.java index c6d34dc..5253cfc 100644 --- a/src/test/java/DNPM/services/mtb/MrMtbAnmeldungToProtocolMapperTest.java +++ b/src/test/java/dev/dnpm/services/mtb/MrMtbAnmeldungToProtocolMapperTest.java @@ -1,4 +1,4 @@ -package DNPM.services.mtb; +package dev.dnpm.services.mtb; import de.itc.onkostar.api.IOnkostarApi; import de.itc.onkostar.api.Item; diff --git a/src/test/java/DNPM/services/mtb/OsTumorkonferenzToProtocolMapperTest.java b/src/test/java/dev/dnpm/services/mtb/OsTumorkonferenzToProtocolMapperTest.java similarity index 97% rename from src/test/java/DNPM/services/mtb/OsTumorkonferenzToProtocolMapperTest.java rename to src/test/java/dev/dnpm/services/mtb/OsTumorkonferenzToProtocolMapperTest.java index 962c032..863ed55 100644 --- a/src/test/java/DNPM/services/mtb/OsTumorkonferenzToProtocolMapperTest.java +++ b/src/test/java/dev/dnpm/services/mtb/OsTumorkonferenzToProtocolMapperTest.java @@ -1,4 +1,4 @@ -package DNPM.services.mtb; +package dev.dnpm.services.mtb; import de.itc.onkostar.api.IOnkostarApi; import de.itc.onkostar.api.Item; diff --git a/src/test/java/DNPM/services/mtb/OsTumorkonferenzVarianteUkwToProtocolMapperTest.java b/src/test/java/dev/dnpm/services/mtb/OsTumorkonferenzVarianteUkwToProtocolMapperTest.java similarity index 97% rename from src/test/java/DNPM/services/mtb/OsTumorkonferenzVarianteUkwToProtocolMapperTest.java rename to src/test/java/dev/dnpm/services/mtb/OsTumorkonferenzVarianteUkwToProtocolMapperTest.java index b462c89..0768a2f 100644 --- a/src/test/java/DNPM/services/mtb/OsTumorkonferenzVarianteUkwToProtocolMapperTest.java +++ b/src/test/java/dev/dnpm/services/mtb/OsTumorkonferenzVarianteUkwToProtocolMapperTest.java @@ -1,4 +1,4 @@ -package DNPM.services.mtb; +package dev.dnpm.services.mtb; import de.itc.onkostar.api.IOnkostarApi; import de.itc.onkostar.api.Item; diff --git a/src/test/java/DNPM/services/strahlentherapie/DefaultStrahlentherapieServiceTest.java b/src/test/java/dev/dnpm/services/strahlentherapie/DefaultStrahlentherapieServiceTest.java similarity index 97% rename from src/test/java/DNPM/services/strahlentherapie/DefaultStrahlentherapieServiceTest.java rename to src/test/java/dev/dnpm/services/strahlentherapie/DefaultStrahlentherapieServiceTest.java index a2bd1f7..9aaa68b 100644 --- a/src/test/java/DNPM/services/strahlentherapie/DefaultStrahlentherapieServiceTest.java +++ b/src/test/java/dev/dnpm/services/strahlentherapie/DefaultStrahlentherapieServiceTest.java @@ -1,6 +1,6 @@ -package DNPM.services.strahlentherapie; +package dev.dnpm.services.strahlentherapie; -import DNPM.services.SettingsService; +import dev.dnpm.services.SettingsService; import de.itc.onkostar.api.*; import org.assertj.core.util.Lists; import org.junit.jupiter.api.BeforeEach; diff --git a/src/test/java/DNPM/services/systemtherapie/DefaultSystemtherapieServiceTest.java b/src/test/java/dev/dnpm/services/systemtherapie/DefaultSystemtherapieServiceTest.java similarity index 98% rename from src/test/java/DNPM/services/systemtherapie/DefaultSystemtherapieServiceTest.java rename to src/test/java/dev/dnpm/services/systemtherapie/DefaultSystemtherapieServiceTest.java index 7455a53..2744c52 100644 --- a/src/test/java/DNPM/services/systemtherapie/DefaultSystemtherapieServiceTest.java +++ b/src/test/java/dev/dnpm/services/systemtherapie/DefaultSystemtherapieServiceTest.java @@ -1,6 +1,6 @@ -package DNPM.services.systemtherapie; +package dev.dnpm.services.systemtherapie; -import DNPM.services.SettingsService; +import dev.dnpm.services.SettingsService; import de.itc.onkostar.api.*; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/DNPM/services/systemtherapie/ProzedurToProzedurwerteMapperTest.java b/src/test/java/dev/dnpm/services/systemtherapie/ProzedurToProzedurwerteMapperTest.java similarity index 98% rename from src/test/java/DNPM/services/systemtherapie/ProzedurToProzedurwerteMapperTest.java rename to src/test/java/dev/dnpm/services/systemtherapie/ProzedurToProzedurwerteMapperTest.java index c3b154e..6dbdada 100644 --- a/src/test/java/DNPM/services/systemtherapie/ProzedurToProzedurwerteMapperTest.java +++ b/src/test/java/dev/dnpm/services/systemtherapie/ProzedurToProzedurwerteMapperTest.java @@ -1,4 +1,4 @@ -package DNPM.services.systemtherapie; +package dev.dnpm.services.systemtherapie; import de.itc.onkostar.api.IOnkostarApi; import de.itc.onkostar.api.Item; diff --git a/src/test/java/DNPM/services/therapieplan/DefaultTherapieplanServiceTest.java b/src/test/java/dev/dnpm/services/therapieplan/DefaultTherapieplanServiceTest.java similarity index 98% rename from src/test/java/DNPM/services/therapieplan/DefaultTherapieplanServiceTest.java rename to src/test/java/dev/dnpm/services/therapieplan/DefaultTherapieplanServiceTest.java index 7c67458..0dff0ea 100644 --- a/src/test/java/DNPM/services/therapieplan/DefaultTherapieplanServiceTest.java +++ b/src/test/java/dev/dnpm/services/therapieplan/DefaultTherapieplanServiceTest.java @@ -1,6 +1,6 @@ -package DNPM.services.therapieplan; +package dev.dnpm.services.therapieplan; -import DNPM.services.FormService; +import dev.dnpm.services.FormService; import de.itc.onkostar.api.IOnkostarApi; import de.itc.onkostar.api.Item; import de.itc.onkostar.api.Procedure; diff --git a/src/test/java/DNPM/services/therapieplan/TherapieplanServiceFactoryTest.java b/src/test/java/dev/dnpm/services/therapieplan/TherapieplanServiceFactoryTest.java similarity index 92% rename from src/test/java/DNPM/services/therapieplan/TherapieplanServiceFactoryTest.java rename to src/test/java/dev/dnpm/services/therapieplan/TherapieplanServiceFactoryTest.java index b91ba46..e8d3600 100644 --- a/src/test/java/DNPM/services/therapieplan/TherapieplanServiceFactoryTest.java +++ b/src/test/java/dev/dnpm/services/therapieplan/TherapieplanServiceFactoryTest.java @@ -1,7 +1,7 @@ -package DNPM.services.therapieplan; +package dev.dnpm.services.therapieplan; -import DNPM.services.FormService; -import DNPM.services.SettingsService; +import dev.dnpm.services.FormService; +import dev.dnpm.services.SettingsService; import de.itc.onkostar.api.IOnkostarApi; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test;