Return-Path: X-Original-To: apmail-brooklyn-commits-archive@minotaur.apache.org Delivered-To: apmail-brooklyn-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 843EC1878A for ; Tue, 18 Aug 2015 11:06:04 +0000 (UTC) Received: (qmail 83835 invoked by uid 500); 18 Aug 2015 11:06:04 -0000 Delivered-To: apmail-brooklyn-commits-archive@brooklyn.apache.org Received: (qmail 83812 invoked by uid 500); 18 Aug 2015 11:06:04 -0000 Mailing-List: contact commits-help@brooklyn.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@brooklyn.incubator.apache.org Delivered-To: mailing list commits@brooklyn.incubator.apache.org Received: (qmail 83803 invoked by uid 99); 18 Aug 2015 11:06:04 -0000 Received: from Unknown (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 18 Aug 2015 11:06:04 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id F14291AA681 for ; Tue, 18 Aug 2015 11:06:03 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.774 X-Spam-Level: * X-Spam-Status: No, score=1.774 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-0.006] autolearn=disabled Received: from mx1-us-east.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id oRea07j-1KKC for ; Tue, 18 Aug 2015 11:06:00 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-east.apache.org (ASF Mail Server at mx1-us-east.apache.org) with SMTP id C03CC42C69 for ; Tue, 18 Aug 2015 11:05:59 +0000 (UTC) Received: (qmail 83578 invoked by uid 99); 18 Aug 2015 11:05:59 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 18 Aug 2015 11:05:59 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 3970DDFFED; Tue, 18 Aug 2015 11:05:59 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: heneveld@apache.org To: commits@brooklyn.incubator.apache.org Date: Tue, 18 Aug 2015 11:06:03 -0000 Message-Id: <7ff56fd19bdd40e5b0a742594998e307@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [05/24] incubator-brooklyn git commit: [BROOKLYN-162] Renaming package policy http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d30ff597/policy/src/test/java/org/apache/brooklyn/policy/loadbalancing/MockItemEntityImpl.java ---------------------------------------------------------------------- diff --git a/policy/src/test/java/org/apache/brooklyn/policy/loadbalancing/MockItemEntityImpl.java b/policy/src/test/java/org/apache/brooklyn/policy/loadbalancing/MockItemEntityImpl.java new file mode 100644 index 0000000..00b665d --- /dev/null +++ b/policy/src/test/java/org/apache/brooklyn/policy/loadbalancing/MockItemEntityImpl.java @@ -0,0 +1,113 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.brooklyn.policy.loadbalancing; + +import static com.google.common.base.Preconditions.checkNotNull; + +import java.util.concurrent.atomic.AtomicInteger; +import java.util.concurrent.atomic.AtomicLong; +import java.util.concurrent.locks.ReentrantLock; + +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.event.AttributeSensor; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import brooklyn.entity.basic.AbstractEntity; +import brooklyn.util.collections.MutableList; + + +public class MockItemEntityImpl extends AbstractEntity implements MockItemEntity { + + private static final Logger LOG = LoggerFactory.getLogger(MockItemEntityImpl.class); + + public static AtomicInteger totalMoveCount = new AtomicInteger(0); + + public static AtomicLong lastMoveTime = new AtomicLong(-1); + + private volatile boolean stopped; + private volatile MockContainerEntity currentContainer; + + private final ReentrantLock _lock = new ReentrantLock(); + + @Override + public String getContainerId() { + return (currentContainer == null) ? null : currentContainer.getId(); + } + + @Override + public boolean isStopped() { + return stopped; + } + + @Override + public T setAttribute(AttributeSensor attribute, T val) { + if (LOG.isDebugEnabled()) LOG.debug("Mocks: item {} setting {} to {}", new Object[] {this, attribute, val}); + return super.setAttribute(attribute, val); + } + + @Override + public void move(Entity destination) { + totalMoveCount.incrementAndGet(); + lastMoveTime.set(System.currentTimeMillis()); + moveNonEffector(destination); + } + + // only moves if the containers will accept us (otherwise we'd lose the item!) + @Override + public void moveNonEffector(Entity rawDestination) { + if (LOG.isDebugEnabled()) LOG.debug("Mocks: moving item {} from {} to {}", new Object[] {this, currentContainer, rawDestination}); + checkNotNull(rawDestination); + final MockContainerEntity previousContainer = currentContainer; + final MockContainerEntity destination = (MockContainerEntity) rawDestination; + + MockContainerEntityImpl.runWithLock(MutableList.of(previousContainer, destination), new Runnable() { + @Override public void run() { + _lock.lock(); + try { + if (stopped) throw new IllegalStateException("Item "+this+" is stopped; cannot move to "+destination); + if (currentContainer != null) currentContainer.removeItem(MockItemEntityImpl.this); + currentContainer = destination; + destination.addItem(MockItemEntityImpl.this); + setAttribute(CONTAINER, currentContainer); + } finally { + _lock.unlock(); + } + }}); + } + + @Override + public void stop() { + // FIXME How best to indicate this has been entirely stopped, rather than just in-transit? + if (LOG.isDebugEnabled()) LOG.debug("Mocks: stopping item {} (was in container {})", this, currentContainer); + _lock.lock(); + try { + if (currentContainer != null) currentContainer.removeItem(this); + currentContainer = null; + stopped = true; + } finally { + _lock.unlock(); + } + } + + @Override + public String toString() { + return "MockItem["+getDisplayName()+"]"; + } +} http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d30ff597/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/TomcatAutoScalerPolicyTest.java ---------------------------------------------------------------------- diff --git a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/TomcatAutoScalerPolicyTest.java b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/TomcatAutoScalerPolicyTest.java index acf6195..9bdd2c6 100644 --- a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/TomcatAutoScalerPolicyTest.java +++ b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/TomcatAutoScalerPolicyTest.java @@ -25,7 +25,6 @@ import static org.testng.Assert.assertTrue; import org.apache.brooklyn.api.entity.proxying.EntitySpec; import org.apache.brooklyn.api.location.LocationSpec; import org.apache.brooklyn.api.management.ManagementContext; -import org.apache.brooklyn.entity.webapp.DynamicWebAppCluster; import org.apache.brooklyn.entity.webapp.tomcat.TomcatServer; import org.apache.brooklyn.entity.webapp.tomcat.TomcatServerImpl; import org.apache.brooklyn.test.entity.TestApplication; @@ -39,7 +38,7 @@ import brooklyn.entity.basic.Entities; import org.apache.brooklyn.location.basic.LocalhostMachineProvisioningLocation; -import brooklyn.policy.autoscaling.AutoScalerPolicy; +import org.apache.brooklyn.policy.autoscaling.AutoScalerPolicy; import brooklyn.test.Asserts; import brooklyn.util.collections.MutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d30ff597/usage/archetypes/quickstart/src/brooklyn-sample/src/main/java/com/acme/sample/brooklyn/sample/app/ClusterWebServerDatabaseSample.java ---------------------------------------------------------------------- diff --git a/usage/archetypes/quickstart/src/brooklyn-sample/src/main/java/com/acme/sample/brooklyn/sample/app/ClusterWebServerDatabaseSample.java b/usage/archetypes/quickstart/src/brooklyn-sample/src/main/java/com/acme/sample/brooklyn/sample/app/ClusterWebServerDatabaseSample.java index c9b73e0..9b101a8 100644 --- a/usage/archetypes/quickstart/src/brooklyn-sample/src/main/java/com/acme/sample/brooklyn/sample/app/ClusterWebServerDatabaseSample.java +++ b/usage/archetypes/quickstart/src/brooklyn-sample/src/main/java/com/acme/sample/brooklyn/sample/app/ClusterWebServerDatabaseSample.java @@ -30,7 +30,7 @@ import org.apache.brooklyn.entity.webapp.WebAppServiceConstants; import org.apache.brooklyn.api.event.AttributeSensor; import brooklyn.event.basic.Sensors; import org.apache.brooklyn.location.basic.PortRanges; -import brooklyn.policy.autoscaling.AutoScalerPolicy; +import org.apache.brooklyn.policy.autoscaling.AutoScalerPolicy; import brooklyn.util.maven.MavenArtifact; import brooklyn.util.maven.MavenRetriever; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d30ff597/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/BrooklynYamlTypeInstantiatorTest.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/BrooklynYamlTypeInstantiatorTest.java b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/BrooklynYamlTypeInstantiatorTest.java index 107b0b9..7999721 100644 --- a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/BrooklynYamlTypeInstantiatorTest.java +++ b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/BrooklynYamlTypeInstantiatorTest.java @@ -27,7 +27,7 @@ import org.apache.brooklyn.core.management.classloading.JavaBrooklynClassLoading import org.testng.Assert; import org.testng.annotations.Test; -import brooklyn.policy.ha.ServiceRestarter; +import org.apache.brooklyn.policy.ha.ServiceRestarter; import brooklyn.util.collections.MutableMap; import brooklyn.util.javalang.JavaClassNames; import brooklyn.util.time.Duration; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d30ff597/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/JavaWebAppsIntegrationTest.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/JavaWebAppsIntegrationTest.java b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/JavaWebAppsIntegrationTest.java index 7314e66..5a6d7d8 100644 --- a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/JavaWebAppsIntegrationTest.java +++ b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/JavaWebAppsIntegrationTest.java @@ -36,9 +36,11 @@ import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.management.ManagementContext; import org.apache.brooklyn.api.management.Task; import org.apache.brooklyn.api.policy.Policy; + import org.apache.brooklyn.camp.brooklyn.BrooklynCampPlatform; import org.apache.brooklyn.camp.brooklyn.BrooklynCampPlatformLauncherNoServer; import org.apache.brooklyn.core.util.ResourceUtils; + import org.apache.brooklyn.entity.webapp.DynamicWebAppCluster; import org.apache.brooklyn.entity.webapp.JavaWebAppService; import org.apache.brooklyn.entity.webapp.WebAppService; @@ -54,7 +56,7 @@ import brooklyn.entity.basic.Attributes; import brooklyn.entity.basic.BrooklynTaskTags; import brooklyn.entity.basic.Entities; import brooklyn.entity.basic.Lifecycle; -import brooklyn.policy.autoscaling.AutoScalerPolicy; +import org.apache.brooklyn.policy.autoscaling.AutoScalerPolicy; import brooklyn.test.Asserts; import brooklyn.util.collections.MutableMap; import brooklyn.util.exceptions.Exceptions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d30ff597/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlCombiTest.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlCombiTest.java b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlCombiTest.java index 73bb59b..2baf194 100644 --- a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlCombiTest.java +++ b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlCombiTest.java @@ -31,7 +31,7 @@ import brooklyn.entity.basic.BasicEntity; import brooklyn.entity.basic.BasicStartable; import brooklyn.entity.basic.ConfigKeys; import brooklyn.entity.basic.Entities; -import brooklyn.policy.ha.ServiceRestarter; +import org.apache.brooklyn.policy.ha.ServiceRestarter; import brooklyn.util.exceptions.Exceptions; import com.google.common.collect.Iterables; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d30ff597/usage/camp/src/test/resources/java-web-app-and-db-with-policy.yaml ---------------------------------------------------------------------- diff --git a/usage/camp/src/test/resources/java-web-app-and-db-with-policy.yaml b/usage/camp/src/test/resources/java-web-app-and-db-with-policy.yaml index 671f64a..c2152b5 100644 --- a/usage/camp/src/test/resources/java-web-app-and-db-with-policy.yaml +++ b/usage/camp/src/test/resources/java-web-app-and-db-with-policy.yaml @@ -29,7 +29,7 @@ services: brooklyn.example.db.url: $brooklyn:formatString("jdbc:%s%s?user=%s&password=%s", component("db").attributeWhenReady("datastore.url"), "visitors", "brooklyn", "br00k11n") brooklyn.policies: - - policyType: brooklyn.policy.autoscaling.AutoScalerPolicy + - policyType: org.apache.brooklyn.policy.autoscaling.AutoScalerPolicy brooklyn.config: metric: $brooklyn:sensor("org.apache.brooklyn.entity.webapp.DynamicWebAppCluster", "webapp.reqs.perSec.windowed.perNode") metricLowerBound: 10 http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d30ff597/usage/camp/src/test/resources/vanilla-bash-netcat-w-client.yaml ---------------------------------------------------------------------- diff --git a/usage/camp/src/test/resources/vanilla-bash-netcat-w-client.yaml b/usage/camp/src/test/resources/vanilla-bash-netcat-w-client.yaml index d1bc4d4..3279dc7 100644 --- a/usage/camp/src/test/resources/vanilla-bash-netcat-w-client.yaml +++ b/usage/camp/src/test/resources/vanilla-bash-netcat-w-client.yaml @@ -34,13 +34,13 @@ services: # a failure detector and a service restarter work together brooklyn.enrichers: - - type: brooklyn.policy.ha.ServiceFailureDetector + - type: org.apache.brooklyn.policy.ha.ServiceFailureDetector brooklyn.config: # wait 15s after service fails before propagating failure serviceFailedStabilizationDelay: 15s brooklyn.policies: - - policyType: brooklyn.policy.ha.ServiceRestarter + - policyType: org.apache.brooklyn.policy.ha.ServiceRestarter brooklyn.config: # repeated failures in a time window can cause the restarter to abort, # propagating the failure; a time window of 0 will mean it always restarts! http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d30ff597/usage/cli/src/main/resources/brooklyn/default.catalog.bom ---------------------------------------------------------------------- diff --git a/usage/cli/src/main/resources/brooklyn/default.catalog.bom b/usage/cli/src/main/resources/brooklyn/default.catalog.bom index 4cd5f6b..9255913 100644 --- a/usage/cli/src/main/resources/brooklyn/default.catalog.bom +++ b/usage/cli/src/main/resources/brooklyn/default.catalog.bom @@ -188,7 +188,7 @@ brooklyn.catalog: initialSize: 3 # and add a policy to scale based on ops per minute brooklyn.policies: - - type: brooklyn.policy.autoscaling.AutoScalerPolicy + - type: org.apache.brooklyn.policy.autoscaling.AutoScalerPolicy brooklyn.config: metric: riak.node.ops.1m.perNode # more than 100 ops per second (6k/min) scales out, less than 50 scales back @@ -274,13 +274,13 @@ brooklyn.catalog: enricher.window.duration: 30s # emit failure sensor if a failure connecting to the service is sustained for 30s - - type: brooklyn.policy.ha.ServiceFailureDetector + - type: org.apache.brooklyn.policy.ha.ServiceFailureDetector brooklyn.config: entityFailed.stabilizationDelay: 30s brooklyn.policies: # restart if a failure is detected (with a max of one restart in 2m, sensor will propagate otherwise) - - type: brooklyn.policy.ha.ServiceRestarter + - type: org.apache.brooklyn.policy.ha.ServiceRestarter brooklyn.config: failOnRecurringFailuresInThisDuration: 2m @@ -305,10 +305,10 @@ brooklyn.catalog: brooklyn.policies: # resilience: if a per-node restart policy fails, # just throw that node away and create a new one - - type: brooklyn.policy.ha.ServiceReplacer + - type: org.apache.brooklyn.policy.ha.ServiceReplacer # and scale based on reqs/sec - - type: brooklyn.policy.autoscaling.AutoScalerPolicy + - type: org.apache.brooklyn.policy.autoscaling.AutoScalerPolicy brooklyn.config: # scale based on reqs/sec (though in a real-world situation, # reqs.per_sec.windowed_30s.per_node might be a better choice) http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d30ff597/usage/launcher/src/test/resources/couchbase-w-loadgen.yaml ---------------------------------------------------------------------- diff --git a/usage/launcher/src/test/resources/couchbase-w-loadgen.yaml b/usage/launcher/src/test/resources/couchbase-w-loadgen.yaml index 7dc4995..7803a8c 100644 --- a/usage/launcher/src/test/resources/couchbase-w-loadgen.yaml +++ b/usage/launcher/src/test/resources/couchbase-w-loadgen.yaml @@ -33,7 +33,7 @@ services: minRam: 16g minCores: 4 brooklyn.policies: - - type: brooklyn.policy.autoscaling.AutoScalerPolicy + - type: org.apache.brooklyn.policy.autoscaling.AutoScalerPolicy brooklyn.config: metric: $brooklyn:sensor("org.apache.brooklyn.entity.nosql.couchbase.CouchbaseCluster", "couchbase.stats.cluster.per.node.ops") http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d30ff597/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 bc7b2c3..2e70a2b 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 @@ -48,7 +48,7 @@ import org.apache.brooklyn.entity.webapp.jboss.JBoss7Server; import org.apache.brooklyn.launcher.BrooklynLauncher; import org.apache.brooklyn.location.basic.PortRanges; -import brooklyn.policy.autoscaling.AutoScalerPolicy; +import org.apache.brooklyn.policy.autoscaling.AutoScalerPolicy; import brooklyn.util.CommandLineUtil; import brooklyn.util.collections.MutableSet; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d30ff597/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 8b635f1..399f847 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 @@ -35,7 +35,7 @@ import org.apache.brooklyn.entity.webapp.ControlledDynamicWebAppCluster; import org.apache.brooklyn.entity.webapp.jboss.JBoss7Server; import org.apache.brooklyn.launcher.BrooklynLauncher; -import brooklyn.policy.autoscaling.AutoScalerPolicy; +import org.apache.brooklyn.policy.autoscaling.AutoScalerPolicy; import brooklyn.util.CommandLineUtil; import com.google.common.collect.Lists; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d30ff597/usage/rest-api/src/main/java/org/apache/brooklyn/rest/domain/ConfigSummary.java ---------------------------------------------------------------------- diff --git a/usage/rest-api/src/main/java/org/apache/brooklyn/rest/domain/ConfigSummary.java b/usage/rest-api/src/main/java/org/apache/brooklyn/rest/domain/ConfigSummary.java index 5f79e4d..12d5a9d 100644 --- a/usage/rest-api/src/main/java/org/apache/brooklyn/rest/domain/ConfigSummary.java +++ b/usage/rest-api/src/main/java/org/apache/brooklyn/rest/domain/ConfigSummary.java @@ -86,7 +86,7 @@ public abstract class ConfigSummary implements HasName, Serializable { this.reconfigurable = config.isReconfigurable(); /* Use String, to guarantee it is serializable; otherwise get: - * No serializer found for class brooklyn.policy.autoscaling.AutoScalerPolicy$3 and no properties discovered to create BeanSerializer (to avoid exception, disable SerializationConfig.Feature.FAIL_ON_EMPTY_BEANS) ) (through reference chain: java.util.ArrayList[9]->org.apache.brooklyn.rest.domain.PolicyConfigSummary["defaultValue"]) + * No serializer found for class org.apache.brooklyn.policy.autoscaling.AutoScalerPolicy$3 and no properties discovered to create BeanSerializer (to avoid exception, disable SerializationConfig.Feature.FAIL_ON_EMPTY_BEANS) ) (through reference chain: java.util.ArrayList[9]->org.apache.brooklyn.rest.domain.PolicyConfigSummary["defaultValue"]) * at org.codehaus.jackson.map.ser.impl.UnknownSerializer.failForEmpty(UnknownSerializer.java:52) */ this.label = label; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d30ff597/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/CatalogResourceTest.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/CatalogResourceTest.java b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/CatalogResourceTest.java index 83690d8..68c7082 100644 --- a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/CatalogResourceTest.java +++ b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/resources/CatalogResourceTest.java @@ -45,7 +45,7 @@ import org.apache.brooklyn.api.catalog.CatalogItem.CatalogBundle; import org.apache.brooklyn.core.catalog.internal.CatalogUtils; import org.apache.brooklyn.core.management.osgi.OsgiStandaloneTest; -import brooklyn.policy.autoscaling.AutoScalerPolicy; +import org.apache.brooklyn.policy.autoscaling.AutoScalerPolicy; import org.apache.brooklyn.rest.domain.CatalogEntitySummary; import org.apache.brooklyn.rest.domain.CatalogItemSummary;