resolved merge issues caused by release dependency updates

seboudry · Mar 13, 2017 · 3f15603 · 3f15603
1 parent 4076b8d
commit 3f15603
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/camel-master/src/main/java/io/fabric8/camel/master/KubernetesLock.java b/camel-master/src/main/java/io/fabric8/camel/master/KubernetesLock.java
@@ -27,8 +27,8 @@
 import io.fabric8.kubernetes.client.KubernetesClientException;
 import io.fabric8.kubernetes.client.Watch;
 import io.fabric8.kubernetes.client.Watcher;
-import io.fabric8.kubernetes.client.dsl.ClientPodResource;
-import io.fabric8.kubernetes.client.dsl.ClientResource;
+import io.fabric8.kubernetes.client.dsl.PodResource;
+import io.fabric8.kubernetes.client.dsl.Resource;
 import io.fabric8.utils.Strings;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -83,7 +83,7 @@ protected static boolean isEmpty(String ownerPodId) {
      * gets the lock
      */
     public void tryAcquireLock() {
-        ClientResource<ConfigMap, DoneableConfigMap> configMapResource = client.configMaps().inNamespace(namespace).withName(configMapName);
+        Resource<ConfigMap, DoneableConfigMap> configMapResource = client.configMaps().inNamespace(namespace).withName(configMapName);
         boolean retry = false;
         do {
             retry = false;
@@ -137,7 +137,7 @@ public void onClose(KubernetesClientException e) {
                 final String deadPodName = currentOwnerPodName;
                 LOG.info("Pod " + deadPodName + " has the lock for endpoint: " + endpointName + " in ConfigMap " + configMapName + " so lets watch it...");
 
-                ClientPodResource<Pod, DoneablePod> podResource = client.pods().inNamespace(namespace).withName(currentOwnerPodName);
+                PodResource<Pod, DoneablePod> podResource = client.pods().inNamespace(namespace).withName(currentOwnerPodName);
                 podWatch = podResource.watch(new Watcher<Pod>() {
                     @Override
                     public void eventReceived(Action action, Pod pod) {

diff --git a/camel-master/src/test/java/io/fabric8/camel/master/KubernetesLockTest.java b/camel-master/src/test/java/io/fabric8/camel/master/KubernetesLockTest.java
@@ -13,7 +13,7 @@
 import io.fabric8.kubernetes.client.NamespacedKubernetesClient;
 import io.fabric8.kubernetes.client.Watch;
 import io.fabric8.kubernetes.client.Watcher;
-import io.fabric8.kubernetes.client.dsl.ClientMixedOperation;
+import io.fabric8.kubernetes.client.dsl.MixedOperation;
 
 import io.fabric8.openshift.server.mock.OpenShiftMockServer;
 import org.junit.Before;
@@ -80,7 +80,7 @@ public void  testLcokAcquiredOrRetry() throws Exception {
        /* MockResource<ConfigMap, MockDoneableConfigMap, Boolean> resource = mock.configMaps().inNamespace(TEST_NAMESPACE).withName(TEST_CONFIG_MAP_NAME);
         Field delegate = BaseMockOperation.class.getDeclaredField("delegate");
         delegate.setAccessible(true);
-        ClientMixedOperation delegateResource = (ClientMixedOperation)delegate.get(resource);
+        MixedOperation delegateResource = (MixedOperation)delegate.get(resource);
         IExpectationSetters<Object> expect = EasyMock.expect(delegateResource.patch(cm));
         expect.andThrow(new RuntimeException("Failed patching of a resource")).once();
         expect.andReturn(cm).times(1);