Updated DTO from com.jaspersoft.jasperserver.jaxrs.client.dto.jobs* and com.jaspersoft.jasperserver.jaxrs.client.dto.setiings packages

Author: TanyaEf

src/main/java/com/jaspersoft/jasperserver/jaxrs/client/dto/jobs/CalendarTrigger.java

@@ -23,12 +23,10 @@
 
 import com.jaspersoft.jasperserver.jaxrs.client.dto.jobs.jaxb.adapters.DaysByteXmlAdapter;
 import com.jaspersoft.jasperserver.jaxrs.client.dto.jobs.jaxb.adapters.MonthsByteXmlAdapter;
-
-import java.util.Iterator;
+import java.util.SortedSet;
 import java.util.TreeSet;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import java.util.SortedSet;
 
 @XmlRootElement(name = "calendarTrigger")
 public class CalendarTrigger extends JobTrigger {
@@ -49,22 +47,9 @@ public CalendarTrigger(CalendarTrigger other) {
         this.minutes = other.minutes;
         this.hours = other.hours;
         this.daysType = other.daysType;
-        Iterator<Byte> iterator;
-        if (other.weekDays != null) {
-            this.weekDays = new TreeSet<Byte>();
-            iterator = other.weekDays.iterator();
-            while (iterator.hasNext()) {
-                this.weekDays.add(iterator.next());
-            }
-        }
+        this.weekDays = (other.weekDays != null) ? new TreeSet<Byte>(other.weekDays) : null;
         this.monthDays = other.monthDays;
-        if (other.months != null) {
-            this.months = new TreeSet<Byte>();
-            Iterator<Byte> monthItertor = other.months.iterator();
-            while (monthItertor.hasNext()) {
-                this.months.add(monthItertor.next());
-            }
-        }
+        this.months = (other.months != null) ? new TreeSet<Byte>(other.months) : null;
     }
 
     public String getMinutes() {

src/main/java/com/jaspersoft/jasperserver/jaxrs/client/dto/jobs/FtpInfo.java

@@ -29,17 +29,17 @@
 @XmlRootElement(name = "outputFTPInfo")
 public class FtpInfo {
 
-    protected String userName;
-    protected String password;
-    protected String folderPath;
-    protected String serverName;
-    protected FtpType type;
-    protected String protocol;
-    protected Integer port;
-    protected Boolean implicit;
-    protected Long pbsz;
-    protected String prot;
-    protected Map<String, String> propertiesMap;
+    private String userName;
+    private String password;
+    private String folderPath;
+    private String serverName;
+    private FtpType type;
+    private String protocol;
+    private Integer port;
+    private Boolean implicit;
+    private Long pbsz;
+    private String prot;
+    private Map<String, String> propertiesMap;
 
     public FtpInfo() {
     }
@@ -50,12 +50,7 @@ public FtpInfo(FtpInfo other) {
         this.password = other.password;
         this.pbsz = other.pbsz;
         this.port = other.port;
-        if (other.propertiesMap != null) {
-            this.propertiesMap = new LinkedHashMap<String, String>();
-            for (Map.Entry<String, String> entry: other.propertiesMap.entrySet()) {
-                this.propertiesMap.put(entry.getKey(), entry.getValue());
-            }
-        }
+        this.propertiesMap = (other.propertiesMap != null) ? new LinkedHashMap<String, String>(other.propertiesMap) : null;
         this.prot = other.prot;
         this.protocol = other.protocol;
         this.serverName = other.serverName;

src/main/java/com/jaspersoft/jasperserver/jaxrs/client/dto/jobs/JobAlert.java

@@ -55,12 +55,7 @@ public JobAlert(JobAlert other) {
         this.messageTextWhenJobFails = other.messageTextWhenJobFails;
         this.recipient = other.recipient;
         this.subject = other.subject;
-        if (other.toAddresses != null) {
-            this.toAddresses = new LinkedList<String>();
-            for (String toAddress : other.toAddresses) {
-                this.toAddresses.add(toAddress);
-            }
-        }
+        this.toAddresses = (other.toAddresses != null) ? new LinkedList<String>(other.toAddresses) : null;
         this.version = other.version;
 
     }

src/main/java/com/jaspersoft/jasperserver/jaxrs/client/dto/jobs/JobSource.java

@@ -41,12 +41,7 @@ public JobSource() {
     }
 
     public JobSource(JobSource other) {
-        if (other.parameters != null) {
-            this.parameters = new LinkedHashMap<String, Object>();
-            for (Map.Entry<String, Object> entry : other.parameters.entrySet()) {
-                parameters.put(entry.getKey(),entry.getValue());
-            }
-        }
+        this.parameters = (other.parameters != null) ? new LinkedHashMap<String, Object>(other.parameters) : null;
         this.reportUnitURI = other.reportUnitURI;
     }
 

src/main/java/com/jaspersoft/jasperserver/jaxrs/client/dto/jobs/MailNotification.java

@@ -35,7 +35,6 @@ public class MailNotification {
     private List<String> bccAddresses;
     private List<String> ccAddresses;
     private List<String> toAddresses;
-
     private Integer version;
     private Long id;
     private Boolean includingStackTraceWhenJobFails;
@@ -50,24 +49,9 @@ public MailNotification() {
     }
 
     public MailNotification(MailNotification other) {
-        if (other.bccAddresses != null) {
-            this.bccAddresses = new LinkedList<String>();
-            for (String bccAddress : other.bccAddresses) {
-                this.bccAddresses.add(bccAddress);
-            }
-        }
-        if (other.ccAddresses != null) {
-            this.ccAddresses = new LinkedList<String>();
-            for (String ccAddress : other.ccAddresses) {
-                this.ccAddresses.add(ccAddress);
-            }
-        }
-        if (other.toAddresses != null) {
-            this.toAddresses = new LinkedList<String>();
-            for (String toAddress : other.toAddresses) {
-                this.toAddresses.add(toAddress);
-            }
-        }
+        this.bccAddresses = (other.bccAddresses != null) ? new LinkedList<String>(other.bccAddresses) : null;
+        this.ccAddresses = (other.ccAddresses != null) ? new LinkedList<String>(other.ccAddresses) : null;
+        this.toAddresses = (other.toAddresses != null) ? new LinkedList<String>(other.toAddresses) : null;
         this.id = other.id;
         this.includingStackTraceWhenJobFails = other.includingStackTraceWhenJobFails;
         this.messageText = other.messageText;

src/main/java/com/jaspersoft/jasperserver/jaxrs/client/dto/jobs/ReportJobCalendar.java

@@ -77,7 +77,7 @@ public ReportJobCalendar(ReportJobCalendar other) {
         if (other.excludeDays != null) {
             this.excludeDays = new ArrayList<Calendar>();
             for (Calendar excludeDay : other.excludeDays) {
-                this.excludeDays.add(excludeDay);
+                this.excludeDays.add((Calendar) excludeDay.clone());
             }
         }
         if (other.excludeDaysFlags != null) {

src/main/java/com/jaspersoft/jasperserver/jaxrs/client/dto/settings/Datepicker.java

@@ -32,36 +32,11 @@ public Datepicker(Datepicker other) {
         this.prevText = other.prevText;
         this.nextText = other.nextText;
         this.currentText = other.currentText;
-        if (other.monthNames != null) {
-            this.monthNames = new LinkedList<String>();
-            for (String monthName : other.monthNames) {
-                this.monthNames.add(monthName);
-            }
-        }
-        if (other.monthNamesShort != null) {
-            this.monthNamesShort = new LinkedList<String>();
-            for (String monthNameShort : other.monthNamesShort) {
-                this.monthNamesShort.add(monthNameShort);
-            }
-        }
-        if (other.dayNames != null) {
-            this.dayNames = new LinkedList<String>();
-            for (String dayName : other.dayNames) {
-                this.dayNames.add(dayName);
-            }
-        }
-        if (other.dayNamesShort != null) {
-            this.dayNamesShort = new LinkedList<String>();
-            for (String dayNameShort : other.dayNamesShort) {
-                this.dayNamesShort.add(dayNameShort);
-            }
-        }
-        if (other.dayNamesMin != null) {
-            this.dayNamesMin = new LinkedList<String>();
-            for (String dayNameMin : other.dayNames) {
-                this.dayNamesMin.add(dayNameMin);
-            }
-        }
+        this.monthNames = (other.monthNames != null) ? new LinkedList<String>(other.monthNames) : null;
+        this.monthNamesShort = (other.monthNamesShort != null) ? new LinkedList<String>(other.monthNamesShort) : null;
+        this.dayNames = (other.dayNames != null) ? new LinkedList<String>(other.dayNames) : null;
+        this.dayNamesShort = (other.dayNamesShort != null) ? new LinkedList<String>(other.dayNamesShort) : null;
+        this.dayNamesMin = (other.dayNamesMin != null) ? new LinkedList<String>(other.dayNamesMin) : null;
         this.weekHeader = other.weekHeader;
         this.dateFormat = other.dateFormat;
         this.firstDay = other.firstDay;

src/main/java/com/jaspersoft/jasperserver/jaxrs/client/dto/settings/GlobalConfigurationSettings.java

@@ -56,12 +56,7 @@ public GlobalConfigurationSettings() {
     }
 
     public GlobalConfigurationSettings(GlobalConfigurationSettings other) {
-        if (other.messages != null) {
-            this.messages = new LinkedHashMap<String, String>();
-            for (Map.Entry<String, String> entry : other.messages.entrySet()) {
-                this.messages.put(entry.getKey(), entry.getValue());
-            }
-        }
+        this.messages = (other.messages != null) ? new LinkedHashMap<String, String>(other.messages) : null;
         this.paginatorItemsPerPage = other.paginatorItemsPerPage;
         this.paginatorPagesRange = other.paginatorPagesRange;
         this.reportLevelConfigurable = other.reportLevelConfigurable;
@@ -75,24 +70,12 @@ public GlobalConfigurationSettings(GlobalConfigurationSettings other) {
         this.userNameSeparator = other.userNameSeparator;
         this.defaultRole = other.defaultRole;
         this.passwordMask = other.passwordMask;
-        if (other.viewReportsFilterList != null) {
-            this.viewReportsFilterList = new LinkedList<String>();
-            for (String viewReportsFilter : other.viewReportsFilterList) {
-                this.viewReportsFilterList.add(viewReportsFilter);
-            }
-        }
-        if (other.outputFolderFilterList != null) {
-            this.outputFolderFilterList = new LinkedList<String>();
-            for (String outputFolderFilter : other.outputFolderFilterList) {
-                this.outputFolderFilterList.add(outputFolderFilter);
-            }
-        }
-        if (other.outputFolderFilterPatterns != null) {
-            this.outputFolderFilterPatterns = new LinkedList<String>();
-            for (String outputFolderFilterPattern : other.outputFolderFilterPatterns) {
-                this.outputFolderFilterPatterns.add(outputFolderFilterPattern);
-            }
-        }
+        this.viewReportsFilterList = (other.viewReportsFilterList != null) ?
+                new LinkedList<String>(other.viewReportsFilterList) : null;
+        this.outputFolderFilterList = (other.outputFolderFilterList != null) ?
+                new LinkedList<String>(other.outputFolderFilterList) : null;
+        this.outputFolderFilterPatterns = (other.outputFolderFilterPatterns != null) ?
+                new LinkedList<String>(other.outputFolderFilterPatterns) : null;
         this.tenantNameNotSupportedSymbols = other.tenantNameNotSupportedSymbols;
         this.tenantIdNotSupportedSymbols = other.tenantIdNotSupportedSymbols;
         this.resourceIdNotSupportedSymbols = other.resourceIdNotSupportedSymbols;
@@ -122,12 +105,8 @@ public GlobalConfigurationSettings(GlobalConfigurationSettings other) {
                 this.dataSourceTypes.add(new DataSourceType(dataSourceType));
             }
         }
-        if (other.allFileResourceTypes != null) {
-            this.allFileResourceTypes = new LinkedHashMap<String, String>();
-            for (Map.Entry<String, String> entry : other.allFileResourceTypes.entrySet()) {
-                this.allFileResourceTypes.put(entry.getKey(), entry.getValue());
-            }
-        }
+        this.allFileResourceTypes = (other.allFileResourceTypes != null) ?
+                new LinkedHashMap<String, String>(other.allFileResourceTypes) : null;
     }
 
     public Map<String, String> getMessages() {

src/main/java/com/jaspersoft/jasperserver/jaxrs/client/dto/settings/Timepicker.java

@@ -4,25 +4,25 @@
 import java.util.List;
 
 /**
- *  @author Tetiana Iefimenko
+ * @author Tetiana Iefimenko
  */
 public class Timepicker {
-    private  String timeOnlyTitle;
-    private  String timeText;
-    private  String hourText;
-    private  String minuteText;
-    private  String secondText;
-    private  String millisecText;
-    private  String microsecText;
-    private  String timezoneText;
-    private  String currentText;
-    private  String closeText;
-    private  String timeFormat;
+    private String timeOnlyTitle;
+    private String timeText;
+    private String hourText;
+    private String minuteText;
+    private String secondText;
+    private String millisecText;
+    private String microsecText;
+    private String timezoneText;
+    private String currentText;
+    private String closeText;
+    private String timeFormat;
     private List<String> amNames;
     private List<String> pmNames;
-    private  Boolean isRTL;
-    private  String dateFormat;
-    private  String separator;
+    private Boolean isRTL;
+    private String dateFormat;
+    private String separator;
 
     public Timepicker() {
     }
@@ -39,18 +39,8 @@ public Timepicker(Timepicker other) {
         this.currentText = other.currentText;
         this.closeText = other.closeText;
         this.timeFormat = other.timeFormat;
-        if (other.amNames != null) {
-            this.amNames = new LinkedList<String>();
-            for (String amName : other.amNames) {
-                this.amNames.add(amName);
-            }
-        }
-        if (other.pmNames != null) {
-            this.pmNames = new LinkedList<String>();
-            for (String pmName : other.pmNames) {
-                this.pmNames.add(pmName);
-            }
-        }
+        this.amNames = (other.amNames != null) ? new LinkedList<String>(other.amNames) : null;
+        this.pmNames = (other.pmNames != null) ? new LinkedList<String>(other.pmNames) : null;
         this.isRTL = other.isRTL;
         this.dateFormat = other.dateFormat;
         this.separator = other.separator;