Repository: incubator-brooklyn Updated Branches: refs/heads/master 3a297d9aa -> bd84352d7
correct package imports for google guava Lists in recent vault work Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/bd84352d Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/bd84352d Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/bd84352d Branch: refs/heads/master Commit: bd84352d7945bec8c13ab770131ac6cd58fe2428 Parents: 3a297d9 Author: Alex Heneveld <[email protected]> Authored: Thu Nov 5 09:36:03 2015 -0800 Committer: Alex Heneveld <[email protected]> Committed: Thu Nov 5 09:38:22 2015 -0800 ---------------------------------------------------------------------- .../vault/VaultAppIdExternalConfigSupplier.java | 17 +++++++++-------- .../vault/VaultExternalConfigSupplier.java | 2 +- .../vault/VaultUserPassExternalConfigSupplier.java | 2 +- 3 files changed, 11 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/bd84352d/core/src/main/java/org/apache/brooklyn/core/config/external/vault/VaultAppIdExternalConfigSupplier.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/config/external/vault/VaultAppIdExternalConfigSupplier.java b/core/src/main/java/org/apache/brooklyn/core/config/external/vault/VaultAppIdExternalConfigSupplier.java index 6e9cd8b..95c9295 100644 --- a/core/src/main/java/org/apache/brooklyn/core/config/external/vault/VaultAppIdExternalConfigSupplier.java +++ b/core/src/main/java/org/apache/brooklyn/core/config/external/vault/VaultAppIdExternalConfigSupplier.java @@ -1,19 +1,20 @@ package org.apache.brooklyn.core.config.external.vault; -import com.google.api.client.util.Lists; -import com.google.common.base.Joiner; -import com.google.common.collect.ImmutableMap; -import com.google.gson.JsonObject; +import java.net.InetAddress; +import java.net.NetworkInterface; +import java.util.List; +import java.util.Map; + import org.apache.brooklyn.api.mgmt.ManagementContext; import org.apache.brooklyn.util.exceptions.Exceptions; import org.apache.brooklyn.util.text.Strings; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.net.InetAddress; -import java.net.NetworkInterface; -import java.util.List; -import java.util.Map; +import com.google.common.base.Joiner; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.Lists; +import com.google.gson.JsonObject; public class VaultAppIdExternalConfigSupplier extends VaultExternalConfigSupplier { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/bd84352d/core/src/main/java/org/apache/brooklyn/core/config/external/vault/VaultExternalConfigSupplier.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/config/external/vault/VaultExternalConfigSupplier.java b/core/src/main/java/org/apache/brooklyn/core/config/external/vault/VaultExternalConfigSupplier.java index 7fac134..eb332ca 100644 --- a/core/src/main/java/org/apache/brooklyn/core/config/external/vault/VaultExternalConfigSupplier.java +++ b/core/src/main/java/org/apache/brooklyn/core/config/external/vault/VaultExternalConfigSupplier.java @@ -15,9 +15,9 @@ import org.apache.http.client.HttpClient; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.google.api.client.util.Lists; import com.google.common.base.Joiner; import com.google.common.collect.ImmutableMap; +import com.google.common.collect.Lists; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.JsonObject; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/bd84352d/core/src/main/java/org/apache/brooklyn/core/config/external/vault/VaultUserPassExternalConfigSupplier.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/config/external/vault/VaultUserPassExternalConfigSupplier.java b/core/src/main/java/org/apache/brooklyn/core/config/external/vault/VaultUserPassExternalConfigSupplier.java index a5d47e2..45ed0b0 100644 --- a/core/src/main/java/org/apache/brooklyn/core/config/external/vault/VaultUserPassExternalConfigSupplier.java +++ b/core/src/main/java/org/apache/brooklyn/core/config/external/vault/VaultUserPassExternalConfigSupplier.java @@ -6,9 +6,9 @@ import java.util.Map; import org.apache.brooklyn.api.mgmt.ManagementContext; import org.apache.brooklyn.util.text.Strings; -import com.google.api.client.util.Lists; import com.google.common.base.Joiner; import com.google.common.collect.ImmutableMap; +import com.google.common.collect.Lists; import com.google.gson.JsonObject; public class VaultUserPassExternalConfigSupplier extends VaultExternalConfigSupplier {
