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 2016/02/01 18:46:05 UTC
[02/50] brooklyn-library git commit: cleanup in response to code
review, providing explicit StructuredModifications for List and Map ConfigKey,
moving Config interfaces to brooklyn.config, and IdGenerator to Identifiers
cleanup in response to code review, providing explicit StructuredModifications for List and Map ConfigKey, moving Config interfaces to brooklyn.config, and IdGenerator to Identifiers
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-library/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-library/commit/0ba43401
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-library/tree/0ba43401
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-library/diff/0ba43401
Branch: refs/heads/0.4.0
Commit: 0ba434013f6bd119fcb8f29936c58ba3173531a1
Parents: cc497c0
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Wed Sep 19 00:20:35 2012 +0100
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Wed Sep 19 00:20:35 2012 +0100
----------------------------------------------------------------------
.../src/main/java/brooklyn/rest/resources/CatalogResource.java | 2 +-
.../java/brooklyn/entity/database/mysql/MySqlSshDriver.groovy | 6 +++---
.../brooklyn/entity/dns/geoscaling/GeoscalingDnsService.groovy | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/0ba43401/sandbox/rest/src/main/java/brooklyn/rest/resources/CatalogResource.java
----------------------------------------------------------------------
diff --git a/sandbox/rest/src/main/java/brooklyn/rest/resources/CatalogResource.java b/sandbox/rest/src/main/java/brooklyn/rest/resources/CatalogResource.java
index b3732a9..0882a02 100644
--- a/sandbox/rest/src/main/java/brooklyn/rest/resources/CatalogResource.java
+++ b/sandbox/rest/src/main/java/brooklyn/rest/resources/CatalogResource.java
@@ -25,7 +25,7 @@ import javax.ws.rs.core.Response;
import org.reflections.Reflections;
-import brooklyn.entity.ConfigKey;
+import brooklyn.config.ConfigKey;
import brooklyn.entity.Entity;
import brooklyn.entity.basic.AbstractEntity;
import brooklyn.policy.basic.AbstractPolicy;
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/0ba43401/software/database/src/main/java/brooklyn/entity/database/mysql/MySqlSshDriver.groovy
----------------------------------------------------------------------
diff --git a/software/database/src/main/java/brooklyn/entity/database/mysql/MySqlSshDriver.groovy b/software/database/src/main/java/brooklyn/entity/database/mysql/MySqlSshDriver.groovy
index 9e393bc..81c8001 100644
--- a/software/database/src/main/java/brooklyn/entity/database/mysql/MySqlSshDriver.groovy
+++ b/software/database/src/main/java/brooklyn/entity/database/mysql/MySqlSshDriver.groovy
@@ -10,8 +10,8 @@ import brooklyn.location.basic.SshMachineLocation
import brooklyn.location.basic.BasicOsDetails.OsArchs
import brooklyn.location.basic.BasicOsDetails.OsVersions
import brooklyn.util.ComparableVersion
-import brooklyn.util.IdGenerator;
import brooklyn.util.ResourceUtils
+import brooklyn.util.text.Identifiers;
/**
* The SSH implementation of the {@link MySlDriver}.
@@ -73,8 +73,8 @@ public class MySqlSshDriver extends AbstractSoftwareProcessSshDriver implements
body.append(commands).execute();
}
- final String socketUid = IdGenerator.makeRandomId(6);
- String secretPassword = IdGenerator.makeRandomId(6);
+ final String socketUid = Identifiers.makeRandomId(6);
+ String secretPassword = Identifiers.makeRandomId(6);
public String getPassword() { secretPassword }
public MySqlNode getEntity() { return super.getEntity() }
public int getPort() { return entity.port }
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/0ba43401/software/webapp/src/main/java/brooklyn/entity/dns/geoscaling/GeoscalingDnsService.groovy
----------------------------------------------------------------------
diff --git a/software/webapp/src/main/java/brooklyn/entity/dns/geoscaling/GeoscalingDnsService.groovy b/software/webapp/src/main/java/brooklyn/entity/dns/geoscaling/GeoscalingDnsService.groovy
index daa181b..3fb2c5f 100644
--- a/software/webapp/src/main/java/brooklyn/entity/dns/geoscaling/GeoscalingDnsService.groovy
+++ b/software/webapp/src/main/java/brooklyn/entity/dns/geoscaling/GeoscalingDnsService.groovy
@@ -15,8 +15,8 @@ import brooklyn.entity.dns.geoscaling.GeoscalingWebClient.SmartSubdomain
import brooklyn.event.basic.BasicAttributeSensor
import brooklyn.event.basic.BasicConfigKey
import brooklyn.location.geo.HostGeoInfo
-import brooklyn.util.IdGenerator
import brooklyn.util.flags.SetFromFlag
+import brooklyn.util.text.Identifiers;
class GeoscalingDnsService extends AbstractGeoDnsService {
@@ -83,7 +83,7 @@ class GeoscalingDnsService extends AbstractGeoDnsService {
// if no smart subdomain specified, but random is, use something random
if (smartSubdomainName) smartSubdomainName += "-";
else smartSubdomainName = "";
- smartSubdomainName += IdGenerator.makeRandomId(8);
+ smartSubdomainName += Identifiers.makeRandomId(8);
}
checkNotNull(smartSubdomainName, "The GeoScaling smart subdomain name is not specified or randomized");