sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject [sling-whiteboard] branch master updated: Add @ConsumerType annotation
Date Wed, 18 Apr 2018 07:37:28 GMT
This is an automated email from the ASF dual-hosted git repository.

cziegeler pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-whiteboard.git


The following commit(s) were added to refs/heads/master by this push:
     new 943085f  Add @ConsumerType annotation
943085f is described below

commit 943085fed01897f487412b579ab472dbd00ed0f2
Author: Carsten Ziegeler <cziegeler@apache.org>
AuthorDate: Wed Apr 18 09:37:22 2018 +0200

    Add @ConsumerType annotation
---
 .../src/main/java/org/apache/sling/feature/builder/BuilderUtil.java | 2 +-
 .../org/apache/sling/feature/builder/FeatureExtensionHandler.java   | 2 ++
 .../main/java/org/apache/sling/feature/builder/FeatureProvider.java | 6 ++++++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/featuremodel/feature-support/src/main/java/org/apache/sling/feature/builder/BuilderUtil.java
b/featuremodel/feature-support/src/main/java/org/apache/sling/feature/builder/BuilderUtil.java
index b3f2c67..ad512dd 100644
--- a/featuremodel/feature-support/src/main/java/org/apache/sling/feature/builder/BuilderUtil.java
+++ b/featuremodel/feature-support/src/main/java/org/apache/sling/feature/builder/BuilderUtil.java
@@ -44,7 +44,7 @@ import org.osgi.resource.Requirement;
  */
 class BuilderUtil {
 
-    public enum ArtifactMerge {
+    enum ArtifactMerge {
         LATEST,
         HIGHEST
     };
diff --git a/featuremodel/feature-support/src/main/java/org/apache/sling/feature/builder/FeatureExtensionHandler.java
b/featuremodel/feature-support/src/main/java/org/apache/sling/feature/builder/FeatureExtensionHandler.java
index c92b742..2907f9b 100644
--- a/featuremodel/feature-support/src/main/java/org/apache/sling/feature/builder/FeatureExtensionHandler.java
+++ b/featuremodel/feature-support/src/main/java/org/apache/sling/feature/builder/FeatureExtensionHandler.java
@@ -17,11 +17,13 @@
 package org.apache.sling.feature.builder;
 
 import org.apache.sling.feature.Feature;
+import org.osgi.annotation.versioning.ConsumerType;
 
 /**
  * A feature extension handler can merge a feature of a particular type
  * and also post process the final assembled feature.
  */
+@ConsumerType
 public interface FeatureExtensionHandler {
 
     /**
diff --git a/featuremodel/feature-support/src/main/java/org/apache/sling/feature/builder/FeatureProvider.java
b/featuremodel/feature-support/src/main/java/org/apache/sling/feature/builder/FeatureProvider.java
index 4bffe15..ace0005 100644
--- a/featuremodel/feature-support/src/main/java/org/apache/sling/feature/builder/FeatureProvider.java
+++ b/featuremodel/feature-support/src/main/java/org/apache/sling/feature/builder/FeatureProvider.java
@@ -18,7 +18,13 @@ package org.apache.sling.feature.builder;
 
 import org.apache.sling.feature.ArtifactId;
 import org.apache.sling.feature.Feature;
+import org.osgi.annotation.versioning.ConsumerType;
 
+/**
+ * The feature provider is used to find features while assembling using either
+ * {@link ApplicationBuilder} or {@link FeatureBuilder}.
+ */
+@ConsumerType
 public interface FeatureProvider {
 
     /**

-- 
To stop receiving notification emails like this one, please contact
cziegeler@apache.org.

Mime
View raw message