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 06:34:10 UTC
[sling-org-apache-sling-models-integration-tests] branch master updated: cosmetic: organize imports, remove unused imports
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 bd467ff cosmetic: organize imports, remove unused imports
bd467ff is described below
commit bd467ffda23adff6d38e05f9366e8c28330dc6b5
Author: Stefan Seifert <st...@users.noreply.github.com>
AuthorDate: Thu Dec 2 07:29:49 2021 +0100
cosmetic: organize imports, remove unused imports
---
.../it/delegate/request/DelegateBaseModel.java | 4 ++--
.../it/delegate/resource/DelegateBaseModel.java | 4 ++--
.../sling/models/it/exporter/BaseComponent.java | 1 -
.../models/it/exporter/BaseRequestComponent.java | 12 ++++++----
.../sling/models/it/exporter/ComponentImpl.java | 4 ++--
.../models/it/exporter/DoubledFirstComponent.java | 4 ----
.../models/it/exporter/ExtendedComponent.java | 4 ++--
.../it/exporter/ExtendedRequestComponent.java | 12 +++++-----
.../models/it/exporter/RequestComponentImpl.java | 4 ++--
.../models/it/models/RequestSelfModelImpl.java | 1 -
.../AnotherTestBindingsValuesProvider.java | 8 +++----
.../it/services/TestBindingsValuesProvider.java | 8 +++----
.../models/it/services/TestResourceDecorator.java | 4 ++--
.../sling/models/it/servlets/PathBoundServlet.java | 7 +++---
.../customizers/SM_TeleporterCustomizer.java | 2 --
.../apache/sling/models/testing/DecoratedIT.java | 11 +++++----
.../testing/InjectorSpecificAnnotationIT.java | 1 -
.../org/apache/sling/models/testing/SimpleIT.java | 6 +++--
.../org/apache/sling/models/testing/ViaIT.java | 3 ++-
.../models/testing/delegate/DelegateRequestIT.java | 12 ++++++----
.../testing/delegate/DelegateResourceIT.java | 12 ++++++----
.../sling/models/testing/exporter/ExporterIT.java | 2 +-
.../sling/models/testing/helper/FakeRequest.java | 11 +++++----
.../sling/models/testing/helper/FakeResponse.java | 7 +++---
.../sling/models/testing/rtbound/FakeRequest.java | 27 +++++++++++-----------
.../rtboundpicker/ResourceTypePickerIT.java | 6 ++---
26 files changed, 91 insertions(+), 86 deletions(-)
diff --git a/src/main/java/org/apache/sling/models/it/delegate/request/DelegateBaseModel.java b/src/main/java/org/apache/sling/models/it/delegate/request/DelegateBaseModel.java
index e958123..db9f00f 100644
--- a/src/main/java/org/apache/sling/models/it/delegate/request/DelegateBaseModel.java
+++ b/src/main/java/org/apache/sling/models/it/delegate/request/DelegateBaseModel.java
@@ -16,12 +16,12 @@
*/
package org.apache.sling.models.it.delegate.request;
+import javax.inject.Inject;
+
import org.apache.sling.api.SlingHttpServletRequest;
import org.apache.sling.models.annotations.Model;
import org.apache.sling.models.annotations.Via;
-import javax.inject.Inject;
-
@Model(adaptables = SlingHttpServletRequest.class, adapters = DelegateInterface.class,
resourceType = "sling/delegate/base")
public class DelegateBaseModel implements DelegateInterface {
diff --git a/src/main/java/org/apache/sling/models/it/delegate/resource/DelegateBaseModel.java b/src/main/java/org/apache/sling/models/it/delegate/resource/DelegateBaseModel.java
index d58cf87..476fce6 100644
--- a/src/main/java/org/apache/sling/models/it/delegate/resource/DelegateBaseModel.java
+++ b/src/main/java/org/apache/sling/models/it/delegate/resource/DelegateBaseModel.java
@@ -16,11 +16,11 @@
*/
package org.apache.sling.models.it.delegate.resource;
+import javax.inject.Inject;
+
import org.apache.sling.api.resource.Resource;
import org.apache.sling.models.annotations.Model;
-import javax.inject.Inject;
-
@Model(adaptables = Resource.class, adapters = DelegateInterface.class,
resourceType = "sling/delegate/base")
public class DelegateBaseModel implements DelegateInterface {
diff --git a/src/main/java/org/apache/sling/models/it/exporter/BaseComponent.java b/src/main/java/org/apache/sling/models/it/exporter/BaseComponent.java
index 26a303b..5412d52 100644
--- a/src/main/java/org/apache/sling/models/it/exporter/BaseComponent.java
+++ b/src/main/java/org/apache/sling/models/it/exporter/BaseComponent.java
@@ -20,7 +20,6 @@ import javax.inject.Inject;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.models.annotations.Exporter;
-import org.apache.sling.models.annotations.ExporterOption;
import org.apache.sling.models.annotations.Model;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/src/main/java/org/apache/sling/models/it/exporter/BaseRequestComponent.java b/src/main/java/org/apache/sling/models/it/exporter/BaseRequestComponent.java
index 4765b80..95f0547 100644
--- a/src/main/java/org/apache/sling/models/it/exporter/BaseRequestComponent.java
+++ b/src/main/java/org/apache/sling/models/it/exporter/BaseRequestComponent.java
@@ -16,7 +16,12 @@
*/
package org.apache.sling.models.it.exporter;
-import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.Map;
+
+import javax.inject.Inject;
+import javax.servlet.ServletRequest;
+import javax.servlet.http.HttpServletRequest;
+
import org.apache.sling.api.SlingHttpServletRequest;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.models.annotations.Exporter;
@@ -25,10 +30,7 @@ import org.apache.sling.models.annotations.Model;
import org.apache.sling.models.annotations.Via;
import org.apache.sling.models.annotations.injectorspecific.SlingObject;
-import javax.inject.Inject;
-import javax.servlet.ServletRequest;
-import javax.servlet.http.HttpServletRequest;
-import java.util.Map;
+import com.fasterxml.jackson.annotation.JsonProperty;
@Model(adaptables = { SlingHttpServletRequest.class }, resourceType = "sling/exp-request/base")
@Exporter(name = "jackson", extensions = "json", options = {
diff --git a/src/main/java/org/apache/sling/models/it/exporter/ComponentImpl.java b/src/main/java/org/apache/sling/models/it/exporter/ComponentImpl.java
index b5839b8..752efc1 100644
--- a/src/main/java/org/apache/sling/models/it/exporter/ComponentImpl.java
+++ b/src/main/java/org/apache/sling/models/it/exporter/ComponentImpl.java
@@ -16,12 +16,12 @@
*/
package org.apache.sling.models.it.exporter;
+import javax.inject.Inject;
+
import org.apache.sling.api.resource.Resource;
import org.apache.sling.models.annotations.Exporter;
import org.apache.sling.models.annotations.Model;
-import javax.inject.Inject;
-
@Model(adaptables = { Resource.class }, adapters = Component.class, resourceType = "sling/exp/interface")
@Exporter(name = "jackson", extensions = "json")
public class ComponentImpl implements Component {
diff --git a/src/main/java/org/apache/sling/models/it/exporter/DoubledFirstComponent.java b/src/main/java/org/apache/sling/models/it/exporter/DoubledFirstComponent.java
index e7cb909..6a138cc 100644
--- a/src/main/java/org/apache/sling/models/it/exporter/DoubledFirstComponent.java
+++ b/src/main/java/org/apache/sling/models/it/exporter/DoubledFirstComponent.java
@@ -16,14 +16,10 @@
*/
package org.apache.sling.models.it.exporter;
-import com.fasterxml.jackson.annotation.JsonProperty;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.models.annotations.Exporter;
import org.apache.sling.models.annotations.Model;
-import javax.inject.Inject;
-import javax.inject.Named;
-
@Model(adaptables = { Resource.class }, resourceType = "sling/exp/doubled")
@Exporter(name = "jackson", extensions = "json", selector = "firstmodel")
public class DoubledFirstComponent {
diff --git a/src/main/java/org/apache/sling/models/it/exporter/ExtendedComponent.java b/src/main/java/org/apache/sling/models/it/exporter/ExtendedComponent.java
index 033a6f6..eb94e7f 100644
--- a/src/main/java/org/apache/sling/models/it/exporter/ExtendedComponent.java
+++ b/src/main/java/org/apache/sling/models/it/exporter/ExtendedComponent.java
@@ -20,12 +20,12 @@ import java.util.Calendar;
import java.util.Date;
import java.util.GregorianCalendar;
+import javax.inject.Inject;
+
import org.apache.sling.api.resource.Resource;
import org.apache.sling.models.annotations.Exporter;
import org.apache.sling.models.annotations.Model;
-import javax.inject.Inject;
-
@Model(adaptables = { Resource.class }, resourceType = "sling/exp/extended")
@Exporter(name = "jackson", extensions = "json")
public class ExtendedComponent extends BaseComponent {
diff --git a/src/main/java/org/apache/sling/models/it/exporter/ExtendedRequestComponent.java b/src/main/java/org/apache/sling/models/it/exporter/ExtendedRequestComponent.java
index 6231d68..4072497 100644
--- a/src/main/java/org/apache/sling/models/it/exporter/ExtendedRequestComponent.java
+++ b/src/main/java/org/apache/sling/models/it/exporter/ExtendedRequestComponent.java
@@ -16,18 +16,18 @@
*/
package org.apache.sling.models.it.exporter;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.GregorianCalendar;
+
+import javax.inject.Inject;
+
import org.apache.sling.api.SlingHttpServletRequest;
-import org.apache.sling.api.resource.Resource;
import org.apache.sling.models.annotations.Exporter;
import org.apache.sling.models.annotations.ExporterOption;
import org.apache.sling.models.annotations.Model;
import org.apache.sling.models.annotations.Via;
-import javax.inject.Inject;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.GregorianCalendar;
-
@Model(adaptables = { SlingHttpServletRequest.class }, resourceType = "sling/exp-request/extended")
@Exporter(name = "jackson", extensions = "json", options = {
@ExporterOption(name = "SerializationFeature.WRITE_DATES_AS_TIMESTAMPS", value = "false")
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 7872b75..34c8c49 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
@@ -16,6 +16,8 @@
*/
package org.apache.sling.models.it.exporter;
+import javax.inject.Inject;
+
import org.apache.sling.api.SlingHttpServletRequest;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.models.annotations.Exporter;
@@ -23,8 +25,6 @@ import org.apache.sling.models.annotations.Model;
import org.apache.sling.models.annotations.Via;
import org.apache.sling.models.annotations.injectorspecific.SlingObject;
-import javax.inject.Inject;
-
@Model(adaptables = { SlingHttpServletRequest.class }, adapters = Component.class, resourceType = "sling/exp-request/interface")
@Exporter(name = "jackson", extensions = "json")
public class RequestComponentImpl implements Component {
diff --git a/src/main/java/org/apache/sling/models/it/models/RequestSelfModelImpl.java b/src/main/java/org/apache/sling/models/it/models/RequestSelfModelImpl.java
index f8ccb2d..5c6bf58 100644
--- a/src/main/java/org/apache/sling/models/it/models/RequestSelfModelImpl.java
+++ b/src/main/java/org/apache/sling/models/it/models/RequestSelfModelImpl.java
@@ -17,7 +17,6 @@
package org.apache.sling.models.it.models;
import org.apache.sling.api.SlingHttpServletRequest;
-import org.apache.sling.api.resource.Resource;
import org.apache.sling.models.annotations.Model;
import org.apache.sling.models.annotations.injectorspecific.Self;
diff --git a/src/main/java/org/apache/sling/models/it/services/AnotherTestBindingsValuesProvider.java b/src/main/java/org/apache/sling/models/it/services/AnotherTestBindingsValuesProvider.java
index ee77a9c..e7daa63 100644
--- a/src/main/java/org/apache/sling/models/it/services/AnotherTestBindingsValuesProvider.java
+++ b/src/main/java/org/apache/sling/models/it/services/AnotherTestBindingsValuesProvider.java
@@ -16,14 +16,14 @@
*/
package org.apache.sling.models.it.services;
-import org.apache.felix.scr.annotations.Component;
-import org.apache.felix.scr.annotations.Property;
-import org.apache.felix.scr.annotations.Service;
-
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
+import org.apache.felix.scr.annotations.Component;
+import org.apache.felix.scr.annotations.Property;
+import org.apache.felix.scr.annotations.Service;
+
@Component
@Service(value = Map.class)
@Property(name = "javax.script.name", value = "sling-models-exporter")
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 40ee96a..a9e1923 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
@@ -16,14 +16,14 @@
*/
package org.apache.sling.models.it.services;
-import org.apache.felix.scr.annotations.Component;
-import org.apache.felix.scr.annotations.Property;
-import org.apache.felix.scr.annotations.Service;
-
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
+import org.apache.felix.scr.annotations.Component;
+import org.apache.felix.scr.annotations.Property;
+import org.apache.felix.scr.annotations.Service;
+
@Component
@Service(value = Map.class)
@Property(name = "javax.script.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 503ca5b..fd9f96f 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
@@ -16,6 +16,8 @@
*/
package org.apache.sling.models.it.services;
+import javax.servlet.http.HttpServletRequest;
+
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.Service;
@@ -25,8 +27,6 @@ import org.apache.sling.api.resource.ResourceDecorator;
import org.apache.sling.api.resource.ResourceWrapper;
import org.apache.sling.api.resource.ValueMap;
-import javax.servlet.http.HttpServletRequest;
-
@Component
@Service
public class TestResourceDecorator implements ResourceDecorator {
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 170d7f3..6385792 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
@@ -16,15 +16,16 @@
*/
package org.apache.sling.models.it.servlets;
+import java.io.IOException;
+
+import javax.servlet.ServletException;
+
import org.apache.felix.scr.annotations.sling.SlingServlet;
import org.apache.sling.api.SlingHttpServletRequest;
import org.apache.sling.api.SlingHttpServletResponse;
import org.apache.sling.api.servlets.SlingSafeMethodsServlet;
import org.apache.sling.models.it.models.RequestSelfModel;
-import javax.servlet.ServletException;
-import java.io.IOException;
-
@SlingServlet(paths = "/apps/rtpickerrequest")
public class PathBoundServlet extends SlingSafeMethodsServlet {
diff --git a/src/test/java/org/apache/sling/junit/teleporter/customizers/SM_TeleporterCustomizer.java b/src/test/java/org/apache/sling/junit/teleporter/customizers/SM_TeleporterCustomizer.java
index 908be63..0af6245 100644
--- a/src/test/java/org/apache/sling/junit/teleporter/customizers/SM_TeleporterCustomizer.java
+++ b/src/test/java/org/apache/sling/junit/teleporter/customizers/SM_TeleporterCustomizer.java
@@ -21,8 +21,6 @@ import org.apache.sling.testing.clients.util.TimeoutsProvider;
import org.apache.sling.testing.serversetup.instance.SlingTestBase;
import org.apache.sling.testing.teleporter.client.ClientSideTeleporter;
-import java.io.File;
-
/** This is required by the TeleporterRule, to setup the client-side
* teleporter with (at least) the test server URL.
*/
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 54ee904..7a3c73b 100644
--- a/src/test/java/org/apache/sling/models/testing/DecoratedIT.java
+++ b/src/test/java/org/apache/sling/models/testing/DecoratedIT.java
@@ -16,6 +16,12 @@
*/
package org.apache.sling.models.testing;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import javax.jcr.Node;
+import javax.jcr.Session;
+
import org.apache.commons.lang.RandomStringUtils;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceResolver;
@@ -29,11 +35,6 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import javax.jcr.Node;
-import javax.jcr.Session;
-
-import static org.junit.Assert.*;
-
public class DecoratedIT {
@Rule
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 7376b81..01a1faf 100644
--- a/src/test/java/org/apache/sling/models/testing/InjectorSpecificAnnotationIT.java
+++ b/src/test/java/org/apache/sling/models/testing/InjectorSpecificAnnotationIT.java
@@ -30,7 +30,6 @@ import org.apache.sling.junit.rules.TeleporterRule;
import org.apache.sling.models.it.models.SlingPropertyAnnotationTestModel;
import org.junit.Rule;
import org.junit.Test;
-import org.junit.runner.RunWith;
public class InjectorSpecificAnnotationIT {
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 ee8030f..d53e777 100644
--- a/src/test/java/org/apache/sling/models/testing/SimpleIT.java
+++ b/src/test/java/org/apache/sling/models/testing/SimpleIT.java
@@ -16,7 +16,9 @@
*/
package org.apache.sling.models.testing;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertSame;
import javax.jcr.Node;
import javax.jcr.Session;
@@ -27,8 +29,8 @@ import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.api.resource.ResourceResolverFactory;
import org.apache.sling.junit.rules.TeleporterRule;
import org.apache.sling.models.it.models.ConstructorInjectionTestModel;
-import org.apache.sling.models.it.models.InterfaceInjectionTestModel;
import org.apache.sling.models.it.models.FieldInjectionTestModel;
+import org.apache.sling.models.it.models.InterfaceInjectionTestModel;
import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
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 b450154..6ac7f4c 100644
--- a/src/test/java/org/apache/sling/models/testing/ViaIT.java
+++ b/src/test/java/org/apache/sling/models/testing/ViaIT.java
@@ -16,7 +16,8 @@
*/
package org.apache.sling.models.testing;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
import javax.jcr.Node;
import javax.jcr.Session;
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 1f4e04a..0cb831f 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
@@ -16,6 +16,13 @@
*/
package org.apache.sling.models.testing.delegate;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import java.util.HashMap;
+import java.util.Map;
+
import org.apache.sling.api.SlingConstants;
import org.apache.sling.api.resource.LoginException;
import org.apache.sling.api.resource.PersistenceException;
@@ -33,11 +40,6 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import java.util.HashMap;
-import java.util.Map;
-
-import static org.junit.Assert.*;
-
public class DelegateRequestIT {
@Rule
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 044d98a..60b7e2d 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
@@ -16,6 +16,13 @@
*/
package org.apache.sling.models.testing.delegate;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import java.util.HashMap;
+import java.util.Map;
+
import org.apache.sling.api.SlingConstants;
import org.apache.sling.api.resource.LoginException;
import org.apache.sling.api.resource.PersistenceException;
@@ -31,11 +38,6 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import java.util.HashMap;
-import java.util.Map;
-
-import static org.junit.Assert.*;
-
public class DelegateResourceIT {
@Rule
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 5221f31..9ac12db 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
@@ -16,9 +16,9 @@
*/
package org.apache.sling.models.testing.exporter;
+import java.io.ByteArrayInputStream;
import java.io.InputStream;
import java.io.StringReader;
-import java.io.ByteArrayInputStream;
import java.text.Format;
import java.util.Calendar;
import java.util.Collections;
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 935f706..fe513e1 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
@@ -16,11 +16,6 @@
*/
package org.apache.sling.models.testing.helper;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletInputStream;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
@@ -31,6 +26,12 @@ import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
+import javax.servlet.RequestDispatcher;
+import javax.servlet.ServletInputStream;
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+
public class FakeRequest implements HttpServletRequest {
private final String path;
diff --git a/src/test/java/org/apache/sling/models/testing/helper/FakeResponse.java b/src/test/java/org/apache/sling/models/testing/helper/FakeResponse.java
index 7cf757a..4a3de9f 100644
--- a/src/test/java/org/apache/sling/models/testing/helper/FakeResponse.java
+++ b/src/test/java/org/apache/sling/models/testing/helper/FakeResponse.java
@@ -16,14 +16,15 @@
*/
package org.apache.sling.models.testing.helper;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.PrintWriter;
import java.io.StringWriter;
import java.util.Locale;
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletResponse;
+
public class FakeResponse implements HttpServletResponse {
private StringWriter stringWriter = new StringWriter();
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 e4f0c04..389b83d 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
@@ -16,19 +16,6 @@
*/
package org.apache.sling.models.testing.rtbound;
-import org.apache.sling.api.SlingHttpServletRequest;
-import org.apache.sling.api.request.RequestDispatcherOptions;
-import org.apache.sling.api.request.RequestParameter;
-import org.apache.sling.api.request.RequestParameterMap;
-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 javax.servlet.RequestDispatcher;
-import javax.servlet.ServletInputStream;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpSession;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
@@ -38,6 +25,20 @@ import java.util.Locale;
import java.util.Map;
import java.util.ResourceBundle;
+import javax.servlet.RequestDispatcher;
+import javax.servlet.ServletInputStream;
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpSession;
+
+import org.apache.sling.api.SlingHttpServletRequest;
+import org.apache.sling.api.request.RequestDispatcherOptions;
+import org.apache.sling.api.request.RequestParameter;
+import org.apache.sling.api.request.RequestParameterMap;
+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;
+
public class FakeRequest implements SlingHttpServletRequest {
private final Resource resource;
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 3230d37..d6223ae 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
@@ -16,6 +16,9 @@
*/
package org.apache.sling.models.testing.rtboundpicker;
+import java.util.HashMap;
+import java.util.Map;
+
import org.apache.sling.api.SlingConstants;
import org.apache.sling.api.resource.LoginException;
import org.apache.sling.api.resource.PersistenceException;
@@ -32,9 +35,6 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-import java.util.HashMap;
-import java.util.Map;
-
public class ResourceTypePickerIT {
@Rule