You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ss...@apache.org on 2021/12/02 17:12:16 UTC
[sling-org-apache-sling-models-integration-tests] branch master updated: cosmetic: cleanup code, eliminate code warnings
This is an automated email from the ASF dual-hosted git repository.
sseifert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-models-integration-tests.git
The following commit(s) were added to refs/heads/master by this push:
new 75d99bb cosmetic: cleanup code, eliminate code warnings
75d99bb is described below
commit 75d99bb57838c3baacce06e4560371118eadf108
Author: Stefan Seifert <st...@users.noreply.github.com>
AuthorDate: Thu Dec 2 07:55:39 2021 +0100
cosmetic: cleanup code, eliminate code warnings
---
pom.xml | 5 +++
.../models/it/exporter/RequestComponentImpl.java | 2 +
.../implpicker/CustomLastImplementationPicker.java | 3 +-
.../models/it/models/ModelWithOptionalImport.java | 2 +
.../it/services/TestBindingsValuesProvider.java | 2 +
.../models/it/services/TestResourceDecorator.java | 6 ++-
.../sling/models/it/servlets/PathBoundServlet.java | 5 ++-
.../apache/sling/models/testing/DecoratedIT.java | 5 ++-
.../sling/models/testing/ImplementsExtendsIT.java | 18 +++++----
.../testing/InjectorSpecificAnnotationIT.java | 1 +
.../sling/models/testing/ModelFactorySimpleIT.java | 3 +-
.../sling/models/testing/PathBoundServletIT.java | 3 ++
.../ServiceInjectionWithDifferentRankingIT.java | 1 +
.../org/apache/sling/models/testing/SimpleIT.java | 11 +++---
.../org/apache/sling/models/testing/ViaIT.java | 1 +
.../models/testing/delegate/DelegateRequestIT.java | 2 +
.../testing/delegate/DelegateResourceIT.java | 2 +
.../sling/models/testing/exporter/ExporterIT.java | 10 ++++-
.../sling/models/testing/helper/FakeRequest.java | 15 ++++----
.../sling/models/testing/rtbound/FakeRequest.java | 43 +++++++++++++---------
.../testing/rtbound/ResourceTypeBindingIT.java | 3 ++
.../rtboundpicker/ResourceTypePickerIT.java | 2 +
22 files changed, 100 insertions(+), 45 deletions(-)
diff --git a/pom.xml b/pom.xml
index 77a5015..0a58d39 100644
--- a/pom.xml
+++ b/pom.xml
@@ -309,6 +309,11 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>org.jetbrains</groupId>
+ <artifactId>annotations</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<scope>test</scope>
diff --git a/src/main/java/org/apache/sling/models/it/exporter/RequestComponentImpl.java b/src/main/java/org/apache/sling/models/it/exporter/RequestComponentImpl.java
index 34c8c49..2a7517e 100644
--- a/src/main/java/org/apache/sling/models/it/exporter/RequestComponentImpl.java
+++ b/src/main/java/org/apache/sling/models/it/exporter/RequestComponentImpl.java
@@ -35,6 +35,7 @@ public class RequestComponentImpl implements Component {
@Inject @Via("resource")
private String sampleValue;
+ @SuppressWarnings("unused")
private final SlingHttpServletRequest request;
public RequestComponentImpl(SlingHttpServletRequest request) {
@@ -48,4 +49,5 @@ public class RequestComponentImpl implements Component {
public String getSampleValue() {
return sampleValue;
}
+
}
diff --git a/src/main/java/org/apache/sling/models/it/implpicker/CustomLastImplementationPicker.java b/src/main/java/org/apache/sling/models/it/implpicker/CustomLastImplementationPicker.java
index 650e204..7689458 100644
--- a/src/main/java/org/apache/sling/models/it/implpicker/CustomLastImplementationPicker.java
+++ b/src/main/java/org/apache/sling/models/it/implpicker/CustomLastImplementationPicker.java
@@ -21,6 +21,7 @@ package org.apache.sling.models.it.implpicker;
import org.apache.commons.lang3.StringUtils;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.models.spi.ImplementationPicker;
+import org.jetbrains.annotations.NotNull;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.propertytypes.ServiceRanking;
@@ -34,7 +35,7 @@ public class CustomLastImplementationPicker implements ImplementationPicker {
public static final String CUSTOM_NAME = "custom";
- public Class<?> pick(Class<?> adapterType, Class<?>[] implementationsTypes, Object adaptable) {
+ public Class<?> pick(@NotNull Class<?> adapterType, Class<?>[] implementationsTypes, @NotNull Object adaptable) {
if (adaptable instanceof Resource && StringUtils.equals(((Resource)adaptable).getName(), CUSTOM_NAME)) {
return implementationsTypes[implementationsTypes.length - 1];
}
diff --git a/src/main/java/org/apache/sling/models/it/models/ModelWithOptionalImport.java b/src/main/java/org/apache/sling/models/it/models/ModelWithOptionalImport.java
index eaf3c9a..1eed687 100644
--- a/src/main/java/org/apache/sling/models/it/models/ModelWithOptionalImport.java
+++ b/src/main/java/org/apache/sling/models/it/models/ModelWithOptionalImport.java
@@ -26,5 +26,7 @@ public class ModelWithOptionalImport {
// this class is not available at runtime. The containing package has an optional import so the bundle
// still resolves
+ @SuppressWarnings("unused")
private BeanUtils beanUtils = new BeanUtils();
+
}
diff --git a/src/main/java/org/apache/sling/models/it/services/TestBindingsValuesProvider.java b/src/main/java/org/apache/sling/models/it/services/TestBindingsValuesProvider.java
index e49e2d3..9b3a84e 100644
--- a/src/main/java/org/apache/sling/models/it/services/TestBindingsValuesProvider.java
+++ b/src/main/java/org/apache/sling/models/it/services/TestBindingsValuesProvider.java
@@ -26,8 +26,10 @@ import org.osgi.service.component.annotations.Component;
"javax.script.name=*"
})
public class TestBindingsValuesProvider extends HashMap<String, Object> {
+ private static final long serialVersionUID = -5029445376678233701L;
public TestBindingsValuesProvider() {
super.put("testBindingsObject", Collections.singletonMap("name", "value"));
}
+
}
diff --git a/src/main/java/org/apache/sling/models/it/services/TestResourceDecorator.java b/src/main/java/org/apache/sling/models/it/services/TestResourceDecorator.java
index d615a3a..46013ad 100644
--- a/src/main/java/org/apache/sling/models/it/services/TestResourceDecorator.java
+++ b/src/main/java/org/apache/sling/models/it/services/TestResourceDecorator.java
@@ -23,6 +23,7 @@ import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceDecorator;
import org.apache.sling.api.resource.ResourceWrapper;
import org.apache.sling.api.resource.ValueMap;
+import org.jetbrains.annotations.NotNull;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;
@@ -33,7 +34,8 @@ public class TestResourceDecorator implements ResourceDecorator {
private AdapterManager adapterManager;
@Override
- public Resource decorate(Resource resource) {
+ @SuppressWarnings("null")
+ public Resource decorate(@NotNull Resource resource) {
ValueMap map = resource.adaptTo(ValueMap.class);
if (map != null && map.containsKey("decorate")) {
if (map.get("decorate", "default").equals("customAdaptTo")) {
@@ -56,7 +58,7 @@ public class TestResourceDecorator implements ResourceDecorator {
}
@Override
- public Resource decorate(Resource resource, HttpServletRequest request) {
+ public Resource decorate(@NotNull Resource resource, @NotNull HttpServletRequest request) {
return decorate(resource);
}
}
diff --git a/src/main/java/org/apache/sling/models/it/servlets/PathBoundServlet.java b/src/main/java/org/apache/sling/models/it/servlets/PathBoundServlet.java
index 18c4209..cca9461 100644
--- a/src/main/java/org/apache/sling/models/it/servlets/PathBoundServlet.java
+++ b/src/main/java/org/apache/sling/models/it/servlets/PathBoundServlet.java
@@ -26,14 +26,17 @@ import org.apache.sling.api.SlingHttpServletResponse;
import org.apache.sling.api.servlets.SlingSafeMethodsServlet;
import org.apache.sling.models.it.models.RequestSelfModel;
import org.apache.sling.servlets.annotations.SlingServletPaths;
+import org.jetbrains.annotations.NotNull;
import org.osgi.service.component.annotations.Component;
@Component(service = Servlet.class)
@SlingServletPaths("/apps/rtpickerrequest")
public class PathBoundServlet extends SlingSafeMethodsServlet {
+ private static final long serialVersionUID = 1L;
@Override
- protected void doGet(SlingHttpServletRequest request, SlingHttpServletResponse response) throws ServletException, IOException {
+ @SuppressWarnings("unused")
+ protected void doGet(@NotNull SlingHttpServletRequest request, @NotNull SlingHttpServletResponse response) throws ServletException, IOException {
RequestSelfModel model = request.adaptTo(RequestSelfModel.class);
response.setStatus(200);
}
diff --git a/src/test/java/org/apache/sling/models/testing/DecoratedIT.java b/src/test/java/org/apache/sling/models/testing/DecoratedIT.java
index a726c9e..7cd7d18 100644
--- a/src/test/java/org/apache/sling/models/testing/DecoratedIT.java
+++ b/src/test/java/org/apache/sling/models/testing/DecoratedIT.java
@@ -45,8 +45,9 @@ public class DecoratedIT {
private ResourceResolver resolver;
private Resource resourceWithDefaultWrapperBehavior;
private Resource resourceWithCustomAdaptToWrapper;
-
+
@Before
+ @SuppressWarnings({ "null", "deprecation" })
public void setUp() throws Exception {
ResourceResolverFactory rrFactory = teleporter.getService(ResourceResolverFactory.class);
modelFactory = teleporter.getService(ModelFactory.class);
@@ -86,7 +87,7 @@ public class DecoratedIT {
public void testInjectDecoratedResourceUsingAdaptTo() {
assertTrue("Resource is not wrapped", resourceWithCustomAdaptToWrapper instanceof ResourceWrapper);
SelfModel model = resourceWithCustomAdaptToWrapper.adaptTo(SelfModel.class);
-
+
assertNotNull("Model is null", model);
assertTrue("Model is not wrapped", model.getResource() instanceof ResourceWrapper);
}
diff --git a/src/test/java/org/apache/sling/models/testing/ImplementsExtendsIT.java b/src/test/java/org/apache/sling/models/testing/ImplementsExtendsIT.java
index c794f69..e0b2e9d 100644
--- a/src/test/java/org/apache/sling/models/testing/ImplementsExtendsIT.java
+++ b/src/test/java/org/apache/sling/models/testing/ImplementsExtendsIT.java
@@ -54,15 +54,16 @@ public class ImplementsExtendsIT {
private ResourceResolver resolver;
private Resource resource;
private Node createdNode;
-
+
@Before
+ @SuppressWarnings({ "null", "deprecation" })
public void setUp() throws Exception {
ResourceResolverFactory rrFactory = teleporter.getService(ResourceResolverFactory.class);
adapterManager = teleporter.getService(AdapterManager.class);
firstValue = RandomStringUtils.randomAlphanumeric(10);
thirdValue = RandomStringUtils.randomAlphanumeric(10);
- resolver = rrFactory.getAdministrativeResourceResolver(null);
+ resolver = rrFactory.getAdministrativeResourceResolver(null);
Session session = resolver.adaptTo(Session.class);
Node rootNode = session.getRootNode();
createdNode = rootNode.addNode("test_" + RandomStringUtils.randomAlphanumeric(10));
@@ -80,7 +81,7 @@ public class ImplementsExtendsIT {
resolver.close();
}
}
-
+
/**
* Try to adapt to interface, with an different implementation class that has the @Model annotation
*/
@@ -119,28 +120,29 @@ public class ImplementsExtendsIT {
assertNotNull(model);
assertEquals("!" + firstValue + "|" + secondValue + "|" + thirdValue + "!", model.getAllProperties());
}
-
+
/**
* Try to adapt to interface, with an different implementation class that has the @Model annotation
*/
@Test
+ @SuppressWarnings("null")
public void testImplementsInterfaceModelWithPickLastImplementationPicker() throws RepositoryException {
-
+
Session session = resolver.adaptTo(Session.class);
Node node = resource.adaptTo(Node.class);
Node childNode = node.addNode(CustomLastImplementationPicker.CUSTOM_NAME);
childNode.setProperty("first", firstValue);
childNode.setProperty("third", thirdValue);
session.save();
-
+
Resource childResource = resolver.getResource(childNode.getPath());
-
+
SampleServiceInterface model = adapterManager.getAdapter(childResource, SampleServiceInterface.class);
assertNotNull(model);
assertEquals(ImplementsInterfacePropertyModel2.class, model.getClass());
assertEquals(firstValue + "|" + secondValue + "|" + thirdValue, model.getAllProperties());
-
+
childNode.remove();
session.save();
}
diff --git a/src/test/java/org/apache/sling/models/testing/InjectorSpecificAnnotationIT.java b/src/test/java/org/apache/sling/models/testing/InjectorSpecificAnnotationIT.java
index 75acb99..2e1f526 100644
--- a/src/test/java/org/apache/sling/models/testing/InjectorSpecificAnnotationIT.java
+++ b/src/test/java/org/apache/sling/models/testing/InjectorSpecificAnnotationIT.java
@@ -37,6 +37,7 @@ public class InjectorSpecificAnnotationIT {
public final TeleporterRule teleporter = TeleporterRule.forClass(getClass(), "SM_Teleporter");
@Test
+ @SuppressWarnings({ "null", "deprecation" })
public void test() throws Exception {
ResourceResolverFactory rrFactory = teleporter.getService(ResourceResolverFactory.class);
String value = RandomStringUtils.randomAlphanumeric(10);
diff --git a/src/test/java/org/apache/sling/models/testing/ModelFactorySimpleIT.java b/src/test/java/org/apache/sling/models/testing/ModelFactorySimpleIT.java
index 1d21526..46aa9c5 100644
--- a/src/test/java/org/apache/sling/models/testing/ModelFactorySimpleIT.java
+++ b/src/test/java/org/apache/sling/models/testing/ModelFactorySimpleIT.java
@@ -53,6 +53,7 @@ public class ModelFactorySimpleIT {
private Node createdNode;
@Before
+ @SuppressWarnings({ "null", "deprecation" })
public void setUp() throws Exception {
ResourceResolverFactory rrFactory = teleporter.getService(ResourceResolverFactory.class);
modelFactory = teleporter.getService(ModelFactory.class);
@@ -105,7 +106,7 @@ public class ModelFactorySimpleIT {
assertTrue("Model is not detected as such", modelFactory.canCreateFromAdaptable(resource, SampleServiceInterface.class));
assertFalse("Model is incorrectly detected", modelFactory.canCreateFromAdaptable(new String(), ConstructorInjectionTestModel.class)); // invalid adaptable
}
-
+
@Test()
public void testCanCreateFromAdaptableWithModelExceptin() {
assertFalse("Model is incorrectly detected", modelFactory.canCreateFromAdaptable(resource, DummyClass.class)); // no model class
diff --git a/src/test/java/org/apache/sling/models/testing/PathBoundServletIT.java b/src/test/java/org/apache/sling/models/testing/PathBoundServletIT.java
index 1c9d452..e281045 100644
--- a/src/test/java/org/apache/sling/models/testing/PathBoundServletIT.java
+++ b/src/test/java/org/apache/sling/models/testing/PathBoundServletIT.java
@@ -36,12 +36,14 @@ public class PathBoundServletIT {
private SlingRequestProcessor slingRequestProcessor;
@Before
+ @SuppressWarnings("null")
public void setup() {
rrFactory = teleporter.getService(ResourceResolverFactory.class);
slingRequestProcessor = teleporter.getService(SlingRequestProcessor.class);
}
@Test
+ @SuppressWarnings("deprecation")
public void testDoubledServlets() throws Exception {
ResourceResolver resolver = null;
try {
@@ -56,4 +58,5 @@ public class PathBoundServletIT {
}
}
}
+
}
diff --git a/src/test/java/org/apache/sling/models/testing/ServiceInjectionWithDifferentRankingIT.java b/src/test/java/org/apache/sling/models/testing/ServiceInjectionWithDifferentRankingIT.java
index db3ad99..5ac0484 100644
--- a/src/test/java/org/apache/sling/models/testing/ServiceInjectionWithDifferentRankingIT.java
+++ b/src/test/java/org/apache/sling/models/testing/ServiceInjectionWithDifferentRankingIT.java
@@ -62,6 +62,7 @@ public class ServiceInjectionWithDifferentRankingIT {
private Collection<ServiceRegistration> serviceRegistrations;
@Before
+ @SuppressWarnings({ "null", "deprecation" })
public void setUp() throws Exception {
ResourceResolverFactory rrFactory = teleporter.getService(ResourceResolverFactory.class);
modelFactory = teleporter.getService(ModelFactory.class);
diff --git a/src/test/java/org/apache/sling/models/testing/SimpleIT.java b/src/test/java/org/apache/sling/models/testing/SimpleIT.java
index 1aef27e..6ac49c4 100644
--- a/src/test/java/org/apache/sling/models/testing/SimpleIT.java
+++ b/src/test/java/org/apache/sling/models/testing/SimpleIT.java
@@ -40,14 +40,15 @@ public class SimpleIT {
@Rule
public final TeleporterRule teleporter = TeleporterRule.forClass(getClass(), "SM_Teleporter");
-
+
private String value;
private String childValue;
private ResourceResolver resolver;
private Resource resource;
private Node createdNode;
-
+
@Before
+ @SuppressWarnings({ "null", "deprecation" })
public void setUp() throws Exception {
ResourceResolverFactory rrFactory = teleporter.getService(ResourceResolverFactory.class);
value = RandomStringUtils.randomAlphanumeric(10);
@@ -78,7 +79,7 @@ public class SimpleIT {
@Test
public void testFieldInjection() {
FieldInjectionTestModel model = resource.adaptTo(FieldInjectionTestModel.class);
-
+
assertNotNull("Model is null", model);
assertEquals("Test Property is not set correctly", value, model.getTestProperty());
assertEquals("Child Test Property is not set correctly", childValue, model.getChildProperty());
@@ -89,7 +90,7 @@ public class SimpleIT {
@Test
public void testInterfaceInjection() {
InterfaceInjectionTestModel model = resource.adaptTo(InterfaceInjectionTestModel.class);
-
+
assertNotNull("Model is null", model);
assertEquals("Test Property is not set correctly", value, model.getTestProperty());
assertNotNull("Filters is null", model.getFilters());
@@ -99,7 +100,7 @@ public class SimpleIT {
@Test
public void testConstructorInjection() {
ConstructorInjectionTestModel model = resource.adaptTo(ConstructorInjectionTestModel.class);
-
+
assertNotNull("Model is null", model);
assertEquals("Test Property is not set correctly", value, model.getTestProperty());
assertNotNull("Filters is null", model.getFilters());
diff --git a/src/test/java/org/apache/sling/models/testing/ViaIT.java b/src/test/java/org/apache/sling/models/testing/ViaIT.java
index ac63b9e..870e8f5 100644
--- a/src/test/java/org/apache/sling/models/testing/ViaIT.java
+++ b/src/test/java/org/apache/sling/models/testing/ViaIT.java
@@ -39,6 +39,7 @@ public class ViaIT {
public final TeleporterRule teleporter = TeleporterRule.forClass(getClass(), "SM_Teleporter");
@Test
+ @SuppressWarnings({ "null", "deprecation" })
public void test() throws Exception {
ResourceResolverFactory rrFactory = teleporter.getService(ResourceResolverFactory.class);
AdapterManager adapterManager = teleporter.getService(AdapterManager.class);
diff --git a/src/test/java/org/apache/sling/models/testing/delegate/DelegateRequestIT.java b/src/test/java/org/apache/sling/models/testing/delegate/DelegateRequestIT.java
index 0cb831f..80fec48 100644
--- a/src/test/java/org/apache/sling/models/testing/delegate/DelegateRequestIT.java
+++ b/src/test/java/org/apache/sling/models/testing/delegate/DelegateRequestIT.java
@@ -53,6 +53,7 @@ public class DelegateRequestIT {
private final String extendedComponentPath = "/content/delegate/extendedComponent";
@Before
+ @SuppressWarnings({ "null", "deprecation" })
public void setup() throws LoginException, PersistenceException {
rrFactory = teleporter.getService(ResourceResolverFactory.class);
modelFactory = teleporter.getService(ModelFactory.class);
@@ -88,6 +89,7 @@ public class DelegateRequestIT {
}
@Test
+ @SuppressWarnings("deprecation")
public void testCreateDelegateModel() throws LoginException {
ResourceResolver resolver = null;
try {
diff --git a/src/test/java/org/apache/sling/models/testing/delegate/DelegateResourceIT.java b/src/test/java/org/apache/sling/models/testing/delegate/DelegateResourceIT.java
index 60b7e2d..ffa7600 100644
--- a/src/test/java/org/apache/sling/models/testing/delegate/DelegateResourceIT.java
+++ b/src/test/java/org/apache/sling/models/testing/delegate/DelegateResourceIT.java
@@ -49,6 +49,7 @@ public class DelegateResourceIT {
private final String extendedComponentPath = "/content/delegate/extendedComponent";
@Before
+ @SuppressWarnings({"null", "deprecation"})
public void setup() throws LoginException, PersistenceException {
rrFactory = teleporter.getService(ResourceResolverFactory.class);
ResourceResolver adminResolver = null;
@@ -83,6 +84,7 @@ public class DelegateResourceIT {
}
@Test
+ @SuppressWarnings("deprecation")
public void testCreateDelegateModel() throws LoginException {
ResourceResolver resolver = null;
try {
diff --git a/src/test/java/org/apache/sling/models/testing/exporter/ExporterIT.java b/src/test/java/org/apache/sling/models/testing/exporter/ExporterIT.java
index dacb061..698c28d 100644
--- a/src/test/java/org/apache/sling/models/testing/exporter/ExporterIT.java
+++ b/src/test/java/org/apache/sling/models/testing/exporter/ExporterIT.java
@@ -71,6 +71,7 @@ public class ExporterIT {
private Format dateFormat = FastDateFormat.getInstance("yyyy-MM-dd'T'HH:mm:ss.SSSZ", TimeZone.getTimeZone("UTC"));
@Before
+ @SuppressWarnings({"null", "deprecation"})
public void setup() throws Exception {
rrFactory = teleporter.getService(ResourceResolverFactory.class);
modelFactory = teleporter.getService(ModelFactory.class);
@@ -149,6 +150,7 @@ public class ExporterIT {
}
@Test
+ @SuppressWarnings({"null", "deprecation"})
public void testExportToJSON() throws Exception {
ResourceResolver resolver = null;
try {
@@ -190,6 +192,7 @@ public class ExporterIT {
}
}
+ @SuppressWarnings("deprecation")
@Test
public void testExportToTidyJSON() throws Exception {
ResourceResolver resolver = null;
@@ -211,6 +214,7 @@ public class ExporterIT {
}
}
+ @SuppressWarnings({ "deprecation", "unchecked" })
@Test
public void testExportToMap() throws Exception {
ResourceResolver resolver = null;
@@ -230,6 +234,7 @@ public class ExporterIT {
}
@Test
+ @SuppressWarnings("deprecation")
public void testResourceServlets() throws Exception {
ResourceResolver resolver = null;
try {
@@ -265,6 +270,7 @@ public class ExporterIT {
}
@Test
+ @SuppressWarnings("deprecation")
public void testRequestServlets() throws Exception {
ResourceResolver resolver = null;
try {
@@ -310,6 +316,7 @@ public class ExporterIT {
}
@Test
+ @SuppressWarnings("deprecation")
public void testDoubledServlets() throws Exception {
ResourceResolver resolver = null;
try {
@@ -334,6 +341,7 @@ public class ExporterIT {
}
@Test
+ @SuppressWarnings("deprecation")
public void testFailedExport() throws Exception {
boolean thrown = false;
try {
@@ -342,7 +350,7 @@ public class ExporterIT {
resolver = rrFactory.getAdministrativeResourceResolver(null);
final Resource baseComponentResource = resolver.getResource(baseComponentPath);
Assert.assertNotNull(baseComponentResource);
- String data = modelFactory.exportModelForResource(baseComponentResource, "jaxb", String.class,
+ modelFactory.exportModelForResource(baseComponentResource, "jaxb", String.class,
Collections.<String, String>emptyMap());
Assert.fail("Should have thrown missing serializer error.");
} finally {
diff --git a/src/test/java/org/apache/sling/models/testing/helper/FakeRequest.java b/src/test/java/org/apache/sling/models/testing/helper/FakeRequest.java
index 4e1d969..0d71e9b 100644
--- a/src/test/java/org/apache/sling/models/testing/helper/FakeRequest.java
+++ b/src/test/java/org/apache/sling/models/testing/helper/FakeRequest.java
@@ -76,12 +76,12 @@ public class FakeRequest implements HttpServletRequest {
}
@Override
- public Enumeration getHeaders(String name) {
+ public Enumeration<String> getHeaders(String name) {
return null;
}
@Override
- public Enumeration getHeaderNames() {
+ public Enumeration<String> getHeaderNames() {
return null;
}
@@ -186,7 +186,7 @@ public class FakeRequest implements HttpServletRequest {
}
@Override
- public Enumeration getAttributeNames() {
+ public Enumeration<String> getAttributeNames() {
return null;
}
@@ -221,7 +221,7 @@ public class FakeRequest implements HttpServletRequest {
}
@Override
- public Enumeration getParameterNames() {
+ public Enumeration<String> getParameterNames() {
return null;
}
@@ -231,8 +231,8 @@ public class FakeRequest implements HttpServletRequest {
}
@Override
- public Map getParameterMap() {
- return Collections.EMPTY_MAP;
+ public Map<String, String[]> getParameterMap() {
+ return Collections.emptyMap();
}
@Override
@@ -286,7 +286,7 @@ public class FakeRequest implements HttpServletRequest {
}
@Override
- public Enumeration getLocales() {
+ public Enumeration<Locale> getLocales() {
return Collections.emptyEnumeration();
}
@@ -397,6 +397,7 @@ public class FakeRequest implements HttpServletRequest {
}
@Override
+ @SuppressWarnings("null")
public <T extends HttpUpgradeHandler> T upgrade(Class<T> handlerClass) throws IOException, ServletException {
return null;
}
diff --git a/src/test/java/org/apache/sling/models/testing/rtbound/FakeRequest.java b/src/test/java/org/apache/sling/models/testing/rtbound/FakeRequest.java
index 6548ac9..51579b3 100644
--- a/src/test/java/org/apache/sling/models/testing/rtbound/FakeRequest.java
+++ b/src/test/java/org/apache/sling/models/testing/rtbound/FakeRequest.java
@@ -49,6 +49,7 @@ import org.apache.sling.api.request.RequestPathInfo;
import org.apache.sling.api.request.RequestProgressTracker;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceResolver;
+import org.jetbrains.annotations.NotNull;
public class FakeRequest implements SlingHttpServletRequest {
@@ -59,47 +60,50 @@ public class FakeRequest implements SlingHttpServletRequest {
}
@Override
- public Resource getResource() {
+ public @NotNull Resource getResource() {
return resource;
}
@Override
- public ResourceResolver getResourceResolver() {
+ @SuppressWarnings("null")
+ public @NotNull ResourceResolver getResourceResolver() {
return null;
}
@Override
- public RequestPathInfo getRequestPathInfo() {
+ @SuppressWarnings("null")
+ public @NotNull RequestPathInfo getRequestPathInfo() {
return null;
}
@Override
- public RequestParameter getRequestParameter(String s) {
+ public RequestParameter getRequestParameter(@NotNull String s) {
return null;
}
@Override
- public RequestParameter[] getRequestParameters(String s) {
+ public RequestParameter[] getRequestParameters(@NotNull String s) {
return new RequestParameter[0];
}
@Override
- public RequestParameterMap getRequestParameterMap() {
+ @SuppressWarnings("null")
+ public @NotNull RequestParameterMap getRequestParameterMap() {
return null;
}
@Override
- public RequestDispatcher getRequestDispatcher(String s, RequestDispatcherOptions requestDispatcherOptions) {
+ public RequestDispatcher getRequestDispatcher(@NotNull String s, RequestDispatcherOptions requestDispatcherOptions) {
return null;
}
@Override
- public RequestDispatcher getRequestDispatcher(Resource resource, RequestDispatcherOptions requestDispatcherOptions) {
+ public RequestDispatcher getRequestDispatcher(@NotNull Resource resource, RequestDispatcherOptions requestDispatcherOptions) {
return null;
}
@Override
- public RequestDispatcher getRequestDispatcher(Resource resource) {
+ public RequestDispatcher getRequestDispatcher(@NotNull Resource resource) {
return null;
}
@@ -114,7 +118,8 @@ public class FakeRequest implements SlingHttpServletRequest {
}
@Override
- public Enumeration<String> getResponseContentTypes() {
+ @SuppressWarnings("null")
+ public @NotNull Enumeration<String> getResponseContentTypes() {
return null;
}
@@ -129,6 +134,7 @@ public class FakeRequest implements SlingHttpServletRequest {
}
@Override
+ @SuppressWarnings("null")
public RequestProgressTracker getRequestProgressTracker() {
return null;
}
@@ -154,12 +160,12 @@ public class FakeRequest implements SlingHttpServletRequest {
}
@Override
- public Enumeration getHeaders(String s) {
+ public Enumeration<String> getHeaders(String s) {
return null;
}
@Override
- public Enumeration getHeaderNames() {
+ public Enumeration<String> getHeaderNames() {
return null;
}
@@ -264,7 +270,7 @@ public class FakeRequest implements SlingHttpServletRequest {
}
@Override
- public Enumeration getAttributeNames() {
+ public Enumeration<String> getAttributeNames() {
return null;
}
@@ -299,7 +305,7 @@ public class FakeRequest implements SlingHttpServletRequest {
}
@Override
- public Enumeration getParameterNames() {
+ public Enumeration<String> getParameterNames() {
return null;
}
@@ -309,7 +315,7 @@ public class FakeRequest implements SlingHttpServletRequest {
}
@Override
- public Map getParameterMap() {
+ public Map<String,String[]> getParameterMap() {
return null;
}
@@ -364,7 +370,7 @@ public class FakeRequest implements SlingHttpServletRequest {
}
@Override
- public Enumeration getLocales() {
+ public Enumeration<Locale> getLocales() {
return null;
}
@@ -404,7 +410,8 @@ public class FakeRequest implements SlingHttpServletRequest {
}
@Override
- public <AdapterType> AdapterType adaptTo(Class<AdapterType> aClass) {
+ @SuppressWarnings("null")
+ public <AdapterType> AdapterType adaptTo(@NotNull Class<AdapterType> aClass) {
return null;
}
@@ -439,6 +446,7 @@ public class FakeRequest implements SlingHttpServletRequest {
}
@Override
+ @SuppressWarnings("null")
public <T extends HttpUpgradeHandler> T upgrade(Class<T> handlerClass) throws IOException, ServletException {
return null;
}
@@ -485,6 +493,7 @@ public class FakeRequest implements SlingHttpServletRequest {
}
@Override
+ @SuppressWarnings("null")
public List<RequestParameter> getRequestParameterList() {
return null;
}
diff --git a/src/test/java/org/apache/sling/models/testing/rtbound/ResourceTypeBindingIT.java b/src/test/java/org/apache/sling/models/testing/rtbound/ResourceTypeBindingIT.java
index 42886a4..0e5313d 100644
--- a/src/test/java/org/apache/sling/models/testing/rtbound/ResourceTypeBindingIT.java
+++ b/src/test/java/org/apache/sling/models/testing/rtbound/ResourceTypeBindingIT.java
@@ -52,6 +52,7 @@ public class ResourceTypeBindingIT {
private final String fromRequestComponentPath = "/content/rt/fromRequest";
@Before
+ @SuppressWarnings({ "null", "deprecation" })
public void setup() throws LoginException, PersistenceException {
rrFactory = teleporter.getService(ResourceResolverFactory.class);
modelFactory = teleporter.getService(ModelFactory.class);
@@ -104,6 +105,7 @@ public class ResourceTypeBindingIT {
}
@Test
+ @SuppressWarnings("deprecation")
public void testClientModelCreateFromResource() throws LoginException {
ResourceResolver resolver = null;
try {
@@ -140,6 +142,7 @@ public class ResourceTypeBindingIT {
}
@Test
+ @SuppressWarnings("deprecation")
public void testClientModelCreateFromRequest() throws LoginException {
ResourceResolver resolver = null;
try {
diff --git a/src/test/java/org/apache/sling/models/testing/rtboundpicker/ResourceTypePickerIT.java b/src/test/java/org/apache/sling/models/testing/rtboundpicker/ResourceTypePickerIT.java
index d6223ae..9a1b8b4 100644
--- a/src/test/java/org/apache/sling/models/testing/rtboundpicker/ResourceTypePickerIT.java
+++ b/src/test/java/org/apache/sling/models/testing/rtboundpicker/ResourceTypePickerIT.java
@@ -46,6 +46,7 @@ public class ResourceTypePickerIT {
private final String childComponentPath = "/content/rtpicker/childComponent";
@Before
+ @SuppressWarnings({ "null", "deprecation" })
public void setup() throws LoginException, PersistenceException {
rrFactory = teleporter.getService(ResourceResolverFactory.class);
ResourceResolver adminResolver = null;
@@ -73,6 +74,7 @@ public class ResourceTypePickerIT {
}
@Test
+ @SuppressWarnings("deprecation")
public void testClientModelCreateFromResource() throws LoginException {
ResourceResolver resolver = null;
try {