Merge pull request #2747 from subutai-io/dev

Dev
subutai-io · Dec 4, 2018 · 029dc0e · 029dc0e
2 parents 89ad1f6 + e81e015
commit 029dc0e
Show file tree

Hide file tree

Showing 69 changed files with 185 additions and 17 deletions.
diff --git a/...ver/subutai-bazaar-share/src/main/java/io/subutai/bazaar/share/dto/AppScaleConfigDto.java b/...ver/subutai-bazaar-share/src/main/java/io/subutai/bazaar/share/dto/AppScaleConfigDto.java
@@ -9,10 +9,13 @@
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
 
 /**
  * Copy from AppScale plugin
  */
+@JsonIgnoreProperties( ignoreUnknown = true )
 public class AppScaleConfigDto
 {
     private String clusterName = "";

diff --git a/...ment/server/subutai-bazaar-share/src/main/java/io/subutai/bazaar/share/dto/CommonDto.java b/...ment/server/subutai-bazaar-share/src/main/java/io/subutai/bazaar/share/dto/CommonDto.java
@@ -1,6 +1,10 @@
 package io.subutai.bazaar.share.dto;
 
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
+
+@JsonIgnoreProperties( ignoreUnknown = true )
 public class CommonDto
 {
     byte[] bytes;

diff --git a/.../subutai-bazaar-share/src/main/java/io/subutai/bazaar/share/dto/HeartbeatResponseDto.java b/.../subutai-bazaar-share/src/main/java/io/subutai/bazaar/share/dto/HeartbeatResponseDto.java
@@ -4,7 +4,10 @@
 import java.util.HashSet;
 import java.util.Set;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 
+
+@JsonIgnoreProperties( ignoreUnknown = true )
 public class HeartbeatResponseDto
 {
     private final HashSet<String> stateLinks = new HashSet<>();

diff --git a/management/server/subutai-bazaar-share/src/main/java/io/subutai/bazaar/share/dto/P2PDto.java b/management/server/subutai-bazaar-share/src/main/java/io/subutai/bazaar/share/dto/P2PDto.java
@@ -3,7 +3,10 @@
 
 import java.util.List;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 
+
+@JsonIgnoreProperties( ignoreUnknown = true )
 public class P2PDto
 {
     private String rhId;

diff --git a/...gement/server/subutai-bazaar-share/src/main/java/io/subutai/bazaar/share/dto/PeerDto.java b/...gement/server/subutai-bazaar-share/src/main/java/io/subutai/bazaar/share/dto/PeerDto.java
@@ -3,7 +3,10 @@
 
 import java.util.Date;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 
+
+@JsonIgnoreProperties( ignoreUnknown = true )
 public class PeerDto
 {
     private String id;

diff --git a/...nt/server/subutai-bazaar-share/src/main/java/io/subutai/bazaar/share/dto/PeerInfoDto.java b/...nt/server/subutai-bazaar-share/src/main/java/io/subutai/bazaar/share/dto/PeerInfoDto.java
@@ -3,7 +3,10 @@
 
 import java.util.Set;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 
+
+@JsonIgnoreProperties( ignoreUnknown = true )
 public class PeerInfoDto
 {
     private String id;

diff --git a/...er/subutai-bazaar-share/src/main/java/io/subutai/bazaar/share/dto/PublicKeyContainer.java b/...er/subutai-bazaar-share/src/main/java/io/subutai/bazaar/share/dto/PublicKeyContainer.java
@@ -1,6 +1,10 @@
 package io.subutai.bazaar.share.dto;
 
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
+
+@JsonIgnoreProperties( ignoreUnknown = true )
 public class PublicKeyContainer
 {
     private String hostId;

diff --git a/...erver/subutai-bazaar-share/src/main/java/io/subutai/bazaar/share/dto/RegistrationDto.java b/...erver/subutai-bazaar-share/src/main/java/io/subutai/bazaar/share/dto/RegistrationDto.java
@@ -1,6 +1,10 @@
 package io.subutai.bazaar.share.dto;
 
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
+
+@JsonIgnoreProperties( ignoreUnknown = true )
 public class RegistrationDto
 {
     private String ownerFingerprint;

diff --git a/...rver/subutai-bazaar-share/src/main/java/io/subutai/bazaar/share/dto/RhVersionInfoDto.java b/...rver/subutai-bazaar-share/src/main/java/io/subutai/bazaar/share/dto/RhVersionInfoDto.java
@@ -1,6 +1,10 @@
 package io.subutai.bazaar.share.dto;
 
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
+
+@JsonIgnoreProperties( ignoreUnknown = true )
 public class RhVersionInfoDto
 {
     private String rhId;

diff --git a/...rver/subutai-bazaar-share/src/main/java/io/subutai/bazaar/share/dto/SubutaiSystemLog.java b/...rver/subutai-bazaar-share/src/main/java/io/subutai/bazaar/share/dto/SubutaiSystemLog.java
@@ -2,9 +2,10 @@
 
 
 import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
-
+@JsonIgnoreProperties( ignoreUnknown = true )
 public class SubutaiSystemLog
 {
     public enum LogType

diff --git a/.../server/subutai-bazaar-share/src/main/java/io/subutai/bazaar/share/dto/SystemLogsDto.java b/.../server/subutai-bazaar-share/src/main/java/io/subutai/bazaar/share/dto/SystemLogsDto.java
@@ -4,7 +4,10 @@
 import java.util.List;
 import java.util.Set;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 
+
+@JsonIgnoreProperties( ignoreUnknown = true )
 public class SystemLogsDto
 {
     private Set<SubutaiSystemLog> subutaiSystemLogs;

diff --git a/.../server/subutai-bazaar-share/src/main/java/io/subutai/bazaar/share/dto/TunnelInfoDto.java b/.../server/subutai-bazaar-share/src/main/java/io/subutai/bazaar/share/dto/TunnelInfoDto.java
@@ -3,7 +3,10 @@
 
 import java.io.Serializable;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 
+
+@JsonIgnoreProperties( ignoreUnknown = true )
 public class TunnelInfoDto implements Serializable
 {
 

diff --git a/...gement/server/subutai-bazaar-share/src/main/java/io/subutai/bazaar/share/dto/UserDto.java b/...gement/server/subutai-bazaar-share/src/main/java/io/subutai/bazaar/share/dto/UserDto.java
@@ -3,7 +3,10 @@
 
 import java.util.Set;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 
+
+@JsonIgnoreProperties( ignoreUnknown = true )
 public class UserDto
 {
     private String id;

diff --git a/...t/server/subutai-bazaar-share/src/main/java/io/subutai/bazaar/share/dto/UserTokenDto.java b/...t/server/subutai-bazaar-share/src/main/java/io/subutai/bazaar/share/dto/UserTokenDto.java
@@ -3,7 +3,10 @@
 
 import java.util.Date;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 
+
+@JsonIgnoreProperties( ignoreUnknown = true )
 public class UserTokenDto
 {
     public enum State

diff --git a/...er/subutai-bazaar-share/src/main/java/io/subutai/bazaar/share/dto/ansible/AnsibleDto.java b/...er/subutai-bazaar-share/src/main/java/io/subutai/bazaar/share/dto/ansible/AnsibleDto.java
@@ -4,7 +4,10 @@
 import java.util.HashSet;
 import java.util.Set;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 
+
+@JsonIgnoreProperties( ignoreUnknown = true )
 public class AnsibleDto
 {
     public enum State

diff --git a/.../server/subutai-bazaar-share/src/main/java/io/subutai/bazaar/share/dto/ansible/Group.java b/.../server/subutai-bazaar-share/src/main/java/io/subutai/bazaar/share/dto/ansible/Group.java
@@ -4,7 +4,10 @@
 import java.util.HashSet;
 import java.util.Set;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 
+
+@JsonIgnoreProperties( ignoreUnknown = true )
 public class Group
 {
     private String name;

diff --git a/...t/server/subutai-bazaar-share/src/main/java/io/subutai/bazaar/share/dto/ansible/Host.java b/...t/server/subutai-bazaar-share/src/main/java/io/subutai/bazaar/share/dto/ansible/Host.java
@@ -1,6 +1,10 @@
 package io.subutai.bazaar.share.dto.ansible;
 
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
+
+@JsonIgnoreProperties( ignoreUnknown = true )
 public class Host
 {
     private String hostname;

diff --git a/...ai-bazaar-share/src/main/java/io/subutai/bazaar/share/dto/domain/ContainerPortMapDto.java b/...ai-bazaar-share/src/main/java/io/subutai/bazaar/share/dto/domain/ContainerPortMapDto.java
@@ -4,7 +4,10 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 
+
+@JsonIgnoreProperties( ignoreUnknown = true )
 public class ContainerPortMapDto
 {
     private String environmentSSId;

diff --git a/...rver/subutai-bazaar-share/src/main/java/io/subutai/bazaar/share/dto/domain/DomainDto.java b/...rver/subutai-bazaar-share/src/main/java/io/subutai/bazaar/share/dto/domain/DomainDto.java
@@ -3,7 +3,10 @@
 
 import java.util.Set;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 
+
+@JsonIgnoreProperties( ignoreUnknown = true )
 public class DomainDto
 {
     public enum DomainState

diff --git a/...ver/subutai-bazaar-share/src/main/java/io/subutai/bazaar/share/dto/domain/PortMapDto.java b/...ver/subutai-bazaar-share/src/main/java/io/subutai/bazaar/share/dto/domain/PortMapDto.java
@@ -1,6 +1,10 @@
 package io.subutai.bazaar.share.dto.domain;
 
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
+
+@JsonIgnoreProperties( ignoreUnknown = true )
 public class PortMapDto
 {
     public enum Protocol

diff --git a/...erver/subutai-bazaar-share/src/main/java/io/subutai/bazaar/share/dto/domain/ProxyDto.java b/...erver/subutai-bazaar-share/src/main/java/io/subutai/bazaar/share/dto/domain/ProxyDto.java
@@ -4,7 +4,10 @@
 import java.util.HashSet;
 import java.util.Set;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 
+
+@JsonIgnoreProperties( ignoreUnknown = true )
 public class ProxyDto
 {
     public enum State

diff --git a/...ai-bazaar-share/src/main/java/io/subutai/bazaar/share/dto/domain/ReservedPortMapping.java b/...ai-bazaar-share/src/main/java/io/subutai/bazaar/share/dto/domain/ReservedPortMapping.java
@@ -1,6 +1,10 @@
 package io.subutai.bazaar.share.dto.domain;
 
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
+
+@JsonIgnoreProperties( ignoreUnknown = true )
 public class ReservedPortMapping
 {
     private PortMapDto.Protocol protocol;

diff --git a/...ai-bazaar-share/src/main/java/io/subutai/bazaar/share/dto/environment/EnvironmentDto.java b/...ai-bazaar-share/src/main/java/io/subutai/bazaar/share/dto/environment/EnvironmentDto.java
@@ -4,7 +4,10 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 
+
+@JsonIgnoreProperties( ignoreUnknown = true )
 public class EnvironmentDto
 {
     public enum BuildState

diff --git a/...azaar-share/src/main/java/io/subutai/bazaar/share/dto/environment/EnvironmentInfoDto.java b/...azaar-share/src/main/java/io/subutai/bazaar/share/dto/environment/EnvironmentInfoDto.java
@@ -4,7 +4,10 @@
 import java.util.HashSet;
 import java.util.Set;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 
+
+@JsonIgnoreProperties( ignoreUnknown = true )
 public class EnvironmentInfoDto
 {
     private String id;

diff --git a/...azaar-share/src/main/java/io/subutai/bazaar/share/dto/environment/EnvironmentNodeDto.java b/...azaar-share/src/main/java/io/subutai/bazaar/share/dto/environment/EnvironmentNodeDto.java
@@ -4,9 +4,11 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import io.subutai.bazaar.share.quota.ContainerQuota;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 
+import io.subutai.bazaar.share.quota.ContainerQuota;
 
+@JsonIgnoreProperties( ignoreUnknown = true )
 public class EnvironmentNodeDto
 {
     private String hostId;

diff --git a/...zaar-share/src/main/java/io/subutai/bazaar/share/dto/environment/EnvironmentNodesDto.java b/...zaar-share/src/main/java/io/subutai/bazaar/share/dto/environment/EnvironmentNodesDto.java
@@ -4,7 +4,10 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 
+
+@JsonIgnoreProperties( ignoreUnknown = true )
 public class EnvironmentNodesDto
 {
     private String peerId;

diff --git a/...azaar-share/src/main/java/io/subutai/bazaar/share/dto/environment/EnvironmentPeerDto.java b/...azaar-share/src/main/java/io/subutai/bazaar/share/dto/environment/EnvironmentPeerDto.java
@@ -4,13 +4,14 @@
 import java.util.HashSet;
 import java.util.Set;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 
 import io.subutai.bazaar.share.dto.PublicKeyContainer;
 import io.subutai.bazaar.share.dto.UserTokenDto;
 import io.subutai.bazaar.share.dto.ansible.AnsibleDto;
 
-
+@JsonIgnoreProperties( ignoreUnknown = true )
 public class EnvironmentPeerDto
 {
     public enum PeerState

diff --git a/...aar-share/src/main/java/io/subutai/bazaar/share/dto/environment/EnvironmentPeerRHDto.java b/...aar-share/src/main/java/io/subutai/bazaar/share/dto/environment/EnvironmentPeerRHDto.java
@@ -1,6 +1,10 @@
 package io.subutai.bazaar.share.dto.environment;
 
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
+
+@JsonIgnoreProperties( ignoreUnknown = true )
 public class EnvironmentPeerRHDto
 {
     private String id;

diff --git a/...-share/src/main/java/io/subutai/bazaar/share/dto/environment/EnvironmentTelemetryDto.java b/...-share/src/main/java/io/subutai/bazaar/share/dto/environment/EnvironmentTelemetryDto.java
@@ -4,7 +4,10 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 
+
+@JsonIgnoreProperties( ignoreUnknown = true )
 public class EnvironmentTelemetryDto
 {
     private List<EnvironmentTelemetryOperation> operations = new ArrayList<>();

diff --git a/.../src/main/java/io/subutai/bazaar/share/dto/environment/EnvironmentTelemetryOperation.java b/.../src/main/java/io/subutai/bazaar/share/dto/environment/EnvironmentTelemetryOperation.java
@@ -1,6 +1,10 @@
 package io.subutai.bazaar.share.dto.environment;
 
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
+
+@JsonIgnoreProperties( ignoreUnknown = true )
 public class EnvironmentTelemetryOperation
 {
     public enum State

diff --git a/...utai-bazaar-share/src/main/java/io/subutai/bazaar/share/dto/environment/P2PStatusDto.java b/...utai-bazaar-share/src/main/java/io/subutai/bazaar/share/dto/environment/P2PStatusDto.java
@@ -1,6 +1,10 @@
 package io.subutai.bazaar.share.dto.environment;
 
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
+
+@JsonIgnoreProperties( ignoreUnknown = true )
 public class P2PStatusDto
 {
     public enum State

diff --git a/...subutai-bazaar-share/src/main/java/io/subutai/bazaar/share/dto/environment/SSHKeyDto.java b/...subutai-bazaar-share/src/main/java/io/subutai/bazaar/share/dto/environment/SSHKeyDto.java
@@ -5,7 +5,10 @@
 import java.util.HashSet;
 import java.util.Set;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 
+
+@JsonIgnoreProperties( ignoreUnknown = true )
 public class SSHKeyDto
 {
     private String name;

diff --git a/.../main/java/io/subutai/bazaar/share/dto/environment/container/ContainerDesktopInfoDto.java b/.../main/java/io/subutai/bazaar/share/dto/environment/container/ContainerDesktopInfoDto.java
@@ -1,6 +1,10 @@
 package io.subutai.bazaar.share.dto.environment.container;
 
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
+
+@JsonIgnoreProperties( ignoreUnknown = true )
 public class ContainerDesktopInfoDto
 {
     private String id;

diff --git a/...re/src/main/java/io/subutai/bazaar/share/dto/environment/container/ContainerEventDto.java b/...re/src/main/java/io/subutai/bazaar/share/dto/environment/container/ContainerEventDto.java
@@ -7,9 +7,11 @@
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
-import io.subutai.bazaar.share.dto.environment.ContainerStateDto;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 
+import io.subutai.bazaar.share.dto.environment.ContainerStateDto;
 
+@JsonIgnoreProperties( ignoreUnknown = true )
 public class ContainerEventDto
 {
     private String id;

diff --git a/...-bazaar-share/src/main/java/io/subutai/bazaar/share/dto/metrics/ContainersMetricsDto.java b/...-bazaar-share/src/main/java/io/subutai/bazaar/share/dto/metrics/ContainersMetricsDto.java
@@ -4,9 +4,10 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
-
+@JsonIgnoreProperties( ignoreUnknown = true )
 public class ContainersMetricsDto
 {
     @JsonProperty( "peerId" )