This is an automated email from the ASF dual-hosted git repository.
heneveld pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git
commit c03fa2a7efb6f3141dfc0adadd10cd561bc7aa52
Merge: 4ba5b44 77c3b17
Author: Alex Heneveld <alex.henev...@cloudsoftcorp.com>
AuthorDate: Mon Dec 7 22:43:56 2020 +0000
Merge branch 'master' into more-policy-highlights-and-check
server-cli/LICENSE => DEPENDENCIES | 956 +++++++++++++++++----
LICENSE | 735 +---------------
NOTICE | 479 +----------
.../brooklyn/api/catalog/BrooklynCatalog.java | 81 +-
.../apache/brooklyn/api/catalog/CatalogItem.java | 10 +-
.../brooklyn/api/entity/EntityInitializer.java | 8 +-
.../api/internal/AbstractBrooklynObjectSpec.java | 24 +-
.../brooklyn/api/location/MachineLocation.java | 7 +
.../api/location/MachineManagementMixins.java | 39 +-
.../mgmt/rebind/mementos/ManagedBundleMemento.java | 2 +
.../apache/brooklyn/api/objs/BrooklynObject.java | 14 +-
.../brooklyn/api/objs/BrooklynObjectType.java | 2 +-
.../brooklyn/api/typereg/BrooklynTypeRegistry.java | 6 +-
.../apache/brooklyn/api/typereg/ManagedBundle.java | 5 +-
.../apache/brooklyn/camp/BasicCampPlatform.java | 2 +-
.../BrooklynAssemblyTemplateInstantiator.java | 9 +-
.../BrooklynComponentTemplateResolver.java | 45 +-
.../creation/BrooklynEntityDecorationResolver.java | 177 ++--
.../spi/creation/BrooklynYamlTypeInstantiator.java | 14 +-
.../camp/brooklyn/spi/creation/CampResolver.java | 95 +-
.../spi/creation/CampTypePlanTransformer.java | 12 -
.../spi/dsl/BrooklynDslDeferredSupplier.java | 22 +-
.../brooklyn/spi/dsl/DslDeferredFunctionCall.java | 30 +-
.../brooklyn/camp/brooklyn/spi/dsl/DslUtils.java | 27 +-
.../spi/dsl/methods/BrooklynDslCommon.java | 122 ++-
.../brooklyn/spi/dsl/methods/DslComponent.java | 42 +-
.../spi/dsl/methods/DslToStringHelpers.java | 2 +-
...apache.brooklyn.core.plan.PlanToSpecTransformer | 4 +
...ooklyn.core.typereg.BrooklynTypePlanTransformer | 4 +
.../brooklyn/camp/brooklyn/AbstractYamlTest.java | 24 +-
.../camp/brooklyn/AddChildrenEffectorYamlTest.java | 133 ++-
.../camp/brooklyn/ApplicationsYamlTest.java | 5 +-
.../camp/brooklyn/ConfigParametersYamlTest.java | 93 +-
.../brooklyn/CustomTypeConfigYamlOsgiTest.java | 58 ++
.../camp/brooklyn/CustomTypeConfigYamlTest.java | 364 ++++++++
.../brooklyn/CustomTypeInitializerYamlTest.java | 354 ++++++++
.../brooklyn/camp/brooklyn/EntitiesYamlTest.java | 91 +-
.../camp/brooklyn/ReferencedOsgiYamlTest.java | 2 +-
...a => TestSensorAndEffectorInitializerBase.java} | 73 +-
.../brooklyn/ValidationMissingTypeYamlTest.java | 9 +-
.../catalog/CatalogMakeOsgiBundleTest.java | 5 +-
.../CatalogOsgiVersionMoreEntityRebindTest.java | 29 +-
.../catalog/CatalogOsgiVersionMoreEntityTest.java | 2 +-
.../catalog/CatalogOsgiYamlEntityTest.java | 194 ++++-
.../catalog/CatalogOsgiYamlLocationTest.java | 4 +-
.../catalog/CatalogOsgiYamlPolicyTest.java | 8 +-
.../catalog/CatalogOsgiYamlTemplateTest.java | 2 +-
.../camp/brooklyn/catalog/CatalogScanOsgiTest.java | 3 +-
.../camp/brooklyn/catalog/CatalogYamlAppTest.java | 8 +-
.../brooklyn/catalog/CatalogYamlCombiTest.java | 10 +-
.../CatalogYamlEntityOsgiTypeRegistryTest.java | 38 +-
.../brooklyn/catalog/CatalogYamlEntityTest.java | 105 ++-
.../brooklyn/catalog/CatalogYamlLocationTest.java | 12 +-
.../brooklyn/catalog/CatalogYamlPolicyTest.java | 12 +-
.../brooklyn/catalog/CatalogYamlTemplateTest.java | 4 +-
.../catalog/CatalogYamlVersioningTest.java | 26 +-
.../brooklyn/catalog/GetFileContentsEffector.java | 12 +-
.../camp/brooklyn/spi/dsl/DslParseTest.java | 12 +-
.../brooklyn/spi/dsl/DslSerializationTest.java | 160 ++++
.../camp/brooklyn/spi/dsl/DslYamlTest.java | 4 +-
.../camp/brooklyn/spi/dsl/TagsYamlTest.java | 2 +-
.../brooklyn/spi/dsl/methods/DslTestObjects.java | 20 +-
.../camp/brooklyn/test/lite/CampYamlLiteTest.java | 2 +-
.../test/policy/failover/ElectPrimaryTest.java | 15 +-
core/pom.xml | 10 -
.../brooklyn/core/BrooklynFeatureEnablement.java | 5 +
.../brooklyn/core/catalog/CatalogPredicates.java | 4 +-
.../catalog/internal/BasicBrooklynCatalog.java | 673 ++++++++-------
.../core/catalog/internal/CatalogBundleLoader.java | 20 +-
.../catalog/internal/CatalogInitialization.java | 62 +-
.../core/catalog/internal/CatalogItemBuilder.java | 1 +
.../catalog/internal/CatalogUpgradeScanner.java | 8 +-
.../core/catalog/internal/CatalogUtils.java | 15 +-
.../brooklyn/core/config/BasicConfigKey.java | 33 +-
.../apache/brooklyn/core/config/ConfigUtils.java | 23 +
.../config/internal/AbstractConfigMapImpl.java | 39 +-
.../config/internal/LazyContainerAndKeyValue.java | 19 +-
.../core/effector/AddChildrenEffector.java | 17 +-
.../apache/brooklyn/core/effector/AddEffector.java | 94 +-
.../effector/AddEffectorInitializerAbstract.java | 71 ++
...va => AddEffectorInitializerAbstractProto.java} | 86 +-
.../apache/brooklyn/core/effector/AddSensor.java | 87 +-
.../core/effector/AddSensorInitializer.java | 112 +++
.../AddSensorInitializerAbstractProto.java | 51 ++
.../brooklyn/core/effector/CompositeEffector.java | 18 +-
.../brooklyn/core/effector/ProxyEffector.java | 12 +-
.../core/effector/http/HttpCommandEffector.java | 17 +-
.../core/effector/ssh/SshCommandEffector.java | 20 +-
.../core/effector/ssh/SshEffectorTasks.java | 3 +-
.../brooklyn/core/entity/AbstractEntity.java | 25 +-
.../org/apache/brooklyn/core/entity/Dumper.java | 4 +-
.../brooklyn/core/entity/EntityInitializers.java | 159 +++-
.../core/entity/EntityPostInitializable.java | 26 +-
.../core/entity/trait/StartableMethods.java | 11 +-
.../core/location/AbstractMachineLocation.java | 4 +
.../core/location/BasicLocationRegistry.java | 72 +-
.../core/location/BasicMachineMetadata.java | 25 +-
.../core/location/MachineLifecycleUtils.java | 288 +++++++
.../brooklyn/core/mgmt/EntityManagementUtils.java | 44 +-
.../OsgiBrooklynClassLoadingContext.java | 22 +-
...r.java => BrooklynBomOsgiArchiveInstaller.java} | 454 ++++++----
.../apache/brooklyn/core/mgmt/ha/OsgiManager.java | 102 ++-
.../BasicExternalConfigSupplierRegistry.java | 5 +-
.../core/mgmt/rebind/RebindContextImpl.java | 3 +-
.../brooklyn/core/mgmt/rebind/RebindIteration.java | 27 +-
.../mgmt/rebind/dto/BasicManagedBundleMemento.java | 17 +-
.../core/mgmt/rebind/dto/MementosGenerators.java | 3 +-
.../objs/AbstractConfigurationSupportInternal.java | 2 +-
.../brooklyn/core/objs/BasicSpecParameter.java | 64 +-
.../core/objs/proxy/InternalEntityFactory.java | 69 +-
.../brooklyn/core/plan/PlanToSpecFactory.java | 9 +-
.../entity/DelegatingEntitySpecResolver.java | 5 +-
.../resolve/jackson/AsPropertyIfAmbiguous.java | 162 ++++
.../jackson/BeanWithTypePlanTransformer.java | 87 ++
.../core/resolve/jackson/BeanWithTypeUtils.java | 259 ++++++
.../jackson/BrooklynJacksonSerializationUtils.java | 183 ++++
...BrooklynRegisteredTypeJacksonSerialization.java | 254 ++++++
.../JacksonBetterDelegatingDeserializer.java | 139 +++
.../core/resolve/jackson/WrappedValue.java | 132 +++
.../jackson/WrappedValuesSerialization.java | 245 ++++++
.../core/sensor/AbstractAddSensorFeed.java | 4 +-
.../brooklyn/core/sensor/DurationSinceSensor.java | 35 +-
.../brooklyn/core/sensor/MaxConcurrencySensor.java | 19 +-
.../apache/brooklyn/core/sensor/StaticSensor.java | 22 +-
.../core/sensor/function/FunctionSensor.java | 10 +-
.../core/sensor/http/HttpRequestSensor.java | 12 +-
.../core/sensor/password/CreatePasswordSensor.java | 28 +-
.../brooklyn/core/sensor/ssh/SshCommandSensor.java | 49 +-
.../typereg/AbstractCatalogBundleResolver.java | 283 ++++++
.../core/typereg/AbstractTypePlanTransformer.java | 13 +-
.../core/typereg/BasicBrooklynTypeRegistry.java | 112 ++-
.../brooklyn/core/typereg/BasicManagedBundle.java | 24 +-
.../BrooklynBomBundleCatalogBundleResolver.java | 79 ++
.../BrooklynBomYamlCatalogBundleResolver.java | 132 +++
.../typereg/BrooklynCatalogBundleResolver.java | 161 ++++
.../typereg/BrooklynCatalogBundleResolvers.java | 211 +++++
.../core/typereg/BrooklynTypePlanTransformer.java | 23 +-
.../typereg/JavaClassNameTypePlanTransformer.java | 23 +-
.../typereg/ReferencedUnresolvedTypeException.java | 2 +-
.../typereg/RegisteredTypeLoadingContexts.java | 11 +-
.../brooklyn/core/typereg/RegisteredTypes.java | 2 +-
...pePlanException.java => TypePlanException.java} | 13 +-
.../core/typereg/TypePlanTransformers.java | 71 +-
...java => UnsupportedCatalogBundleException.java} | 10 +-
.../core/typereg/UnsupportedTypePlanException.java | 3 +-
.../brooklyn/enricher/stock/Transformer.java | 2 +-
.../stock/YamlTimeWeightedDeltaEnricher.java | 4 +-
.../brooklyn/entity/group/AbstractGroupImpl.java | 10 +-
.../group/SshCommandMembershipTrackingPolicy.java | 2 +-
.../brooklyn/location/ssh/SshMachineLocation.java | 23 +-
.../brooklyn/util/core/ClassLoaderUtils.java | 10 +-
.../apache/brooklyn/util/core/ResourceUtils.java | 12 +
.../brooklyn/util/core/config/ConfigBag.java | 42 +-
.../util/core/config/ResolvingConfigBag.java | 4 +-
.../core/flags/BrooklynTypeNameResolution.java | 281 ++++++
.../brooklyn/util/core/flags/TypeCoercions.java | 74 +-
.../brooklyn/util/core/task/DeferredSupplier.java | 4 +-
.../core/task/InterruptingImmediateSupplier.java | 3 +-
.../org/apache/brooklyn/util/core/task/Tasks.java | 188 ++--
.../brooklyn/util/core/task/ValueResolver.java | 254 +++---
.../ssh/internal/AbstractSshExecTaskFactory.java | 3 +-
.../util/core/task/system/ProcessTaskFactory.java | 3 +-
.../util/core/task/system/ProcessTaskStub.java | 5 +-
.../internal/AbstractProcessTaskFactory.java | 3 +-
.../system/internal/SystemProcessTaskFactory.java | 3 +-
...rooklyn.api.internal.ApiObjectsFactoryInterface | 4 +
...g.apache.brooklyn.api.location.LocationResolver | 4 +
...apache.brooklyn.core.plan.PlanToSpecTransformer | 4 +
...brooklyn.core.resolve.entity.EntitySpecResolver | 4 +
...lyn.core.typereg.BrooklynCatalogBundleResolver} | 7 +-
...ooklyn.core.typereg.BrooklynTypePlanTransformer | 5 +
.../resources/OSGI-INF/blueprint/blueprint.xml | 18 +
.../internal/StaticTypePlanTransformer.java | 12 -
.../core/config/ConfigKeyDeprecationTest.java | 13 +-
.../MapListAndOtherStructuredConfigKeyTest.java | 28 +-
.../core/effector/CompositeEffectorTest.java | 9 +-
.../brooklyn/core/effector/ProxyEffectorTest.java | 6 +-
.../core/effector/SampleManyTasksEffector.java | 14 +-
.../effector/http/HttpCommandEffectorTest.java | 8 +-
.../brooklyn/core/entity/DynamicEntityTest.java | 14 +-
.../brooklyn/core/entity/EntityConfigTest.java | 105 ++-
.../core/entity/EntityInitializersTest.java | 47 +
.../core/entity/OwnedChildrenDeprecatedTest.java | 38 +-
.../brooklyn/core/location/SimulatedLocation.java | 18 +-
...va => BrooklynBomOsgiArchiveInstallerTest.java} | 22 +-
.../core/mgmt/osgi/OsgiStandaloneTest.java | 1 +
.../rebind/RebindHistoricSshCommandSensorTest.java | 14 +-
.../rebind/RebindManagerExceptionHandlerTest.java | 16 +-
.../BrooklynMiscJacksonSerializationTest.java | 50 ++
...klynRegisteredTypeJacksonSerializationTest.java | 95 ++
.../resolve/jackson/LoggingSerializationTest.java | 56 ++
.../core/resolve/jackson/MapperTestFixture.java | 75 ++
.../resolve/jackson/PerverseSerializationTest.java | 147 ++++
.../jackson/WrappedValuesSerializationTest.java | 162 ++++
.../core/test/BrooklynMgmtUnitTestSupport.java | 2 +
.../typereg/ExampleXmlTypePlanTransformer.java | 13 -
.../brooklyn/feed/ssh/SshFeedIntegrationTest.java | 7 +-
.../location/ssh/SshMachineLocationTest.java | 6 +-
.../core/flags/BrooklynTypeNameResolutionTest.java | 55 ++
.../util/core/internal/ssh/RecordingSshTool.java | 8 +-
.../brooklyn/util/core/task/ValueResolverTest.java | 20 +-
karaf/features/pom.xml | 22 +
.../brooklyn/launcher/osgi/OsgiLauncherImpl.java | 196 ++++-
karaf/pom.xml | 3 -
launcher/pom.xml | 12 +-
.../AbstractBrooklynLauncherRebindTest.java | 4 +-
.../BrooklynLauncherRebindCatalogOsgiTest.java | 9 +-
locations/container/pom.xml | 19 +-
.../brooklyn/container/entity/helm/HelmEntity.java | 87 ++
.../container/entity/helm/HelmEntityImpl.java | 361 ++++++++
.../location/kubernetes/KubernetesLocation.java | 104 ++-
.../kubernetes/KubernetesLocationConfig.java | 1 +
...g.apache.brooklyn.api.location.LocationResolver | 4 +
.../container/entity/helm/HelmEntityLiveTest.java | 157 ++++
.../kubernetes/KubernetesLocationYamlLiveTest.java | 76 +-
.../src/test/resources/nginx-2-deployment.yaml} | 27 +-
.../src/test/resources/nginx-2-service.yaml} | 18 +-
locations/jclouds/pom.xml | 10 +
.../jclouds/DefaultConnectivityResolver.java | 16 +-
.../brooklyn/location/jclouds/JcloudsLocation.java | 106 ++-
.../location/jclouds/JcloudsMachineLocation.java | 10 +-
.../jclouds/JcloudsSshMachineLocation.java | 12 +-
.../jclouds/api/JcloudsLocationPublic.java | 2 +-
.../templates/customize/TemplateOptionsOption.java | 2 +-
...g.apache.brooklyn.api.location.LocationResolver | 4 +
...cloudsLocationSuspendResumeMachineLiveTest.java | 46 +-
.../JcloudsTypeCoercionsWithBuilderTest.java | 2 +-
.../resources/brooklyn/logback-logger-excludes.xml | 4 +
parent/pom.xml | 40 +-
.../policy/failover/ElectPrimaryEffector.java | 19 +-
pom.xml | 3 +-
.../apache/brooklyn/rest/api/ApplicationApi.java | 54 +-
.../org/apache/brooklyn/rest/api/BundleApi.java | 62 +-
.../org/apache/brooklyn/rest/api/CatalogApi.java | 109 ++-
.../rest/resources/ApplicationResource.java | 66 +-
.../brooklyn/rest/resources/BundleResource.java | 64 +-
.../brooklyn/rest/resources/CatalogResource.java | 80 +-
.../security/provider/LdapSecurityProvider.java | 7 +-
.../brooklyn/rest/transform/TypeTransformer.java | 46 +-
.../rest/resources/AdjunctResourceTest.java | 12 +-
.../rest/resources/ApplicationResourceTest.java | 17 +-
.../rest/resources/BundleAndTypeResourcesTest.java | 2 +-
.../rest/resources/CatalogResourceTest.java | 14 +-
.../rest/resources/LocationResourceTest.java | 7 +
.../brooklyn/rest/testing/BrooklynRestApiTest.java | 10 +-
server-cli/{LICENSE => DEPENDENCIES} | 911 ++++++++++++++++----
server-cli/LICENSE | 794 +----------------
server-cli/NOTICE | 546 +-----------
server-cli/pom.xml | 7 -
.../java/org/apache/brooklyn/cli/ItemLister.java | 4 +
.../brooklyn/entity/java/JmxAttributeSensor.java | 29 +-
.../SameServerDriverLifecycleEffectorTasks.java | 3 +-
...oftwareProcessDriverLifecycleEffectorTasks.java | 52 +-
.../lifecycle/MachineLifecycleEffectorTasks.java | 239 ++++--
...g.apache.brooklyn.api.location.LocationResolver | 4 +
...brooklyn.core.resolve.entity.EntitySpecResolver | 4 +
.../test/mysql/DynamicToyMySqlEntityBuilder.java | 7 +-
.../core/sensor/windows/WinRmCommandSensor.java | 51 +-
.../windows/WindowsPerformanceCounterSensors.java | 23 +-
.../location/winrm/PlainWinRmExecTaskFactory.java | 72 ++
.../location/winrm/WinRmMachineLocation.java | 72 +-
.../location/winrm/WinRmPutTaskFactory.java | 120 +++
.../brooklyn/location/winrm/WinRmPutTaskStub.java | 68 ++
.../location/winrm/WinRmPutTaskWrapper.java | 185 ++++
.../apache/brooklyn/location/winrm/WinRmTasks.java | 57 ++
.../util/core/internal/winrm/WinRmTool.java | 2 +-
.../core/internal/winrm/winrm4j/Winrm4jTool.java | 35 +-
.../brooklyn/feed/windows/WinRmFeedLiveTest.java | 7 +-
.../META-INF/services/org.testng.ITestNGListener | 24 +-
utils/common/dependencies/osgi/beans/pom.xml | 84 ++
.../org/apache/brooklyn/test/osgi/SampleBean.java | 20 +-
.../osgi/beans/src/main/resources/catalog.bom | 14 +-
.../java/org/apache/brooklyn/test/Asserts.java | 9 +-
.../brooklyn/util/collections/MutableList.java | 56 +-
.../brooklyn/util/collections/MutableSet.java | 12 +-
.../java/org/apache/brooklyn/util/guava/Maybe.java | 203 ++++-
.../org/apache/brooklyn/util/guava/TypeTokens.java | 15 +-
.../apache/brooklyn/util/javalang/Reflections.java | 3 +-
.../javalang/coerce/TypeCoercerExtensible.java | 15 +-
.../main/java/org/apache/brooklyn/util/os/Os.java | 17 +
.../apache/brooklyn/util/osgi/OsgiActivator.java | 11 +
.../apache/brooklyn/util/osgi/VersionedName.java | 2 +-
.../brooklyn/util/stream/InputStreamSource.java | 109 +++
.../org/apache/brooklyn/util/text/Strings.java | 32 +-
.../apache/brooklyn/util/text/WildcardGlobs.java | 6 +-
.../org/apache/brooklyn/util/time/Duration.java | 2 +
.../java/org/apache/brooklyn/util/time/Time.java | 121 +--
.../apache/brooklyn/util/guava/TypeTokensTest.java | 36 +-
.../brooklyn/util/osgi/OsgiTestResources.java | 6 +-
.../org/apache/brooklyn/util/time/TimeTest.java | 7 +-
.../brooklyn/osgi/brooklyn-osgi-test-a_0.1.0.txt | 2 +-
.../brooklyn/osgi/brooklyn-test-osgi-beans.jar | Bin 0 -> 11696 bytes
...st-a_0.1.0.txt => brooklyn-test-osgi-beans.txt} | 8 +-
.../brooklyn/osgi/brooklyn-test-osgi-entities.txt | 4 +-
.../brooklyn-test-osgi-more-entities_0.1.0.txt | 4 +-
.../brooklyn-test-osgi-more-entities_0.2.0.txt | 4 +-
...lyn-test-osgi-more-entities_evil-twin_0.2.0.txt | 4 +-
.../brooklyn/rt/felix/EmbeddedFelixFramework.java | 23 +-
.../org.apache.brooklyn.util.osgi.SystemFramework | 4 +
.../src/main/resources/logback-test.xml | 3 +
300 files changed, 13116 insertions(+), 5622 deletions(-)
diff --cc
core/src/main/java/org/apache/brooklyn/core/sensor/http/HttpRequestSensor.java
index fc21fab,08e8bf7..2c1c4ea
---
a/core/src/main/java/org/apache/brooklyn/core/sensor/http/HttpRequestSensor.java
+++
b/core/src/main/java/org/apache/brooklyn/core/sensor/http/HttpRequestSensor.java
@@@ -48,11 -44,9 +49,11 @@@ import com.google.common.base.Function
import com.google.common.base.Functions;
import com.google.common.base.Supplier;
+import net.minidev.json.JSONObject;
+
/**
* Configurable {@link org.apache.brooklyn.api.entity.EntityInitializer}
which adds an HTTP sensor feed to retrieve the
- * {@link JSONObject} from a JSON response in order to populate the sensor
with the data at the {@code jsonPath}.
+ * {@link net.minidev.json.JSONObject} from a JSON response in order to
populate the sensor with the data at the {@code jsonPath}.
*
* @see SshCommandSensor
*/
