You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by tb...@apache.org on 2017/10/18 08:29:04 UTC
[2/7] brooklyn-server git commit: Deletes old deprecated code
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/test/java/org/apache/brooklyn/core/test/entity/TestApplicationImpl.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/core/test/entity/TestApplicationImpl.java b/core/src/test/java/org/apache/brooklyn/core/test/entity/TestApplicationImpl.java
index 7a27d8d..030f5d2 100644
--- a/core/src/test/java/org/apache/brooklyn/core/test/entity/TestApplicationImpl.java
+++ b/core/src/test/java/org/apache/brooklyn/core/test/entity/TestApplicationImpl.java
@@ -22,17 +22,13 @@ import java.util.Map;
import org.apache.brooklyn.api.entity.Entity;
import org.apache.brooklyn.api.entity.EntitySpec;
-import org.apache.brooklyn.api.entity.Group;
import org.apache.brooklyn.api.location.LocationSpec;
-import org.apache.brooklyn.api.mgmt.SubscriptionHandle;
-import org.apache.brooklyn.api.sensor.Sensor;
-import org.apache.brooklyn.api.sensor.SensorEventListener;
import org.apache.brooklyn.core.entity.AbstractApplication;
import org.apache.brooklyn.core.location.SimulatedLocation;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.apache.brooklyn.location.localhost.LocalhostMachineProvisioningLocation;
import org.apache.brooklyn.util.logging.LoggingSetup;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Mock application for testing.
@@ -61,11 +57,6 @@ public class TestApplicationImpl extends AbstractApplication implements TestAppl
}
@Override
- public <T> SubscriptionHandle subscribeToMembers(Group parent, Sensor<T> sensor, SensorEventListener<? super T> listener) {
- return subscriptions().subscribeToMembers(parent, sensor, listener);
- }
-
- @Override
public String toString() {
String id = getId();
return "Application["+id.substring(Math.max(0, id.length()-8))+"]";
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/test/java/org/apache/brooklyn/core/test/qa/performance/AbstractPerformanceTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/core/test/qa/performance/AbstractPerformanceTest.java b/core/src/test/java/org/apache/brooklyn/core/test/qa/performance/AbstractPerformanceTest.java
index ab6978d..5985ac0 100644
--- a/core/src/test/java/org/apache/brooklyn/core/test/qa/performance/AbstractPerformanceTest.java
+++ b/core/src/test/java/org/apache/brooklyn/core/test/qa/performance/AbstractPerformanceTest.java
@@ -18,11 +18,6 @@
*/
package org.apache.brooklyn.core.test.qa.performance;
-import static org.testng.Assert.assertTrue;
-
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-
import org.apache.brooklyn.core.internal.BrooklynProperties;
import org.apache.brooklyn.core.location.SimulatedLocation;
import org.apache.brooklyn.core.test.BrooklynAppUnitTestSupport;
@@ -34,8 +29,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.testng.annotations.BeforeMethod;
-import com.google.common.base.Stopwatch;
-
/**
* For running simplistic performance tests, to measure the number of operations per second and compare
* it against some min rate.
@@ -96,90 +89,4 @@ public class AbstractPerformanceTest extends BrooklynAppUnitTestSupport {
LOG.info("test="+options+"; result="+result);
return result;
}
-
- /**
- * @deprecated since 0.9.0; use {@link #measure(PerformanceTestDescriptor)}
- */
- @Deprecated
- protected void measureAndAssert(String prefix, int numIterations, double minRatePerSec, Runnable r) {
- measure(PerformanceTestDescriptor.create()
- .summary(prefix)
- .iterations(numIterations)
- .minAcceptablePerSecond(minRatePerSec)
- .job(r));
- }
-
- /**
- * @deprecated since 0.9.0; use {@link #measure(PerformanceTestDescriptor)}
- */
- @Deprecated
- protected void measureAndAssert(String prefix, int numIterations, double minRatePerSec, Runnable r, CountDownLatch completionLatch) {
- measure(PerformanceTestDescriptor.create()
- .summary(prefix)
- .iterations(numIterations)
- .completionLatch(completionLatch)
- .minAcceptablePerSecond(minRatePerSec)
- .job(r));
- }
-
- /**
- * @deprecated since 0.9.0; use {@link #measure(PerformanceTestDescriptor)}
- */
- @Deprecated
- protected void measureAndAssert(String prefix, int numIterations, double minRatePerSec, Runnable r, Runnable postIterationPhase) {
- long durationMillis = measure(prefix, numIterations, r);
- long postIterationDurationMillis = (postIterationPhase != null) ? measure(postIterationPhase) : 0;
-
- double numPerSec = ((double)numIterations/durationMillis * 1000);
- double numPerSecIncludingPostIteration = ((double)numIterations/(durationMillis+postIterationDurationMillis) * 1000);
-
- String msg1 = prefix+": "+durationMillis+"ms for "+numIterations+" iterations"+
- (postIterationPhase != null ? "(+"+postIterationDurationMillis+"ms for post-iteration phase)" : "")+
- ": numPerSec="+numPerSec+"; minAcceptableRate="+minRatePerSec;
- String msg2 = (postIterationPhase != null ? " (or "+numPerSecIncludingPostIteration+" per sec including post-iteration phase time)" : "");
-
- LOG.info(msg1+msg2);
- System.out.println("\n"+msg1+"\n"+msg2+"\n"); //make it easier to see in the console in eclipse :)
- assertTrue(numPerSecIncludingPostIteration >= minRatePerSec, msg1+msg2);
- }
-
- /**
- * @deprecated since 0.9.0; use {@link #measure(PerformanceTestDescriptor)}
- */
- @Deprecated
- protected long measure(String prefix, int numIterations, Runnable r) {
- final int logInterval = 5*1000;
- long nextLogTime = logInterval;
-
- // Give it some warm-up cycles
- Stopwatch warmupWatch = Stopwatch.createStarted();
- for (int i = 0; i < (numIterations/10); i++) {
- if (warmupWatch.elapsed(TimeUnit.MILLISECONDS) >= nextLogTime) {
- LOG.info("Warm-up "+prefix+" iteration="+i+" at "+warmupWatch.elapsed(TimeUnit.MILLISECONDS)+"ms");
- nextLogTime += logInterval;
- }
- r.run();
- }
-
- Stopwatch stopwatch = Stopwatch.createStarted();
- nextLogTime = 0;
- for (int i = 0; i < numIterations; i++) {
- if (stopwatch.elapsed(TimeUnit.MILLISECONDS) >= nextLogTime) {
- LOG.info(prefix+" iteration="+i+" at "+stopwatch.elapsed(TimeUnit.MILLISECONDS)+"ms");
- nextLogTime += logInterval;
- }
- r.run();
- }
- return stopwatch.elapsed(TimeUnit.MILLISECONDS);
- }
-
- /**
- * @deprecated since 0.9.0; use {@link #measure(PerformanceTestDescriptor)}
- */
- @Deprecated
- protected long measure(Runnable r) {
- Stopwatch stopwatch = Stopwatch.createStarted();
- r.run();
- return stopwatch.elapsed(TimeUnit.MILLISECONDS);
- }
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/test/java/org/apache/brooklyn/feed/http/HttpFeedTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/feed/http/HttpFeedTest.java b/core/src/test/java/org/apache/brooklyn/feed/http/HttpFeedTest.java
index af66e45..d22dbf0 100644
--- a/core/src/test/java/org/apache/brooklyn/feed/http/HttpFeedTest.java
+++ b/core/src/test/java/org/apache/brooklyn/feed/http/HttpFeedTest.java
@@ -26,7 +26,6 @@ import java.nio.charset.StandardCharsets;
import java.util.List;
import java.util.concurrent.Callable;
-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;
@@ -79,7 +78,7 @@ public class HttpFeedTest extends BrooklynAppUnitTestSupport {
protected URL baseUrl;
protected Location loc;
- protected EntityLocal entity;
+ protected TestEntity entity;
protected HttpFeed feed;
@BeforeMethod(alwaysRun=true)
@@ -131,12 +130,12 @@ public class HttpFeedTest extends BrooklynAppUnitTestSupport {
@Test
public void testFeedDeDupe() throws Exception {
testPollsAndParsesHttpGetResponse();
- entity.addFeed(feed);
+ entity.feeds().add(feed);
log.info("Feed 0 is: "+feed);
testPollsAndParsesHttpGetResponse();
log.info("Feed 1 is: "+feed);
- entity.addFeed(feed);
+ entity.feeds().add(feed);
FeedSupport feeds = ((EntityInternal)entity).feeds();
Assert.assertEquals(feeds.getFeeds().size(), 1, "Wrong feed count: "+feeds.getFeeds());
@@ -300,8 +299,7 @@ public class HttpFeedTest extends BrooklynAppUnitTestSupport {
.onSuccess(HttpValueFunctions.stringContentsFunction()))
.suspended()
.build();
- Asserts.continually(MutableMap.of("timeout", 500),
- Entities.attributeSupplier(entity, SENSOR_INT), Predicates.<Integer>equalTo(null));
+ Asserts.continually(Entities.attributeSupplier(entity, SENSOR_INT), Predicates.<Integer>equalTo(null), Duration.millis(500), null, null);
int countWhenSuspended = server.getRequestCount();
feed.resume();
Asserts.eventually(Entities.attributeSupplier(entity, SENSOR_INT), Predicates.<Integer>equalTo(200));
@@ -360,7 +358,7 @@ public class HttpFeedTest extends BrooklynAppUnitTestSupport {
assertSensorEventually(SENSOR_INT, -1, TIMEOUT_MS);
assertSensorEventually(SENSOR_STRING, null, TIMEOUT_MS);
- List<String> attrs = Lists.transform(MutableList.copyOf( ((EntityInternal)entity).getAllAttributes().keySet() ),
+ List<String> attrs = Lists.transform(MutableList.copyOf( ((EntityInternal)entity).sensors().getAll().keySet() ),
new Function<AttributeSensor,String>() {
@Override public String apply(AttributeSensor input) { return input.getName(); } });
Assert.assertTrue(!attrs.contains(SENSOR_STRING.getName()), "attrs contained "+SENSOR_STRING);
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/test/java/org/apache/brooklyn/util/core/internal/FlagUtilsTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/util/core/internal/FlagUtilsTest.java b/core/src/test/java/org/apache/brooklyn/util/core/internal/FlagUtilsTest.java
index 7a407cf..b4ace3a 100644
--- a/core/src/test/java/org/apache/brooklyn/util/core/internal/FlagUtilsTest.java
+++ b/core/src/test/java/org/apache/brooklyn/util/core/internal/FlagUtilsTest.java
@@ -370,11 +370,6 @@ public class FlagUtilsTest {
return config().get(key);
}
- @Override
- public <T> T setConfig(ConfigKey<T> key, T val) {
- return config().set(key, val);
- }
-
private class BasicConfigurationSupport implements ConfigurationSupport {
@Override
public <T> T get(ConfigKey<T> key) {
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/test/java/org/apache/brooklyn/util/core/internal/ssh/RecordingSshTool.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/util/core/internal/ssh/RecordingSshTool.java b/core/src/test/java/org/apache/brooklyn/util/core/internal/ssh/RecordingSshTool.java
index 9361d7a..b9e5e1c 100644
--- a/core/src/test/java/org/apache/brooklyn/util/core/internal/ssh/RecordingSshTool.java
+++ b/core/src/test/java/org/apache/brooklyn/util/core/internal/ssh/RecordingSshTool.java
@@ -246,9 +246,6 @@ public class RecordingSshTool implements SshTool {
@Override public void connect() {
connected = true;
}
- @Override public void connect(int maxAttempts) {
- connected = true;
- }
@Override public void disconnect() {
connected = false;
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/launcher/src/test/java/org/apache/brooklyn/entity/brooklynnode/BrooklynEntityMirrorIntegrationTest.java
----------------------------------------------------------------------
diff --git a/launcher/src/test/java/org/apache/brooklyn/entity/brooklynnode/BrooklynEntityMirrorIntegrationTest.java b/launcher/src/test/java/org/apache/brooklyn/entity/brooklynnode/BrooklynEntityMirrorIntegrationTest.java
index 3c874f8..ed8c93b 100644
--- a/launcher/src/test/java/org/apache/brooklyn/entity/brooklynnode/BrooklynEntityMirrorIntegrationTest.java
+++ b/launcher/src/test/java/org/apache/brooklyn/entity/brooklynnode/BrooklynEntityMirrorIntegrationTest.java
@@ -121,7 +121,7 @@ public class BrooklynEntityMirrorIntegrationTest {
EntityAsserts.assertAttributeEqualsEventually(mirror, TestApplication.MY_ATTRIBUTE, "austria");
EntityAsserts.assertAttributeEqualsEventually(mirror, BrooklynEntityMirror.MIRROR_CATALOG_ITEM_ID, catalogItemId);
assertTrue(mirror.getAttribute(BrooklynEntityMirror.MIRROR_SUMMARY) != null, "entity summary is null");
- log.info("Sensors mirrored are: "+((EntityInternal)mirror).getAllAttributes());
+ log.info("Sensors mirrored are: "+((EntityInternal)mirror).sensors().getAll());
serverApp.sensors().set(TestApplication.MY_ATTRIBUTE, "bermuda");
serverApp.setCatalogItemId(catalogItemIdGA);
@@ -157,7 +157,7 @@ public class BrooklynEntityMirrorIntegrationTest {
);
EntityAsserts.assertAttributeEqualsEventually(mirror, TestApplication.MY_ATTRIBUTE, "austria");
- log.info("Sensors mirrored are: "+((EntityInternal)mirror).getAllAttributes());
+ log.info("Sensors mirrored are: "+((EntityInternal)mirror).sensors().getAll());
serverApp.sensors().set(TestApplication.MY_ATTRIBUTE, "bermuda");
EntityAsserts.assertAttributeEqualsEventually(mirror, TestApplication.MY_ATTRIBUTE, "bermuda");
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/BlobStoreContextFactoryImpl.java
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/BlobStoreContextFactoryImpl.java b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/BlobStoreContextFactoryImpl.java
index 4885935..5b4b957 100644
--- a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/BlobStoreContextFactoryImpl.java
+++ b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/BlobStoreContextFactoryImpl.java
@@ -27,9 +27,9 @@ import org.apache.brooklyn.api.location.Location;
import org.apache.brooklyn.core.config.Sanitizer;
import org.apache.brooklyn.core.location.LocationConfigKeys;
import org.apache.brooklyn.core.location.cloud.CloudLocationConfig;
+import org.apache.brooklyn.core.location.internal.LocationInternal;
import org.apache.brooklyn.core.mgmt.persist.DeserializingJcloudsRenamesProvider;
import org.apache.brooklyn.util.collections.MutableList;
-import org.apache.brooklyn.util.core.config.ConfigBag;
import org.jclouds.Constants;
import org.jclouds.ContextBuilder;
import org.jclouds.blobstore.BlobStoreContext;
@@ -88,7 +88,7 @@ public class BlobStoreContextFactoryImpl implements BlobStoreContextFactory {
overrides.setProperty(Constants.PROPERTY_STRIP_EXPECT_HEADER, "true");
// Add extra jclouds-specific configuration
- Map<String, Object> extra = Maps.filterKeys(location.getAllConfig(true), Predicates.containsPattern("^jclouds\\."));
+ Map<String, Object> extra = Maps.filterKeys(((LocationInternal)location).config().getBag().getAllConfig(), Predicates.containsPattern("^jclouds\\."));
if (extra.size() > 0) {
LOG.debug("Configuring custom jclouds property overrides for {}: {}", provider, Sanitizer.sanitize(extra));
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/BrooklynImageChooser.java
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/BrooklynImageChooser.java b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/BrooklynImageChooser.java
index e00c41a..701528a 100644
--- a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/BrooklynImageChooser.java
+++ b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/BrooklynImageChooser.java
@@ -258,9 +258,10 @@ public class BrooklynImageChooser implements Cloneable {
return new OrderingScoredWithoutDefaults(this);
}
- /** @deprecated since 0.7.0 kept in case persisted */
+ /** @deprecated since 0.7.0; kept for persisted state backwards compatibility */
@Deprecated
- public Ordering<Image> orderingScoredWithoutDefaultsDeprecated() {
+ @SuppressWarnings("unused")
+ private Ordering<Image> orderingScoredWithoutDefaultsDeprecated() {
return new Ordering<Image>() {
@Override
public int compare(Image left, Image right) {
@@ -309,9 +310,10 @@ public class BrooklynImageChooser implements Cloneable {
return new OrderingWithDefaults(primaryOrdering);
}
- /** @deprecated since 0.7.0 kept in case persisted */
+ /** @deprecated since 0.7.0; kept for persisted state backwards compatibility */
@Deprecated
- public static Ordering<Image> orderingWithDefaultsDeprecated(final Ordering<Image> primaryOrdering) {
+ @SuppressWarnings("unused")
+ private static Ordering<Image> orderingWithDefaultsDeprecated(final Ordering<Image> primaryOrdering) {
return new Ordering<Image>() {
@Override
public int compare(Image left, Image right) {
@@ -392,9 +394,10 @@ public class BrooklynImageChooser implements Cloneable {
return new ImageChooserFromOrdering(orderings);
}
- /** @deprecated since 0.7.0 kept in case persisted */
+ /** @deprecated since 0.7.0; kept for persisted state backwards compatibility */
@Deprecated
- public static Function<Iterable<? extends Image>, Image> imageChooserFromOrderingDeprecated(final Ordering<Image> ordering) {
+ @SuppressWarnings("unused")
+ private static Function<Iterable<? extends Image>, Image> imageChooserFromOrderingDeprecated(final Ordering<Image> ordering) {
return new Function<Iterable<? extends Image>, Image>() {
@Override
public Image apply(Iterable<? extends Image> input) {
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsLocation.java
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsLocation.java b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsLocation.java
index 450ba79..39ccc52 100644
--- a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsLocation.java
+++ b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsLocation.java
@@ -1251,7 +1251,6 @@ public class JcloudsLocation extends AbstractCloudMachineProvisioningLocation im
/** properties which cause customization of the TemplateOptions */
public static final Map<ConfigKey<?>, ? extends TemplateOptionCustomizer>SUPPORTED_TEMPLATE_OPTIONS_PROPERTIES = ImmutableMap.<ConfigKey<?>, TemplateOptionCustomizer>builder()
.put(AUTO_ASSIGN_FLOATING_IP, TemplateOptionCustomizers.autoAssignFloatingIp())
- .put(AUTO_CREATE_FLOATING_IPS, TemplateOptionCustomizers.autoCreateFloatingIps())
.put(AUTO_GENERATE_KEYPAIRS, TemplateOptionCustomizers.autoGenerateKeypairs())
.put(DOMAIN_NAME, TemplateOptionCustomizers.domainName())
.put(EXTRA_PUBLIC_KEY_DATA_TO_AUTH, TemplateOptionCustomizers.extraPublicKeyDataToAuth())
@@ -1266,7 +1265,6 @@ public class JcloudsLocation extends AbstractCloudMachineProvisioningLocation im
.put(SECURITY_GROUPS, TemplateOptionCustomizers.securityGroups())
.put(STRING_TAGS, TemplateOptionCustomizers.stringTags())
.put(TEMPLATE_OPTIONS, TemplateOptionCustomizers.templateOptions())
- .put(USER_DATA_UUENCODED, TemplateOptionCustomizers.userDataUuencoded())
.put(USER_METADATA_MAP, TemplateOptionCustomizers.userMetadataMap())
.put(USER_METADATA_STRING, TemplateOptionCustomizers.userMetadataString())
.build();
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsMachineLocation.java
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsMachineLocation.java b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsMachineLocation.java
index fc93745..83cfc2e 100644
--- a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsMachineLocation.java
+++ b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsMachineLocation.java
@@ -20,7 +20,6 @@ package org.apache.brooklyn.location.jclouds;
import org.apache.brooklyn.location.jclouds.api.JcloudsMachineLocationPublic;
import org.jclouds.compute.domain.NodeMetadata;
-import org.jclouds.compute.domain.Template;
import com.google.common.base.Optional;
@@ -40,12 +39,4 @@ public interface JcloudsMachineLocation extends JcloudsMachineLocationPublic {
*/
@Deprecated
public NodeMetadata getNode();
-
- /**
- * @deprecated since 0.9.0; instead use {@link #getOptionalNode()}. After rebind, the node will not
- * be available if the VM is no longer running.
- */
- @Deprecated
- public Template getTemplate();
-
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsPredicates.java
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsPredicates.java b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsPredicates.java
index 3143e59..e68382a 100644
--- a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsPredicates.java
+++ b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsPredicates.java
@@ -29,12 +29,7 @@ public class JcloudsPredicates {
return new NodeInLocation(regionId, matchNullLocations);
}
- /**
- * @deprecated since 0.9.0; direct access strongly discouraged; will be made protected in future release;
- * use {@link JcloudsPredicates#nodeInLocation(String, boolean)}
- */
- @Deprecated
- public static class NodeInLocation implements Predicate<ComputeMetadata> {
+ private static class NodeInLocation implements Predicate<ComputeMetadata> {
private final String regionId;
private final boolean matchNullLocations;
public NodeInLocation(String regionId, boolean matchNullLocations) {
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsSshMachineLocation.java
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsSshMachineLocation.java b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsSshMachineLocation.java
index 82b873a..26c37ad 100644
--- a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsSshMachineLocation.java
+++ b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsSshMachineLocation.java
@@ -300,23 +300,6 @@ public class JcloudsSshMachineLocation extends SshMachineLocation implements Jcl
return _node;
}
- /**
- * @deprecated since 0.9.0
- */
- @Override
- @Deprecated
- public Template getTemplate() {
- Optional<Template> result = getOptionalTemplate();
- if (result.isPresent()) {
- String msg = "Deprecated use of getTemplate() for "+this;
- LOG.warn(msg + " - see debug log for stacktrace");
- LOG.debug(msg, new Exception("for stacktrace"));
- return result.get();
- } else {
- throw new IllegalStateException("Template for "+nodeId+" (in "+getParent()+") not cached (deprecated use of getTemplate())");
- }
- }
-
@Override
public JcloudsLocation getParent() {
return jcloudsParent;
@@ -437,67 +420,6 @@ public class JcloudsSshMachineLocation extends SshMachineLocation implements Jcl
return imageId;
}
- /** executes the given statements on the server using jclouds ScriptBuilder,
- * wrapping in a script which is polled periodically.
- * the output is returned once the script completes (disadvantage compared to other methods)
- * but the process is nohupped and the SSH session is not kept,
- * so very useful for long-running processes
- *
- * @deprecated since 0.9.0; use standard {@link #execScript(String, List)} and the other variants.
- */
- @Deprecated
- public ListenableFuture<ExecResponse> submitRunScript(String ...statements) {
- return submitRunScript(new InterpretableStatement(statements));
- }
-
- /**
- * @deprecated since 0.9.0; use standard {@link #execScript(String, List)} and the other variants.
- */
- @Deprecated
- public ListenableFuture<ExecResponse> submitRunScript(Statement script) {
- return submitRunScript(script, new RunScriptOptions());
- }
-
- /**
- * @deprecated since 0.9.0; use standard {@link #execScript(String, List)} and the other variants.
- */
- @Deprecated
- public ListenableFuture<ExecResponse> submitRunScript(Statement script, RunScriptOptions options) {
- JcloudsLocation jcloudsParent = getParent();
- Optional<NodeMetadata> node = getOptionalNode();
-
- if (!node.isPresent()) {
- throw new IllegalStateException("Node "+nodeId+" not present in "+jcloudsParent);
- }
- if (jcloudsParent == null) {
- throw new IllegalStateException("No jclouds parent location for "+this+"; cannot retrieve jclouds script-runner");
- }
-
- ComputeServiceContext context = jcloudsParent.getComputeService().getContext();
- RunScriptOnNode.Factory runScriptFactory = context.utils().injector().getInstance(RunScriptOnNode.Factory.class);
-
- return runScriptFactory.submit(node.get(), script, options);
- }
-
- /**
- * Uses submitRunScript to execute the commands, and throws error if it fails or returns non-zero
- *
- * @deprecated since 0.9.0; use standard {@link #execScript(String, List)} and the other variants.
- */
- @Deprecated
- public void execRemoteScript(String ...commands) {
- try {
- ExecResponse result = submitRunScript(commands).get();
- if (result.getExitStatus()!=0)
- throw new IllegalStateException("Error running remote commands (code "+result.getExitStatus()+"): "+commands);
- } catch (InterruptedException e) {
- Thread.currentThread().interrupt();
- throw Throwables.propagate(e);
- } catch (ExecutionException e) {
- throw Throwables.propagate(e);
- }
- }
-
/**
* Retrieves the password for this VM, if one exists. The behaviour/implementation is different for different clouds.
* e.g. on Rackspace, the password for a windows VM is available immediately; on AWS-EC2, for a Windows VM you need
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsWinRmMachineLocation.java
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsWinRmMachineLocation.java b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsWinRmMachineLocation.java
index d491791..003b38a 100644
--- a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsWinRmMachineLocation.java
+++ b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsWinRmMachineLocation.java
@@ -210,23 +210,6 @@ public class JcloudsWinRmMachineLocation extends WinRmMachineLocation implements
}
}
- /**
- * @deprecated since 0.9.0
- */
- @Override
- @Deprecated
- public Template getTemplate() {
- Optional<Template> result = getOptionalTemplate();
- if (result.isPresent()) {
- String msg = "Deprecated use of getTemplate() for "+this;
- LOG.warn(msg + " - see debug log for stacktrace");
- LOG.debug(msg, new Exception("for stacktrace"));
- return result.get();
- } else {
- throw new IllegalStateException("Template for "+nodeId+" (in "+getParent()+") not cached (deprecated use of getTemplate())");
- }
- }
-
@Override
public String getHostname() {
if (hostname != null) {
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/api/JcloudsLocationConfigPublic.java
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/api/JcloudsLocationConfigPublic.java b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/api/JcloudsLocationConfigPublic.java
index 8c9a3c4..caadf94 100644
--- a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/api/JcloudsLocationConfigPublic.java
+++ b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/api/JcloudsLocationConfigPublic.java
@@ -65,10 +65,6 @@ public interface JcloudsLocationConfigPublic extends CloudLocationConfig {
public static final ConfigKey<Boolean> AUTO_GENERATE_KEYPAIRS = ConfigKeys.newBooleanConfigKey("jclouds.openstack-nova.auto-generate-keypairs",
"Whether to generate keypairs automatically (OpenStack Nova)");
- /** @deprecated since 0.9.0 Use {@link #AUTO_ASSIGN_FLOATING_IP} instead (deprecated in 0.7.0 but warning not given until 0.9.0) */
- @Deprecated
- public static final ConfigKey<Boolean> AUTO_CREATE_FLOATING_IPS = ConfigKeys.newBooleanConfigKey("jclouds.openstack-nova.auto-create-floating-ips",
- "Whether to generate floating ips for Nova");
public static final ConfigKey<Boolean> AUTO_ASSIGN_FLOATING_IP = ConfigKeys.newBooleanConfigKey("autoAssignFloatingIp",
"Whether to generate floating ips (in Nova paralance), or elastic IPs (in CloudStack parlance)");
@@ -141,25 +137,14 @@ public interface JcloudsLocationConfigPublic extends CloudLocationConfig {
public static final ConfigKey<String> USER_METADATA_STRING = ConfigKeys.newStringConfigKey("userMetadataString",
"Arbitrary user data, as a single string, on supported clouds (AWS)", null);
- @Deprecated /** @deprecated since 0.7.0 even AWS (the only one where this was supported) does not seem to want this uuencoded;
- use #USER_METADATA_STRING */
- public static final ConfigKey<String> USER_DATA_UUENCODED = ConfigKeys.newStringConfigKey("userData",
- "Arbitrary user data, as a single string in uuencoded format, on supported clouds (AWS)", null);
-
public static final ConfigKey<Object> STRING_TAGS = new BasicConfigKey<Object>(Object.class, "tags",
"Tags to be applied when creating a VM, on supported clouds " +
"(either a single tag as a String, or an Iterable<String> or String[];" +
"note this is not key-value pairs (e.g. what AWS calls 'tags'), for that see userMetadata)", null);
- @Deprecated /** @deprecated since 0.7.0 use #STRING_TAGS */
- public static final ConfigKey<Object> TAGS = STRING_TAGS;
-
public static final ConfigKey<Object> USER_METADATA_MAP = new BasicConfigKey<Object>(Object.class, "userMetadata",
"Arbitrary user metadata, as a map (or String of comma-separated key=value pairs), on supported clouds; " +
"note often values cannot be null", null);
- @Deprecated /** @deprecated since 0.7.0 use #USER_METADATA_MAP */
- public static final ConfigKey<Object> USER_METADATA = USER_METADATA_MAP;
-
public static final ConfigKey<Boolean> INCLUDE_BROOKLYN_USER_METADATA = ConfigKeys.newBooleanConfigKey("includeBrooklynUserMetadata",
"Whether to set metadata about the context of a machine, e.g. brooklyn-entity-id, brooklyn-app-name (default true)", true);
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/templates/customize/AutoCreateFloatingIpsOption.java
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/templates/customize/AutoCreateFloatingIpsOption.java b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/templates/customize/AutoCreateFloatingIpsOption.java
deleted file mode 100644
index 96590c8..0000000
--- a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/templates/customize/AutoCreateFloatingIpsOption.java
+++ /dev/null
@@ -1,42 +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.location.jclouds.templates.customize;
-
-import org.apache.brooklyn.location.jclouds.JcloudsLocationConfig;
-import org.apache.brooklyn.util.core.config.ConfigBag;
-import org.jclouds.compute.options.TemplateOptions;
-import org.jclouds.openstack.nova.v2_0.compute.options.NovaTemplateOptions;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-class AutoCreateFloatingIpsOption implements TemplateOptionCustomizer {
-
- private static final Logger LOG = LoggerFactory.getLogger(AutoCreateFloatingIpsOption.class);
-
- @Override
- public void apply(TemplateOptions t, ConfigBag props, Object v) {
- LOG.warn("Using deprecated " + JcloudsLocationConfig.AUTO_CREATE_FLOATING_IPS + "; use " + JcloudsLocationConfig.AUTO_ASSIGN_FLOATING_IP + " instead");
- if (t instanceof NovaTemplateOptions) {
- ((NovaTemplateOptions) t).autoAssignFloatingIp((Boolean) v);
- } else {
- LOG.info("ignoring auto-generate-floating-ips({}) in VM creation because not supported for cloud/type ({})", v, t);
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/templates/customize/TemplateOptionCustomizers.java
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/templates/customize/TemplateOptionCustomizers.java b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/templates/customize/TemplateOptionCustomizers.java
index 3cc7807..2c08b18 100644
--- a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/templates/customize/TemplateOptionCustomizers.java
+++ b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/templates/customize/TemplateOptionCustomizers.java
@@ -28,10 +28,6 @@ public class TemplateOptionCustomizers {
return new AutoAssignFloatingIpOption();
}
- public static TemplateOptionCustomizer autoCreateFloatingIps() {
- return new AutoCreateFloatingIpsOption();
- }
-
public static TemplateOptionCustomizer autoGenerateKeypairs() {
return new AutoGenerateKeypairsOption();
}
@@ -88,10 +84,6 @@ public class TemplateOptionCustomizers {
return new TemplateOptionsOption();
}
- public static TemplateOptionCustomizer userDataUuencoded() {
- return new UserDataUuencodedOption();
- }
-
public static TemplateOptionCustomizer userMetadataMap() {
return new UserMetadataMapOption();
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/templates/customize/UserDataUuencodedOption.java
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/templates/customize/UserDataUuencodedOption.java b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/templates/customize/UserDataUuencodedOption.java
deleted file mode 100644
index ee0075e..0000000
--- a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/templates/customize/UserDataUuencodedOption.java
+++ /dev/null
@@ -1,54 +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.location.jclouds.templates.customize;
-
-import org.apache.brooklyn.util.core.config.ConfigBag;
-import org.apache.brooklyn.util.text.Strings;
-import org.jclouds.compute.options.TemplateOptions;
-import org.jclouds.ec2.compute.options.EC2TemplateOptions;
-import org.jclouds.softlayer.compute.options.SoftLayerTemplateOptions;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-class UserDataUuencodedOption implements TemplateOptionCustomizer {
- private static final Logger LOG = LoggerFactory.getLogger(UserDataUuencodedOption.class);
-
- @Override
- public void apply(TemplateOptions t, ConfigBag props, Object v) {
- if (t instanceof EC2TemplateOptions) {
- byte[] bytes = toByteArray(v);
- ((EC2TemplateOptions) t).userData(bytes);
- } else if (t instanceof SoftLayerTemplateOptions) {
- ((SoftLayerTemplateOptions) t).userData(Strings.toString(v));
- } else {
- LOG.info("ignoring userData({}) in VM creation because not supported for cloud/type ({})", v, t.getClass());
- }
- }
-
- private byte[] toByteArray(Object v) {
- if (v instanceof byte[]) {
- return (byte[]) v;
- } else if (v instanceof CharSequence) {
- return v.toString().getBytes();
- } else {
- throw new IllegalArgumentException("Invalid type for byte[]: " + v + " of type " + v.getClass());
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsByonRebindLiveTest.java
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsByonRebindLiveTest.java b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsByonRebindLiveTest.java
index 53bc32d..8a12c1d 100644
--- a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsByonRebindLiveTest.java
+++ b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsByonRebindLiveTest.java
@@ -120,7 +120,6 @@ public class JcloudsByonRebindLiveTest extends RebindTestFixtureWithApp {
JcloudsLocation origJcloudsLocation = origMachine.getParent();
String origHostname = origMachine.getHostname();
NodeMetadata origNode = origMachine.getNode();
- Template origTemplate = origMachine.getTemplate();
assertSshable(origMachine);
rebind();
@@ -131,7 +130,6 @@ public class JcloudsByonRebindLiveTest extends RebindTestFixtureWithApp {
JcloudsLocation newJcloudsLocation = newMachine.getParent();
String newHostname = newMachine.getHostname();
NodeMetadata newNode = newMachine.getNode();
- Template newTemplate = newMachine.getTemplate();
assertSshable(newMachine);
assertEquals(newHostname, origHostname);
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsImageChoiceStubbedLiveTest.java
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsImageChoiceStubbedLiveTest.java b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsImageChoiceStubbedLiveTest.java
index 3ce9dbd..6f4094b 100644
--- a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsImageChoiceStubbedLiveTest.java
+++ b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsImageChoiceStubbedLiveTest.java
@@ -88,7 +88,6 @@ public class JcloudsImageChoiceStubbedLiveTest extends AbstractJcloudsStubbedLiv
.put(JcloudsLocationConfig.SECURITY_GROUPS, null)
.put(JcloudsLocationConfig.INBOUND_PORTS, null)
.put(JcloudsLocationConfig.USER_METADATA_STRING, null)
- .put(JcloudsLocationConfig.USER_DATA_UUENCODED, null)
.put(JcloudsLocationConfig.STRING_TAGS, null)
.put(JcloudsLocationConfig.USER_METADATA_MAP, null)
.put(JcloudsLocationConfig.EXTRA_PUBLIC_KEY_DATA_TO_AUTH, null)
@@ -98,7 +97,6 @@ public class JcloudsImageChoiceStubbedLiveTest extends AbstractJcloudsStubbedLiv
.put(JcloudsLocationConfig.LOGIN_USER_PRIVATE_KEY_FILE, null)
.put(JcloudsLocationConfig.KEY_PAIR, null)
.put(JcloudsLocationConfig.AUTO_GENERATE_KEYPAIRS, null)
- .put(JcloudsLocationConfig.AUTO_CREATE_FLOATING_IPS, null)
.put(JcloudsLocationConfig.AUTO_ASSIGN_FLOATING_IP, null)
.put(JcloudsLocationConfig.NETWORK_NAME, null)
.put(JcloudsLocationConfig.DOMAIN_NAME, null)
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsLocationResolverTest.java
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsLocationResolverTest.java b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsLocationResolverTest.java
index 28d340a..371c8a3 100644
--- a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsLocationResolverTest.java
+++ b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsLocationResolverTest.java
@@ -249,7 +249,7 @@ public class JcloudsLocationResolverTest {
JcloudsLocation loc = resolve("myloc");
// Test relies on the computeService not being used! Not great, but good enough.
- Function<Iterable<? extends Image>, Image> chooser = loc.getImageChooser((ComputeService)null, loc.getLocalConfigBag());
+ Function<Iterable<? extends Image>, Image> chooser = loc.getImageChooser((ComputeService)null, loc.config().getLocalBag());
assertTrue(chooser instanceof MyFunction, "chooser="+chooser);
}
public static class MyFunction implements Function<Iterable<? extends Image>, Image> {
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsRebindLiveTest.java
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsRebindLiveTest.java b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsRebindLiveTest.java
index 1390608..9cbd9ac 100644
--- a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsRebindLiveTest.java
+++ b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsRebindLiveTest.java
@@ -136,9 +136,6 @@ public class JcloudsRebindLiveTest extends RebindTestFixtureWithApp {
JcloudsMachineLocation origMachine = obtainMachine(location, obtainFlags);
String origHostname = origMachine.getHostname();
NodeMetadata origNode = origMachine.getNode();
- if (origMachine instanceof JcloudsSshMachineLocation) {
- Template origTemplate = origMachine.getTemplate(); // WinRM machines don't bother with template!
- }
assertConnectable(origMachine);
rebind();
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsRebindStubTest.java
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsRebindStubTest.java b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsRebindStubTest.java
index f20a271..47d8912 100644
--- a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsRebindStubTest.java
+++ b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsRebindStubTest.java
@@ -194,7 +194,6 @@ public class JcloudsRebindStubTest extends RebindTestFixtureWithApp {
String origHostname = origMachine.getHostname();
NodeMetadata origNode = origMachine.getNode();
- Template origTemplate = origMachine.getTemplate();
rebind();
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsRebindStubUnitTest.java
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsRebindStubUnitTest.java b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsRebindStubUnitTest.java
index 01cb558..5201932 100644
--- a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsRebindStubUnitTest.java
+++ b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsRebindStubUnitTest.java
@@ -155,7 +155,6 @@ public class JcloudsRebindStubUnitTest extends RebindTestFixtureWithApp {
String origHostname = origMachine.getHostname();
NodeMetadata origNode = origMachine.getNode();
- Template origTemplate = origMachine.getTemplate();
rebind();
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/policy/src/main/java/org/apache/brooklyn/policy/enricher/HttpLatencyDetector.java
----------------------------------------------------------------------
diff --git a/policy/src/main/java/org/apache/brooklyn/policy/enricher/HttpLatencyDetector.java b/policy/src/main/java/org/apache/brooklyn/policy/enricher/HttpLatencyDetector.java
index 3e56c27..8d695d2 100644
--- a/policy/src/main/java/org/apache/brooklyn/policy/enricher/HttpLatencyDetector.java
+++ b/policy/src/main/java/org/apache/brooklyn/policy/enricher/HttpLatencyDetector.java
@@ -45,6 +45,7 @@ import org.apache.brooklyn.feed.http.HttpPollConfig;
import org.apache.brooklyn.feed.http.HttpValueFunctions;
import org.apache.brooklyn.util.collections.MutableMap;
import org.apache.brooklyn.util.core.flags.SetFromFlag;
+import org.apache.brooklyn.util.guava.Functionals;
import org.apache.brooklyn.util.javalang.AtomicReferences;
import org.apache.brooklyn.util.javalang.Boxing;
import org.apache.brooklyn.util.javalang.JavaClassNames;
@@ -122,9 +123,6 @@ public class HttpLatencyDetector extends AbstractEnricher implements Enricher {
startSubscriptions(entity);
activateAdditionalEnrichers(entity);
- if (log.isDebugEnabled())
- log.debug(""+this+" enabled="+computeEnablement()+" when attached, subscribing to "+getAllSubscriptions());
-
updateEnablement();
}
@@ -145,7 +143,7 @@ public class HttpLatencyDetector extends AbstractEnricher implements Enricher {
.period(getConfig(PERIOD))
.baseUri(Suppliers.compose(Urls.stringToUriFunction(), AtomicReferences.supplier(url)))
.poll(new HttpPollConfig<Double>(REQUEST_LATENCY_IN_SECONDS_MOST_RECENT)
- .onResult(MathFunctions.divide(HttpValueFunctions.latency(), 1000.0d))
+ .onResult(Functionals.chain(HttpValueFunctions.latency(), MathFunctions.divide(1000.0d)))
.setOnException(null))
.suspended()
.build();
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/policy/src/main/java/org/apache/brooklyn/policy/enricher/RollingTimeWindowMeanEnricher.java
----------------------------------------------------------------------
diff --git a/policy/src/main/java/org/apache/brooklyn/policy/enricher/RollingTimeWindowMeanEnricher.java b/policy/src/main/java/org/apache/brooklyn/policy/enricher/RollingTimeWindowMeanEnricher.java
index 6a023d8..16a1286 100644
--- a/policy/src/main/java/org/apache/brooklyn/policy/enricher/RollingTimeWindowMeanEnricher.java
+++ b/policy/src/main/java/org/apache/brooklyn/policy/enricher/RollingTimeWindowMeanEnricher.java
@@ -138,16 +138,6 @@ public class RollingTimeWindowMeanEnricher<T extends Number> extends AbstractTyp
}
}
- @Deprecated /** @deprecated since 0.7.0; not used except in groovy tests; use the 2-arg method */
- public ConfidenceQualifiedNumber getAverage() {
- return getAverage(System.currentTimeMillis(), 0);
- }
-
- @Deprecated /** @deprecated since 0.7.0; not used except in groovy tests; use the 2-arg method */
- public ConfidenceQualifiedNumber getAverage(long fromTimeExact) {
- return getAverage(fromTimeExact, 0);
- }
-
public ConfidenceQualifiedNumber getAverage(long fromTime, long graceAllowed) {
if (timestamps.isEmpty()) {
return lastAverage = new ConfidenceQualifiedNumber(lastAverage.value, 0.0d);
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/policy/src/test/java/org/apache/brooklyn/policy/enricher/RollingTimeWindowMeanEnricherTest.java
----------------------------------------------------------------------
diff --git a/policy/src/test/java/org/apache/brooklyn/policy/enricher/RollingTimeWindowMeanEnricherTest.java b/policy/src/test/java/org/apache/brooklyn/policy/enricher/RollingTimeWindowMeanEnricherTest.java
index e911fe4..8af6d65 100644
--- a/policy/src/test/java/org/apache/brooklyn/policy/enricher/RollingTimeWindowMeanEnricherTest.java
+++ b/policy/src/test/java/org/apache/brooklyn/policy/enricher/RollingTimeWindowMeanEnricherTest.java
@@ -29,11 +29,9 @@ 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.policy.enricher.RollingTimeWindowMeanEnricher.ConfidenceQualifiedNumber;
-import org.apache.brooklyn.util.time.Duration;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
-@SuppressWarnings("deprecation")
public class RollingTimeWindowMeanEnricherTest extends BrooklynAppUnitTestSupport {
Entity producer;
@@ -71,7 +69,7 @@ public class RollingTimeWindowMeanEnricherTest extends BrooklynAppUnitTestSuppor
@Test
public void testDefaultAverageWhenEmpty() {
- average = averager.getAverage(0);
+ average = averager.getAverage(0, 0);
assertEquals(average.value, 0d);
assertEquals(average.confidence, 0.0d);
}
@@ -79,7 +77,7 @@ public class RollingTimeWindowMeanEnricherTest extends BrooklynAppUnitTestSuppor
@Test
public void testNoRecentValuesAverage() {
averager.onEvent(intSensor.newEvent(producer, 10), 0L);
- average = averager.getAverage(timePeriod+1000);
+ average = averager.getAverage(timePeriod+1000, 0);
assertEquals(average.value, 10d);
assertEquals(average.confidence, 0d);
}
@@ -88,7 +86,7 @@ public class RollingTimeWindowMeanEnricherTest extends BrooklynAppUnitTestSuppor
public void testNoRecentValuesUsesLastForAverage() {
averager.onEvent(intSensor.newEvent(producer, 10), 0L);
averager.onEvent(intSensor.newEvent(producer, 20), 10L);
- average = averager.getAverage(timePeriod+1000);
+ average = averager.getAverage(timePeriod+1000, 0);
assertEquals(average.value, 20d);
assertEquals(average.confidence, 0d);
}
@@ -96,7 +94,7 @@ public class RollingTimeWindowMeanEnricherTest extends BrooklynAppUnitTestSuppor
@Test
public void testSingleValueTimeAverage() {
averager.onEvent(intSensor.newEvent(producer, 10), 1000);
- average = averager.getAverage(1000);
+ average = averager.getAverage(1000, 0);
assertEquals(average.confidence, 0d);
}
@@ -104,7 +102,7 @@ public class RollingTimeWindowMeanEnricherTest extends BrooklynAppUnitTestSuppor
public void testTwoValueAverageForPeriod() {
averager.onEvent(intSensor.newEvent(producer, 10), 1000);
averager.onEvent(intSensor.newEvent(producer, 10), 2000);
- average = averager.getAverage(2000);
+ average = averager.getAverage(2000, 0);
assertEquals(average.value, 10 /1d);
assertEquals(average.confidence, 1d);
}
@@ -116,7 +114,7 @@ public class RollingTimeWindowMeanEnricherTest extends BrooklynAppUnitTestSuppor
averager.onEvent(intSensor.newEvent(producer, 30), 1500);
averager.onEvent(intSensor.newEvent(producer, 40), 1750);
averager.onEvent(intSensor.newEvent(producer, 50), 2000);
- average = averager.getAverage(2000);
+ average = averager.getAverage(2000, 0);
assertEquals(average.value, (20+30+40+50)/4d);
assertEquals(average.confidence, 1d);
}
@@ -128,7 +126,7 @@ public class RollingTimeWindowMeanEnricherTest extends BrooklynAppUnitTestSuppor
averager.onEvent(intSensor.newEvent(producer, 30), 1300);
averager.onEvent(intSensor.newEvent(producer, 40), 1600);
averager.onEvent(intSensor.newEvent(producer, 50), 2000);
- average = averager.getAverage(2000);
+ average = averager.getAverage(2000, 0);
assertEquals(average.value, (20*0.1d)+(30*0.2d)+(40*0.3d)+(50*0.4d));
assertEquals(average.confidence, 1d);
}
@@ -141,16 +139,16 @@ public class RollingTimeWindowMeanEnricherTest extends BrooklynAppUnitTestSuppor
averager.onEvent(intSensor.newEvent(producer, 40), 1750);
averager.onEvent(intSensor.newEvent(producer, 50), 2000);
- average = averager.getAverage(2250);
+ average = averager.getAverage(2250, 0);
assertEquals(average.value, (30+40+50)/3d);
assertEquals(average.confidence, 0.75d);
- average = averager.getAverage(2500);
+ average = averager.getAverage(2500, 0);
assertEquals(average.value, (40+50)/2d);
assertEquals(average.confidence, 0.5d);
- average = averager.getAverage(2750);
+ average = averager.getAverage(2750, 0);
assertEquals(average.value, 50d);
assertEquals(average.confidence, 0.25d);
- average = averager.getAverage(3000);
+ average = averager.getAverage(3000, 0);
assertEquals(average.value, 50d);
assertEquals(average.confidence, 0d);
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/policy/src/test/java/org/apache/brooklyn/policy/loadbalancing/MockContainerEntityImpl.java
----------------------------------------------------------------------
diff --git a/policy/src/test/java/org/apache/brooklyn/policy/loadbalancing/MockContainerEntityImpl.java b/policy/src/test/java/org/apache/brooklyn/policy/loadbalancing/MockContainerEntityImpl.java
index ba2c519..de76cb1 100644
--- a/policy/src/test/java/org/apache/brooklyn/policy/loadbalancing/MockContainerEntityImpl.java
+++ b/policy/src/test/java/org/apache/brooklyn/policy/loadbalancing/MockContainerEntityImpl.java
@@ -28,7 +28,6 @@ import java.util.concurrent.locks.ReentrantLock;
import org.apache.brooklyn.api.entity.Entity;
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.entity.group.AbstractGroupImpl;
import org.apache.brooklyn.util.collections.MutableList;
@@ -54,13 +53,6 @@ public class MockContainerEntityImpl extends AbstractGroupImpl implements MockCo
ReentrantLock _lock = new ReentrantLock();
@Override
- @Deprecated
- public <T> T setAttribute(AttributeSensor<T> attribute, T val) {
- if (LOG.isDebugEnabled()) LOG.debug("Mocks: container {} setting {} to {}", new Object[] {this, attribute, val});
- return super.sensors().set(attribute, val);
- }
-
- @Override
public void lock() {
_lock.lock();
if (!running) {
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/policy/src/test/java/org/apache/brooklyn/policy/loadbalancing/MockItemEntityImpl.java
----------------------------------------------------------------------
diff --git a/policy/src/test/java/org/apache/brooklyn/policy/loadbalancing/MockItemEntityImpl.java b/policy/src/test/java/org/apache/brooklyn/policy/loadbalancing/MockItemEntityImpl.java
index e0c960d..7166cf5 100644
--- a/policy/src/test/java/org/apache/brooklyn/policy/loadbalancing/MockItemEntityImpl.java
+++ b/policy/src/test/java/org/apache/brooklyn/policy/loadbalancing/MockItemEntityImpl.java
@@ -25,7 +25,6 @@ import java.util.concurrent.atomic.AtomicLong;
import java.util.concurrent.locks.ReentrantLock;
import org.apache.brooklyn.api.entity.Entity;
-import org.apache.brooklyn.api.sensor.AttributeSensor;
import org.apache.brooklyn.core.entity.AbstractEntity;
import org.apache.brooklyn.core.entity.Entities;
import org.apache.brooklyn.util.collections.MutableList;
@@ -57,12 +56,6 @@ public class MockItemEntityImpl extends AbstractEntity implements MockItemEntity
}
@Override
- public <T> T setAttribute(AttributeSensor<T> attribute, T val) {
- if (LOG.isDebugEnabled()) LOG.debug("Mocks: item {} setting {} to {}", new Object[] {this, attribute, val});
- return super.sensors().set(attribute, val);
- }
-
- @Override
public void move(Entity destination) {
totalMoveCount.incrementAndGet();
lastMoveTime.set(System.currentTimeMillis());
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/ApiError.java
----------------------------------------------------------------------
diff --git a/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/ApiError.java b/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/ApiError.java
index a2a1834..be72f07 100644
--- a/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/ApiError.java
+++ b/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/ApiError.java
@@ -50,12 +50,6 @@ public class ApiError implements Serializable {
return builder().message(message).build();
}
- /** @deprecated since 0.7.0; use {@link #builderFromThrowable(Throwable)} */
- @Deprecated
- public static Builder fromThrowable(Throwable t) {
- return builderFromThrowable(t);
- }
-
/**
* @return An {@link ApiError.Builder} whose message is initialised to either the throwable's
* message or the throwable's class name if the message is null and whose details are
@@ -120,12 +114,6 @@ public class ApiError implements Serializable {
return new ApiError(message, details, data, errorCode);
}
- /** @deprecated since 0.7.0; use {@link #copy(ApiError)} */
- @Deprecated
- public Builder fromApiError(ApiError error) {
- return copy(error);
- }
-
public Builder copy(ApiError error) {
return this
.message(error.message)
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/TaskSummary.java
----------------------------------------------------------------------
diff --git a/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/TaskSummary.java b/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/TaskSummary.java
index e3b0e95..6064572 100644
--- a/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/TaskSummary.java
+++ b/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/TaskSummary.java
@@ -169,20 +169,6 @@ public class TaskSummary implements HasId, Serializable {
return result;
}
- /** @deprecated since 0.7.0 use {@link #isError} instead. */
- @Deprecated
- @JsonIgnore
- public boolean getIsError() {
- return isError;
- }
-
- /** @deprecated since 0.7.0 use {@link #isCancelled} instead. */
- @Deprecated
- @JsonIgnore
- public boolean getIsCancelled() {
- return isCancelled;
- }
-
public boolean isError() {
return isError;
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/filter/HaHotCheckResourceFilter.java
----------------------------------------------------------------------
diff --git a/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/filter/HaHotCheckResourceFilter.java b/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/filter/HaHotCheckResourceFilter.java
index 2971378..28eac1c 100644
--- a/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/filter/HaHotCheckResourceFilter.java
+++ b/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/filter/HaHotCheckResourceFilter.java
@@ -112,12 +112,6 @@ public class HaHotCheckResourceFilter implements ContainerRequestFilter {
return null;
}
- /** @deprecated since 0.9.0 use {@link BrooklynRestResourceUtils#getProblemMessageIfServerNotRunning(ManagementContext)} */
- @Deprecated
- public static String lookForProblemIfServerNotRunning(ManagementContext mgmt) {
- return HaHotCheckHelperAbstract.getProblemMessageIfServerNotRunning(mgmt).orNull();
- }
-
private boolean isMaster() {
return ManagementNodeState.MASTER.equals(
mgmt.getContext(ManagementContext.class)
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/resources/AbstractBrooklynRestResource.java
----------------------------------------------------------------------
diff --git a/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/resources/AbstractBrooklynRestResource.java b/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/resources/AbstractBrooklynRestResource.java
index 3f33643..04761a5 100644
--- a/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/resources/AbstractBrooklynRestResource.java
+++ b/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/resources/AbstractBrooklynRestResource.java
@@ -91,11 +91,6 @@ public abstract class AbstractBrooklynRestResource {
return mapper;
}
- /** @deprecated since 0.7.0 use {@link #getValueForDisplay(Object, boolean, boolean, Boolean, EntityLocal, Duration)} */ @Deprecated
- protected Object getValueForDisplay(Object value, boolean preferJson, boolean isJerseyReturnValue) {
- return resolving(value).preferJson(preferJson).asJerseyOutermostReturnValue(isJerseyReturnValue).resolve();
- }
-
protected RestValueResolver resolving(Object v) {
return resolving(v, mgmt());
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/resources/LocationResource.java
----------------------------------------------------------------------
diff --git a/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/resources/LocationResource.java b/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/resources/LocationResource.java
index 052114a..0b28c2f 100644
--- a/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/resources/LocationResource.java
+++ b/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/resources/LocationResource.java
@@ -123,12 +123,6 @@ public class LocationResource extends AbstractBrooklynRestResource implements Lo
return result;
}
- /** @deprecated since 0.7.0; REST call now handled by below (optional query parameter added) */
- @Deprecated
- public LocationSummary get(String locationId) {
- return get(locationId, false);
- }
-
@Override
public LocationSummary get(String locationId, String fullConfig) {
return get(locationId, Boolean.valueOf(fullConfig));
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/transform/LocationTransformer.java
----------------------------------------------------------------------
diff --git a/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/transform/LocationTransformer.java b/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/transform/LocationTransformer.java
index 430cbbe..26385ec 100644
--- a/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/transform/LocationTransformer.java
+++ b/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/transform/LocationTransformer.java
@@ -55,12 +55,6 @@ public class LocationTransformer {
public static enum LocationDetailLevel { NONE, LOCAL_EXCLUDING_SECRET, FULL_EXCLUDING_SECRET, FULL_INCLUDING_SECRET }
- /** @deprecated since 0.7.0 use method taking management context and detail specifier */
- @Deprecated
- public static LocationSummary newInstance(String id, org.apache.brooklyn.rest.domain.LocationSpec locationSpec, UriBuilder ub) {
- return newInstance(null, id, locationSpec, LocationDetailLevel.LOCAL_EXCLUDING_SECRET, ub);
- }
-
private static LocationSummary newInstance(ManagementContext mgmt,
LocationSpec<? extends Location> spec, ConfigBag explicitConfig,
String optionalExplicitId, String name, String specString,
@@ -111,12 +105,6 @@ public class LocationTransformer {
return newInstance(mgmt, ld, level, ub);
}
- /** @deprecated since 0.7.0 use method taking management context and detail specifier */
- @Deprecated
- public static LocationSummary newInstance(LocationDefinition l, UriBuilder ub) {
- return newInstance(null, l, LocationDetailLevel.LOCAL_EXCLUDING_SECRET, ub);
- }
-
public static LocationSummary newInstance(ManagementContext mgmt, LocationDefinition ld, LocationDetailLevel level, UriBuilder ub) {
return newInstance(mgmt, mgmt.getLocationRegistry().getLocationSpec(ld).orNull(), ConfigBag.newInstance(ld.getConfig()),
ld.getId(), ld.getName(), ld.getSpec(), level, ub);
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/util/ShutdownHandler.java
----------------------------------------------------------------------
diff --git a/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/util/ShutdownHandler.java b/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/util/ShutdownHandler.java
deleted file mode 100644
index d959ca0..0000000
--- a/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/util/ShutdownHandler.java
+++ /dev/null
@@ -1,26 +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.rest.util;
-
-/** @deprecated since 0.9.0, use {@link org.apache.brooklyn.core.mgmt.ShutdownHandler} instead. */
-@Deprecated
-public interface ShutdownHandler extends org.apache.brooklyn.core.mgmt.ShutdownHandler {
- @Override
- void onShutdownRequest();
-}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/util/URLParamEncoder.java
----------------------------------------------------------------------
diff --git a/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/util/URLParamEncoder.java b/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/util/URLParamEncoder.java
deleted file mode 100644
index 55ff4d3..0000000
--- a/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/util/URLParamEncoder.java
+++ /dev/null
@@ -1,28 +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.rest.util;
-
-
-/**
- * @deprecated since 0.7.0 use {@link org.apache.brooklyn.util.net.URLParamEncoder}
- */
-@Deprecated
-public class URLParamEncoder extends org.apache.brooklyn.util.net.URLParamEncoder {
-
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/util/WebResourceUtils.java
----------------------------------------------------------------------
diff --git a/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/util/WebResourceUtils.java b/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/util/WebResourceUtils.java
index bd7a740..8da72f8 100644
--- a/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/util/WebResourceUtils.java
+++ b/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/util/WebResourceUtils.java
@@ -21,7 +21,6 @@ package org.apache.brooklyn.rest.util;
import java.io.IOException;
import java.util.Map;
-import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletResponse;
import javax.ws.rs.WebApplicationException;
import javax.ws.rs.core.MediaType;
@@ -185,12 +184,6 @@ public class WebResourceUtils {
}
}
- /** @deprecated since 0.9.0, use {@link #applyJsonResponse(ManagementContext, Response, HttpServletResponse)} */
- @Deprecated
- public static void applyJsonResponse(ServletContext servletContext, Response source, HttpServletResponse target) throws IOException {
- applyJsonResponse(OsgiCompat.getManagementContext(servletContext), source, target);
- }
-
/** Sets the {@link HttpServletResponse} target (last argument) from the given source {@link Response};
* useful in filters where we might have a {@link Response} and need to set up an {@link HttpServletResponse}.
*/
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/util/json/BrooklynJacksonJsonProvider.java
----------------------------------------------------------------------
diff --git a/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/util/json/BrooklynJacksonJsonProvider.java b/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/util/json/BrooklynJacksonJsonProvider.java
index 050fa4e..3dca3e9 100644
--- a/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/util/json/BrooklynJacksonJsonProvider.java
+++ b/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/util/json/BrooklynJacksonJsonProvider.java
@@ -31,9 +31,7 @@ import javax.ws.rs.ext.Provider;
import org.apache.brooklyn.api.mgmt.ManagementContext;
import org.apache.brooklyn.config.ConfigKey;
import org.apache.brooklyn.core.config.ConfigKeys;
-import org.apache.brooklyn.core.internal.BrooklynProperties;
import org.apache.brooklyn.core.server.BrooklynServiceAttributes;
-import org.apache.brooklyn.rest.util.OsgiCompat;
import org.apache.brooklyn.util.core.json.BrooklynObjectsJsonMapper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -93,21 +91,6 @@ public class BrooklynJacksonJsonProvider extends JacksonJsonProvider implements
return mgmt.getContext(ManagementContext.class);
}
- /** @deprecated since 0.9.0, use {@link #findSharedObjectMapper(ManagementContext)} */
- @Deprecated
- public static ObjectMapper findSharedObjectMapper(ServletContext servletContext, ManagementContext mgmt) {
- return findSharedObjectMapper(getManagementContext(servletContext, mgmt));
- }
-
- @Deprecated
- private static ManagementContext getManagementContext(ServletContext servletContext, ManagementContext mgmt) {
- if (mgmt != null) {
- return mgmt;
- } else {
- return OsgiCompat.getManagementContext(servletContext);
- }
- }
-
/**
* Finds a shared {@link ObjectMapper} or makes a new one, stored against the servlet context;
* returns null if a shared instance cannot be created.
@@ -126,12 +109,6 @@ public class BrooklynJacksonJsonProvider extends JacksonJsonProvider implements
}
}
- /** @deprecated since 0.9.0, use {@link #findAnyObjectMapper(ManagementContext) */
- @Deprecated
- public static ObjectMapper findAnyObjectMapper(ServletContext servletContext, ManagementContext mgmt) {
- return findAnyObjectMapper(getManagementContext(servletContext, mgmt));
- }
-
/**
* Like {@link #findSharedObjectMapper(ServletContext, ManagementContext)} but will create a private
* ObjectMapper if it can, from the servlet context and/or the management context, or else fail
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/rest/rest-server/src/main/java/org/apache/brooklyn/rest/filter/BrooklynPropertiesSecurityFilter.java
----------------------------------------------------------------------
diff --git a/rest/rest-server/src/main/java/org/apache/brooklyn/rest/filter/BrooklynPropertiesSecurityFilter.java b/rest/rest-server/src/main/java/org/apache/brooklyn/rest/filter/BrooklynPropertiesSecurityFilter.java
index 8b3a04b..f5089a1 100644
--- a/rest/rest-server/src/main/java/org/apache/brooklyn/rest/filter/BrooklynPropertiesSecurityFilter.java
+++ b/rest/rest-server/src/main/java/org/apache/brooklyn/rest/filter/BrooklynPropertiesSecurityFilter.java
@@ -60,15 +60,6 @@ public class BrooklynPropertiesSecurityFilter implements Filter {
*/
public static final String AUTHENTICATED_USER_SESSION_ATTRIBUTE = BrooklynLoginModule.AUTHENTICATED_USER_SESSION_ATTRIBUTE;
- /**
- * The session attribute set to indicate the remote address of the HTTP request.
- * Corresponds to {@link javax.servlet.http.HttpServletRequest#getRemoteAddr()}.
- *
- * @deprecated since 0.9.0, use {@link BrooklynWebConfig#REMOTE_ADDRESS_SESSION_ATTRIBUTE}
- */
- @Deprecated
- public static final String REMOTE_ADDRESS_SESSION_ATTRIBUTE = BrooklynWebConfig.REMOTE_ADDRESS_SESSION_ATTRIBUTE;
-
private static final Logger log = LoggerFactory.getLogger(BrooklynPropertiesSecurityFilter.class);
protected DelegatingSecurityProvider provider;
@@ -181,7 +172,7 @@ public class BrooklynPropertiesSecurityFilter implements Filter {
request.getSession().getAttribute(AUTHENTICATED_USER_SESSION_ATTRIBUTE), request.getSession().getId());
provider.logout(request.getSession());
request.getSession().removeAttribute(AUTHENTICATED_USER_SESSION_ATTRIBUTE);
- request.getSession().removeAttribute(REMOTE_ADDRESS_SESSION_ATTRIBUTE);
+ request.getSession().removeAttribute(BrooklynWebConfig.REMOTE_ADDRESS_SESSION_ATTRIBUTE);
request.getSession().invalidate();
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/rest/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynRestApiLauncherTestFixture.java
----------------------------------------------------------------------
diff --git a/rest/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynRestApiLauncherTestFixture.java b/rest/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynRestApiLauncherTestFixture.java
index 828727a..1ec89a4 100644
--- a/rest/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynRestApiLauncherTestFixture.java
+++ b/rest/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynRestApiLauncherTestFixture.java
@@ -117,12 +117,6 @@ public abstract class BrooklynRestApiLauncherTestFixture {
assertTrue(HttpAsserts.isHealthyStatusCode(response.getResponseCode()), "code="+response.getResponseCode()+"; reason="+response.getReasonPhrase());
}
- /** @deprecated since 0.9.0 use {@link #getBaseUriHostAndPost(Server)} or {@link #getBaseUriRest(Server)} */
- @Deprecated
- public static String getBaseUri(Server server) {
- return getBaseUriHostAndPost(server);
- }
-
protected String getBaseUriHostAndPost() {
return getBaseUriHostAndPost(server);
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/software/base/src/main/java/org/apache/brooklyn/entity/brooklynnode/BrooklynNodeImpl.java
----------------------------------------------------------------------
diff --git a/software/base/src/main/java/org/apache/brooklyn/entity/brooklynnode/BrooklynNodeImpl.java b/software/base/src/main/java/org/apache/brooklyn/entity/brooklynnode/BrooklynNodeImpl.java
index d6e3fce..df83086 100644
--- a/software/base/src/main/java/org/apache/brooklyn/entity/brooklynnode/BrooklynNodeImpl.java
+++ b/software/base/src/main/java/org/apache/brooklyn/entity/brooklynnode/BrooklynNodeImpl.java
@@ -497,7 +497,7 @@ public class BrooklynNodeImpl extends SoftwareProcessImpl implements BrooklynNod
.computing(Functionals.ifNotEquals(true).value("URL where Brooklyn listens is not answering correctly") )
.build());
- addEnricher(Enrichers.builder().transforming(WEB_CONSOLE_ACCESSIBLE)
+ enrichers().add(Enrichers.builder().transforming(WEB_CONSOLE_ACCESSIBLE)
.computing(Functions.identity())
.publishing(SERVICE_PROCESS_IS_RUNNING)
.build());
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/software/base/src/main/java/org/apache/brooklyn/entity/java/JavaAppUtils.java
----------------------------------------------------------------------
diff --git a/software/base/src/main/java/org/apache/brooklyn/entity/java/JavaAppUtils.java b/software/base/src/main/java/org/apache/brooklyn/entity/java/JavaAppUtils.java
index 0f44f3c..8aad550 100644
--- a/software/base/src/main/java/org/apache/brooklyn/entity/java/JavaAppUtils.java
+++ b/software/base/src/main/java/org/apache/brooklyn/entity/java/JavaAppUtils.java
@@ -222,12 +222,6 @@ public class JavaAppUtils {
return builder;
}
- /** @deprecated Since 0.7.0. Use {@link org.apache.brooklyn.util.math.MathFunctions#times(double)} instead */
- @Deprecated
- public static Function<Number, Double> times(final double x) {
- return MathFunctions.times(x);
- }
-
public static Function<CompositeData, MemoryUsage> compositeDataToMemoryUsage() {
return new Function<CompositeData, MemoryUsage>() {
@Override public MemoryUsage apply(CompositeData input) {
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/software/base/src/main/java/org/apache/brooklyn/entity/java/JavaSoftwareProcessSshDriver.java
----------------------------------------------------------------------
diff --git a/software/base/src/main/java/org/apache/brooklyn/entity/java/JavaSoftwareProcessSshDriver.java b/software/base/src/main/java/org/apache/brooklyn/entity/java/JavaSoftwareProcessSshDriver.java
index 6a64c6c..28c12d6 100644
--- a/software/base/src/main/java/org/apache/brooklyn/entity/java/JavaSoftwareProcessSshDriver.java
+++ b/software/base/src/main/java/org/apache/brooklyn/entity/java/JavaSoftwareProcessSshDriver.java
@@ -333,14 +333,6 @@ public abstract class JavaSoftwareProcessSshDriver extends AbstractSoftwareProce
}
/**
- * @deprecated since 0.7.0; instead use {@link #getInstalledJavaVersion()}
- */
- @Deprecated
- protected Optional<String> getCurrentJavaVersion() {
- return getInstalledJavaVersion();
- }
-
- /**
* Checks for the version of Java installed on the entity's location over SSH.
* @return An Optional containing the version portion of `java -version`, or absent if no Java found.
*/
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/software/base/src/main/java/org/apache/brooklyn/entity/software/base/SameServerEntityImpl.java
----------------------------------------------------------------------
diff --git a/software/base/src/main/java/org/apache/brooklyn/entity/software/base/SameServerEntityImpl.java b/software/base/src/main/java/org/apache/brooklyn/entity/software/base/SameServerEntityImpl.java
index 11bb42d..4cf3ea2 100644
--- a/software/base/src/main/java/org/apache/brooklyn/entity/software/base/SameServerEntityImpl.java
+++ b/software/base/src/main/java/org/apache/brooklyn/entity/software/base/SameServerEntityImpl.java
@@ -129,10 +129,4 @@ public class SameServerEntityImpl extends AbstractEntity implements SameServerEn
protected void doRestart(ConfigBag parameters) {
LIFECYCLE_TASKS.restart(parameters);
}
-
- @Deprecated /** @deprecated since 0.7.0 subclasses should instead override {@link #doRestart(ConfigBag)} */
- protected final void doRestart() {
- doRestart(ConfigBag.EMPTY);
- }
-
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/software/base/src/main/java/org/apache/brooklyn/feed/jmx/JmxFeed.java
----------------------------------------------------------------------
diff --git a/software/base/src/main/java/org/apache/brooklyn/feed/jmx/JmxFeed.java b/software/base/src/main/java/org/apache/brooklyn/feed/jmx/JmxFeed.java
index 2047144..4220d05 100644
--- a/software/base/src/main/java/org/apache/brooklyn/feed/jmx/JmxFeed.java
+++ b/software/base/src/main/java/org/apache/brooklyn/feed/jmx/JmxFeed.java
@@ -190,11 +190,11 @@ public class JmxFeed extends AbstractFeed {
super();
if (builder.helper != null) {
JmxHelper helper = builder.helper;
- setConfig(HELPER, helper);
- setConfig(OWN_HELPER, false);
- setConfig(JMX_URI, helper.getUrl());
+ config().set(HELPER, helper);
+ config().set(OWN_HELPER, false);
+ config().set(JMX_URI, helper.getUrl());
}
- setConfig(JMX_CONNECTION_TIMEOUT, builder.jmxConnectionTimeout);
+ config().set(JMX_CONNECTION_TIMEOUT, builder.jmxConnectionTimeout);
SetMultimap<String, JmxAttributePollConfig<?>> attributePolls = HashMultimap.<String,JmxAttributePollConfig<?>>create();
for (JmxAttributePollConfig<?> config : builder.attributePolls) {
@@ -204,7 +204,7 @@ public class JmxFeed extends AbstractFeed {
if (configCopy.getPeriod() < 0) configCopy.period(builder.period, builder.periodUnits);
attributePolls.put(configCopy.getObjectName().getCanonicalName() + configCopy.getAttributeName(), configCopy);
}
- setConfig(ATTRIBUTE_POLLS, attributePolls);
+ config().set(ATTRIBUTE_POLLS, attributePolls);
SetMultimap<List<?>, JmxOperationPollConfig<?>> operationPolls = HashMultimap.<List<?>,JmxOperationPollConfig<?>>create();
for (JmxOperationPollConfig<?> config : builder.operationPolls) {
@@ -214,14 +214,14 @@ public class JmxFeed extends AbstractFeed {
if (configCopy.getPeriod() < 0) configCopy.period(builder.period, builder.periodUnits);
operationPolls.put(configCopy.buildOperationIdentity(), configCopy);
}
- setConfig(OPERATION_POLLS, operationPolls);
+ config().set(OPERATION_POLLS, operationPolls);
SetMultimap<NotificationFilter, JmxNotificationSubscriptionConfig<?>> notificationSubscriptions = HashMultimap.create();
for (JmxNotificationSubscriptionConfig<?> config : builder.notificationSubscriptions) {
if (!config.isEnabled()) continue;
notificationSubscriptions.put(config.getNotificationFilter(), config);
}
- setConfig(NOTIFICATION_SUBSCRIPTIONS, notificationSubscriptions);
+ config().set(NOTIFICATION_SUBSCRIPTIONS, notificationSubscriptions);
initUniqueTag(builder.uniqueTag, attributePolls, operationPolls, notificationSubscriptions);
}
@@ -229,9 +229,9 @@ public class JmxFeed extends AbstractFeed {
public void setEntity(EntityLocal entity) {
if (getConfig(HELPER) == null) {
JmxHelper helper = new JmxHelper(entity);
- setConfig(HELPER, helper);
- setConfig(OWN_HELPER, true);
- setConfig(JMX_URI, helper.getUrl());
+ config().set(HELPER, helper);
+ config().set(OWN_HELPER, true);
+ config().set(JMX_URI, helper.getUrl());
}
super.setEntity(entity);
}