change address list to map

imCodePartnerAB · Nov 5, 2015 · aab5755 · aab5755
1 parent c3ab326
commit aab5755
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/ivis-core/src/main/java/com/imcode/entities/Person.java b/ivis-core/src/main/java/com/imcode/entities/Person.java
@@ -107,7 +107,11 @@ public Map<AddressTypeEnum, Address> getAddresses() {
 
     public void setAddresses(Map<AddressTypeEnum, Address> addresses) {
         if (!(addresses instanceof EnumMap)) {
-             addresses = new EnumMap<>(addresses);
+            if (addresses == null || addresses.isEmpty()) {
+                addresses = new EnumMap<>(AddressTypeEnum.class);
+            } else {
+                addresses = new EnumMap<>(addresses);
+            }
 
         }
 

diff --git a/ivis-sdk/src/main/java/imcode/services/restful/ProxyIvisServiceFactory.java b/ivis-sdk/src/main/java/imcode/services/restful/ProxyIvisServiceFactory.java
@@ -1,11 +1,13 @@
 package imcode.services.restful;
 
 import com.imcode.entities.School;
+import com.imcode.entities.User;
 import com.imcode.entities.superclasses.AbstractIdEntity;
 import com.imcode.entities.Pupil;
 import com.imcode.services.GenericService;
 import com.imcode.services.PupilService;
 import com.imcode.services.SchoolService;
+import com.imcode.services.UserService;
 import imcode.services.GenericServiceProxy;
 import imcode.services.IvisServiceFactory;
 import org.apache.commons.lang3.StringUtils;
@@ -457,14 +459,14 @@ public static void main(String[] args) {
             System.out.println("sfas");
 //            serviceFactory.checkEntityClassList(serviceFactory.entityClassList);
 //            GenericService service = serviceFactory.getService(RoleService.class);
-            SchoolService service = serviceFactory.getService(SchoolService.class);
-            List<School> schoolList = service.findByName("School #1");
+            UserService service = serviceFactory.getService(UserService.class);
+            List<User> entityList = service.findAll();
 ////            SchoolClass schoolClass = (SchoolClass) service1.find(1L);
 //            Pupil entity = (Pupil) service.find(1);
 
 //            Object entity = service.find(0);
 //            System.out.println(entity);
-            System.out.println(schoolList);
+            System.out.println(entityList);
         } catch (Exception e) {
             e.printStackTrace();