SORMAS-Foundation#3388 rename origin info facade toDto method

lgal · lgal · commit 85718b13a16c · 2020-11-23T11:20:40.000+02:00
diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/caze/CaseFacadeEjb.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/caze/CaseFacadeEjb.java
@@ -2095,7 +2095,7 @@ public Case fillOrBuildEntity(@NotNull CaseDataDto source, Case target) {
 		target.setTrimester(source.getTrimester());
 		target.setFacilityType(source.getFacilityType());
 		if (source.getSormasToSormasOriginInfo() != null) {
-			target.setSormasToSormasOriginInfo(originInfoFacade.fromDto(source.getSormasToSormasOriginInfo()));
+			target.setSormasToSormasOriginInfo(originInfoFacade.toDto(source.getSormasToSormasOriginInfo()));
 		}
 
 		// TODO this makes sure follow-up is not overriden from the mobile app side. remove once that is implemented
@@ -2390,7 +2390,7 @@ public static CaseDataDto toDto(Case source) {
 		target.setEndOfIsolationReason(source.getEndOfIsolationReason());
 		target.setEndOfIsolationReasonDetails(source.getEndOfIsolationReasonDetails());
 
-		target.setSormasToSormasOriginInfo(SormasToSormasOriginInfoFacadeEjb.fromDto(source.getSormasToSormasOriginInfo()));
+		target.setSormasToSormasOriginInfo(SormasToSormasOriginInfoFacadeEjb.toDto(source.getSormasToSormasOriginInfo()));
 		target.setOwnershipHandedOver(source.getSormasToSormasShares().stream().anyMatch(SormasToSormasShareInfo::isOwnershipHandedOver));
 
 		return target;
diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/contact/ContactFacadeEjb.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/contact/ContactFacadeEjb.java
@@ -1095,7 +1095,7 @@ public Contact fromDto(@NotNull ContactDto source) {
 		target.setEndOfQuarantineReasonDetails(source.getEndOfQuarantineReasonDetails());
 
 		if (source.getSormasToSormasOriginInfo() != null) {
-			target.setSormasToSormasOriginInfo(originInfoFacade.fromDto(source.getSormasToSormasOriginInfo()));
+			target.setSormasToSormasOriginInfo(originInfoFacade.toDto(source.getSormasToSormasOriginInfo()));
 		}
 
 		return target;
@@ -1334,7 +1334,7 @@ public static ContactDto toDto(Contact source) {
 		target.setEndOfQuarantineReason(source.getEndOfQuarantineReason());
 		target.setEndOfQuarantineReasonDetails(source.getEndOfQuarantineReasonDetails());
 
-		target.setSormasToSormasOriginInfo(SormasToSormasOriginInfoFacadeEjb.fromDto(source.getSormasToSormasOriginInfo()));
+		target.setSormasToSormasOriginInfo(SormasToSormasOriginInfoFacadeEjb.toDto(source.getSormasToSormasOriginInfo()));
 		target.setOwnershipHandedOver(source.getSormasToSormasShares().stream().anyMatch(SormasToSormasShareInfo::isOwnershipHandedOver));
 
 		return target;
diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/sample/SampleFacadeEjb.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/sample/SampleFacadeEjb.java
@@ -789,7 +789,7 @@ public Sample fromDto(@NotNull SampleDto source) {
 		target.setReportLatLonAccuracy(source.getReportLatLonAccuracy());
 
 		if (source.getSormasToSormasOriginInfo() != null) {
-			target.setSormasToSormasOriginInfo(originInfoFacade.fromDto(source.getSormasToSormasOriginInfo()));
+			target.setSormasToSormasOriginInfo(originInfoFacade.toDto(source.getSormasToSormasOriginInfo()));
 		}
 
 		return target;
@@ -918,7 +918,7 @@ public static SampleDto toDto(Sample source) {
 		target.setReportLon(source.getReportLon());
 		target.setReportLatLonAccuracy(source.getReportLatLonAccuracy());
 
-		target.setSormasToSormasOriginInfo(SormasToSormasOriginInfoFacadeEjb.fromDto(source.getSormasToSormasOriginInfo()));
+		target.setSormasToSormasOriginInfo(SormasToSormasOriginInfoFacadeEjb.toDto(source.getSormasToSormasOriginInfo()));
 		target.setOwnershipHandedOver(source.getSormasToSormasShares().stream().anyMatch(SormasToSormasShareInfo::isOwnershipHandedOver));
 
 		return target;
diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/sormastosormas/SormasToSormasOriginInfoFacadeEjb.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/sormastosormas/SormasToSormasOriginInfoFacadeEjb.java
@@ -33,17 +33,17 @@ public class SormasToSormasOriginInfoFacadeEjb implements SormasToSormasOriginIn
 
 	public SormasToSormasOriginInfoDto saveOriginInfo(SormasToSormasOriginInfoDto originInfoDto) {
 
-		SormasToSormasOriginInfo originInfo = fromDto(originInfoDto);
+		SormasToSormasOriginInfo originInfo = toDto(originInfoDto);
 
 		originInfoService.ensurePersisted(originInfo);
 
-		return fromDto(originInfo);
+		return toDto(originInfo);
 	}
 
 	@EJB
 	private SormasToSormasOriginInfoService sormasToSormasOriginInfoService;
 
-	public SormasToSormasOriginInfo fromDto(SormasToSormasOriginInfoDto source) {
+	public SormasToSormasOriginInfo toDto(SormasToSormasOriginInfoDto source) {
 		if (source == null) {
 			return null;
 		}
@@ -69,7 +69,7 @@ public SormasToSormasOriginInfo fromDto(SormasToSormasOriginInfoDto source) {
 		return target;
 	}
 
-	public static SormasToSormasOriginInfoDto fromDto(SormasToSormasOriginInfo source) {
+	public static SormasToSormasOriginInfoDto toDto(SormasToSormasOriginInfo source) {
 		if (source == null) {
 			return null;
 		}

Original file line number	Diff line number	Diff line change
`@@ -33,17 +33,17 @@ public class SormasToSormasOriginInfoFacadeEjb implements SormasToSormasOriginIn`
`33`	`33`
`34`	`34`	`public SormasToSormasOriginInfoDto saveOriginInfo(SormasToSormasOriginInfoDto originInfoDto) {`
`35`	`35`
`36`		`- SormasToSormasOriginInfo originInfo = fromDto(originInfoDto);`
	`36`	`+ SormasToSormasOriginInfo originInfo = toDto(originInfoDto);`
`37`	`37`
`38`	`38`	`originInfoService.ensurePersisted(originInfo);`
`39`	`39`
`40`		`- return fromDto(originInfo);`
	`40`	`+ return toDto(originInfo);`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`@EJB`
`44`	`44`	`private SormasToSormasOriginInfoService sormasToSormasOriginInfoService;`
`45`	`45`
`46`		`- public SormasToSormasOriginInfo fromDto(SormasToSormasOriginInfoDto source) {`
	`46`	`+ public SormasToSormasOriginInfo toDto(SormasToSormasOriginInfoDto source) {`
`47`	`47`	`if (source == null) {`
`48`	`48`	`return null;`
`49`	`49`	`}`
`@@ -69,7 +69,7 @@ public SormasToSormasOriginInfo fromDto(SormasToSormasOriginInfoDto source) {`
`69`	`69`	`return target;`
`70`	`70`	`}`
`71`	`71`
`72`		`- public static SormasToSormasOriginInfoDto fromDto(SormasToSormasOriginInfo source) {`
	`72`	`+ public static SormasToSormasOriginInfoDto toDto(SormasToSormasOriginInfo source) {`
`73`	`73`	`if (source == null) {`
`74`	`74`	`return null;`
`75`	`75`	`}`