http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/core/src/main/java/org/apache/brooklyn/core/location/geo/MaxMind2HostGeoLookup.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/location/geo/MaxMind2HostGeoLookup.java b/core/src/main/java/org/apache/brooklyn/core/location/geo/MaxMind2HostGeoLookup.java index 1880441..cb7994c 100644 --- a/core/src/main/java/org/apache/brooklyn/core/location/geo/MaxMind2HostGeoLookup.java +++ b/core/src/main/java/org/apache/brooklyn/core/location/geo/MaxMind2HostGeoLookup.java @@ -62,6 +62,7 @@ public class MaxMind2HostGeoLookup implements HostGeoLookup { return databaseReader; } + @Override public HostGeoInfo getHostGeoInfo(InetAddress address) throws MalformedURLException, IOException { if (lookupFailed) return null;
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/core/src/main/java/org/apache/brooklyn/core/location/geo/UtraceHostGeoLookup.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/location/geo/UtraceHostGeoLookup.java b/core/src/main/java/org/apache/brooklyn/core/location/geo/UtraceHostGeoLookup.java index 12f1b15..16ffa18 100644 --- a/core/src/main/java/org/apache/brooklyn/core/location/geo/UtraceHostGeoLookup.java +++ b/core/src/main/java/org/apache/brooklyn/core/location/geo/UtraceHostGeoLookup.java @@ -113,6 +113,7 @@ Beyond this you get blacklisted and requests may time out, or return none. private static long LAST_FAILURE_UTC = -1; /** does the {@link #retrieveHostGeoInfo(InetAddress)}, but in the background with a default timeout */ + @Override public HostGeoInfo getHostGeoInfo(InetAddress address) throws MalformedURLException, IOException { if (Duration.sinceUtc(LAST_FAILURE_UTC).compareTo(RETRY_INTERVAL) < 0) { // wait at least 60s since a failure http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/core/src/main/java/org/apache/brooklyn/core/mgmt/ha/BasicMasterChooser.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/mgmt/ha/BasicMasterChooser.java b/core/src/main/java/org/apache/brooklyn/core/mgmt/ha/BasicMasterChooser.java index 9bb2ea1..c474b66 100644 --- a/core/src/main/java/org/apache/brooklyn/core/mgmt/ha/BasicMasterChooser.java +++ b/core/src/main/java/org/apache/brooklyn/core/mgmt/ha/BasicMasterChooser.java @@ -63,6 +63,7 @@ public abstract class BasicMasterChooser implements MasterChooser { } } + @Override public ManagementNodeSyncRecord choose(ManagementPlaneSyncRecord memento, Duration heartbeatTimeout, String ownNodeId) { if (LOG.isDebugEnabled()) LOG.debug("Choosing new master from "+memento.getManagementNodes()); ManagementNodeSyncRecord me = memento.getManagementNodes().get(ownNodeId); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/core/src/main/java/org/apache/brooklyn/core/mgmt/ha/HighAvailabilityManagerImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/mgmt/ha/HighAvailabilityManagerImpl.java b/core/src/main/java/org/apache/brooklyn/core/mgmt/ha/HighAvailabilityManagerImpl.java index 7e6868c..c9f3a58 100644 --- a/core/src/main/java/org/apache/brooklyn/core/mgmt/ha/HighAvailabilityManagerImpl.java +++ b/core/src/main/java/org/apache/brooklyn/core/mgmt/ha/HighAvailabilityManagerImpl.java @@ -533,6 +533,7 @@ public class HighAvailabilityManagerImpl implements HighAvailabilityManager { return myNodeState; } + @Override public ManagementPlaneSyncRecord getLastManagementPlaneSyncRecord() { return lastSyncRecord; } @@ -613,6 +614,7 @@ public class HighAvailabilityManagerImpl implements HighAvailabilityManager { } } + @Override public void publishClearNonMaster() { ManagementPlaneSyncRecord plane = getLastManagementPlaneSyncRecord(); if (plane==null || persister==null) { http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/AbstractManagementContext.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/AbstractManagementContext.java b/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/AbstractManagementContext.java index b57e6eb..5a67faa 100644 --- a/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/AbstractManagementContext.java +++ b/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/AbstractManagementContext.java @@ -335,6 +335,7 @@ public abstract class AbstractManagementContext implements ManagementContextInte ConfigBag.newInstance().configureStringKey("args", args)), entity, new Callable<T>() { + @Override public T call() { return invokeEffectorMethodLocal(entity, eff, args); }}); @@ -501,10 +502,12 @@ public abstract class AbstractManagementContext implements ManagementContextInte } } + @Override public BrooklynObject lookup(String id) { return lookup(id, BrooklynObject.class); } + @Override @SuppressWarnings("unchecked") public <T extends BrooklynObject> T lookup(String id, Class<T> type) { Object result; http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/AbstractSubscriptionManager.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/AbstractSubscriptionManager.java b/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/AbstractSubscriptionManager.java index dc454e2..c15f770 100644 --- a/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/AbstractSubscriptionManager.java +++ b/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/AbstractSubscriptionManager.java @@ -47,6 +47,7 @@ public abstract class AbstractSubscriptionManager implements SubscriptionManager /** performs the actual subscription; should return the subscription parameter as the handle */ protected abstract <T> SubscriptionHandle subscribe(Map<String, Object> flags, Subscription<T> s); /** performs the actual publishing -- ie distribution to subscriptions */ + @Override public abstract <T> void publish(final SensorEvent<T> event); public static class EntitySensorToken { @@ -83,6 +84,7 @@ public abstract class AbstractSubscriptionManager implements SubscriptionManager } /** @see SubscriptionManager#subscribe(Map, Entity, Sensor, SensorEventListener) */ + @Override public final <T> SubscriptionHandle subscribe(Entity producer, Sensor<T> sensor, SensorEventListener<? super T> listener) { return subscribe(Collections.<String,Object>emptyMap(), producer, sensor, listener); } @@ -98,18 +100,22 @@ public abstract class AbstractSubscriptionManager implements SubscriptionManager * * @see SubscriptionManager#subscribe(Map, Entity, Sensor, SensorEventListener) */ + @Override public final <T> SubscriptionHandle subscribe(Map<String, Object> flags, Entity producer, Sensor<T> sensor, SensorEventListener<? super T> listener) { return subscribe(flags, new Subscription<T>(producer, sensor, listener)); } /** @see SubscriptionManager#subscribeToChildren(Map, Entity, Sensor, SensorEventListener) */ + @Override public final <T> SubscriptionHandle subscribeToChildren(Entity parent, Sensor<T> sensor, SensorEventListener<? super T> listener) { return subscribeToChildren(Collections.<String,Object>emptyMap(), parent, sensor, listener); } /** @see SubscriptionManager#subscribe(Map, Entity, Sensor, SensorEventListener) */ + @Override public final <T> SubscriptionHandle subscribeToChildren(Map<String, Object> flags, final Entity parent, Sensor<T> sensor, SensorEventListener<? super T> listener) { Predicate<SensorEvent<T>> eventFilter = new Predicate<SensorEvent<T>>() { + @Override public boolean apply(SensorEvent<T> input) { return parent != null && input.getSource() != null && parent.equals(input.getSource().getParent()); } @@ -119,13 +125,16 @@ public abstract class AbstractSubscriptionManager implements SubscriptionManager } /** @see SubscriptionManager#subscribeToChildren(Map, Entity, Sensor, SensorEventListener) */ + @Override public final <T> SubscriptionHandle subscribeToMembers(Group parent, Sensor<T> sensor, SensorEventListener<? super T> listener) { return subscribeToMembers(Collections.<String,Object>emptyMap(), parent, sensor, listener); } /** @see SubscriptionManager#subscribe(Map, Entity, Sensor, SensorEventListener) */ + @Override public final <T> SubscriptionHandle subscribeToMembers(Map<String, Object> flags, final Group parent, Sensor<T> sensor, SensorEventListener<? super T> listener) { Predicate<SensorEvent<T>> eventFilter = new Predicate<SensorEvent<T>>() { + @Override public boolean apply(SensorEvent<T> input) { return parent.getMembers().contains(input.getSource()); } http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/AsyncCollectionChangeAdapter.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/AsyncCollectionChangeAdapter.java b/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/AsyncCollectionChangeAdapter.java index 3ffdf5f..4077a4b 100644 --- a/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/AsyncCollectionChangeAdapter.java +++ b/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/AsyncCollectionChangeAdapter.java @@ -44,6 +44,7 @@ public class AsyncCollectionChangeAdapter<Item> implements CollectionChangeListe @Override public void onItemAdded(final Item item) { executor.submit(MutableMap.of("tag", delegate), new Runnable() { + @Override public void run() { try { delegate.onItemAdded(item); @@ -58,6 +59,7 @@ public class AsyncCollectionChangeAdapter<Item> implements CollectionChangeListe @Override public void onItemRemoved(final Item item) { executor.submit(MutableMap.of("tag", delegate), new Runnable() { + @Override public void run() { try { delegate.onItemRemoved(item); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/GroovyObservablesPropertyChangeToCollectionChangeAdapter.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/GroovyObservablesPropertyChangeToCollectionChangeAdapter.java b/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/GroovyObservablesPropertyChangeToCollectionChangeAdapter.java index 4930e01..9b1bdc6 100644 --- a/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/GroovyObservablesPropertyChangeToCollectionChangeAdapter.java +++ b/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/GroovyObservablesPropertyChangeToCollectionChangeAdapter.java @@ -31,6 +31,7 @@ public class GroovyObservablesPropertyChangeToCollectionChangeAdapter implements this.delegate = delegate; } + @Override @SuppressWarnings("unchecked") public void propertyChange(PropertyChangeEvent evt) { if (evt instanceof ObservableList.ElementAddedEvent) { http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/LocalEntityManager.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/LocalEntityManager.java b/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/LocalEntityManager.java index d0168d1..2aa0712 100644 --- a/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/LocalEntityManager.java +++ b/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/LocalEntityManager.java @@ -345,7 +345,7 @@ public class LocalEntityManager implements EntityManagerInternal { checkManagementAllowed(e); final List<EntityInternal> allEntities = Lists.newArrayList(); - Predicate<EntityInternal> manageEntity = new Predicate<EntityInternal>() { public boolean apply(EntityInternal it) { + Predicate<EntityInternal> manageEntity = new Predicate<EntityInternal>() { @Override public boolean apply(EntityInternal it) { ManagementTransitionMode mode = getLastManagementTransitionMode(it.getId()); if (mode==null) { setManagementTransitionMode(it, mode = initialMode); @@ -430,6 +430,7 @@ public class LocalEntityManager implements EntityManagerInternal { unmanage(e, ManagementTransitionMode.guessing(BrooklynObjectManagementMode.MANAGED_PRIMARY, BrooklynObjectManagementMode.NONEXISTENT)); } + @Override public void unmanage(final Entity e, final ManagementTransitionMode mode) { unmanage(e, mode, false); } @@ -478,7 +479,7 @@ public class LocalEntityManager implements EntityManagerInternal { // Need to store all child entities as onManagementStopping removes a child from the parent entity final List<EntityInternal> allEntities = Lists.newArrayList(); - recursively(e, new Predicate<EntityInternal>() { public boolean apply(EntityInternal it) { + recursively(e, new Predicate<EntityInternal>() { @Override public boolean apply(EntityInternal it) { if (shouldSkipUnmanagement(it)) return false; allEntities.add(it); it.getManagementSupport().onManagementStopping(info); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/LocalLocationManager.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/LocalLocationManager.java b/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/LocalLocationManager.java index 709369d..64f233c 100644 --- a/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/LocalLocationManager.java +++ b/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/LocalLocationManager.java @@ -224,7 +224,7 @@ public class LocalLocationManager implements LocationManagerInternal { } } - recursively(loc, new Predicate<AbstractLocation>() { public boolean apply(AbstractLocation it) { + recursively(loc, new Predicate<AbstractLocation>() { @Override public boolean apply(AbstractLocation it) { ManagementTransitionMode mode = getLastManagementTransitionMode(it.getId()); if (mode==null) { setManagementTransitionMode(it, mode = initialMode); @@ -264,6 +264,7 @@ public class LocalLocationManager implements LocationManagerInternal { unmanage(loc, ManagementTransitionMode.guessing(BrooklynObjectManagementMode.MANAGED_PRIMARY, BrooklynObjectManagementMode.NONEXISTENT)); } + @Override public void unmanage(final Location loc, final ManagementTransitionMode mode) { unmanage(loc, mode, false); } @@ -303,7 +304,7 @@ public class LocalLocationManager implements LocationManagerInternal { // Need to store all child entities as onManagementStopping removes a child from the parent entity // As above, see TODO in LocalEntityManager about recursive management / unmanagement v manageAll/unmanageAll - recursively(loc, new Predicate<AbstractLocation>() { public boolean apply(AbstractLocation it) { + recursively(loc, new Predicate<AbstractLocation>() { @Override public boolean apply(AbstractLocation it) { if (shouldSkipUnmanagement(it)) return false; boolean result = unmanageNonRecursiveRemoveFromRecords(it, mode); if (result) { http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/LocalSubscriptionManager.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/LocalSubscriptionManager.java b/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/LocalSubscriptionManager.java index 9a01c48..9de2d3b 100644 --- a/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/LocalSubscriptionManager.java +++ b/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/LocalSubscriptionManager.java @@ -150,6 +150,7 @@ public class LocalSubscriptionManager extends AbstractSubscriptionManager { public String toString() { return "LSM.publishInitialValue("+s.producer+", "+s.sensor+")"; } + @Override public void run() { Object val = s.producer.getAttribute((AttributeSensor<?>) s.sensor); @SuppressWarnings("rawtypes") // TODO s.listener.onEvent gives compilation error if try to use <T> @@ -175,11 +176,13 @@ public class LocalSubscriptionManager extends AbstractSubscriptionManager { return s; } + @Override @SuppressWarnings("unchecked") public Set<SubscriptionHandle> getSubscriptionsForSubscriber(Object subscriber) { return (Set<SubscriptionHandle>) ((Set<?>) elvis(subscriptionsBySubscriber.get(subscriber), Collections.emptySet())); } + @Override public synchronized Set<SubscriptionHandle> getSubscriptionsForEntitySensor(Entity source, Sensor<?> sensor) { Set<SubscriptionHandle> subscriptions = new LinkedHashSet<SubscriptionHandle>(); subscriptions.addAll(elvis(subscriptionsByToken.get(makeEntitySensorToken(source, sensor)), Collections.emptySet())); @@ -194,6 +197,7 @@ public class LocalSubscriptionManager extends AbstractSubscriptionManager { * * @see #subscribe(Map, Entity, Sensor, SensorEventListener) */ + @Override @SuppressWarnings("rawtypes") public synchronized boolean unsubscribe(SubscriptionHandle sh) { if (!(sh instanceof Subscription)) throw new IllegalArgumentException("Only subscription handles of type Subscription supported: sh="+sh+"; type="+(sh != null ? sh.getClass().getCanonicalName() : null)); @@ -249,6 +253,7 @@ public class LocalSubscriptionManager extends AbstractSubscriptionManager { public String toString() { return "LSM.publish("+event+")"; } + @Override public void run() { try { int count = sAtClosureCreation.eventCount.incrementAndGet(); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/LocalUsageManager.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/LocalUsageManager.java b/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/LocalUsageManager.java index d4c2c0d..5403b47 100644 --- a/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/LocalUsageManager.java +++ b/core/src/main/java/org/apache/brooklyn/core/mgmt/internal/LocalUsageManager.java @@ -211,6 +211,7 @@ public class LocalUsageManager implements UsageManager { List<ListenableFuture<?>> futures = Lists.newArrayList(); for (final UsageListener listener : listeners) { ListenableFuture<?> future = listenerExecutor.submit(new Runnable() { + @Override public void run() { if (listener instanceof Closeable) { try { @@ -236,6 +237,7 @@ public class LocalUsageManager implements UsageManager { for (final UsageListener listener : listeners) { listenerQueueSize.incrementAndGet(); listenerExecutor.execute(new Runnable() { + @Override public void run() { try { job.apply(listener); @@ -276,6 +278,7 @@ public class LocalUsageManager implements UsageManager { eventMap.put(app.getId(), usage); execOnListeners(new Function<UsageListener, Void>() { + @Override public Void apply(UsageListener listener) { listener.onApplicationEvent(new ApplicationMetadataImpl(Entities.proxy(app)), event); return null; @@ -361,6 +364,7 @@ public class LocalUsageManager implements UsageManager { eventMap.put(loc.getId(), usage); execOnListeners(new Function<UsageListener, Void>() { + @Override public Void apply(UsageListener listener) { listener.onLocationEvent(new LocationMetadataImpl(loc), event); return null; http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/core/src/main/java/org/apache/brooklyn/core/mgmt/persist/BrooklynMementoPersisterToObjectStore.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/mgmt/persist/BrooklynMementoPersisterToObjectStore.java b/core/src/main/java/org/apache/brooklyn/core/mgmt/persist/BrooklynMementoPersisterToObjectStore.java index cce552d..de5fd0a 100644 --- a/core/src/main/java/org/apache/brooklyn/core/mgmt/persist/BrooklynMementoPersisterToObjectStore.java +++ b/core/src/main/java/org/apache/brooklyn/core/mgmt/persist/BrooklynMementoPersisterToObjectStore.java @@ -278,6 +278,7 @@ public class BrooklynMementoPersisterToObjectStore implements BrooklynMementoPer return subPathData; } + @Override public BrooklynMementoRawData loadMementoRawData(final RebindExceptionHandler exceptionHandler) { BrooklynMementoRawData subPathData = listMementoSubPathsAsData(exceptionHandler); @@ -447,6 +448,7 @@ public class BrooklynMementoPersisterToObjectStore implements BrooklynMementoPer this.type = type; this.objectIdAndData = objectIdAndData; } + @Override public void run() { try { visitor.visit(type, objectIdAndData.getKey(), objectIdAndData.getValue()); @@ -674,6 +676,7 @@ public class BrooklynMementoPersisterToObjectStore implements BrooklynMementoPer private ListenableFuture<?> asyncPersist(final String subPath, final Memento memento, final PersistenceExceptionHandler exceptionHandler) { return executor.submit(new Runnable() { + @Override public void run() { persist(subPath, memento, exceptionHandler); }}); @@ -681,6 +684,7 @@ public class BrooklynMementoPersisterToObjectStore implements BrooklynMementoPer private ListenableFuture<?> asyncPersist(final String subPath, final BrooklynObjectType type, final String id, final String content, final PersistenceExceptionHandler exceptionHandler) { return executor.submit(new Runnable() { + @Override public void run() { persist(subPath, type, id, content, exceptionHandler); }}); @@ -688,6 +692,7 @@ public class BrooklynMementoPersisterToObjectStore implements BrooklynMementoPer private ListenableFuture<?> asyncDelete(final String subPath, final String id, final PersistenceExceptionHandler exceptionHandler) { return executor.submit(new Runnable() { + @Override public void run() { delete(subPath, id, exceptionHandler); }}); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/PeriodicDeltaChangeListener.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/PeriodicDeltaChangeListener.java b/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/PeriodicDeltaChangeListener.java index e5c6779..fdfe362 100644 --- a/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/PeriodicDeltaChangeListener.java +++ b/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/PeriodicDeltaChangeListener.java @@ -211,6 +211,7 @@ public class PeriodicDeltaChangeListener implements ChangeListener { Callable<Task<?>> taskFactory = new Callable<Task<?>>() { @Override public Task<Void> call() { return Tasks.<Void>builder().dynamic(false).displayName("periodic-persister").body(new Callable<Void>() { + @Override public Void call() { persistNowSafely(); return null; http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/PersisterDeltaImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/PersisterDeltaImpl.java b/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/PersisterDeltaImpl.java index 6229534..7ea3a44 100644 --- a/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/PersisterDeltaImpl.java +++ b/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/PersisterDeltaImpl.java @@ -158,6 +158,7 @@ public class PersisterDeltaImpl implements Delta, MutableDelta { } } + @Override public void add(BrooklynObjectType type, Memento memento) { getMutableUncheckedObjectsOfType(type).add(memento); } @@ -167,6 +168,7 @@ public class PersisterDeltaImpl implements Delta, MutableDelta { Iterables.addAll(getMutableUncheckedObjectsOfType(type), mementos); } + @Override public void removed(BrooklynObjectType type, Set<String> removedIdsOfType) { getRemovedIdsOfTypeMutable(type).addAll(removedIdsOfType); } http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/RebindContextImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/RebindContextImpl.java b/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/RebindContextImpl.java index f57bc46..8a2caa0 100644 --- a/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/RebindContextImpl.java +++ b/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/RebindContextImpl.java @@ -130,10 +130,12 @@ public class RebindContextImpl implements RebindContext { return feeds.get(id); } + @Override public Class<?> loadClass(String className) throws ClassNotFoundException { return classLoader.loadClass(className); } + @Override public RebindExceptionHandler getExceptionHandler() { return exceptionHandler; } @@ -178,6 +180,7 @@ public class RebindContextImpl implements RebindContext { allAreReadOnly = true; } + @Override public boolean isReadOnly(BrooklynObject item) { return allAreReadOnly; } http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/RebindExceptionHandlerImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/RebindExceptionHandlerImpl.java b/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/RebindExceptionHandlerImpl.java index 994a3a7..cab6385 100644 --- a/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/RebindExceptionHandlerImpl.java +++ b/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/RebindExceptionHandlerImpl.java @@ -307,6 +307,7 @@ public class RebindExceptionHandlerImpl implements RebindExceptionHandler { } } + @Override public void onAddConfigFailed(EntityMemento entityMemento, ConfigKey<?> key, Exception e) { Exceptions.propagateIfFatal(e); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/RebindManagerImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/RebindManagerImpl.java b/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/RebindManagerImpl.java index 48365d4..079a5cf 100644 --- a/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/RebindManagerImpl.java +++ b/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/RebindManagerImpl.java @@ -308,6 +308,7 @@ public class RebindManagerImpl implements RebindManager { Callable<Task<?>> taskFactory = new Callable<Task<?>>() { @Override public Task<Void> call() { return Tasks.<Void>builder().dynamic(false).displayName("rebind (periodic run").body(new Callable<Void>() { + @Override public Void call() { try { rebind(null, null, mode); @@ -594,6 +595,7 @@ public class RebindManagerImpl implements RebindManager { return result; } + @Override public boolean isAwaitingInitialRebind() { return isAwaitingInitialRebind; } http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/dto/BasicEntityMemento.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/dto/BasicEntityMemento.java b/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/dto/BasicEntityMemento.java index 9966c95..c8fa133 100644 --- a/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/dto/BasicEntityMemento.java +++ b/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/dto/BasicEntityMemento.java @@ -300,6 +300,7 @@ public class BasicEntityMemento extends AbstractTreeNodeMemento implements Entit return Collections.unmodifiableMap(attributesByKey); } + @Override public List<Effector<?>> getEffectors() { return fromPersistedList(effectors); } http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/transformer/impl/XsltTransformer.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/transformer/impl/XsltTransformer.java b/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/transformer/impl/XsltTransformer.java index 5d6dd4b..5a71cb9 100644 --- a/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/transformer/impl/XsltTransformer.java +++ b/core/src/main/java/org/apache/brooklyn/core/mgmt/rebind/transformer/impl/XsltTransformer.java @@ -45,6 +45,7 @@ public class XsltTransformer implements RawDataTransformer { this.xsltContent = xsltContent; } + @Override public String transform(String input) throws IOException, URISyntaxException, TransformerException { // stream source is single-use StreamSource xslt = new StreamSource(new ByteArrayInputStream(xsltContent.getBytes())); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/core/src/main/java/org/apache/brooklyn/core/objs/AbstractConfigurationSupportInternal.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/objs/AbstractConfigurationSupportInternal.java b/core/src/main/java/org/apache/brooklyn/core/objs/AbstractConfigurationSupportInternal.java index 57730b6..a878e52 100644 --- a/core/src/main/java/org/apache/brooklyn/core/objs/AbstractConfigurationSupportInternal.java +++ b/core/src/main/java/org/apache/brooklyn/core/objs/AbstractConfigurationSupportInternal.java @@ -96,6 +96,7 @@ public abstract class AbstractConfigurationSupportInternal implements BrooklynOb // ValueResolver. Callable<T> job = new Callable<T>() { + @Override public T call() { try { return get(key); @@ -242,6 +243,7 @@ public abstract class AbstractConfigurationSupportInternal implements BrooklynOb return getConfigsInternal(); } + @Override public Map<ConfigKey<?>,Object> getAllLocalRaw() { return getConfigsInternal().getAllConfigLocalRaw(); } http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/core/src/main/java/org/apache/brooklyn/core/objs/BasicConfigurableObject.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/objs/BasicConfigurableObject.java b/core/src/main/java/org/apache/brooklyn/core/objs/BasicConfigurableObject.java index 0e9bd87..6479b54 100644 --- a/core/src/main/java/org/apache/brooklyn/core/objs/BasicConfigurableObject.java +++ b/core/src/main/java/org/apache/brooklyn/core/objs/BasicConfigurableObject.java @@ -63,6 +63,7 @@ public class BasicConfigurableObject implements Configurable, Identifiable, Mana this.managementContext = managementContext; } + @Override public ManagementContext getBrooklynManagementContext() { return managementContext; } @@ -83,6 +84,7 @@ public class BasicConfigurableObject implements Configurable, Identifiable, Mana return config().set(key, value); } + @Override public <T> T getConfig(ConfigKey<T> key) { return config().get(key); } http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/core/src/main/java/org/apache/brooklyn/core/objs/BrooklynObjectInternal.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/objs/BrooklynObjectInternal.java b/core/src/main/java/org/apache/brooklyn/core/objs/BrooklynObjectInternal.java index 1c76f6d..b9ae2b7 100644 --- a/core/src/main/java/org/apache/brooklyn/core/objs/BrooklynObjectInternal.java +++ b/core/src/main/java/org/apache/brooklyn/core/objs/BrooklynObjectInternal.java @@ -37,6 +37,7 @@ public interface BrooklynObjectInternal extends BrooklynObject, Rebindable { void setCatalogItemId(String id); // subclasses typically apply stronger typing + @Override RebindSupport<?> getRebindSupport(); @Override @@ -166,6 +167,7 @@ public interface BrooklynObjectInternal extends BrooklynObject, Rebindable { public void unsubscribeAll(); } + @Override RelationSupportInternal<?> relations(); public interface RelationSupportInternal<T extends BrooklynObject> extends BrooklynObject.RelationSupport<T> { http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/core/src/main/java/org/apache/brooklyn/core/objs/proxy/EntityProxyImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/objs/proxy/EntityProxyImpl.java b/core/src/main/java/org/apache/brooklyn/core/objs/proxy/EntityProxyImpl.java index 97b8f39..daaf18b 100644 --- a/core/src/main/java/org/apache/brooklyn/core/objs/proxy/EntityProxyImpl.java +++ b/core/src/main/java/org/apache/brooklyn/core/objs/proxy/EntityProxyImpl.java @@ -174,6 +174,7 @@ public class EntityProxyImpl implements java.lang.reflect.InvocationHandler { return isMasterX; } + @Override public Object invoke(Object proxy, final Method m, final Object[] args) throws Throwable { if (proxy == null) { throw new IllegalArgumentException("Static methods not supported via proxy on entity "+delegate); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/core/src/main/java/org/apache/brooklyn/core/relations/ByObjectBasicRelationSupport.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/relations/ByObjectBasicRelationSupport.java b/core/src/main/java/org/apache/brooklyn/core/relations/ByObjectBasicRelationSupport.java index 7c78e97..ebe6ab7 100644 --- a/core/src/main/java/org/apache/brooklyn/core/relations/ByObjectBasicRelationSupport.java +++ b/core/src/main/java/org/apache/brooklyn/core/relations/ByObjectBasicRelationSupport.java @@ -59,11 +59,13 @@ public class ByObjectBasicRelationSupport<SourceType extends BrooklynObject> ext private Multimap<String,BrooklynObject> relations = Multimaps.newMultimap(MutableMap.<String,Collection<BrooklynObject>>of(), new Supplier<Collection<BrooklynObject>>() { + @Override public Collection<BrooklynObject> get() { return MutableSet.of(); } }); + @Override public Set<RelationshipType<? super T,? extends BrooklynObject>> getRelationshipTypes() { synchronized (relations) { return MutableSet.copyOf(relationshipTypes.values()); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/core/src/main/java/org/apache/brooklyn/core/sensor/AttributeSensorAndConfigKey.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/sensor/AttributeSensorAndConfigKey.java b/core/src/main/java/org/apache/brooklyn/core/sensor/AttributeSensorAndConfigKey.java index 0580a77..02a659d 100644 --- a/core/src/main/java/org/apache/brooklyn/core/sensor/AttributeSensorAndConfigKey.java +++ b/core/src/main/java/org/apache/brooklyn/core/sensor/AttributeSensorAndConfigKey.java @@ -93,6 +93,7 @@ public abstract class AttributeSensorAndConfigKey<ConfigType,SensorType> extends configKey = new BasicConfigKey<ConfigType>(configKeyBuilder); } + @Override public ConfigKey<ConfigType> getConfigKey() { return configKey; } /** returns the sensor value for this attribute on the given entity, if present, http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/core/src/main/java/org/apache/brooklyn/core/sensor/BasicSensor.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/sensor/BasicSensor.java b/core/src/main/java/org/apache/brooklyn/core/sensor/BasicSensor.java index efb610f..f5589d4 100644 --- a/core/src/main/java/org/apache/brooklyn/core/sensor/BasicSensor.java +++ b/core/src/main/java/org/apache/brooklyn/core/sensor/BasicSensor.java @@ -66,29 +66,36 @@ public class BasicSensor<T> implements Sensor<T> { } /** @see Sensor#getTypeToken() */ + @Override public TypeToken<T> getTypeToken() { return TypeTokens.getTypeToken(typeToken, type); } /** @see Sensor#getType() */ + @Override public Class<? super T> getType() { return TypeTokens.getRawType(typeToken, type); } /** @see Sensor#getTypeName() */ + @Override public String getTypeName() { return getType().getName(); } /** @see Sensor#getName() */ + @Override public String getName() { return name; } /** @see Sensor#getNameParts() */ + @Override public synchronized List<String> getNameParts() { if (nameParts==null) nameParts = ImmutableList.copyOf(dots.split(name)); return nameParts; } /** @see Sensor#getDescription() */ + @Override public String getDescription() { return description; } /** @see Sensor#newEvent(Entity, Object) */ + @Override public SensorEvent<T> newEvent(Entity producer, T value) { return new BasicSensorEvent<T>(this, producer, value); } http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/core/src/main/java/org/apache/brooklyn/core/sensor/BasicSensorEvent.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/sensor/BasicSensorEvent.java b/core/src/main/java/org/apache/brooklyn/core/sensor/BasicSensorEvent.java index 44453fc..d4214f0 100644 --- a/core/src/main/java/org/apache/brooklyn/core/sensor/BasicSensorEvent.java +++ b/core/src/main/java/org/apache/brooklyn/core/sensor/BasicSensorEvent.java @@ -40,12 +40,16 @@ public class BasicSensorEvent<T> implements SensorEvent<T> { private final T value; private final long timestamp; + @Override public T getValue() { return value; } + @Override public Sensor<T> getSensor() { return sensor; } + @Override public Entity getSource() { return source; } + @Override public long getTimestamp() { return timestamp; } /** arguments should not be null (except in certain limited testing situations) */ http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/core/src/main/java/org/apache/brooklyn/core/sensor/DependentConfiguration.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/sensor/DependentConfiguration.java b/core/src/main/java/org/apache/brooklyn/core/sensor/DependentConfiguration.java index d6e0622..906f854 100644 --- a/core/src/main/java/org/apache/brooklyn/core/sensor/DependentConfiguration.java +++ b/core/src/main/java/org/apache/brooklyn/core/sensor/DependentConfiguration.java @@ -403,6 +403,7 @@ public class DependentConfiguration { @SuppressWarnings({ "rawtypes" }) public static <U,T> Task<T> transform(final Map flags, final TaskAdaptable<U> task, final Function<U,T> transformer) { return new BasicTask<T>(flags, new Callable<T>() { + @Override public T call() throws Exception { if (!task.asTask().isSubmitted()) { BasicExecutionContext.getCurrentExecutionContext().submit(task); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/core/src/main/java/org/apache/brooklyn/core/server/entity/BrooklynMetricsImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/server/entity/BrooklynMetricsImpl.java b/core/src/main/java/org/apache/brooklyn/core/server/entity/BrooklynMetricsImpl.java index fd9488c..1662428 100644 --- a/core/src/main/java/org/apache/brooklyn/core/server/entity/BrooklynMetricsImpl.java +++ b/core/src/main/java/org/apache/brooklyn/core/server/entity/BrooklynMetricsImpl.java @@ -47,6 +47,7 @@ public class BrooklynMetricsImpl extends AbstractEntity implements BrooklynMetri executor = Executors.newSingleThreadScheduledExecutor(threadFactory); executor.scheduleWithFixedDelay( new Runnable() { + @Override public void run() { refreshSensors(); }}, http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/core/src/main/java/org/apache/brooklyn/core/typereg/BasicBrooklynTypeRegistry.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/typereg/BasicBrooklynTypeRegistry.java b/core/src/main/java/org/apache/brooklyn/core/typereg/BasicBrooklynTypeRegistry.java index 75697f8..f7df463 100644 --- a/core/src/main/java/org/apache/brooklyn/core/typereg/BasicBrooklynTypeRegistry.java +++ b/core/src/main/java/org/apache/brooklyn/core/typereg/BasicBrooklynTypeRegistry.java @@ -61,6 +61,7 @@ public class BasicBrooklynTypeRegistry implements BrooklynTypeRegistry { this.mgmt = mgmt; } + @Override public Iterable<RegisteredType> getAll() { return getMatching(Predicates.alwaysTrue()); } http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/core/src/main/java/org/apache/brooklyn/feed/http/HttpFeed.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/feed/http/HttpFeed.java b/core/src/main/java/org/apache/brooklyn/feed/http/HttpFeed.java index 6c9439b..147c4e5 100644 --- a/core/src/main/java/org/apache/brooklyn/feed/http/HttpFeed.java +++ b/core/src/main/java/org/apache/brooklyn/feed/http/HttpFeed.java @@ -370,6 +370,7 @@ public class HttpFeed extends AbstractFeed { Callable<HttpToolResponse> pollJob; pollJob = new Callable<HttpToolResponse>() { + @Override public HttpToolResponse call() throws Exception { if (log.isTraceEnabled()) log.trace("http polling for {} sensors at {}", entity, pollInfo); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/core/src/main/java/org/apache/brooklyn/feed/http/HttpValueFunctions.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/feed/http/HttpValueFunctions.java b/core/src/main/java/org/apache/brooklyn/feed/http/HttpValueFunctions.java index 5e3f99f..9ad3b34 100644 --- a/core/src/main/java/org/apache/brooklyn/feed/http/HttpValueFunctions.java +++ b/core/src/main/java/org/apache/brooklyn/feed/http/HttpValueFunctions.java @@ -109,6 +109,7 @@ public class HttpValueFunctions { private static Function<HttpToolResponse, Long> latencyLegacy() { // TODO PERSISTENCE WORKAROUND kept anonymous function in case referenced in persisted state return new Function<HttpToolResponse, Long>() { + @Override public Long apply(HttpToolResponse input) { return input.getLatencyFullContent(); } @@ -116,6 +117,7 @@ public class HttpValueFunctions { } private static class Latency implements Function<HttpToolResponse, Long> { + @Override public Long apply(HttpToolResponse input) { return input.getLatencyFullContent(); } http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/core/src/main/java/org/apache/brooklyn/feed/ssh/SshFeed.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/feed/ssh/SshFeed.java b/core/src/main/java/org/apache/brooklyn/feed/ssh/SshFeed.java index 5ac144a..49a19db 100644 --- a/core/src/main/java/org/apache/brooklyn/feed/ssh/SshFeed.java +++ b/core/src/main/java/org/apache/brooklyn/feed/ssh/SshFeed.java @@ -246,6 +246,7 @@ public class SshFeed extends AbstractFeed { getPoller().scheduleAtFixedRate( new Callable<SshPollValue>() { + @Override public SshPollValue call() throws Exception { return exec(pollInfo.command.get(), pollInfo.env.get()); }}, http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/core/src/main/java/org/apache/brooklyn/location/byon/FixedListMachineProvisioningLocation.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/location/byon/FixedListMachineProvisioningLocation.java b/core/src/main/java/org/apache/brooklyn/location/byon/FixedListMachineProvisioningLocation.java index c57a5b7..756db1c 100644 --- a/core/src/main/java/org/apache/brooklyn/location/byon/FixedListMachineProvisioningLocation.java +++ b/core/src/main/java/org/apache/brooklyn/location/byon/FixedListMachineProvisioningLocation.java @@ -215,6 +215,7 @@ implements MachineProvisioningLocation<T>, Closeable { return super.configure(properties); } + @Override @SuppressWarnings("unchecked") public FixedListMachineProvisioningLocation<T> newSubLocation(Map<?,?> newFlags) { // TODO shouldn't have to copy config bag as it should be inherited (but currently it is not used inherited everywhere; just most places) http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/core/src/main/java/org/apache/brooklyn/location/ssh/SshMachineLocation.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/location/ssh/SshMachineLocation.java b/core/src/main/java/org/apache/brooklyn/location/ssh/SshMachineLocation.java index 295d1fb..3843b86 100644 --- a/core/src/main/java/org/apache/brooklyn/location/ssh/SshMachineLocation.java +++ b/core/src/main/java/org/apache/brooklyn/location/ssh/SshMachineLocation.java @@ -846,6 +846,7 @@ public class SshMachineLocation extends AbstractLocation implements MachineLocat return copyTo(props, src, destination); } else { return execSsh(props, new Function<ShellTool,Integer>() { + @Override public Integer apply(ShellTool ssh) { return ((SshTool) ssh).copyToServer(props, new KnownSizeInputStream(src, filesize), destination); }}); @@ -855,6 +856,7 @@ public class SshMachineLocation extends AbstractLocation implements MachineLocat // Closes input stream before returning public int copyTo(final Map<String,?> props, final InputStream src, final String destination) { return execSsh(props, new Function<ShellTool,Integer>() { + @Override public Integer apply(ShellTool ssh) { return ((SshTool)ssh).copyToServer(props, src, destination); }}); @@ -866,6 +868,7 @@ public class SshMachineLocation extends AbstractLocation implements MachineLocat } public int copyFrom(final Map<String,?> props, final String remote, final String local) { return execSsh(props, new Function<ShellTool,Integer>() { + @Override public Integer apply(ShellTool ssh) { return ((SshTool)ssh).copyFromServer(props, remote, new File(local)); }}); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/core/src/main/java/org/apache/brooklyn/util/core/task/AbstractExecutionContext.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/util/core/task/AbstractExecutionContext.java b/core/src/main/java/org/apache/brooklyn/util/core/task/AbstractExecutionContext.java index 2c152b9..e7debb9 100644 --- a/core/src/main/java/org/apache/brooklyn/util/core/task/AbstractExecutionContext.java +++ b/core/src/main/java/org/apache/brooklyn/util/core/task/AbstractExecutionContext.java @@ -67,6 +67,7 @@ public abstract class AbstractExecutionContext implements ExecutionContext { * * @see #submit(Map, Runnable) */ + @Override public void execute(Runnable r) { submit(r); } /** does the work internally of submitting the task; note that the return value may be a wrapper task even if a task is passed in, http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/core/src/main/java/org/apache/brooklyn/util/core/task/BasicExecutionContext.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/util/core/task/BasicExecutionContext.java b/core/src/main/java/org/apache/brooklyn/util/core/task/BasicExecutionContext.java index b220552..4cece3a 100644 --- a/core/src/main/java/org/apache/brooklyn/util/core/task/BasicExecutionContext.java +++ b/core/src/main/java/org/apache/brooklyn/util/core/task/BasicExecutionContext.java @@ -94,6 +94,7 @@ public class BasicExecutionContext extends AbstractExecutionContext { } /** returns tasks started by this context (or tasks which have all the tags on this object) */ + @Override public Set<Task<?>> getTasks() { return executionManager.getTasksWithAllTags((Set<?>)tags); } @SuppressWarnings({ "unchecked", "rawtypes" }) @@ -142,6 +143,7 @@ public class BasicExecutionContext extends AbstractExecutionContext { // (this matters when we are navigating in the GUI; without it we lose the reference to the child // when browsing in the context of the parent) return submit(Tasks.<T>builder().displayName("Cross-context execution: "+t.getDescription()).dynamic(true).body(new Callable<T>() { + @Override public T call() { return DynamicTasks.get(t); } @@ -154,6 +156,7 @@ public class BasicExecutionContext extends AbstractExecutionContext { // as above, but here we are definitely not a child (what we are submitting isn't even a task) // (will only come here if properties defines tags including a target entity, which probably never happens) submit(Tasks.<T>builder().displayName("Cross-context execution").dynamic(true).body(new Callable<T>() { + @Override public T call() { if (task instanceof Callable) { return DynamicTasks.queue( Tasks.<T>builder().dynamic(false).body((Callable<T>)task).build() ).getUnchecked(); @@ -184,6 +187,7 @@ public class BasicExecutionContext extends AbstractExecutionContext { final Object startCallback = properties.get("newTaskStartCallback"); properties.put("newTaskStartCallback", new Function<Task<?>,Void>() { + @Override public Void apply(Task<?> it) { registerPerThreadExecutionContext(); if (startCallback!=null) BasicExecutionManager.invokeCallback(startCallback, it); @@ -192,6 +196,7 @@ public class BasicExecutionContext extends AbstractExecutionContext { final Object endCallback = properties.get("newTaskEndCallback"); properties.put("newTaskEndCallback", new Function<Task<?>,Void>() { + @Override public Void apply(Task<?> it) { try { if (endCallback!=null) BasicExecutionManager.invokeCallback(endCallback, it); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/core/src/main/java/org/apache/brooklyn/util/core/task/BasicExecutionManager.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/util/core/task/BasicExecutionManager.java b/core/src/main/java/org/apache/brooklyn/util/core/task/BasicExecutionManager.java index 36a316f..b2b970e 100644 --- a/core/src/main/java/org/apache/brooklyn/util/core/task/BasicExecutionManager.java +++ b/core/src/main/java/org/apache/brooklyn/util/core/task/BasicExecutionManager.java @@ -259,6 +259,7 @@ public class BasicExecutionManager implements ExecutionManager { return removed != null; } + @Override public boolean isShutdown() { return runner.isShutdown(); } @@ -366,19 +367,22 @@ public class BasicExecutionManager implements ExecutionManager { @Beta public Collection<Task<?>> allTasksLive() { return tasksById.values(); } + @Override public Set<Object> getTaskTags() { synchronized (tasksByTag) { return Collections.unmodifiableSet(Sets.newLinkedHashSet(tasksByTag.keySet())); } } - public Task<?> submit(Runnable r) { return submit(new LinkedHashMap<Object,Object>(1), r); } - public Task<?> submit(Map<?,?> flags, Runnable r) { return submit(flags, new BasicTask<Void>(flags, r)); } + @Override public Task<?> submit(Runnable r) { return submit(new LinkedHashMap<Object,Object>(1), r); } + @Override public Task<?> submit(Map<?,?> flags, Runnable r) { return submit(flags, new BasicTask<Void>(flags, r)); } + + @Override public <T> Task<T> submit(Callable<T> c) { return submit(new LinkedHashMap<Object,Object>(1), c); } + @Override public <T> Task<T> submit(Map<?,?> flags, Callable<T> c) { return submit(flags, new BasicTask<T>(flags, c)); } - public <T> Task<T> submit(Callable<T> c) { return submit(new LinkedHashMap<Object,Object>(1), c); } - public <T> Task<T> submit(Map<?,?> flags, Callable<T> c) { return submit(flags, new BasicTask<T>(flags, c)); } + @Override public <T> Task<T> submit(TaskAdaptable<T> t) { return submit(new LinkedHashMap<Object,Object>(1), t); } - public <T> Task<T> submit(TaskAdaptable<T> t) { return submit(new LinkedHashMap<Object,Object>(1), t); } + @Override public <T> Task<T> submit(Map<?,?> flags, TaskAdaptable<T> task) { if (!(task instanceof Task)) task = task.asTask(); @@ -424,6 +428,7 @@ public class BasicExecutionManager implements ExecutionManager { this.flags = flags; } + @Override @SuppressWarnings({ "rawtypes", "unchecked" }) public Object call() { if (task.startTimeUtc==-1) task.startTimeUtc = System.currentTimeMillis(); @@ -434,7 +439,7 @@ public class BasicExecutionManager implements ExecutionManager { taskScheduled.setSubmittedByTask(task); final Callable<?> oldJob = taskScheduled.getJob(); final TaskInternal<?> taskScheduledF = taskScheduled; - taskScheduled.setJob(new Callable() { public Object call() { + taskScheduled.setJob(new Callable() { @Override public Object call() { boolean shouldResubmit = true; task.recentRun = taskScheduledF; try { @@ -513,6 +518,7 @@ public class BasicExecutionManager implements ExecutionManager { this.task = task; } + @Override public T call() { try { T result = null; http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/core/src/main/java/org/apache/brooklyn/util/core/task/CompoundTask.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/util/core/task/CompoundTask.java b/core/src/main/java/org/apache/brooklyn/util/core/task/CompoundTask.java index 22a6ed8..72dfb44 100644 --- a/core/src/main/java/org/apache/brooklyn/util/core/task/CompoundTask.java +++ b/core/src/main/java/org/apache/brooklyn/util/core/task/CompoundTask.java @@ -122,6 +122,7 @@ public abstract class CompoundTask<T> extends BasicTask<List<T>> implements HasT return children; } + @Override @SuppressWarnings({ "unchecked", "rawtypes" }) public List<Task<?>> getChildren() { return (List) getChildrenTyped(); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/core/src/main/java/org/apache/brooklyn/util/core/task/TaskBuilder.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/util/core/task/TaskBuilder.java b/core/src/main/java/org/apache/brooklyn/util/core/task/TaskBuilder.java index 8750933..816065e 100644 --- a/core/src/main/java/org/apache/brooklyn/util/core/task/TaskBuilder.java +++ b/core/src/main/java/org/apache/brooklyn/util/core/task/TaskBuilder.java @@ -184,6 +184,7 @@ public class TaskBuilder<T> { /** returns a a factory based on this builder */ public TaskFactory<Task<T>> buildFactory() { return new TaskFactory<Task<T>>() { + @Override public Task<T> newTask() { return build(); } http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/core/src/main/java/org/apache/brooklyn/util/core/task/TaskTags.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/util/core/task/TaskTags.java b/core/src/main/java/org/apache/brooklyn/util/core/task/TaskTags.java index 68a59e7..6b64a6b 100644 --- a/core/src/main/java/org/apache/brooklyn/util/core/task/TaskTags.java +++ b/core/src/main/java/org/apache/brooklyn/util/core/task/TaskTags.java @@ -37,6 +37,7 @@ public class TaskTags { public static void addTagDynamically(TaskAdaptable<?> task, final Object tag) { ((BasicTask<?>)task.asTask()).applyTagModifier(new Function<Set<Object>, Void>() { + @Override public Void apply(@Nullable Set<Object> input) { input.add(tag); return null; @@ -46,6 +47,7 @@ public class TaskTags { public static void addTagsDynamically(TaskAdaptable<?> task, final Object tag1, final Object ...tags) { ((BasicTask<?>)task.asTask()).applyTagModifier(new Function<Set<Object>, Void>() { + @Override public Void apply(@Nullable Set<Object> input) { input.add(tag1); for (Object tag: tags) input.add(tag); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/core/src/main/java/org/apache/brooklyn/util/core/task/Tasks.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/util/core/task/Tasks.java b/core/src/main/java/org/apache/brooklyn/util/core/task/Tasks.java index 661f1c2..09116af 100644 --- a/core/src/main/java/org/apache/brooklyn/util/core/task/Tasks.java +++ b/core/src/main/java/org/apache/brooklyn/util/core/task/Tasks.java @@ -342,7 +342,7 @@ public class Tasks { } } public static Task<Void> fail(final String name, final Throwable optionalError) { - return Tasks.<Void>builder().dynamic(false).displayName(name).body(new Runnable() { public void run() { + return Tasks.<Void>builder().dynamic(false).displayName(name).body(new Runnable() { @Override public void run() { if (optionalError!=null) throw Exceptions.propagate(optionalError); else throw new RuntimeException("Failed: "+name); } }).build(); } http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/core/src/main/java/org/apache/brooklyn/util/core/task/ValueResolver.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/util/core/task/ValueResolver.java b/core/src/main/java/org/apache/brooklyn/util/core/task/ValueResolver.java index c0af7cf..650ccc9 100644 --- a/core/src/main/java/org/apache/brooklyn/util/core/task/ValueResolver.java +++ b/core/src/main/java/org/apache/brooklyn/util/core/task/ValueResolver.java @@ -286,6 +286,7 @@ public class ValueResolver<T> implements DeferredSupplier<T> { throw new NullPointerException("type must be set to resolve, for '"+value+"'"+(description!=null ? ", "+description : "")); } + @Override public T get() { Maybe<T> m = getMaybe(); if (m.isPresent()) return m.get(); @@ -367,6 +368,7 @@ public class ValueResolver<T> implements DeferredSupplier<T> { //including tasks, above if (!vfuture.isDone()) { Callable<Maybe> callable = new Callable<Maybe>() { + @Override public Maybe call() throws Exception { return Durations.get(vfuture, timer); } }; @@ -389,6 +391,7 @@ public class ValueResolver<T> implements DeferredSupplier<T> { return Maybe.absent("Embedding in task needed for '"+getDescription()+"' but no execution context available"); Callable<Object> callable = new Callable<Object>() { + @Override public Object call() throws Exception { try { Tasks.setBlockingDetails("Retrieving "+ds); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/core/src/main/java/org/apache/brooklyn/util/core/task/ssh/SshPutTaskFactory.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/util/core/task/ssh/SshPutTaskFactory.java b/core/src/main/java/org/apache/brooklyn/util/core/task/ssh/SshPutTaskFactory.java index 7909df5..5e369d1 100644 --- a/core/src/main/java/org/apache/brooklyn/util/core/task/ssh/SshPutTaskFactory.java +++ b/core/src/main/java/org/apache/brooklyn/util/core/task/ssh/SshPutTaskFactory.java @@ -107,6 +107,7 @@ public class SshPutTaskFactory extends SshPutTaskStub implements TaskFactory<Ssh return self(); } + @Override public SshPutTaskWrapper newTask() { dirty = false; return new SshPutTaskWrapper(this); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/core/src/main/java/org/apache/brooklyn/util/core/task/ssh/SshTasks.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/util/core/task/ssh/SshTasks.java b/core/src/main/java/org/apache/brooklyn/util/core/task/ssh/SshTasks.java index 28abc86..97b99adce 100644 --- a/core/src/main/java/org/apache/brooklyn/util/core/task/ssh/SshTasks.java +++ b/core/src/main/java/org/apache/brooklyn/util/core/task/ssh/SshTasks.java @@ -186,7 +186,7 @@ public class SshTasks { .summary("patch /etc/sudoers to disable requiretty") .configure(SshTool.PROP_ALLOCATE_PTY, true) .allowingNonZeroExitCode() - .returning(new Function<ProcessTaskWrapper<?>,Boolean>() { public Boolean apply(ProcessTaskWrapper<?> task) { + .returning(new Function<ProcessTaskWrapper<?>,Boolean>() { @Override public Boolean apply(ProcessTaskWrapper<?> task) { if (task.getExitCode()==0 && task.getStdout().contains("sudo-is-working-"+id)) return true; Entity entity = BrooklynTaskTags.getTargetOrContextEntity(Tasks.current()); @@ -215,6 +215,7 @@ public class SshTasks { * and then returns stdout */ public static Function<ProcessTaskWrapper<?>, String> returningStdoutLoggingInfo(final Logger logger, final boolean requireZero) { return new Function<ProcessTaskWrapper<?>, String>() { + @Override public String apply(@Nullable ProcessTaskWrapper<?> input) { if (logger!=null) logger.info(input+" COMMANDS:\n"+Strings.join(input.getCommands(),"\n")); if (logger!=null) logger.info(input+" STDOUT:\n"+input.getStdout()); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/core/src/main/java/org/apache/brooklyn/util/core/task/system/internal/AbstractProcessTaskFactory.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/util/core/task/system/internal/AbstractProcessTaskFactory.java b/core/src/main/java/org/apache/brooklyn/util/core/task/system/internal/AbstractProcessTaskFactory.java index 8d6a343..6f9f0e0 100644 --- a/core/src/main/java/org/apache/brooklyn/util/core/task/system/internal/AbstractProcessTaskFactory.java +++ b/core/src/main/java/org/apache/brooklyn/util/core/task/system/internal/AbstractProcessTaskFactory.java @@ -100,6 +100,7 @@ public abstract class AbstractProcessTaskFactory<T extends AbstractProcessTaskFa public ProcessTaskFactory<Boolean> returningIsExitCodeZero() { if (requireExitCodeZero==null) allowingNonZeroExitCode(); return returning(new Function<ProcessTaskWrapper<?>,Boolean>() { + @Override public Boolean apply(ProcessTaskWrapper<?> input) { return input.getExitCode()==0; } http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/core/src/main/java/org/apache/brooklyn/util/core/task/system/internal/ExecWithLoggingHelpers.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/util/core/task/system/internal/ExecWithLoggingHelpers.java b/core/src/main/java/org/apache/brooklyn/util/core/task/system/internal/ExecWithLoggingHelpers.java index 790dc18..b3cdf67 100644 --- a/core/src/main/java/org/apache/brooklyn/util/core/task/system/internal/ExecWithLoggingHelpers.java +++ b/core/src/main/java/org/apache/brooklyn/util/core/task/system/internal/ExecWithLoggingHelpers.java @@ -163,6 +163,7 @@ public abstract class ExecWithLoggingHelpers { Tasks.setBlockingDetails(shortName+" executing, "+summaryForLogging); try { return execWithTool(MutableMap.copyOf(toolFlags.getAllConfig()), new Function<ShellTool, Integer>() { + @Override public Integer apply(ShellTool tool) { int result = execCommand.exec(tool, MutableMap.copyOf(execFlags.getAllConfig()), commands, env); if (commandLogger!=null && commandLogger.isDebugEnabled()) http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/core/src/test/java/org/apache/brooklyn/core/BrooklynFeatureEnablementPerformanceTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/BrooklynFeatureEnablementPerformanceTest.java b/core/src/test/java/org/apache/brooklyn/core/BrooklynFeatureEnablementPerformanceTest.java index e029def..75d7eba 100644 --- a/core/src/test/java/org/apache/brooklyn/core/BrooklynFeatureEnablementPerformanceTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/BrooklynFeatureEnablementPerformanceTest.java @@ -49,6 +49,7 @@ public class BrooklynFeatureEnablementPerformanceTest extends AbstractPerformanc .iterations(numIterations) .minAcceptablePerSecond(minRatePerSec) .job(new Runnable() { + @Override public void run() { assertFalse(BrooklynFeatureEnablement.isEnabled(featureProperty)); }})); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/core/src/test/java/org/apache/brooklyn/core/config/MapListAndOtherStructuredConfigKeyTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/config/MapListAndOtherStructuredConfigKeyTest.java b/core/src/test/java/org/apache/brooklyn/core/config/MapListAndOtherStructuredConfigKeyTest.java index fd6b15a..fb124bf 100644 --- a/core/src/test/java/org/apache/brooklyn/core/config/MapListAndOtherStructuredConfigKeyTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/config/MapListAndOtherStructuredConfigKeyTest.java @@ -86,6 +86,7 @@ public class MapListAndOtherStructuredConfigKeyTest extends BrooklynAppUnitTestS final AtomicReference<String> bval = new AtomicReference<String>("bval-too-early"); entity.config().set(TestEntity.CONF_MAP_THING.subKey("akey"), DependentConfiguration.whenDone(Callables.returning("aval"))); entity.config().set(TestEntity.CONF_MAP_THING.subKey("bkey"), DependentConfiguration.whenDone(new Callable<String>() { + @Override public String call() { return bval.get(); }})); @@ -101,6 +102,7 @@ public class MapListAndOtherStructuredConfigKeyTest extends BrooklynAppUnitTestS entity.config().set(TestEntity.CONF_MAP_THING, (Map) MutableMap.of( "akey", DependentConfiguration.whenDone(Callables.returning("aval")), "bkey", DependentConfiguration.whenDone(new Callable<String>() { + @Override public String call() { return bval.get(); }}))); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/core/src/test/java/org/apache/brooklyn/core/effector/EffectorConcatenateTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/effector/EffectorConcatenateTest.java b/core/src/test/java/org/apache/brooklyn/core/effector/EffectorConcatenateTest.java index c909a9d..93692c6 100644 --- a/core/src/test/java/org/apache/brooklyn/core/effector/EffectorConcatenateTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/effector/EffectorConcatenateTest.java @@ -92,6 +92,7 @@ public class EffectorConcatenateTest { Tasks.setExtraStatusDetails("waitabit extra status details"); Tasks.withBlockingDetails("waitabit.blocking", new Callable<Void>() { + @Override public Void call() throws Exception { nowWaitingLatch.countDown(); if (!continueFromWaitingLatch.await(TIMEOUT, TimeUnit.MILLISECONDS)) { @@ -107,6 +108,7 @@ public class EffectorConcatenateTest { BasicExecutionContext.getCurrentExecutionContext().submit( MutableMap.of("displayName", "SpawnedChildName"), new Callable<Void>() { + @Override public Void call() throws Exception { log.info("beginning spawned child response "+Tasks.current()+", with tags "+Tasks.current().getTags()); Tasks.setBlockingDetails("spawned child blocking details"); @@ -149,6 +151,7 @@ public class EffectorConcatenateTest { final AtomicReference<String> result = new AtomicReference<String>(); Thread bg = new Thread(new Runnable() { + @Override public void run() { try { // Expect "wait a bit" to tell us it's blocking @@ -195,6 +198,7 @@ public class EffectorConcatenateTest { final AtomicReference<String> result = new AtomicReference<String>(); Thread bg = new Thread(new Runnable() { + @Override public void run() { try { // Expect "spawned child" to tell us it's blocking @@ -206,6 +210,7 @@ public class EffectorConcatenateTest { // Expect spawned task to be have been tagged with entity ExecutionManager em = e.getManagementContext().getExecutionManager(); Task<?> subtask = Iterables.find(BrooklynTaskTags.getTasksInEntityContext(em, e), new Predicate<Task<?>>() { + @Override public boolean apply(Task<?> input) { return "SpawnedChildName".equals(input.getDisplayName()); } http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/core/src/test/java/org/apache/brooklyn/core/effector/EffectorSayHiTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/effector/EffectorSayHiTest.java b/core/src/test/java/org/apache/brooklyn/core/effector/EffectorSayHiTest.java index 7f37245..df8a2cb 100644 --- a/core/src/test/java/org/apache/brooklyn/core/effector/EffectorSayHiTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/effector/EffectorSayHiTest.java @@ -122,7 +122,7 @@ public class EffectorSayHiTest extends BrooklynAppUnitTestSupport { @Test public void testCanExcludeNonEffectorTasks() throws Exception { ExecutionContext executionContext = mgmt.getExecutionContext(e); - executionContext.submit(new BasicTask<Void>(new Runnable() { public void run() {} })); + executionContext.submit(new BasicTask<Void>(new Runnable() { @Override public void run() {} })); Set<Task<?>> effectTasks = mgmt.getExecutionManager().getTasksWithAllTags(ImmutableList.of( BrooklynTaskTags.tagForContextEntity(e),ManagementContextInternal.EFFECTOR_TAG)); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/core/src/test/java/org/apache/brooklyn/core/effector/EffectorTaskTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/effector/EffectorTaskTest.java b/core/src/test/java/org/apache/brooklyn/core/effector/EffectorTaskTest.java index f094697..f30c913 100644 --- a/core/src/test/java/org/apache/brooklyn/core/effector/EffectorTaskTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/effector/EffectorTaskTest.java @@ -111,9 +111,11 @@ public class EffectorTaskTest extends BrooklynAppUnitTestSupport { return new EffectorTaskFactory<Integer>() { @Override public Task<Integer> newTask(final Entity entity, final Effector<Integer> effector, final ConfigBag parameters) { - return TaskBuilder.<Integer>builder().displayName("times").body(new Callable<Integer>() { public Integer call() { - return DynamicTasks.get( x.newTask(entity, effector, parameters) )*y; - } }).build(); + return TaskBuilder.<Integer>builder() + .displayName("times") + .body(new Callable<Integer>() { @Override public Integer call() { + return DynamicTasks.get( x.newTask(entity, effector, parameters) )*y; + }}).build(); } }; } @@ -200,26 +202,47 @@ public class EffectorTaskTest extends BrooklynAppUnitTestSupport { // ----------------- syntax for more complex -- an effector using subtasks public static Task<Integer> add(final int x, final int y) { - return TaskBuilder.<Integer>builder().displayName("add").body(new Callable<Integer>() { public Integer call() { return x+y; } }).build(); + return TaskBuilder.<Integer>builder() + .displayName("add") + .body(new Callable<Integer>() { + @Override public Integer call() { return x+y; } + }).build(); } public static Task<Integer> add(final Task<Integer> x, final int y) { - return TaskBuilder.<Integer>builder().displayName("add").body(new Callable<Integer>() { public Integer call() { return DynamicTasks.get(x)+y; } }).build(); + return TaskBuilder.<Integer>builder() + .displayName("add") + .body(new Callable<Integer>() { + @Override public Integer call() { return DynamicTasks.get(x)+y; } + }).build(); } public static Task<Integer> addBasic(final Task<Integer> x, final int y) { - return TaskBuilder.<Integer>builder().displayName("add (not dynamic)").dynamic(false).body(new Callable<Integer>() { public Integer call() { - Preconditions.checkState(x.isSubmitted()); - return x.getUnchecked()+y; - } }).build(); + return TaskBuilder.<Integer>builder() + .displayName("add (not dynamic)") + .dynamic(false) + .body(new Callable<Integer>() { + @Override public Integer call() { + Preconditions.checkState(x.isSubmitted()); + return x.getUnchecked()+y; + } + }).build(); } public static Task<Integer> times(final int x, final int y) { - return TaskBuilder.<Integer>builder().displayName("times").body(new Callable<Integer>() { public Integer call() { return x*y; } }).build(); + return TaskBuilder.<Integer>builder() + .displayName("times") + .body(new Callable<Integer>() { + @Override public Integer call() { return x*y; } + }).build(); } public static Task<Integer> times(final Task<Integer> x, final int y) { - return TaskBuilder.<Integer>builder().displayName("times").body(new Callable<Integer>() { public Integer call() { return DynamicTasks.get(x)*y; } }).build(); + return TaskBuilder.<Integer>builder() + .displayName("times") + .body(new Callable<Integer>() { + @Override public Integer call() { return DynamicTasks.get(x)*y; } + }).build(); } public static final Effector<Integer> TWO_X_PLUS_ONE = Effectors.effector(Integer.class, "twoXPlusOne") http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/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 079e45e..c40707c 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 @@ -198,6 +198,7 @@ public class DependentConfigurationTest extends BrooklynAppUnitTestSupport { @Test public void testAttributeWhenReadyWithPostProcessingWithBuilderWaitingNow() throws Exception { final Task<String> t = submit(new Callable<String>() { + @Override public String call() { return DependentConfiguration.builder() .attributeWhenReady(entity, TestEntity.SEQUENCE) @@ -247,6 +248,7 @@ public class DependentConfigurationTest extends BrooklynAppUnitTestSupport { @Test public void testAttributeWhenReadyWithAbortWaitingNow() throws Exception { final Task<String> t = submit(new Callable<String>() { + @Override public String call() { return DependentConfiguration.builder() .attributeWhenReady(entity, TestEntity.NAME) @@ -287,6 +289,7 @@ public class DependentConfigurationTest extends BrooklynAppUnitTestSupport { public void testAttributeWhenReadyWithAbortFailsWhenAbortConditionAlreadyHoldsWaitingNow() throws Exception { entity2.sensors().set(TestEntity.SEQUENCE, 1); final Task<String> t = submit(new Callable<String>() { + @Override public String call() { return DependentConfiguration.builder() .attributeWhenReady(entity, TestEntity.NAME) http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/core/src/test/java/org/apache/brooklyn/core/entity/DynamicEntityTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/entity/DynamicEntityTest.java b/core/src/test/java/org/apache/brooklyn/core/entity/DynamicEntityTest.java index fb9276c..01b7e0b 100644 --- a/core/src/test/java/org/apache/brooklyn/core/entity/DynamicEntityTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/entity/DynamicEntityTest.java @@ -38,6 +38,7 @@ public class DynamicEntityTest extends BrooklynAppUnitTestSupport { public void testEffectorAddedDuringInit() { BasicEntity entity = app.createAndManageChild(EntitySpec.create(BasicEntity.class) .addInitializer(new EntityInitializer() { + @Override public void apply(EntityLocal entity) { ((EntityInternal) entity).getMutableEntityType().addEffector(EffectorTaskTest.DOUBLE_1); } http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/core/src/test/java/org/apache/brooklyn/core/entity/EntityConfigTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/entity/EntityConfigTest.java b/core/src/test/java/org/apache/brooklyn/core/entity/EntityConfigTest.java index c25e6d2..814f78d 100644 --- a/core/src/test/java/org/apache/brooklyn/core/entity/EntityConfigTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/entity/EntityConfigTest.java @@ -379,6 +379,7 @@ public class EntityConfigTest extends BrooklynAppUnitTestSupport { public void testGetConfigWithDeferredSupplierReturnsSupplied() throws Exception { DeferredSupplier<Integer> supplier = new DeferredSupplier<Integer>() { volatile int next = 0; + @Override public Integer get() { return next++; } @@ -401,6 +402,7 @@ public class EntityConfigTest extends BrooklynAppUnitTestSupport { entity.config().set((ConfigKey)MyOtherEntity.STRING_KEY, future); Future<String> getConfigFuture = executor.submit(new Callable<String>() { + @Override public String call() { return entity.getConfig(MyOtherEntity.STRING_KEY); }}); @@ -421,6 +423,7 @@ public class EntityConfigTest extends BrooklynAppUnitTestSupport { .configure(MyOtherEntity.STRING_KEY, task)); Future<String> getConfigFuture = executor.submit(new Callable<String>() { + @Override public String call() { return entity.getConfig(MyOtherEntity.STRING_KEY); }}); @@ -442,6 +445,7 @@ public class EntityConfigTest extends BrooklynAppUnitTestSupport { .configure(MyOtherEntity.STRING_KEY, task)); Future<String> getConfigFuture = executor.submit(new Callable<String>() { + @Override public String call() { return entity.getConfig(MyOtherEntity.STRING_KEY); }}); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/core/src/test/java/org/apache/brooklyn/core/entity/EntityConfigUsageTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/entity/EntityConfigUsageTest.java b/core/src/test/java/org/apache/brooklyn/core/entity/EntityConfigUsageTest.java index 55f0426..a431151 100644 --- a/core/src/test/java/org/apache/brooklyn/core/entity/EntityConfigUsageTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/entity/EntityConfigUsageTest.java @@ -226,6 +226,7 @@ public class EntityConfigUsageTest extends BrooklynAppUnitTestSupport { final CountDownLatch latch = new CountDownLatch(1); TestEntity entity = app.createAndManageChild(EntitySpec.create(TestEntity.class) .configure(TestEntity.CONF_NAME, DependentConfiguration.whenDone(new Callable<String>() { + @Override public String call() { try { latch.await(); return "aval"; @@ -236,6 +237,7 @@ public class EntityConfigUsageTest extends BrooklynAppUnitTestSupport { app.start(locs); Thread t = new Thread(new Runnable() { + @Override public void run() { try { Thread.sleep(10+EARLY_RETURN_GRACE); latch.countDown(); @@ -272,6 +274,7 @@ public class EntityConfigUsageTest extends BrooklynAppUnitTestSupport { TestEntity entity = app.createAndManageChild(EntitySpec.create(TestEntity.class)); TestEntity entity2 = app.createAndManageChild(EntitySpec.create(TestEntity.class) .configure(TestEntity.CONF_NAME, DependentConfiguration.attributePostProcessedWhenReady(entity, TestEntity.NAME, Predicates.notNull(), new Function<String,String>() { + @Override public String apply(String input) { return input+"mysuffix"; }}))); @@ -289,6 +292,7 @@ public class EntityConfigUsageTest extends BrooklynAppUnitTestSupport { app.start(locs); Thread t = new Thread(new Runnable() { + @Override public void run() { try { Thread.sleep(10+EARLY_RETURN_GRACE);
