http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2a78e273/core/src/main/java/org/apache/brooklyn/sensor/core/Sensors.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/sensor/core/Sensors.java b/core/src/main/java/org/apache/brooklyn/sensor/core/Sensors.java deleted file mode 100644 index 5e9ed81..0000000 --- a/core/src/main/java/org/apache/brooklyn/sensor/core/Sensors.java +++ /dev/null @@ -1,164 +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.sensor.core; - -import static com.google.common.base.Preconditions.checkNotNull; - -import java.net.InetAddress; -import java.net.URI; -import java.net.URL; - -import javax.annotation.Nullable; - -import org.apache.brooklyn.api.sensor.AttributeSensor; -import org.apache.brooklyn.api.sensor.AttributeSensor.SensorPersistenceMode; -import org.apache.brooklyn.core.config.render.RendererHints; -import org.apache.brooklyn.util.net.UserAndHostAndPort; -import org.apache.brooklyn.util.text.StringFunctions; -import org.apache.brooklyn.util.time.Duration; -import org.apache.brooklyn.util.time.Time; - -import com.google.common.annotations.Beta; -import com.google.common.base.Function; -import com.google.common.net.HostAndPort; -import com.google.common.reflect.TypeToken; - -public class Sensors { - - @Beta - public static <T> Builder<T> builder(TypeToken<T> type, String name) { - return new Builder<T>().type(type).name(name); - } - - @Beta - public static <T> Builder<T> builder(Class<T> type, String name) { - return new Builder<T>().type(type).name(name); - } - - @Beta - public static class Builder<T> { - private String name; - private TypeToken<T> type; - private String description; - private SensorPersistenceMode persistence; - - protected Builder() { // use builder(type, name) instead - } - public Builder<T> name(String val) { - this.name = checkNotNull(val, "name"); return this; - } - public Builder<T> type(Class<T> val) { - return type(TypeToken.of(val)); - } - public Builder<T> type(TypeToken<T> val) { - this.type = checkNotNull(val, "type"); return this; - } - public Builder<T> description(String val) { - this.description = val; return this; - } - public Builder<T> persistence(SensorPersistenceMode val) { - this.persistence = val; return this; - } - public AttributeSensor<T> build() { - return new BasicAttributeSensor<T>(type, name, description, persistence); - } - } - - public static <T> AttributeSensor<T> newSensor(Class<T> type, String name) { - return new BasicAttributeSensor<T>(type, name); - } - - public static <T> AttributeSensor<T> newSensor(Class<T> type, String name, String description) { - return new BasicAttributeSensor<T>(type, name, description); - } - - public static <T> AttributeSensor<T> newSensor(TypeToken<T> type, String name, String description) { - return new BasicAttributeSensor<T>(type, name, description); - } - - public static AttributeSensor<String> newStringSensor(String name) { - return newSensor(String.class, name); - } - - public static AttributeSensor<String> newStringSensor(String name, String description) { - return newSensor(String.class, name, description); - } - - public static AttributeSensor<Integer> newIntegerSensor(String name) { - return newSensor(Integer.class, name); - } - - public static AttributeSensor<Integer> newIntegerSensor(String name, String description) { - return newSensor(Integer.class, name, description); - } - - public static AttributeSensor<Long> newLongSensor(String name) { - return newSensor(Long.class, name); - } - - public static AttributeSensor<Long> newLongSensor(String name, String description) { - return newSensor(Long.class, name, description); - } - - public static AttributeSensor<Double> newDoubleSensor(String name) { - return newSensor(Double.class, name); - } - - public static AttributeSensor<Double> newDoubleSensor(String name, String description) { - return newSensor(Double.class, name, description); - } - - public static AttributeSensor<Boolean> newBooleanSensor(String name) { - return newSensor(Boolean.class, name); - } - - public static AttributeSensor<Boolean> newBooleanSensor(String name, String description) { - return newSensor(Boolean.class, name, description); - } - - // Extensions to sensors - - public static <T> AttributeSensor<T> newSensorRenamed(String newName, AttributeSensor<T> sensor) { - return new BasicAttributeSensor<T>(sensor.getTypeToken(), newName, sensor.getDescription()); - } - - public static <T> AttributeSensor<T> newSensorWithPrefix(String prefix, AttributeSensor<T> sensor) { - return newSensorRenamed(prefix+sensor.getName(), sensor); - } - - // Display hints for common utility objects - - static { - RendererHints.register(Duration.class, RendererHints.displayValue(Time.fromDurationToTimeStringRounded())); - RendererHints.register(HostAndPort.class, RendererHints.displayValue(StringFunctions.toStringFunction())); - RendererHints.register(UserAndHostAndPort.class, RendererHints.displayValue(StringFunctions.toStringFunction())); - RendererHints.register(InetAddress.class, RendererHints.displayValue(new Function<InetAddress,String>() { - @Override - public String apply(@Nullable InetAddress input) { - return input == null ? null : input.getHostAddress(); - } - })); - - RendererHints.register(URL.class, RendererHints.displayValue(StringFunctions.toStringFunction())); - RendererHints.register(URL.class, RendererHints.openWithUrl(StringFunctions.toStringFunction())); - RendererHints.register(URI.class, RendererHints.displayValue(StringFunctions.toStringFunction())); - RendererHints.register(URI.class, RendererHints.openWithUrl(StringFunctions.toStringFunction())); - } - -}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2a78e273/core/src/main/java/org/apache/brooklyn/sensor/core/StaticSensor.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/sensor/core/StaticSensor.java b/core/src/main/java/org/apache/brooklyn/sensor/core/StaticSensor.java deleted file mode 100644 index 0c3a00f..0000000 --- a/core/src/main/java/org/apache/brooklyn/sensor/core/StaticSensor.java +++ /dev/null @@ -1,72 +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.sensor.core; - -import org.apache.brooklyn.api.entity.EntityLocal; -import org.apache.brooklyn.api.mgmt.Task; -import org.apache.brooklyn.config.ConfigKey; -import org.apache.brooklyn.core.config.ConfigKeys; -import org.apache.brooklyn.core.effector.AddSensor; -import org.apache.brooklyn.sensor.enricher.Propagator; -import org.apache.brooklyn.util.core.config.ConfigBag; -import org.apache.brooklyn.util.core.task.Tasks; -import org.apache.brooklyn.util.core.task.ValueResolver; -import org.apache.brooklyn.util.guava.Maybe; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.google.common.base.Supplier; - -/** - * Provides an initializer/feed which simply sets a given value. - * <p> - * {@link Task}/{@link Supplier} values are resolved when written, - * unlike config values which are resolved on each read. - * <p> - * This supports a {@link StaticSensor#SENSOR_PERIOD} - * which can be useful if the supplied value is such a function. - * However when the source is another sensor, - * consider using {@link Propagator} which listens for changes instead. */ -public class StaticSensor<T> extends AddSensor<T> { - - private static final Logger log = LoggerFactory.getLogger(StaticSensor.class); - - public static final ConfigKey<Object> STATIC_VALUE = ConfigKeys.newConfigKey(Object.class, "static.value"); - - private final Object value; - - public StaticSensor(ConfigBag params) { - super(params); - value = params.get(STATIC_VALUE); - } - - @SuppressWarnings("unchecked") - @Override - public void apply(EntityLocal entity) { - super.apply(entity); - - Maybe<T> v = Tasks.resolving(value).as((Class<T>)sensor.getType()).timeout(ValueResolver.PRETTY_QUICK_WAIT).getMaybe(); - if (v.isPresent()) { - log.debug(this+" setting sensor "+sensor+" to "+v.get()); - entity.setAttribute(sensor, v.get()); - } else { - log.debug(this+" not setting sensor "+sensor+"; cannot resolve "+value); - } - } -} http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2a78e273/core/src/main/java/org/apache/brooklyn/sensor/core/TemplatedStringAttributeSensorAndConfigKey.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/sensor/core/TemplatedStringAttributeSensorAndConfigKey.java b/core/src/main/java/org/apache/brooklyn/sensor/core/TemplatedStringAttributeSensorAndConfigKey.java deleted file mode 100644 index 27367c3..0000000 --- a/core/src/main/java/org/apache/brooklyn/sensor/core/TemplatedStringAttributeSensorAndConfigKey.java +++ /dev/null @@ -1,66 +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.sensor.core; - -import org.apache.brooklyn.api.entity.Entity; -import org.apache.brooklyn.api.mgmt.ManagementContext; -import org.apache.brooklyn.config.ConfigKey; -import org.apache.brooklyn.core.entity.EntityInternal; -import org.apache.brooklyn.core.mgmt.internal.ManagementContextInternal; -import org.apache.brooklyn.util.core.text.TemplateProcessor; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.google.common.collect.ImmutableMap; - -/** - * A {@link ConfigKey} which takes a freemarker-templated string, - * and whose value is converted to a sensor by processing the template - * with access to config and methods on the entity where it is set. - */ -public class TemplatedStringAttributeSensorAndConfigKey extends BasicAttributeSensorAndConfigKey<String> { - private static final long serialVersionUID = 4680651022807491321L; - - public static final Logger LOG = LoggerFactory.getLogger(TemplatedStringAttributeSensorAndConfigKey.class); - - public TemplatedStringAttributeSensorAndConfigKey(String name) { - this(name, name, null); - } - public TemplatedStringAttributeSensorAndConfigKey(String name, String description) { - this(name, description, null); - } - public TemplatedStringAttributeSensorAndConfigKey(String name, String description, String defaultValue) { - super(String.class, name, description, defaultValue); - } - public TemplatedStringAttributeSensorAndConfigKey(TemplatedStringAttributeSensorAndConfigKey orig, String defaultValue) { - super(orig, defaultValue); - } - - @Override - protected String convertConfigToSensor(String value, Entity entity) { - if (value == null) return null; - return TemplateProcessor.processTemplateContents(value, (EntityInternal)entity, ImmutableMap.<String,Object>of()); - } - - @Override - protected String convertConfigToSensor(String value, ManagementContext managementContext) { - if (value == null) return null; - return TemplateProcessor.processTemplateContents(value, (ManagementContextInternal)managementContext, ImmutableMap.<String,Object>of()); - } -} http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2a78e273/core/src/main/java/org/apache/brooklyn/sensor/enricher/AbstractTransformer.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/sensor/enricher/AbstractTransformer.java b/core/src/main/java/org/apache/brooklyn/sensor/enricher/AbstractTransformer.java index 09cf404..1ff7938 100644 --- a/core/src/main/java/org/apache/brooklyn/sensor/enricher/AbstractTransformer.java +++ b/core/src/main/java/org/apache/brooklyn/sensor/enricher/AbstractTransformer.java @@ -26,7 +26,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.sensor.core.BasicSensorEvent; +import org.apache.brooklyn.core.sensor.BasicSensorEvent; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2a78e273/core/src/main/java/org/apache/brooklyn/sensor/enricher/AbstractTypeTransformingEnricher.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/sensor/enricher/AbstractTypeTransformingEnricher.java b/core/src/main/java/org/apache/brooklyn/sensor/enricher/AbstractTypeTransformingEnricher.java index c022da7..f66004c 100644 --- a/core/src/main/java/org/apache/brooklyn/sensor/enricher/AbstractTypeTransformingEnricher.java +++ b/core/src/main/java/org/apache/brooklyn/sensor/enricher/AbstractTypeTransformingEnricher.java @@ -23,7 +23,7 @@ import org.apache.brooklyn.api.entity.EntityLocal; import org.apache.brooklyn.api.sensor.AttributeSensor; import org.apache.brooklyn.api.sensor.Sensor; import org.apache.brooklyn.api.sensor.SensorEventListener; -import org.apache.brooklyn.sensor.core.BasicSensorEvent; +import org.apache.brooklyn.core.sensor.BasicSensorEvent; import org.apache.brooklyn.util.core.flags.SetFromFlag; /** http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2a78e273/core/src/main/java/org/apache/brooklyn/sensor/enricher/AddingEnricher.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/sensor/enricher/AddingEnricher.java b/core/src/main/java/org/apache/brooklyn/sensor/enricher/AddingEnricher.java index 067c568..997f974 100644 --- a/core/src/main/java/org/apache/brooklyn/sensor/enricher/AddingEnricher.java +++ b/core/src/main/java/org/apache/brooklyn/sensor/enricher/AddingEnricher.java @@ -23,7 +23,7 @@ import org.apache.brooklyn.api.sensor.AttributeSensor; 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.sensor.core.BasicSensorEvent; +import org.apache.brooklyn.core.sensor.BasicSensorEvent; /** * enricher which adds multiple sensors on an entity to produce a new sensor http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2a78e273/core/src/main/java/org/apache/brooklyn/sensor/enricher/Combiner.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/sensor/enricher/Combiner.java b/core/src/main/java/org/apache/brooklyn/sensor/enricher/Combiner.java index 583ee7d..823b8b7 100644 --- a/core/src/main/java/org/apache/brooklyn/sensor/enricher/Combiner.java +++ b/core/src/main/java/org/apache/brooklyn/sensor/enricher/Combiner.java @@ -35,7 +35,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.sensor.core.BasicSensorEvent; +import org.apache.brooklyn.core.sensor.BasicSensorEvent; import org.apache.brooklyn.util.collections.MutableList; import org.apache.brooklyn.util.exceptions.Exceptions; import org.slf4j.Logger; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2a78e273/core/src/main/java/org/apache/brooklyn/sensor/enricher/Joiner.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/sensor/enricher/Joiner.java b/core/src/main/java/org/apache/brooklyn/sensor/enricher/Joiner.java index 4ab4fe9..c6d9329 100644 --- a/core/src/main/java/org/apache/brooklyn/sensor/enricher/Joiner.java +++ b/core/src/main/java/org/apache/brooklyn/sensor/enricher/Joiner.java @@ -28,7 +28,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.sensor.core.BasicSensorEvent; +import org.apache.brooklyn.core.sensor.BasicSensorEvent; import org.apache.brooklyn.util.collections.MutableList; import org.apache.brooklyn.util.core.flags.SetFromFlag; import org.apache.brooklyn.util.text.StringEscapes; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2a78e273/core/src/main/java/org/apache/brooklyn/sensor/feed/ConfigToAttributes.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/sensor/feed/ConfigToAttributes.java b/core/src/main/java/org/apache/brooklyn/sensor/feed/ConfigToAttributes.java index b3c156a..7938cc4 100644 --- a/core/src/main/java/org/apache/brooklyn/sensor/feed/ConfigToAttributes.java +++ b/core/src/main/java/org/apache/brooklyn/sensor/feed/ConfigToAttributes.java @@ -21,8 +21,8 @@ package org.apache.brooklyn.sensor.feed; import org.apache.brooklyn.api.entity.EntityLocal; import org.apache.brooklyn.api.mgmt.ManagementContext; import org.apache.brooklyn.api.sensor.Sensor; -import org.apache.brooklyn.sensor.core.AttributeSensorAndConfigKey; -import org.apache.brooklyn.sensor.core.TemplatedStringAttributeSensorAndConfigKey; +import org.apache.brooklyn.core.sensor.AttributeSensorAndConfigKey; +import org.apache.brooklyn.core.sensor.TemplatedStringAttributeSensorAndConfigKey; /** Simple config adapter for setting {@link AttributeSensorAndConfigKey} sensor values from the config value or config default */ http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2a78e273/core/src/main/java/org/apache/brooklyn/sensor/feed/FeedConfig.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/sensor/feed/FeedConfig.java b/core/src/main/java/org/apache/brooklyn/sensor/feed/FeedConfig.java index d3f7597..32ea2ab 100644 --- a/core/src/main/java/org/apache/brooklyn/sensor/feed/FeedConfig.java +++ b/core/src/main/java/org/apache/brooklyn/sensor/feed/FeedConfig.java @@ -22,7 +22,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import org.apache.brooklyn.api.sensor.AttributeSensor; import org.apache.brooklyn.core.entity.Entities; -import org.apache.brooklyn.sensor.core.Sensors; +import org.apache.brooklyn.core.sensor.Sensors; import org.apache.brooklyn.sensor.feed.http.HttpPollConfig; import org.apache.brooklyn.util.collections.MutableList; import org.apache.brooklyn.util.guava.Functionals; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2a78e273/core/src/main/java/org/apache/brooklyn/sensor/feed/windows/WindowsPerformanceCounterFeed.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/sensor/feed/windows/WindowsPerformanceCounterFeed.java b/core/src/main/java/org/apache/brooklyn/sensor/feed/windows/WindowsPerformanceCounterFeed.java index 95aba9f..e9767d9 100644 --- a/core/src/main/java/org/apache/brooklyn/sensor/feed/windows/WindowsPerformanceCounterFeed.java +++ b/core/src/main/java/org/apache/brooklyn/sensor/feed/windows/WindowsPerformanceCounterFeed.java @@ -42,10 +42,10 @@ import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.config.ConfigKeys; import org.apache.brooklyn.core.effector.EffectorTasks; import org.apache.brooklyn.core.entity.EntityInternal; +import org.apache.brooklyn.core.sensor.Sensors; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.brooklyn.location.winrm.WinRmMachineLocation; -import org.apache.brooklyn.sensor.core.Sensors; import org.apache.brooklyn.sensor.feed.AbstractFeed; import org.apache.brooklyn.sensor.feed.PollHandler; import org.apache.brooklyn.sensor.feed.Poller; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2a78e273/core/src/main/java/org/apache/brooklyn/util/core/flags/TypeCoercions.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/util/core/flags/TypeCoercions.java b/core/src/main/java/org/apache/brooklyn/util/core/flags/TypeCoercions.java index 51b0456..ec49de7 100644 --- a/core/src/main/java/org/apache/brooklyn/util/core/flags/TypeCoercions.java +++ b/core/src/main/java/org/apache/brooklyn/util/core/flags/TypeCoercions.java @@ -50,7 +50,7 @@ import org.apache.brooklyn.core.entity.factory.ConfigurableEntityFactory; import org.apache.brooklyn.core.entity.factory.ConfigurableEntityFactoryFromEntityFactory; import org.apache.brooklyn.core.internal.BrooklynInitialization; import org.apache.brooklyn.core.mgmt.BrooklynTaskTags; -import org.apache.brooklyn.sensor.core.Sensors; +import org.apache.brooklyn.core.sensor.Sensors; import org.apache.brooklyn.util.JavaGroovyEquivalents; import org.apache.brooklyn.util.collections.MutableSet; import org.apache.brooklyn.util.collections.QuorumCheck; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2a78e273/core/src/main/java/org/apache/brooklyn/util/core/text/TemplateProcessor.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/util/core/text/TemplateProcessor.java b/core/src/main/java/org/apache/brooklyn/util/core/text/TemplateProcessor.java index afa2f71..58efcd4 100644 --- a/core/src/main/java/org/apache/brooklyn/util/core/text/TemplateProcessor.java +++ b/core/src/main/java/org/apache/brooklyn/util/core/text/TemplateProcessor.java @@ -34,8 +34,8 @@ import org.apache.brooklyn.core.config.ConfigKeys; import org.apache.brooklyn.core.entity.Entities; import org.apache.brooklyn.core.entity.EntityInternal; import org.apache.brooklyn.core.mgmt.internal.ManagementContextInternal; -import org.apache.brooklyn.sensor.core.DependentConfiguration; -import org.apache.brooklyn.sensor.core.Sensors; +import org.apache.brooklyn.core.sensor.DependentConfiguration; +import org.apache.brooklyn.core.sensor.Sensors; import org.apache.brooklyn.util.collections.MutableMap; import org.apache.brooklyn.util.exceptions.Exceptions; import org.apache.brooklyn.util.text.Strings; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2a78e273/core/src/test/java/org/apache/brooklyn/core/config/MapListAndOtherStructuredConfigKeyTest.groovy ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/config/MapListAndOtherStructuredConfigKeyTest.groovy b/core/src/test/java/org/apache/brooklyn/core/config/MapListAndOtherStructuredConfigKeyTest.groovy index e57c8cb..8516df5 100644 --- a/core/src/test/java/org/apache/brooklyn/core/config/MapListAndOtherStructuredConfigKeyTest.groovy +++ b/core/src/test/java/org/apache/brooklyn/core/config/MapListAndOtherStructuredConfigKeyTest.groovy @@ -33,7 +33,7 @@ import org.apache.brooklyn.core.test.entity.TestApplication import org.apache.brooklyn.core.test.entity.TestEntity import org.apache.brooklyn.core.entity.Entities import org.apache.brooklyn.core.location.SimulatedLocation -import org.apache.brooklyn.sensor.core.DependentConfiguration +import org.apache.brooklyn.core.sensor.DependentConfiguration import org.apache.brooklyn.util.collections.MutableMap import org.apache.brooklyn.util.core.task.DeferredSupplier import org.apache.brooklyn.util.exceptions.Exceptions http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2a78e273/core/src/test/java/org/apache/brooklyn/core/entity/AttributeMapTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/entity/AttributeMapTest.java b/core/src/test/java/org/apache/brooklyn/core/entity/AttributeMapTest.java index 565b34b..21529c8 100644 --- a/core/src/test/java/org/apache/brooklyn/core/entity/AttributeMapTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/entity/AttributeMapTest.java @@ -32,10 +32,10 @@ import java.util.concurrent.Future; import org.apache.brooklyn.api.entity.Application; import org.apache.brooklyn.api.sensor.AttributeSensor; import org.apache.brooklyn.core.entity.Entities; +import org.apache.brooklyn.core.sensor.AttributeMap; +import org.apache.brooklyn.core.sensor.Sensors; import org.apache.brooklyn.core.test.entity.TestApplication; import org.apache.brooklyn.core.test.entity.TestEntityImpl; -import org.apache.brooklyn.sensor.core.AttributeMap; -import org.apache.brooklyn.sensor.core.Sensors; import org.apache.brooklyn.test.Asserts; import org.apache.brooklyn.util.collections.MutableMap; import org.apache.brooklyn.util.guava.Maybe; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2a78e273/core/src/test/java/org/apache/brooklyn/core/entity/AttributeTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/entity/AttributeTest.java b/core/src/test/java/org/apache/brooklyn/core/entity/AttributeTest.java index 614a275..68fe527 100644 --- a/core/src/test/java/org/apache/brooklyn/core/entity/AttributeTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/entity/AttributeTest.java @@ -22,8 +22,8 @@ import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNull; import org.apache.brooklyn.api.sensor.AttributeSensor; +import org.apache.brooklyn.core.sensor.BasicAttributeSensor; import org.apache.brooklyn.core.test.entity.TestEntityImpl; -import org.apache.brooklyn.sensor.core.BasicAttributeSensor; 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/2a78e273/core/src/test/java/org/apache/brooklyn/core/entity/ConfigEntityInheritanceTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/entity/ConfigEntityInheritanceTest.java b/core/src/test/java/org/apache/brooklyn/core/entity/ConfigEntityInheritanceTest.java index 2a8ae20..afcd340 100644 --- a/core/src/test/java/org/apache/brooklyn/core/entity/ConfigEntityInheritanceTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/entity/ConfigEntityInheritanceTest.java @@ -26,9 +26,9 @@ import org.apache.brooklyn.core.config.ConfigKeys; import org.apache.brooklyn.core.entity.AbstractEntity; import org.apache.brooklyn.core.entity.Entities; import org.apache.brooklyn.core.entity.internal.ConfigMapTest.MyOtherEntity; +import org.apache.brooklyn.core.sensor.AttributeSensorAndConfigKey; +import org.apache.brooklyn.core.sensor.BasicAttributeSensorAndConfigKey.IntegerAttributeSensorAndConfigKey; import org.apache.brooklyn.core.test.entity.TestApplication; -import org.apache.brooklyn.sensor.core.AttributeSensorAndConfigKey; -import org.apache.brooklyn.sensor.core.BasicAttributeSensorAndConfigKey.IntegerAttributeSensorAndConfigKey; import org.testng.Assert; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2a78e273/core/src/test/java/org/apache/brooklyn/core/entity/DependentConfigurationTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/entity/DependentConfigurationTest.java b/core/src/test/java/org/apache/brooklyn/core/entity/DependentConfigurationTest.java index 2c681f3..45fac8f 100644 --- a/core/src/test/java/org/apache/brooklyn/core/entity/DependentConfigurationTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/entity/DependentConfigurationTest.java @@ -35,9 +35,9 @@ import org.apache.brooklyn.core.entity.Attributes; import org.apache.brooklyn.core.entity.Entities; import org.apache.brooklyn.core.entity.lifecycle.Lifecycle; import org.apache.brooklyn.core.entity.lifecycle.ServiceStateLogic; +import org.apache.brooklyn.core.sensor.DependentConfiguration; import org.apache.brooklyn.core.test.BrooklynAppUnitTestSupport; import org.apache.brooklyn.core.test.entity.TestEntity; -import org.apache.brooklyn.sensor.core.DependentConfiguration; import org.apache.brooklyn.test.Asserts; import org.apache.brooklyn.test.EntityTestUtils; import org.apache.brooklyn.util.collections.MutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2a78e273/core/src/test/java/org/apache/brooklyn/core/entity/EntitySubscriptionTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/entity/EntitySubscriptionTest.java b/core/src/test/java/org/apache/brooklyn/core/entity/EntitySubscriptionTest.java index 6e2bd89..599d28c 100644 --- a/core/src/test/java/org/apache/brooklyn/core/entity/EntitySubscriptionTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/entity/EntitySubscriptionTest.java @@ -25,10 +25,10 @@ import org.apache.brooklyn.api.entity.EntitySpec; import org.apache.brooklyn.api.mgmt.SubscriptionHandle; import org.apache.brooklyn.core.entity.Entities; import org.apache.brooklyn.core.location.SimulatedLocation; +import org.apache.brooklyn.core.sensor.BasicSensorEvent; 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.sensor.core.BasicSensorEvent; import org.apache.brooklyn.test.Asserts; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2a78e273/core/src/test/java/org/apache/brooklyn/core/entity/EntityTypeTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/entity/EntityTypeTest.java b/core/src/test/java/org/apache/brooklyn/core/entity/EntityTypeTest.java index cead05a..5851c35 100644 --- a/core/src/test/java/org/apache/brooklyn/core/entity/EntityTypeTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/entity/EntityTypeTest.java @@ -51,11 +51,11 @@ import org.apache.brooklyn.core.effector.MethodEffector; import org.apache.brooklyn.core.entity.AbstractEntity; import org.apache.brooklyn.core.entity.Entities; import org.apache.brooklyn.core.entity.EntityInternal; +import org.apache.brooklyn.core.sensor.BasicSensorEvent; +import org.apache.brooklyn.core.sensor.Sensors; 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.sensor.core.BasicSensorEvent; -import org.apache.brooklyn.sensor.core.Sensors; import org.apache.brooklyn.test.Asserts; import org.apache.brooklyn.util.collections.MutableSet; import org.testng.annotations.BeforeMethod; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2a78e273/core/src/test/java/org/apache/brooklyn/core/entity/hello/HelloEntity.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/entity/hello/HelloEntity.java b/core/src/test/java/org/apache/brooklyn/core/entity/hello/HelloEntity.java index a217514..5490868 100644 --- a/core/src/test/java/org/apache/brooklyn/core/entity/hello/HelloEntity.java +++ b/core/src/test/java/org/apache/brooklyn/core/entity/hello/HelloEntity.java @@ -26,9 +26,9 @@ import org.apache.brooklyn.core.annotation.Effector; import org.apache.brooklyn.core.annotation.EffectorParam; import org.apache.brooklyn.core.config.ConfigKeys; import org.apache.brooklyn.core.effector.MethodEffector; +import org.apache.brooklyn.core.sensor.BasicSensor; +import org.apache.brooklyn.core.sensor.Sensors; import org.apache.brooklyn.entity.group.AbstractGroup; -import org.apache.brooklyn.sensor.core.BasicSensor; -import org.apache.brooklyn.sensor.core.Sensors; @ImplementedBy(HelloEntityImpl.class) public interface HelloEntity extends AbstractGroup { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2a78e273/core/src/test/java/org/apache/brooklyn/core/entity/hello/LocalEntitiesTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/entity/hello/LocalEntitiesTest.java b/core/src/test/java/org/apache/brooklyn/core/entity/hello/LocalEntitiesTest.java index 9fef5ba..28ee8c1 100644 --- a/core/src/test/java/org/apache/brooklyn/core/entity/hello/LocalEntitiesTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/entity/hello/LocalEntitiesTest.java @@ -18,8 +18,8 @@ */ package org.apache.brooklyn.core.entity.hello; -import static org.apache.brooklyn.sensor.core.DependentConfiguration.attributeWhenReady; -import static org.apache.brooklyn.sensor.core.DependentConfiguration.transform; +import static org.apache.brooklyn.core.sensor.DependentConfiguration.attributeWhenReady; +import static org.apache.brooklyn.core.sensor.DependentConfiguration.transform; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; import static org.testng.Assert.assertNull; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2a78e273/core/src/test/java/org/apache/brooklyn/core/entity/internal/ConfigMapTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/entity/internal/ConfigMapTest.java b/core/src/test/java/org/apache/brooklyn/core/entity/internal/ConfigMapTest.java index 448ca07..0a0b3a2 100644 --- a/core/src/test/java/org/apache/brooklyn/core/entity/internal/ConfigMapTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/entity/internal/ConfigMapTest.java @@ -41,8 +41,8 @@ import org.apache.brooklyn.core.config.ConfigKeys; import org.apache.brooklyn.core.config.ConfigPredicates; import org.apache.brooklyn.core.entity.AbstractEntity; import org.apache.brooklyn.core.entity.Entities; +import org.apache.brooklyn.core.sensor.BasicAttributeSensorAndConfigKey.IntegerAttributeSensorAndConfigKey; import org.apache.brooklyn.core.test.BrooklynAppUnitTestSupport; -import org.apache.brooklyn.sensor.core.BasicAttributeSensorAndConfigKey.IntegerAttributeSensorAndConfigKey; import org.apache.brooklyn.util.collections.MutableMap; import org.apache.brooklyn.util.core.task.BasicTask; import org.apache.brooklyn.util.core.task.DeferredSupplier; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2a78e273/core/src/test/java/org/apache/brooklyn/core/entity/internal/EntityConfigMapUsageLegacyTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/entity/internal/EntityConfigMapUsageLegacyTest.java b/core/src/test/java/org/apache/brooklyn/core/entity/internal/EntityConfigMapUsageLegacyTest.java index dcd40ee..11e3ca6 100644 --- a/core/src/test/java/org/apache/brooklyn/core/entity/internal/EntityConfigMapUsageLegacyTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/entity/internal/EntityConfigMapUsageLegacyTest.java @@ -25,7 +25,6 @@ import static org.testng.Assert.fail; import java.util.concurrent.Callable; import java.util.concurrent.CountDownLatch; -import org.apache.brooklyn.sensor.core.DependentConfiguration; import org.apache.brooklyn.util.collections.MutableMap; import org.apache.brooklyn.util.time.Time; import org.testng.annotations.Test; @@ -33,6 +32,7 @@ import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.config.ConfigKeys; import org.apache.brooklyn.core.entity.Entities; import org.apache.brooklyn.core.location.SimulatedLocation; +import org.apache.brooklyn.core.sensor.DependentConfiguration; import org.apache.brooklyn.core.test.BrooklynAppUnitTestSupport; import org.apache.brooklyn.core.test.entity.TestEntity; import org.apache.brooklyn.core.test.entity.TestEntityImpl; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2a78e273/core/src/test/java/org/apache/brooklyn/core/entity/internal/EntityConfigMapUsageTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/entity/internal/EntityConfigMapUsageTest.java b/core/src/test/java/org/apache/brooklyn/core/entity/internal/EntityConfigMapUsageTest.java index e5b6299..9af2919 100644 --- a/core/src/test/java/org/apache/brooklyn/core/entity/internal/EntityConfigMapUsageTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/entity/internal/EntityConfigMapUsageTest.java @@ -32,9 +32,9 @@ import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.config.BasicConfigKey; import org.apache.brooklyn.core.entity.Entities; import org.apache.brooklyn.core.location.SimulatedLocation; +import org.apache.brooklyn.core.sensor.DependentConfiguration; import org.apache.brooklyn.core.test.BrooklynAppUnitTestSupport; import org.apache.brooklyn.core.test.entity.TestEntity; -import org.apache.brooklyn.sensor.core.DependentConfiguration; import org.apache.brooklyn.util.exceptions.Exceptions; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2a78e273/core/src/test/java/org/apache/brooklyn/core/entity/lifecycle/ServiceStateLogicTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/entity/lifecycle/ServiceStateLogicTest.java b/core/src/test/java/org/apache/brooklyn/core/entity/lifecycle/ServiceStateLogicTest.java index f461e4b..33d5e1c 100644 --- a/core/src/test/java/org/apache/brooklyn/core/entity/lifecycle/ServiceStateLogicTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/entity/lifecycle/ServiceStateLogicTest.java @@ -32,11 +32,11 @@ import org.apache.brooklyn.core.entity.lifecycle.ServiceStateLogic; import org.apache.brooklyn.core.entity.lifecycle.ServiceStateLogic.ComputeServiceIndicatorsFromChildrenAndMembers; import org.apache.brooklyn.core.entity.lifecycle.ServiceStateLogic.ServiceNotUpLogic; import org.apache.brooklyn.core.entity.lifecycle.ServiceStateLogic.ServiceProblemsLogic; +import org.apache.brooklyn.core.sensor.Sensors; import org.apache.brooklyn.core.test.BrooklynAppUnitTestSupport; import org.apache.brooklyn.core.test.entity.TestEntity; import org.apache.brooklyn.core.test.entity.TestEntityImpl.TestEntityWithoutEnrichers; import org.apache.brooklyn.entity.group.DynamicCluster; -import org.apache.brooklyn.sensor.core.Sensors; import org.apache.brooklyn.test.EntityTestUtils; import org.apache.brooklyn.util.collections.QuorumCheck.QuorumChecks; import org.apache.brooklyn.util.exceptions.Exceptions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2a78e273/core/src/test/java/org/apache/brooklyn/core/location/TestPortSupplierLocation.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/location/TestPortSupplierLocation.java b/core/src/test/java/org/apache/brooklyn/core/location/TestPortSupplierLocation.java index 6b64cc1..a5b4294 100644 --- a/core/src/test/java/org/apache/brooklyn/core/location/TestPortSupplierLocation.java +++ b/core/src/test/java/org/apache/brooklyn/core/location/TestPortSupplierLocation.java @@ -22,9 +22,9 @@ import static org.testng.Assert.assertEquals; import org.apache.brooklyn.api.entity.EntitySpec; import org.apache.brooklyn.core.location.PortRanges; +import org.apache.brooklyn.core.sensor.PortAttributeSensorAndConfigKey; import org.apache.brooklyn.core.test.BrooklynAppUnitTestSupport; import org.apache.brooklyn.core.test.entity.TestEntity; -import org.apache.brooklyn.sensor.core.PortAttributeSensorAndConfigKey; import org.apache.brooklyn.sensor.feed.ConfigToAttributes; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2a78e273/core/src/test/java/org/apache/brooklyn/core/location/access/PortForwardManagerRebindTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/location/access/PortForwardManagerRebindTest.java b/core/src/test/java/org/apache/brooklyn/core/location/access/PortForwardManagerRebindTest.java index f123342..f14c4a3 100644 --- a/core/src/test/java/org/apache/brooklyn/core/location/access/PortForwardManagerRebindTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/location/access/PortForwardManagerRebindTest.java @@ -37,9 +37,9 @@ import org.apache.brooklyn.core.mgmt.persist.PersistenceObjectStore; import org.apache.brooklyn.core.mgmt.rebind.RebindOptions; import org.apache.brooklyn.core.mgmt.rebind.RebindTestFixtureWithApp; import org.apache.brooklyn.core.mgmt.rebind.RebindTestUtils; +import org.apache.brooklyn.core.sensor.Sensors; import org.apache.brooklyn.core.test.entity.TestEntity; import org.apache.brooklyn.core.test.entity.TestEntityImpl; -import org.apache.brooklyn.sensor.core.Sensors; import org.apache.brooklyn.util.net.Networking; import org.apache.brooklyn.util.os.Os; import org.apache.brooklyn.util.text.Identifiers; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2a78e273/core/src/test/java/org/apache/brooklyn/core/mgmt/internal/EntityExecutionManagerTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/mgmt/internal/EntityExecutionManagerTest.java b/core/src/test/java/org/apache/brooklyn/core/mgmt/internal/EntityExecutionManagerTest.java index d69294b..2bc73cb 100644 --- a/core/src/test/java/org/apache/brooklyn/core/mgmt/internal/EntityExecutionManagerTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/mgmt/internal/EntityExecutionManagerTest.java @@ -43,10 +43,10 @@ import org.apache.brooklyn.core.mgmt.BrooklynTaskTags.WrappedEntity; import org.apache.brooklyn.core.mgmt.internal.BrooklynGarbageCollector; import org.apache.brooklyn.core.mgmt.internal.LocalManagementContext; import org.apache.brooklyn.core.mgmt.internal.ManagementContextInternal; +import org.apache.brooklyn.core.sensor.BasicAttributeSensor; 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.sensor.core.BasicAttributeSensor; import org.apache.brooklyn.test.Asserts; import org.apache.brooklyn.util.collections.MutableMap; import org.apache.brooklyn.util.core.task.BasicExecutionManager; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2a78e273/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindCatalogEntityTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindCatalogEntityTest.java b/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindCatalogEntityTest.java index d437e92..4d03e05 100644 --- a/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindCatalogEntityTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindCatalogEntityTest.java @@ -42,7 +42,7 @@ import org.apache.brooklyn.core.entity.EntityInternal; import org.apache.brooklyn.core.entity.StartableApplication; import org.apache.brooklyn.core.entity.factory.ApplicationBuilder; import org.apache.brooklyn.core.mgmt.internal.LocalManagementContext; -import org.apache.brooklyn.sensor.core.Sensors; +import org.apache.brooklyn.core.sensor.Sensors; import org.apache.brooklyn.test.support.TestResourceUnavailableException; import org.apache.brooklyn.util.core.javalang.UrlClassLoader; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2a78e273/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindEnricherTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindEnricherTest.java b/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindEnricherTest.java index 4afb361..c4d295a 100644 --- a/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindEnricherTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindEnricherTest.java @@ -38,11 +38,11 @@ import org.apache.brooklyn.core.entity.Entities; import org.apache.brooklyn.core.entity.EntityInternal; import org.apache.brooklyn.core.entity.EntityPredicates; import org.apache.brooklyn.core.location.SimulatedLocation; +import org.apache.brooklyn.core.sensor.Sensors; import org.apache.brooklyn.core.test.entity.TestApplication; import org.apache.brooklyn.core.test.entity.TestEntity; import org.apache.brooklyn.core.test.entity.TestEntityImpl; import org.apache.brooklyn.entity.group.DynamicCluster; -import org.apache.brooklyn.sensor.core.Sensors; import org.apache.brooklyn.sensor.enricher.AbstractEnricher; import org.apache.brooklyn.sensor.enricher.Enrichers; import org.apache.brooklyn.test.Asserts; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2a78e273/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindEntityTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindEntityTest.java b/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindEntityTest.java index a427995..f912e55 100644 --- a/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindEntityTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindEntityTest.java @@ -62,15 +62,15 @@ import org.apache.brooklyn.core.entity.trait.Startable; import org.apache.brooklyn.core.location.LocationConfigTest.MyLocation; import org.apache.brooklyn.core.mgmt.internal.LocalManagementContext; import org.apache.brooklyn.core.mgmt.rebind.BasicEntityRebindSupport; +import org.apache.brooklyn.core.sensor.BasicAttributeSensor; +import org.apache.brooklyn.core.sensor.BasicSensorEvent; +import org.apache.brooklyn.core.sensor.DependentConfiguration; +import org.apache.brooklyn.core.sensor.Sensors; import org.apache.brooklyn.core.test.entity.TestApplication; import org.apache.brooklyn.core.test.entity.TestEntity; import org.apache.brooklyn.core.test.entity.TestEntityImpl; import org.apache.brooklyn.entity.group.AbstractGroupImpl; import org.apache.brooklyn.entity.group.BasicGroup; -import org.apache.brooklyn.sensor.core.BasicAttributeSensor; -import org.apache.brooklyn.sensor.core.BasicSensorEvent; -import org.apache.brooklyn.sensor.core.DependentConfiguration; -import org.apache.brooklyn.sensor.core.Sensors; import org.apache.brooklyn.test.Asserts; import org.apache.brooklyn.util.collections.MutableMap; import org.apache.brooklyn.util.collections.MutableSet; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2a78e273/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindFeedTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindFeedTest.java b/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindFeedTest.java index cdfd87d..f0c6551 100644 --- a/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindFeedTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindFeedTest.java @@ -32,9 +32,9 @@ import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.config.ConfigKeys; import org.apache.brooklyn.core.entity.Entities; import org.apache.brooklyn.core.mgmt.internal.BrooklynGarbageCollector; +import org.apache.brooklyn.core.sensor.Sensors; import org.apache.brooklyn.core.test.entity.TestEntity; import org.apache.brooklyn.core.test.entity.TestEntityImpl.TestEntityWithoutEnrichers; -import org.apache.brooklyn.sensor.core.Sensors; import org.apache.brooklyn.sensor.feed.function.FunctionFeed; import org.apache.brooklyn.sensor.feed.function.FunctionPollConfig; import org.apache.brooklyn.sensor.feed.http.HttpFeed; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2a78e273/core/src/test/java/org/apache/brooklyn/core/policy/basic/PolicyConfigTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/policy/basic/PolicyConfigTest.java b/core/src/test/java/org/apache/brooklyn/core/policy/basic/PolicyConfigTest.java index cd07bc5..0b5c877 100644 --- a/core/src/test/java/org/apache/brooklyn/core/policy/basic/PolicyConfigTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/policy/basic/PolicyConfigTest.java @@ -27,9 +27,9 @@ import java.util.concurrent.CountDownLatch; import org.apache.brooklyn.core.config.BasicConfigKey; import org.apache.brooklyn.core.policy.basic.BasicPolicyTest.MyPolicy; +import org.apache.brooklyn.core.sensor.DependentConfiguration; import org.apache.brooklyn.core.test.BrooklynAppUnitTestSupport; import org.apache.brooklyn.core.test.entity.TestEntity; -import org.apache.brooklyn.sensor.core.DependentConfiguration; import org.apache.brooklyn.util.collections.MutableMap; import org.apache.brooklyn.util.exceptions.Exceptions; import org.testng.annotations.Test; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2a78e273/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 6ed6918..ed4a9c0 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 @@ -25,9 +25,9 @@ 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.sensor.BasicSensorEvent; import org.apache.brooklyn.core.test.BrooklynAppUnitTestSupport; import org.apache.brooklyn.core.test.entity.TestEntity; -import org.apache.brooklyn.sensor.core.BasicSensorEvent; import org.apache.brooklyn.test.Asserts; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2a78e273/core/src/test/java/org/apache/brooklyn/core/sensor/HttpRequestSensorTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/sensor/HttpRequestSensorTest.java b/core/src/test/java/org/apache/brooklyn/core/sensor/HttpRequestSensorTest.java new file mode 100644 index 0000000..4715594 --- /dev/null +++ b/core/src/test/java/org/apache/brooklyn/core/sensor/HttpRequestSensorTest.java @@ -0,0 +1,85 @@ +/* + * 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.sensor; + +import org.apache.brooklyn.api.entity.EntityLocal; +import org.apache.brooklyn.api.entity.EntitySpec; +import org.apache.brooklyn.api.location.Location; +import org.apache.brooklyn.api.sensor.AttributeSensor; +import org.apache.brooklyn.core.entity.Attributes; +import org.apache.brooklyn.core.entity.Entities; +import org.apache.brooklyn.core.sensor.HttpRequestSensor; +import org.apache.brooklyn.core.sensor.Sensors; +import org.apache.brooklyn.core.test.TestHttpRequestHandler; +import org.apache.brooklyn.core.test.TestHttpServer; +import org.apache.brooklyn.core.test.entity.TestApplication; +import org.apache.brooklyn.core.test.entity.TestEntity; +import org.apache.brooklyn.test.EntityTestUtils; +import org.apache.brooklyn.util.core.config.ConfigBag; +import org.apache.brooklyn.util.time.Duration; +import org.testng.annotations.AfterMethod; +import org.testng.annotations.BeforeClass; +import org.testng.annotations.Test; + +import com.google.common.collect.ImmutableList; + +public class HttpRequestSensorTest { + final static AttributeSensor<String> SENSOR_STRING = Sensors.newStringSensor("aString"); + final static String TARGET_TYPE = "java.lang.String"; + + private TestApplication app; + private EntityLocal entity; + + private TestHttpServer server; + private String serverUrl; + + @BeforeClass(alwaysRun=true) + public void setUp() throws Exception { + server = new TestHttpServer() + .handler("/myKey/myValue", new TestHttpRequestHandler().header("Content-Type", "application/json").response("{\"myKey\":\"myValue\"}")) + .start(); + serverUrl = server.getUrl(); + + app = TestApplication.Factory.newManagedInstanceForTests(); + entity = app.createAndManageChild(EntitySpec.create(TestEntity.class) + .location(app.newLocalhostProvisioningLocation().obtain())); + app.start(ImmutableList.<Location>of()); + } + + @AfterMethod(alwaysRun=true) + public void tearDown() throws Exception { + if (app != null) Entities.destroyAll(app.getManagementContext()); + server.stop(); + } + + @Test + public void testHttpSensor() throws Exception { + HttpRequestSensor<Integer> sensor = new HttpRequestSensor<Integer>(ConfigBag.newInstance() + .configure(HttpRequestSensor.SENSOR_PERIOD, Duration.millis(100)) + .configure(HttpRequestSensor.SENSOR_NAME, SENSOR_STRING.getName()) + .configure(HttpRequestSensor.SENSOR_TYPE, TARGET_TYPE) + .configure(HttpRequestSensor.JSON_PATH, "$.myKey") + .configure(HttpRequestSensor.SENSOR_URI, serverUrl + "/myKey/myValue")); + sensor.apply(entity); + entity.setAttribute(Attributes.SERVICE_UP, true); + + EntityTestUtils.assertAttributeEqualsEventually(entity, SENSOR_STRING, "myValue"); + } + +} http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2a78e273/core/src/test/java/org/apache/brooklyn/core/sensor/StaticSensorTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/sensor/StaticSensorTest.java b/core/src/test/java/org/apache/brooklyn/core/sensor/StaticSensorTest.java new file mode 100644 index 0000000..1e6efb1 --- /dev/null +++ b/core/src/test/java/org/apache/brooklyn/core/sensor/StaticSensorTest.java @@ -0,0 +1,55 @@ +/* + * 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.sensor; + +import org.apache.brooklyn.api.entity.EntitySpec; +import org.apache.brooklyn.core.sensor.Sensors; +import org.apache.brooklyn.core.sensor.StaticSensor; +import org.apache.brooklyn.core.test.BrooklynAppUnitTestSupport; +import org.apache.brooklyn.entity.stock.BasicEntity; +import org.apache.brooklyn.test.EntityTestUtils; +import org.apache.brooklyn.util.core.config.ConfigBag; +import org.testng.annotations.Test; + +import com.google.common.collect.ImmutableMap; + +public class StaticSensorTest extends BrooklynAppUnitTestSupport { + + @Test + public void testAddsStaticSensorOfTypeString() { + BasicEntity entity = app.createAndManageChild(EntitySpec.create(BasicEntity.class) + .addInitializer(new StaticSensor<String>(ConfigBag.newInstance(ImmutableMap.of( + StaticSensor.SENSOR_NAME, "myname", + StaticSensor.SENSOR_TYPE, String.class.getName(), + StaticSensor.STATIC_VALUE, "myval"))))); + + EntityTestUtils.assertAttributeEquals(entity, Sensors.newSensor(String.class, "myname"), "myval"); + } + + @Test + public void testAddsStaticSensorOfTypeInteger() { + BasicEntity entity = app.createAndManageChild(EntitySpec.create(BasicEntity.class) + .addInitializer(new StaticSensor<Integer>(ConfigBag.newInstance(ImmutableMap.of( + StaticSensor.SENSOR_NAME, "myname", + StaticSensor.SENSOR_TYPE, Integer.class.getName(), + StaticSensor.STATIC_VALUE, "1"))))); + + EntityTestUtils.assertAttributeEquals(entity, Sensors.newSensor(Integer.class, "myname"), 1); + } +} http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2a78e273/core/src/test/java/org/apache/brooklyn/core/test/entity/TestApplication.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/test/entity/TestApplication.java b/core/src/test/java/org/apache/brooklyn/core/test/entity/TestApplication.java index 2521b1f..974d4e6 100644 --- a/core/src/test/java/org/apache/brooklyn/core/test/entity/TestApplication.java +++ b/core/src/test/java/org/apache/brooklyn/core/test/entity/TestApplication.java @@ -29,8 +29,8 @@ import org.apache.brooklyn.core.entity.EntityInternal; import org.apache.brooklyn.core.entity.StartableApplication; import org.apache.brooklyn.core.entity.factory.ApplicationBuilder; import org.apache.brooklyn.core.location.SimulatedLocation; +import org.apache.brooklyn.core.sensor.Sensors; import org.apache.brooklyn.location.localhost.LocalhostMachineProvisioningLocation; -import org.apache.brooklyn.sensor.core.Sensors; /** * Mock application for testing. http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2a78e273/core/src/test/java/org/apache/brooklyn/core/test/entity/TestEntity.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/test/entity/TestEntity.java b/core/src/test/java/org/apache/brooklyn/core/test/entity/TestEntity.java index 8c185a0..be8ad3d 100644 --- a/core/src/test/java/org/apache/brooklyn/core/test/entity/TestEntity.java +++ b/core/src/test/java/org/apache/brooklyn/core/test/entity/TestEntity.java @@ -41,8 +41,8 @@ import org.apache.brooklyn.core.entity.Attributes; import org.apache.brooklyn.core.entity.EntityInternal; import org.apache.brooklyn.core.entity.lifecycle.Lifecycle; import org.apache.brooklyn.core.entity.trait.Startable; -import org.apache.brooklyn.sensor.core.BasicNotificationSensor; -import org.apache.brooklyn.sensor.core.Sensors; +import org.apache.brooklyn.core.sensor.BasicNotificationSensor; +import org.apache.brooklyn.core.sensor.Sensors; import org.apache.brooklyn.util.collections.MutableMap; import org.apache.brooklyn.util.core.flags.SetFromFlag; import org.testng.collections.Lists; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2a78e273/core/src/test/java/org/apache/brooklyn/entity/group/DynamicGroupTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/entity/group/DynamicGroupTest.java b/core/src/test/java/org/apache/brooklyn/entity/group/DynamicGroupTest.java index 7c43835..1b7ec97 100644 --- a/core/src/test/java/org/apache/brooklyn/entity/group/DynamicGroupTest.java +++ b/core/src/test/java/org/apache/brooklyn/entity/group/DynamicGroupTest.java @@ -42,12 +42,12 @@ import org.apache.brooklyn.api.sensor.SensorEventListener; import org.apache.brooklyn.core.entity.AbstractEntity; import org.apache.brooklyn.core.entity.Entities; import org.apache.brooklyn.core.entity.EntityPredicates; +import org.apache.brooklyn.core.sensor.Sensors; import org.apache.brooklyn.core.test.entity.TestApplication; import org.apache.brooklyn.core.test.entity.TestEntity; import org.apache.brooklyn.entity.group.AbstractGroup; import org.apache.brooklyn.entity.group.DynamicGroup; import org.apache.brooklyn.entity.group.DynamicGroupImpl; -import org.apache.brooklyn.sensor.core.Sensors; import org.apache.brooklyn.test.Asserts; import org.apache.brooklyn.util.collections.MutableMap; import org.apache.brooklyn.util.exceptions.Exceptions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2a78e273/core/src/test/java/org/apache/brooklyn/entity/group/DynamicMultiGroupTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/entity/group/DynamicMultiGroupTest.java b/core/src/test/java/org/apache/brooklyn/entity/group/DynamicMultiGroupTest.java index f783b49..d0d1235 100644 --- a/core/src/test/java/org/apache/brooklyn/entity/group/DynamicMultiGroupTest.java +++ b/core/src/test/java/org/apache/brooklyn/entity/group/DynamicMultiGroupTest.java @@ -37,12 +37,12 @@ import org.apache.brooklyn.api.sensor.SensorEventListener; import org.apache.brooklyn.core.entity.Entities; import org.apache.brooklyn.core.entity.factory.ApplicationBuilder; import org.apache.brooklyn.core.location.SimulatedLocation; +import org.apache.brooklyn.core.sensor.Sensors; 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.entity.group.BasicGroup; import org.apache.brooklyn.entity.group.DynamicMultiGroup; -import org.apache.brooklyn.sensor.core.Sensors; import org.apache.brooklyn.test.Asserts; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2a78e273/core/src/test/java/org/apache/brooklyn/entity/stock/DataEntityTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/entity/stock/DataEntityTest.java b/core/src/test/java/org/apache/brooklyn/entity/stock/DataEntityTest.java index f2c4a23..5d19d43 100644 --- a/core/src/test/java/org/apache/brooklyn/entity/stock/DataEntityTest.java +++ b/core/src/test/java/org/apache/brooklyn/entity/stock/DataEntityTest.java @@ -30,10 +30,10 @@ import org.apache.brooklyn.api.sensor.AttributeSensor; import org.apache.brooklyn.core.entity.Entities; import org.apache.brooklyn.core.entity.factory.ApplicationBuilder; import org.apache.brooklyn.core.location.SimulatedLocation; +import org.apache.brooklyn.core.sensor.Sensors; import org.apache.brooklyn.core.test.entity.LocalManagementContextForTests; import org.apache.brooklyn.core.test.entity.TestApplication; import org.apache.brooklyn.entity.stock.DataEntity; -import org.apache.brooklyn.sensor.core.Sensors; import org.apache.brooklyn.test.Asserts; import org.apache.brooklyn.test.EntityTestUtils; import org.apache.brooklyn.util.collections.MutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2a78e273/core/src/test/java/org/apache/brooklyn/sensor/core/HttpRequestSensorTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/sensor/core/HttpRequestSensorTest.java b/core/src/test/java/org/apache/brooklyn/sensor/core/HttpRequestSensorTest.java deleted file mode 100644 index 1ac4432..0000000 --- a/core/src/test/java/org/apache/brooklyn/sensor/core/HttpRequestSensorTest.java +++ /dev/null @@ -1,85 +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.sensor.core; - -import org.apache.brooklyn.api.entity.EntityLocal; -import org.apache.brooklyn.api.entity.EntitySpec; -import org.apache.brooklyn.api.location.Location; -import org.apache.brooklyn.api.sensor.AttributeSensor; -import org.apache.brooklyn.core.entity.Attributes; -import org.apache.brooklyn.core.entity.Entities; -import org.apache.brooklyn.core.test.TestHttpRequestHandler; -import org.apache.brooklyn.core.test.TestHttpServer; -import org.apache.brooklyn.core.test.entity.TestApplication; -import org.apache.brooklyn.core.test.entity.TestEntity; -import org.apache.brooklyn.sensor.core.HttpRequestSensor; -import org.apache.brooklyn.sensor.core.Sensors; -import org.apache.brooklyn.test.EntityTestUtils; -import org.apache.brooklyn.util.core.config.ConfigBag; -import org.apache.brooklyn.util.time.Duration; -import org.testng.annotations.AfterMethod; -import org.testng.annotations.BeforeClass; -import org.testng.annotations.Test; - -import com.google.common.collect.ImmutableList; - -public class HttpRequestSensorTest { - final static AttributeSensor<String> SENSOR_STRING = Sensors.newStringSensor("aString"); - final static String TARGET_TYPE = "java.lang.String"; - - private TestApplication app; - private EntityLocal entity; - - private TestHttpServer server; - private String serverUrl; - - @BeforeClass(alwaysRun=true) - public void setUp() throws Exception { - server = new TestHttpServer() - .handler("/myKey/myValue", new TestHttpRequestHandler().header("Content-Type", "application/json").response("{\"myKey\":\"myValue\"}")) - .start(); - serverUrl = server.getUrl(); - - app = TestApplication.Factory.newManagedInstanceForTests(); - entity = app.createAndManageChild(EntitySpec.create(TestEntity.class) - .location(app.newLocalhostProvisioningLocation().obtain())); - app.start(ImmutableList.<Location>of()); - } - - @AfterMethod(alwaysRun=true) - public void tearDown() throws Exception { - if (app != null) Entities.destroyAll(app.getManagementContext()); - server.stop(); - } - - @Test - public void testHttpSensor() throws Exception { - HttpRequestSensor<Integer> sensor = new HttpRequestSensor<Integer>(ConfigBag.newInstance() - .configure(HttpRequestSensor.SENSOR_PERIOD, Duration.millis(100)) - .configure(HttpRequestSensor.SENSOR_NAME, SENSOR_STRING.getName()) - .configure(HttpRequestSensor.SENSOR_TYPE, TARGET_TYPE) - .configure(HttpRequestSensor.JSON_PATH, "$.myKey") - .configure(HttpRequestSensor.SENSOR_URI, serverUrl + "/myKey/myValue")); - sensor.apply(entity); - entity.setAttribute(Attributes.SERVICE_UP, true); - - EntityTestUtils.assertAttributeEqualsEventually(entity, SENSOR_STRING, "myValue"); - } - -} http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2a78e273/core/src/test/java/org/apache/brooklyn/sensor/core/StaticSensorTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/sensor/core/StaticSensorTest.java b/core/src/test/java/org/apache/brooklyn/sensor/core/StaticSensorTest.java deleted file mode 100644 index a62d985..0000000 --- a/core/src/test/java/org/apache/brooklyn/sensor/core/StaticSensorTest.java +++ /dev/null @@ -1,55 +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.sensor.core; - -import org.apache.brooklyn.api.entity.EntitySpec; -import org.apache.brooklyn.core.test.BrooklynAppUnitTestSupport; -import org.apache.brooklyn.entity.stock.BasicEntity; -import org.apache.brooklyn.sensor.core.Sensors; -import org.apache.brooklyn.sensor.core.StaticSensor; -import org.apache.brooklyn.test.EntityTestUtils; -import org.apache.brooklyn.util.core.config.ConfigBag; -import org.testng.annotations.Test; - -import com.google.common.collect.ImmutableMap; - -public class StaticSensorTest extends BrooklynAppUnitTestSupport { - - @Test - public void testAddsStaticSensorOfTypeString() { - BasicEntity entity = app.createAndManageChild(EntitySpec.create(BasicEntity.class) - .addInitializer(new StaticSensor<String>(ConfigBag.newInstance(ImmutableMap.of( - StaticSensor.SENSOR_NAME, "myname", - StaticSensor.SENSOR_TYPE, String.class.getName(), - StaticSensor.STATIC_VALUE, "myval"))))); - - EntityTestUtils.assertAttributeEquals(entity, Sensors.newSensor(String.class, "myname"), "myval"); - } - - @Test - public void testAddsStaticSensorOfTypeInteger() { - BasicEntity entity = app.createAndManageChild(EntitySpec.create(BasicEntity.class) - .addInitializer(new StaticSensor<Integer>(ConfigBag.newInstance(ImmutableMap.of( - StaticSensor.SENSOR_NAME, "myname", - StaticSensor.SENSOR_TYPE, Integer.class.getName(), - StaticSensor.STATIC_VALUE, "1"))))); - - EntityTestUtils.assertAttributeEquals(entity, Sensors.newSensor(Integer.class, "myname"), 1); - } -} http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2a78e273/core/src/test/java/org/apache/brooklyn/sensor/enricher/CustomAggregatingEnricherDeprecatedTest.groovy ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/sensor/enricher/CustomAggregatingEnricherDeprecatedTest.groovy b/core/src/test/java/org/apache/brooklyn/sensor/enricher/CustomAggregatingEnricherDeprecatedTest.groovy index 0700c91..b35c329 100644 --- a/core/src/test/java/org/apache/brooklyn/sensor/enricher/CustomAggregatingEnricherDeprecatedTest.groovy +++ b/core/src/test/java/org/apache/brooklyn/sensor/enricher/CustomAggregatingEnricherDeprecatedTest.groovy @@ -27,7 +27,7 @@ import org.apache.brooklyn.core.test.entity.TestEntity import org.apache.brooklyn.core.entity.Entities import org.apache.brooklyn.entity.group.BasicGroup import org.apache.brooklyn.core.location.SimulatedLocation -import org.apache.brooklyn.sensor.core.BasicAttributeSensor +import org.apache.brooklyn.core.sensor.BasicAttributeSensor 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/2a78e273/core/src/test/java/org/apache/brooklyn/sensor/enricher/CustomAggregatingEnricherTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/sensor/enricher/CustomAggregatingEnricherTest.java b/core/src/test/java/org/apache/brooklyn/sensor/enricher/CustomAggregatingEnricherTest.java index 05e0fe3..30737b7 100644 --- a/core/src/test/java/org/apache/brooklyn/sensor/enricher/CustomAggregatingEnricherTest.java +++ b/core/src/test/java/org/apache/brooklyn/sensor/enricher/CustomAggregatingEnricherTest.java @@ -26,10 +26,10 @@ import org.apache.brooklyn.api.location.LocationSpec; import org.apache.brooklyn.api.sensor.AttributeSensor; import org.apache.brooklyn.core.entity.Entities; import org.apache.brooklyn.core.location.SimulatedLocation; +import org.apache.brooklyn.core.sensor.BasicAttributeSensor; 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.sensor.core.BasicAttributeSensor; import org.apache.brooklyn.sensor.enricher.Enrichers; import org.apache.brooklyn.test.EntityTestUtils; import org.apache.brooklyn.util.collections.MutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2a78e273/core/src/test/java/org/apache/brooklyn/sensor/enricher/EnrichersTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/sensor/enricher/EnrichersTest.java b/core/src/test/java/org/apache/brooklyn/sensor/enricher/EnrichersTest.java index 1307bb5..ff76342 100644 --- a/core/src/test/java/org/apache/brooklyn/sensor/enricher/EnrichersTest.java +++ b/core/src/test/java/org/apache/brooklyn/sensor/enricher/EnrichersTest.java @@ -29,10 +29,10 @@ import org.apache.brooklyn.api.sensor.SensorEvent; import org.apache.brooklyn.core.entity.Entities; import org.apache.brooklyn.core.entity.EntityAdjuncts; import org.apache.brooklyn.core.entity.RecordingSensorEventListener; +import org.apache.brooklyn.core.sensor.Sensors; 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.sensor.core.Sensors; import org.apache.brooklyn.sensor.enricher.Enrichers; import org.apache.brooklyn.test.Asserts; import org.apache.brooklyn.test.EntityTestUtils; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2a78e273/core/src/test/java/org/apache/brooklyn/sensor/enricher/SensorPropagatingEnricherDeprecatedTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/sensor/enricher/SensorPropagatingEnricherDeprecatedTest.java b/core/src/test/java/org/apache/brooklyn/sensor/enricher/SensorPropagatingEnricherDeprecatedTest.java index 589c0fb..9b55006 100644 --- a/core/src/test/java/org/apache/brooklyn/sensor/enricher/SensorPropagatingEnricherDeprecatedTest.java +++ b/core/src/test/java/org/apache/brooklyn/sensor/enricher/SensorPropagatingEnricherDeprecatedTest.java @@ -24,9 +24,9 @@ import org.apache.brooklyn.api.entity.EntitySpec; 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.sensor.Sensors; import org.apache.brooklyn.core.test.BrooklynAppUnitTestSupport; import org.apache.brooklyn.core.test.entity.TestEntity; -import org.apache.brooklyn.sensor.core.Sensors; import org.apache.brooklyn.sensor.enricher.SensorPropagatingEnricher; import org.apache.brooklyn.test.Asserts; import org.apache.brooklyn.test.EntityTestUtils; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2a78e273/core/src/test/java/org/apache/brooklyn/sensor/enricher/SensorPropagatingEnricherTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/sensor/enricher/SensorPropagatingEnricherTest.java b/core/src/test/java/org/apache/brooklyn/sensor/enricher/SensorPropagatingEnricherTest.java index 241e581..82067c4 100644 --- a/core/src/test/java/org/apache/brooklyn/sensor/enricher/SensorPropagatingEnricherTest.java +++ b/core/src/test/java/org/apache/brooklyn/sensor/enricher/SensorPropagatingEnricherTest.java @@ -25,10 +25,10 @@ import org.apache.brooklyn.api.sensor.AttributeSensor; import org.apache.brooklyn.api.sensor.EnricherSpec; import org.apache.brooklyn.api.sensor.SensorEvent; import org.apache.brooklyn.api.sensor.SensorEventListener; +import org.apache.brooklyn.core.sensor.BasicNotificationSensor; +import org.apache.brooklyn.core.sensor.Sensors; import org.apache.brooklyn.core.test.BrooklynAppUnitTestSupport; import org.apache.brooklyn.core.test.entity.TestEntity; -import org.apache.brooklyn.sensor.core.BasicNotificationSensor; -import org.apache.brooklyn.sensor.core.Sensors; import org.apache.brooklyn.sensor.enricher.Enrichers; import org.apache.brooklyn.sensor.enricher.Propagator; import org.apache.brooklyn.test.Asserts; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2a78e273/core/src/test/java/org/apache/brooklyn/sensor/enricher/TransformingEnricherDeprecatedTest.groovy ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/sensor/enricher/TransformingEnricherDeprecatedTest.groovy b/core/src/test/java/org/apache/brooklyn/sensor/enricher/TransformingEnricherDeprecatedTest.groovy index 2883a05..9db0d37 100644 --- a/core/src/test/java/org/apache/brooklyn/sensor/enricher/TransformingEnricherDeprecatedTest.groovy +++ b/core/src/test/java/org/apache/brooklyn/sensor/enricher/TransformingEnricherDeprecatedTest.groovy @@ -26,7 +26,7 @@ import org.apache.brooklyn.core.test.entity.TestApplication import org.apache.brooklyn.core.test.entity.TestEntity import org.apache.brooklyn.core.entity.Entities import org.apache.brooklyn.core.location.SimulatedLocation -import org.apache.brooklyn.sensor.core.BasicAttributeSensor +import org.apache.brooklyn.core.sensor.BasicAttributeSensor import org.apache.brooklyn.test.TestUtils import org.apache.brooklyn.util.collections.MutableMap import org.slf4j.Logger http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2a78e273/core/src/test/java/org/apache/brooklyn/sensor/enricher/TransformingEnricherTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/sensor/enricher/TransformingEnricherTest.java b/core/src/test/java/org/apache/brooklyn/sensor/enricher/TransformingEnricherTest.java index 70d5af5..d020a25 100644 --- a/core/src/test/java/org/apache/brooklyn/sensor/enricher/TransformingEnricherTest.java +++ b/core/src/test/java/org/apache/brooklyn/sensor/enricher/TransformingEnricherTest.java @@ -21,9 +21,9 @@ package org.apache.brooklyn.sensor.enricher; import org.apache.brooklyn.api.entity.EntitySpec; import org.apache.brooklyn.api.sensor.AttributeSensor; import org.apache.brooklyn.core.location.SimulatedLocation; +import org.apache.brooklyn.core.sensor.BasicAttributeSensor; import org.apache.brooklyn.core.test.BrooklynAppUnitTestSupport; import org.apache.brooklyn.core.test.entity.TestEntity; -import org.apache.brooklyn.sensor.core.BasicAttributeSensor; import org.apache.brooklyn.sensor.enricher.Enrichers; import org.apache.brooklyn.test.EntityTestUtils; import org.apache.brooklyn.util.math.MathFunctions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2a78e273/core/src/test/java/org/apache/brooklyn/sensor/enricher/YamlRollingTimeWindowMeanEnricherTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/sensor/enricher/YamlRollingTimeWindowMeanEnricherTest.java b/core/src/test/java/org/apache/brooklyn/sensor/enricher/YamlRollingTimeWindowMeanEnricherTest.java index 96644a6..e7fbcd6 100644 --- a/core/src/test/java/org/apache/brooklyn/sensor/enricher/YamlRollingTimeWindowMeanEnricherTest.java +++ b/core/src/test/java/org/apache/brooklyn/sensor/enricher/YamlRollingTimeWindowMeanEnricherTest.java @@ -26,9 +26,9 @@ import org.apache.brooklyn.api.sensor.AttributeSensor; import org.apache.brooklyn.api.sensor.EnricherSpec; import org.apache.brooklyn.core.entity.AbstractApplication; import org.apache.brooklyn.core.entity.Entities; +import org.apache.brooklyn.core.sensor.BasicAttributeSensor; +import org.apache.brooklyn.core.sensor.BasicSensorEvent; import org.apache.brooklyn.entity.stock.BasicEntity; -import org.apache.brooklyn.sensor.core.BasicAttributeSensor; -import org.apache.brooklyn.sensor.core.BasicSensorEvent; import org.apache.brooklyn.sensor.enricher.YamlRollingTimeWindowMeanEnricher; import org.apache.brooklyn.sensor.enricher.YamlTimeWeightedDeltaEnricher; import org.apache.brooklyn.sensor.enricher.YamlRollingTimeWindowMeanEnricher.ConfidenceQualifiedNumber; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2a78e273/core/src/test/java/org/apache/brooklyn/sensor/enricher/YamlTimeWeightedDeltaEnricherTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/sensor/enricher/YamlTimeWeightedDeltaEnricherTest.java b/core/src/test/java/org/apache/brooklyn/sensor/enricher/YamlTimeWeightedDeltaEnricherTest.java index 140ed15..5b98168 100644 --- a/core/src/test/java/org/apache/brooklyn/sensor/enricher/YamlTimeWeightedDeltaEnricherTest.java +++ b/core/src/test/java/org/apache/brooklyn/sensor/enricher/YamlTimeWeightedDeltaEnricherTest.java @@ -26,9 +26,9 @@ import org.apache.brooklyn.api.sensor.AttributeSensor; import org.apache.brooklyn.api.sensor.EnricherSpec; import org.apache.brooklyn.core.entity.AbstractApplication; import org.apache.brooklyn.core.entity.Entities; +import org.apache.brooklyn.core.sensor.BasicAttributeSensor; +import org.apache.brooklyn.core.sensor.BasicSensorEvent; import org.apache.brooklyn.entity.stock.BasicEntity; -import org.apache.brooklyn.sensor.core.BasicAttributeSensor; -import org.apache.brooklyn.sensor.core.BasicSensorEvent; import org.apache.brooklyn.sensor.enricher.YamlTimeWeightedDeltaEnricher; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2a78e273/core/src/test/java/org/apache/brooklyn/sensor/feed/ConfigToAttributesTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/sensor/feed/ConfigToAttributesTest.java b/core/src/test/java/org/apache/brooklyn/sensor/feed/ConfigToAttributesTest.java index 2dd5bc4..b82aecf 100644 --- a/core/src/test/java/org/apache/brooklyn/sensor/feed/ConfigToAttributesTest.java +++ b/core/src/test/java/org/apache/brooklyn/sensor/feed/ConfigToAttributesTest.java @@ -24,10 +24,10 @@ import org.apache.brooklyn.api.entity.EntitySpec; import org.apache.brooklyn.core.entity.Entities; import org.apache.brooklyn.core.mgmt.internal.LocalManagementContext; import org.apache.brooklyn.core.mgmt.internal.ManagementContextInternal; +import org.apache.brooklyn.core.sensor.BasicAttributeSensorAndConfigKey; +import org.apache.brooklyn.core.sensor.TemplatedStringAttributeSensorAndConfigKey; import org.apache.brooklyn.core.test.entity.TestApplication; import org.apache.brooklyn.core.test.entity.TestEntity; -import org.apache.brooklyn.sensor.core.BasicAttributeSensorAndConfigKey; -import org.apache.brooklyn.sensor.core.TemplatedStringAttributeSensorAndConfigKey; import org.apache.brooklyn.sensor.feed.ConfigToAttributes; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2a78e273/core/src/test/java/org/apache/brooklyn/sensor/feed/function/FunctionFeedTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/sensor/feed/function/FunctionFeedTest.java b/core/src/test/java/org/apache/brooklyn/sensor/feed/function/FunctionFeedTest.java index fc1dc1d..71b44b8 100644 --- a/core/src/test/java/org/apache/brooklyn/sensor/feed/function/FunctionFeedTest.java +++ b/core/src/test/java/org/apache/brooklyn/sensor/feed/function/FunctionFeedTest.java @@ -38,9 +38,9 @@ import org.apache.brooklyn.api.sensor.SensorEvent; import org.apache.brooklyn.api.sensor.SensorEventListener; import org.apache.brooklyn.core.entity.EntityInternal; import org.apache.brooklyn.core.entity.EntityInternal.FeedSupport; +import org.apache.brooklyn.core.sensor.Sensors; import org.apache.brooklyn.core.test.BrooklynAppUnitTestSupport; import org.apache.brooklyn.core.test.entity.TestEntity; -import org.apache.brooklyn.sensor.core.Sensors; import org.apache.brooklyn.sensor.feed.function.FunctionFeed; import org.apache.brooklyn.sensor.feed.function.FunctionFeedTest; import org.apache.brooklyn.sensor.feed.function.FunctionPollConfig;
