Got rid of some duplicated code

hibooboo2 · Jul 27, 2015 · 2e93f83 · 2e93f83
1 parent 119989e
commit 2e93f83
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 33 deletions.
diff --git a/...er/src/main/java/io/cattle/platform/servicediscovery/deployment/AbstractInstanceUnit.java b/...er/src/main/java/io/cattle/platform/servicediscovery/deployment/AbstractInstanceUnit.java
@@ -1,9 +1,12 @@
 package io.cattle.platform.servicediscovery.deployment;
 
+import static io.cattle.platform.core.model.tables.InstanceHostMapTable.INSTANCE_HOST_MAP;
 import io.cattle.platform.core.constants.HealthcheckConstants;
 import io.cattle.platform.core.constants.InstanceConstants;
 import io.cattle.platform.core.model.Instance;
+import io.cattle.platform.core.model.InstanceHostMap;
 import io.cattle.platform.core.model.Service;
+import io.cattle.platform.object.resource.ResourcePredicate;
 import io.cattle.platform.servicediscovery.deployment.impl.DeploymentManagerImpl;
 
 public abstract class AbstractInstanceUnit extends DeploymentUnitInstance implements InstanceUnit {
@@ -41,4 +44,17 @@ public void stop() {
     public boolean isHealthCheckInitializing() {
         return instance != null && HealthcheckConstants.HEALTH_STATE_INITIALIZING.equals(instance.getHealthState());
     }
+
+    @Override
+    public void waitForAllocate() {
+        if (this.instance != null) {
+            instance = context.resourceMonitor.waitFor(instance, new ResourcePredicate<Instance>() {
+                @Override
+                public boolean evaluate(Instance obj) {
+                    return context.objectManager.find(InstanceHostMap.class, INSTANCE_HOST_MAP.INSTANCE_ID,
+                            instance.getId()).size() > 0;
+                }
+            });
+        }
+    }
 }
diff --git a/...va/io/cattle/platform/servicediscovery/deployment/impl/DefaultDeploymentUnitInstance.java b/...va/io/cattle/platform/servicediscovery/deployment/impl/DefaultDeploymentUnitInstance.java
@@ -1,11 +1,8 @@
 package io.cattle.platform.servicediscovery.deployment.impl;
 
-import static io.cattle.platform.core.model.tables.InstanceHostMapTable.*;
-
 import io.cattle.platform.core.constants.CommonStatesConstants;
 import io.cattle.platform.core.constants.InstanceConstants;
 import io.cattle.platform.core.model.Instance;
-import io.cattle.platform.core.model.InstanceHostMap;
 import io.cattle.platform.core.model.Service;
 import io.cattle.platform.core.model.ServiceExposeMap;
 import io.cattle.platform.engine.process.impl.ProcessCancelException;
@@ -113,18 +110,5 @@ public void waitForNotTransitioning() {
             this.instance = context.resourceMonitor.waitForNotTransitioning(this.instance);
         }
     }
-
-    @Override
-    public void waitForAllocate() {
-        if (this.instance != null) {
-            instance = context.resourceMonitor.waitFor(instance, new ResourcePredicate<Instance>() {
-                @Override
-                public boolean evaluate(Instance obj) {
-                    return context.objectManager.find(InstanceHostMap.class, INSTANCE_HOST_MAP.INSTANCE_ID,
-                            instance.getId()).size() > 0;
-                }
-            });
-        }
-    }
 }
 
diff --git a/.../cattle/platform/servicediscovery/deployment/impl/LoadBalancerDeploymentUnitInstance.java b/.../cattle/platform/servicediscovery/deployment/impl/LoadBalancerDeploymentUnitInstance.java
@@ -1,13 +1,10 @@
 package io.cattle.platform.servicediscovery.deployment.impl;
 
-import static io.cattle.platform.core.model.tables.InstanceHostMapTable.*;
-import static io.cattle.platform.core.model.tables.LoadBalancerTable.*;
-
+import static io.cattle.platform.core.model.tables.LoadBalancerTable.LOAD_BALANCER;
 import io.cattle.platform.core.constants.CommonStatesConstants;
 import io.cattle.platform.core.constants.InstanceConstants;
 import io.cattle.platform.core.constants.LoadBalancerConstants;
 import io.cattle.platform.core.model.Instance;
-import io.cattle.platform.core.model.InstanceHostMap;
 import io.cattle.platform.core.model.LoadBalancer;
 import io.cattle.platform.core.model.LoadBalancerHostMap;
 import io.cattle.platform.core.model.Service;
@@ -106,17 +103,4 @@ public void waitForNotTransitioning() {
             this.hostMap = context.resourceMonitor.waitForNotTransitioning(this.hostMap);
         }
     }
-
-    @Override
-    public void waitForAllocate() {
-        if (this.instance != null) {
-            instance = context.resourceMonitor.waitFor(instance, new ResourcePredicate<Instance>() {
-                @Override
-                public boolean evaluate(Instance obj) {
-                    return context.objectManager.find(InstanceHostMap.class, INSTANCE_HOST_MAP.INSTANCE_ID,
-                            instance.getId()).size() > 0;
-                }
-            });
-        }
-    }
 }