SLING-3884 - fix two failing tests, patch contributed by Stefan Seifert, thanks
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1621267 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/pom.xml b/pom.xml
index d3290f2..191d34d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -245,7 +245,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.testing.tools</artifactId>
- <version>1.0.7-SNAPSHOT</version>
+ <version>1.0.8</version>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/src/main/java/org/apache/sling/models/it/SimpleTest.java b/src/main/java/org/apache/sling/models/it/SimpleTest.java
index d78746f..704e239 100644
--- a/src/main/java/org/apache/sling/models/it/SimpleTest.java
+++ b/src/main/java/org/apache/sling/models/it/SimpleTest.java
@@ -36,7 +36,6 @@
import org.junit.runner.RunWith;
@RunWith(SlingAnnotationsTestRunner.class)
-@SuppressWarnings("javadoc")
public class SimpleTest {
@TestReference
diff --git a/src/main/java/org/apache/sling/models/it/models/ConstructorInjectionTestModel.java b/src/main/java/org/apache/sling/models/it/models/ConstructorInjectionTestModel.java
index 108d311..b22e107 100644
--- a/src/main/java/org/apache/sling/models/it/models/ConstructorInjectionTestModel.java
+++ b/src/main/java/org/apache/sling/models/it/models/ConstructorInjectionTestModel.java
@@ -24,9 +24,9 @@
import org.apache.sling.api.resource.Resource;
import org.apache.sling.models.annotations.Model;
+import org.apache.sling.models.annotations.injectorspecific.Self;
@Model(adaptables=Resource.class)
-@SuppressWarnings("javadoc")
public class ConstructorInjectionTestModel {
private final String testProperty;
@@ -34,8 +34,10 @@
private final Resource resource;
@Inject
- public ConstructorInjectionTestModel(@Named("testProperty") String testProperty,
- @Named("filters") List<Filter> filters, Resource resource) {
+ public ConstructorInjectionTestModel(
+ @Named("testProperty") String testProperty,
+ @Named("filters") List<Filter> filters,
+ @Self Resource resource) {
this.testProperty = testProperty;
this.filters = filters;
this.resource = resource;
diff --git a/src/main/java/org/apache/sling/models/it/models/FieldInjectionTestModel.java b/src/main/java/org/apache/sling/models/it/models/FieldInjectionTestModel.java
index af333f8..c5c39d5 100644
--- a/src/main/java/org/apache/sling/models/it/models/FieldInjectionTestModel.java
+++ b/src/main/java/org/apache/sling/models/it/models/FieldInjectionTestModel.java
@@ -25,7 +25,6 @@
import org.apache.sling.models.annotations.Model;
@Model(adaptables=Resource.class)
-@SuppressWarnings("javadoc")
public class FieldInjectionTestModel {
@Inject
diff --git a/src/main/java/org/apache/sling/models/it/models/InterfaceInjectionTestModel.java b/src/main/java/org/apache/sling/models/it/models/InterfaceInjectionTestModel.java
index 7a077d1..c4196fb 100644
--- a/src/main/java/org/apache/sling/models/it/models/InterfaceInjectionTestModel.java
+++ b/src/main/java/org/apache/sling/models/it/models/InterfaceInjectionTestModel.java
@@ -23,9 +23,9 @@
import org.apache.sling.api.resource.Resource;
import org.apache.sling.models.annotations.Model;
+import org.apache.sling.models.annotations.injectorspecific.Self;
@Model(adaptables=Resource.class)
-@SuppressWarnings("javadoc")
public interface InterfaceInjectionTestModel {
@Inject
@@ -34,7 +34,7 @@
@Inject
List<Filter> getFilters();
- @Inject
+ @Self
Resource getResource();
}
