You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by tb...@apache.org on 2017/10/11 11:42:52 UTC
[1/2] brooklyn-server git commit: Deprecate `@Catalog` annotation
Repository: brooklyn-server
Updated Branches:
refs/heads/master 7c317388f -> 84e9e1986
Deprecate `@Catalog` annotation
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/8f73a9ce
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/8f73a9ce
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/8f73a9ce
Branch: refs/heads/master
Commit: 8f73a9cee27630b0eb24b84a7b003d45f6f7d74e
Parents: baf8070
Author: Aled Sage <al...@gmail.com>
Authored: Mon Sep 18 11:38:15 2017 +0100
Committer: Aled Sage <al...@gmail.com>
Committed: Mon Oct 9 10:08:12 2017 +0100
----------------------------------------------------------------------
.../org/apache/brooklyn/api/catalog/Catalog.java | 3 +++
.../catalog/internal/BasicBrooklynCatalog.java | 18 ++++++++++++++++++
.../core/catalog/internal/CatalogClasspathDo.java | 10 ++++++++--
3 files changed, 29 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/8f73a9ce/api/src/main/java/org/apache/brooklyn/api/catalog/Catalog.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/brooklyn/api/catalog/Catalog.java b/api/src/main/java/org/apache/brooklyn/api/catalog/Catalog.java
index 1c6b680..094cafc 100644
--- a/api/src/main/java/org/apache/brooklyn/api/catalog/Catalog.java
+++ b/api/src/main/java/org/apache/brooklyn/api/catalog/Catalog.java
@@ -30,7 +30,10 @@ import java.lang.annotation.Target;
* the "id" field used in the catalog is not exposed here but is always taken as the Class.getName() of the annotated item
* if loaded from an annotation. (the "type" field unsurprisingly is given the same value).
* {@link #name()}, if not supplied, is the SimpleName of the class.
+ *
+ * @deprecated since 1.0.0; instead use a {@code catalog.bom} file
*/
+@Deprecated
@Retention(value = RetentionPolicy.RUNTIME)
@Target(value = { ElementType.TYPE })
public @interface Catalog {
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/8f73a9ce/core/src/main/java/org/apache/brooklyn/core/catalog/internal/BasicBrooklynCatalog.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/catalog/internal/BasicBrooklynCatalog.java b/core/src/main/java/org/apache/brooklyn/core/catalog/internal/BasicBrooklynCatalog.java
index a9c6669..4126d5d 100644
--- a/core/src/main/java/org/apache/brooklyn/core/catalog/internal/BasicBrooklynCatalog.java
+++ b/core/src/main/java/org/apache/brooklyn/core/catalog/internal/BasicBrooklynCatalog.java
@@ -671,6 +671,8 @@ public class BasicBrooklynCatalog implements BrooklynCatalog {
if (scanJavaAnnotations==null || !scanJavaAnnotations) {
// don't scan
} else {
+ log.warn("Deprecated use of scanJavaAnnotations" + (containingBundle != null ? " in bundle " + containingBundle.getVersionedName() : ""));
+
if (isNoBundleOrSimpleWrappingBundle(mgmt, containingBundle)) {
Collection<CatalogItemDtoAbstract<?, ?>> scanResult;
// BOMs wrapped in JARs, or without JARs, have special treatment
@@ -1076,11 +1078,19 @@ public class BasicBrooklynCatalog implements BrooklynCatalog {
return oldValue;
}
+ /**
+ * @deprecated since 1.0.0; Catalog annotation is deprecated.
+ */
+ @Deprecated
private Collection<CatalogItemDtoAbstract<?, ?>> scanAnnotationsFromLocalNonBundleClasspath(ManagementContext mgmt, Map<?, ?> catalogMetadata, ManagedBundle containingBundle) {
CatalogDto dto = CatalogDto.newNamedInstance("Local Scanned Catalog", "All annotated Brooklyn entities detected in the classpath", "scanning-local-classpath");
return scanAnnotationsInternal(mgmt, new CatalogDo(dto), catalogMetadata, containingBundle);
}
+ /**
+ * @deprecated since 1.0.0; Catalog annotation is deprecated.
+ */
+ @Deprecated
private Collection<CatalogItemDtoAbstract<?, ?>> scanAnnotationsLegacyInListOfLibraries(ManagementContext mgmt, Collection<? extends OsgiBundleWithUrl> libraries, Map<?, ?> catalogMetadata, ManagedBundle containingBundle) {
CatalogDto dto = CatalogDto.newNamedInstance("Bundles Scanned Catalog", "All annotated Brooklyn entities detected in bundles", "scanning-bundles-classpath-"+libraries.hashCode());
List<String> urls = MutableList.of();
@@ -1104,6 +1114,10 @@ public class BasicBrooklynCatalog implements BrooklynCatalog {
return scanAnnotationsInternal(mgmt, subCatalog, catalogMetadata, containingBundle);
}
+ /**
+ * @deprecated since 1.0.0; Catalog annotation is deprecated.
+ */
+ @Deprecated
@SuppressWarnings("unused") // keep during 0.12.0 until we are decided we won't support this; search for this method name
// (note that this now could work after rebind since we have the OSGi cache)
private Collection<CatalogItemDtoAbstract<?, ?>> scanAnnotationsInBundle(ManagementContext mgmt, ManagedBundle containingBundle) {
@@ -1136,6 +1150,10 @@ public class BasicBrooklynCatalog implements BrooklynCatalog {
}
}
+ /**
+ * @deprecated since 1.0.0; Catalog annotation is deprecated.
+ */
+ @Deprecated
private Collection<CatalogItemDtoAbstract<?, ?>> scanAnnotationsInternal(ManagementContext mgmt, CatalogDo subCatalog, Map<?, ?> catalogMetadata, ManagedBundle containingBundle) {
subCatalog.mgmt = mgmt;
subCatalog.setClasspathScanForEntities(CatalogScanningModes.ANNOTATIONS);
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/8f73a9ce/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogClasspathDo.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogClasspathDo.java b/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogClasspathDo.java
index 70a8374..94bbd01 100644
--- a/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogClasspathDo.java
+++ b/core/src/main/java/org/apache/brooklyn/core/catalog/internal/CatalogClasspathDo.java
@@ -68,8 +68,13 @@ public class CatalogClasspathDo {
* then editing the resulting XML (e.g. setting the classpath and removing the scan attribute) */
NONE,
- /** types in the classpath are scanned for annotations indicating inclusion in the catalog ({@link Catalog});
- * this is the default if no catalog is supplied, scanning the local classpath */
+ /**
+ * Types in the classpath are scanned for annotations indicating inclusion in the catalog ({@link Catalog});
+ * this is the default if no catalog is supplied, scanning the local classpath.
+ *
+ * @deprecated since 1.0.0; instead use catalog.bom files
+ */
+ @Deprecated
ANNOTATIONS,
@Beta
@@ -197,6 +202,7 @@ public class CatalogClasspathDo {
if (scanner!=null) {
int count = 0, countApps = 0;
if (scanMode==CatalogScanningModes.ANNOTATIONS) {
+ log.warn("Deprecated scanning of @Catalog annotations; instead use catalog.bom");
Set<Class<?>> catalogClasses = scanner.getTypesAnnotatedWith(Catalog.class);
for (Class<?> c: catalogClasses) {
try {
[2/2] brooklyn-server git commit: This closes #857
Posted by tb...@apache.org.
This closes #857
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/84e9e198
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/84e9e198
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/84e9e198
Branch: refs/heads/master
Commit: 84e9e1986649ce38a03a93beaeb338f296fd19f2
Parents: 7c31738 8f73a9c
Author: Thomas Bouron <th...@cloudsoftcorp.com>
Authored: Wed Oct 11 12:42:49 2017 +0100
Committer: Thomas Bouron <th...@cloudsoftcorp.com>
Committed: Wed Oct 11 12:42:49 2017 +0100
----------------------------------------------------------------------
.../org/apache/brooklyn/api/catalog/Catalog.java | 3 +++
.../catalog/internal/BasicBrooklynCatalog.java | 18 ++++++++++++++++++
.../core/catalog/internal/CatalogClasspathDo.java | 10 ++++++++--
3 files changed, 29 insertions(+), 2 deletions(-)
----------------------------------------------------------------------