SLIDER-254 update feature branch changes for java 6 compatibility
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/621d2cd4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/621d2cd4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/621d2cd4 Branch: refs/heads/feature/SLIDER-149_Support_a_YARN_service_registry Commit: 621d2cd474f01190462b26da28caaa16bedbe9cc Parents: c89b264 Author: Billie Rinaldi <billie.rina...@gmail.com> Authored: Mon Aug 25 15:02:24 2014 -0700 Committer: Billie Rinaldi <billie.rina...@gmail.com> Committed: Mon Aug 25 15:02:24 2014 -0700 ---------------------------------------------------------------------- .../src/main/java/org/apache/slider/client/SliderClient.java | 8 ++++---- .../src/main/java/org/apache/slider/core/conf/ConfTree.java | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/621d2cd4/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 1a372e7..2107838 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 @@ -483,7 +483,7 @@ public class SliderClient extends AbstractSliderLaunchedService implements RunSe c.set(CredentialProviderFactory.CREDENTIAL_PROVIDER_PATH, provider); CredentialProvider credentialProvider = CredentialProviderFactory.getProviders(c).get(0); - Set<String> existingAliases = new HashSet<>(credentialProvider.getAliases()); + Set<String> existingAliases = new HashSet<String>(credentialProvider.getAliases()); for (String alias : aliases) { if (existingAliases.contains(alias.toLowerCase())) { log.warn("Skipping creation of credentials for {}, " + @@ -710,16 +710,16 @@ public class SliderClient extends AbstractSliderLaunchedService implements RunSe @VisibleForTesting public static void replaceTokens(ConfTree conf, String userName, String clusterName) throws IOException { - Map<String,String> newglobal = new HashMap<>(); + Map<String,String> newglobal = new HashMap<String,String>(); for (Entry<String,String> entry : conf.global.entrySet()) { newglobal.put(entry.getKey(), replaceTokens(entry.getValue(), userName, clusterName)); } conf.global.putAll(newglobal); - Map<String,List<String>> newcred = new HashMap<>(); + Map<String,List<String>> newcred = new HashMap<String,List<String>>(); for (Entry<String,List<String>> entry : conf.credentials.entrySet()) { - List<String> resultList = new ArrayList<>(); + List<String> resultList = new ArrayList<String>(); for (String v : entry.getValue()) { resultList.add(replaceTokens(v, userName, clusterName)); } http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/621d2cd4/slider-core/src/main/java/org/apache/slider/core/conf/ConfTree.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/core/conf/ConfTree.java b/slider-core/src/main/java/org/apache/slider/core/conf/ConfTree.java index be7c56f..2af8d26 100644 --- a/slider-core/src/main/java/org/apache/slider/core/conf/ConfTree.java +++ b/slider-core/src/main/java/org/apache/slider/core/conf/ConfTree.java @@ -70,7 +70,7 @@ public final class ConfTree { * Credentials */ public Map<String, List<String>> credentials = - new HashMap<>(INITAL_MAP_CAPACITY); + new HashMap<String, List<String>>(INITAL_MAP_CAPACITY); /** * Role options,
