Ozg 7501 weiterleitung vorbereiten

vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/vorgang/redirect/ForwardingRequestMapper.java

@@ -34,18 +34,27 @@ import de.ozgcloud.command.Command;
 @Mapper(imports = MapUtils.class)
 interface ForwardingRequestMapper {
 
+	interface CommandBodyFields {
+		String ORGANISATION_EINHEIT_ID = "organisationEinheitId";
+		String NAME = "name";
+		String STRASSE = "strasse";
+		String HAUSNUMMER = "hausnummer";
+		String PLZ = "plz";
+		String ORT = "ort";
+	}
+	
 	@Mapping(target = "version", source = "relationVersion")
 	@Mapping(target = "organisationEinheit", source = "bodyObject")
 	ForwardingRequest fromCommand(Command command);
 
-	@Mapping(target = "id", expression = "java(MapUtils.getString(body, \"organisationEinheitId\"))")
-	@Mapping(target = "name", expression = "java(MapUtils.getString(body, \"name\"))")
+	@Mapping(target = "id", expression = "java(MapUtils.getString(body, CommandBodyFields.ORGANISATION_EINHEIT_ID))")
+	@Mapping(target = "name", expression = "java(MapUtils.getString(body, CommandBodyFields.NAME))")
 	@Mapping(target = "address", source = ".")
 	OrganisationEinheit toOrganisationEinheit(Map<String, Object> body);
 
-	@Mapping(target = "street", expression = "java(MapUtils.getString(body, \"strasse\"))")
-	@Mapping(target = "houseNumber", expression = "java(MapUtils.getString(body, \"hausnummer\"))")
-	@Mapping(target = "zipCode", expression = "java(MapUtils.getString(body, \"plz\"))")
-	@Mapping(target = "city", expression = "java(MapUtils.getString(body, \"ort\"))")
+	@Mapping(target = "street", expression = "java(MapUtils.getString(body, CommandBodyFields.STRASSE))")
+	@Mapping(target = "houseNumber", expression = "java(MapUtils.getString(body, CommandBodyFields.HAUSNUMMER))")
+	@Mapping(target = "zipCode", expression = "java(MapUtils.getString(body, CommandBodyFields.PLZ))")
+	@Mapping(target = "city", expression = "java(MapUtils.getString(body, CommandBodyFields.ORT))")
 	Address toAddress(Map<String, Object> body);
 }