[1/4] incubator-slider git commit: SLIDER-878 move AMWebClient to using BaseRestClient for its REST operations. This drops the http/https logic
Repository: incubator-slider Updated Branches: refs/heads/develop ed7b52eab - 92b299a6d SLIDER-878 move AMWebClient to using BaseRestClient for its REST operations. This drops the http/https logic Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/e95d516a Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/e95d516a Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/e95d516a Branch: refs/heads/develop Commit: e95d516a336ad1a09418559733cd6d8ee8f16a2e Parents: 6263573 Author: Steve Loughran ste...@apache.org Authored: Thu May 21 21:57:33 2015 +0100 Committer: Steve Loughran ste...@apache.org Committed: Thu May 21 21:57:33 2015 +0100 -- .../funtest/accumulo/AccumuloBasicIT.groovy | 4 +- .../org/apache/slider/client/SliderClient.java | 8 ++-- .../slider/client/rest/BaseRestClient.java | 19 ++--- .../core/registry/retrieve/AMWebClient.java | 27 - .../registry/retrieve/RegistryRetriever.java| 14 +++ .../core/restclient/UgiJerseyBinding.java | 42 .../TestStandaloneYarnRegistryAM.groovy | 2 +- 7 files changed, 67 insertions(+), 49 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/e95d516a/app-packages/accumulo/src/test/groovy/org/apache/slider/funtest/accumulo/AccumuloBasicIT.groovy -- diff --git a/app-packages/accumulo/src/test/groovy/org/apache/slider/funtest/accumulo/AccumuloBasicIT.groovy b/app-packages/accumulo/src/test/groovy/org/apache/slider/funtest/accumulo/AccumuloBasicIT.groovy index f0504e4..56014d7 100644 --- a/app-packages/accumulo/src/test/groovy/org/apache/slider/funtest/accumulo/AccumuloBasicIT.groovy +++ b/app-packages/accumulo/src/test/groovy/org/apache/slider/funtest/accumulo/AccumuloBasicIT.groovy @@ -174,7 +174,9 @@ class AccumuloBasicIT extends AccumuloAgentCommandTestBase { SliderKeys.APP_TYPE, clusterName); ServiceRecord instance = sliderClient.resolve(path) -RegistryRetriever retriever = new RegistryRetriever(instance) +RegistryRetriever retriever = new RegistryRetriever( +sliderClient.config, +instance) PublishedConfiguration configuration = retriever.retrieveConfiguration( retriever.getConfigurations(true), exportName, true) return configuration http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/e95d516a/slider-core/src/main/java/org/apache/slider/client/SliderClient.java -- diff --git a/slider-core/src/main/java/org/apache/slider/client/SliderClient.java b/slider-core/src/main/java/org/apache/slider/client/SliderClient.java index 98f1344..4380173 100644 --- a/slider-core/src/main/java/org/apache/slider/client/SliderClient.java +++ b/slider-core/src/main/java/org/apache/slider/client/SliderClient.java @@ -3937,7 +3937,7 @@ public class SliderClient extends AbstractSliderLaunchedService implements RunSe ServiceRecord instance = lookupServiceRecord(registryArgs); -RegistryRetriever retriever = new RegistryRetriever(instance); +RegistryRetriever retriever = new RegistryRetriever(getConfig(), instance); PublishedConfigSet configurations = retriever.getConfigurations(!registryArgs.internal); PrintStream out = null; @@ -3977,7 +3977,7 @@ public class SliderClient extends AbstractSliderLaunchedService implements RunSe throws YarnException, IOException { ServiceRecord instance = lookupServiceRecord(registryArgs); -RegistryRetriever retriever = new RegistryRetriever(instance); +RegistryRetriever retriever = new RegistryRetriever(getConfig(), instance); PublishedExportsSet exports = retriever.getExports(!registryArgs.internal); PrintStream out = null; @@ -4025,7 +4025,7 @@ public class SliderClient extends AbstractSliderLaunchedService implements RunSe throws YarnException, IOException { ServiceRecord instance = lookupServiceRecord(registryArgs); -RegistryRetriever retriever = new RegistryRetriever(instance); +RegistryRetriever retriever = new RegistryRetriever(getConfig(), instance); boolean external = !registryArgs.internal; PublishedConfigSet configurations = retriever.getConfigurations(external); @@ -4050,7 +4050,7 @@ public class SliderClient extends AbstractSliderLaunchedService implements RunSe throws YarnException, IOException { ServiceRecord instance = lookupServiceRecord(registryArgs); -RegistryRetriever retriever = new RegistryRetriever(instance); +RegistryRetriever retriever = new RegistryRetriever(getConfig(), instance); boolean external =
incubator-slider git commit: SLIDER-878 move AMWebClient to using BaseRestClient for its REST operations. This drops the http/https logic
Repository: incubator-slider Updated Branches: refs/heads/feature/SLIDER-878-jersey-jdk8 6263573dc - e95d516a3 SLIDER-878 move AMWebClient to using BaseRestClient for its REST operations. This drops the http/https logic Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/e95d516a Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/e95d516a Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/e95d516a Branch: refs/heads/feature/SLIDER-878-jersey-jdk8 Commit: e95d516a336ad1a09418559733cd6d8ee8f16a2e Parents: 6263573 Author: Steve Loughran ste...@apache.org Authored: Thu May 21 21:57:33 2015 +0100 Committer: Steve Loughran ste...@apache.org Committed: Thu May 21 21:57:33 2015 +0100 -- .../funtest/accumulo/AccumuloBasicIT.groovy | 4 +- .../org/apache/slider/client/SliderClient.java | 8 ++-- .../slider/client/rest/BaseRestClient.java | 19 ++--- .../core/registry/retrieve/AMWebClient.java | 27 - .../registry/retrieve/RegistryRetriever.java| 14 +++ .../core/restclient/UgiJerseyBinding.java | 42 .../TestStandaloneYarnRegistryAM.groovy | 2 +- 7 files changed, 67 insertions(+), 49 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/e95d516a/app-packages/accumulo/src/test/groovy/org/apache/slider/funtest/accumulo/AccumuloBasicIT.groovy -- diff --git a/app-packages/accumulo/src/test/groovy/org/apache/slider/funtest/accumulo/AccumuloBasicIT.groovy b/app-packages/accumulo/src/test/groovy/org/apache/slider/funtest/accumulo/AccumuloBasicIT.groovy index f0504e4..56014d7 100644 --- a/app-packages/accumulo/src/test/groovy/org/apache/slider/funtest/accumulo/AccumuloBasicIT.groovy +++ b/app-packages/accumulo/src/test/groovy/org/apache/slider/funtest/accumulo/AccumuloBasicIT.groovy @@ -174,7 +174,9 @@ class AccumuloBasicIT extends AccumuloAgentCommandTestBase { SliderKeys.APP_TYPE, clusterName); ServiceRecord instance = sliderClient.resolve(path) -RegistryRetriever retriever = new RegistryRetriever(instance) +RegistryRetriever retriever = new RegistryRetriever( +sliderClient.config, +instance) PublishedConfiguration configuration = retriever.retrieveConfiguration( retriever.getConfigurations(true), exportName, true) return configuration http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/e95d516a/slider-core/src/main/java/org/apache/slider/client/SliderClient.java -- diff --git a/slider-core/src/main/java/org/apache/slider/client/SliderClient.java b/slider-core/src/main/java/org/apache/slider/client/SliderClient.java index 98f1344..4380173 100644 --- a/slider-core/src/main/java/org/apache/slider/client/SliderClient.java +++ b/slider-core/src/main/java/org/apache/slider/client/SliderClient.java @@ -3937,7 +3937,7 @@ public class SliderClient extends AbstractSliderLaunchedService implements RunSe ServiceRecord instance = lookupServiceRecord(registryArgs); -RegistryRetriever retriever = new RegistryRetriever(instance); +RegistryRetriever retriever = new RegistryRetriever(getConfig(), instance); PublishedConfigSet configurations = retriever.getConfigurations(!registryArgs.internal); PrintStream out = null; @@ -3977,7 +3977,7 @@ public class SliderClient extends AbstractSliderLaunchedService implements RunSe throws YarnException, IOException { ServiceRecord instance = lookupServiceRecord(registryArgs); -RegistryRetriever retriever = new RegistryRetriever(instance); +RegistryRetriever retriever = new RegistryRetriever(getConfig(), instance); PublishedExportsSet exports = retriever.getExports(!registryArgs.internal); PrintStream out = null; @@ -4025,7 +4025,7 @@ public class SliderClient extends AbstractSliderLaunchedService implements RunSe throws YarnException, IOException { ServiceRecord instance = lookupServiceRecord(registryArgs); -RegistryRetriever retriever = new RegistryRetriever(instance); +RegistryRetriever retriever = new RegistryRetriever(getConfig(), instance); boolean external = !registryArgs.internal; PublishedConfigSet configurations = retriever.getConfigurations(external); @@ -4050,7 +4050,7 @@ public class SliderClient extends AbstractSliderLaunchedService implements RunSe throws YarnException, IOException { ServiceRecord instance = lookupServiceRecord(registryArgs); -RegistryRetriever retriever = new RegistryRetriever(instance); +RegistryRetriever retriever = new RegistryRetriever(getConfig(),