code cleaned

cluster-manager/src/main/java/com/codeabovelab/dm/cluman/batch/StopThenStartEachStrategy.java

@@ -56,7 +56,6 @@ class StopThenStartEachStrategy {
     private ContainerConfigTasklet containerConfig;
 
     /**
-     *
      * @param predicate filter containers
      * @param processor change containers
      */
@@ -66,19 +65,20 @@ public void run(ContainerPredicate predicate, ContainerProcessor processor) {
     }
 
     protected void updateContainer(List<ProcessedContainer> containers, ContainerProcessor processor) {
-        ProcessedContainer curr = null;
-        try {
-            for(ProcessedContainer container: containers) {
+
+        for (ProcessedContainer container : containers) {
+            try {
                 ProcessedContainer withConfig = containerConfig.process(container);
                 containerStopper.execute(withConfig);
                 containerRemover.execute(withConfig);
                 ProcessedContainer newVersion = processor.apply(withConfig);
                 ProcessedContainer newContainer = containerCreator.execute(newVersion);
                 healthchecker.execute(newContainer);
+            } catch (Exception e) {
+                jobContext.fire("Error on container {0}", container);
+                throw e;
             }
-        } catch (Exception e) {
-            jobContext.fire("Error on container {0}", curr);
-            throw e;
         }
+
     }
 }

cluster-manager/src/main/java/com/codeabovelab/dm/cluman/cluster/docker/management/DockerServiceImpl.java

@@ -269,7 +269,7 @@ private void checkOffline(Throwable th) {
             }
             updated = offlineRef.compareAndSet(old, new OfflineCause(timeout, th));
         }
-        if(updated && old == null) {
+        if(old == null) {
             fireEvent(new DockerServiceEvent(this, StandardActions.OFFLINE));
         }
     }

cluster-manager/src/main/java/com/codeabovelab/dm/cluman/cluster/docker/management/argument/KillContainerArg.java

@@ -22,7 +22,7 @@
 import lombok.Data;
 
 /**
- * Argument for {@link DockerService#killContainer(String)}
+ * Argument for {@link DockerService#killContainer(KillContainerArg)}
  */
 @Builder
 @Data

cluster-manager/src/main/java/com/codeabovelab/dm/cluman/cluster/docker/model/swarm/Service.java

@@ -64,7 +64,7 @@ public static class UpdateStatus {
     public enum UpdateState {
         UPDATING,
         PAUSED,
-        COMPLETED;
+        COMPLETED
     }
 
     @Data

cluster-manager/src/main/java/com/codeabovelab/dm/cluman/cluster/docker/model/swarm/SwarmNode.java

@@ -182,7 +182,7 @@ public enum NodeState {
         UNKNOWN,
         DOWN,
         READY,
-        DISCONNECTED;
+        DISCONNECTED
     }
 
     /**
@@ -192,7 +192,7 @@ public enum NodeState {
     public enum Reachability {
         UNKNOWN,
         UNREACHABLE,
-        REACHABLE;
+        REACHABLE
     }
 
     /**
@@ -202,7 +202,7 @@ public enum Reachability {
     public enum NodeAvailability {
         ACTIVE,
         PAUSE,
-        DRAIN;
+        DRAIN
     }
 
     /**
@@ -211,6 +211,6 @@ public enum NodeAvailability {
     @JtEnumLower
     public enum NodeRole {
         WORKER,
-        MANAGER;
+        MANAGER
     }
 }

cluster-manager/src/main/java/com/codeabovelab/dm/cluman/ds/clusters/DiscoveryStorageImpl.java

@@ -71,7 +71,6 @@ public class DiscoveryStorageImpl implements DiscoveryStorage {
     private final DockerServices services;
     private final NodeStorage nodeStorage;
     private final KvMap<NodesGroup> clusters;
-    private final String prefix;
     private final AccessContextFactory aclContextFactory;
     private final MessageBus<NodesGroupEvent> messageBus;
     private final AutowireCapableBeanFactory beanFactory;
@@ -91,7 +90,7 @@ public DiscoveryStorageImpl(KvMapperFactory kvmf,
         this.messageBus = messageBus;
         this.aclContextFactory = aclContextFactory;
         KeyValueStorage storage = kvmf.getStorage();
-        this.prefix = storage.getPrefix() + "/clusters/";
+        String prefix = storage.getPrefix() + "/clusters/";
         this.clusters = KvMap.builder(NodesGroup.class, AbstractNodesGroupConfig.class)
           .path(prefix)
           .mapper(kvmf)

cluster-manager/src/main/java/com/codeabovelab/dm/cluman/ds/nodes/NodeRegistrationImpl.java

@@ -198,7 +198,7 @@ public void setCluster(String cluster) {
 
     private <T> void update(Supplier<T> getter, Consumer<T> setter, T value) {
         NodeInfoImpl ni = null;
-        NodeInfoImpl oldInfo = null;
+        NodeInfoImpl oldInfo;
         synchronized (lock) {
             oldInfo = cache;
             T oldVal = getter.get();

cluster-manager/src/main/java/com/codeabovelab/dm/cluman/model/ProtocolType.java

@@ -23,5 +23,5 @@
  */
 @JtEnumLower
 public enum ProtocolType {
-    TCP, UDP;
+    TCP, UDP
 }

cluster-manager/src/main/java/com/codeabovelab/dm/cluman/ui/configuration/UiConfiguration.java

@@ -31,6 +31,7 @@
 import org.springframework.web.util.UrlPathHelper;
 
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
@@ -45,6 +46,7 @@ public class UiConfiguration {
      * @see WebSocketConfiguration
      */
     static final String ALLOWED_ORIGIN = "*";
+    private final List<String> exports = Collections.singletonList("/ui/**");
 
     @Bean
     WebMvcConfigurerAdapter webMvcConfigurerAdapter(YAMLMapper yamlMapper) {
@@ -72,7 +74,7 @@ public void configurePathMatch(PathMatchConfigurer configurer) {
 
             @Override
             public void addCorsMappings(CorsRegistry registry) {
-                List<String> exports = Arrays.asList("/ui/**");
+
                 for(String prefix: exports) {
                     CorsRegistration cr = registry.addMapping(prefix);
                     cr.allowedOrigins(ALLOWED_ORIGIN);

common/gateway-balancer-common/src/main/java/com/codeabovelab/dm/gateway/proxy/common/BalancerConfiguration.java

@@ -125,7 +125,7 @@ public class BalancerConfiguration {
      */
     @Bean
     HttpProxy httpProxy() {
-        ProxyClient proxyClient = null;
+        ProxyClient proxyClient;
         if (async) {
             if (metricsEbanled) {
                 //Building HTTP Async client wrapper for gathering metrics