You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2015/11/05 18:33:35 UTC
incubator-brooklyn git commit: update vault for HttpTool change,
and fix warnings there
Repository: incubator-brooklyn
Updated Branches:
refs/heads/master 40de86652 -> 3a297d9aa
update vault for HttpTool change, and fix warnings there
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/3a297d9a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/3a297d9a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/3a297d9a
Branch: refs/heads/master
Commit: 3a297d9aaab17a3980d43e0136b267b18e903166
Parents: 40de866
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Thu Nov 5 09:33:10 2015 -0800
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Thu Nov 5 09:33:27 2015 -0800
----------------------------------------------------------------------
.../vault/VaultExternalConfigSupplier.java | 23 ++++++++++----------
.../vault/VaultTokenExternalConfigSupplier.java | 8 +++----
.../VaultUserPassExternalConfigSupplier.java | 13 +++++------
3 files changed, 21 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3a297d9a/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 031ee8e..7fac134 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
@@ -1,25 +1,26 @@
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.Gson;
-import com.google.gson.GsonBuilder;
-import com.google.gson.JsonObject;
+import java.io.UnsupportedEncodingException;
+import java.util.List;
+import java.util.Map;
+
import org.apache.brooklyn.api.mgmt.ManagementContext;
import org.apache.brooklyn.core.config.external.AbstractExternalConfigSupplier;
-import org.apache.brooklyn.util.core.http.HttpTool;
-import org.apache.brooklyn.util.core.http.HttpToolResponse;
import org.apache.brooklyn.util.exceptions.Exceptions;
+import org.apache.brooklyn.util.http.HttpTool;
+import org.apache.brooklyn.util.http.HttpToolResponse;
import org.apache.brooklyn.util.net.Urls;
import org.apache.brooklyn.util.text.Strings;
import org.apache.http.client.HttpClient;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.io.UnsupportedEncodingException;
-import java.util.List;
-import java.util.Map;
+import com.google.api.client.util.Lists;
+import com.google.common.base.Joiner;
+import com.google.common.collect.ImmutableMap;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.JsonObject;
public abstract class VaultExternalConfigSupplier extends AbstractExternalConfigSupplier {
public static final String CHARSET_NAME = "UTF-8";
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3a297d9a/core/src/main/java/org/apache/brooklyn/core/config/external/vault/VaultTokenExternalConfigSupplier.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/config/external/vault/VaultTokenExternalConfigSupplier.java b/core/src/main/java/org/apache/brooklyn/core/config/external/vault/VaultTokenExternalConfigSupplier.java
index ed994b4..2e3709c 100644
--- a/core/src/main/java/org/apache/brooklyn/core/config/external/vault/VaultTokenExternalConfigSupplier.java
+++ b/core/src/main/java/org/apache/brooklyn/core/config/external/vault/VaultTokenExternalConfigSupplier.java
@@ -1,13 +1,11 @@
package org.apache.brooklyn.core.config.external.vault;
-import com.google.common.collect.ImmutableMap;
-import org.apache.brooklyn.api.mgmt.ManagementContext;
-import org.apache.brooklyn.core.config.external.ExternalConfigSupplier;
-import org.apache.brooklyn.util.text.Strings;
+import static com.google.common.base.Preconditions.checkArgument;
import java.util.Map;
-import static com.google.common.base.Preconditions.checkArgument;
+import org.apache.brooklyn.api.mgmt.ManagementContext;
+import org.apache.brooklyn.util.text.Strings;
public class VaultTokenExternalConfigSupplier extends VaultExternalConfigSupplier {
public VaultTokenExternalConfigSupplier(ManagementContext managementContext, String name, Map<String, String> config) {
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3a297d9a/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 c43ab90..a5d47e2 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
@@ -1,16 +1,15 @@
package org.apache.brooklyn.core.config.external.vault;
+import java.util.List;
+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.gson.JsonObject;
-import org.apache.brooklyn.api.mgmt.ManagementContext;
-import org.apache.brooklyn.util.text.Strings;
-
-import java.util.List;
-import java.util.Map;
-
-import static com.google.common.base.Preconditions.checkArgument;
public class VaultUserPassExternalConfigSupplier extends VaultExternalConfigSupplier {
public VaultUserPassExternalConfigSupplier(ManagementContext managementContext, String name, Map<String, String> config) {