рефакторинг, истребление вызовов на SynergyClientBean

src/main/java/kz/arta/synergy/api/asforms/converter/components/AbstractComponentConverter.java

@@ -69,8 +69,8 @@ public abstract class AbstractComponentConverter implements ComponentConverter {
         } else if (field.getType().isAssignableFrom(AsFormData.class)) {
             // common type
             AsFormData data = asfData.getData(cmpId);
-            if (data != null) {
             AsFormData fieldAsFormData = new AsFormData();
+            if (data != null) {
                 fieldAsFormData.setId(cmpId);
                 fieldAsFormData.setType(getType(annotation));
                 fieldAsFormData.setValue(data.getValue());
@@ -82,9 +82,8 @@ public abstract class AbstractComponentConverter implements ComponentConverter {
                 fieldAsFormData.setLabel(data.getLabel());
                 fieldAsFormData.setUsername(data.getUsername());
                 fieldAsFormData.setData(data.getData());
-
-                field.set(asFormObject, fieldAsFormData);
             }
+            field.set(asFormObject, fieldAsFormData);
         } else {
             throw new UnsupportedFieldTypeException("This type unsupported");
         }

src/main/java/kz/arta/synergy/api/asforms/pojo/AdvancedSearchParams.java

@@ -5,6 +5,7 @@ import org.codehaus.jackson.annotate.JsonIgnoreProperties;
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -87,4 +88,8 @@ public class AdvancedSearchParams {
     public void setShowDeleted(boolean showDeleted) {
         this.showDeleted = showDeleted;
     }
+
+    public void setDynParams(String... params) {
+        setDynParams(Collections.singletonList(Arrays.asList(params)));
+    }
 }

src/main/java/kz/arta/synergy/api/asforms/pojo/AsFormData.java

@@ -51,6 +51,13 @@ public class AsFormData extends AsFormDataContainer {
         return value;
     }
 
+    public String getValue(String defaultValue) {
+        if (value == null) {
+            return defaultValue;
+        }
+        return value;
+    }
+
     public void setValue(String value) {
         this.value = value;
     }
@@ -59,6 +66,13 @@ public class AsFormData extends AsFormDataContainer {
         return key;
     }
 
+    public String getKey(String defaultValue) {
+        if (key == null) {
+            return defaultValue;
+        }
+        return key;
+    }
+
     public void setKey(String key) {
         this.key = key;
     }

src/main/java/kz/arta/synergy/api/asforms/pojo/AsFormDataContainer.java

@@ -39,6 +39,14 @@ public class AsFormDataContainer {
         return null;
     }
 
+    public String getValue(String cmpId, String defaultValue) {
+        String value = getValue(cmpId);
+        if (value == null) {
+            return defaultValue;
+        }
+        return value;
+    }
+
     public String getKey(String cmpId) {
         AsFormData data = getData(cmpId);
         if (data != null) {
@@ -47,6 +55,14 @@ public class AsFormDataContainer {
         return null;
     }
 
+    public String getKey(String cmpId, String defaultKey) {
+        String key = getKey(cmpId);
+        if (key == null) {
+            return defaultKey;
+        }
+        return key;
+    }
+
     public List<AsFormData> getData() {
         return data;
     }

src/main/java/kz/arta/synergy/api/asforms/pojo/AsFormWrapper.java

@@ -58,4 +58,5 @@ public class AsFormWrapper extends AsFormDataContainer {
     public void setVersion(String version) {
         this.version = version;
     }
+
 }