form edit

imCodePartnerAB · Jan 29, 2016 · 973bb97 · 973bb97
1 parent d782116
commit 973bb97
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/ivis-core/src/main/java/com/imcode/entities/embed/Email.java b/ivis-core/src/main/java/com/imcode/entities/embed/Email.java
@@ -1,5 +1,6 @@
 package com.imcode.entities.embed;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.imcode.entities.enums.CommunicationTypeEnum;
 import com.imcode.entities.superclasses.ContactInformation;
 
@@ -44,21 +45,25 @@ protected Email(CommunicationTypeEnum type, String value) {
 //        this.address = address;
 //        this.communicationType = CommunicationTypeEnum.MOBILE;
 //    }
+    @JsonIgnore
     @Deprecated
     public String getAddress() {
         return value;
     }
 
+    @JsonIgnore
     @Deprecated
     public void setAddress(String address) {
         this.value = address;
     }
 
+    @JsonIgnore
     @Deprecated
     public CommunicationTypeEnum getCommunicationType() {
         return type;
     }
 
+    @JsonIgnore
     @Deprecated
     public void setCommunicationType(CommunicationTypeEnum communicationType) {
         this.type = communicationType;

diff --git a/ivis-core/src/main/java/com/imcode/entities/embed/Phone.java b/ivis-core/src/main/java/com/imcode/entities/embed/Phone.java
@@ -1,5 +1,6 @@
 package com.imcode.entities.embed;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.imcode.entities.enums.CommunicationTypeEnum;
 import com.imcode.entities.superclasses.ContactInformation;
 
@@ -36,21 +37,25 @@ protected Phone(CommunicationTypeEnum type, String value) {
         super(type, value);
     }
 
+    @JsonIgnore
     @Deprecated
     public String getNumber() {
         return value;
     }
 
+    @JsonIgnore
     @Deprecated
     public void setNumber(String value) {
         this.value = value;
     }
 
+    @JsonIgnore
     @Deprecated
     public CommunicationTypeEnum getCommunicationType() {
         return type;
     }
 
+    @JsonIgnore
     @Deprecated
     public void setCommunicationType(CommunicationTypeEnum type) {
         this.type = type;

diff --git a/ivis-sdk/src/main/java/imcode/services/restful/ProxyIvisServiceFactory.java b/ivis-sdk/src/main/java/imcode/services/restful/ProxyIvisServiceFactory.java
@@ -460,7 +460,7 @@ public static void main(String[] args) {
 //            serviceFactory.checkEntityClassList(serviceFactory.entityClassList);
 //            GenericService service = serviceFactory.getService(RoleService.class);
             UserService service = serviceFactory.getService(UserService.class);
-            List<User> entityList = service.findAll();
+            User entityList = service.getCurrentUser();
 ////            SchoolClass schoolClass = (SchoolClass) service1.find(1L);
 //            Pupil entity = (Pupil) service.find(1);