Repository: incubator-brooklyn Updated Branches: refs/heads/master bdcc5ced6 -> 44755eb12
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4d08310c/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlRebindTest.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlRebindTest.java b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlRebindTest.java index 2956478..cfc8ae1 100644 --- a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlRebindTest.java +++ b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlRebindTest.java @@ -161,8 +161,8 @@ public class CatalogYamlRebindTest extends AbstractYamlRebindTest { "- type: "+CatalogUtils.getVersionedId(appSymbolicName, appVersion); origApp = (StartableApplication) createAndStartApplication(yaml); BasicEntity origEntity = (BasicEntity) Iterables.getOnlyElement(origApp.getChildren()); - TestPolicy origPolicy = (TestPolicy) Iterables.getOnlyElement(origEntity.getPolicies()); - TestEnricher origEnricher = (TestEnricher) Iterables.tryFind(origEntity.getEnrichers(), Predicates.instanceOf(TestEnricher.class)).get(); + TestPolicy origPolicy = (TestPolicy) Iterables.getOnlyElement(origEntity.policies()); + TestEnricher origEnricher = (TestEnricher) Iterables.tryFind(origEntity.enrichers(), Predicates.instanceOf(TestEnricher.class)).get(); assertEquals(origEntity.getCatalogItemId(), appSymbolicName+":"+appVersion); // Depending on test-mode, delete the catalog item, and then rebind @@ -223,8 +223,8 @@ public class CatalogYamlRebindTest extends AbstractYamlRebindTest { // Ensure app is still there, and that it is usabe - e.g. "stop" effector functions as expected BasicEntity newEntity = (BasicEntity) Iterables.getOnlyElement(newApp.getChildren()); - Policy newPolicy = Iterables.getOnlyElement(newEntity.getPolicies()); - Enricher newEnricher = Iterables.tryFind(newEntity.getEnrichers(), Predicates.instanceOf(TestEnricher.class)).get(); + Policy newPolicy = Iterables.getOnlyElement(newEntity.policies()); + Enricher newEnricher = Iterables.tryFind(newEntity.enrichers(), Predicates.instanceOf(TestEnricher.class)).get(); assertEquals(newEntity.getCatalogItemId(), appSymbolicName+":"+appVersion); newApp.stop(); http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4d08310c/usage/launcher/src/test/java/org/apache/brooklyn/entity/brooklynnode/BrooklynEntityMirrorIntegrationTest.java ---------------------------------------------------------------------- diff --git a/usage/launcher/src/test/java/org/apache/brooklyn/entity/brooklynnode/BrooklynEntityMirrorIntegrationTest.java b/usage/launcher/src/test/java/org/apache/brooklyn/entity/brooklynnode/BrooklynEntityMirrorIntegrationTest.java index 1f3eb8e..c3c94bc 100644 --- a/usage/launcher/src/test/java/org/apache/brooklyn/entity/brooklynnode/BrooklynEntityMirrorIntegrationTest.java +++ b/usage/launcher/src/test/java/org/apache/brooklyn/entity/brooklynnode/BrooklynEntityMirrorIntegrationTest.java @@ -111,7 +111,7 @@ public class BrooklynEntityMirrorIntegrationTest { String catalogItemId = "test-catalog-item:1.0"; String catalogItemIdGA = "test-catalog-item:1.0-GA"; - serverApp.setAttribute(TestApplication.MY_ATTRIBUTE, "austria"); + serverApp.sensors().set(TestApplication.MY_ATTRIBUTE, "austria"); serverApp.setCatalogItemId(catalogItemId); String serviceId = serverApp.getId(); @@ -127,7 +127,7 @@ public class BrooklynEntityMirrorIntegrationTest { assertTrue(mirror.getAttribute(BrooklynEntityMirror.MIRROR_SUMMARY) != null, "entity summary is null"); log.info("Sensors mirrored are: "+((EntityInternal)mirror).getAllAttributes()); - serverApp.setAttribute(TestApplication.MY_ATTRIBUTE, "bermuda"); + serverApp.sensors().set(TestApplication.MY_ATTRIBUTE, "bermuda"); serverApp.setCatalogItemId(catalogItemIdGA); EntityTestUtils.assertAttributeEqualsEventually(mirror, TestApplication.MY_ATTRIBUTE, "bermuda"); EntityTestUtils.assertAttributeEqualsEventually(mirror, BrooklynEntityMirror.MIRROR_CATALOG_ITEM_ID, catalogItemIdGA); @@ -148,7 +148,7 @@ public class BrooklynEntityMirrorIntegrationTest { // check auth is required HttpTestUtils.assertHttpStatusCodeEquals(getBaseUri(), 401); - serverApp.setAttribute(TestApplication.MY_ATTRIBUTE, "austria"); + serverApp.sensors().set(TestApplication.MY_ATTRIBUTE, "austria"); String serviceId = serverApp.getId(); Entity mirror = localApp.addChild(EntitySpec.create(BrooklynEntityMirror.class) @@ -163,7 +163,7 @@ public class BrooklynEntityMirrorIntegrationTest { EntityTestUtils.assertAttributeEqualsEventually(mirror, TestApplication.MY_ATTRIBUTE, "austria"); log.info("Sensors mirrored are: "+((EntityInternal)mirror).getAllAttributes()); - serverApp.setAttribute(TestApplication.MY_ATTRIBUTE, "bermuda"); + serverApp.sensors().set(TestApplication.MY_ATTRIBUTE, "bermuda"); EntityTestUtils.assertAttributeEqualsEventually(mirror, TestApplication.MY_ATTRIBUTE, "bermuda"); serverApp.stop(); http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4d08310c/usage/launcher/src/test/java/org/apache/brooklyn/entity/brooklynnode/BrooklynNodeRestTest.java ---------------------------------------------------------------------- diff --git a/usage/launcher/src/test/java/org/apache/brooklyn/entity/brooklynnode/BrooklynNodeRestTest.java b/usage/launcher/src/test/java/org/apache/brooklyn/entity/brooklynnode/BrooklynNodeRestTest.java index e6e3fbb..37b45c3 100644 --- a/usage/launcher/src/test/java/org/apache/brooklyn/entity/brooklynnode/BrooklynNodeRestTest.java +++ b/usage/launcher/src/test/java/org/apache/brooklyn/entity/brooklynnode/BrooklynNodeRestTest.java @@ -109,7 +109,7 @@ public class BrooklynNodeRestTest { EntityTestUtils.assertAttributeEqualsEventually(mirror, Attributes.SERVICE_UP, true); - ((EntityInternal)newApp).setAttribute(TestEntity.NAME, "foo"); + ((EntityInternal)newApp).sensors().set(TestEntity.NAME, "foo"); EntityTestUtils.assertAttributeEqualsEventually(mirror, TestEntity.NAME, "foo"); log.info("Mirror successfully validated"); http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4d08310c/usage/qa/src/main/java/org/apache/brooklyn/qa/load/SimulatedJBoss7ServerImpl.java ---------------------------------------------------------------------- diff --git a/usage/qa/src/main/java/org/apache/brooklyn/qa/load/SimulatedJBoss7ServerImpl.java b/usage/qa/src/main/java/org/apache/brooklyn/qa/load/SimulatedJBoss7ServerImpl.java index a050fd8..ed00f61 100644 --- a/usage/qa/src/main/java/org/apache/brooklyn/qa/load/SimulatedJBoss7ServerImpl.java +++ b/usage/qa/src/main/java/org/apache/brooklyn/qa/load/SimulatedJBoss7ServerImpl.java @@ -106,11 +106,11 @@ public class SimulatedJBoss7ServerImpl extends JBoss7ServerImpl { String managementUri = String.format("http://%s:%s/management/subsystem/web/connector/http/read-resource";, hp.getHostText(), hp.getPort()); - setAttribute(MANAGEMENT_URL, managementUri); + sensors().set(MANAGEMENT_URL, managementUri); if (simulateExternalMonitoring) { // TODO What would set this normally, if not doing connectServiceUpIsRunning? - setAttribute(SERVICE_PROCESS_IS_RUNNING, true); + sensors().set(SERVICE_PROCESS_IS_RUNNING, true); } else { // if simulating entity, then simulate work of periodic HTTP request; TODO but not parsing JSON response String uriToPoll = (simulateEntity) ? "http://localhost:8081"; : managementUri; @@ -135,17 +135,17 @@ public class SimulatedJBoss7ServerImpl extends JBoss7ServerImpl { .callable(new Callable<Boolean>() { private int counter = 0; public Boolean call() { - setAttribute(REQUEST_COUNT, (counter++ % 100)); - setAttribute(ERROR_COUNT, (counter++ % 100)); - setAttribute(TOTAL_PROCESSING_TIME, (counter++ % 100)); - setAttribute(MAX_PROCESSING_TIME, (counter++ % 100)); - setAttribute(BYTES_RECEIVED, (long) (counter++ % 100)); - setAttribute(BYTES_SENT, (long) (counter++ % 100)); + sensors().set(REQUEST_COUNT, (counter++ % 100)); + sensors().set(ERROR_COUNT, (counter++ % 100)); + sensors().set(TOTAL_PROCESSING_TIME, (counter++ % 100)); + sensors().set(MAX_PROCESSING_TIME, (counter++ % 100)); + sensors().set(BYTES_RECEIVED, (long) (counter++ % 100)); + sensors().set(BYTES_SENT, (long) (counter++ % 100)); return true; }})) .build(); - addEnricher(Enrichers.builder().updatingMap(Attributes.SERVICE_NOT_UP_INDICATORS) + enrichers().add(Enrichers.builder().updatingMap(Attributes.SERVICE_NOT_UP_INDICATORS) .from(MANAGEMENT_URL_UP) .computing(Functionals.ifNotEquals(true).value("Management URL not reachable") ) .build()); http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4d08310c/usage/qa/src/main/java/org/apache/brooklyn/qa/load/SimulatedMySqlNodeImpl.java ---------------------------------------------------------------------- diff --git a/usage/qa/src/main/java/org/apache/brooklyn/qa/load/SimulatedMySqlNodeImpl.java b/usage/qa/src/main/java/org/apache/brooklyn/qa/load/SimulatedMySqlNodeImpl.java index 30da612..4560050 100644 --- a/usage/qa/src/main/java/org/apache/brooklyn/qa/load/SimulatedMySqlNodeImpl.java +++ b/usage/qa/src/main/java/org/apache/brooklyn/qa/load/SimulatedMySqlNodeImpl.java @@ -57,7 +57,7 @@ public class SimulatedMySqlNodeImpl extends MySqlNodeImpl { protected void connectSensors() { boolean simulateExternalMonitoring = getConfig(SIMULATE_EXTERNAL_MONITORING); if (simulateExternalMonitoring) { - setAttribute(DATASTORE_URL, String.format("mysql://%s:%s/", getAttribute(HOSTNAME), getAttribute(MYSQL_PORT))); + sensors().set(DATASTORE_URL, String.format("mysql://%s:%s/", getAttribute(HOSTNAME), getAttribute(MYSQL_PORT))); feed = FunctionFeed.builder() .entity(this) @@ -66,7 +66,7 @@ public class SimulatedMySqlNodeImpl extends MySqlNodeImpl { .callable(new Callable<Boolean>() { private int counter = 0; public Boolean call() { - setAttribute(QUERIES_PER_SECOND_FROM_MYSQL, (double)(counter++ % 100)); + sensors().set(QUERIES_PER_SECOND_FROM_MYSQL, (double)(counter++ % 100)); return true; }}) .setOnFailureOrException(false)) @@ -154,7 +154,7 @@ public class SimulatedMySqlNodeImpl extends MySqlNodeImpl { return; } - entity.setAttribute(MySqlNode.PID_FILE, getRunDir() + "/" + AbstractSoftwareProcessSshDriver.PID_FILENAME); + entity.sensors().set(MySqlNode.PID_FILE, getRunDir() + "/" + AbstractSoftwareProcessSshDriver.PID_FILENAME); if (entity.getConfig(SKIP_SSH_ON_START)) { // minimal ssh, so that isRunning will subsequently work http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4d08310c/usage/qa/src/main/java/org/apache/brooklyn/qa/load/SimulatedNginxControllerImpl.java ---------------------------------------------------------------------- diff --git a/usage/qa/src/main/java/org/apache/brooklyn/qa/load/SimulatedNginxControllerImpl.java b/usage/qa/src/main/java/org/apache/brooklyn/qa/load/SimulatedNginxControllerImpl.java index d57bf63..c75c8ab 100644 --- a/usage/qa/src/main/java/org/apache/brooklyn/qa/load/SimulatedNginxControllerImpl.java +++ b/usage/qa/src/main/java/org/apache/brooklyn/qa/load/SimulatedNginxControllerImpl.java @@ -72,8 +72,8 @@ public class SimulatedNginxControllerImpl extends NginxControllerImpl { // From AbstractController.connectSensors if (getUrl()==null) { - setAttribute(MAIN_URI, URI.create(inferUrl())); - setAttribute(ROOT_URL, inferUrl()); + sensors().set(MAIN_URI, URI.create(inferUrl())); + sensors().set(ROOT_URL, inferUrl()); } addServerPoolMemberTrackingPolicy(); @@ -108,14 +108,14 @@ public class SimulatedNginxControllerImpl extends NginxControllerImpl { Group urlMappings = getConfig(URL_MAPPINGS); if (urlMappings != null) { // Listen to the targets of each url-mapping changing - subscribeToMembers(urlMappings, UrlMapping.TARGET_ADDRESSES, new SensorEventListener<Collection<String>>() { + subscriptions().subscribeToMembers(urlMappings, UrlMapping.TARGET_ADDRESSES, new SensorEventListener<Collection<String>>() { @Override public void onEvent(SensorEvent<Collection<String>> event) { updateNeeded(); } }); // Listen to url-mappings being added and removed - urlMappingsMemberTrackerPolicy = addPolicy(PolicySpec.create(UrlMappingsMemberTrackerPolicy.class) + urlMappingsMemberTrackerPolicy = policies().add(PolicySpec.create(UrlMappingsMemberTrackerPolicy.class) .configure("group", urlMappings)); } } http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4d08310c/usage/qa/src/main/java/org/apache/brooklyn/qa/load/SimulatedTheeTierApp.java ---------------------------------------------------------------------- diff --git a/usage/qa/src/main/java/org/apache/brooklyn/qa/load/SimulatedTheeTierApp.java b/usage/qa/src/main/java/org/apache/brooklyn/qa/load/SimulatedTheeTierApp.java index 80daba7..0e41beb 100644 --- a/usage/qa/src/main/java/org/apache/brooklyn/qa/load/SimulatedTheeTierApp.java +++ b/usage/qa/src/main/java/org/apache/brooklyn/qa/load/SimulatedTheeTierApp.java @@ -99,20 +99,20 @@ public class SimulatedTheeTierApp extends AbstractApplication { .configure(DynamicCluster.INITIAL_SIZE, 2) .configure(WebAppService.ENABLED_PROTOCOLS, ImmutableSet.of(USE_HTTPS ? "https" : "http")) ); - web.getCluster().addPolicy(AutoScalerPolicy.builder(). + web.getCluster().policies().add(AutoScalerPolicy.builder(). metric(DynamicWebAppCluster.REQUESTS_PER_SECOND_IN_WINDOW_PER_NODE). metricRange(10, 100). sizeRange(2, 5). build()); - addEnricher(Enrichers.builder() + enrichers().add(Enrichers.builder() .propagating(Attributes.MAIN_URI, WebAppServiceConstants.ROOT_URL, DynamicWebAppCluster.REQUESTS_PER_SECOND_IN_WINDOW, HttpLatencyDetector.REQUEST_LATENCY_IN_SECONDS_IN_WINDOW) .from(web) .build()); - addEnricher(Enrichers.builder() + enrichers().add(Enrichers.builder() .aggregating(Startable.SERVICE_UP) .publishing(Startable.SERVICE_UP) .fromHardcodedProducers(ImmutableList.of(web, mysql)) http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4d08310c/usage/qa/src/test/java/org/apache/brooklyn/qa/longevity/webcluster/SinusoidalLoadGenerator.java ---------------------------------------------------------------------- diff --git a/usage/qa/src/test/java/org/apache/brooklyn/qa/longevity/webcluster/SinusoidalLoadGenerator.java b/usage/qa/src/test/java/org/apache/brooklyn/qa/longevity/webcluster/SinusoidalLoadGenerator.java index 7559420..a8dd8da 100644 --- a/usage/qa/src/test/java/org/apache/brooklyn/qa/longevity/webcluster/SinusoidalLoadGenerator.java +++ b/usage/qa/src/test/java/org/apache/brooklyn/qa/longevity/webcluster/SinusoidalLoadGenerator.java @@ -72,7 +72,7 @@ public class SinusoidalLoadGenerator extends AbstractEnricher { try { long time = System.currentTimeMillis(); double val = getRequiredConfig(SIN_AMPLITUDE) * (1 + Math.sin( (1.0*time) / getRequiredConfig(SIN_PERIOD_MS) * Math.PI * 2 - Math.PI/2 )) / 2; - entity.setAttribute(getRequiredConfig(TARGET), val); + entity.sensors().set(getRequiredConfig(TARGET), val); } catch (Throwable t) { LOG.warn("Error generating sinusoidal-load metric", t); throw Throwables.propagate(t); http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4d08310c/usage/qa/src/test/java/org/apache/brooklyn/qa/longevity/webcluster/WebClusterApp.java ---------------------------------------------------------------------- diff --git a/usage/qa/src/test/java/org/apache/brooklyn/qa/longevity/webcluster/WebClusterApp.java b/usage/qa/src/test/java/org/apache/brooklyn/qa/longevity/webcluster/WebClusterApp.java index 31f5060..7c11803 100644 --- a/usage/qa/src/test/java/org/apache/brooklyn/qa/longevity/webcluster/WebClusterApp.java +++ b/usage/qa/src/test/java/org/apache/brooklyn/qa/longevity/webcluster/WebClusterApp.java @@ -72,13 +72,13 @@ public class WebClusterApp extends AbstractApplication { .configure("initialSize", 1) .configure("memberSpec", jbossSpec)); - web.getCluster().addEnricher(Enrichers.builder() + web.getCluster().enrichers().add(Enrichers.builder() .aggregating(sinusoidalLoad) .publishing(averageLoad) .fromMembers() .computingAverage() .build()); - web.getCluster().addPolicy(AutoScalerPolicy.builder() + web.getCluster().policies().add(AutoScalerPolicy.builder() .metric(averageLoad) .sizeRange(1, 3) .metricRange(0.3, 0.7) http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4d08310c/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/PolicyResource.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/PolicyResource.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/PolicyResource.java index f933142..7ec0b22 100644 --- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/PolicyResource.java +++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/PolicyResource.java @@ -23,10 +23,7 @@ import java.util.Map; import javax.ws.rs.core.Response; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.apache.brooklyn.api.entity.Entity; -import org.apache.brooklyn.api.entity.EntityLocal; import org.apache.brooklyn.api.policy.Policy; import org.apache.brooklyn.api.policy.PolicySpec; import org.apache.brooklyn.core.policy.Policies; @@ -39,6 +36,8 @@ import org.apache.brooklyn.rest.transform.ApplicationTransformer; import org.apache.brooklyn.rest.transform.PolicyTransformer; import org.apache.brooklyn.rest.util.WebResourceUtils; import org.apache.brooklyn.util.exceptions.Exceptions; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.google.common.base.Function; import com.google.common.collect.FluentIterable; @@ -52,7 +51,7 @@ public class PolicyResource extends AbstractBrooklynRestResource implements Poli @Override public List<PolicySummary> list( final String application, final String entityToken) { final Entity entity = brooklyn().getEntity(application, entityToken); - return FluentIterable.from(entity.getPolicies()) + return FluentIterable.from(entity.policies()) .transform(new Function<Policy, PolicySummary>() { @Override public PolicySummary apply(Policy policy) { @@ -67,9 +66,9 @@ public class PolicyResource extends AbstractBrooklynRestResource implements Poli @Override public Map<String, Boolean> batchConfigRead( String application, String entityToken) { // TODO: add test - EntityLocal entity = brooklyn().getEntity(application, entityToken); + Entity entity = brooklyn().getEntity(application, entityToken); Map<String, Boolean> result = Maps.newLinkedHashMap(); - for (Policy p : entity.getPolicies()) { + for (Policy p : entity.policies()) { result.put(p.getId(), !p.isSuspended()); } return result; @@ -80,7 +79,7 @@ public class PolicyResource extends AbstractBrooklynRestResource implements Poli @Override public PolicySummary addPolicy( String application,String entityToken, String policyTypeName, Map<String, String> config) { - EntityLocal entity = brooklyn().getEntity(application, entityToken); + Entity entity = brooklyn().getEntity(application, entityToken); Class<? extends Policy> policyType; try { policyType = (Class<? extends Policy>) Class.forName(policyTypeName); @@ -92,7 +91,7 @@ public class PolicyResource extends AbstractBrooklynRestResource implements Poli throw Exceptions.propagate(e); } - Policy policy = entity.addPolicy(PolicySpec.create(policyType).configure(config)); + Policy policy = entity.policies().add(PolicySpec.create(policyType).configure(config)); log.debug("REST API added policy " + policy + " to " + entity); return PolicyTransformer.policySummary(entity, policy); @@ -122,11 +121,11 @@ public class PolicyResource extends AbstractBrooklynRestResource implements Poli @Override public Response destroy(String application, String entityToken, String policyToken) { - EntityLocal entity = brooklyn().getEntity(application, entityToken); + Entity entity = brooklyn().getEntity(application, entityToken); Policy policy = brooklyn().getPolicy(entity, policyToken); policy.suspend(); - entity.removePolicy(policy); + entity.policies().remove(policy); return Response.status(Response.Status.NO_CONTENT).build(); } } http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4d08310c/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/SensorResource.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/SensorResource.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/SensorResource.java index 1976d6f..90e434a 100644 --- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/SensorResource.java +++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/resources/SensorResource.java @@ -118,7 +118,7 @@ public class SensorResource extends AbstractBrooklynRestResource implements Sens Object newValue = ((Map.Entry)entry).getValue(); AttributeSensor sensor = findSensor(entity, sensorName); - entity.setAttribute(sensor, newValue); + entity.sensors().set(sensor, newValue); } } @@ -134,7 +134,7 @@ public class SensorResource extends AbstractBrooklynRestResource implements Sens AttributeSensor sensor = findSensor(entity, sensorName); if (log.isDebugEnabled()) log.debug("REST user "+Entitlements.getEntitlementContext()+" setting sensor "+sensorName+" to "+newValue); - entity.setAttribute(sensor, newValue); + entity.sensors().set(sensor, newValue); } @Override http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4d08310c/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/BrooklynRestResourceUtils.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/BrooklynRestResourceUtils.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/BrooklynRestResourceUtils.java index 1c16e2a..cbdf70d 100644 --- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/BrooklynRestResourceUtils.java +++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/util/BrooklynRestResourceUtils.java @@ -123,10 +123,10 @@ public class BrooklynRestResourceUtils { public Policy getPolicy(Entity entity, String policy) { if (policy==null) return null; - for (Policy p: entity.getPolicies()) { + for (Policy p: entity.policies()) { if (policy.equals(p.getId())) return p; } - for (Policy p: entity.getPolicies()) { + for (Policy p: entity.policies()) { if (policy.equals(p.getDisplayName())) return p; } @@ -286,7 +286,7 @@ public class BrooklynRestResourceUtils { Entity soleChild = mgmt.getEntityManager().createEntity(toCoreEntitySpec(clazz, name, configO, catalogItemId)); instance.addChild(soleChild); - instance.addEnricher(Enrichers.builder() + instance.enrichers().add(Enrichers.builder() .propagatingAllBut(Attributes.SERVICE_UP, Attributes.SERVICE_NOT_UP_INDICATORS, Attributes.SERVICE_STATE_ACTUAL, Attributes.SERVICE_STATE_EXPECTED, Attributes.SERVICE_PROBLEMS) http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4d08310c/usage/rest-server/src/test/java/org/apache/brooklyn/rest/domain/SensorSummaryTest.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/domain/SensorSummaryTest.java b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/domain/SensorSummaryTest.java index 0355def..a3c6df2 100644 --- a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/domain/SensorSummaryTest.java +++ b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/domain/SensorSummaryTest.java @@ -90,7 +90,7 @@ public class SensorSummaryTest { @Test public void testSensorWithMultipleOpenUrlActionsRegistered() throws IOException { AttributeSensor<String> sensor = Sensors.newStringSensor("sensor1"); - entity.setAttribute(sensor, "http://myval";); + entity.sensors().set(sensor, "http://myval";); RendererHints.register(sensor, RendererHints.namedActionWithUrl()); RendererHints.register(sensor, RendererHints.namedActionWithUrl()); http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4d08310c/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ApplicationResourceTest.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ApplicationResourceTest.java b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ApplicationResourceTest.java index 1d342d2..2d264f3 100644 --- a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ApplicationResourceTest.java +++ b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ApplicationResourceTest.java @@ -335,7 +335,7 @@ public class ApplicationResourceTest extends BrooklynRestResourceTest { .get(ApplicationSummary.class); assertEquals(summary.getStatus(), Status.RUNNING); - ((EntityLocal)app).setAttribute(Attributes.SERVICE_STATE_ACTUAL, Lifecycle.ON_FIRE); + ((EntityLocal)app).sensors().set(Attributes.SERVICE_STATE_ACTUAL, Lifecycle.ON_FIRE); try { ApplicationSummary summary2 = client().resource("/v1/applications/"+app.getId()) .get(ApplicationSummary.class); @@ -343,7 +343,7 @@ public class ApplicationResourceTest extends BrooklynRestResourceTest { assertEquals(summary2.getStatus(), Status.ERROR); } finally { - ((EntityLocal)app).setAttribute(Attributes.SERVICE_STATE_ACTUAL, origState); + ((EntityLocal)app).sensors().set(Attributes.SERVICE_STATE_ACTUAL, origState); } } http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4d08310c/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/DescendantsTest.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/DescendantsTest.java b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/DescendantsTest.java index 8e11d82..43e7166 100644 --- a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/DescendantsTest.java +++ b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/DescendantsTest.java @@ -101,9 +101,9 @@ public class DescendantsTest extends BrooklynRestResourceTest { assertEquals(sensors.size(), 0); long v = 0; - ((EntityLocal)application).setAttribute(Sensors.newLongSensor("foo"), v); + ((EntityLocal)application).sensors().set(Sensors.newLongSensor("foo"), v); for (Entity e: entities) - ((EntityLocal)e).setAttribute(Sensors.newLongSensor("foo"), v+=123); + ((EntityLocal)e).sensors().set(Sensors.newLongSensor("foo"), v+=123); sensors = client().resource("/v1/applications/"+application.getApplicationId()+"/descendants/sensor/foo") .get(new GenericType<Map<String,Object>>() {}); http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4d08310c/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/SensorResourceTest.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/SensorResourceTest.java b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/SensorResourceTest.java index ad606c7..b3d49e5 100644 --- a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/SensorResourceTest.java +++ b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/SensorResourceTest.java @@ -95,7 +95,7 @@ public class SensorResourceTest extends BrooklynRestResourceTest { static void addAmphibianSensor(EntityInternal entity) { // Add new sensor entity.getMutableEntityType().addSensor(SENSOR); - entity.setAttribute(SENSOR, 12345); + entity.sensors().set(SENSOR, 12345); // Register display value hint RendererHints.register(SENSOR, RendererHints.displayValue(Functions.compose(StringFunctions.append(" frogs"), Functions.toStringFunction()))); http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4d08310c/usage/rest-server/src/test/java/org/apache/brooklyn/rest/test/entity/brooklynnode/DeployBlueprintTest.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/test/entity/brooklynnode/DeployBlueprintTest.java b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/test/entity/brooklynnode/DeployBlueprintTest.java index 2a464f2..980e844 100644 --- a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/test/entity/brooklynnode/DeployBlueprintTest.java +++ b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/test/entity/brooklynnode/DeployBlueprintTest.java @@ -63,7 +63,7 @@ public class DeployBlueprintTest extends BrooklynRestApiLauncherTestFixture { EntitySpec<BrooklynNode> spec = EntitySpec.create(BrooklynNode.class); EntityManager mgr = getManagementContextFromJettyServerAttributes(server).getEntityManager(); BrooklynNode node = mgr.createEntity(spec); - ((EntityLocal)node).setAttribute(BrooklynNode.WEB_CONSOLE_URI, webConsoleUri); + ((EntityLocal)node).sensors().set(BrooklynNode.WEB_CONSOLE_URI, webConsoleUri); mgr.manage(node); Map<String, String> params = ImmutableMap.of(DeployBlueprintEffector.BLUEPRINT_CAMP_PLAN.getName(), "{ services: [ serviceType: \"java:"+BasicApplication.class.getName()+"\" ] }"); String id = node.invoke(BrooklynNode.DEPLOY_BLUEPRINT, params).getUnchecked(); http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4d08310c/usage/rest-server/src/test/java/org/apache/brooklyn/rest/testing/mocks/RestMockSimpleEntity.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/testing/mocks/RestMockSimpleEntity.java b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/testing/mocks/RestMockSimpleEntity.java index 2983f4e..58d24aa 100644 --- a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/testing/mocks/RestMockSimpleEntity.java +++ b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/testing/mocks/RestMockSimpleEntity.java @@ -76,7 +76,7 @@ public class RestMockSimpleEntity extends SoftwareProcessImpl { @EffectorParam(name="param2") Integer param2) { log.info("Invoked sampleEffector("+param1+","+param2+")"); String result = ""+param1+param2; - setAttribute(SAMPLE_SENSOR, result); + sensors().set(SAMPLE_SENSOR, result); return result; } http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4d08310c/usage/rest-server/src/test/java/org/apache/brooklyn/rest/util/BrooklynRestResourceUtilsTest.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/util/BrooklynRestResourceUtilsTest.java b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/util/BrooklynRestResourceUtilsTest.java index be6d50c..d190614 100644 --- a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/util/BrooklynRestResourceUtilsTest.java +++ b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/util/BrooklynRestResourceUtilsTest.java @@ -181,7 +181,7 @@ public class BrooklynRestResourceUtilsTest { subapp.setDisplayName("subapp"); TestEntityImpl subentity = new TestEntityImpl(MutableMap.of("displayName", "subentity"), subapp); - subentity.addPolicy(new MyPolicy(MutableMap.of("name", "mypolicy"))); + subentity.policies().add(new MyPolicy(MutableMap.of("name", "mypolicy"))); subentity.getApplication(); // force this to be cached app.addChild(subapp); http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4d08310c/usage/test-support/src/main/java/org/apache/brooklyn/test/EntityTestUtils.java ---------------------------------------------------------------------- diff --git a/usage/test-support/src/main/java/org/apache/brooklyn/test/EntityTestUtils.java b/usage/test-support/src/main/java/org/apache/brooklyn/test/EntityTestUtils.java index 49abea9..3baa26d 100644 --- a/usage/test-support/src/main/java/org/apache/brooklyn/test/EntityTestUtils.java +++ b/usage/test-support/src/main/java/org/apache/brooklyn/test/EntityTestUtils.java @@ -141,7 +141,7 @@ public class EntityTestUtils { public static void assertAttributeChangesEventually(final Entity entity, final AttributeSensor<?> attribute) { final Object origValue = entity.getAttribute(attribute); final AtomicBoolean changed = new AtomicBoolean(); - SubscriptionHandle handle = ((EntityLocal)entity).subscribe(entity, attribute, new SensorEventListener<Object>() { + SubscriptionHandle handle = entity.subscriptions().subscribe(entity, attribute, new SensorEventListener<Object>() { @Override public void onEvent(SensorEvent<Object> event) { if (!Objects.equal(origValue, event.getValue())) { changed.set(true); @@ -153,7 +153,7 @@ public class EntityTestUtils { assertTrue(changed.get(), entity+" -> "+attribute+" not changed"); }}); } finally { - ((EntityLocal)entity).unsubscribe(entity, handle); + entity.subscriptions().unsubscribe(entity, handle); } }
