fix: k8s api lombok warning

api/src/main/java/seecoder/devcloud/api/k8s/impl/DeploymentApiImpl.java

@@ -14,6 +14,7 @@ import org.springframework.stereotype.Service;
 import seecoder.devcloud.api.k8s.DeploymentApi;
 import seecoder.devcloud.api.k8s.exception.K8sApiException;
 import seecoder.devcloud.api.k8s.model.Deployment;
+import seecoder.devcloud.api.k8s.model.DeploymentStatus;
 import seecoder.devcloud.api.k8s.model.K8sObjectRequest;
 import seecoder.devcloud.api.k8s.model.LabelSelector;
 import seecoder.devcloud.common.util.LoggerUtil;
@@ -23,6 +24,7 @@ import java.util.List;
 import java.util.stream.Collectors;
 
 import static seecoder.devcloud.api.k8s.K8sConstants.FOREGROUND_PROPAGATION_POLICY;
+import static seecoder.devcloud.api.k8s.K8sConstants.PRETTY_FORMAT;
 import static seecoder.devcloud.api.k8s.exception.K8sApiException.*;
 
 

api/src/main/java/seecoder/devcloud/api/k8s/impl/WatchApiImpl.java

@@ -1,6 +1,5 @@
 package seecoder.devcloud.api.k8s.impl;
 
-import cn.seecoder.paas.service.facade.k8s.WatchApi;
 import com.google.common.reflect.TypeToken;
 import io.kubernetes.client.openapi.ApiClient;
 import io.kubernetes.client.openapi.ApiException;
@@ -9,17 +8,19 @@ import io.kubernetes.client.openapi.models.V1Deployment;
 import io.kubernetes.client.util.Watch;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import seecoder.devcloud.api.k8s.WatchApi;
 
 import java.io.IOException;
 
-import static cn.seecoder.paas.service.facade.k8s.K8sConstants.PRETTY_FORMAT;
+import static seecoder.devcloud.api.k8s.K8sConstants.PRETTY_FORMAT;
+
 
 /**
  * author: rale
  * createdAt: 1/13/19
  */
 @Service
-public class WatchApiImpl implements WatchApi{
+public class WatchApiImpl implements WatchApi {
 
     private ApiClient watchApiClient;
 

api/src/main/java/seecoder/devcloud/api/k8s/model/ConfigMap.java

@@ -2,10 +2,7 @@ package seecoder.devcloud.api.k8s.model;
 
 import io.kubernetes.client.openapi.models.V1ConfigMap;
 import io.kubernetes.client.openapi.models.V1ConfigMapBuilder;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
+import lombok.*;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -14,12 +11,14 @@ import java.util.Map;
 @AllArgsConstructor
 @NoArgsConstructor
 @Builder
+@EqualsAndHashCode(callSuper=true)
 public class ConfigMap extends K8sAbstractObject<V1ConfigMap> {
 
     public static final String API_VERSION = "v1";
 
     public static final String KIND = "ConfigMap";
 
+    @Builder.Default
     private Map<String, String> data = new HashMap<>();
 
 

api/src/main/java/seecoder/devcloud/api/k8s/model/Container.java

@@ -32,11 +32,14 @@ public class Container implements K8sObjectTransformer<V1Container> {
     /* 启动指令 */
     private List<String> command;
 
+    @Builder.Default
     /* 环境变量 */
     private Map<String, String> env = new HashMap<>();
 
+    @Builder.Default
     private Set<ContainerPort> ports = new HashSet<>();
 
+    @Builder.Default
     private List<VolumeMount> volumeMounts = new ArrayList<>();
 
     @Data
@@ -51,6 +54,7 @@ public class Container implements K8sObjectTransformer<V1Container> {
 
         String subPath;
 
+        @Builder.Default
         Boolean readOnly = true;
 
         public VolumeMount(V1VolumeMount v1VolumeMount) {

api/src/main/java/seecoder/devcloud/api/k8s/model/Deployment.java

@@ -1,10 +1,7 @@
 package seecoder.devcloud.api.k8s.model;
 
 import io.kubernetes.client.openapi.models.*;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
+import lombok.*;
 import org.hibernate.validator.constraints.Range;
 import org.springframework.data.annotation.ReadOnlyProperty;
 
@@ -22,6 +19,7 @@ import java.util.stream.Collectors;
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
+@EqualsAndHashCode(callSuper=true)
 public class Deployment extends K8sAbstractObject<V1Deployment> {
 
     public static final String API_VERSION = "apps/v1";
@@ -34,24 +32,31 @@ public class Deployment extends K8sAbstractObject<V1Deployment> {
 
     public static final String DEFAULT_UPDATE_STRATEGY = "Recreate";
 
+    @Builder.Default
     private List<Container> containers = new ArrayList<>();
 
+    @Builder.Default
     private List<String> imagePullSecrets = new ArrayList<>();
 
+    @Builder.Default
     private List<V1Volume> volumes = new ArrayList<>();
 
+    @Builder.Default
     private Map<String, String> nodeSelectors = new HashMap<>();
+
     @Range(min = 1, max = 3)
     private int replicas;
 
     /**
      * 超过timeout时间未完成启动则提示启动超时
      */
+    @Builder.Default
     private int timeout = DEFAULT_PROGRESS_DEADLINE_SECONDS;
 
     /**
      * 保留历史replica set的个数
      */
+    @Builder.Default
     private int revisionHistoryLimit = DEFAULT_REVISION_HISTORY_LIMIT;
 
     @ReadOnlyProperty

api/src/main/java/seecoder/devcloud/api/k8s/model/Ingress.java

@@ -16,6 +16,7 @@ import java.util.stream.Collectors;
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
+@EqualsAndHashCode(callSuper=true)
 public class Ingress extends K8sAbstractObject<ExtensionsV1beta1Ingress> {
 
     public static final String API_VERSION = "extensions/v1beta1";
@@ -29,6 +30,7 @@ public class Ingress extends K8sAbstractObject<ExtensionsV1beta1Ingress> {
     //重定向的路径，默认为根路径
     private static final String redirectPath = DEFAULT_REWRITE_PATH;
 
+    @Builder.Default
     /*Ingress能暴露HTTP和HTTPS协议口，目前暂不支持HTTPS协议*/
     private List<IngressRule> httpRules = new ArrayList<>();
 
@@ -100,6 +102,7 @@ public class Ingress extends K8sAbstractObject<ExtensionsV1beta1Ingress> {
 
         private String host;
 
+        @Builder.Default
         private Set<IngressPath> ruleValues = new HashSet<>();
 
         public IngressRule(String host) {

api/src/main/java/seecoder/devcloud/api/k8s/model/K8sObjectRequest.java

@@ -16,8 +16,10 @@ public class K8sObjectRequest {
 
     private String namespace;
 
+    @Builder.Default
     private Map<String, String> labels = new HashMap<>();
 
+    @Builder.Default
     private Map<String, String> annotations = new HashMap<>();
 
     private LabelSelector selector;

api/src/main/java/seecoder/devcloud/api/k8s/model/Namespace.java

@@ -1,15 +1,17 @@
 package seecoder.devcloud.api.k8s.model;
 
-import cn.seecoder.paas.util.DateUtil;
 import io.kubernetes.client.openapi.models.V1Namespace;
 import io.kubernetes.client.openapi.models.V1NamespaceBuilder;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
+import seecoder.devcloud.common.util.DateUtil;
 
 import java.time.LocalDateTime;
 
 @Data
 @NoArgsConstructor
+@EqualsAndHashCode(callSuper=true)
 public class Namespace extends K8sAbstractObject<V1Namespace> {
 
     private static final String KIND = "Namespace";

api/src/main/java/seecoder/devcloud/api/k8s/model/PersistentVolumeClaim.java

@@ -5,10 +5,7 @@ import io.kubernetes.client.openapi.models.V1PersistentVolumeClaim;
 import io.kubernetes.client.openapi.models.V1PersistentVolumeClaimBuilder;
 import io.kubernetes.client.openapi.models.V1PersistentVolumeClaimSpecBuilder;
 import io.kubernetes.client.openapi.models.V1ResourceRequirementsBuilder;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
+import lombok.*;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -18,6 +15,7 @@ import java.util.List;
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
+@EqualsAndHashCode(callSuper=true)
 public class PersistentVolumeClaim extends K8sAbstractObject<V1PersistentVolumeClaim> {
 
     public static final String API_VERSION = "v1";
@@ -28,6 +26,7 @@ public class PersistentVolumeClaim extends K8sAbstractObject<V1PersistentVolumeC
 
     private String volumeMode;
 
+    @Builder.Default
     private List<String> accessModes = new ArrayList<>();
 
     private Quantity quantity;

api/src/main/java/seecoder/devcloud/api/k8s/model/Pod.java

@@ -17,9 +17,9 @@ import java.util.stream.Collectors;
  * createdAt: 3/4/19
  */
 @Data
-@EqualsAndHashCode
 @NoArgsConstructor
 @AllArgsConstructor
+@EqualsAndHashCode(callSuper=true)
 public class Pod extends K8sAbstractObject<V1Pod> {
 
     public static final String API_VERSION = "v1";

api/src/main/java/seecoder/devcloud/api/k8s/model/Service.java

@@ -4,10 +4,7 @@ import io.kubernetes.client.openapi.models.V1Service;
 import io.kubernetes.client.openapi.models.V1ServiceBuilder;
 import io.kubernetes.client.openapi.models.V1ServiceSpec;
 import io.kubernetes.client.openapi.models.V1ServiceSpecBuilder;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
+import lombok.*;
 
 import java.util.HashMap;
 import java.util.HashSet;
@@ -19,6 +16,7 @@ import java.util.stream.Collectors;
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
+@EqualsAndHashCode(callSuper=true)
 public class Service extends K8sAbstractObject<V1Service> {
 
     public static final String API_VERSION = "v1";
@@ -29,12 +27,16 @@ public class Service extends K8sAbstractObject<V1Service> {
 
     private String namespace;
 
+    @Builder.Default
     private Map<String, String> labels = new HashMap<>();
 
+    @Builder.Default
     private Map<String, String> annotations = new HashMap<>();
 
+    @Builder.Default
     private Set<ServicePort> servicePorts = new HashSet<>();
 
+    @Builder.Default
     private Map<String, String> selectors = new HashMap<>();
 
     public Service(V1Service v1Service) {