Merge branch 'master' into bundle-rest-api BrooklynCatalog api tidy minor conflict
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/1cd6bf45 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/1cd6bf45 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/1cd6bf45 Branch: refs/heads/master Commit: 1cd6bf455d4cd0004a98881cc2d9a045bf2ffd1e Parents: 9b33703 4795aac Author: Alex Heneveld <[email protected]> Authored: Wed Sep 13 12:53:30 2017 +0100 Committer: Alex Heneveld <[email protected]> Committed: Wed Sep 13 12:53:30 2017 +0100 ---------------------------------------------------------------------- .../brooklyn/api/catalog/BrooklynCatalog.java | 37 ++- .../api/mgmt/rebind/mementos/PolicyMemento.java | 3 + .../apache/brooklyn/api/objs/EntityAdjunct.java | 3 + .../brooklyn/api/objs/HighlightTuple.java | 81 ++++++ .../apache/brooklyn/core/BrooklynVersion.java | 38 ++- .../catalog/internal/BasicBrooklynCatalog.java | 70 ++++- .../core/catalog/internal/CatalogUtils.java | 2 +- .../internal/AbstractManagementContext.java | 2 +- .../persist/FileBasedStoreObjectAccessor.java | 33 ++- .../core/mgmt/rebind/RebindIteration.java | 1 + .../mgmt/rebind/dto/BasicPolicyMemento.java | 17 +- .../mgmt/rebind/dto/MementosGenerators.java | 4 +- .../core/objs/AbstractEntityAdjunct.java | 30 +++ .../core/typereg/BasicBrooklynTypeRegistry.java | 16 +- .../brooklyn/core/typereg/RegisteredTypes.java | 9 +- .../core/policy/basic/BasicPolicyTest.java | 18 ++ karaf/features/src/main/feature/feature.xml | 1 + .../brooklyn/launcher/osgi/OsgiLauncher.java | 259 ++++--------------- .../launcher/osgi/OsgiLauncherImpl.java | 225 ++++++++++++++++ .../resources/OSGI-INF/blueprint/blueprint.xml | 12 +- karaf/pom.xml | 1 + karaf/start/pom.xml | 75 ++++++ .../osgi/start/OsgiLauncherCompleter.java | 42 +++ .../resources/OSGI-INF/blueprint/blueprint.xml | 36 +++ .../brooklyn/launcher/common/BasicLauncher.java | 35 ++- .../location/jclouds/JcloudsLocation.java | 13 +- .../jclouds/JcloudsWinRmMachineLocation.java | 5 +- .../jclouds/StubbedComputeServiceRegistry.java | 26 +- .../autoscaling/AutoScalerPolicyRebindTest.java | 34 +++ .../brooklyn/rest/domain/PolicySummary.java | 15 +- .../rest/transform/PolicyTransformer.java | 7 +- .../rest/resources/PolicyResourceTest.java | 24 +- .../testing/mocks/RestMockSimplePolicy.java | 3 + 33 files changed, 914 insertions(+), 263 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/1cd6bf45/api/src/main/java/org/apache/brooklyn/api/catalog/BrooklynCatalog.java ---------------------------------------------------------------------- diff --cc api/src/main/java/org/apache/brooklyn/api/catalog/BrooklynCatalog.java index 9e19a81,9c7ed66..fa1d55e --- a/api/src/main/java/org/apache/brooklyn/api/catalog/BrooklynCatalog.java +++ b/api/src/main/java/org/apache/brooklyn/api/catalog/BrooklynCatalog.java @@@ -54,15 -63,34 +63,33 @@@ public interface BrooklynCatalog void deleteCatalogItem(String symbolicName, String version); /** variant of {@link #getCatalogItem(String, String)} which checks (and casts) type for convenience - * (returns null if type does not match) */ + * (returns null if type does not match) + * @deprecated since 0.12.0 use {@link BrooklynTypeRegistry} instead */ + @Deprecated <T,SpecT> CatalogItem<T,SpecT> getCatalogItem(Class<T> type, String symbolicName, String version); + + /** As non-legacy method but only looking in legacy catalog + * @deprecated since 0.12.0 only provided to allow TypeRegistry to see the legacy items */ + <T,SpecT> CatalogItem<T,SpecT> getCatalogItemLegacy(Class<T> type, String symbolicName, String version); - /** @return All items in the catalog */ + /** @return All items in the catalog + * @deprecated since 0.12.0 use {@link BrooklynTypeRegistry} instead */ + @Deprecated <T,SpecT> Iterable<CatalogItem<T,SpecT>> getCatalogItems(); - /** convenience for filtering items in the catalog; see CatalogPredicates for useful filters */ + /** As non-legacy method but only looking in legacy catalog + * @deprecated since 0.12.0 only provided to allow TypeRegistry to see the legacy items */ + @Deprecated + <T,SpecT> Iterable<CatalogItem<T,SpecT>> getCatalogItemsLegacy(); + + /** convenience for filtering items in the catalog; see CatalogPredicates for useful filters + * @deprecated since 0.12.0 use {@link BrooklynTypeRegistry} instead */ - @Deprecated <T,SpecT> Iterable<CatalogItem<T,SpecT>> getCatalogItems(Predicate<? super CatalogItem<T,SpecT>> filter); + /** As non-legacy method but only looking in legacy catalog + * @deprecated since 0.12.0 only provided to allow TypeRegistry to see the legacy items */ + <T,SpecT> Iterable<CatalogItem<T,SpecT>> getCatalogItemsLegacy(Predicate<? super CatalogItem<T,SpecT>> filter); + /** persists the catalog item to the object store, if persistence is enabled */ public void persist(CatalogItem<?, ?> catalogItem); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/1cd6bf45/core/src/main/java/org/apache/brooklyn/core/catalog/internal/BasicBrooklynCatalog.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/1cd6bf45/core/src/main/java/org/apache/brooklyn/core/typereg/RegisteredTypes.java ----------------------------------------------------------------------
