This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.models.api-1.2.2
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-models-api.git
commit 8842257940a48709dd969aae00c315d4ed32b201
Author: Stefan Seifert <sseif...@apache.org>
AuthorDate: Thu Sep 10 11:42:00 2015 +0000
SLING-5013 add @ProviderType to API classes/interfaces and @ConsumerType to
SPI classes/interfaces
git-svn-id:
https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/models/api@1702223
13f79535-47bb-0310-9956-ffa450edef68
---
.../org/apache/sling/models/factory/InvalidModelException.java | 3 +++
.../org/apache/sling/models/factory/MissingElementException.java | 3 +++
.../org/apache/sling/models/factory/MissingElementsException.java | 3 +++
.../java/org/apache/sling/models/factory/ModelClassException.java | 3 +++
.../org/apache/sling/models/factory/PostConstructException.java | 8 +++-----
.../java/org/apache/sling/models/factory/ValidationException.java | 4 +++-
src/main/java/org/apache/sling/models/spi/AcceptsNullName.java | 3 +++
.../java/org/apache/sling/models/spi/ImplementationPicker.java | 3 +++
src/main/java/org/apache/sling/models/spi/Injector.java | 5 ++++-
src/main/java/org/apache/sling/models/spi/ModelValidation.java | 3 +++
.../spi/injectorspecific/AbstractInjectAnnotationProcessor.java | 2 ++
.../spi/injectorspecific/AbstractInjectAnnotationProcessor2.java | 3 +++
.../models/spi/injectorspecific/InjectAnnotationProcessor.java | 3 +++
.../models/spi/injectorspecific/InjectAnnotationProcessor2.java | 3 +++
.../spi/injectorspecific/InjectAnnotationProcessorFactory.java | 3 +++
.../spi/injectorspecific/InjectAnnotationProcessorFactory2.java | 3 +++
.../injectorspecific/StaticInjectAnnotationProcessorFactory.java | 3 +++
.../apache/sling/models/spi/injectorspecific/package-info.java | 2 +-
src/main/java/org/apache/sling/models/spi/package-info.java | 2 +-
19 files changed, 53 insertions(+), 9 deletions(-)
diff --git
a/src/main/java/org/apache/sling/models/factory/InvalidModelException.java
b/src/main/java/org/apache/sling/models/factory/InvalidModelException.java
index 2e24ee3..2b9b3ca 100644
--- a/src/main/java/org/apache/sling/models/factory/InvalidModelException.java
+++ b/src/main/java/org/apache/sling/models/factory/InvalidModelException.java
@@ -16,11 +16,14 @@
*/
package org.apache.sling.models.factory;
+import aQute.bnd.annotation.ProviderType;
+
/**
* Thrown in case the given model type could not be validated through the
model validation.
* The actual validation error message is encapsulated
* @see ModelFactory
*/
+@ProviderType
public class InvalidModelException extends RuntimeException {
private static final long serialVersionUID = 366657841414210438L;
diff --git
a/src/main/java/org/apache/sling/models/factory/MissingElementException.java
b/src/main/java/org/apache/sling/models/factory/MissingElementException.java
index 09195aa..76f7683 100644
--- a/src/main/java/org/apache/sling/models/factory/MissingElementException.java
+++ b/src/main/java/org/apache/sling/models/factory/MissingElementException.java
@@ -20,10 +20,13 @@ package org.apache.sling.models.factory;
import java.lang.reflect.AnnotatedElement;
+import aQute.bnd.annotation.ProviderType;
+
/**
* Exception which is used whenever one element (field, method or constructor)
could not be set.
* @see MissingElementsException
*/
+@ProviderType
public class MissingElementException extends RuntimeException {
private static final long serialVersionUID = 5782291184414886658L;
diff --git
a/src/main/java/org/apache/sling/models/factory/MissingElementsException.java
b/src/main/java/org/apache/sling/models/factory/MissingElementsException.java
index 7c02dbe..e166847 100644
---
a/src/main/java/org/apache/sling/models/factory/MissingElementsException.java
+++
b/src/main/java/org/apache/sling/models/factory/MissingElementsException.java
@@ -21,6 +21,8 @@ package org.apache.sling.models.factory;
import java.util.ArrayList;
import java.util.Collection;
+import aQute.bnd.annotation.ProviderType;
+
/**
* Exception which is triggered whenever a Sling Model cannot be instantiated
* due to some missing elements (i.e. required fields/methods/constructor
parameters
@@ -30,6 +32,7 @@ import java.util.Collection;
* @see ModelFactory
*
*/
+@ProviderType
public final class MissingElementsException extends RuntimeException {
private static final long serialVersionUID = 7870762030809272254L;
diff --git
a/src/main/java/org/apache/sling/models/factory/ModelClassException.java
b/src/main/java/org/apache/sling/models/factory/ModelClassException.java
index 9d503f9..0b1cb6a 100644
--- a/src/main/java/org/apache/sling/models/factory/ModelClassException.java
+++ b/src/main/java/org/apache/sling/models/factory/ModelClassException.java
@@ -18,6 +18,8 @@
*/
package org.apache.sling.models.factory;
+import aQute.bnd.annotation.ProviderType;
+
/**
* Exception which is triggered when the Model class could not be instantiated
due to
* not having a model annotation, some reflection error, invalid constructors
or
@@ -25,6 +27,7 @@ package org.apache.sling.models.factory;
*
* @see ModelFactory
*/
+@ProviderType
public class ModelClassException extends RuntimeException {
private static final long serialVersionUID = 4323592065808565135L;
diff --git
a/src/main/java/org/apache/sling/models/factory/PostConstructException.java
b/src/main/java/org/apache/sling/models/factory/PostConstructException.java
index dea789e..7fac494 100644
--- a/src/main/java/org/apache/sling/models/factory/PostConstructException.java
+++ b/src/main/java/org/apache/sling/models/factory/PostConstructException.java
@@ -18,19 +18,17 @@
*/
package org.apache.sling.models.factory;
+import aQute.bnd.annotation.ProviderType;
+
/**
* Exception which is triggered, whenever the post-construct method has thrown
an exception.
* The cause (accessible via {@link #getCause()}) is always the original
exception being thrown from the post-construct method.
*/
+@ProviderType
public class PostConstructException extends ModelClassException {
-
- /**
- *
- */
private static final long serialVersionUID = -2527043835215727726L;
/**
- *
* @param message some message
* @param cause the original exception being thrown in the post-construct
*/
diff --git
a/src/main/java/org/apache/sling/models/factory/ValidationException.java
b/src/main/java/org/apache/sling/models/factory/ValidationException.java
index 4cf1602..d0c2767 100644
--- a/src/main/java/org/apache/sling/models/factory/ValidationException.java
+++ b/src/main/java/org/apache/sling/models/factory/ValidationException.java
@@ -16,14 +16,16 @@
*/
package org.apache.sling.models.factory;
+import aQute.bnd.annotation.ProviderType;
+
/**
* Thrown in case an validation could not be performed for the given model.
* (although it would be required through {@link
org.apache.sling.models.annotations.ValidationStrategy#REQUIRED}).
* Depends on the actual implementation under which exact circumstances this
is thrown.
* @see ModelFactory
*/
+@ProviderType
public class ValidationException extends RuntimeException {
-
private static final long serialVersionUID = 1115037385798809055L;
public ValidationException(String message) {
diff --git a/src/main/java/org/apache/sling/models/spi/AcceptsNullName.java
b/src/main/java/org/apache/sling/models/spi/AcceptsNullName.java
index 3f0e80e..aa20d8f 100644
--- a/src/main/java/org/apache/sling/models/spi/AcceptsNullName.java
+++ b/src/main/java/org/apache/sling/models/spi/AcceptsNullName.java
@@ -18,10 +18,13 @@
*/
package org.apache.sling.models.spi;
+import aQute.bnd.annotation.ConsumerType;
+
/**
* Marker interface for an injector to declare that it ignores the name
* parameter.
*
*/
+@ConsumerType
public interface AcceptsNullName {
}
diff --git
a/src/main/java/org/apache/sling/models/spi/ImplementationPicker.java
b/src/main/java/org/apache/sling/models/spi/ImplementationPicker.java
index 8a936b8..9eb2280 100644
--- a/src/main/java/org/apache/sling/models/spi/ImplementationPicker.java
+++ b/src/main/java/org/apache/sling/models/spi/ImplementationPicker.java
@@ -21,6 +21,8 @@ package org.apache.sling.models.spi;
import javax.annotation.CheckForNull;
import javax.annotation.Nonnull;
+import aQute.bnd.annotation.ConsumerType;
+
/**
* Defines a strategy to choose an implementation for a model if multiple are
registered
* for the same interface or super class.
@@ -36,6 +38,7 @@ import javax.annotation.Nonnull;
* The first that picks an implementation is the winner.
* </p>
*/
+@ConsumerType
public interface ImplementationPicker {
/**
diff --git a/src/main/java/org/apache/sling/models/spi/Injector.java
b/src/main/java/org/apache/sling/models/spi/Injector.java
index e798875..8bee8a0 100644
--- a/src/main/java/org/apache/sling/models/spi/Injector.java
+++ b/src/main/java/org/apache/sling/models/spi/Injector.java
@@ -22,9 +22,12 @@ import java.lang.reflect.Type;
import javax.annotation.CheckForNull;
import javax.annotation.Nonnull;
+import aQute.bnd.annotation.ConsumerType;
+
/**
* Service interface for pluggable value injectors.
*/
+@ConsumerType
public interface Injector {
/**
@@ -47,4 +50,4 @@ public interface Injector {
* @return the value to be injected or null if no value could be resolved
*/
@CheckForNull Object getValue(@Nonnull Object adaptable, String name,
@Nonnull Type declaredType, @Nonnull AnnotatedElement element, @Nonnull
DisposalCallbackRegistry callbackRegistry);
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/apache/sling/models/spi/ModelValidation.java
b/src/main/java/org/apache/sling/models/spi/ModelValidation.java
index 673b0db..d47a1b1 100644
--- a/src/main/java/org/apache/sling/models/spi/ModelValidation.java
+++ b/src/main/java/org/apache/sling/models/spi/ModelValidation.java
@@ -19,6 +19,9 @@ package org.apache.sling.models.spi;
import org.apache.sling.models.factory.InvalidModelException;
import org.apache.sling.models.factory.ValidationException;
+import aQute.bnd.annotation.ConsumerType;
+
+@ConsumerType
public interface ModelValidation {
/**
diff --git
a/src/main/java/org/apache/sling/models/spi/injectorspecific/AbstractInjectAnnotationProcessor.java
b/src/main/java/org/apache/sling/models/spi/injectorspecific/AbstractInjectAnnotationProcessor.java
index efa0056..b681af8 100644
---
a/src/main/java/org/apache/sling/models/spi/injectorspecific/AbstractInjectAnnotationProcessor.java
+++
b/src/main/java/org/apache/sling/models/spi/injectorspecific/AbstractInjectAnnotationProcessor.java
@@ -16,12 +16,14 @@
*/
package org.apache.sling.models.spi.injectorspecific;
+import aQute.bnd.annotation.ConsumerType;
/**
* Default implementation of {@link InjectAnnotationProcessor}.
* @deprecated Use {@link AbstractInjectAnnotationProcessor2} instead
*/
@Deprecated
+@ConsumerType
public class AbstractInjectAnnotationProcessor implements
InjectAnnotationProcessor {
public String getName() {
diff --git
a/src/main/java/org/apache/sling/models/spi/injectorspecific/AbstractInjectAnnotationProcessor2.java
b/src/main/java/org/apache/sling/models/spi/injectorspecific/AbstractInjectAnnotationProcessor2.java
index 29e5690..6fbefe9 100644
---
a/src/main/java/org/apache/sling/models/spi/injectorspecific/AbstractInjectAnnotationProcessor2.java
+++
b/src/main/java/org/apache/sling/models/spi/injectorspecific/AbstractInjectAnnotationProcessor2.java
@@ -18,11 +18,14 @@ package org.apache.sling.models.spi.injectorspecific;
import org.apache.sling.models.annotations.injectorspecific.InjectionStrategy;
+import aQute.bnd.annotation.ConsumerType;
+
/**
* Default implementation of {@link InjectAnnotationProcessor2}.
*
*/
@SuppressWarnings("deprecation")
+@ConsumerType
public class AbstractInjectAnnotationProcessor2 extends
AbstractInjectAnnotationProcessor implements InjectAnnotationProcessor2 {
public InjectionStrategy getInjectionStrategy() {
diff --git
a/src/main/java/org/apache/sling/models/spi/injectorspecific/InjectAnnotationProcessor.java
b/src/main/java/org/apache/sling/models/spi/injectorspecific/InjectAnnotationProcessor.java
index eda3a5d..e2c0912 100644
---
a/src/main/java/org/apache/sling/models/spi/injectorspecific/InjectAnnotationProcessor.java
+++
b/src/main/java/org/apache/sling/models/spi/injectorspecific/InjectAnnotationProcessor.java
@@ -16,11 +16,14 @@
*/
package org.apache.sling.models.spi.injectorspecific;
+import aQute.bnd.annotation.ConsumerType;
+
/**
* Processor for injector-specific annotations.
* @deprecated Use {@link InjectAnnotationProcessor2} instead
*/
@Deprecated
+@ConsumerType
public interface InjectAnnotationProcessor {
/**
diff --git
a/src/main/java/org/apache/sling/models/spi/injectorspecific/InjectAnnotationProcessor2.java
b/src/main/java/org/apache/sling/models/spi/injectorspecific/InjectAnnotationProcessor2.java
index b3d11fb..dddb0a6 100644
---
a/src/main/java/org/apache/sling/models/spi/injectorspecific/InjectAnnotationProcessor2.java
+++
b/src/main/java/org/apache/sling/models/spi/injectorspecific/InjectAnnotationProcessor2.java
@@ -18,10 +18,13 @@ package org.apache.sling.models.spi.injectorspecific;
import org.apache.sling.models.annotations.injectorspecific.InjectionStrategy;
+import aQute.bnd.annotation.ConsumerType;
+
/**
* Processor for injector-specific annotations.
*/
@SuppressWarnings("deprecation")
+@ConsumerType
public interface InjectAnnotationProcessor2 extends InjectAnnotationProcessor{
/**
diff --git
a/src/main/java/org/apache/sling/models/spi/injectorspecific/InjectAnnotationProcessorFactory.java
b/src/main/java/org/apache/sling/models/spi/injectorspecific/InjectAnnotationProcessorFactory.java
index 8c9576b..2c431bf 100644
---
a/src/main/java/org/apache/sling/models/spi/injectorspecific/InjectAnnotationProcessorFactory.java
+++
b/src/main/java/org/apache/sling/models/spi/injectorspecific/InjectAnnotationProcessorFactory.java
@@ -18,12 +18,15 @@ package org.apache.sling.models.spi.injectorspecific;
import java.lang.reflect.AnnotatedElement;
+import aQute.bnd.annotation.ConsumerType;
+
/**
* Factory for {@link InjectAnnotationProcessor} that is evaluated at runtime
for each
* sling model adaption and may depend on the adaptable.
* @deprecated Use {@link StaticInjectAnnotationProcessorFactory} preferably
or in case of a dependency to the adaptable {@link
InjectAnnotationProcessorFactory2}
*/
@Deprecated
+@ConsumerType
public interface InjectAnnotationProcessorFactory {
/**
diff --git
a/src/main/java/org/apache/sling/models/spi/injectorspecific/InjectAnnotationProcessorFactory2.java
b/src/main/java/org/apache/sling/models/spi/injectorspecific/InjectAnnotationProcessorFactory2.java
index bc48fe3..3465e4f 100644
---
a/src/main/java/org/apache/sling/models/spi/injectorspecific/InjectAnnotationProcessorFactory2.java
+++
b/src/main/java/org/apache/sling/models/spi/injectorspecific/InjectAnnotationProcessorFactory2.java
@@ -18,11 +18,14 @@ package org.apache.sling.models.spi.injectorspecific;
import java.lang.reflect.AnnotatedElement;
+import aQute.bnd.annotation.ConsumerType;
+
/**
* Factory for {@link InjectAnnotationProcessor2} that is evaluated at runtime
for each
* sling model adaption and may depend on the adaptable.
* Use {@link StaticInjectAnnotationProcessorFactory} preferably.
*/
+@ConsumerType
public interface InjectAnnotationProcessorFactory2 {
/**
*
diff --git
a/src/main/java/org/apache/sling/models/spi/injectorspecific/StaticInjectAnnotationProcessorFactory.java
b/src/main/java/org/apache/sling/models/spi/injectorspecific/StaticInjectAnnotationProcessorFactory.java
index 3e9cd05..b8f55f3 100644
---
a/src/main/java/org/apache/sling/models/spi/injectorspecific/StaticInjectAnnotationProcessorFactory.java
+++
b/src/main/java/org/apache/sling/models/spi/injectorspecific/StaticInjectAnnotationProcessorFactory.java
@@ -18,11 +18,14 @@ package org.apache.sling.models.spi.injectorspecific;
import java.lang.reflect.AnnotatedElement;
+import aQute.bnd.annotation.ConsumerType;
+
/**
* Factory for {@link InjectAnnotationProcessor} that is evaluated once
* a sling model implementation class is registered.
* Whenever possible this interface should be favored above {@link
InjectAnnotationProcessorFactory2}.
*/
+@ConsumerType
public interface StaticInjectAnnotationProcessorFactory {
/**
diff --git
a/src/main/java/org/apache/sling/models/spi/injectorspecific/package-info.java
b/src/main/java/org/apache/sling/models/spi/injectorspecific/package-info.java
index 1a59018..c75ec3a 100644
---
a/src/main/java/org/apache/sling/models/spi/injectorspecific/package-info.java
+++
b/src/main/java/org/apache/sling/models/spi/injectorspecific/package-info.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-@Version("1.1.0")
+@Version("1.1.1")
package org.apache.sling.models.spi.injectorspecific;
import aQute.bnd.annotation.Version;
diff --git a/src/main/java/org/apache/sling/models/spi/package-info.java
b/src/main/java/org/apache/sling/models/spi/package-info.java
index a16e5d0..07a5625 100644
--- a/src/main/java/org/apache/sling/models/spi/package-info.java
+++ b/src/main/java/org/apache/sling/models/spi/package-info.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-@Version("1.1.0")
+@Version("1.1.1")
package org.apache.sling.models.spi;
import aQute.bnd.annotation.Version;
\ No newline at end of file
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <commits@sling.apache.org>.
