Rename o.a.b.policy.core to o.a.b.core.policy Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/22033300 Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/22033300 Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/22033300
Branch: refs/heads/master Commit: 22033300c6dc965750a3ae60b8855bfc36e28edd Parents: 35e7e68 Author: Aled Sage <[email protected]> Authored: Wed Aug 19 16:47:31 2015 +0100 Committer: Aled Sage <[email protected]> Committed: Wed Aug 19 16:47:31 2015 +0100 ---------------------------------------------------------------------- .../brooklyn/core/entity/AbstractEntity.java | 2 +- .../mgmt/rebind/BasicEntityRebindSupport.java | 2 +- .../mgmt/rebind/BasicPolicyRebindSupport.java | 2 +- .../core/mgmt/rebind/RebindIteration.java | 2 +- .../mgmt/rebind/dto/MementosGenerators.java | 2 +- .../brooklyn/core/objs/BrooklynTypes.java | 2 +- .../core/objs/proxy/InternalEntityFactory.java | 2 +- .../core/objs/proxy/InternalPolicyFactory.java | 2 +- .../brooklyn/core/policy/AbstractPolicy.java | 119 +++++++++++++++++++ .../apache/brooklyn/core/policy/Policies.java | 73 ++++++++++++ .../brooklyn/core/policy/PolicyDynamicType.java | 43 +++++++ .../core/policy/PolicyTypeSnapshot.java | 39 ++++++ .../group/AbstractMembershipTrackingPolicy.java | 2 +- .../winrm/AdvertiseWinrmLoginPolicy.java | 2 +- .../brooklyn/policy/core/AbstractPolicy.java | 119 ------------------- .../apache/brooklyn/policy/core/Policies.java | 73 ------------ .../brooklyn/policy/core/PolicyDynamicType.java | 43 ------- .../policy/core/PolicyTypeSnapshot.java | 39 ------ .../core/entity/EntityPreManagementTest.java | 2 +- .../brooklyn/core/entity/EntitySpecTest.java | 2 +- .../core/entity/PolicyRegistrationTest.java | 2 +- .../core/mgmt/rebind/RebindCatalogItemTest.java | 2 +- .../core/mgmt/rebind/RebindFailuresTest.java | 2 +- .../core/mgmt/rebind/RebindPolicyTest.java | 2 +- .../core/policy/basic/BasicPolicyTest.java | 2 +- .../policy/basic/PolicySubscriptionTest.java | 2 +- .../core/policy/basic/PolicyTypeTest.java | 2 +- .../brooklyn/core/test/policy/TestPolicy.java | 2 +- .../entity/group/GroupPickUpEntitiesTest.java | 2 +- .../policy/jclouds/os/CreateUserPolicy.java | 2 +- .../policy/autoscaling/AutoScalerPolicy.java | 2 +- .../policy/followthesun/FollowTheSunPolicy.java | 2 +- .../policy/ha/AbstractFailureDetector.java | 2 +- .../policy/ha/ConditionalSuspendPolicy.java | 2 +- .../brooklyn/policy/ha/ServiceReplacer.java | 2 +- .../brooklyn/policy/ha/ServiceRestarter.java | 2 +- .../loadbalancing/LoadBalancingPolicy.java | 2 +- .../camp/brooklyn/TestReferencingPolicy.java | 2 +- .../apache/brooklyn/cli/lister/ClassFinder.java | 2 +- .../brooklyn/rest/resources/PolicyResource.java | 2 +- .../rest/transform/PolicyTransformer.java | 2 +- .../rest/util/BrooklynRestResourceUtils.java | 2 +- .../rest/testing/mocks/CapitalizePolicy.java | 2 +- .../testing/mocks/RestMockSimplePolicy.java | 2 +- .../util/BrooklynRestResourceUtilsTest.java | 2 +- 45 files changed, 311 insertions(+), 311 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/22033300/core/src/main/java/org/apache/brooklyn/core/entity/AbstractEntity.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/entity/AbstractEntity.java b/core/src/main/java/org/apache/brooklyn/core/entity/AbstractEntity.java index ee4ad56..ea6bda7 100644 --- a/core/src/main/java/org/apache/brooklyn/core/entity/AbstractEntity.java +++ b/core/src/main/java/org/apache/brooklyn/core/entity/AbstractEntity.java @@ -76,7 +76,7 @@ import org.apache.brooklyn.core.mgmt.rebind.BasicEntityRebindSupport; import org.apache.brooklyn.core.objs.AbstractBrooklynObject; import org.apache.brooklyn.core.objs.AbstractEntityAdjunct; import org.apache.brooklyn.core.objs.AbstractEntityAdjunct.AdjunctTagSupport; -import org.apache.brooklyn.policy.core.AbstractPolicy; +import org.apache.brooklyn.core.policy.AbstractPolicy; import org.apache.brooklyn.sensor.core.AttributeMap; import org.apache.brooklyn.sensor.core.AttributeSensorAndConfigKey; import org.apache.brooklyn.sensor.core.BasicNotificationSensor; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/22033300/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/BasicEntityRebindSupport.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/BasicEntityRebindSupport.java b/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/BasicEntityRebindSupport.java index 94f71d6..2e4a971 100644 --- a/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/BasicEntityRebindSupport.java +++ b/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/BasicEntityRebindSupport.java @@ -35,8 +35,8 @@ import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.entity.AbstractEntity; import org.apache.brooklyn.core.entity.EntityInternal; import org.apache.brooklyn.core.mgmt.rebind.dto.MementosGenerators; +import org.apache.brooklyn.core.policy.AbstractPolicy; import org.apache.brooklyn.entity.group.AbstractGroupImpl; -import org.apache.brooklyn.policy.core.AbstractPolicy; import org.apache.brooklyn.sensor.enricher.AbstractEnricher; import org.apache.brooklyn.sensor.feed.AbstractFeed; import org.apache.brooklyn.util.exceptions.Exceptions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/22033300/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/BasicPolicyRebindSupport.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/BasicPolicyRebindSupport.java b/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/BasicPolicyRebindSupport.java index bb43e16..a52df3a 100644 --- a/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/BasicPolicyRebindSupport.java +++ b/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/BasicPolicyRebindSupport.java @@ -20,7 +20,7 @@ package org.apache.brooklyn.core.mgmt.rebind; import org.apache.brooklyn.api.mgmt.rebind.RebindContext; import org.apache.brooklyn.api.mgmt.rebind.mementos.PolicyMemento; -import org.apache.brooklyn.policy.core.AbstractPolicy; +import org.apache.brooklyn.core.policy.AbstractPolicy; import org.apache.brooklyn.util.core.config.ConfigBag; import org.apache.brooklyn.util.core.flags.FlagUtils; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/22033300/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/RebindIteration.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/RebindIteration.java b/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/RebindIteration.java index e6d030d..c3e8030 100644 --- a/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/RebindIteration.java +++ b/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/RebindIteration.java @@ -84,7 +84,7 @@ import org.apache.brooklyn.core.objs.proxy.InternalEntityFactory; import org.apache.brooklyn.core.objs.proxy.InternalFactory; import org.apache.brooklyn.core.objs.proxy.InternalLocationFactory; import org.apache.brooklyn.core.objs.proxy.InternalPolicyFactory; -import org.apache.brooklyn.policy.core.AbstractPolicy; +import org.apache.brooklyn.core.policy.AbstractPolicy; import org.apache.brooklyn.sensor.enricher.AbstractEnricher; import org.apache.brooklyn.sensor.feed.AbstractFeed; import org.apache.brooklyn.util.collections.MutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/22033300/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/dto/MementosGenerators.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/dto/MementosGenerators.java b/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/dto/MementosGenerators.java index 3710cfb..761341b 100644 --- a/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/dto/MementosGenerators.java +++ b/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/dto/MementosGenerators.java @@ -56,7 +56,7 @@ import org.apache.brooklyn.core.mgmt.persist.BrooklynPersistenceUtils; import org.apache.brooklyn.core.mgmt.rebind.AbstractBrooklynObjectRebindSupport; import org.apache.brooklyn.core.mgmt.rebind.TreeUtils; import org.apache.brooklyn.core.objs.BrooklynTypes; -import org.apache.brooklyn.policy.core.AbstractPolicy; +import org.apache.brooklyn.core.policy.AbstractPolicy; import org.apache.brooklyn.sensor.enricher.AbstractEnricher; import org.apache.brooklyn.sensor.feed.AbstractFeed; import org.apache.brooklyn.util.collections.MutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/22033300/core/src/main/java/org/apache/brooklyn/core/objs/BrooklynTypes.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/objs/BrooklynTypes.java b/core/src/main/java/org/apache/brooklyn/core/objs/BrooklynTypes.java index 19b9b79..b6e68ff 100644 --- a/core/src/main/java/org/apache/brooklyn/core/objs/BrooklynTypes.java +++ b/core/src/main/java/org/apache/brooklyn/core/objs/BrooklynTypes.java @@ -28,7 +28,7 @@ import org.apache.brooklyn.api.sensor.Enricher; import org.apache.brooklyn.api.sensor.Sensor; import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.entity.EntityDynamicType; -import org.apache.brooklyn.policy.core.PolicyDynamicType; +import org.apache.brooklyn.core.policy.PolicyDynamicType; import org.apache.brooklyn.sensor.enricher.EnricherDynamicType; import org.apache.brooklyn.util.exceptions.Exceptions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/22033300/core/src/main/java/org/apache/brooklyn/core/objs/proxy/InternalEntityFactory.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/objs/proxy/InternalEntityFactory.java b/core/src/main/java/org/apache/brooklyn/core/objs/proxy/InternalEntityFactory.java index b529edc..c5d1c80 100644 --- a/core/src/main/java/org/apache/brooklyn/core/objs/proxy/InternalEntityFactory.java +++ b/core/src/main/java/org/apache/brooklyn/core/objs/proxy/InternalEntityFactory.java @@ -43,7 +43,7 @@ import org.apache.brooklyn.core.entity.Entities; import org.apache.brooklyn.core.entity.EntityInternal; import org.apache.brooklyn.core.mgmt.BrooklynTaskTags; import org.apache.brooklyn.core.mgmt.internal.ManagementContextInternal; -import org.apache.brooklyn.policy.core.AbstractPolicy; +import org.apache.brooklyn.core.policy.AbstractPolicy; import org.apache.brooklyn.util.collections.MutableMap; import org.apache.brooklyn.util.collections.MutableSet; import org.apache.brooklyn.util.core.flags.FlagUtils; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/22033300/core/src/main/java/org/apache/brooklyn/core/objs/proxy/InternalPolicyFactory.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/objs/proxy/InternalPolicyFactory.java b/core/src/main/java/org/apache/brooklyn/core/objs/proxy/InternalPolicyFactory.java index d0d16d1..4e45580 100644 --- a/core/src/main/java/org/apache/brooklyn/core/objs/proxy/InternalPolicyFactory.java +++ b/core/src/main/java/org/apache/brooklyn/core/objs/proxy/InternalPolicyFactory.java @@ -29,7 +29,7 @@ import org.apache.brooklyn.api.sensor.Feed; import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.entity.AbstractEntity; import org.apache.brooklyn.core.mgmt.internal.ManagementContextInternal; -import org.apache.brooklyn.policy.core.AbstractPolicy; +import org.apache.brooklyn.core.policy.AbstractPolicy; import org.apache.brooklyn.sensor.enricher.AbstractEnricher; import org.apache.brooklyn.util.collections.MutableMap; import org.apache.brooklyn.util.core.config.ConfigBag; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/22033300/core/src/main/java/org/apache/brooklyn/core/policy/AbstractPolicy.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/policy/AbstractPolicy.java b/core/src/main/java/org/apache/brooklyn/core/policy/AbstractPolicy.java new file mode 100644 index 0000000..1c9bb1c --- /dev/null +++ b/core/src/main/java/org/apache/brooklyn/core/policy/AbstractPolicy.java @@ -0,0 +1,119 @@ +/* + * 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.core.policy; + +import java.util.Collections; +import java.util.Map; +import java.util.concurrent.atomic.AtomicBoolean; + +import org.apache.brooklyn.api.mgmt.rebind.RebindSupport; +import org.apache.brooklyn.api.mgmt.rebind.mementos.PolicyMemento; +import org.apache.brooklyn.api.objs.Configurable; +import org.apache.brooklyn.api.policy.Policy; +import org.apache.brooklyn.api.policy.PolicyType; +import org.apache.brooklyn.core.mgmt.rebind.BasicPolicyRebindSupport; +import org.apache.brooklyn.core.objs.AbstractEntityAdjunct; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import com.google.common.base.Objects; + +/** + * Base {@link Policy} implementation; all policies should extend this or its children + */ +public abstract class AbstractPolicy extends AbstractEntityAdjunct implements Policy, Configurable { + @SuppressWarnings("unused") + private static final Logger log = LoggerFactory.getLogger(AbstractPolicy.class); + + protected String policyStatus; + protected AtomicBoolean suspended = new AtomicBoolean(false); + + private final PolicyDynamicType policyType; + + public AbstractPolicy() { + this(Collections.emptyMap()); + } + + public AbstractPolicy(Map<?,?> flags) { + super(flags); + + // TODO Don't let `this` reference escape during construction + policyType = new PolicyDynamicType(this); + + if (isLegacyConstruction() && !isLegacyNoConstructionInit()) { + init(); + } + } + + @Override + public PolicyType getPolicyType() { + return policyType.getSnapshot(); + } + + @Override + public void suspend() { + suspended.set(true); + } + + @Override + public void resume() { + suspended.set(false); + } + + @Override + public boolean isSuspended() { + if (suspended==null) { + // only if accessed during construction in super, e.g. by a call to toString in configure + return true; + } + return suspended.get(); + } + + @Override + public void destroy(){ + suspend(); + super.destroy(); + } + + @Override + public boolean isRunning() { + return !isSuspended() && !isDestroyed(); + } + + @Override + protected void onChanged() { + // currently changes simply trigger re-persistence; there is no intermediate listener as we do for EntityChangeListener + if (getManagementContext() != null) { + getManagementContext().getRebindManager().getChangeListener().onChanged(this); + } + } + + @Override + public RebindSupport<PolicyMemento> getRebindSupport() { + return new BasicPolicyRebindSupport(this); + } + + @Override + public String toString() { + return Objects.toStringHelper(getClass()) + .add("name", name) + .add("running", isRunning()) + .toString(); + } +} http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/22033300/core/src/main/java/org/apache/brooklyn/core/policy/Policies.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/policy/Policies.java b/core/src/main/java/org/apache/brooklyn/core/policy/Policies.java new file mode 100644 index 0000000..3fa69a4 --- /dev/null +++ b/core/src/main/java/org/apache/brooklyn/core/policy/Policies.java @@ -0,0 +1,73 @@ +/* + * 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.core.policy; + +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.sensor.Sensor; +import org.apache.brooklyn.api.sensor.SensorEvent; +import org.apache.brooklyn.api.sensor.SensorEventListener; +import org.apache.brooklyn.core.entity.lifecycle.Lifecycle; +import org.apache.brooklyn.core.policy.AbstractPolicy; + +import groovy.lang.Closure; + +@SuppressWarnings({"rawtypes","unchecked"}) +public class Policies { + + public static SensorEventListener listenerFromValueClosure(final Closure code) { + return new SensorEventListener() { + @Override + public void onEvent(SensorEvent event) { + code.call(event.getValue()); + } + }; + } + + public static <T> Policy newSingleSensorValuePolicy(final Sensor<T> sensor, final Closure code) { + return new AbstractPolicy() { + @Override + public void setEntity(EntityLocal entity) { + super.setEntity(entity); + entity.subscribe(entity, sensor, listenerFromValueClosure(code)); + } + }; + } + + public static <S,T> Policy newSingleSensorValuePolicy(final Entity remoteEntity, final Sensor<T> remoteSensor, + final Closure code) { + return new AbstractPolicy() { + @Override + public void setEntity(EntityLocal entity) { + super.setEntity(entity); + entity.subscribe(remoteEntity, remoteSensor, listenerFromValueClosure(code)); + } + }; + } + + public static Lifecycle getPolicyStatus(Policy p) { + if (p.isRunning()) return Lifecycle.RUNNING; + if (p.isDestroyed()) return Lifecycle.DESTROYED; + if (p.isSuspended()) return Lifecycle.STOPPED; + // TODO could policy be in an error state? + return Lifecycle.CREATED; + } + +} http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/22033300/core/src/main/java/org/apache/brooklyn/core/policy/PolicyDynamicType.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/policy/PolicyDynamicType.java b/core/src/main/java/org/apache/brooklyn/core/policy/PolicyDynamicType.java new file mode 100644 index 0000000..b103dbc --- /dev/null +++ b/core/src/main/java/org/apache/brooklyn/core/policy/PolicyDynamicType.java @@ -0,0 +1,43 @@ +/* + * 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.core.policy; + +import org.apache.brooklyn.api.policy.Policy; +import org.apache.brooklyn.api.policy.PolicyType; +import org.apache.brooklyn.core.objs.BrooklynDynamicType; + +public class PolicyDynamicType extends BrooklynDynamicType<Policy, AbstractPolicy> { + + public PolicyDynamicType(Class<? extends Policy> type) { + super(type); + } + + public PolicyDynamicType(AbstractPolicy policy) { + super(policy); + } + + public PolicyType getSnapshot() { + return (PolicyType) super.getSnapshot(); + } + + @Override + protected PolicyTypeSnapshot newSnapshot() { + return new PolicyTypeSnapshot(name, value(configKeys)); + } +} http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/22033300/core/src/main/java/org/apache/brooklyn/core/policy/PolicyTypeSnapshot.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/policy/PolicyTypeSnapshot.java b/core/src/main/java/org/apache/brooklyn/core/policy/PolicyTypeSnapshot.java new file mode 100644 index 0000000..96f4ad8 --- /dev/null +++ b/core/src/main/java/org/apache/brooklyn/core/policy/PolicyTypeSnapshot.java @@ -0,0 +1,39 @@ +/* + * 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.core.policy; + +import java.util.Map; + +import org.apache.brooklyn.api.policy.PolicyType; +import org.apache.brooklyn.config.ConfigKey; +import org.apache.brooklyn.core.objs.BrooklynTypeSnapshot; + +public class PolicyTypeSnapshot extends BrooklynTypeSnapshot implements PolicyType { + private static final long serialVersionUID = 4670930188951106009L; + + PolicyTypeSnapshot(String name, Map<String, ConfigKey<?>> configKeys) { + super(name, configKeys); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) return true; + return (obj instanceof PolicyTypeSnapshot) && super.equals(obj); + } +} http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/22033300/core/src/main/java/org/apache/brooklyn/entity/group/AbstractMembershipTrackingPolicy.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/entity/group/AbstractMembershipTrackingPolicy.java b/core/src/main/java/org/apache/brooklyn/entity/group/AbstractMembershipTrackingPolicy.java index a2ff5ac..c84e6bc 100644 --- a/core/src/main/java/org/apache/brooklyn/entity/group/AbstractMembershipTrackingPolicy.java +++ b/core/src/main/java/org/apache/brooklyn/entity/group/AbstractMembershipTrackingPolicy.java @@ -33,7 +33,7 @@ import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.BrooklynLogging; import org.apache.brooklyn.core.config.ConfigKeys; import org.apache.brooklyn.core.entity.Attributes; -import org.apache.brooklyn.policy.core.AbstractPolicy; +import org.apache.brooklyn.core.policy.AbstractPolicy; import org.apache.brooklyn.util.collections.MutableMap; import org.apache.brooklyn.util.javalang.JavaClassNames; import org.slf4j.Logger; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/22033300/core/src/main/java/org/apache/brooklyn/location/winrm/AdvertiseWinrmLoginPolicy.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/location/winrm/AdvertiseWinrmLoginPolicy.java b/core/src/main/java/org/apache/brooklyn/location/winrm/AdvertiseWinrmLoginPolicy.java index 8eea8ff..0d5828d 100644 --- a/core/src/main/java/org/apache/brooklyn/location/winrm/AdvertiseWinrmLoginPolicy.java +++ b/core/src/main/java/org/apache/brooklyn/location/winrm/AdvertiseWinrmLoginPolicy.java @@ -25,9 +25,9 @@ import org.apache.brooklyn.api.sensor.AttributeSensor; import org.apache.brooklyn.api.sensor.SensorEvent; import org.apache.brooklyn.api.sensor.SensorEventListener; import org.apache.brooklyn.core.entity.AbstractEntity; +import org.apache.brooklyn.core.policy.AbstractPolicy; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.brooklyn.policy.core.AbstractPolicy; import org.apache.brooklyn.sensor.core.Sensors; import com.google.common.annotations.Beta; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/22033300/core/src/main/java/org/apache/brooklyn/policy/core/AbstractPolicy.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/policy/core/AbstractPolicy.java b/core/src/main/java/org/apache/brooklyn/policy/core/AbstractPolicy.java deleted file mode 100644 index 16a50e4..0000000 --- a/core/src/main/java/org/apache/brooklyn/policy/core/AbstractPolicy.java +++ /dev/null @@ -1,119 +0,0 @@ -/* - * 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.core; - -import java.util.Collections; -import java.util.Map; -import java.util.concurrent.atomic.AtomicBoolean; - -import org.apache.brooklyn.api.mgmt.rebind.RebindSupport; -import org.apache.brooklyn.api.mgmt.rebind.mementos.PolicyMemento; -import org.apache.brooklyn.api.objs.Configurable; -import org.apache.brooklyn.api.policy.Policy; -import org.apache.brooklyn.api.policy.PolicyType; -import org.apache.brooklyn.core.mgmt.rebind.BasicPolicyRebindSupport; -import org.apache.brooklyn.core.objs.AbstractEntityAdjunct; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.google.common.base.Objects; - -/** - * Base {@link Policy} implementation; all policies should extend this or its children - */ -public abstract class AbstractPolicy extends AbstractEntityAdjunct implements Policy, Configurable { - @SuppressWarnings("unused") - private static final Logger log = LoggerFactory.getLogger(AbstractPolicy.class); - - protected String policyStatus; - protected AtomicBoolean suspended = new AtomicBoolean(false); - - private final PolicyDynamicType policyType; - - public AbstractPolicy() { - this(Collections.emptyMap()); - } - - public AbstractPolicy(Map<?,?> flags) { - super(flags); - - // TODO Don't let `this` reference escape during construction - policyType = new PolicyDynamicType(this); - - if (isLegacyConstruction() && !isLegacyNoConstructionInit()) { - init(); - } - } - - @Override - public PolicyType getPolicyType() { - return policyType.getSnapshot(); - } - - @Override - public void suspend() { - suspended.set(true); - } - - @Override - public void resume() { - suspended.set(false); - } - - @Override - public boolean isSuspended() { - if (suspended==null) { - // only if accessed during construction in super, e.g. by a call to toString in configure - return true; - } - return suspended.get(); - } - - @Override - public void destroy(){ - suspend(); - super.destroy(); - } - - @Override - public boolean isRunning() { - return !isSuspended() && !isDestroyed(); - } - - @Override - protected void onChanged() { - // currently changes simply trigger re-persistence; there is no intermediate listener as we do for EntityChangeListener - if (getManagementContext() != null) { - getManagementContext().getRebindManager().getChangeListener().onChanged(this); - } - } - - @Override - public RebindSupport<PolicyMemento> getRebindSupport() { - return new BasicPolicyRebindSupport(this); - } - - @Override - public String toString() { - return Objects.toStringHelper(getClass()) - .add("name", name) - .add("running", isRunning()) - .toString(); - } -} http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/22033300/core/src/main/java/org/apache/brooklyn/policy/core/Policies.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/policy/core/Policies.java b/core/src/main/java/org/apache/brooklyn/policy/core/Policies.java deleted file mode 100644 index 8e6518a..0000000 --- a/core/src/main/java/org/apache/brooklyn/policy/core/Policies.java +++ /dev/null @@ -1,73 +0,0 @@ -/* - * 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.core; - -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.sensor.Sensor; -import org.apache.brooklyn.api.sensor.SensorEvent; -import org.apache.brooklyn.api.sensor.SensorEventListener; -import org.apache.brooklyn.core.entity.lifecycle.Lifecycle; -import org.apache.brooklyn.policy.core.AbstractPolicy; - -import groovy.lang.Closure; - -@SuppressWarnings({"rawtypes","unchecked"}) -public class Policies { - - public static SensorEventListener listenerFromValueClosure(final Closure code) { - return new SensorEventListener() { - @Override - public void onEvent(SensorEvent event) { - code.call(event.getValue()); - } - }; - } - - public static <T> Policy newSingleSensorValuePolicy(final Sensor<T> sensor, final Closure code) { - return new AbstractPolicy() { - @Override - public void setEntity(EntityLocal entity) { - super.setEntity(entity); - entity.subscribe(entity, sensor, listenerFromValueClosure(code)); - } - }; - } - - public static <S,T> Policy newSingleSensorValuePolicy(final Entity remoteEntity, final Sensor<T> remoteSensor, - final Closure code) { - return new AbstractPolicy() { - @Override - public void setEntity(EntityLocal entity) { - super.setEntity(entity); - entity.subscribe(remoteEntity, remoteSensor, listenerFromValueClosure(code)); - } - }; - } - - public static Lifecycle getPolicyStatus(Policy p) { - if (p.isRunning()) return Lifecycle.RUNNING; - if (p.isDestroyed()) return Lifecycle.DESTROYED; - if (p.isSuspended()) return Lifecycle.STOPPED; - // TODO could policy be in an error state? - return Lifecycle.CREATED; - } - -} http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/22033300/core/src/main/java/org/apache/brooklyn/policy/core/PolicyDynamicType.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/policy/core/PolicyDynamicType.java b/core/src/main/java/org/apache/brooklyn/policy/core/PolicyDynamicType.java deleted file mode 100644 index 1453aa9..0000000 --- a/core/src/main/java/org/apache/brooklyn/policy/core/PolicyDynamicType.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * 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.core; - -import org.apache.brooklyn.api.policy.Policy; -import org.apache.brooklyn.api.policy.PolicyType; -import org.apache.brooklyn.core.objs.BrooklynDynamicType; - -public class PolicyDynamicType extends BrooklynDynamicType<Policy, AbstractPolicy> { - - public PolicyDynamicType(Class<? extends Policy> type) { - super(type); - } - - public PolicyDynamicType(AbstractPolicy policy) { - super(policy); - } - - public PolicyType getSnapshot() { - return (PolicyType) super.getSnapshot(); - } - - @Override - protected PolicyTypeSnapshot newSnapshot() { - return new PolicyTypeSnapshot(name, value(configKeys)); - } -} http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/22033300/core/src/main/java/org/apache/brooklyn/policy/core/PolicyTypeSnapshot.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/policy/core/PolicyTypeSnapshot.java b/core/src/main/java/org/apache/brooklyn/policy/core/PolicyTypeSnapshot.java deleted file mode 100644 index 4f6bc08..0000000 --- a/core/src/main/java/org/apache/brooklyn/policy/core/PolicyTypeSnapshot.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * 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.core; - -import java.util.Map; - -import org.apache.brooklyn.api.policy.PolicyType; -import org.apache.brooklyn.config.ConfigKey; -import org.apache.brooklyn.core.objs.BrooklynTypeSnapshot; - -public class PolicyTypeSnapshot extends BrooklynTypeSnapshot implements PolicyType { - private static final long serialVersionUID = 4670930188951106009L; - - PolicyTypeSnapshot(String name, Map<String, ConfigKey<?>> configKeys) { - super(name, configKeys); - } - - @Override - public boolean equals(Object obj) { - if (this == obj) return true; - return (obj instanceof PolicyTypeSnapshot) && super.equals(obj); - } -} http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/22033300/core/src/test/java/org/apache/brooklyn/core/entity/EntityPreManagementTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/entity/EntityPreManagementTest.java b/core/src/test/java/org/apache/brooklyn/core/entity/EntityPreManagementTest.java index bc7ed14..0d83980 100644 --- a/core/src/test/java/org/apache/brooklyn/core/entity/EntityPreManagementTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/entity/EntityPreManagementTest.java @@ -30,10 +30,10 @@ import org.apache.brooklyn.api.sensor.SensorEventListener; import org.apache.brooklyn.core.entity.Attributes; import org.apache.brooklyn.core.entity.Entities; import org.apache.brooklyn.core.entity.factory.ApplicationBuilder; +import org.apache.brooklyn.core.policy.AbstractPolicy; import org.apache.brooklyn.core.test.entity.LocalManagementContextForTests; import org.apache.brooklyn.core.test.entity.TestApplication; import org.apache.brooklyn.core.test.entity.TestEntity; -import org.apache.brooklyn.policy.core.AbstractPolicy; import org.apache.brooklyn.test.TestUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/22033300/core/src/test/java/org/apache/brooklyn/core/entity/EntitySpecTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/entity/EntitySpecTest.java b/core/src/test/java/org/apache/brooklyn/core/entity/EntitySpecTest.java index 9d8cea7..d53bc87 100644 --- a/core/src/test/java/org/apache/brooklyn/core/entity/EntitySpecTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/entity/EntitySpecTest.java @@ -31,12 +31,12 @@ import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.config.BasicConfigKey; import org.apache.brooklyn.core.config.ConfigKeys; import org.apache.brooklyn.core.location.SimulatedLocation; +import org.apache.brooklyn.core.policy.AbstractPolicy; import org.apache.brooklyn.core.test.BrooklynAppUnitTestSupport; import org.apache.brooklyn.core.test.entity.TestEntity; import org.apache.brooklyn.core.test.entity.TestEntityImpl; import org.apache.brooklyn.core.test.entity.TestEntityNoEnrichersImpl; import org.apache.brooklyn.entity.group.BasicGroup; -import org.apache.brooklyn.policy.core.AbstractPolicy; import org.apache.brooklyn.sensor.enricher.AbstractEnricher; import org.apache.brooklyn.test.Asserts; import org.apache.brooklyn.util.core.flags.SetFromFlag; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/22033300/core/src/test/java/org/apache/brooklyn/core/entity/PolicyRegistrationTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/entity/PolicyRegistrationTest.java b/core/src/test/java/org/apache/brooklyn/core/entity/PolicyRegistrationTest.java index 325168a..b802bb6 100644 --- a/core/src/test/java/org/apache/brooklyn/core/entity/PolicyRegistrationTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/entity/PolicyRegistrationTest.java @@ -33,10 +33,10 @@ import org.apache.brooklyn.api.sensor.SensorEvent; import org.apache.brooklyn.api.sensor.SensorEventListener; import org.apache.brooklyn.core.entity.AbstractEntity; import org.apache.brooklyn.core.entity.lifecycle.PolicyDescriptor; +import org.apache.brooklyn.core.policy.AbstractPolicy; import org.apache.brooklyn.core.test.BrooklynAppUnitTestSupport; import org.apache.brooklyn.core.test.entity.TestEntity; import org.apache.brooklyn.core.test.entity.TestEntityNoEnrichersImpl; -import org.apache.brooklyn.policy.core.AbstractPolicy; import org.apache.brooklyn.test.TestUtils; import org.apache.brooklyn.util.collections.MutableMap; import org.testng.annotations.BeforeMethod; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/22033300/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindCatalogItemTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindCatalogItemTest.java b/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindCatalogItemTest.java index 6802543..2bea3a2 100644 --- a/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindCatalogItemTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindCatalogItemTest.java @@ -38,10 +38,10 @@ import org.apache.brooklyn.core.catalog.internal.CatalogLocationItemDto; import org.apache.brooklyn.core.catalog.internal.CatalogPolicyItemDto; import org.apache.brooklyn.core.internal.BrooklynProperties; import org.apache.brooklyn.core.mgmt.internal.LocalManagementContext; +import org.apache.brooklyn.core.policy.AbstractPolicy; import org.apache.brooklyn.core.server.BrooklynServerConfig; import org.apache.brooklyn.core.test.entity.TestEntity; import org.apache.brooklyn.location.localhost.LocalhostMachineProvisioningLocation; -import org.apache.brooklyn.policy.core.AbstractPolicy; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.AfterMethod; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/22033300/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindFailuresTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindFailuresTest.java b/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindFailuresTest.java index b43d62b..26ee74f 100644 --- a/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindFailuresTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindFailuresTest.java @@ -47,8 +47,8 @@ import org.apache.brooklyn.core.entity.EntityPredicates; import org.apache.brooklyn.core.mgmt.internal.LocalManagementContext; import org.apache.brooklyn.core.mgmt.rebind.RebindEntityTest.MyEntity; import org.apache.brooklyn.core.mgmt.rebind.RebindEntityTest.MyEntityImpl; +import org.apache.brooklyn.core.policy.AbstractPolicy; import org.apache.brooklyn.core.test.entity.LocalManagementContextForTests; -import org.apache.brooklyn.policy.core.AbstractPolicy; import org.apache.brooklyn.sensor.enricher.AbstractEnricher; import org.apache.brooklyn.util.core.flags.SetFromFlag; import org.apache.brooklyn.util.exceptions.Exceptions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/22033300/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindPolicyTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindPolicyTest.java b/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindPolicyTest.java index d410474..28c9ba8 100644 --- a/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindPolicyTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindPolicyTest.java @@ -38,10 +38,10 @@ import org.apache.brooklyn.core.config.ConfigKeys; import org.apache.brooklyn.core.entity.Entities; import org.apache.brooklyn.core.location.Locations; import org.apache.brooklyn.core.mgmt.rebind.RebindEnricherTest.MyEnricher; +import org.apache.brooklyn.core.policy.AbstractPolicy; import org.apache.brooklyn.core.test.entity.TestApplication; import org.apache.brooklyn.core.test.entity.TestEntity; import org.apache.brooklyn.entity.group.BasicGroup; -import org.apache.brooklyn.policy.core.AbstractPolicy; import org.apache.brooklyn.sensor.enricher.AbstractEnricher; import org.apache.brooklyn.test.Asserts; import org.apache.brooklyn.util.collections.MutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/22033300/core/src/test/java/org/apache/brooklyn/core/policy/basic/BasicPolicyTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/policy/basic/BasicPolicyTest.java b/core/src/test/java/org/apache/brooklyn/core/policy/basic/BasicPolicyTest.java index 3f5eead..5feae60 100644 --- a/core/src/test/java/org/apache/brooklyn/core/policy/basic/BasicPolicyTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/policy/basic/BasicPolicyTest.java @@ -25,8 +25,8 @@ import java.util.Map; import org.apache.brooklyn.api.policy.PolicySpec; import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.config.BasicConfigKey; +import org.apache.brooklyn.core.policy.AbstractPolicy; import org.apache.brooklyn.core.test.BrooklynAppUnitTestSupport; -import org.apache.brooklyn.policy.core.AbstractPolicy; import org.apache.brooklyn.util.collections.MutableSet; import org.apache.brooklyn.util.core.flags.SetFromFlag; import org.testng.annotations.Test; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/22033300/core/src/test/java/org/apache/brooklyn/core/policy/basic/PolicySubscriptionTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/policy/basic/PolicySubscriptionTest.java b/core/src/test/java/org/apache/brooklyn/core/policy/basic/PolicySubscriptionTest.java index c2cb02c..6ed6918 100644 --- a/core/src/test/java/org/apache/brooklyn/core/policy/basic/PolicySubscriptionTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/policy/basic/PolicySubscriptionTest.java @@ -24,9 +24,9 @@ import org.apache.brooklyn.api.entity.EntitySpec; import org.apache.brooklyn.api.mgmt.SubscriptionHandle; import org.apache.brooklyn.core.entity.RecordingSensorEventListener; import org.apache.brooklyn.core.location.SimulatedLocation; +import org.apache.brooklyn.core.policy.AbstractPolicy; import org.apache.brooklyn.core.test.BrooklynAppUnitTestSupport; import org.apache.brooklyn.core.test.entity.TestEntity; -import org.apache.brooklyn.policy.core.AbstractPolicy; import org.apache.brooklyn.sensor.core.BasicSensorEvent; import org.apache.brooklyn.test.Asserts; import org.testng.annotations.BeforeMethod; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/22033300/core/src/test/java/org/apache/brooklyn/core/policy/basic/PolicyTypeTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/policy/basic/PolicyTypeTest.java b/core/src/test/java/org/apache/brooklyn/core/policy/basic/PolicyTypeTest.java index 9185e2c..4a5fccd 100644 --- a/core/src/test/java/org/apache/brooklyn/core/policy/basic/PolicyTypeTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/policy/basic/PolicyTypeTest.java @@ -22,7 +22,7 @@ import static org.testng.Assert.assertEquals; import org.apache.brooklyn.api.policy.PolicyType; import org.apache.brooklyn.core.config.BasicConfigKey; -import org.apache.brooklyn.policy.core.AbstractPolicy; +import org.apache.brooklyn.core.policy.AbstractPolicy; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/22033300/core/src/test/java/org/apache/brooklyn/core/test/policy/TestPolicy.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/test/policy/TestPolicy.java b/core/src/test/java/org/apache/brooklyn/core/test/policy/TestPolicy.java index bb0fa99..baa3d47 100644 --- a/core/src/test/java/org/apache/brooklyn/core/test/policy/TestPolicy.java +++ b/core/src/test/java/org/apache/brooklyn/core/test/policy/TestPolicy.java @@ -25,7 +25,7 @@ import org.apache.brooklyn.api.sensor.AttributeSensor; import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.config.BasicConfigKey; import org.apache.brooklyn.core.config.ConfigKeys; -import org.apache.brooklyn.policy.core.AbstractPolicy; +import org.apache.brooklyn.core.policy.AbstractPolicy; import org.apache.brooklyn.util.core.flags.SetFromFlag; import com.google.common.reflect.TypeToken; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/22033300/core/src/test/java/org/apache/brooklyn/entity/group/GroupPickUpEntitiesTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/entity/group/GroupPickUpEntitiesTest.java b/core/src/test/java/org/apache/brooklyn/entity/group/GroupPickUpEntitiesTest.java index f0ec721..2ab2230 100644 --- a/core/src/test/java/org/apache/brooklyn/entity/group/GroupPickUpEntitiesTest.java +++ b/core/src/test/java/org/apache/brooklyn/entity/group/GroupPickUpEntitiesTest.java @@ -28,10 +28,10 @@ import org.apache.brooklyn.api.sensor.SensorEventListener; import org.apache.brooklyn.core.entity.Entities; import org.apache.brooklyn.core.entity.EntityInternal; import org.apache.brooklyn.core.entity.trait.Startable; +import org.apache.brooklyn.core.policy.AbstractPolicy; import org.apache.brooklyn.core.test.BrooklynAppUnitTestSupport; import org.apache.brooklyn.core.test.entity.TestEntity; import org.apache.brooklyn.entity.group.BasicGroup; -import org.apache.brooklyn.policy.core.AbstractPolicy; import org.apache.brooklyn.test.Asserts; import org.apache.brooklyn.test.EntityTestUtils; import org.apache.brooklyn.util.javalang.Boxing; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/22033300/locations/jclouds/src/main/java/org/apache/brooklyn/policy/jclouds/os/CreateUserPolicy.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/main/java/org/apache/brooklyn/policy/jclouds/os/CreateUserPolicy.java b/locations/jclouds/src/main/java/org/apache/brooklyn/policy/jclouds/os/CreateUserPolicy.java index 18d2312..4b7e9c5 100644 --- a/locations/jclouds/src/main/java/org/apache/brooklyn/policy/jclouds/os/CreateUserPolicy.java +++ b/locations/jclouds/src/main/java/org/apache/brooklyn/policy/jclouds/os/CreateUserPolicy.java @@ -30,8 +30,8 @@ import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.config.ConfigKeys; import org.apache.brooklyn.core.entity.AbstractEntity; import org.apache.brooklyn.core.entity.EntityInternal; +import org.apache.brooklyn.core.policy.AbstractPolicy; import org.apache.brooklyn.location.ssh.SshMachineLocation; -import org.apache.brooklyn.policy.core.AbstractPolicy; import org.apache.brooklyn.sensor.core.Sensors; import org.apache.brooklyn.util.core.flags.SetFromFlag; import org.apache.brooklyn.util.core.internal.ssh.SshTool; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/22033300/policy/src/main/java/org/apache/brooklyn/policy/autoscaling/AutoScalerPolicy.java ---------------------------------------------------------------------- diff --git a/policy/src/main/java/org/apache/brooklyn/policy/autoscaling/AutoScalerPolicy.java b/policy/src/main/java/org/apache/brooklyn/policy/autoscaling/AutoScalerPolicy.java index f7f4a9c..0956573 100644 --- a/policy/src/main/java/org/apache/brooklyn/policy/autoscaling/AutoScalerPolicy.java +++ b/policy/src/main/java/org/apache/brooklyn/policy/autoscaling/AutoScalerPolicy.java @@ -46,8 +46,8 @@ import org.apache.brooklyn.core.entity.Entities; import org.apache.brooklyn.core.entity.trait.Resizable; import org.apache.brooklyn.core.entity.trait.Startable; import org.apache.brooklyn.core.mgmt.BrooklynTaskTags; +import org.apache.brooklyn.core.policy.AbstractPolicy; import org.apache.brooklyn.policy.autoscaling.SizeHistory.WindowSummary; -import org.apache.brooklyn.policy.core.AbstractPolicy; import org.apache.brooklyn.policy.loadbalancing.LoadBalancingPolicy; import org.apache.brooklyn.sensor.core.BasicNotificationSensor; import org.apache.brooklyn.util.collections.MutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/22033300/policy/src/main/java/org/apache/brooklyn/policy/followthesun/FollowTheSunPolicy.java ---------------------------------------------------------------------- diff --git a/policy/src/main/java/org/apache/brooklyn/policy/followthesun/FollowTheSunPolicy.java b/policy/src/main/java/org/apache/brooklyn/policy/followthesun/FollowTheSunPolicy.java index 3d5cf02..05f8800 100644 --- a/policy/src/main/java/org/apache/brooklyn/policy/followthesun/FollowTheSunPolicy.java +++ b/policy/src/main/java/org/apache/brooklyn/policy/followthesun/FollowTheSunPolicy.java @@ -39,9 +39,9 @@ import org.apache.brooklyn.api.sensor.Sensor; import org.apache.brooklyn.api.sensor.SensorEvent; import org.apache.brooklyn.api.sensor.SensorEventListener; import org.apache.brooklyn.core.entity.Attributes; +import org.apache.brooklyn.core.policy.AbstractPolicy; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.brooklyn.policy.core.AbstractPolicy; import org.apache.brooklyn.policy.followthesun.FollowTheSunPool.ContainerItemPair; import org.apache.brooklyn.policy.loadbalancing.Movable; import org.apache.brooklyn.util.collections.MutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/22033300/policy/src/main/java/org/apache/brooklyn/policy/ha/AbstractFailureDetector.java ---------------------------------------------------------------------- diff --git a/policy/src/main/java/org/apache/brooklyn/policy/ha/AbstractFailureDetector.java b/policy/src/main/java/org/apache/brooklyn/policy/ha/AbstractFailureDetector.java index 6ddd9fa..2dddc8f 100644 --- a/policy/src/main/java/org/apache/brooklyn/policy/ha/AbstractFailureDetector.java +++ b/policy/src/main/java/org/apache/brooklyn/policy/ha/AbstractFailureDetector.java @@ -32,9 +32,9 @@ import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.config.ConfigKeys; import org.apache.brooklyn.core.entity.EntityInternal; import org.apache.brooklyn.core.mgmt.BrooklynTaskTags; +import org.apache.brooklyn.core.policy.AbstractPolicy; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.brooklyn.policy.core.AbstractPolicy; import org.apache.brooklyn.policy.ha.HASensors.FailureDescriptor; import org.apache.brooklyn.util.collections.MutableMap; import org.apache.brooklyn.util.core.flags.SetFromFlag; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/22033300/policy/src/main/java/org/apache/brooklyn/policy/ha/ConditionalSuspendPolicy.java ---------------------------------------------------------------------- diff --git a/policy/src/main/java/org/apache/brooklyn/policy/ha/ConditionalSuspendPolicy.java b/policy/src/main/java/org/apache/brooklyn/policy/ha/ConditionalSuspendPolicy.java index f5cbda5..d2a2e36 100644 --- a/policy/src/main/java/org/apache/brooklyn/policy/ha/ConditionalSuspendPolicy.java +++ b/policy/src/main/java/org/apache/brooklyn/policy/ha/ConditionalSuspendPolicy.java @@ -25,7 +25,7 @@ import org.apache.brooklyn.api.sensor.SensorEvent; import org.apache.brooklyn.api.sensor.SensorEventListener; import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.config.ConfigKeys; -import org.apache.brooklyn.policy.core.AbstractPolicy; +import org.apache.brooklyn.core.policy.AbstractPolicy; import org.apache.brooklyn.util.core.flags.SetFromFlag; import org.apache.brooklyn.util.javalang.JavaClassNames; import org.slf4j.Logger; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/22033300/policy/src/main/java/org/apache/brooklyn/policy/ha/ServiceReplacer.java ---------------------------------------------------------------------- diff --git a/policy/src/main/java/org/apache/brooklyn/policy/ha/ServiceReplacer.java b/policy/src/main/java/org/apache/brooklyn/policy/ha/ServiceReplacer.java index 7295916..5e036e1 100644 --- a/policy/src/main/java/org/apache/brooklyn/policy/ha/ServiceReplacer.java +++ b/policy/src/main/java/org/apache/brooklyn/policy/ha/ServiceReplacer.java @@ -42,8 +42,8 @@ import org.apache.brooklyn.core.entity.Entities; import org.apache.brooklyn.core.entity.EntityInternal; import org.apache.brooklyn.core.entity.lifecycle.ServiceStateLogic.ServiceProblemsLogic; import org.apache.brooklyn.core.entity.trait.MemberReplaceable; +import org.apache.brooklyn.core.policy.AbstractPolicy; import org.apache.brooklyn.entity.group.StopFailedRuntimeException; -import org.apache.brooklyn.policy.core.AbstractPolicy; import org.apache.brooklyn.policy.ha.HASensors.FailureDescriptor; import org.apache.brooklyn.sensor.core.BasicNotificationSensor; import org.apache.brooklyn.util.collections.MutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/22033300/policy/src/main/java/org/apache/brooklyn/policy/ha/ServiceRestarter.java ---------------------------------------------------------------------- diff --git a/policy/src/main/java/org/apache/brooklyn/policy/ha/ServiceRestarter.java b/policy/src/main/java/org/apache/brooklyn/policy/ha/ServiceRestarter.java index eef106b..37ce701 100644 --- a/policy/src/main/java/org/apache/brooklyn/policy/ha/ServiceRestarter.java +++ b/policy/src/main/java/org/apache/brooklyn/policy/ha/ServiceRestarter.java @@ -35,7 +35,7 @@ import org.apache.brooklyn.core.entity.EntityInternal; import org.apache.brooklyn.core.entity.lifecycle.Lifecycle; import org.apache.brooklyn.core.entity.lifecycle.ServiceStateLogic; import org.apache.brooklyn.core.entity.trait.Startable; -import org.apache.brooklyn.policy.core.AbstractPolicy; +import org.apache.brooklyn.core.policy.AbstractPolicy; import org.apache.brooklyn.policy.ha.HASensors.FailureDescriptor; import org.apache.brooklyn.sensor.core.BasicNotificationSensor; import org.apache.brooklyn.util.collections.MutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/22033300/policy/src/main/java/org/apache/brooklyn/policy/loadbalancing/LoadBalancingPolicy.java ---------------------------------------------------------------------- diff --git a/policy/src/main/java/org/apache/brooklyn/policy/loadbalancing/LoadBalancingPolicy.java b/policy/src/main/java/org/apache/brooklyn/policy/loadbalancing/LoadBalancingPolicy.java index f7011d4..d714557 100644 --- a/policy/src/main/java/org/apache/brooklyn/policy/loadbalancing/LoadBalancingPolicy.java +++ b/policy/src/main/java/org/apache/brooklyn/policy/loadbalancing/LoadBalancingPolicy.java @@ -37,10 +37,10 @@ import org.apache.brooklyn.api.sensor.SensorEvent; import org.apache.brooklyn.api.sensor.SensorEventListener; import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.entity.EntityInternal; +import org.apache.brooklyn.core.policy.AbstractPolicy; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.brooklyn.policy.autoscaling.AutoScalerPolicy; -import org.apache.brooklyn.policy.core.AbstractPolicy; import org.apache.brooklyn.util.collections.MutableMap; import org.apache.brooklyn.util.core.flags.SetFromFlag; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/22033300/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/TestReferencingPolicy.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/TestReferencingPolicy.java b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/TestReferencingPolicy.java index 354a518..e8b339e 100644 --- a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/TestReferencingPolicy.java +++ b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/TestReferencingPolicy.java @@ -21,7 +21,7 @@ package org.apache.brooklyn.camp.brooklyn; import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.config.BasicConfigKey; -import org.apache.brooklyn.policy.core.AbstractPolicy; +import org.apache.brooklyn.core.policy.AbstractPolicy; public class TestReferencingPolicy extends AbstractPolicy { public static final ConfigKey<Entity> TEST_APPLICATION = new BasicConfigKey<Entity>(Entity.class, "test.reference.app"); http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/22033300/usage/cli/src/main/java/org/apache/brooklyn/cli/lister/ClassFinder.java ---------------------------------------------------------------------- diff --git a/usage/cli/src/main/java/org/apache/brooklyn/cli/lister/ClassFinder.java b/usage/cli/src/main/java/org/apache/brooklyn/cli/lister/ClassFinder.java index 00fa590..bd1bf6d 100644 --- a/usage/cli/src/main/java/org/apache/brooklyn/cli/lister/ClassFinder.java +++ b/usage/cli/src/main/java/org/apache/brooklyn/cli/lister/ClassFinder.java @@ -33,8 +33,8 @@ import org.apache.brooklyn.api.policy.Policy; import org.apache.brooklyn.api.sensor.Enricher; import org.apache.brooklyn.core.entity.AbstractApplication; import org.apache.brooklyn.core.entity.AbstractEntity; +import org.apache.brooklyn.core.policy.AbstractPolicy; import org.apache.brooklyn.entity.software.base.SoftwareProcessImpl; -import org.apache.brooklyn.policy.core.AbstractPolicy; import org.apache.brooklyn.sensor.enricher.AbstractEnricher; import org.apache.brooklyn.util.core.ResourceUtils; import org.apache.brooklyn.util.core.javalang.UrlClassLoader; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/22033300/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 8008dd1..f933142 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 @@ -29,7 +29,7 @@ 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.policy.core.Policies; +import org.apache.brooklyn.core.policy.Policies; import org.apache.brooklyn.rest.api.PolicyApi; import org.apache.brooklyn.rest.domain.PolicySummary; import org.apache.brooklyn.rest.domain.Status; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/22033300/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/PolicyTransformer.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/PolicyTransformer.java b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/PolicyTransformer.java index 03003f1..39bc783 100644 --- a/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/PolicyTransformer.java +++ b/usage/rest-server/src/main/java/org/apache/brooklyn/rest/transform/PolicyTransformer.java @@ -25,7 +25,7 @@ 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.config.ConfigKey; -import org.apache.brooklyn.policy.core.Policies; +import org.apache.brooklyn.core.policy.Policies; import org.apache.brooklyn.rest.domain.ApplicationSummary; import org.apache.brooklyn.rest.domain.PolicyConfigSummary; import org.apache.brooklyn.rest.domain.PolicySummary; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/22033300/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 e7e8ab6..a36854a 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 @@ -58,8 +58,8 @@ import org.apache.brooklyn.core.entity.trait.Startable; import org.apache.brooklyn.core.mgmt.entitlement.Entitlements; import org.apache.brooklyn.core.mgmt.entitlement.Entitlements.StringAndArgument; import org.apache.brooklyn.core.objs.BrooklynTypes; +import org.apache.brooklyn.core.policy.AbstractPolicy; import org.apache.brooklyn.entity.stock.BasicApplication; -import org.apache.brooklyn.policy.core.AbstractPolicy; import org.apache.brooklyn.rest.domain.ApplicationSpec; import org.apache.brooklyn.rest.domain.EntitySpec; import org.apache.brooklyn.sensor.enricher.Enrichers; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/22033300/usage/rest-server/src/test/java/org/apache/brooklyn/rest/testing/mocks/CapitalizePolicy.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/testing/mocks/CapitalizePolicy.java b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/testing/mocks/CapitalizePolicy.java index 3a11cb9..412ab7e 100644 --- a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/testing/mocks/CapitalizePolicy.java +++ b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/testing/mocks/CapitalizePolicy.java @@ -19,7 +19,7 @@ package org.apache.brooklyn.rest.testing.mocks; import org.apache.brooklyn.api.entity.EntityLocal; -import org.apache.brooklyn.policy.core.AbstractPolicy; +import org.apache.brooklyn.core.policy.AbstractPolicy; public class CapitalizePolicy extends AbstractPolicy { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/22033300/usage/rest-server/src/test/java/org/apache/brooklyn/rest/testing/mocks/RestMockSimplePolicy.java ---------------------------------------------------------------------- diff --git a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/testing/mocks/RestMockSimplePolicy.java b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/testing/mocks/RestMockSimplePolicy.java index 2234eca..e15cdd1 100644 --- a/usage/rest-server/src/test/java/org/apache/brooklyn/rest/testing/mocks/RestMockSimplePolicy.java +++ b/usage/rest-server/src/test/java/org/apache/brooklyn/rest/testing/mocks/RestMockSimplePolicy.java @@ -22,7 +22,7 @@ import java.util.Map; import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.config.BasicConfigKey; -import org.apache.brooklyn.policy.core.AbstractPolicy; +import org.apache.brooklyn.core.policy.AbstractPolicy; import org.apache.brooklyn.util.core.flags.SetFromFlag; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/22033300/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 3eef545..be6d50c 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 @@ -39,10 +39,10 @@ import org.apache.brooklyn.core.entity.AbstractApplication; import org.apache.brooklyn.core.entity.Entities; import org.apache.brooklyn.core.mgmt.internal.LocalManagementContext; import org.apache.brooklyn.core.objs.proxy.EntityProxy; +import org.apache.brooklyn.core.policy.AbstractPolicy; import org.apache.brooklyn.core.test.entity.LocalManagementContextForTests; import org.apache.brooklyn.core.test.entity.TestEntityImpl; import org.apache.brooklyn.entity.stock.BasicEntity; -import org.apache.brooklyn.policy.core.AbstractPolicy; import org.apache.brooklyn.rest.domain.ApplicationSpec; import org.apache.brooklyn.rest.domain.EntitySpec; import org.apache.brooklyn.util.collections.MutableMap;
