refactor: use package name following Java guidelines

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 {
 

src/main/java/dev/dnpm/VerweisVon.java

@@ -1,4 +1,4 @@
-package DNPM;
+package dev.dnpm;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;

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;
 

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;

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;

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;

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;

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;

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;

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;
 

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;

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;

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;

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

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;

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;

src/main/java/dev/dnpm/dto/EcogStatusWithDate.java

@@ -1,4 +1,4 @@
-package DNPM.dto;
+package dev.dnpm.dto;
 
 import org.springframework.util.Assert;
 

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;

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;
 

src/main/java/dev/dnpm/exceptions/FormException.java

@@ -1,4 +1,4 @@
-package DNPM.exceptions;
+package dev.dnpm.exceptions;
 
 public class FormException extends RuntimeException {
 

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;

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;

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;

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)

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;

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;

src/main/java/dev/dnpm/security/IllegalSecuredObjectAccessException.java

@@ -1,4 +1,4 @@
-package DNPM.security;
+package dev.dnpm.security;
 
 public class IllegalSecuredObjectAccessException extends RuntimeException {
 

src/main/java/dev/dnpm/security/PermissionType.java

@@ -1,4 +1,4 @@
-package DNPM.security;
+package dev.dnpm.security;
 
 public enum PermissionType {
     READ,

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;

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)

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;

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;

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;

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;

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;

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;
 

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;
 

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;
 

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;

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;
 

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;
 

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;

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;

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;

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;

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;

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;

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;
 

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;
 

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;
 

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;
 

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;

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

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;

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;

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;
 

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;

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;
 

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 {
 

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 {
 

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;
 

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 {

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">
  
-    <bean id="DNPMHelper" class="DNPM.analyzer.DNPMHelper">
+    <bean id="DNPMHelper" class="dev.dnpm.analyzer.DNPMHelper">
         <constructor-arg ref="localOnkostarApi" />
         <constructor-arg ref="systemtherapieService" />
     </bean>
-    <bean id="Merkmalskatalog" class="DNPM.analyzer.Merkmalskatalog">
+    <bean id="Merkmalskatalog" class="dev.dnpm.analyzer.Merkmalskatalog">
         <constructor-arg ref="localOnkostarApi" />
     </bean>
-    <bean id="ConsentManager" class="DNPM.analyzer.ConsentManager">
+    <bean id="ConsentManager" class="dev.dnpm.analyzer.ConsentManager">
         <constructor-arg ref="localOnkostarApi" />
         <constructor-arg ref="consentManagerServiceFactory" />
     </bean>

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;