[2/2] brooklyn-client git commit: This closes #38
This closes #38 Project: http://git-wip-us.apache.org/repos/asf/brooklyn-client/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-client/commit/8ecbfe78 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-client/tree/8ecbfe78 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-client/diff/8ecbfe78 Branch: refs/heads/master Commit: 8ecbfe786d03d471ebc93517ddf368a9205f49d7 Parents: a13f6e9 d5de6ab Author: Aled Sage Authored: Mon Jan 23 19:58:09 2017 + Committer: Aled Sage Committed: Mon Jan 23 19:58:09 2017 + -- cli/.gitignore | 1 + cli/pom.xml| 1 + 2 files changed, 2 insertions(+) --
[1/2] brooklyn-client git commit: Exclude cli/.glide/* (cache) from rat + git
Repository: brooklyn-client Updated Branches: refs/heads/master a13f6e956 -> 8ecbfe786 Exclude cli/.glide/* (cache) from rat + git Project: http://git-wip-us.apache.org/repos/asf/brooklyn-client/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-client/commit/d5de6aba Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-client/tree/d5de6aba Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-client/diff/d5de6aba Branch: refs/heads/master Commit: d5de6aba8a8d6c676c2f4f23105f92649cbfa354 Parents: a13f6e9 Author: Aled Sage Authored: Mon Jan 23 18:51:28 2017 + Committer: Aled Sage Committed: Mon Jan 23 18:51:28 2017 + -- cli/.gitignore | 1 + cli/pom.xml| 1 + 2 files changed, 2 insertions(+) -- http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/d5de6aba/cli/.gitignore -- diff --git a/cli/.gitignore b/cli/.gitignore index 41559ee..40209ea 100644 --- a/cli/.gitignore +++ b/cli/.gitignore @@ -1,2 +1,3 @@ temp_test vendor/ +.glide/ http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/d5de6aba/cli/pom.xml -- diff --git a/cli/pom.xml b/cli/pom.xml index b725567..8e32329 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -101,6 +101,7 @@ vendor/** glide.* +.glide/**
[16/17] brooklyn-server git commit: Remove unnecessary casts
Remove unnecessary casts Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/c0f11d07 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/c0f11d07 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/c0f11d07 Branch: refs/heads/master Commit: c0f11d0748698d8368a7a0619f53ad6806ac7b5b Parents: 070d4ef Author: Svetoslav Neykov Authored: Fri Jan 20 16:58:08 2017 +0200 Committer: Svetoslav Neykov Committed: Fri Jan 20 16:58:08 2017 +0200 -- .../apache/brooklyn/camp/spi/pdp/Artifact.java | 2 +- .../camp/spi/pdp/ArtifactRequirement.java | 2 +- .../BrooklynComponentTemplateResolver.java | 2 +- .../creation/BrooklynYamlLocationResolver.java | 2 +- .../spi/dsl/BrooklynDslInterpreter.java | 2 +- .../spi/dsl/DslDeferredFunctionCall.java| 2 +- .../spi/dsl/methods/BrooklynDslCommon.java | 4 +-- .../brooklyn/spi/dsl/methods/DslComponent.java | 4 +-- .../camp/brooklyn/EnrichersYamlTest.java| 2 +- .../camp/brooklyn/EntitiesYamlTest.java | 4 +-- .../camp/brooklyn/LocationsYamlTest.java| 22 - .../brooklyn/camp/brooklyn/ObjectsYamlTest.java | 2 +- .../camp/brooklyn/PoliciesYamlTest.java | 2 +- .../camp/brooklyn/WindowsYamlLiveTest.java | 2 +- .../catalog/CatalogYamlLocationTest.java| 2 +- .../camp/server/rest/util/DtoFactory.java | 2 +- .../catalog/internal/BasicBrooklynCatalog.java | 6 ++--- .../core/catalog/internal/CatalogDto.java | 2 +- .../config/internal/AbstractConfigMapImpl.java | 2 +- .../brooklyn/core/entity/AbstractEntity.java| 2 +- .../brooklyn/core/entity/EntityFunctions.java | 4 +-- .../brooklyn/core/entity/EntityRelations.java | 2 +- .../drivers/ReflectiveEntityDriverFactory.java | 2 +- .../core/entity/factory/ApplicationBuilder.java | 4 +-- .../entity/lifecycle/ServiceStateLogic.java | 2 +- .../core/feed/AttributePollHandler.java | 2 +- .../impl/ConcurrentMapAcceptingNullVals.java| 2 +- .../core/location/CatalogLocationResolver.java | 2 +- .../core/mgmt/EntityManagementUtils.java| 2 +- .../ha/dto/BasicManagementNodeSyncRecord.java | 2 +- .../core/mgmt/internal/EffectorUtils.java | 2 +- .../core/mgmt/internal/LocalEntityManager.java | 2 +- .../mgmt/rebind/BasicEntityRebindSupport.java | 6 ++--- .../core/mgmt/rebind/RebindIteration.java | 8 +++--- .../mgmt/rebind/dto/MementosGenerators.java | 2 +- .../core/objs/proxy/InternalEntityFactory.java | 2 +- .../brooklyn/core/sensor/AttributeMap.java | 2 +- ...platedStringAttributeSensorAndConfigKey.java | 2 +- .../core/server/BrooklynServerPaths.java| 2 +- .../stock/CustomAggregatingEnricher.java| 2 +- .../brooklyn/enricher/stock/Enrichers.java | 8 +++--- .../SshCommandMembershipTrackingPolicy.java | 2 +- .../brooklyn/entity/stock/DelegateEntity.java | 2 +- .../brooklyn/feed/http/HttpValueFunctions.java | 2 +- .../brooklyn/feed/http/JsonFunctions.java | 4 +-- .../location/byon/ByonLocationResolver.java | 2 +- .../FixedListMachineProvisioningLocation.java | 2 +- .../LocalhostMachineProvisioningLocation.java | 4 +-- .../location/ssh/SshMachineLocation.java| 2 +- .../util/core/internal/ssh/sshj/SshjTool.java | 2 +- .../util/core/json/MultimapSerializer.java | 2 +- .../util/core/task/BasicExecutionContext.java | 2 +- .../util/core/task/BasicExecutionManager.java | 2 +- .../brooklyn/util/core/task/BasicTask.java | 4 +-- .../core/effector/EffectorTaskTest.java | 6 ++--- .../core/effector/ssh/SshEffectorTasksTest.java | 4 +-- .../entity/DynamicEntityTypeConfigTest.java | 2 +- .../core/entity/EntityConfigUsageTest.java | 2 +- .../core/location/TestPortSupplierLocation.java | 2 +- .../core/mgmt/internal/EffectorUtilsTest.java | 6 ++--- .../mgmt/osgi/OsgiVersionMoreEntityTest.java| 2 +- .../core/mgmt/rebind/RebindEnricherTest.java| 8 +++--- .../core/mgmt/rebind/RebindEntityTest.java | 2 +- .../core/mgmt/rebind/RebindFeedTest.java| 12 - .../core/mgmt/rebind/RebindFeedWithHaTest.java | 6 ++--- .../rebind/RebindLocalhostLocationTest.java | 2 +- .../core/mgmt/rebind/RebindLocationTest.java| 18 +++--- .../core/mgmt/rebind/RebindPolicyTest.java | 2 +- .../rebind/RebindSshMachineLocationTest.java| 4 +-- .../network/OnPublicNetworkEnricherTest.java| 6 ++--- .../network/OnSubnetNetworkEnricherTest.java| 4 +-- .../core/test/entity/TestApplicationImpl.java | 2 +- .../typereg/RegisteredTypePredicatesTest.java | 4 +-- ...CustomAggregatingEnricherDeprecatedTest.java | 2 +- .../stock/TransformingEnricherTest.java | 5 ++-- .../apache/brookl
[06/17] brooklyn-server git commit: Add missing @Override annotation to method signatures overriding interface methods
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/core/src/test/java/org/apache/brooklyn/util/core/task/ScheduledExecutionTest.java
--
diff --git
a/core/src/test/java/org/apache/brooklyn/util/core/task/ScheduledExecutionTest.java
b/core/src/test/java/org/apache/brooklyn/util/core/task/ScheduledExecutionTest.java
index 5c11355..536dfea 100644
---
a/core/src/test/java/org/apache/brooklyn/util/core/task/ScheduledExecutionTest.java
+++
b/core/src/test/java/org/apache/brooklyn/util/core/task/ScheduledExecutionTest.java
@@ -56,8 +56,10 @@ public class ScheduledExecutionTest {
BasicExecutionManager m = new BasicExecutionManager("mycontextid");
final AtomicInteger i = new AtomicInteger(0);
ScheduledTask t = new ScheduledTask(MutableMap.of("delay", 2*PERIOD,
"period", PERIOD, "maxIterations", 5), new Callable>() {
+@Override
public Task call() throws Exception {
return new BasicTask(new Callable() {
+@Override
public Integer call() {
log.debug("task running: "+Tasks.current()+"
"+Tasks.current().getStatusDetail(false));
return i.incrementAndGet();
@@ -82,8 +84,10 @@ public class ScheduledExecutionTest {
BasicExecutionManager m = new BasicExecutionManager("mycontextid");
final AtomicInteger calls = new AtomicInteger(0);
ScheduledTask t = new ScheduledTask(MutableMap.of("period",
Duration.ONE_MILLISECOND, "maxIterations", 5), new Callable>() {
+@Override
public Task call() throws Exception {
return new BasicTask<>(new Callable() {
+@Override
public Integer call() {
calls.incrementAndGet();
throw new RuntimeException("boo");
@@ -108,8 +112,10 @@ public class ScheduledExecutionTest {
BasicExecutionManager m = new BasicExecutionManager("mycontextid");
final AtomicInteger calls = new AtomicInteger(0);
ScheduledTask t = new ScheduledTask(MutableMap.of("period",
Duration.ONE_MILLISECOND, "maxIterations", 5, "cancelOnException", false), new
Callable>() {
+@Override
public Task call() throws Exception {
return new BasicTask<>(new Callable() {
+@Override
public Integer call() {
calls.incrementAndGet();
throw new RuntimeException("boo");
@@ -128,8 +134,10 @@ public class ScheduledExecutionTest {
BasicExecutionManager m = new BasicExecutionManager("mycontextid");
final AtomicInteger i = new AtomicInteger(0);
ScheduledTask t = new ScheduledTask(MutableMap.of("delay", 2*PERIOD,
"period", PERIOD), new Callable>() {
+@Override
public Task call() throws Exception {
return new BasicTask(new Callable() {
+@Override
public Integer call() {
ScheduledTask submitter = (ScheduledTask)
((BasicTask)Tasks.current()).getSubmittedByTask();
if (i.get() >= 4) submitter.period = null;
@@ -157,8 +165,10 @@ public class ScheduledExecutionTest {
BasicExecutionManager m = new BasicExecutionManager("mycontextid");
final AtomicInteger i = new AtomicInteger();
ScheduledTask t = new ScheduledTask(MutableMap.of("delay",
PERIOD.times(2), "period", PERIOD), new Callable>() {
+@Override
public Task call() throws Exception {
return new BasicTask(new Callable() {
+@Override
public Integer call() {
log.info("task running ("+i+"): "+Tasks.current()+"
"+Tasks.current().getStatusDetail(false));
ScheduledTask submitter = (ScheduledTask)
((BasicTask)Tasks.current()).getSubmittedByTask();
@@ -192,8 +202,10 @@ public class ScheduledExecutionTest {
BasicExecutionManager m = new BasicExecutionManager("mycontextid");
final AtomicInteger i = new AtomicInteger();
ScheduledTask t = new ScheduledTask(MutableMap.of("delay",
PERIOD.times(2), "period", PERIOD), new Callable>() {
+@Override
public Task call() throws Exception {
return new BasicTask(new Callable() {
+@Override
public Integer call() {
log.info("task running ("+i+"): "+Tasks.current()+"
"+Tasks.current().getStatusDetail(false));
Time.sleep(CYCLE_DELAY);
@@ -241,8 +253,10 @@ public class ScheduledExecutionTest {
final Semaphore interruptedSemaphore = new Semaphore(0);
final AtomicInteger i = new AtomicInteger();
ScheduledTask t = new ScheduledTask
[09/17] brooklyn-server git commit: Add missing @Override annotation to method signatures overriding interface methods
Add missing @Override annotation to method signatures overriding interface methods Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/e61caea4 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/e61caea4 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/e61caea4 Branch: refs/heads/master Commit: e61caea44a535ea1aeda0ea8633b3a0d7c38c8ec Parents: 0d2d5d6 Author: Svetoslav Neykov Authored: Fri Jan 20 16:00:40 2017 +0200 Committer: Svetoslav Neykov Committed: Fri Jan 20 16:17:09 2017 +0200 -- .../org/apache/brooklyn/api/entity/Entity.java | 2 + .../apache/brooklyn/api/entity/EntityLocal.java | 1 + .../brooklyn/api/location/MachineLocation.java | 1 + .../java/org/apache/brooklyn/api/mgmt/Task.java | 1 + .../mementos/BrooklynMementoManifest.java | 1 + .../org/apache/brooklyn/api/policy/Policy.java | 1 + .../brooklyn/camp/AggregatingCampPlatform.java | 6 +++ .../collection/AggregatingResourceLookup.java | 2 + .../spi/collection/BasicResourceLookup.java | 2 + .../camp/spi/collection/ResourceLookup.java | 3 ++ .../BasicAssemblyTemplateInstantiator.java | 1 + .../brooklyn/camp/spi/resolve/PdpMatcher.java | 2 + .../web/MockAssemblyTemplateInstantiator.java | 1 + .../camp/test/mock/web/MockWebPlatform.java | 2 + .../camp/brooklyn/BrooklynCampPlatform.java | 2 + .../brooklyn/ConfigInheritanceYamlTest.java | 2 + .../camp/brooklyn/ConfigParametersYamlTest.java | 1 + .../brooklyn/camp/brooklyn/ConfigYamlTest.java | 3 ++ .../DependentConfigPollingYamlTest.java | 2 + .../camp/brooklyn/EnrichersYamlTest.java| 3 ++ .../camp/brooklyn/EntitiesYamlTest.java | 1 + .../brooklyn/TestEntityWithInitConfigImpl.java | 1 + .../TestSensorAndEffectorInitializer.java | 1 + .../qa/performance/CatalogPerformanceTest.java | 6 +++ .../brooklyn/camp/brooklyn/spi/dsl/DslTest.java | 3 ++ .../camp/server/rest/util/CampRestGuavas.java | 1 + .../camp/server/rest/util/DtoFactory.java | 2 + .../AbstractExternalConfigSupplier.java | 1 + .../external/InPlaceExternalConfigSupplier.java | 1 + .../PropertiesFileExternalConfigSupplier.java | 1 + .../external/UrlsExternalConfigSupplier.java| 1 + .../config/internal/AbstractConfigMapImpl.java | 2 + .../internal/AbstractStructuredConfigKey.java | 2 + .../core/config/render/RendererHints.java | 1 + .../core/effector/ssh/SshEffectorTasks.java | 3 ++ .../brooklyn/core/entity/AbstractEntity.java| 1 + .../apache/brooklyn/core/entity/Entities.java | 2 + .../drivers/BasicEntityDriverManager.java | 1 + .../drivers/RegistryEntityDriverFactory.java| 1 + .../DownloadProducerFromCloudsoftRepo.java | 1 + .../DownloadProducerFromLocalRepo.java | 1 + .../DownloadProducerFromProperties.java | 1 + .../AbstractConfigurableEntityFactory.java | 6 +++ .../org/apache/brooklyn/core/feed/Poller.java | 4 +- .../core/internal/BrooklynProperties.java | 1 + .../core/internal/BrooklynPropertiesImpl.java | 17 ++- .../storage/impl/BrooklynStorageImpl.java | 1 + .../core/location/BasicLocationDefinition.java | 3 ++ .../core/location/BasicMachineMetadata.java | 5 ++ .../brooklyn/core/location/PortRanges.java | 6 +-- .../location/access/PortForwardManager.java | 1 + .../cloud/names/AbstractCloudMachineNamer.java | 3 ++ .../location/geo/GeoBytesHostGeoLookup.java | 1 + .../location/geo/MaxMind2HostGeoLookup.java | 1 + .../core/location/geo/UtraceHostGeoLookup.java | 1 + .../core/mgmt/ha/BasicMasterChooser.java| 1 + .../mgmt/ha/HighAvailabilityManagerImpl.java| 2 + .../internal/AbstractManagementContext.java | 3 ++ .../internal/AbstractSubscriptionManager.java | 9 .../internal/AsyncCollectionChangeAdapter.java | 2 + ...PropertyChangeToCollectionChangeAdapter.java | 1 + .../core/mgmt/internal/LocalEntityManager.java | 5 +- .../mgmt/internal/LocalLocationManager.java | 5 +- .../mgmt/internal/LocalSubscriptionManager.java | 5 ++ .../core/mgmt/internal/LocalUsageManager.java | 4 ++ .../BrooklynMementoPersisterToObjectStore.java | 5 ++ .../rebind/PeriodicDeltaChangeListener.java | 1 + .../core/mgmt/rebind/PersisterDeltaImpl.java| 2 + .../core/mgmt/rebind/RebindContextImpl.java | 3 ++ .../mgmt/rebind/RebindExceptionHandlerImpl.java | 1 + .../core/mgmt/rebind/RebindManagerImpl.java | 2 + .../mgmt/rebind/dto/BasicEntityMemento.java | 1 + .../transformer/impl/XsltTransformer.java | 1 + .../AbstractConfigurationSupportInternal.java | 2 + .../core/objs/BasicConfigurableObject.java | 2 + .../core/objs/BrooklynObjectInternal.java | 2 + .../core/objs/proxy/En
[14/17] brooklyn-server git commit: Remove unnecessary casts
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/c0f11d07/utils/common/src/main/java/org/apache/brooklyn/util/javalang/Boxing.java
--
diff --git
a/utils/common/src/main/java/org/apache/brooklyn/util/javalang/Boxing.java
b/utils/common/src/main/java/org/apache/brooklyn/util/javalang/Boxing.java
index 87529ad..5838df9 100644
--- a/utils/common/src/main/java/org/apache/brooklyn/util/javalang/Boxing.java
+++ b/utils/common/src/main/java/org/apache/brooklyn/util/javalang/Boxing.java
@@ -116,7 +116,7 @@ public class Boxing {
Array.setShort(target, index, (Short)value);
else if (type.equals(Void.TYPE))
-Array.set(target, index, (Void)value);
+Array.set(target, index, value);
else
// should not happen!
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/c0f11d07/utils/common/src/main/java/org/apache/brooklyn/util/javalang/coerce/EnumTypeCoercions.java
--
diff --git
a/utils/common/src/main/java/org/apache/brooklyn/util/javalang/coerce/EnumTypeCoercions.java
b/utils/common/src/main/java/org/apache/brooklyn/util/javalang/coerce/EnumTypeCoercions.java
index b57625a..e8e84b7 100644
---
a/utils/common/src/main/java/org/apache/brooklyn/util/javalang/coerce/EnumTypeCoercions.java
+++
b/utils/common/src/main/java/org/apache/brooklyn/util/javalang/coerce/EnumTypeCoercions.java
@@ -52,7 +52,7 @@ public class EnumTypeCoercions {
@SuppressWarnings({ "unchecked", "rawtypes" })
public static Function stringToEnumUntyped(final Class type, @Nullable final T defaultValue) {
if (!type.isEnum()) return new
Functionals.ConstantFunction(null);
-return (Function) new
StringToEnumFunction((Class)type, (Enum)defaultValue);
+return new StringToEnumFunction((Class)type, (Enum)defaultValue);
}
private static class StringToEnumFunction> implements
Function {
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/c0f11d07/utils/common/src/main/java/org/apache/brooklyn/util/javalang/coerce/PrimitiveStringTypeCoercions.java
--
diff --git
a/utils/common/src/main/java/org/apache/brooklyn/util/javalang/coerce/PrimitiveStringTypeCoercions.java
b/utils/common/src/main/java/org/apache/brooklyn/util/javalang/coerce/PrimitiveStringTypeCoercions.java
index 9812d93..0b2a636 100644
---
a/utils/common/src/main/java/org/apache/brooklyn/util/javalang/coerce/PrimitiveStringTypeCoercions.java
+++
b/utils/common/src/main/java/org/apache/brooklyn/util/javalang/coerce/PrimitiveStringTypeCoercions.java
@@ -96,7 +96,7 @@ public class PrimitiveStringTypeCoercions {
// (we could say 0=false, nonzero=true, but there is no compelling
use case so better
// to encourage users to write as boolean)
if (sourceWrapType == Character.class)
-return (T) stringToPrimitive(value.toString(), targetType);
+return stringToPrimitive(value.toString(), targetType);
throw new ClassCoercionException("Cannot cast "+sourceWrapType+"
("+value+") to "+targetType);
} else if (sourceWrapType == Boolean.class) {
@@ -109,13 +109,13 @@ public class PrimitiveStringTypeCoercions {
long v = 0;
boolean islong = true;
if (sourceWrapType == Character.class) {
-v = (long) ((Character)value).charValue();
+v = ((Character)value).charValue();
} else if (sourceWrapType == Byte.class) {
-v = (long) ((Byte)value).byteValue();
+v = ((Byte)value).byteValue();
} else if (sourceWrapType == Short.class) {
-v = (long) ((Short)value).shortValue();
+v = ((Short)value).shortValue();
} else if (sourceWrapType == Integer.class) {
-v = (long) ((Integer)value).intValue();
+v = ((Integer)value).intValue();
} else if (sourceWrapType == Long.class) {
v = ((Long)value).longValue();
} else {
@@ -126,9 +126,9 @@ public class PrimitiveStringTypeCoercions {
if (targetWrapType == Byte.class) return (T)
Byte.valueOf((byte)v);
if (targetWrapType == Short.class) return (T)
Short.valueOf((short)v);
if (targetWrapType == Integer.class) return (T)
Integer.valueOf((int)v);
-if (targetWrapType == Long.class) return (T)
Long.valueOf((long)v);
-if (targetWrapType == Float.class) return (T)
Float.valueOf((float)v);
-if (targetWrapType == Double.class) return (T)
Double.valueOf((double)v);
+if (targetWrapType == Long.class) return (T) Long.valueOf(v);
+if (targetWrapType == Float.class) return (T) Float.valueOf(v);
+if (targetW
[03/17] brooklyn-server git commit: Add missing @Override annotations
Add missing @Override annotations Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/0d2d5d6a Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/0d2d5d6a Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/0d2d5d6a Branch: refs/heads/master Commit: 0d2d5d6a7a3568c4ed4c4aee4d07dd5982802d9e Parents: 4d2f7cc Author: Svetoslav Neykov Authored: Fri Jan 20 12:45:34 2017 +0200 Committer: Svetoslav Neykov Committed: Fri Jan 20 12:45:34 2017 +0200 -- .../brooklyn/api/location/LocationSpec.java | 3 ++ .../apache/brooklyn/api/policy/PolicySpec.java | 1 + .../brooklyn/api/sensor/EnricherSpec.java | 2 ++ .../brooklyn/camp/AggregatingCampPlatform.java | 4 +++ .../apache/brooklyn/camp/BasicCampPlatform.java | 4 +++ .../brooklyn/camp/spi/PlatformRootSummary.java | 1 + .../camp/brooklyn/AbstractYamlRebindTest.java | 1 + .../brooklyn/catalog/CatalogYamlRebindTest.java | 1 + .../catalog/CatalogYamlVersioningTest.java | 1 + .../brooklyn/core/config/MapConfigKey.java | 5 +++ .../vault/VaultAppIdExternalConfigSupplier.java | 1 + .../core/effector/ExplicitEffector.java | 2 ++ .../brooklyn/core/effector/MethodEffector.java | 1 + .../core/effector/ssh/SshEffectorTasks.java | 2 ++ .../core/enricher/EnricherDynamicType.java | 1 + .../core/entity/AbstractApplication.java| 1 + .../brooklyn/core/entity/AbstractEntity.java| 4 +++ .../factory/BasicConfigurableEntityFactory.java | 1 + .../entity/factory/ClosureEntityFactory.java| 1 + .../org/apache/brooklyn/core/feed/Poller.java | 1 + .../core/internal/BrooklynPropertiesImpl.java | 1 + .../core/location/AbstractLocation.java | 4 +++ .../brooklyn/core/location/PortRanges.java | 2 ++ .../location/access/PortForwardManager.java | 1 + .../access/PortForwardManagerAuthority.java | 1 + .../location/geo/LocalhostExternalIpLoader.java | 1 + .../core/location/geo/UtraceHostGeoLookup.java | 1 + .../location/internal/LocationDynamicType.java | 1 + .../brooklyn/core/mgmt/BrooklynTaskTags.java| 1 + .../BrooklynClassLoadingContextSequential.java | 1 + .../JavaBrooklynClassLoadingContext.java| 1 + ...PropertyChangeToCollectionChangeAdapter.java | 2 ++ .../mgmt/internal/LocalSubscriptionManager.java | 2 ++ .../core/mgmt/internal/LocalUsageManager.java | 2 ++ .../brooklyn/core/policy/PolicyDynamicType.java | 1 + .../stock/AbstractTypeTransformingEnricher.java | 1 + .../brooklyn/enricher/stock/AddingEnricher.java | 1 + .../brooklyn/enricher/stock/Aggregator.java | 2 ++ .../brooklyn/enricher/stock/Enrichers.java | 7 .../stock/SensorPropagatingEnricher.java| 1 + .../brooklyn/enricher/stock/Transformer.java| 1 + .../org/apache/brooklyn/feed/http/HttpFeed.java | 1 + .../apache/brooklyn/feed/shell/ShellFeed.java | 1 + .../org/apache/brooklyn/feed/ssh/SshFeed.java | 1 + .../LocalhostMachineProvisioningLocation.java | 4 +++ .../location/ssh/SshMachineLocation.java| 1 + .../util/core/config/ResolvingConfigBag.java| 2 ++ .../util/core/internal/ssh/cli/SshCliTool.java | 2 ++ .../core/internal/ssh/process/ProcessTool.java | 1 + .../util/core/internal/ssh/sshj/SshjTool.java | 2 ++ .../util/core/task/BasicExecutionManager.java | 1 + .../util/core/task/DynamicSequentialTask.java | 1 + .../core/task/ListenableForwardingFuture.java | 1 + .../brooklyn/util/core/task/ScheduledTask.java | 3 ++ .../brooklyn/util/core/task/SequentialTask.java | 1 + .../brooklyn/util/core/task/ValueResolver.java | 1 + .../internal/AbstractSshExecTaskFactory.java| 2 ++ .../xstream/EnumCaseForgivingConverter.java | 1 + .../EnumCaseForgivingSingleValueConverter.java | 1 + .../core/xstream/ImmutableListConverter.java| 1 + .../core/xstream/ImmutableMapConverter.java | 1 + .../core/xstream/ImmutableSetConverter.java | 1 + .../util/core/xstream/MapConverter.java | 2 ++ .../core/xstream/StringKeyMapConverter.java | 1 + .../MapListAndOtherStructuredConfigKeyTest.java | 2 ++ .../effector/EffectorExceptionLoggedTest.java | 1 + .../core/effector/EffectorTaskTest.java | 2 ++ .../core/enricher/BasicEnricherTest.java| 1 + .../ApplicationLifecycleStateStressTest.java| 11 ++ .../core/entity/EntityAutomanagedTest.java | 1 + .../apache/brooklyn/core/feed/PollerTest.java | 2 ++ .../brooklyn/core/location/MachinesTest.java| 1 + .../entitlement/AcmeEntitlementManagerTest.java | 1 + ...PerUserEntitlementManagerPropertiesTest.java | 1 + .../HighAvailabilityManagerFileBasedTest.java | 1 + .../ha/HighAvailabilityManagerInMemoryTest.java | 2 ++ .../HighAvailabilityManagerSplitBrainTest.java | 2 +- .../inter
[01/17] brooklyn-server git commit: Add missing @Override annotations
Repository: brooklyn-server
Updated Branches:
refs/heads/master 8ad5578c1 -> 972a0d8e1
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/policy/src/test/java/org/apache/brooklyn/policy/ha/ServiceRestarterTest.java
--
diff --git
a/policy/src/test/java/org/apache/brooklyn/policy/ha/ServiceRestarterTest.java
b/policy/src/test/java/org/apache/brooklyn/policy/ha/ServiceRestarterTest.java
index 8d239da..ce060e3 100644
---
a/policy/src/test/java/org/apache/brooklyn/policy/ha/ServiceRestarterTest.java
+++
b/policy/src/test/java/org/apache/brooklyn/policy/ha/ServiceRestarterTest.java
@@ -56,6 +56,7 @@ public class ServiceRestarterTest extends
BrooklynAppUnitTestSupport {
private SensorEventListener eventListener;
private List> events;
+@Override
@BeforeMethod(alwaysRun=true)
public void setUp() throws Exception {
super.setUp();
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/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 cb93df0..bf5661e 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
@@ -122,6 +122,7 @@ public class MockContainerEntityImpl extends
AbstractGroupImpl implements MockCo
return (Set) Sets.newLinkedHashSet(getMembers());
}
+@Override
public String toString() {
return "MockContainer["+getDisplayName()+"]";
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/BrooklynRestApp.java
--
diff --git
a/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/BrooklynRestApp.java
b/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/BrooklynRestApp.java
index 419715b..05b9092 100644
---
a/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/BrooklynRestApp.java
+++
b/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/BrooklynRestApp.java
@@ -45,6 +45,7 @@ public class BrooklynRestApp extends Application {
//Uncomment after removing jersey dependencies
//@Override
+@Override
public Map getProperties() {
return ImmutableMap.of(
// Makes sure that all exceptions are handled by our custom
DefaultExceptionMapper
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/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 6278b7c..cb55875 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
@@ -67,6 +67,7 @@ public class HaHotCheckResourceFilter implements
ContainerRequestFilter {
private ResourceInfo resourceInfo;
private HaHotCheckHelperAbstract helper = new HaHotCheckHelperAbstract() {
+@Override
public ManagementContext mgmt() {
return mgmt.getContext(ManagementContext.class);
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/rest/rest-resources/src/test/java/org/apache/brooklyn/rest/resources/DelegatingPrintStream.java
--
diff --git
a/rest/rest-resources/src/test/java/org/apache/brooklyn/rest/resources/DelegatingPrintStream.java
b/rest/rest-resources/src/test/java/org/apache/brooklyn/rest/resources/DelegatingPrintStream.java
index 713dccb..e12b769 100644
---
a/rest/rest-resources/src/test/java/org/apache/brooklyn/rest/resources/DelegatingPrintStream.java
+++
b/rest/rest-resources/src/test/java/org/apache/brooklyn/rest/resources/DelegatingPrintStream.java
@@ -40,142 +40,177 @@ public abstract class DelegatingPrintStream extends
PrintStream {
protected abstract PrintStream getDelegate();
+@Override
public int hashCode() {
return getDelegate().hashCode();
}
+@Override
public void write(byte[] b) throws IOException {
getDelegate().write(b);
}
+@Override
public boolean equals(Object obj) {
return getDelegate().equals(obj
[11/17] brooklyn-server git commit: Add missing @Deprecated annotations
Add missing @Deprecated annotations Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/dfa8aa29 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/dfa8aa29 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/dfa8aa29 Branch: refs/heads/master Commit: dfa8aa2926fbecc884ffa75cb5c820c6174199c4 Parents: e61caea Author: Svetoslav Neykov Authored: Fri Jan 20 16:24:50 2017 +0200 Committer: Svetoslav Neykov Committed: Fri Jan 20 16:24:50 2017 +0200 -- .../java/org/apache/brooklyn/api/catalog/BrooklynCatalog.java | 1 + .../main/java/org/apache/brooklyn/api/catalog/CatalogItem.java | 1 + .../main/java/org/apache/brooklyn/api/entity/EntityLocal.java | 4 .../main/java/org/apache/brooklyn/api/mgmt/LocationManager.java | 1 + .../java/org/apache/brooklyn/api/mgmt/rebind/RebindManager.java | 1 + .../brooklyn/camp/spi/pdp/AssemblyTemplateConstructor.java | 1 + .../org/apache/brooklyn/camp/brooklyn/AbstractYamlTest.java | 1 + .../org/apache/brooklyn/core/catalog/internal/CatalogUtils.java | 4 .../java/org/apache/brooklyn/core/config/ConfigPredicates.java | 4 .../java/org/apache/brooklyn/core/entity/AbstractEntity.java| 4 .../org/apache/brooklyn/core/entity/BrooklynConfigKeys.java | 2 ++ .../src/main/java/org/apache/brooklyn/core/entity/Entities.java | 4 .../org/apache/brooklyn/core/entity/EntityAndAttribute.java | 1 + .../java/org/apache/brooklyn/core/entity/EntityInternal.java| 3 +++ .../java/org/apache/brooklyn/core/entity/EntityPredicates.java | 1 + .../apache/brooklyn/core/entity/factory/ApplicationBuilder.java | 1 + .../src/main/java/org/apache/brooklyn/core/feed/FeedConfig.java | 1 + .../apache/brooklyn/core/internal/BrooklynPropertiesImpl.java | 1 + .../brooklyn/core/location/DeprecatedKeysMappingBuilder.java| 1 + .../main/java/org/apache/brooklyn/core/location/Locations.java | 1 + .../org/apache/brooklyn/core/mgmt/internal/EffectorUtils.java | 1 + .../org/apache/brooklyn/core/mgmt/rebind/RebindManagerImpl.java | 1 + .../brooklyn/core/mgmt/rebind/dto/MementosGenerators.java | 1 + .../brooklyn/core/mgmt/rebind/dto/MutableBrooklynMemento.java | 1 + .../org/apache/brooklyn/core/objs/AbstractEntityAdjunct.java| 1 + .../org/apache/brooklyn/core/plan/PlanToSpecTransformer.java| 1 + .../org/apache/brooklyn/core/sensor/DependentConfiguration.java | 1 + .../org/apache/brooklyn/core/server/BrooklynServerConfig.java | 4 .../brooklyn/enricher/stock/AbstractAggregatingEnricher.java| 1 + .../brooklyn/enricher/stock/AbstractTransformingEnricher.java | 1 + .../enricher/stock/AbstractTypeTransformingEnricher.java| 1 + .../java/org/apache/brooklyn/enricher/stock/AddingEnricher.java | 1 + .../brooklyn/enricher/stock/CustomAggregatingEnricher.java | 5 + .../brooklyn/enricher/stock/SensorPropagatingEnricher.java | 4 .../brooklyn/enricher/stock/SensorTransformingEnricher.java | 2 ++ .../java/org/apache/brooklyn/entity/stock/BasicStartable.java | 1 + .../org/apache/brooklyn/feed/function/FunctionPollConfig.java | 1 + .../java/org/apache/brooklyn/feed/http/HttpValueFunctions.java | 3 +++ .../main/java/org/apache/brooklyn/feed/ssh/SshPollConfig.java | 2 ++ .../java/org/apache/brooklyn/feed/ssh/SshValueFunctions.java| 2 ++ .../localhost/LocalhostMachineProvisioningLocation.java | 2 ++ .../apache/brooklyn/util/core/BrooklynLanguageExtensions.java | 1 + .../java/org/apache/brooklyn/util/core/flags/FlagUtils.java | 2 ++ .../java/org/apache/brooklyn/util/core/flags/TypeCoercions.java | 1 + .../java/org/apache/brooklyn/util/core/internal/Repeater.java | 1 + .../apache/brooklyn/util/core/internal/ssh/SshAbstractTool.java | 1 + .../org/apache/brooklyn/util/core/internal/ssh/SshTool.java | 1 + .../util/core/internal/ssh/sshj/SshjClientConnection.java | 1 + .../java/org/apache/brooklyn/util/core/task/TaskPredicates.java | 1 + .../org/apache/brooklyn/core/mgmt/rebind/RebindEntityTest.java | 1 + .../apache/brooklyn/core/mgmt/rebind/RebindLocationTest.java| 1 + .../java/org/apache/brooklyn/launcher/common/BasicLauncher.java | 1 + .../java/org/apache/brooklyn/launcher/BrooklynWebServer.java| 1 + .../org/apache/brooklyn/location/jclouds/JcloudsPredicates.java | 1 + .../java/org/apache/brooklyn/location/jclouds/JcloudsUtil.java | 1 + .../brooklyn/policy/enricher/RollingTimeWindowMeanEnricher.java | 1 + .../main/java/org/apache/brooklyn/rest/domain/LocationSpec.java | 1 + .../apache/brooklyn/rest/filter/HaHotCheckResourceFilter.java | 1 + .../org/apache/brooklyn/rest/resources/LocationResource.java| 1 + .../java/org/apache/brooklyn/rest/util/URLParamEncoder.java | 1 + .../apache/brooklyn/rest/testing/mocks/RestMockAppBuilder.java
[07/17] brooklyn-server git commit: Add missing @Override annotation to method signatures overriding interface methods
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/core/src/test/java/org/apache/brooklyn/core/entity/EntityLifecycleEnrichersTest.java
--
diff --git
a/core/src/test/java/org/apache/brooklyn/core/entity/EntityLifecycleEnrichersTest.java
b/core/src/test/java/org/apache/brooklyn/core/entity/EntityLifecycleEnrichersTest.java
index 429c0a8..a4863ec 100644
---
a/core/src/test/java/org/apache/brooklyn/core/entity/EntityLifecycleEnrichersTest.java
+++
b/core/src/test/java/org/apache/brooklyn/core/entity/EntityLifecycleEnrichersTest.java
@@ -62,6 +62,7 @@ public class EntityLifecycleEnrichersTest extends
BrooklynAppUnitTestSupport {
List> futures = Lists.newArrayList();
for (int i = 0; i < 100; i++) {
ListenableFuture future = executor.submit(new
Callable() {
+@Override
public Void call() throws Exception {
TestEntity entity =
app.addChild(EntitySpec.create(TestEntity.class));
entity.sensors().set(TestEntity.SERVICE_UP, true);
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/core/src/test/java/org/apache/brooklyn/core/entity/RecordingSensorEventListener.java
--
diff --git
a/core/src/test/java/org/apache/brooklyn/core/entity/RecordingSensorEventListener.java
b/core/src/test/java/org/apache/brooklyn/core/entity/RecordingSensorEventListener.java
index c54a0fb..30d40a2 100644
---
a/core/src/test/java/org/apache/brooklyn/core/entity/RecordingSensorEventListener.java
+++
b/core/src/test/java/org/apache/brooklyn/core/entity/RecordingSensorEventListener.java
@@ -112,6 +112,7 @@ public class RecordingSensorEventListener implements
SensorEventListener,
public void assertHasEventEventually(final Predicate> filter) {
Asserts.succeedsEventually(new Runnable() {
+@Override
public void run() {
assertHasEvent(filter);
}});
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/core/src/test/java/org/apache/brooklyn/core/entity/hello/LocalEntitiesTest.java
--
diff --git
a/core/src/test/java/org/apache/brooklyn/core/entity/hello/LocalEntitiesTest.java
b/core/src/test/java/org/apache/brooklyn/core/entity/hello/LocalEntitiesTest.java
index 9729068..193e3e7 100644
---
a/core/src/test/java/org/apache/brooklyn/core/entity/hello/LocalEntitiesTest.java
+++
b/core/src/test/java/org/apache/brooklyn/core/entity/hello/LocalEntitiesTest.java
@@ -204,6 +204,7 @@ public class LocalEntitiesTest extends
BrooklynAppUnitTestSupport {
final Semaphore s1 = new Semaphore(0);
final Object[] sonsConfig = new Object[1];
Thread t = new Thread(new Runnable() {
+@Override
public void run() {
log.info("started");
s1.release();
@@ -245,6 +246,7 @@ public class LocalEntitiesTest extends
BrooklynAppUnitTestSupport {
HelloEntity dad =
app.createAndManageChild(EntitySpec.create(HelloEntity.class));
HelloEntity son = dad.addChild(EntitySpec.create(HelloEntity.class)
.configure(HelloEntity.MY_NAME,
transform(attributeWhenReady(dad, HelloEntity.FAVOURITE_NAME), new
Function() {
+@Override
public String apply(String input) {
return input+input.charAt(input.length()-1)+"y";
}})));
@@ -262,6 +264,7 @@ public class LocalEntitiesTest extends
BrooklynAppUnitTestSupport {
// the unnecessary (HelloEntity) cast is required as a work-around to
an IntelliJ issue that prevents Brooklyn from launching from the IDE
HelloEntity son = (HelloEntity)
dad.addChild(EntitySpec.create(HelloEntity.class)
.configure(HelloEntity.MY_NAME,
transform(attributeWhenReady(dad, HelloEntity.FAVOURITE_NAME, (Closure)null),
new Function() {
+@Override
public String apply(String input) {
return input+input.charAt(input.length()-1)+"y";
}})));
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/core/src/test/java/org/apache/brooklyn/core/entity/proxying/ApplicationBuilderOverridingTest.java
--
diff --git
a/core/src/test/java/org/apache/brooklyn/core/entity/proxying/ApplicationBuilderOverridingTest.java
b/core/src/test/java/org/apache/brooklyn/core/entity/proxying/ApplicationBuilderOverridingTest.java
index 912c434..c00d33b 100644
---
a/core/src/test/java/org/apache/brooklyn/core/entity/proxying/ApplicationBuilderOverridingTest.java
+++
b/core/src/test/java/org/apache/brooklyn/core/entity/proxying/ApplicationBuilderOverridingTest.java
@
[15/17] brooklyn-server git commit: Remove unnecessary casts
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/c0f11d07/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindEnricherTest.java
--
diff --git
a/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindEnricherTest.java
b/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindEnricherTest.java
index 25c2ebc..113c6c5 100644
---
a/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindEnricherTest.java
+++
b/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindEnricherTest.java
@@ -175,7 +175,7 @@ public class RebindEnricherTest extends
RebindTestFixtureWithApp {
.configure(MyEnricher.MY_CONFIG_WITH_SETFROMFLAG_WITH_SHORT_NAME, "myVal for
setFromFlag withShortName")
.configure(MyEnricher.MY_CONFIG_WITHOUT_SETFROMFLAG, "myVal
for witout setFromFlag"));
-newApp = (TestApplication) rebind();
+newApp = rebind();
MyEnricher newEnricher = (MyEnricher)
Iterables.getOnlyElement(newApp.enrichers());
assertEquals(newEnricher.getDisplayName(), "My Enricher");
@@ -192,7 +192,7 @@ public class RebindEnricherTest extends
RebindTestFixtureWithApp {
public void testReboundConfigDoesNotContainId() throws Exception {
MyEnricher policy =
origApp.enrichers().add(EnricherSpec.create(MyEnricher.class));
-newApp = (TestApplication) rebind();
+newApp = rebind();
MyEnricher newEnricher = (MyEnricher)
Iterables.getOnlyElement(newApp.enrichers());
assertNull(newEnricher.getConfig(ConfigKeys.newStringConfigKey("id")));
@@ -203,7 +203,7 @@ public class RebindEnricherTest extends
RebindTestFixtureWithApp {
public void testIsRebinding() throws Exception {
origApp.enrichers().add(EnricherSpec.create(EnricherChecksIsRebinding.class));
-newApp = (TestApplication) rebind();
+newApp = rebind();
EnricherChecksIsRebinding newEnricher = (EnricherChecksIsRebinding)
Iterables.getOnlyElement(newApp.enrichers());
assertTrue(newEnricher.isRebindingValWhenRebinding());
@@ -312,7 +312,7 @@ public class RebindEnricherTest extends
RebindTestFixtureWithApp {
Entities.dumpInfo(e1);
assertEquals(e1e.size(), 5);
-newApp = (TestApplication) rebind();
+newApp = rebind();
Entity e2 = Iterables.getOnlyElement(
Entities.descendantsAndSelf(newApp, EntityPredicates.idEqualTo(e1.getId())) );
Collection e2e = e2.getEnrichers();
log.info("enrichers2: "+e2e);
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/c0f11d07/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindEntityTest.java
--
diff --git
a/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindEntityTest.java
b/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindEntityTest.java
index f46bd73..32720b9 100644
---
a/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindEntityTest.java
+++
b/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindEntityTest.java
@@ -640,7 +640,7 @@ public class RebindEntityTest extends
RebindTestFixtureWithApp {
@Test
public void testRebindAttributeWithSpecialCharacters() throws Exception {
String val = "abc\u001b";
-assertEquals((int)val.charAt(3), 27); // expect that to give us
unicode character 27
+assertEquals(val.charAt(3), 27); // expect that to give us unicode
character 27
MyEntity origE =
origApp.createAndManageChild(EntitySpec.create(MyEntity.class));
origE.sensors().set(MyEntity.MY_SENSOR, val);
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/c0f11d07/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindFeedTest.java
--
diff --git
a/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindFeedTest.java
b/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindFeedTest.java
index de3abc6..1503bfa 100644
---
a/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindFeedTest.java
+++
b/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindFeedTest.java
@@ -105,7 +105,7 @@ public class RebindFeedTest extends
RebindTestFixtureWithApp {
public void testHttpFeedRegisteredInInitIsPersistedAndFeedsStop() throws
Exception {
TestEntity origEntity =
origApp.createAndManageChild(EntitySpec.create(TestEntity.class).impl(MyEntityWithHttpFeedImpl.class)
.configure(MyEntityWithHttpFeedImpl.BASE_URL, baseUrl));
-EntityAsserts.assertAttributeEqualsEventually(origEntity, SENSOR_INT,
(Integer)200);
+EntityAsserts.assertAttributeEqualsEventually(origEntity, SENSOR_INT,
200);
EntityAsserts.assertAttributeEqualsEventually(origEntity,
SENSOR_STRING,
[13/17] brooklyn-server git commit: Remove unused imports
Remove unused imports Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/070d4ef5 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/070d4ef5 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/070d4ef5 Branch: refs/heads/master Commit: 070d4ef568528423f78079370b760df3e7fa6990 Parents: dfa8aa2 Author: Svetoslav Neykov Authored: Fri Jan 20 16:27:10 2017 +0200 Committer: Svetoslav Neykov Committed: Fri Jan 20 16:27:10 2017 +0200 -- .../org/apache/brooklyn/api/catalog/BrooklynCatalog.java | 2 -- .../spi/creation/BrooklynYamlLocationResolver.java | 1 - .../spi/creation/BrooklynYamlTypeInstantiator.java | 1 - .../camp/brooklyn/spi/creation/CampResolver.java | 1 - .../spi/creation/service/UrlServiceSpecResolver.java | 3 --- .../camp/brooklyn/spi/dsl/BrooklynDslInterpreter.java| 1 - .../org/apache/brooklyn/core/entity/AbstractEntity.java | 1 - .../main/java/org/apache/brooklyn/core/feed/Poller.java | 1 - .../brooklyn/core/location/BasicLocationRegistry.java| 1 - .../core/location/geo/LocalhostExternalIpLoader.java | 1 - .../core/location/internal/LocationConfigMap.java| 1 - .../org/apache/brooklyn/core/mgmt/BrooklynTaskTags.java | 2 -- .../ManagementPlaneSyncRecordPersisterToObjectStore.java | 1 - .../core/mgmt/internal/AbstractManagementContext.java| 1 - .../core/mgmt/persist/DeserializingProvider.java | 1 - .../brooklyn/core/mgmt/rebind/RebindIteration.java | 1 - .../brooklyn/core/network/OnSubnetNetworkEnricher.java | 1 - .../org/apache/brooklyn/core/plan/PlanToSpecFactory.java | 2 -- .../org/apache/brooklyn/core/policy/AbstractPolicy.java | 1 - .../resolve/entity/DelegatingEntitySpecResolver.java | 1 - .../org/apache/brooklyn/core/sensor/StaticSensor.java| 2 -- .../brooklyn/core/typereg/TypePlanTransformers.java | 1 - .../brooklyn/enricher/stock/AbstractTransformer.java | 2 -- .../org/apache/brooklyn/enricher/stock/Enrichers.java| 3 --- .../apache/brooklyn/enricher/stock/MapAggregator.java| 3 --- .../org/apache/brooklyn/enricher/stock/Propagator.java | 1 - .../enricher/stock/SensorTransformingEnricher.java | 2 -- .../stock/YamlRollingTimeWindowMeanEnricher.java | 2 -- .../apache/brooklyn/enricher/stock/reducer/Reducer.java | 1 - .../brooklyn/entity/group/DynamicMultiGroupImpl.java | 1 - .../apache/brooklyn/entity/group/QuarantineGroup.java| 2 -- .../entity/group/SshCommandMembershipTrackingPolicy.java | 1 - .../apache/brooklyn/entity/stock/BasicStartableImpl.java | 1 - .../main/java/org/apache/brooklyn/feed/ssh/SshFeed.java | 2 -- .../brooklyn/location/byon/HostLocationResolver.java | 1 - .../location/byon/SingleMachineLocationResolver.java | 1 - .../util/core/internal/ssh/process/ProcessTool.java | 1 - .../org/apache/brooklyn/util/core/task/ssh/SshTasks.java | 1 - .../core/catalog/internal/CatalogItemBuilderTest.java| 1 - .../config/external/UrlsExternalConfigSupplierTest.java | 2 -- .../org/apache/brooklyn/core/entity/EntitiesTest.java| 1 - .../brooklyn/core/location/LocationSubscriptionTest.java | 1 - .../brooklyn/core/mgmt/internal/EffectorUtilsTest.java | 1 - .../core/mgmt/internal/EntityExecutionManagerTest.java | 1 - .../core/mgmt/internal/LocalSubscriptionManagerTest.java | 2 -- .../core/mgmt/persist/XmlMementoSerializerTest.java | 1 - .../RebindCatalogWhenCatalogPersistenceDisabledTest.java | 5 - .../brooklyn/core/mgmt/rebind/RebindTestFixture.java | 1 - .../apache/brooklyn/entity/group/DynamicFabricTest.java | 1 - .../apache/brooklyn/entity/group/DynamicGroupTest.java | 1 - .../entity/group/DynamicMultiGroupRebindTest.java| 2 -- .../entity/group/MembershipTrackingPolicyTest.java | 1 - .../apache/brooklyn/entity/stock/LocationEntityTest.java | 1 - .../brooklyn/location/byon/ByonLocationResolverTest.java | 1 - .../localhost/LocalhostLocationResolverRebindTest.java | 2 -- .../brooklyn/util/core/BrooklynMavenArtifactsTest.java | 2 -- .../apache/brooklyn/util/core/ClassLoaderUtilsTest.java | 1 - .../ssh/sshj/SshjToolAsyncStubIntegrationTest.java | 1 - .../util/core/xstream/CompilerCompatibilityTest.java | 2 -- .../launcher/osgi/ClassRenameOsgiConfigLoader.java | 1 - .../org/apache/brooklyn/launcher/BrooklynLauncher.java | 2 -- .../brooklyn/location/jclouds/ChildEntityCustomizer.java | 1 - .../apache/brooklyn/location/jclouds/JcloudsUtil.java| 4 .../location/jclouds/JcloudsWinRmMachineLocation.java| 2 -- .../JcloudsLocationReleasePortForwardingDefaultTest.java | 1 - .../location/jclouds/JcloudsStubTemplateBuilder.java | 1 - .../apache/brooklyn/policy/enricher/DeltaEnricher.jav
[10/17] brooklyn-server git commit: Add missing @Deprecated annotations
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/dfa8aa29/utils/common/src/main/java/org/apache/brooklyn/util/time/Time.java
--
diff --git a/utils/common/src/main/java/org/apache/brooklyn/util/time/Time.java
b/utils/common/src/main/java/org/apache/brooklyn/util/time/Time.java
index ef445d5..39bb15f 100644
--- a/utils/common/src/main/java/org/apache/brooklyn/util/time/Time.java
+++ b/utils/common/src/main/java/org/apache/brooklyn/util/time/Time.java
@@ -944,6 +944,7 @@ public class Time {
* @deprecated since 0.7.0 use {@link #parseCalendar(String)} for general
or {@link #parseCalendarFormat(String, DateFormat)} for a format,
* plus {@link #parseCalendarUtc(String)} if you want to accept UTC
*/
+@Deprecated
public static Date parseDateString(String dateString, DateFormat format) {
Maybe r = parseCalendarFormat(dateString, format);
if (r.isPresent()) return r.get().getTime();
[17/17] brooklyn-server git commit: This closes #532
This closes #532 Add missing @Override annotations and other cleanup Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/972a0d8e Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/972a0d8e Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/972a0d8e Branch: refs/heads/master Commit: 972a0d8e1d9e5f456e40f8afd791c425d94419ca Parents: 8ad5578 c0f11d0 Author: Sam Corbett Authored: Mon Jan 23 15:12:47 2017 + Committer: Sam Corbett Committed: Mon Jan 23 15:12:47 2017 + -- .../brooklyn/api/catalog/BrooklynCatalog.java | 3 +- .../brooklyn/api/catalog/CatalogItem.java | 1 + .../org/apache/brooklyn/api/entity/Entity.java | 2 + .../apache/brooklyn/api/entity/EntityLocal.java | 5 ++ .../brooklyn/api/location/LocationSpec.java | 3 ++ .../brooklyn/api/location/MachineLocation.java | 1 + .../brooklyn/api/mgmt/LocationManager.java | 1 + .../java/org/apache/brooklyn/api/mgmt/Task.java | 1 + .../brooklyn/api/mgmt/rebind/RebindManager.java | 1 + .../mementos/BrooklynMementoManifest.java | 1 + .../org/apache/brooklyn/api/policy/Policy.java | 1 + .../apache/brooklyn/api/policy/PolicySpec.java | 1 + .../brooklyn/api/sensor/EnricherSpec.java | 2 + .../brooklyn/camp/AggregatingCampPlatform.java | 10 .../apache/brooklyn/camp/BasicCampPlatform.java | 4 ++ .../brooklyn/camp/spi/PlatformRootSummary.java | 1 + .../collection/AggregatingResourceLookup.java | 2 + .../spi/collection/BasicResourceLookup.java | 2 + .../camp/spi/collection/ResourceLookup.java | 3 ++ .../BasicAssemblyTemplateInstantiator.java | 1 + .../apache/brooklyn/camp/spi/pdp/Artifact.java | 2 +- .../camp/spi/pdp/ArtifactRequirement.java | 2 +- .../spi/pdp/AssemblyTemplateConstructor.java| 1 + .../brooklyn/camp/spi/resolve/PdpMatcher.java | 2 + .../web/MockAssemblyTemplateInstantiator.java | 1 + .../camp/test/mock/web/MockWebPlatform.java | 2 + .../camp/brooklyn/BrooklynCampPlatform.java | 2 + .../BrooklynComponentTemplateResolver.java | 2 +- .../creation/BrooklynYamlLocationResolver.java | 3 +- .../creation/BrooklynYamlTypeInstantiator.java | 1 - .../brooklyn/spi/creation/CampResolver.java | 1 - .../service/UrlServiceSpecResolver.java | 3 -- .../spi/dsl/BrooklynDslInterpreter.java | 3 +- .../spi/dsl/DslDeferredFunctionCall.java| 2 +- .../spi/dsl/methods/BrooklynDslCommon.java | 4 +- .../brooklyn/spi/dsl/methods/DslComponent.java | 4 +- .../camp/brooklyn/AbstractYamlRebindTest.java | 1 + .../camp/brooklyn/AbstractYamlTest.java | 1 + .../brooklyn/ConfigInheritanceYamlTest.java | 2 + .../camp/brooklyn/ConfigParametersYamlTest.java | 1 + .../brooklyn/camp/brooklyn/ConfigYamlTest.java | 3 ++ .../DependentConfigPollingYamlTest.java | 2 + .../camp/brooklyn/EnrichersYamlTest.java| 5 +- .../camp/brooklyn/EntitiesYamlTest.java | 5 +- .../camp/brooklyn/LocationsYamlTest.java| 22 .../brooklyn/camp/brooklyn/ObjectsYamlTest.java | 2 +- .../camp/brooklyn/PoliciesYamlTest.java | 2 +- .../brooklyn/TestEntityWithInitConfigImpl.java | 1 + .../TestSensorAndEffectorInitializer.java | 1 + .../camp/brooklyn/WindowsYamlLiveTest.java | 2 +- .../catalog/CatalogYamlLocationTest.java| 2 +- .../brooklyn/catalog/CatalogYamlRebindTest.java | 1 + .../catalog/CatalogYamlVersioningTest.java | 1 + .../qa/performance/CatalogPerformanceTest.java | 6 +++ .../brooklyn/camp/brooklyn/spi/dsl/DslTest.java | 3 ++ .../camp/server/rest/util/CampRestGuavas.java | 1 + .../camp/server/rest/util/DtoFactory.java | 4 +- .../catalog/internal/BasicBrooklynCatalog.java | 6 +-- .../core/catalog/internal/CatalogDto.java | 2 +- .../core/catalog/internal/CatalogUtils.java | 4 ++ .../brooklyn/core/config/ConfigPredicates.java | 4 ++ .../brooklyn/core/config/MapConfigKey.java | 5 ++ .../AbstractExternalConfigSupplier.java | 1 + .../external/InPlaceExternalConfigSupplier.java | 1 + .../PropertiesFileExternalConfigSupplier.java | 1 + .../external/UrlsExternalConfigSupplier.java| 1 + .../vault/VaultAppIdExternalConfigSupplier.java | 1 + .../config/internal/AbstractConfigMapImpl.java | 4 +- .../internal/AbstractStructuredConfigKey.java | 2 + .../core/config/render/RendererHints.java | 1 + .../core/effector/ExplicitEffector.java | 2 + .../brooklyn/core/effector/MethodEffector.java | 1 + .../core/effector/ssh/SshEffectorTasks.java | 5 ++ .../core/enricher/EnricherDynamicType.java | 1 + .../core/entity/AbstractApplication.java| 1 + .../brooklyn/core/entity/AbstractEntity.java| 12 - .../core/entity/Brooklyn
[05/17] brooklyn-server git commit: Add missing @Override annotation to method signatures overriding interface methods
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/policy/src/test/java/org/apache/brooklyn/policy/loadbalancing/LoadBalancingPolicyTest.java
--
diff --git
a/policy/src/test/java/org/apache/brooklyn/policy/loadbalancing/LoadBalancingPolicyTest.java
b/policy/src/test/java/org/apache/brooklyn/policy/loadbalancing/LoadBalancingPolicyTest.java
index bee3eae..5d06b12 100644
---
a/policy/src/test/java/org/apache/brooklyn/policy/loadbalancing/LoadBalancingPolicyTest.java
+++
b/policy/src/test/java/org/apache/brooklyn/policy/loadbalancing/LoadBalancingPolicyTest.java
@@ -316,6 +316,7 @@ public class LoadBalancingPolicyTest extends
AbstractLoadBalancingPolicyTest {
pool.policies().add(policy);
Asserts.succeedsEventually(MutableMap.of("timeout", TIMEOUT_MS), new
Runnable() {
+@Override
public void run() {
assertEquals(model.getContainerWorkrates(),
ImmutableMap.of(containerA, 10d));
}
@@ -375,6 +376,7 @@ public class LoadBalancingPolicyTest extends
AbstractLoadBalancingPolicyTest {
final MockItemEntity item2 = newItem(app, containerB, "2", 13);
Asserts.succeedsEventually(MutableMap.of("timeout", TIMEOUT_MS), new
Runnable() {
+@Override
public void run() {
assertEquals(model.getPoolSize(), 2);
assertEquals(model.getPoolContents(),
ImmutableSet.of(containerA, containerB));
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/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 bf5661e..ba2c519 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
@@ -165,9 +165,11 @@ public class MockContainerEntityImpl extends
AbstractGroupImpl implements MockCo
sensors().set(SERVICE_UP, false);
}
+@Override
public void offloadAndStop(final MockContainerEntity otherContainer) {
if (LOG.isDebugEnabled()) LOG.debug("Mocks: offloading container {} to
{} (items {})", new Object[] {this, otherContainer, getBalanceableItems()});
runWithLock(ImmutableList.of(this, otherContainer), new Runnable() {
+@Override
public void run() {
offloading = false;
for (Movable item : getBalanceableItems()) {
@@ -188,6 +190,7 @@ public class MockContainerEntityImpl extends
AbstractGroupImpl implements MockCo
List entitiesToLockCopy =
MutableList.copyOf(Iterables.filter(entitiesToLock, Predicates.notNull()));
List entitiesLocked = Lists.newArrayList();
Collections.sort(entitiesToLockCopy, new
Comparator() {
+@Override
public int compare(MockContainerEntity o1, MockContainerEntity o2)
{
return o1.getId().compareTo(o2.getId());
}});
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/LocationSpec.java
--
diff --git
a/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/LocationSpec.java
b/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/LocationSpec.java
index 70980bc..2947df1 100644
---
a/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/LocationSpec.java
+++
b/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/LocationSpec.java
@@ -66,6 +66,7 @@ public class LocationSpec implements HasName, HasConfig,
Serializable {
return spec;
}
+@Override
public Map getConfig() {
return config;
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/security/jaas/SecurityProviderHttpSession.java
--
diff --git
a/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/security/jaas/SecurityProviderHttpSession.java
b/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/security/jaas/SecurityProviderHttpSession.java
index 188df40..98f1e6d 100644
---
a/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/security/jaas/SecurityProviderHttpSession.java
+++
b/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/security/jaas/SecurityProviderHttpSession.java
@@ -62,6 +62,7 @@ public class SecurityProviderHttpSession implements
HttpSession {
return 0;
}
+
[02/17] brooklyn-server git commit: Add missing @Override annotations
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/core/src/test/java/org/apache/brooklyn/core/enricher/BasicEnricherTest.java
--
diff --git
a/core/src/test/java/org/apache/brooklyn/core/enricher/BasicEnricherTest.java
b/core/src/test/java/org/apache/brooklyn/core/enricher/BasicEnricherTest.java
index 6d58be0a..ae61d0a 100644
---
a/core/src/test/java/org/apache/brooklyn/core/enricher/BasicEnricherTest.java
+++
b/core/src/test/java/org/apache/brooklyn/core/enricher/BasicEnricherTest.java
@@ -48,6 +48,7 @@ public class BasicEnricherTest extends
BrooklynAppUnitTestSupport {
// TODO These tests are a copy of BasicPolicyTest, which is a code smell.
// However, the src/main/java code does not contain as much duplication.
+@Override
protected void setUpApp() {
EntitySpec appSpec =
EntitySpec.create(TestApplication.class, TestApplicationNoEnrichersImpl.class)
.configure(BrooklynConfigKeys.SKIP_ON_BOX_BASE_DIR_RESOLUTION,
shouldSkipOnBoxBaseDirResolution());
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/core/src/test/java/org/apache/brooklyn/core/entity/ApplicationLifecycleStateStressTest.java
--
diff --git
a/core/src/test/java/org/apache/brooklyn/core/entity/ApplicationLifecycleStateStressTest.java
b/core/src/test/java/org/apache/brooklyn/core/entity/ApplicationLifecycleStateStressTest.java
index c4b288c..f333b43 100644
---
a/core/src/test/java/org/apache/brooklyn/core/entity/ApplicationLifecycleStateStressTest.java
+++
b/core/src/test/java/org/apache/brooklyn/core/entity/ApplicationLifecycleStateStressTest.java
@@ -27,46 +27,57 @@ public class ApplicationLifecycleStateStressTest extends
ApplicationLifecycleSta
// invocationCount defined on this class, rather than the simple `@Test`
annotation on
// the super-class (without redefining all the public methods here!)?
+@Override
public void testHappyPathEmptyApp() throws Exception {
super.testHappyPathEmptyApp();
}
+@Override
public void testHappyPathWithChild() throws Exception {
super.testHappyPathWithChild();
}
+@Override
public void testOnlyChildFailsToStartCausesAppToFail() throws Exception {
super.testOnlyChildFailsToStartCausesAppToFail();
}
+@Override
public void testSomeChildFailsOnStartCausesAppToFail() throws Exception {
super.testSomeChildFailsOnStartCausesAppToFail();
}
+@Override
public void testOnlyChildFailsToStartThenRecoversCausesAppToRecover()
throws Exception {
super.testOnlyChildFailsToStartThenRecoversCausesAppToRecover();
}
+@Override
public void testSomeChildFailsToStartThenRecoversCausesAppToRecover()
throws Exception {
super.testSomeChildFailsToStartThenRecoversCausesAppToRecover();
}
+@Override
public void testStartsThenOnlyChildFailsCausesAppToFail() throws Exception
{
super.testStartsThenOnlyChildFailsCausesAppToFail();
}
+@Override
public void testStartsThenSomeChildFailsCausesAppToFail() throws Exception
{
super.testStartsThenSomeChildFailsCausesAppToFail();
}
+@Override
public void testChildFailuresOnStartButWithQuorumCausesAppToSucceed()
throws Exception {
super.testChildFailuresOnStartButWithQuorumCausesAppToSucceed();
}
+@Override
public void testStartsThenChildFailsButWithQuorumCausesAppToSucceed()
throws Exception {
super.testStartsThenChildFailsButWithQuorumCausesAppToSucceed();
}
+@Override
public void testStartsThenChildFailsButWithQuorumCausesAppToStayHealthy()
throws Exception {
super.testStartsThenChildFailsButWithQuorumCausesAppToStayHealthy();
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/core/src/test/java/org/apache/brooklyn/core/entity/EntityAutomanagedTest.java
--
diff --git
a/core/src/test/java/org/apache/brooklyn/core/entity/EntityAutomanagedTest.java
b/core/src/test/java/org/apache/brooklyn/core/entity/EntityAutomanagedTest.java
index 84c7eef..3d67337 100644
---
a/core/src/test/java/org/apache/brooklyn/core/entity/EntityAutomanagedTest.java
+++
b/core/src/test/java/org/apache/brooklyn/core/entity/EntityAutomanagedTest.java
@@ -59,6 +59,7 @@ public class EntityAutomanagedTest extends
BrooklynAppUnitTestSupport {
protected RecordingCollectionChangeListener listener;
+@Override
@BeforeMethod(alwaysRun=true)
public void setUp() throws Exception {
super.setUp();
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0d2d5d6a/core/src/test/java/org/apache/brooklyn/core/feed/PollerTest.java
-
[08/17] brooklyn-server git commit: Add missing @Override annotation to method signatures overriding interface methods
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
Ma
[12/17] brooklyn-server git commit: Remove unused imports
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/070d4ef5/rest/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynPropertiesSecurityFilterTest.java -- diff --git a/rest/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynPropertiesSecurityFilterTest.java b/rest/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynPropertiesSecurityFilterTest.java index c05d15b..f7b52fd 100644 --- a/rest/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynPropertiesSecurityFilterTest.java +++ b/rest/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynPropertiesSecurityFilterTest.java @@ -35,7 +35,6 @@ import org.eclipse.jetty.server.Server; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.Test; -import org.apache.brooklyn.rest.security.provider.AnyoneSecurityProvider; import org.apache.brooklyn.util.collections.MutableMap; import org.apache.brooklyn.util.http.HttpTool; import org.apache.brooklyn.util.http.HttpToolResponse; http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/070d4ef5/rest/rest-server/src/test/java/org/apache/brooklyn/rest/entitlement/AbstractRestApiEntitlementsTest.java -- diff --git a/rest/rest-server/src/test/java/org/apache/brooklyn/rest/entitlement/AbstractRestApiEntitlementsTest.java b/rest/rest-server/src/test/java/org/apache/brooklyn/rest/entitlement/AbstractRestApiEntitlementsTest.java index ad16226..7e11474 100644 --- a/rest/rest-server/src/test/java/org/apache/brooklyn/rest/entitlement/AbstractRestApiEntitlementsTest.java +++ b/rest/rest-server/src/test/java/org/apache/brooklyn/rest/entitlement/AbstractRestApiEntitlementsTest.java @@ -18,10 +18,7 @@ */ package org.apache.brooklyn.rest.entitlement; -import static org.apache.brooklyn.util.http.HttpTool.httpClientBuilder; import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertTrue; - import java.net.URI; import org.apache.brooklyn.api.entity.EntitySpec; @@ -33,15 +30,10 @@ import org.apache.brooklyn.core.mgmt.entitlement.PerUserEntitlementManager; import org.apache.brooklyn.core.test.entity.LocalManagementContextForTests; import org.apache.brooklyn.core.test.entity.TestApplication; import org.apache.brooklyn.core.test.entity.TestEntity; -import org.apache.brooklyn.rest.BrooklynRestApiLauncher; import org.apache.brooklyn.rest.BrooklynRestApiLauncherTestFixture; import org.apache.brooklyn.rest.BrooklynWebConfig; -import org.apache.brooklyn.util.http.HttpAsserts; import org.apache.brooklyn.util.http.HttpTool; -import org.apache.brooklyn.util.http.HttpTool.HttpClientBuilder; import org.apache.brooklyn.util.http.HttpToolResponse; -import org.apache.http.auth.UsernamePasswordCredentials; -import org.apache.http.client.HttpClient; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/070d4ef5/rest/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ServerResourceIntegrationTest.java -- diff --git a/rest/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ServerResourceIntegrationTest.java b/rest/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ServerResourceIntegrationTest.java index 5daa5fa..1cae978 100644 --- a/rest/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ServerResourceIntegrationTest.java +++ b/rest/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ServerResourceIntegrationTest.java @@ -29,7 +29,6 @@ import org.apache.brooklyn.api.mgmt.ManagementContext; import org.apache.brooklyn.core.internal.BrooklynProperties; import org.apache.brooklyn.core.mgmt.internal.LocalManagementContext; import org.apache.brooklyn.core.mgmt.internal.ManagementContextInternal; -import org.apache.brooklyn.rest.BrooklynRestApiLauncher; import org.apache.brooklyn.rest.BrooklynRestApiLauncherTestFixture; import org.apache.brooklyn.rest.security.provider.TestSecurityProvider; import org.apache.brooklyn.util.http.HttpAsserts; http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/070d4ef5/rest/rest-server/src/test/java/org/apache/brooklyn/rest/util/json/BrooklynJacksonSerializerIntegrationTest.java -- diff --git a/rest/rest-server/src/test/java/org/apache/brooklyn/rest/util/json/BrooklynJacksonSerializerIntegrationTest.java b/rest/rest-server/src/test/java/org/apache/brooklyn/rest/util/json/BrooklynJacksonSerializerIntegrationTest.java index 09ac6cc..edad261 100644 --- a/rest/rest-server/src/test/java/org/apache/brooklyn/rest/util/json/BrooklynJacksonSerializerIntegrationTest.java +++ b/rest/rest-server/src/test/java/org/apache/brooklyn/rest/util/json/BrooklynJacksonSerializerIntegrat
[04/17] brooklyn-server git commit: Add missing @Override annotation to method signatures overriding interface methods
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e61caea4/software/base/src/test/java/org/apache/brooklyn/feed/jmx/JmxFeedTest.java
--
diff --git
a/software/base/src/test/java/org/apache/brooklyn/feed/jmx/JmxFeedTest.java
b/software/base/src/test/java/org/apache/brooklyn/feed/jmx/JmxFeedTest.java
index 5326bd2..08434e8 100644
--- a/software/base/src/test/java/org/apache/brooklyn/feed/jmx/JmxFeedTest.java
+++ b/software/base/src/test/java/org/apache/brooklyn/feed/jmx/JmxFeedTest.java
@@ -253,6 +253,7 @@ public class JmxFeedTest {
GeneralisedDynamicMBean mbean = jmxService.registerMBean(
Collections.emptyMap(),
ImmutableMap.of(opInfo, new Function() {
+@Override
public Integer apply(Object[] args) {
invocationCount.incrementAndGet(); return
opReturnVal;
}}),
@@ -266,6 +267,7 @@ public class JmxFeedTest {
.build();
Asserts.succeedsEventually(ImmutableMap.of("timeout", TIMEOUT_MS), new
Runnable() {
+@Override
public void run() {
assertTrue(invocationCount.get() > 0,
"invocationCount="+invocationCount);
assertEquals(entity.getAttribute(intAttribute),
(Integer)opReturnVal);
@@ -281,6 +283,7 @@ public class JmxFeedTest {
GeneralisedDynamicMBean mbean = jmxService.registerMBean(
Collections.emptyMap(),
ImmutableMap.of(opInfo, new Function() {
+@Override
public String apply(Object[] args) {
return args[0]+"suffix";
}}),
@@ -313,6 +316,7 @@ public class JmxFeedTest {
// Notification updates the sensor
// Note that subscription is done async, so can't just send
notification immediately during test.
Asserts.succeedsEventually(ImmutableMap.of("timeout", TIMEOUT_MS), new
Runnable() {
+@Override
public void run() {
sendNotification(mbean, one, sequence.getAndIncrement(), 123);
assertEquals(entity.getAttribute(intAttribute), (Integer)123);
@@ -322,6 +326,7 @@ public class JmxFeedTest {
sendNotification(mbean, two, sequence.getAndIncrement(), -1);
Asserts.succeedsEventually(ImmutableMap.of("timeout", TIMEOUT_MS), new
Runnable() {
+@Override
public void run() {
assertEquals(entity.getAttribute(intAttribute), (Integer)123);
}});
@@ -339,6 +344,7 @@ public class JmxFeedTest {
.objectName(objectName)
.notificationFilter(JmxNotificationFilters.matchesType(one))
.onNotification(new Function() {
+@Override
public Integer apply(Notification notif) {
return (Integer) notif.getUserData();
}
@@ -349,6 +355,7 @@ public class JmxFeedTest {
// Notification updates the sensor
// Note that subscription is done async, so can't just send
notification immediately during test.
Asserts.succeedsEventually(ImmutableMap.of("timeout", TIMEOUT_MS), new
Runnable() {
+@Override
public void run() {
sendNotification(mbean, one, sequence.getAndIncrement(), 123);
assertEquals(entity.getAttribute(intAttribute), (Integer)123);
@@ -372,6 +379,7 @@ public class JmxFeedTest {
// Notification updates the sensor
// Note that subscription is done async, so can't just send
notification immediately during test.
Asserts.succeedsEventually(ImmutableMap.of("timeout", TIMEOUT_MS), new
Runnable() {
+@Override
public void run() {
sendNotification(mbean, one, sequence.getAndIncrement(), 123);
assertEquals(entity.getAttribute(intAttribute), (Integer)123);
@@ -393,6 +401,7 @@ public class JmxFeedTest {
final List> received = Lists.newArrayList();
app2.subscriptions().subscribe(null, EntityWithEmitter.MY_NOTIF,
new SensorEventListener() {
+@Override
public void onEvent(SensorEvent event) {
received.add(event);
}});
@@ -402,6 +411,7 @@ public class JmxFeedTest {
jmxHelper.connect(TIMEOUT_MS);
jmxHelper.addNotificationListener(jmxObjectName, new
NotificationListener() {
+@Override
public void handleNotification(Notification notif, Object
callback) {
if (notif.getType().equals("one")) {
entity.sensors().emit(EntityWithEmitter.MY_NO
[1/2] brooklyn-server git commit: Adds test for catalog-effector from OSGi bundle
Repository: brooklyn-server
Updated Branches:
refs/heads/master c5fc588c3 -> 8ad5578c1
Adds test for catalog-effector from OSGi bundle
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/d893d529
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/d893d529
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/d893d529
Branch: refs/heads/master
Commit: d893d529bccb2cea3b4511a4409a378d2253b8be
Parents: 494ae6f
Author: Aled Sage
Authored: Thu Jan 19 12:37:42 2017 +
Committer: Aled Sage
Committed: Thu Jan 19 12:37:42 2017 +
--
.../CatalogOsgiVersionMoreEntityRebindTest.java | 41
1 file changed, 41 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/d893d529/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogOsgiVersionMoreEntityRebindTest.java
--
diff --git
a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogOsgiVersionMoreEntityRebindTest.java
b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogOsgiVersionMoreEntityRebindTest.java
index b4af697..cee7a4d 100644
---
a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogOsgiVersionMoreEntityRebindTest.java
+++
b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogOsgiVersionMoreEntityRebindTest.java
@@ -20,6 +20,7 @@ package org.apache.brooklyn.camp.brooklyn.catalog;
import static org.testng.Assert.assertEquals;
+import org.apache.brooklyn.api.effector.Effector;
import org.apache.brooklyn.api.entity.Entity;
import org.apache.brooklyn.api.location.Location;
import org.apache.brooklyn.api.location.LocationSpec;
@@ -39,6 +40,7 @@ import org.slf4j.LoggerFactory;
import org.testng.annotations.Test;
import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Iterables;
/** Many of the same tests as per {@link OsgiVersionMoreEntityTest} but using
YAML for catalog and entities, so catalog item ID is set automatically */
@@ -128,4 +130,43 @@ public class CatalogOsgiVersionMoreEntityRebindTest
extends AbstractYamlRebindTe
Location newLoc = Iterables.getOnlyElement(newEntity.getLocations());
assertEquals(newLoc.getClass().getName(), locationType);
}
+
+@Test
+public void testEffectorInBundleReferencedByStockCatalogItem() throws
Exception {
+
TestResourceUnavailableException.throwIfResourceUnavailable(getClass(),
OsgiTestResources.BROOKLYN_TEST_OSGI_ENTITIES_COM_EXAMPLE_PATH);
+
+String effectorType =
OsgiTestResources.BROOKLYN_TEST_OSGI_ENTITIES_COM_EXAMPLE_EFFECTOR;
+
+addCatalogItems(
+"brooklyn.catalog:",
+" id: wrapped-entity",
+" version: 1.0",
+" item:",
+"services:",
+"- type: " + TestEntity.class.getName());
+
+addCatalogItems(
+"brooklyn.catalog:",
+" id: with-effector-from-library",
+" version: 1.0",
+" brooklyn.libraries:",
+" - classpath:" +
OsgiTestResources.BROOKLYN_TEST_OSGI_ENTITIES_COM_EXAMPLE_PATH,
+" item:",
+"services:",
+"- type: " + BasicApplication.class.getName(),
+" brooklyn.children:",
+" - type: wrapped-entity:1.0",
+"brooklyn.initializers:",
+"- type: " + effectorType);
+
+Entity app = createAndStartApplication("services: [ { type:
'with-effector-from-library:1.0' } ]");
+Entity entity = Iterables.getOnlyElement(app.getChildren());
+Effector effector =
entity.getEntityType().getEffectorByName("myEffector").get();
+entity.invoke(effector, ImmutableMap.of()).get();
+
+StartableApplication newApp = rebind();
+Entity newEntity = Iterables.getOnlyElement(newApp.getChildren());
+Effector newEffector =
newEntity.getEntityType().getEffectorByName("myEffector").get();
+newEntity.invoke(newEffector, ImmutableMap.of()).get();
+}
}
[2/2] brooklyn-server git commit: This closes #527
This closes #527 Adds test for catalog-effector from OSGi bundle Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/8ad5578c Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/8ad5578c Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/8ad5578c Branch: refs/heads/master Commit: 8ad5578c17013377f5f362acb512e9c5ccb8894f Parents: c5fc588 d893d52 Author: Sam Corbett Authored: Mon Jan 23 15:03:29 2017 + Committer: Sam Corbett Committed: Mon Jan 23 15:03:29 2017 + -- .../CatalogOsgiVersionMoreEntityRebindTest.java | 41 1 file changed, 41 insertions(+) --
[1/2] brooklyn-server git commit: BROOKLYN-426: avoid propagating NoClassDefFoundError
Repository: brooklyn-server
Updated Branches:
refs/heads/master a9047f64c -> c5fc588c3
BROOKLYN-426: avoid propagating NoClassDefFoundError
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/1c20df25
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/1c20df25
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/1c20df25
Branch: refs/heads/master
Commit: 1c20df2590f7b2104d3f6f70b68a586d15bbc3f7
Parents: 4d2f7cc
Author: Aled Sage
Authored: Thu Jan 19 12:38:52 2017 +
Committer: Aled Sage
Committed: Thu Jan 19 12:38:52 2017 +
--
.../org/apache/brooklyn/util/core/LoaderDispatcher.java | 12
1 file changed, 12 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/1c20df25/core/src/main/java/org/apache/brooklyn/util/core/LoaderDispatcher.java
--
diff --git
a/core/src/main/java/org/apache/brooklyn/util/core/LoaderDispatcher.java
b/core/src/main/java/org/apache/brooklyn/util/core/LoaderDispatcher.java
index f45c6d1..8fffa9d 100644
--- a/core/src/main/java/org/apache/brooklyn/util/core/LoaderDispatcher.java
+++ b/core/src/main/java/org/apache/brooklyn/util/core/LoaderDispatcher.java
@@ -44,6 +44,10 @@ public interface LoaderDispatcher {
return
Maybe.>of(SystemFrameworkLoader.get().loadClassFromBundle(className,
bundle));
} catch (ClassNotFoundException e) {
return Maybe.absent("Failed to load class " + className + "
from bundle " + bundle, e);
+} catch (NoClassDefFoundError e) {
+// Can happen if a bundle misbehaves (e.g. it doesn't include
Import-Package for
+// all the packages it really needs.
+return Maybe.absent("Failed to load class " + className + "
from bundle " + bundle, e);
}
}
@@ -54,6 +58,10 @@ public interface LoaderDispatcher {
} catch (IllegalStateException e) {
propagateIfCauseNotClassNotFound(e);
return Maybe.absent("Failed to load class " + className + "
from loader " + loader, e);
+} catch (NoClassDefFoundError e) {
+// Can happen if a bundle misbehaves (e.g. it doesn't include
Import-Package for
+// all the packages it really needs.
+return Maybe.absent("Failed to load class " + className + "
from loader " + loader, e);
}
}
@@ -68,6 +76,10 @@ public interface LoaderDispatcher {
return Maybe.absent("Failed to load class " + className + "
from class loader " + classLoader, e);
} catch (ClassNotFoundException e) {
return Maybe.absent("Failed to load class " + className + "
from class loader " + classLoader, e);
+} catch (NoClassDefFoundError e) {
+// Can happen if a bundle misbehaves (e.g. it doesn't include
Import-Package for
+// all the packages it really needs.
+return Maybe.absent("Failed to load class " + className + "
from class loader " + classLoader, e);
}
}
[2/2] brooklyn-server git commit: This closes #528
This closes #528 BROOKLYN-426: avoid propagating NoClassDefFoundError Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/c5fc588c Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/c5fc588c Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/c5fc588c Branch: refs/heads/master Commit: c5fc588c377f3fa68b6caedefb978e1e79466f60 Parents: a9047f6 1c20df2 Author: Sam Corbett Authored: Mon Jan 23 14:56:42 2017 + Committer: Sam Corbett Committed: Mon Jan 23 14:56:42 2017 + -- .../org/apache/brooklyn/util/core/LoaderDispatcher.java | 12 1 file changed, 12 insertions(+) --
[2/4] brooklyn-server git commit: WIP Make CORS filter configurable
WIP Make CORS filter configurable Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/8085db55 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/8085db55 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/8085db55 Branch: refs/heads/master Commit: 8085db5518141bb9864ba27946c03429bc9476b6 Parents: 31598a0 Author: Mark McKenna Authored: Fri Jan 20 17:16:56 2017 + Committer: Valentin Aitken Committed: Sun Jan 22 06:46:07 2017 +0200 -- .../resources/OSGI-INF/blueprint/service.xml| 137 +++ 1 file changed, 80 insertions(+), 57 deletions(-) -- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/8085db55/rest/rest-resources/src/main/resources/OSGI-INF/blueprint/service.xml -- diff --git a/rest/rest-resources/src/main/resources/OSGI-INF/blueprint/service.xml b/rest/rest-resources/src/main/resources/OSGI-INF/blueprint/service.xml index 8e0201e..9808a28 100644 --- a/rest/rest-resources/src/main/resources/OSGI-INF/blueprint/service.xml +++ b/rest/rest-resources/src/main/resources/OSGI-INF/blueprint/service.xml @@ -17,17 +17,14 @@ limitations under the License. http://www.osgi.org/xmlns/blueprint/v1.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns:cm="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.2.0"; - xmlns:jaxws="http://cxf.apache.org/blueprint/jaxws"; xmlns:jaxrs="http://cxf.apache.org/blueprint/jaxrs"; xmlns:cxf="http://cxf.apache.org/blueprint/core"; xmlns:jaas="http://karaf.apache.org/xmlns/jaas/v1.0.0"; - xsi:schemaLocation=" - http://www.osgi.org/xmlns/blueprint/v1.0.0 http://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd - http://cxf.apache.org/blueprint/jaxws http://cxf.apache.org/schemas/blueprint/jaxws.xsd + xsi:schemaLocation="http://www.osgi.org/xmlns/blueprint/v1.0.0 http://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd + http://cxf.apache.org/blueprint/jaxrs http://cxf.apache.org/schemas/blueprint/jaxrs.xsd http://cxf.apache.org/blueprint/core http://cxf.apache.org/schemas/blueprint/core.xsd - http://karaf.apache.org/xmlns/jaas/v1.0.0 http://karaf.apache.org/xmlns/jaas/v1.0.0 - "> + http://karaf.apache.org/xmlns/jaas/v1.0.0 http://karaf.apache.org/xmlns/jaas/v1.0.0";> @@ -35,57 +32,85 @@ limitations under the License. + + + + + + + + + + + + + + + + + + + + + + + + + + - + interface="org.apache.brooklyn.core.mgmt.internal.ManagementContextInternal"/> - + - + - + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + @@ -96,24 +121,22 @@ limitations under the License. - + - - - - - - + + + + + + - - - - + + @@ -123,6 +146,6 @@ limitations under the License. - +
[1/4] brooklyn-server git commit: Add experimental CORS server support
Repository: brooklyn-server
Updated Branches:
refs/heads/master 050a15654 -> a9047f64c
Add experimental CORS server support
Include org.apache.cxf.rs.security.cors.CrossOriginResourceSharing
implementation
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/31598a04
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/31598a04
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/31598a04
Branch: refs/heads/master
Commit: 31598a0483fdf62299b69bea82c48141f60a160f
Parents: bfc74eb
Author: Valentin Aitken
Authored: Tue Jan 10 23:51:06 2017 +0200
Committer: Valentin Aitken
Committed: Sun Jan 22 06:45:59 2017 +0200
--
.../core/BrooklynFeatureEnablement.java | 2 +
karaf/features/src/main/feature/feature.xml | 1 +
karaf/init/pom.xml | 10 +
.../brooklyn/launcher/BrooklynWebServer.java| 12 +-
rest/rest-resources/pom.xml | 5 +
.../rest/filter/CorsImplSupplierFilter.java | 166 +
.../resources/OSGI-INF/blueprint/service.xml| 4 +
.../rest-server/src/main/webapp/WEB-INF/web.xml | 1 +
.../brooklyn/rest/BrooklynRestApiLauncher.java | 11 +-
.../brooklyn/rest/CorsFilterLauncherTest.java | 247 +++
.../rest/CsrfTokenFilterLauncherTest.java | 3 +-
11 files changed, 458 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/31598a04/core/src/main/java/org/apache/brooklyn/core/BrooklynFeatureEnablement.java
--
diff --git
a/core/src/main/java/org/apache/brooklyn/core/BrooklynFeatureEnablement.java
b/core/src/main/java/org/apache/brooklyn/core/BrooklynFeatureEnablement.java
index 8bc2ffd..8f0aff1 100644
--- a/core/src/main/java/org/apache/brooklyn/core/BrooklynFeatureEnablement.java
+++ b/core/src/main/java/org/apache/brooklyn/core/BrooklynFeatureEnablement.java
@@ -61,6 +61,8 @@ public class BrooklynFeatureEnablement {
/** whether feeds are automatically registered when set on entities, so
that they are persisted */
public static final String FEATURE_FEED_REGISTRATION_PROPERTY =
FEATURE_PROPERTY_PREFIX+".feedRegistration";
+public static final String FEATURE_CORS_CXF_PROPERTY =
FEATURE_PROPERTY_PREFIX + ".corsCxfFeature";
+
public static final String FEATURE_CATALOG_PERSISTENCE_PROPERTY =
FEATURE_PROPERTY_PREFIX+".catalogPersistence";
/** whether the default standby mode is {@link
HighAvailabilityMode#HOT_STANDBY} or falling back to the traditional
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/31598a04/karaf/features/src/main/feature/feature.xml
--
diff --git a/karaf/features/src/main/feature/feature.xml
b/karaf/features/src/main/feature/feature.xml
index 9cfc49a..effcf52 100644
--- a/karaf/features/src/main/feature/feature.xml
+++ b/karaf/features/src/main/feature/feature.xml
@@ -194,6 +194,7 @@
brooklyn-camp-base
cxf-jaxrs
+mvn:org.apache.cxf/cxf-rt-rs-security-cors/${cxf.version}
mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-json-provider/${fasterxml.jackson.version}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/31598a04/karaf/init/pom.xml
--
diff --git a/karaf/init/pom.xml b/karaf/init/pom.xml
index 4d77752..ef78d9f 100644
--- a/karaf/init/pom.xml
+++ b/karaf/init/pom.xml
@@ -65,6 +65,16 @@
testng
test
+
+org.apache.aries.blueprint
+org.apache.aries.blueprint.core
+1.5.0
+
+
+org.apache.aries.blueprint
+org.apache.aries.blueprint.cm
+1.0.7
+
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/31598a04/launcher/src/main/java/org/apache/brooklyn/launcher/BrooklynWebServer.java
--
diff --git
a/launcher/src/main/java/org/apache/brooklyn/launcher/BrooklynWebServer.java
b/launcher/src/main/java/org/apache/brooklyn/launcher/BrooklynWebServer.java
index 933ce68..d9c3c7d 100644
--- a/launcher/src/main/java/org/apache/brooklyn/launcher/BrooklynWebServer.java
+++ b/launcher/src/main/java/org/apache/brooklyn/launcher/BrooklynWebServer.java
@@ -36,6 +36,8 @@ import java.util.Map;
import javax.annotation.Nullable;
import javax.security.auth.spi.LoginModule;
+import com.google.common.collect.ImmutableList;
+import org.apache.brooklyn.core.BrooklynFeatureEnablement;
import org.apache.brooklyn.rest.NopSecurityHandler;
import org.apache.brooklyn.api.location.PortRange;
im
[3/4] brooklyn-server git commit: CORS bean - fix setting default values
CORS bean - fix setting default values
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/51e568e6
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/51e568e6
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/51e568e6
Branch: refs/heads/master
Commit: 51e568e6c0b5c9582c97067b8e7aa6918cb80b64
Parents: 8085db5
Author: Valentin Aitken
Authored: Fri Jan 20 19:39:17 2017 +0200
Committer: Valentin Aitken
Committed: Sun Jan 22 06:48:42 2017 +0200
--
karaf/init/pom.xml | 10
.../rest/filter/CorsImplSupplierFilter.java | 52 ++--
.../resources/OSGI-INF/blueprint/service.xml| 23 -
3 files changed, 47 insertions(+), 38 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/51e568e6/karaf/init/pom.xml
--
diff --git a/karaf/init/pom.xml b/karaf/init/pom.xml
index ef78d9f..4d77752 100644
--- a/karaf/init/pom.xml
+++ b/karaf/init/pom.xml
@@ -65,16 +65,6 @@
testng
test
-
-org.apache.aries.blueprint
-org.apache.aries.blueprint.core
-1.5.0
-
-
-org.apache.aries.blueprint
-org.apache.aries.blueprint.cm
-1.0.7
-
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/51e568e6/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/filter/CorsImplSupplierFilter.java
--
diff --git
a/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/filter/CorsImplSupplierFilter.java
b/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/filter/CorsImplSupplierFilter.java
index 1e3764a..51c9e5c 100644
---
a/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/filter/CorsImplSupplierFilter.java
+++
b/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/filter/CorsImplSupplierFilter.java
@@ -28,6 +28,7 @@ import org.apache.brooklyn.core.BrooklynFeatureEnablement;
import org.apache.brooklyn.core.config.ConfigKeys;
import org.apache.brooklyn.core.config.ConfigPredicates;
import org.apache.brooklyn.core.config.ConfigUtils;
+import org.apache.brooklyn.util.text.Strings;
import org.apache.cxf.rs.security.cors.CrossOriginResourceSharingFilter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -41,7 +42,7 @@ import java.util.List;
/**
*
- * Enables support for Cross Origin Resource Sharing (CORS) filtering on
requests in BrooklynWebServer.
+ * Enables support for Cross Origin Resource Sharing (CORS) filtering on
Apache Brooklyn REST API.
* If enabled, the allowed origins for the CORS headers should be configured
* using the
brooklyn.experimental.feature.corsCxfFeature.allowedOrigins=[]
property.
*
@@ -63,7 +64,7 @@ public class CorsImplSupplierFilter extends
CrossOriginResourceSharingFilter {
* @see CrossOriginResourceSharingFilter#setAllowOrigins(List)
*/
public static final ConfigKey> ALLOW_ORIGINS =
ConfigKeys.newConfigKey(new TypeToken>() {},
-"allowedOrigins",
+"allowOrigins",
"List of allowed origins. Access-Control-Allow-Origin header will
be returned to client if Origin header in request is matching exactly a value
among the list allowed origins. " +
"If AllowedOrigins is empty or not specified then all
origins are allowed. " +
"No wildcard allowed origins are supported.",
@@ -73,7 +74,7 @@ public class CorsImplSupplierFilter extends
CrossOriginResourceSharingFilter {
* @see CrossOriginResourceSharingFilter#setAllowHeaders(List)
*/
public static final ConfigKey> ALLOW_HEADERS =
ConfigKeys.newConfigKey(new TypeToken>() {},
-"allowedHeaders",
+"allowHeaders",
"List of allowed headers for preflight checks.",
Collections.emptyList());
@@ -90,7 +91,7 @@ public class CorsImplSupplierFilter extends
CrossOriginResourceSharingFilter {
* @see CrossOriginResourceSharingFilter#setExposeHeaders(List)
*/
public static final ConfigKey> EXPOSE_HEADERS =
ConfigKeys.newConfigKey(new TypeToken>() {},
-"exposedHeaders",
+"exposeHeaders",
"A list of non-simple headers to be exposed via
Access-Control-Expose-Headers.",
Collections.emptyList());
@@ -117,7 +118,7 @@ public class CorsImplSupplierFilter extends
CrossOriginResourceSharingFilter {
private static final Logger LOGGER =
LoggerFactory.getLogger(CorsImplSupplierFilter.class);
-private boolean corsEnabled = false;
+private boolean enableCors = false;
[4/4] brooklyn-server git commit: Closes #519
Closes #519 Add experimental CORS server support Include org.apache.cxf.rs.security.cors.CrossOriginResourceSharing implementation Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/a9047f64 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/a9047f64 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/a9047f64 Branch: refs/heads/master Commit: a9047f64c7fa401c99a72c878facdc3143a749d1 Parents: 050a156 51e568e Author: Geoff Macartney Authored: Mon Jan 23 13:11:45 2017 + Committer: Geoff Macartney Committed: Mon Jan 23 13:11:45 2017 + -- .../core/BrooklynFeatureEnablement.java | 2 + karaf/features/src/main/feature/feature.xml | 1 + .../brooklyn/launcher/BrooklynWebServer.java| 12 +- rest/rest-resources/pom.xml | 5 + .../rest/filter/CorsImplSupplierFilter.java | 190 ++ .../resources/OSGI-INF/blueprint/service.xml| 128 ++ .../rest-server/src/main/webapp/WEB-INF/web.xml | 1 + .../brooklyn/rest/BrooklynRestApiLauncher.java | 11 +- .../brooklyn/rest/CorsFilterLauncherTest.java | 247 +++ .../rest/CsrfTokenFilterLauncherTest.java | 3 +- 10 files changed, 543 insertions(+), 57 deletions(-) --
[2/2] brooklyn-server git commit: This closes #533
This closes #533 Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/050a1565 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/050a1565 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/050a1565 Branch: refs/heads/master Commit: 050a15654f69be3a1e69898969eea35f62cbd29b Parents: bfc74eb dfd4315 Author: Aled Sage Authored: Mon Jan 23 10:05:12 2017 + Committer: Aled Sage Committed: Mon Jan 23 10:05:12 2017 + -- .../brooklyn/core/mgmt/persist/OsgiClassPrefixer.java | 9 - .../brooklyn/core/mgmt/persist/OsgiClassPrefixerTest.java | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) --
[1/2] brooklyn-server git commit: persistence: include bundle-prefix for whitelisted classes
Repository: brooklyn-server
Updated Branches:
refs/heads/master bfc74ebc5 -> 050a15654
persistence: include bundle-prefix for whitelisted classes
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/dfd43155
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/dfd43155
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/dfd43155
Branch: refs/heads/master
Commit: dfd4315565c6767ccb16979c8d098717ed2a4853
Parents: bfc74eb
Author: Aled Sage
Authored: Fri Jan 20 18:12:38 2017 +
Committer: Aled Sage
Committed: Fri Jan 20 20:54:40 2017 +
--
.../brooklyn/core/mgmt/persist/OsgiClassPrefixer.java | 9 -
.../brooklyn/core/mgmt/persist/OsgiClassPrefixerTest.java | 2 +-
2 files changed, 9 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/dfd43155/core/src/main/java/org/apache/brooklyn/core/mgmt/persist/OsgiClassPrefixer.java
--
diff --git
a/core/src/main/java/org/apache/brooklyn/core/mgmt/persist/OsgiClassPrefixer.java
b/core/src/main/java/org/apache/brooklyn/core/mgmt/persist/OsgiClassPrefixer.java
index f252f8e..4c4a348 100644
---
a/core/src/main/java/org/apache/brooklyn/core/mgmt/persist/OsgiClassPrefixer.java
+++
b/core/src/main/java/org/apache/brooklyn/core/mgmt/persist/OsgiClassPrefixer.java
@@ -58,7 +58,14 @@ public class OsgiClassPrefixer {
public Optional getPrefix(Class type) {
Optional bundle = (bundleRetriever != null) ?
bundleRetriever.apply(type) : Osgis.getBundleOf(type);
-if (bundle.isPresent() &&
!whiteListRetriever.isBundleWhiteListed(bundle.get())) {
+if (bundle.isPresent()) {
+// Previously we didn't include the bundle prefix for whitelisted
bundles. However,
+// that means once a bundle is whitelisted it must always be
whitelisted. That is
+// annoying for customer-upgrades of persisted state created
pre-karaf. For those
+// upgrades, the temporary whitelist is a useful way to allow
rebind to complete
+// successfully. The persisted state will then be re-written with
the appropriate
+// prefixes. It is also better that we treat persistence/rebind of
classes from
+// Brooklyn bundles in the same way as customer bundles.
return Optional.of(bundle.get().getSymbolicName() + DELIMITER);
}
return Optional.absent();
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/dfd43155/core/src/test/java/org/apache/brooklyn/core/mgmt/persist/OsgiClassPrefixerTest.java
--
diff --git
a/core/src/test/java/org/apache/brooklyn/core/mgmt/persist/OsgiClassPrefixerTest.java
b/core/src/test/java/org/apache/brooklyn/core/mgmt/persist/OsgiClassPrefixerTest.java
index 19a5610..724d8d7 100644
---
a/core/src/test/java/org/apache/brooklyn/core/mgmt/persist/OsgiClassPrefixerTest.java
+++
b/core/src/test/java/org/apache/brooklyn/core/mgmt/persist/OsgiClassPrefixerTest.java
@@ -70,7 +70,7 @@ public class OsgiClassPrefixerTest {
}
};
OsgiClassPrefixer prefixer = new OsgiClassPrefixer(bundleRetriever);
-assertAbsent(prefixer.getPrefix(String.class));
+assertPresent(prefixer.getPrefix(String.class),
"org.apache.brooklyn.my-bundle:");
}
@Test
