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 2014/08/01 22:12:58 UTC
[3/8] git commit: Deprecate EntitySpec.id and LocationSpec.id
Deprecate EntitySpec.id and LocationSpec.id
- Just let the management context decide what the id should be.
- Rebind goes through a different path.
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/91383179
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/91383179
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/91383179
Branch: refs/heads/master
Commit: 91383179bff219989c0f4a4f90d5f3d7e0360e94
Parents: 519bc9a
Author: Aled Sage <al...@gmail.com>
Authored: Mon Jul 14 12:47:25 2014 +0100
Committer: Aled Sage <al...@gmail.com>
Committed: Mon Jul 14 23:45:19 2014 +0100
----------------------------------------------------------------------
api/src/main/java/brooklyn/entity/proxying/EntitySpec.java | 7 +++++++
api/src/main/java/brooklyn/location/LocationSpec.java | 7 +++++++
.../src/test/java/brooklyn/entity/basic/DynamicGroupTest.java | 2 +-
3 files changed, 15 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/91383179/api/src/main/java/brooklyn/entity/proxying/EntitySpec.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/brooklyn/entity/proxying/EntitySpec.java b/api/src/main/java/brooklyn/entity/proxying/EntitySpec.java
index 1ea5fb6..2f67dbd 100644
--- a/api/src/main/java/brooklyn/entity/proxying/EntitySpec.java
+++ b/api/src/main/java/brooklyn/entity/proxying/EntitySpec.java
@@ -158,7 +158,10 @@ public class EntitySpec<T extends Entity> implements Serializable {
/**
* @return The id to use when creating the entity, or null if allow brooklyn to generate a unique id.
+ /**
+ * @deprecated since 0.7.0; instead let the management context pick a random+unique id
*/
+ @Deprecated
public String getId() {
return id;
}
@@ -240,6 +243,10 @@ public class EntitySpec<T extends Entity> implements Serializable {
return locations;
}
+ /**
+ * @deprecated since 0.7.0; instead let the management context pick a random+unique id
+ */
+ @Deprecated
public EntitySpec<T> id(String val) {
checkMutable();
id = val;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/91383179/api/src/main/java/brooklyn/location/LocationSpec.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/brooklyn/location/LocationSpec.java b/api/src/main/java/brooklyn/location/LocationSpec.java
index d9027b5..6f767c2 100644
--- a/api/src/main/java/brooklyn/location/LocationSpec.java
+++ b/api/src/main/java/brooklyn/location/LocationSpec.java
@@ -90,6 +90,10 @@ public class LocationSpec<T extends Location> implements Serializable {
this.type = type;
}
+ /**
+ * @deprecated since 0.7.0; instead let the management context pick a random+unique id
+ */
+ @Deprecated
public LocationSpec<T> id(String val) {
id = val;
return this;
@@ -164,7 +168,10 @@ public class LocationSpec<T extends Location> implements Serializable {
/**
* @return The id of the location to be created, or null if brooklyn can auto-generate an id
+ *
+ * @deprecated since 0.7.0; instead let the management context pick a random+unique id
*/
+ @Deprecated
public String getId() {
return id;
}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/91383179/core/src/test/java/brooklyn/entity/basic/DynamicGroupTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/brooklyn/entity/basic/DynamicGroupTest.java b/core/src/test/java/brooklyn/entity/basic/DynamicGroupTest.java
index 1491210..00ed47a 100644
--- a/core/src/test/java/brooklyn/entity/basic/DynamicGroupTest.java
+++ b/core/src/test/java/brooklyn/entity/basic/DynamicGroupTest.java
@@ -293,7 +293,7 @@ public class DynamicGroupTest {
});
for (int i = 0; i < NUM_CYCLES; i++) {
- final TestEntity entity = app.createAndManageChild(EntitySpec.create(TestEntity.class).id("entity-" + i));
+ final TestEntity entity = app.createAndManageChild(EntitySpec.create(TestEntity.class));
LOG.debug("Created: entity {}", i);
Asserts.succeedsEventually(new Runnable() {
public void run() {