5364-app - Add Support for additional core fields

- add all new properties to the change log - split JsonPersisterService into multiple java files - make sure that if one location or cantact is set to be the default, all others are unset - #5364
metasfresh · Jul 18, 2019 · 2a73be8 · 2a73be8
1 parent b8686b0
commit 2a73be8
Show file tree

Hide file tree

Showing 12 changed files with 656 additions and 337 deletions.
diff --git a/...s.rest-api-impl/src/main/java/de/metas/rest_api/bpartner/impl/BpartnerRestController.java b/...s.rest-api-impl/src/main/java/de/metas/rest_api/bpartner/impl/BpartnerRestController.java
@@ -28,8 +28,8 @@
 import de.metas.rest_api.SyncAdvise.IfExists;
 import de.metas.rest_api.SyncAdvise.IfNotExists;
 import de.metas.rest_api.bpartner.BPartnerRestEndpoint;
-import de.metas.rest_api.bpartner.impl.bpartnercomposite.JsonPersisterService;
 import de.metas.rest_api.bpartner.impl.bpartnercomposite.JsonServiceFactory;
+import de.metas.rest_api.bpartner.impl.bpartnercomposite.jsonpersister.JsonPersisterService;
 import de.metas.rest_api.bpartner.request.JsonRequestBPartnerUpsert;
 import de.metas.rest_api.bpartner.request.JsonRequestBPartnerUpsertItem;
 import de.metas.rest_api.bpartner.request.JsonRequestContactUpsert;

diff --git a/...ss.rest-api-impl/src/main/java/de/metas/rest_api/bpartner/impl/ContactRestController.java b/...ss.rest-api-impl/src/main/java/de/metas/rest_api/bpartner/impl/ContactRestController.java
@@ -26,8 +26,8 @@
 import de.metas.rest_api.SyncAdvise.IfExists;
 import de.metas.rest_api.SyncAdvise.IfNotExists;
 import de.metas.rest_api.bpartner.ContactRestEndpoint;
-import de.metas.rest_api.bpartner.impl.bpartnercomposite.JsonPersisterService;
 import de.metas.rest_api.bpartner.impl.bpartnercomposite.JsonServiceFactory;
+import de.metas.rest_api.bpartner.impl.bpartnercomposite.jsonpersister.JsonPersisterService;
 import de.metas.rest_api.bpartner.request.JsonRequestContactUpsert;
 import de.metas.rest_api.bpartner.request.JsonRequestContactUpsertItem;
 import de.metas.rest_api.bpartner.request.JsonResponseUpsert;

diff --git a/...src/main/java/de/metas/rest_api/bpartner/impl/bpartnercomposite/JsonRetrieverService.java b/...src/main/java/de/metas/rest_api/bpartner/impl/bpartnercomposite/JsonRetrieverService.java
@@ -93,21 +93,21 @@ public class JsonRetrieverService
 	/** Mapping between {@link JsonResponseBPartner} property names and REST-API properties names */
 	private static final ImmutableMap<String, String> BPARTNER_FIELD_MAP = ImmutableMap
 			.<String, String> builder()
-			.put("value", JsonResponseBPartner.CODE)
-			.put("companyName", JsonResponseBPartner.COMPANY_NAME)
-			.put("externalId", JsonResponseBPartner.EXTERNAL_ID)
-			.put("active", JsonResponseBPartner.ACTIVE)
-			.put("groupId", JsonResponseBPartner.GROUP)
-			.put("language", JsonResponseBPartner.LANGUAGE)
-			.put("id", JsonResponseBPartner.METASFRESH_ID)
-			.put("name", JsonResponseBPartner.NAME)
-			.put("name2", JsonResponseBPartner.NAME_2)
-			.put("name3", JsonResponseBPartner.NAME_3)
-			.put("parentId", JsonResponseBPartner.PARENT_ID)
-			.put("phone", JsonResponseBPartner.PHONE)
-			.put("url", JsonResponseBPartner.URL)
-			.put("url2", JsonResponseBPartner.URL_2)
-			.put("url3", JsonResponseBPartner.URL_3)
+			.put(BPartner.VALUE, JsonResponseBPartner.CODE)
+			.put(BPartner.COMPANY_NAME, JsonResponseBPartner.COMPANY_NAME)
+			.put(BPartner.EXTERNAL_ID, JsonResponseBPartner.EXTERNAL_ID)
+			.put(BPartner.ACTIVE, JsonResponseBPartner.ACTIVE)
+			.put(BPartner.GROUP_ID, JsonResponseBPartner.GROUP)
+			.put(BPartner.LANGUAGE, JsonResponseBPartner.LANGUAGE)
+			.put(BPartner.ID, JsonResponseBPartner.METASFRESH_ID)
+			.put(BPartner.NAME, JsonResponseBPartner.NAME)
+			.put(BPartner.NAME_2, JsonResponseBPartner.NAME_2)
+			.put(BPartner.NAME_3, JsonResponseBPartner.NAME_3)
+			.put(BPartner.PARENT_ID, JsonResponseBPartner.PARENT_ID)
+			.put(BPartner.PHONE, JsonResponseBPartner.PHONE)
+			.put(BPartner.URL, JsonResponseBPartner.URL)
+			.put(BPartner.URL_2, JsonResponseBPartner.URL_2)
+			.put(BPartner.URL_3, JsonResponseBPartner.URL_3)
 			.build();
 
 	/** Mapping between {@link JsonResponseContact} property names and REST-API properties names */

diff --git a/...l/src/main/java/de/metas/rest_api/bpartner/impl/bpartnercomposite/JsonServiceFactory.java b/...l/src/main/java/de/metas/rest_api/bpartner/impl/bpartnercomposite/JsonServiceFactory.java
@@ -6,6 +6,7 @@
 import de.metas.bpartner.BPGroupRepository;
 import de.metas.bpartner.composite.BPartnerCompositeRepository;
 import de.metas.greeting.GreetingRepository;
+import de.metas.rest_api.bpartner.impl.bpartnercomposite.jsonpersister.JsonPersisterService;
 import de.metas.util.lang.UIDStringUtil;
 import lombok.NonNull;