deprecation is since 0.13.0 now (12 is out)
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/8e693305 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/8e693305 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/8e693305 Branch: refs/heads/master Commit: 8e693305d50a82ffa4567e900ed2686187ccf7fb Parents: 05ad45e Author: Alex Heneveld <[email protected]> Authored: Fri Sep 22 13:19:11 2017 +0100 Committer: Alex Heneveld <[email protected]> Committed: Fri Sep 22 13:28:43 2017 +0100 ---------------------------------------------------------------------- .../brooklyn/api/catalog/BrooklynCatalog.java | 4 +++ .../mgmt/ha/OsgiBundleInstallationResult.java | 4 +-- .../brooklyn/core/typereg/RegisteredTypes.java | 2 +- .../apache/brooklyn/rest/api/CatalogApi.java | 34 ++++++++++---------- 4 files changed, 24 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/8e693305/api/src/main/java/org/apache/brooklyn/api/catalog/BrooklynCatalog.java ---------------------------------------------------------------------- diff --git a/api/src/main/java/org/apache/brooklyn/api/catalog/BrooklynCatalog.java b/api/src/main/java/org/apache/brooklyn/api/catalog/BrooklynCatalog.java index fa1d55e..e03adbf 100644 --- a/api/src/main/java/org/apache/brooklyn/api/catalog/BrooklynCatalog.java +++ b/api/src/main/java/org/apache/brooklyn/api/catalog/BrooklynCatalog.java @@ -53,6 +53,7 @@ public interface BrooklynCatalog { /** As {@link #getCatalogItem(String, String)} but only looking in legacy catalog * @deprecated since 0.12.0 only provided to allow TypeRegistry to see the legacy items */ + @Deprecated CatalogItem<?,?> getCatalogItemLegacy(String symbolicName, String version); /** @return Deletes the item with the given {@link CatalogItem#getSymbolicName() @@ -70,6 +71,7 @@ public interface BrooklynCatalog { /** 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> CatalogItem<T,SpecT> getCatalogItemLegacy(Class<T> type, String symbolicName, String version); /** @return All items in the catalog @@ -84,10 +86,12 @@ public interface BrooklynCatalog { /** 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 */ + @Deprecated <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 */ http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/8e693305/core/src/main/java/org/apache/brooklyn/core/mgmt/ha/OsgiBundleInstallationResult.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/mgmt/ha/OsgiBundleInstallationResult.java b/core/src/main/java/org/apache/brooklyn/core/mgmt/ha/OsgiBundleInstallationResult.java index d65f105..05221a6 100644 --- a/core/src/main/java/org/apache/brooklyn/core/mgmt/ha/OsgiBundleInstallationResult.java +++ b/core/src/main/java/org/apache/brooklyn/core/mgmt/ha/OsgiBundleInstallationResult.java @@ -61,7 +61,7 @@ public class OsgiBundleInstallationResult { public boolean isError() { return isError; } } final List<RegisteredType> typesInstalled = MutableList.of(); - /** @deprecated since 0.12.0 use {@link #typesInstalled} */ + /** @deprecated since 0.13.0 use {@link #typesInstalled} */ @Deprecated private final List<String> catalogItemsInstalled = MutableList.of(); @@ -80,7 +80,7 @@ public class OsgiBundleInstallationResult { public List<RegisteredType> getTypesInstalled() { return typesInstalled; } - /** @deprecated since 0.12.0 use {@link #getTypesInstalled()} */ + /** @deprecated since 0.13.0 use {@link #getTypesInstalled()} */ @Deprecated public List<String> getCatalogItemsInstalled() { return ImmutableList.copyOf(catalogItemsInstalled); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/8e693305/core/src/main/java/org/apache/brooklyn/core/typereg/RegisteredTypes.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/typereg/RegisteredTypes.java b/core/src/main/java/org/apache/brooklyn/core/typereg/RegisteredTypes.java index 9e6d610..49ea861 100644 --- a/core/src/main/java/org/apache/brooklyn/core/typereg/RegisteredTypes.java +++ b/core/src/main/java/org/apache/brooklyn/core/typereg/RegisteredTypes.java @@ -446,7 +446,7 @@ public class RegisteredTypes { /** * Queries recursively the given types (either {@link Class} or {@link RegisteredType}) * to see whether any java superclasses satisfy the given {@link Predicate} on the {@link Class} - * @deprecated since 0.12.0 use {@link #isAnyTypeOrSuper(Set, Predicate)} accepting any object in the predicate, + * @deprecated since 0.13.0 use {@link #isAnyTypeOrSuper(Set, Predicate)} accepting any object in the predicate, * typically allowing string equivalence although it is valid to restrict to {@link Class} comparison * (might be stricter in some OSGi cases) */ @Deprecated http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/8e693305/rest/rest-api/src/main/java/org/apache/brooklyn/rest/api/CatalogApi.java ---------------------------------------------------------------------- diff --git a/rest/rest-api/src/main/java/org/apache/brooklyn/rest/api/CatalogApi.java b/rest/rest-api/src/main/java/org/apache/brooklyn/rest/api/CatalogApi.java index cb4298f..6499f14 100644 --- a/rest/rest-api/src/main/java/org/apache/brooklyn/rest/api/CatalogApi.java +++ b/rest/rest-api/src/main/java/org/apache/brooklyn/rest/api/CatalogApi.java @@ -153,7 +153,7 @@ public interface CatalogApi { @QueryParam("forceUpdate") @DefaultValue("false") boolean forceUpdate); - /** @deprecated since 0.12.0 delete the bundle via DELETE /catalog/bundles/xxx */ + /** @deprecated since 0.13.0 delete the bundle via DELETE /catalog/bundles/xxx */ // but we will probably keep this around for a while as many places use it @Deprecated @DELETE @@ -173,7 +173,7 @@ public interface CatalogApi { @ApiParam(name = "version", value = "The version identifier of the application or template to delete", required = true) @PathParam("version") String version) throws Exception; - /** @deprecated since 0.12.0 delete the bundle via DELETE /catalog/bundles/xxx */ + /** @deprecated since 0.13.0 delete the bundle via DELETE /catalog/bundles/xxx */ // but we will probably keep this around for a while as many places use it @Deprecated @DELETE @@ -193,7 +193,7 @@ public interface CatalogApi { @ApiParam(name = "version", value = "The version identifier of the entity or template to delete", required = true) @PathParam("version") String version) throws Exception; - /** @deprecated since 0.12.0 delete the bundle via DELETE /catalog/bundles/xxx */ + /** @deprecated since 0.13.0 delete the bundle via DELETE /catalog/bundles/xxx */ // but we will probably keep this around for a while as many places use it @Deprecated @DELETE @@ -212,7 +212,7 @@ public interface CatalogApi { @ApiParam(name = "version", value = "The version identifier of the policy to delete", required = true) @PathParam("version") String version) throws Exception; - /** @deprecated since 0.12.0 delete the bundle via DELETE /catalog/bundles/xxx */ + /** @deprecated since 0.13.0 delete the bundle via DELETE /catalog/bundles/xxx */ // but we will probably keep this around for a while as many places use it @Deprecated @DELETE @@ -232,7 +232,7 @@ public interface CatalogApi { @ApiParam(name = "version", value = "The version identifier of the location to delete", required = true) @PathParam("version") String version) throws Exception; - /** @deprecated since 0.12.0 use /catalog/bundles and /catalog/types?supertype=... */ + /** @deprecated since 0.13.0 use /catalog/bundles and /catalog/types?supertype=... */ // but we will probably keep this around for a while as many places use it @Deprecated @GET @@ -249,7 +249,7 @@ public interface CatalogApi { @QueryParam("allVersions") @DefaultValue("false") boolean includeAllVersions); // bad name - it is just templates - /** @deprecated since 0.12.0 use /catalog/bundles and /catalog/types?supertype=... */ + /** @deprecated since 0.13.0 use /catalog/bundles and /catalog/types?supertype=... */ // but we will probably keep this around for a while as many places use it @Deprecated @GET @@ -265,7 +265,7 @@ public interface CatalogApi { @ApiParam(name = "allVersions", value = "Include all versions (defaults false, only returning the best version)") @QueryParam("allVersions") @DefaultValue("false") boolean includeAllVersions); - /** @deprecated since 0.12.0 use /catalog/bundles and /catalog/types?supertype=... */ + /** @deprecated since 0.13.0 use /catalog/bundles and /catalog/types?supertype=... */ // but we will probably keep this around for a while as many places use it @Deprecated @GET @@ -286,7 +286,7 @@ public interface CatalogApi { @ApiParam(name = "version", value = "The version identifier of the entity or template to retrieve", required = true) @PathParam("version") String version) throws Exception; - /** @deprecated since 0.12.0 use /catalog/bundles and /catalog/types?supertype=... */ + /** @deprecated since 0.13.0 use /catalog/bundles and /catalog/types?supertype=... */ // but we will probably keep this around for a while as many places use it @Deprecated @GET @@ -307,7 +307,7 @@ public interface CatalogApi { @ApiParam(name = "version", value = "The version identifier of the application to retrieve", required = true) @PathParam("version") String version) throws Exception; - /** @deprecated since 0.12.0 use /catalog/bundles and /catalog/types?supertype=... */ + /** @deprecated since 0.13.0 use /catalog/bundles and /catalog/types?supertype=... */ // but we will probably keep this around for a while as many places use it @Deprecated @GET @@ -323,7 +323,7 @@ public interface CatalogApi { @ApiParam(name = "allVersions", value = "Include all versions (defaults false, only returning the best version)") @QueryParam("allVersions") @DefaultValue("false") boolean includeAllVersions); - /** @deprecated since 0.12.0 use /catalog/bundles and /catalog/types?supertype=... */ + /** @deprecated since 0.13.0 use /catalog/bundles and /catalog/types?supertype=... */ // but we will probably keep this around for a while as many places use it @Deprecated @GET @@ -343,7 +343,7 @@ public interface CatalogApi { @ApiParam(name = "version", value = "The version identifier of the application to retrieve", required = true) @PathParam("version") String version) throws Exception; - /** @deprecated since 0.12.0 use /catalog/bundles and /catalog/types?supertype=... */ + /** @deprecated since 0.13.0 use /catalog/bundles and /catalog/types?supertype=... */ // but we will probably keep this around for a while as many places use it @Deprecated @GET @@ -359,7 +359,7 @@ public interface CatalogApi { @ApiParam(name = "allVersions", value = "Include all versions (defaults false, only returning the best version)") @QueryParam("allVersions") @DefaultValue("false") boolean includeAllVersions); - /** @deprecated since 0.12.0 use /catalog/bundles and /catalog/types?supertype=... */ + /** @deprecated since 0.13.0 use /catalog/bundles and /catalog/types?supertype=... */ // but we will probably keep this around for a while as many places use it @Deprecated @GET @@ -397,7 +397,7 @@ public interface CatalogApi { @ApiParam(name = "version", value = "version identifier of catalog item (application, entity, policy, location)", required=true) @PathParam("version") String version); - /** @deprecated since 0.12.0 use /catalog/bundles and /catalog/types?supertype=...; + /** @deprecated since 0.13.0 use /catalog/bundles and /catalog/types?supertype=...; * deprecation/disabling needs to be done in the bundle, and we might support deprecating/disabling bundles */ // but we will probably keep this around for a while as many places use it @Deprecated @@ -413,7 +413,7 @@ public interface CatalogApi { @ApiParam(name = "deprecated", value = "Whether or not the catalog item is deprecated", required = true) boolean deprecated); - /** @deprecated since 0.12.0 use /catalog/bundles and /catalog/types?supertype=...; + /** @deprecated since 0.13.0 use /catalog/bundles and /catalog/types?supertype=...; * deprecation/disabling needs to be done in the bundle, and we might support deprecating/disabling bundles */ // but we will probably keep this around for a while as many places use it @Deprecated @@ -429,7 +429,7 @@ public interface CatalogApi { @ApiParam(name = "disabled", value = "Whether or not the catalog item is disabled", required = true) boolean disabled); - /** @deprecated since 0.12.0 use /catalog/bundles and /catalog/types?supertype=... */ + /** @deprecated since 0.13.0 use /catalog/bundles and /catalog/types?supertype=... */ // but we will probably keep this around for a while as many places use it @Deprecated @GET @@ -445,7 +445,7 @@ public interface CatalogApi { @ApiParam(name = "allVersions", value = "Include all versions (defaults false, only returning the best version)") @QueryParam("allVersions") @DefaultValue("false") boolean includeAllVersions); - /** @deprecated since 0.12.0 use /catalog/bundles and /catalog/types?supertype=... */ + /** @deprecated since 0.13.0 use /catalog/bundles and /catalog/types?supertype=... */ // but we will probably keep this around for a while as many places use it @Deprecated @GET @@ -462,7 +462,7 @@ public interface CatalogApi { @ApiParam(name = "version", value = "The version identifier of the enricher to retrieve", required = true) @PathParam("version") String version) throws Exception; - /** @deprecated since 0.12.0 delete the bundle via DELETE /catalog/bundles/xxx */ + /** @deprecated since 0.13.0 delete the bundle via DELETE /catalog/bundles/xxx */ // but we will probably keep this around for a while as many places use it @Deprecated @DELETE
