Updated DOT from com.jaspersoft.jasperserver.jaxrs.client.dto.settings.* and com.jaspersoft.jasperserver.jaxrs.client.dto.job.* packages

TanyaEf · TanyaEf · commit 997bfdb25c4e · 2016-06-15T14:53:56.000+03:00
diff --git a/src/main/java/com/jaspersoft/jasperserver/jaxrs/client/dto/jobs/CalendarTrigger.java b/src/main/java/com/jaspersoft/jasperserver/jaxrs/client/dto/jobs/CalendarTrigger.java
@@ -49,16 +49,21 @@ public CalendarTrigger(CalendarTrigger other) {
         this.minutes = other.minutes;
         this.hours = other.hours;
         this.daysType = other.daysType;
-        this.weekDays = new TreeSet<Byte>();
-        Iterator<Byte> iterator = other.weekDays.iterator();
-        while (iterator.hasNext()) {
-            this.weekDays.add(iterator.next());
+        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.monthDays = other.monthDays;
-        this.months = new TreeSet<Byte>();
-        Iterator<Byte> monthItertor = other.months.iterator();
-        while (monthItertor.hasNext()) {
-            this.months.add(iterator.next());
+        if (other.months != null) {
+            this.months = new TreeSet<Byte>();
+            Iterator<Byte> monthItertor = other.months.iterator();
+            while (monthItertor.hasNext()) {
+                this.months.add(monthItertor.next());
+            }
         }
     }
 
diff --git a/src/main/java/com/jaspersoft/jasperserver/jaxrs/client/dto/jobs/FtpInfo.java b/src/main/java/com/jaspersoft/jasperserver/jaxrs/client/dto/jobs/FtpInfo.java
@@ -50,9 +50,11 @@ public FtpInfo(FtpInfo other) {
         this.password = other.password;
         this.pbsz = other.pbsz;
         this.port = other.port;
-        this.propertiesMap = new LinkedHashMap<String, String>();
-        for (Map.Entry<String, String> entry: other.propertiesMap.entrySet()) {
-            this.propertiesMap.put(entry.getKey(), entry.getValue());
+        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.prot = other.prot;
         this.protocol = other.protocol;
diff --git a/src/main/java/com/jaspersoft/jasperserver/jaxrs/client/dto/jobs/Job.java b/src/main/java/com/jaspersoft/jasperserver/jaxrs/client/dto/jobs/Job.java
@@ -61,9 +61,11 @@ public Job(Job other) {
         this.id = other.id;
         this.label = other.label;
         this.mailNotification = (other.mailNotification != null) ? new MailNotification(other.mailNotification) : null;
-        this.outputFormats = new HashSet<OutputFormat>();
-        for (OutputFormat outputFormat : other.outputFormats) {
-            this.outputFormats.add(outputFormat);
+        if (other.outputFormats != null) {
+            this.outputFormats = new HashSet<OutputFormat>();
+            for (OutputFormat outputFormat : other.outputFormats) {
+                this.outputFormats.add(outputFormat);
+            }
         }
         this.outputLocale = other.outputLocale;
         this.outputTimeZone = other.outputTimeZone;
diff --git a/src/main/java/com/jaspersoft/jasperserver/jaxrs/client/dto/jobs/JobAlert.java b/src/main/java/com/jaspersoft/jasperserver/jaxrs/client/dto/jobs/JobAlert.java
@@ -55,9 +55,11 @@ public JobAlert(JobAlert other) {
         this.messageTextWhenJobFails = other.messageTextWhenJobFails;
         this.recipient = other.recipient;
         this.subject = other.subject;
-        this.toAddresses = new LinkedList<String>();
-        for (String toAddress : other.toAddresses) {
-            this.toAddresses.add(toAddress);
+        if (other.toAddresses != null) {
+            this.toAddresses = new LinkedList<String>();
+            for (String toAddress : other.toAddresses) {
+                this.toAddresses.add(toAddress);
+            }
         }
         this.version = other.version;
 
diff --git a/src/main/java/com/jaspersoft/jasperserver/jaxrs/client/dto/jobs/JobIdListWrapper.java b/src/main/java/com/jaspersoft/jasperserver/jaxrs/client/dto/jobs/JobIdListWrapper.java
@@ -34,6 +34,7 @@
 public class JobIdListWrapper {
 
     private List<Long> ids;
+
     public JobIdListWrapper(){
     }
 
diff --git a/src/main/java/com/jaspersoft/jasperserver/jaxrs/client/dto/jobs/JobSource.java b/src/main/java/com/jaspersoft/jasperserver/jaxrs/client/dto/jobs/JobSource.java
@@ -41,9 +41,11 @@ public JobSource() {
     }
 
     public JobSource(JobSource other) {
-        this.parameters = new LinkedHashMap<String, Object>();
-        for (Map.Entry<String, Object> entry : parameters.entrySet()) {
-            parameters.put(entry.getKey(),entry.getValue());
+        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.reportUnitURI = other.reportUnitURI;
     }
diff --git a/src/main/java/com/jaspersoft/jasperserver/jaxrs/client/dto/jobs/MailNotification.java b/src/main/java/com/jaspersoft/jasperserver/jaxrs/client/dto/jobs/MailNotification.java
@@ -50,17 +50,23 @@ public MailNotification() {
     }
 
     public MailNotification(MailNotification other) {
-        this.bccAddresses = new LinkedList<String>();
-        for (String bccAddress : other.bccAddresses) {
-            this.bccAddresses.add(bccAddress);
+        if (other.bccAddresses != null) {
+            this.bccAddresses = new LinkedList<String>();
+            for (String bccAddress : other.bccAddresses) {
+                this.bccAddresses.add(bccAddress);
+            }
         }
-        this.ccAddresses = new LinkedList<String>();
-        for (String ccAddress : other.ccAddresses) {
-            this.ccAddresses.add(ccAddress);
+        if (other.ccAddresses != null) {
+            this.ccAddresses = new LinkedList<String>();
+            for (String ccAddress : other.ccAddresses) {
+                this.ccAddresses.add(ccAddress);
+            }
         }
-        this.toAddresses = new LinkedList<String>();
-        for (String toAddress : other.toAddresses) {
-            this.toAddresses.add(toAddress);
+        if (other.toAddresses != null) {
+            this.toAddresses = new LinkedList<String>();
+            for (String toAddress : other.toAddresses) {
+                this.toAddresses.add(toAddress);
+            }
         }
         this.id = other.id;
         this.includingStackTraceWhenJobFails = other.includingStackTraceWhenJobFails;
diff --git a/src/main/java/com/jaspersoft/jasperserver/jaxrs/client/dto/jobs/ReportJobCalendar.java b/src/main/java/com/jaspersoft/jasperserver/jaxrs/client/dto/jobs/ReportJobCalendar.java
@@ -74,18 +74,24 @@ public ReportJobCalendar(ReportJobCalendar other) {
         this.cronExpression = other.cronExpression;
         this.dataSorted = other.dataSorted;
         this.description = other.description;
-        this.excludeDays = new ArrayList<Calendar>();
-        for (Calendar excludeDay : other.excludeDays) {
-            this.excludeDays.add(excludeDay);
+        if (other.excludeDays != null) {
+            this.excludeDays = new ArrayList<Calendar>();
+            for (Calendar excludeDay : other.excludeDays) {
+                this.excludeDays.add(excludeDay);
+            }
         }
-        this.excludeDaysFlags = new boolean[other.excludeDaysFlags.length];
-        for (int i = 0; i < other.excludeDaysFlags.length; i++) {
-            this.excludeDaysFlags[i] = other.excludeDaysFlags[i];
+        if (other.excludeDaysFlags != null) {
+            this.excludeDaysFlags = new boolean[other.excludeDaysFlags.length];
+            for (int i = 0; i < other.excludeDaysFlags.length; i++) {
+                this.excludeDaysFlags[i] = other.excludeDaysFlags[i];
+            }
         }
         this.invertTimeRange = other.invertTimeRange;
-        this.rangeEndingCalendar = (Calendar) other.rangeEndingCalendar.clone();
-        this.rangeStartingCalendar = (Calendar) other.rangeStartingCalendar.clone();
-        this.timeZone = (TimeZone) other.timeZone.clone();
+        this.rangeEndingCalendar = (other.rangeEndingCalendar != null) ?
+                (Calendar) other.rangeEndingCalendar.clone() : null;
+        this.rangeStartingCalendar = (other.rangeStartingCalendar != null) ?
+                (Calendar) other.rangeStartingCalendar.clone() : null;
+        this.timeZone = (other.timeZone != null) ? (TimeZone) other.timeZone.clone() : null;
     }
 
     public String getCalendarType() {
diff --git a/src/main/java/com/jaspersoft/jasperserver/jaxrs/client/dto/settings/AwsSettings.java b/src/main/java/com/jaspersoft/jasperserver/jaxrs/client/dto/settings/AwsSettings.java
@@ -24,7 +24,12 @@ public AwsSettings(AwsSettings other) {
         this.productTypeIsEc2 = other.productTypeIsEc2;
         this.isEc2Instance = other.isEc2Instance;
         this.productTypeIsJrsAmi = other.productTypeIsJrsAmi;
-        this.awsRegions = (other.awsRegions != null) ? new LinkedList<String>(other.awsRegions) : null;
+        if (other.awsRegions != null) {
+            this.awsRegions = new LinkedList<String>();
+            for (String awsRegion : other.awsRegions) {
+                this.awsRegions.add(awsRegion);
+            }
+        }
         this.productTypeIsMpAmi = other.productTypeIsMpAmi;
         this.suppressEc2CredentialsWarnings = other.suppressEc2CredentialsWarnings;
     }
diff --git a/src/main/java/com/jaspersoft/jasperserver/jaxrs/client/dto/settings/DashboardSettings.java b/src/main/java/com/jaspersoft/jasperserver/jaxrs/client/dto/settings/DashboardSettings.java
@@ -14,7 +14,12 @@ public DashboardSettings() {
     }
 
     public DashboardSettings(DashboardSettings other) {
-        this.newItemsRegistry = (other.newItemsRegistry != null) ? new LinkedList<ItemRegistry>(other.newItemsRegistry) : null;
+        if (other.newItemsRegistry != null) {
+            this.newItemsRegistry = new LinkedList<ItemRegistry>();
+            for (ItemRegistry itemRegistry : other.newItemsRegistry) {
+                this.newItemsRegistry.add(new ItemRegistry(itemRegistry));
+            }
+        }
     }
 
     public List<ItemRegistry> getNewItemsRegistry() {
diff --git a/src/main/java/com/jaspersoft/jasperserver/jaxrs/client/dto/settings/DataSourceType.java b/src/main/java/com/jaspersoft/jasperserver/jaxrs/client/dto/settings/DataSourceType.java
@@ -12,10 +12,10 @@ public class DataSourceType {
     public DataSourceType() {
     }
 
-    public DataSourceType(String type, String typeValue, String labelMessage) {
-        this.type = type;
-        this.typeValue = typeValue;
-        this.labelMessage = labelMessage;
+    public DataSourceType(DataSourceType other) {
+        this.type = other.type;
+        this.typeValue = other.typeValue;
+        this.labelMessage = other.labelMessage;
     }
 
     public String getType() {
diff --git a/src/main/java/com/jaspersoft/jasperserver/jaxrs/client/dto/settings/Datepicker.java b/src/main/java/com/jaspersoft/jasperserver/jaxrs/client/dto/settings/Datepicker.java
@@ -32,11 +32,36 @@ public Datepicker(Datepicker other) {
         this.prevText = other.prevText;
         this.nextText = other.nextText;
         this.currentText = other.currentText;
-        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;
+        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.weekHeader = other.weekHeader;
         this.dateFormat = other.dateFormat;
         this.firstDay = other.firstDay;
diff --git a/src/main/java/com/jaspersoft/jasperserver/jaxrs/client/dto/settings/GlobalConfigurationSettings.java b/src/main/java/com/jaspersoft/jasperserver/jaxrs/client/dto/settings/GlobalConfigurationSettings.java
@@ -58,9 +58,9 @@ public GlobalConfigurationSettings() {
     public GlobalConfigurationSettings(GlobalConfigurationSettings other) {
         if (other.messages != null) {
             this.messages = new LinkedHashMap<String, String>();
-            messages.putAll(other.messages);
-        } else {
-            this.messages = null;
+            for (Map.Entry<String, String> entry : other.messages.entrySet()) {
+                this.messages.put(entry.getKey(), entry.getValue());
+            }
         }
         this.paginatorItemsPerPage = other.paginatorItemsPerPage;
         this.paginatorPagesRange = other.paginatorPagesRange;
@@ -75,9 +75,24 @@ public GlobalConfigurationSettings(GlobalConfigurationSettings other) {
         this.userNameSeparator = other.userNameSeparator;
         this.defaultRole = other.defaultRole;
         this.passwordMask = other.passwordMask;
-        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;
+        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.tenantNameNotSupportedSymbols = other.tenantNameNotSupportedSymbols;
         this.tenantIdNotSupportedSymbols = other.tenantIdNotSupportedSymbols;
         this.resourceIdNotSupportedSymbols = other.resourceIdNotSupportedSymbols;
@@ -101,12 +116,17 @@ public GlobalConfigurationSettings(GlobalConfigurationSettings other) {
         this.forceDomainDependentsUseACL = other.forceDomainDependentsUseACL;
         this.defaultDomainDependentsBlockAndUpdate = other.defaultDomainDependentsBlockAndUpdate;
         this.defaultDontUpdateDomainDependents = other.defaultDontUpdateDomainDependents;
-        this.dataSourceTypes = (other.dataSourceTypes != null) ? new LinkedList<DataSourceType>(other.dataSourceTypes) : null;
+        if (other.dataSourceTypes != null) {
+            this.dataSourceTypes = new LinkedList<DataSourceType>();
+            for (DataSourceType dataSourceType : other.dataSourceTypes) {
+                this.dataSourceTypes.add(new DataSourceType(dataSourceType));
+            }
+        }
         if (other.allFileResourceTypes != null) {
             this.allFileResourceTypes = new LinkedHashMap<String, String>();
-            allFileResourceTypes.putAll(other.allFileResourceTypes);
-        } else {
-            this.allFileResourceTypes = null;
+            for (Map.Entry<String, String> entry : other.allFileResourceTypes.entrySet()) {
+                this.allFileResourceTypes.put(entry.getKey(), entry.getValue());
+            }
         }
     }
 
diff --git a/src/main/java/com/jaspersoft/jasperserver/jaxrs/client/dto/settings/Timepicker.java b/src/main/java/com/jaspersoft/jasperserver/jaxrs/client/dto/settings/Timepicker.java
@@ -39,13 +39,17 @@ public Timepicker(Timepicker other) {
         this.currentText = other.currentText;
         this.closeText = other.closeText;
         this.timeFormat = other.timeFormat;
-        this.amNames = new LinkedList<String>();
-        for (String amName : other.amNames) {
-            this.amNames.add(amName);
+        if (other.amNames != null) {
+            this.amNames = new LinkedList<String>();
+            for (String amName : other.amNames) {
+                this.amNames.add(amName);
+            }
         }
-        this.pmNames = new LinkedList<String>();
-        for (String pmName : other.pmNames) {
-            this.pmNames.add(pmName);
+        if (other.pmNames != null) {
+            this.pmNames = new LinkedList<String>();
+            for (String pmName : other.pmNames) {
+                this.pmNames.add(pmName);
+            }
         }
         this.isRTL = other.isRTL;
         this.dateFormat = other.dateFormat;

Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,7 @@`
`34`	`34`	`public class JobIdListWrapper {`
`35`	`35`
`36`	`36`	`private List<Long> ids;`
	`37`	`+`
`37`	`38`	`public JobIdListWrapper(){`
`38`	`39`	`}`
`39`	`40`
Original file line number	Diff line number	Diff line change
`@@ -41,9 +41,11 @@ public JobSource() {`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`public JobSource(JobSource other) {`
`44`		`- this.parameters = new LinkedHashMap<String, Object>();`
`45`		`- for (Map.Entry<String, Object> entry : parameters.entrySet()) {`
`46`		`- parameters.put(entry.getKey(),entry.getValue());`
	`44`	`+ if (other.parameters != null) {`
	`45`	`+ this.parameters = new LinkedHashMap<String, Object>();`
	`46`	`+ for (Map.Entry<String, Object> entry : other.parameters.entrySet()) {`
	`47`	`+ parameters.put(entry.getKey(),entry.getValue());`
	`48`	`+ }`
`47`	`49`	`}`
`48`	`50`	`this.reportUnitURI = other.reportUnitURI;`
`49`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,12 @@ public DashboardSettings() {`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`public DashboardSettings(DashboardSettings other) {`
`17`		`- this.newItemsRegistry = (other.newItemsRegistry != null) ? new LinkedList<ItemRegistry>(other.newItemsRegistry) : null;`
	`17`	`+ if (other.newItemsRegistry != null) {`
	`18`	`+ this.newItemsRegistry = new LinkedList<ItemRegistry>();`
	`19`	`+ for (ItemRegistry itemRegistry : other.newItemsRegistry) {`
	`20`	`+ this.newItemsRegistry.add(new ItemRegistry(itemRegistry));`
	`21`	`+ }`
	`22`	`+ }`
`18`	`23`	`}`
`19`	`24`
`20`	`25`	`public List<ItemRegistry> getNewItemsRegistry() {`