Merge branch 'tasks-better-tree' into adjunct-activities-rest-api Conflict - tweaks to AdjunctResource, easily resolved
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/b0429892 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/b0429892 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/b0429892 Branch: refs/heads/master Commit: b042989213591a295dd6664e98118d36b3b03d74 Parents: d1ab00c 0c2e1f6 Author: Alex Heneveld <[email protected]> Authored: Wed Oct 4 03:08:49 2017 +0100 Committer: Alex Heneveld <[email protected]> Committed: Wed Oct 4 03:08:49 2017 +0100 ---------------------------------------------------------------------- .../org/apache/brooklyn/api/entity/Entity.java | 3 + .../brooklyn/api/mgmt/ExecutionContext.java | 8 +- .../brooklyn/api/mgmt/rebind/RebindManager.java | 14 +- ...loudsCustomizerInstantiationYamlDslTest.java | 156 +++++-- .../catalog/SpecParameterUnwrappingTest.java | 2 +- .../brooklyn/core/catalog/CatalogLoadMode.java | 73 ---- .../catalog/internal/BasicBrooklynCatalog.java | 28 +- .../catalog/internal/CatalogInitialization.java | 278 ++++++++----- .../core/catalog/internal/CatalogUtils.java | 31 +- .../brooklyn/core/entity/AbstractEntity.java | 29 +- .../core/entity/BrooklynConfigKeys.java | 2 +- .../brooklyn/core/entity/EntityAdjuncts.java | 28 +- .../brooklyn/core/entity/EntityInternal.java | 14 +- .../apache/brooklyn/core/feed/AbstractFeed.java | 2 +- .../mgmt/ha/HighAvailabilityManagerImpl.java | 45 +- .../core/mgmt/ha/OsgiArchiveInstaller.java | 210 +++++++--- .../brooklyn/core/mgmt/ha/OsgiManager.java | 36 +- .../internal/AbstractManagementContext.java | 5 +- .../core/mgmt/internal/LocalUsageManager.java | 31 +- .../ManagementNodeStateListenerManager.java | 175 ++++++++ .../NonDeploymentManagementContext.java | 19 - .../rebind/ImmediateDeltaChangeListener.java | 160 -------- .../core/mgmt/rebind/RebindIteration.java | 213 ++++------ .../core/mgmt/rebind/RebindManagerImpl.java | 30 -- .../mgmt/rebind/dto/BasicEntityMemento.java | 2 +- .../mgmt/rebind/dto/MementosGenerators.java | 5 +- .../mgmt/usage/ManagementNodeStateListener.java | 53 +++ .../core/objs/BasicConfigurableObject.java | 4 +- .../apache/brooklyn/core/policy/Policies.java | 86 +--- .../core/server/BrooklynServerConfig.java | 28 +- .../FixedListMachineProvisioningLocation.java | 3 +- .../brooklyn/util/core/ClassLoaderUtils.java | 7 +- .../brooklyn/util/core/flags/TypeCoercions.java | 21 + .../brooklyn/util/core/osgi/BundleMaker.java | 38 +- .../util/core/task/BasicExecutionContext.java | 30 +- .../util/core/task/BasicExecutionManager.java | 11 +- .../brooklyn/util/core/task/BasicTask.java | 26 +- .../brooklyn/util/core/task/ForwardingTask.java | 4 +- .../brooklyn/util/core/task/TaskInternal.java | 10 +- .../task/TaskInternalCancellableWithMode.java | 32 ++ .../brooklyn/util/core/task/ValueResolver.java | 8 +- .../core/effector/EffectorSayHiTest.java | 5 +- .../core/entity/EntityConcurrencyTest.java | 2 +- .../ha/HighAvailabilityManagerInMemoryTest.java | 5 - .../ha/HighAvailabilityManagerTestFixture.java | 61 ++- .../mgmt/rebind/RebindCatalogEntityTest.java | 2 +- .../core/mgmt/rebind/RebindCatalogItemTest.java | 2 - .../core/mgmt/rebind/RebindFailuresTest.java | 18 +- .../core/mgmt/rebind/RebindFeedWithHaTest.java | 2 +- .../usage/ManagementNodeStateListenerTest.java | 160 ++++++++ .../util/core/ClassLoaderUtilsTest.java | 6 +- .../util/core/internal/TypeCoercionsTest.java | 31 ++ .../core/internal/ssh/RecordingSshTool.java | 7 + .../util/core/osgi/BundleMakerTest.java | 8 +- .../util/core/task/BasicTasksFutureTest.java | 23 +- .../core/task/NonBasicTaskExecutionTest.java | 8 +- .../bundlemaker/withmanifest/myemptyfile.txt | 0 .../launcher/osgi/OsgiLauncherImpl.java | 2 +- .../init/src/main/resources/catalog-classes.bom | 364 ---------------- karaf/init/src/main/resources/catalog.bom | 25 ++ .../BrooklynLauncherRebindCatalogTest.java | 2 +- .../brooklyn/launcher/BrooklynLauncherTest.java | 2 +- .../launcher/CleanOrphanedAdjunctsTest.java | 6 +- .../CleanOrphanedLocationsIntegrationTest.java | 2 +- .../jclouds/LocationCustomizerDelegate.java | 8 +- ...ailabilityManagerJcloudsObjectStoreTest.java | 7 +- .../apache/brooklyn/rest/api/AdjunctApi.java | 16 +- .../apache/brooklyn/rest/api/CatalogApi.java | 34 +- .../org/apache/brooklyn/rest/api/PolicyApi.java | 16 +- .../brooklyn/rest/api/PolicyConfigApi.java | 10 +- .../brooklyn/rest/domain/AdjunctSummary.java | 2 - .../brooklyn/rest/domain/ApplicationSpec.java | 12 +- .../rest/domain/CatalogEnricherSummary.java | 4 +- .../rest/domain/CatalogEntitySummary.java | 4 +- .../rest/domain/CatalogItemSummary.java | 4 +- .../rest/domain/CatalogLocationSummary.java | 4 +- .../rest/domain/CatalogPolicySummary.java | 4 +- .../brooklyn/rest/domain/EffectorSummary.java | 9 +- .../brooklyn/rest/domain/EntityDetail.java | 14 +- .../brooklyn/rest/domain/EntitySummary.java | 11 +- .../rest/domain/PolicyConfigSummary.java | 2 +- .../brooklyn/rest/domain/PolicySummary.java | 2 +- .../rest/domain/ScriptExecutionSummary.java | 11 +- .../brooklyn/rest/domain/SensorSummary.java | 7 +- .../rest/resources/AdjunctResource.java | 55 +-- .../brooklyn/rest/resources/PolicyResource.java | 1 - .../rest/transform/AdjunctTransformer.java | 4 +- .../rest/transform/CatalogTransformer.java | 2 +- .../rest/transform/ConfigTransformer.java | 2 + .../rest/transform/PolicyTransformer.java | 2 +- .../rest/util/BrooklynRestResourceUtils.java | 13 +- .../rest/resources/AdjunctResourceTest.java | 198 +++++++++ .../rest/testing/BrooklynRestResourceTest.java | 2 +- .../main/java/org/apache/brooklyn/cli/Main.java | 21 +- .../java/org/apache/brooklyn/cli/CliTest.java | 32 +- .../brooklyn/entity/chef/ChefAttributeFeed.java | 411 ------------------- .../entity/chef/ChefAttributePollConfig.java | 61 --- .../brooklyn/entity/chef/ChefBashCommands.java | 42 -- .../apache/brooklyn/entity/chef/ChefConfig.java | 94 ----- .../brooklyn/entity/chef/ChefConfigs.java | 102 ----- .../apache/brooklyn/entity/chef/ChefEntity.java | 26 -- .../brooklyn/entity/chef/ChefEntityImpl.java | 39 -- .../entity/chef/ChefLifecycleEffectorTasks.java | 364 ---------------- .../brooklyn/entity/chef/ChefServerTasks.java | 97 ----- .../brooklyn/entity/chef/ChefSoloDriver.java | 85 ---- .../brooklyn/entity/chef/ChefSoloTasks.java | 70 ---- .../apache/brooklyn/entity/chef/ChefTasks.java | 154 ------- .../entity/chef/KnifeConvergeTaskFactory.java | 249 ----------- .../brooklyn/entity/chef/KnifeTaskFactory.java | 241 ----------- .../entity/resolve/ChefEntitySpecResolver.java | 42 -- ...oklyn.core.resolve.entity.EntitySpecResolver | 1 - .../resources/OSGI-INF/blueprint/blueprint.xml | 5 - software/base/src/main/resources/catalog.bom | 88 ---- .../brooklyn/entity/chef/ChefConfigsTest.java | 40 -- .../entity/chef/ChefLiveTestSupport.java | 99 ----- .../chef/ChefServerTasksIntegrationTest.java | 109 ----- .../AbstractChefToyMySqlEntityLiveTest.java | 41 -- .../ChefSoloDriverMySqlEntityLiveTest.java | 49 --- .../mysql/ChefSoloDriverToyMySqlEntity.java | 89 ---- ...micChefAutodetectToyMySqlEntityLiveTest.java | 43 -- ...DynamicChefServerToyMySqlEntityLiveTest.java | 50 --- .../DynamicChefSoloToyMySqlEntityLiveTest.java | 43 -- .../chef/mysql/DynamicToyMySqlEntityChef.java | 81 ---- .../chef/mysql/TypedToyMySqlEntityChef.java | 55 --- .../org/apache/brooklyn/util/guava/Maybe.java | 2 +- .../apache/brooklyn/util/repeat/Repeater.java | 7 +- .../apache/brooklyn/util/stream/Streams.java | 39 +- .../brooklyn/util/stream/StreamsTest.java | 17 + 128 files changed, 1850 insertions(+), 4301 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/b0429892/rest/rest-api/src/main/java/org/apache/brooklyn/rest/api/AdjunctApi.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/b0429892/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/resources/AdjunctResource.java ---------------------------------------------------------------------- diff --cc rest/rest-resources/src/main/java/org/apache/brooklyn/rest/resources/AdjunctResource.java index ec9444b,1111193..dae7bb8 --- a/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/resources/AdjunctResource.java +++ b/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/resources/AdjunctResource.java @@@ -53,10 -51,7 +53,9 @@@ import org.apache.brooklyn.rest.filter. import org.apache.brooklyn.rest.transform.AdjunctTransformer; import org.apache.brooklyn.rest.transform.ConfigTransformer; import org.apache.brooklyn.rest.transform.EntityTransformer; +import org.apache.brooklyn.rest.transform.TaskTransformer; - import org.apache.brooklyn.rest.util.BrooklynRestResourceUtils; import org.apache.brooklyn.rest.util.WebResourceUtils; +import org.apache.brooklyn.util.collections.MutableList; import org.apache.brooklyn.util.core.ClassLoaderUtils; import org.apache.brooklyn.util.core.flags.TypeCoercions; import org.apache.brooklyn.util.exceptions.Exceptions; @@@ -261,16 -270,4 +274,12 @@@ public class AdjunctResource extends Ab return Response.status(Response.Status.OK).build(); } - public static String getStringValueForDisplay(BrooklynRestResourceUtils utils, EntityAdjunct policy, Object value) { - return utils.getStringValueForDisplay(value); - } - + @Override + public List<TaskSummary> listTasks(String applicationId, String entityId, String adjunctToken, int limit, Boolean recurse) { + Entity entity = brooklyn().getEntity(applicationId, entityId); + EntityAdjunct adjunct = brooklyn().getAdjunct(entity, adjunctToken); + return TaskTransformer.fromTasks(MutableList.copyOf(BrooklynTaskTags.getTasksInAdjunctContext(mgmt().getExecutionManager(), adjunct)), + limit, recurse, entity, ui); + } + }
