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 2025/02/26 09:20:40 UTC
(sling-org-apache-sling-api) 02/02: SLING-12677 apply spotless formatting
This is an automated email from the ASF dual-hosted git repository.
sseifert pushed a commit to branch feature/parent-62
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-api.git
commit 22a1f08286be70cd20354838a28641d28baeac1e
Author: Stefan Seifert <st...@users.noreply.github.com>
AuthorDate: Wed Feb 26 10:20:25 2025 +0100
SLING-12677 apply spotless formatting
---
pom.xml | 15 +-
.../java/org/apache/sling/api/SlingConstants.java | 6 +-
.../java/org/apache/sling/api/SlingException.java | 2 +-
.../apache/sling/api/SlingHttpServletRequest.java | 115 +-
.../apache/sling/api/SlingHttpServletResponse.java | 5 +-
.../org/apache/sling/api/SlingIOException.java | 1 -
.../sling/api/SlingJakartaHttpServletRequest.java | 108 +-
.../sling/api/SlingJakartaHttpServletResponse.java | 6 +-
.../org/apache/sling/api/adapter/Adaptable.java | 7 +-
.../apache/sling/api/adapter/AdapterFactory.java | 8 +-
.../apache/sling/api/adapter/AdapterManager.java | 10 +-
.../apache/sling/api/adapter/SlingAdaptable.java | 10 +-
.../org/apache/sling/api/adapter/package-info.java | 1 -
.../org/apache/sling/api/auth/Authenticator.java | 11 +-
.../api/auth/NoAuthenticationHandlerException.java | 1 -
.../org/apache/sling/api/auth/package-info.java | 1 -
.../java/org/apache/sling/api/package-info.java | 1 -
.../api/request/RecursionTooDeepException.java | 1 -
.../api/request/RequestDispatcherOptions.java | 12 +-
.../apache/sling/api/request/RequestParameter.java | 22 +-
.../sling/api/request/RequestParameterMap.java | 10 +-
.../apache/sling/api/request/RequestPathInfo.java | 50 +-
.../sling/api/request/RequestProgressTracker.java | 6 +-
.../org/apache/sling/api/request/RequestUtil.java | 49 +-
.../org/apache/sling/api/request/ResponseUtil.java | 24 +-
.../api/request/SlingJakartaRequestEvent.java | 74 +-
.../api/request/SlingJakartaRequestListener.java | 23 +-
.../sling/api/request/SlingRequestEvent.java | 74 +-
.../sling/api/request/SlingRequestListener.java | 23 +-
.../sling/api/request/TooManyCallsException.java | 1 -
.../apache/sling/api/request/builder/Builders.java | 6 +-
.../builder/SlingHttpServletRequestBuilder.java | 65 +-
.../builder/SlingHttpServletResponseBuilder.java | 6 +-
.../builder/SlingHttpServletResponseResult.java | 12 +-
.../SlingJakartaHttpServletResponseResult.java | 13 +-
.../request/builder/impl/FastMessageFormat.java | 1 -
.../api/request/builder/impl/HeaderSupport.java | 15 +-
.../request/builder/impl/RequestParameterImpl.java | 25 +-
.../builder/impl/RequestParameterMapImpl.java | 9 +-
.../builder/impl/RequestProgressTrackerImpl.java | 16 +-
.../request/builder/impl/ServletContextImpl.java | 4 +-
.../impl/SlingHttpServletRequestBuilderImpl.java | 88 +-
.../builder/impl/SlingHttpServletRequestImpl.java | 91 +-
.../impl/SlingHttpServletResponseBuilderImpl.java | 4 +-
.../impl/SlingHttpServletResponseResultImpl.java | 27 +-
.../impl/SlingJakartaHttpServletRequestImpl.java | 60 +-
.../SlingJakartaHttpServletResponseResultImpl.java | 25 +-
.../api/request/header/JakartaMediaRangeList.java | 46 +-
.../sling/api/request/header/MediaRangeList.java | 49 +-
.../sling/api/resource/AbstractResource.java | 6 +-
.../api/resource/AbstractResourceVisitor.java | 8 +-
.../api/resource/ModifyingResourceProvider.java | 9 +-
.../sling/api/resource/NonExistingResource.java | 6 +-
.../resource/ParametrizableResourceProvider.java | 9 +-
.../sling/api/resource/PersistenceException.java | 6 +-
.../api/resource/QueriableResourceProvider.java | 1 -
.../sling/api/resource/QuerySyntaxException.java | 3 +-
.../api/resource/RefreshableResourceProvider.java | 2 -
.../org/apache/sling/api/resource/Resource.java | 65 +-
.../sling/api/resource/ResourceDecorator.java | 36 +-
.../sling/api/resource/ResourceMetadata.java | 9 +-
.../api/resource/ResourceNotFoundException.java | 31 +-
.../sling/api/resource/ResourceProvider.java | 16 +-
.../api/resource/ResourceProviderFactory.java | 7 +-
.../sling/api/resource/ResourceResolver.java | 92 +-
.../api/resource/ResourceResolverFactory.java | 18 +-
.../apache/sling/api/resource/ResourceUtil.java | 110 +-
.../apache/sling/api/resource/ResourceWrapper.java | 13 +-
.../sling/api/resource/SyntheticResource.java | 12 +-
.../org/apache/sling/api/resource/ValueMap.java | 13 +-
.../external/ExternalizableInputStream.java | 5 +-
.../sling/api/resource/external/URIProvider.java | 4 +-
.../sling/api/resource/external/package-info.java | 1 -
.../sling/api/resource/mapping/ResourceMapper.java | 21 +-
.../sling/api/resource/mapping/package-info.java | 1 -
.../api/resource/observation/ResourceChange.java | 34 +-
.../observation/ResourceChangeListener.java | 5 +-
.../api/resource/observation/package-info.java | 1 -
.../apache/sling/api/resource/package-info.java | 1 -
.../org/apache/sling/api/resource/path/Path.java | 28 +-
.../sling/api/resource/path/PathBuilder.java | 8 +-
.../apache/sling/api/resource/path/PathSet.java | 48 +-
.../sling/api/resource/path/package-info.java | 1 -
.../sling/api/resource/runtime/RuntimeService.java | 1 -
.../sling/api/resource/runtime/dto/AuthType.java | 2 -
.../api/resource/runtime/dto/FailureReason.java | 6 +-
.../resource/runtime/dto/ResourceProviderDTO.java | 20 +-
.../runtime/dto/ResourceProviderFailureDTO.java | 2 +-
.../sling/api/resource/runtime/dto/RuntimeDTO.java | 4 +-
.../api/resource/runtime/dto/package-info.java | 1 -
.../sling/api/resource/runtime/package-info.java | 1 -
.../InvalidServiceFilterSyntaxException.java | 5 +-
.../apache/sling/api/scripting/LazyBindings.java | 41 +-
.../api/scripting/ScriptEvaluationException.java | 3 +-
.../apache/sling/api/scripting/SlingBindings.java | 8 +-
.../sling/api/scripting/SlingJakartaBindings.java | 10 +-
.../sling/api/scripting/SlingJakartaScript.java | 7 +-
.../api/scripting/SlingJakartaScriptHelper.java | 21 +-
.../apache/sling/api/scripting/SlingScript.java | 7 +-
.../sling/api/scripting/SlingScriptHelper.java | 22 +-
.../sling/api/scripting/SlingScriptResolver.java | 29 +-
.../apache/sling/api/scripting/package-info.java | 1 -
.../api/security/AccessSecurityException.java | 6 +-
.../sling/api/security/ResourceAccessSecurity.java | 17 +-
.../apache/sling/api/security/package-info.java | 1 -
.../apache/sling/api/servlets/ErrorHandler.java | 8 +-
.../apache/sling/api/servlets/HtmlResponse.java | 54 +-
.../apache/sling/api/servlets/HttpConstants.java | 27 +-
.../sling/api/servlets/JakartaErrorHandler.java | 13 +-
.../sling/api/servlets/JakartaOptingServlet.java | 4 +-
.../apache/sling/api/servlets/OptingServlet.java | 4 +-
.../apache/sling/api/servlets/ServletResolver.java | 25 +-
.../sling/api/servlets/SlingAllMethodsServlet.java | 55 +-
.../servlets/SlingJakartaAllMethodsServlet.java | 56 +-
.../servlets/SlingJakartaSafeMethodsServlet.java | 103 +-
.../api/servlets/SlingSafeMethodsServlet.java | 105 +-
.../apache/sling/api/servlets/package-info.java | 1 -
.../java/org/apache/sling/api/uri/SlingUri.java | 49 +-
.../org/apache/sling/api/uri/SlingUriBuilder.java | 164 +--
.../org/apache/sling/api/uri/package-info.java | 1 -
.../sling/api/wrappers/CompositeValueMap.java | 12 +-
.../DeepReadModifiableValueMapDecorator.java | 4 +-
.../api/wrappers/DeepReadValueMapDecorator.java | 12 +-
.../apache/sling/api/wrappers/IteratorWrapper.java | 30 +-
.../api/wrappers/JakartaToJavaxFilterWrapper.java | 33 +-
.../api/wrappers/JakartaToJavaxRequestWrapper.java | 45 +-
.../wrappers/JakartaToJavaxResponseWrapper.java | 19 +-
.../api/wrappers/JakartaToJavaxServletWrapper.java | 22 +-
.../api/wrappers/JavaxToJakartaFilterWrapper.java | 25 +-
.../api/wrappers/JavaxToJakartaRequestWrapper.java | 42 +-
.../wrappers/JavaxToJakartaResponseWrapper.java | 20 +-
.../api/wrappers/JavaxToJakartaServletWrapper.java | 23 +-
.../api/wrappers/ModifiableValueMapDecorator.java | 8 +-
.../sling/api/wrappers/RequestPathInfoWrapper.java | 2 +-
.../api/wrappers/ResourceResolverWrapper.java | 45 +-
.../wrappers/SlingHttpServletRequestWrapper.java | 17 +-
.../wrappers/SlingHttpServletResponseWrapper.java | 3 +-
.../SlingJakartaHttpServletRequestWrapper.java | 7 +-
.../SlingJakartaHttpServletResponseWrapper.java | 1 -
.../sling/api/wrappers/ValueMapDecorator.java | 8 +-
.../apache/sling/api/wrappers/ValueMapUtil.java | 33 +-
.../sling/api/wrappers/impl/CachingValueMap.java | 12 +-
.../apache/sling/api/wrappers/impl/JcrRules.java | 45 +-
.../sling/api/wrappers/impl/MergingValueMap.java | 5 +-
.../sling/api/wrappers/impl/ObjectConverter.java | 29 +-
.../spi/resource/provider/ObservationReporter.java | 11 +-
.../resource/provider/ObserverConfiguration.java | 15 +-
.../spi/resource/provider/ProviderContext.java | 8 +-
.../resource/provider/QueryLanguageProvider.java | 4 +-
.../spi/resource/provider/ResolveContext.java | 17 +-
.../spi/resource/provider/ResourceContext.java | 4 +-
.../spi/resource/provider/ResourceProvider.java | 56 +-
.../sling/spi/resource/provider/package-info.java | 1 -
.../org/apache/sling/api/SlingExceptionTest.java | 2 -
.../sling/api/adapter/SlingAdaptableTest.java | 39 +-
.../api/request/RequestDispatcherOptionsTest.java | 98 +-
.../apache/sling/api/request/RequestUtilTest.java | 48 +-
.../apache/sling/api/request/ResponseUtilTest.java | 22 +-
.../sling/api/request/builder/BuildersTest.java | 25 +-
.../builder/impl/FastMessageFormatTest.java | 85 +-
.../request/builder/impl/HeaderSupportTest.java | 27 +-
.../request/builder/impl/HttpSessionImplTest.java | 6 +-
.../builder/impl/RequestParameterImplTest.java | 23 +-
.../builder/impl/RequestParameterMapImplTest.java | 11 +-
.../impl/RequestProgressTrackerImplTest.java | 65 +-
.../builder/impl/ServletContextImplTest.java | 168 ++-
.../impl/SlingHttpServletRequestImplTest.java | 269 ++--
.../impl/SlingHttpServletResponseImplTest.java | 91 +-
.../SlingJakartaHttpServletRequestImplTest.java | 261 ++--
.../SlingJakartaHttpServletResponseImplTest.java | 84 +-
.../request/header/JakartaMediaRangeListTest.java | 40 +-
.../api/request/header/MediaRangeListTest.java | 40 +-
.../api/resource/NonExistingResourceTest.java | 21 +-
.../sling/api/resource/ResourceMetadataTest.java | 17 +-
.../sling/api/resource/ResourceUtilTest.java | 97 +-
.../api/resource/impl/ValueMapUtilMergeTest.java | 30 +-
.../observation/ResourceChangeListenerTest.java | 7 +-
.../sling/api/resource/path/PathBuilderTest.java | 4 +-
.../sling/api/resource/path/PathSetTest.java | 44 +-
.../apache/sling/api/resource/path/PathTest.java | 145 +--
.../sling/api/scripting/LazyBindingsTest.java | 53 +-
.../apache/sling/api/uri/SlingUriBuilderTest.java | 56 +-
.../uri/SlingUriBuilderWithAdjustMethodTest.java | 53 +-
.../apache/sling/api/uri/SlingUriEncodingTest.java | 43 +-
.../sling/api/uri/SlingUriInvalidUrisTest.java | 55 +-
.../apache/sling/api/uri/SlingUriRebaseTest.java | 236 ++--
.../org/apache/sling/api/uri/SlingUriTest.java | 1341 ++++++++++++--------
...UriToSlingRequestPathInfoCompatibilityTest.java | 45 +-
.../sling/api/wrappers/CompositeValueMapTest.java | 76 +-
.../api/wrappers/ResourceResolverWrapperTest.java | 55 +-
.../sling/api/wrappers/ValueMapDecoratorTest.java | 128 +-
.../apache/sling/api/wrappers/impl/Convert.java | 68 +-
.../api/wrappers/impl/ObjectConverterTest.java | 284 +++--
193 files changed, 4307 insertions(+), 3326 deletions(-)
diff --git a/pom.xml b/pom.xml
index 6fa9779..acb0ffd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -31,22 +31,20 @@
<version>3.0.0-SNAPSHOT</version>
<name>Apache Sling API</name>
- <description>
- The Apache Sling API defines an extension to the Jakarta Servlet
+ <description>The Apache Sling API defines an extension to the Jakarta Servlet
API 6.0 to provide access to content and unified access
to request parameters hiding the differences between the
different methods of transferring parameters from client
to server. Note that the Apache Sling API bundle does not
include the Servlet API but instead requires the API to
be provided by the Servlet container in which the Apache
- Sling framework is running or by another bundle.
- </description>
+ Sling framework is running or by another bundle.</description>
<scm>
<connection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-api.git</connection>
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-api.git</developerConnection>
<url>https://github.com/apache/sling-org-apache-sling-api.git</url>
- </scm>
+ </scm>
<properties>
<site.jira.version.id>12314252</site.jira.version.id>
@@ -137,7 +135,8 @@
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.resource.filter</artifactId>
<version>1.0.0</version>
- <scope>provided</scope> <!-- just used for javadoc link -->
+ <scope>provided</scope>
+ <!-- just used for javadoc link -->
</dependency>
</dependencies>
@@ -155,7 +154,7 @@
<diffpackage>*</diffpackage>
</diffpackages>
</configuration>
- </plugin>
+ </plugin>
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
diff --git a/src/main/java/org/apache/sling/api/SlingConstants.java b/src/main/java/org/apache/sling/api/SlingConstants.java
index 624c896..d6f4d62 100644
--- a/src/main/java/org/apache/sling/api/SlingConstants.java
+++ b/src/main/java/org/apache/sling/api/SlingConstants.java
@@ -354,13 +354,15 @@ public class SlingConstants {
* The event contains at least the {@link #PROPERTY_PATH} property.
* @since 2.0.6 (Sling API Bundle 2.0.6)
*/
- public static final String TOPIC_RESOURCE_PROVIDER_REMOVED = "org/apache/sling/api/resource/ResourceProvider/REMOVED";
+ public static final String TOPIC_RESOURCE_PROVIDER_REMOVED =
+ "org/apache/sling/api/resource/ResourceProvider/REMOVED";
/**
* The topic for the OSGi event which is sent when the resource mapping changes.
* @since 2.2.0 (Sling API Bundle 2.2.0)
*/
- public static final String TOPIC_RESOURCE_RESOLVER_MAPPING_CHANGED = "org/apache/sling/api/resource/ResourceResolverMapping/CHANGED";
+ public static final String TOPIC_RESOURCE_RESOLVER_MAPPING_CHANGED =
+ "org/apache/sling/api/resource/ResourceResolverMapping/CHANGED";
/**
* The name of the event property holding the resource path.
diff --git a/src/main/java/org/apache/sling/api/SlingException.java b/src/main/java/org/apache/sling/api/SlingException.java
index e06e816..2c2a02a 100644
--- a/src/main/java/org/apache/sling/api/SlingException.java
+++ b/src/main/java/org/apache/sling/api/SlingException.java
@@ -79,4 +79,4 @@ public class SlingException extends RuntimeException {
protected SlingException(Throwable cause) {
super(cause);
}
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/apache/sling/api/SlingHttpServletRequest.java b/src/main/java/org/apache/sling/api/SlingHttpServletRequest.java
index e78f9c9..0c7132e 100644
--- a/src/main/java/org/apache/sling/api/SlingHttpServletRequest.java
+++ b/src/main/java/org/apache/sling/api/SlingHttpServletRequest.java
@@ -18,17 +18,15 @@
*/
package org.apache.sling.api;
+import javax.servlet.RequestDispatcher;
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletRequest;
+
import java.util.Enumeration;
import java.util.List;
import java.util.Locale;
import java.util.ResourceBundle;
-import org.jetbrains.annotations.Nullable;
-import org.jetbrains.annotations.NotNull;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-
import org.apache.sling.api.adapter.Adaptable;
import org.apache.sling.api.request.RequestDispatcherOptions;
import org.apache.sling.api.request.RequestParameter;
@@ -37,7 +35,8 @@ 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;
+import org.jetbrains.annotations.Nullable;
import org.osgi.annotation.versioning.ProviderType;
/**
@@ -73,7 +72,8 @@ public interface SlingHttpServletRequest extends HttpServletRequest, Adaptable {
*
* @return The <code>Resource</code> object of this request.
*/
- @NotNull Resource getResource();
+ @NotNull
+ Resource getResource();
/**
* Returns the {@link ResourceResolver} which resolved the
@@ -81,14 +81,16 @@ public interface SlingHttpServletRequest extends HttpServletRequest, Adaptable {
*
* @return The resource resolver
*/
- @NotNull ResourceResolver getResourceResolver();
+ @NotNull
+ ResourceResolver getResourceResolver();
/**
* Returns the {@link RequestPathInfo} pertaining to this request.
*
* @return the request path info.
*/
- @NotNull RequestPathInfo getRequestPathInfo();
+ @NotNull
+ RequestPathInfo getRequestPathInfo();
/**
* Returns the value of a request parameter as a {@link RequestParameter},
@@ -112,7 +114,8 @@ public interface SlingHttpServletRequest extends HttpServletRequest, Adaptable {
* @see RequestParameterMap#getValue(String)
* @throws IllegalArgumentException if name is <code>null</code>.
*/
- @Nullable RequestParameter getRequestParameter(@NotNull String name);
+ @Nullable
+ RequestParameter getRequestParameter(@NotNull String name);
/**
* Returns an array of {@link RequestParameter} objects containing all of
@@ -132,7 +135,8 @@ public interface SlingHttpServletRequest extends HttpServletRequest, Adaptable {
* @see RequestParameterMap#getValues(String)
* @throws IllegalArgumentException if name is <code>null</code>.
*/
- @Nullable RequestParameter[] getRequestParameters(@NotNull String name);
+ @Nullable
+ RequestParameter[] getRequestParameters(@NotNull String name);
/**
* Returns a <code>Map</code> of the parameters of this request.
@@ -148,7 +152,8 @@ public interface SlingHttpServletRequest extends HttpServletRequest, Adaptable {
* parameter map are of type String. The values in the parameter map
* are of type {@link RequestParameter} array (<code>RequestParameter[]</code>).
*/
- @NotNull RequestParameterMap getRequestParameterMap();
+ @NotNull
+ RequestParameterMap getRequestParameterMap();
/**
* Returns the request parameters as instances of the
@@ -160,7 +165,8 @@ public interface SlingHttpServletRequest extends HttpServletRequest, Adaptable {
* order.
* @since 2.3 (Sling API Bundle 2.6.0)
*/
- @NotNull List<RequestParameter> getRequestParameterList();
+ @NotNull
+ List<RequestParameter> getRequestParameterList();
/**
* Returns a <code>RequestDispatcher</code> object that acts as a wrapper
@@ -179,8 +185,8 @@ public interface SlingHttpServletRequest extends HttpServletRequest, Adaptable {
* for the <code>resource</code> or <code>null</code> if an
* error occurs preparing the dispatcher.
*/
- @Nullable RequestDispatcher getRequestDispatcher(@NotNull String path,
- RequestDispatcherOptions options);
+ @Nullable
+ RequestDispatcher getRequestDispatcher(@NotNull String path, RequestDispatcherOptions options);
/**
* Returns a <code>RequestDispatcher</code> object that acts as a wrapper
@@ -198,8 +204,8 @@ public interface SlingHttpServletRequest extends HttpServletRequest, Adaptable {
* for the <code>resource</code> or <code>null</code> if an
* error occurs preparing the dispatcher.
*/
- @Nullable RequestDispatcher getRequestDispatcher(@NotNull Resource resource,
- RequestDispatcherOptions options);
+ @Nullable
+ RequestDispatcher getRequestDispatcher(@NotNull Resource resource, RequestDispatcherOptions options);
/**
* Same as {@link #getRequestDispatcher(Resource,RequestDispatcherOptions)}
@@ -210,7 +216,8 @@ public interface SlingHttpServletRequest extends HttpServletRequest, Adaptable {
* for the <code>resource</code> or <code>null</code> if an
* error occurs preparing the dispatcher.
*/
- @Nullable RequestDispatcher getRequestDispatcher(@NotNull Resource resource);
+ @Nullable
+ RequestDispatcher getRequestDispatcher(@NotNull Resource resource);
/**
* Returns the named cookie from the HTTP request or <code>null</code> if
@@ -219,7 +226,8 @@ public interface SlingHttpServletRequest extends HttpServletRequest, Adaptable {
* @param name The name of the cookie to return.
* @return The named cookie or <code>null</code> if no such cookie exists.
*/
- @Nullable Cookie getCookie(String name);
+ @Nullable
+ Cookie getCookie(String name);
/**
* Returns the framework preferred content type for the response. The
@@ -231,7 +239,8 @@ public interface SlingHttpServletRequest extends HttpServletRequest, Adaptable {
*
* @return preferred MIME type of the response
*/
- @Nullable String getResponseContentType();
+ @Nullable
+ String getResponseContentType();
/**
* Gets a list of content types which the framework accepts for the
@@ -246,7 +255,8 @@ public interface SlingHttpServletRequest extends HttpServletRequest, Adaptable {
*
* @return ordered list of MIME types for the response
*/
- @NotNull Enumeration<String> getResponseContentTypes();
+ @NotNull
+ Enumeration<String> getResponseContentTypes();
/**
* Returns the resource bundle for the given locale.
@@ -256,7 +266,8 @@ public interface SlingHttpServletRequest extends HttpServletRequest, Adaptable {
* {@link #getLocale()} is used to select the resource bundle.
* @return the resource bundle for the given locale
*/
- @Nullable ResourceBundle getResourceBundle(Locale locale);
+ @Nullable
+ ResourceBundle getResourceBundle(Locale locale);
/**
* Returns the resource bundle of the given base name for the given locale.
@@ -270,14 +281,15 @@ public interface SlingHttpServletRequest extends HttpServletRequest, Adaptable {
* {@link #getLocale()} is used to select the resource bundle.
* @return the resource bundle for the given locale
*/
- @Nullable ResourceBundle getResourceBundle(String baseName, Locale locale);
+ @Nullable
+ ResourceBundle getResourceBundle(String baseName, Locale locale);
/**
* Returns the {@link RequestProgressTracker} of this request.
* @return The request progress tracker.
*/
- @NotNull RequestProgressTracker getRequestProgressTracker();
-
+ @NotNull
+ RequestProgressTracker getRequestProgressTracker();
/**
* Returns a {@code java.security.Principal} object containing
@@ -292,30 +304,33 @@ public interface SlingHttpServletRequest extends HttpServletRequest, Adaptable {
* @see #getAuthType()
* @see #getRemoteUser()
*/
- @Nullable java.security.Principal getUserPrincipal();
+ @Nullable
+ java.security.Principal getUserPrincipal();
- /**
- * Returns the name of the authentication scheme used to protect
- * the servlet. All servlet containers support basic, form and client
- * certificate authentication, and may additionally support digest
- * authentication.
- * If the request is not authenticated {@code null} is returned.
- *
- * @return the authentication scheme or {code null}
- * @see getRemoteUser()
- * @see HttpServletRequest#getAuthType()
- */
- @Nullable String getAuthType();
+ /**
+ * Returns the name of the authentication scheme used to protect
+ * the servlet. All servlet containers support basic, form and client
+ * certificate authentication, and may additionally support digest
+ * authentication.
+ * If the request is not authenticated {@code null} is returned.
+ *
+ * @return the authentication scheme or {code null}
+ * @see getRemoteUser()
+ * @see HttpServletRequest#getAuthType()
+ */
+ @Nullable
+ String getAuthType();
- /**
- * Returns the login of the user making this request, if the
- * user has been authenticated, or {@code null} if the user
- * has not been authenticated.
- *
- * @return a {@code String} specifying the login of the user making
- * this request, or {@code null}
- * @see getAuthType()
- * @see HttpServletRequest#getRemoteUser()
- */
- @Nullable String getRemoteUser();
+ /**
+ * Returns the login of the user making this request, if the
+ * user has been authenticated, or {@code null} if the user
+ * has not been authenticated.
+ *
+ * @return a {@code String} specifying the login of the user making
+ * this request, or {@code null}
+ * @see getAuthType()
+ * @see HttpServletRequest#getRemoteUser()
+ */
+ @Nullable
+ String getRemoteUser();
}
diff --git a/src/main/java/org/apache/sling/api/SlingHttpServletResponse.java b/src/main/java/org/apache/sling/api/SlingHttpServletResponse.java
index 3137db6..eab7bed 100644
--- a/src/main/java/org/apache/sling/api/SlingHttpServletResponse.java
+++ b/src/main/java/org/apache/sling/api/SlingHttpServletResponse.java
@@ -37,7 +37,4 @@ import org.osgi.annotation.versioning.ProviderType;
*/
@ProviderType
@Deprecated
-public interface SlingHttpServletResponse extends HttpServletResponse,
- Adaptable {
-
-}
+public interface SlingHttpServletResponse extends HttpServletResponse, Adaptable {}
diff --git a/src/main/java/org/apache/sling/api/SlingIOException.java b/src/main/java/org/apache/sling/api/SlingIOException.java
index 13f9ee1..66b43a9 100644
--- a/src/main/java/org/apache/sling/api/SlingIOException.java
+++ b/src/main/java/org/apache/sling/api/SlingIOException.java
@@ -33,5 +33,4 @@ public class SlingIOException extends SlingException {
public SlingIOException(IOException cause) {
super(cause);
}
-
}
diff --git a/src/main/java/org/apache/sling/api/SlingJakartaHttpServletRequest.java b/src/main/java/org/apache/sling/api/SlingJakartaHttpServletRequest.java
index 851e2ee..5f32c35 100644
--- a/src/main/java/org/apache/sling/api/SlingJakartaHttpServletRequest.java
+++ b/src/main/java/org/apache/sling/api/SlingJakartaHttpServletRequest.java
@@ -23,12 +23,9 @@ import java.util.List;
import java.util.Locale;
import java.util.ResourceBundle;
-import org.jetbrains.annotations.Nullable;
-import org.jetbrains.annotations.NotNull;
import jakarta.servlet.RequestDispatcher;
import jakarta.servlet.http.Cookie;
import jakarta.servlet.http.HttpServletRequest;
-
import org.apache.sling.api.adapter.Adaptable;
import org.apache.sling.api.request.RequestDispatcherOptions;
import org.apache.sling.api.request.RequestParameter;
@@ -37,7 +34,8 @@ 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;
+import org.jetbrains.annotations.Nullable;
import org.osgi.annotation.versioning.ProviderType;
/**
@@ -70,7 +68,8 @@ public interface SlingJakartaHttpServletRequest extends HttpServletRequest, Adap
*
* @return The <code>Resource</code> object of this request.
*/
- @NotNull Resource getResource();
+ @NotNull
+ Resource getResource();
/**
* Returns the {@link ResourceResolver} which resolved the
@@ -78,14 +77,16 @@ public interface SlingJakartaHttpServletRequest extends HttpServletRequest, Adap
*
* @return The resource resolver
*/
- @NotNull ResourceResolver getResourceResolver();
+ @NotNull
+ ResourceResolver getResourceResolver();
/**
* Returns the {@link RequestPathInfo} pertaining to this request.
*
* @return the request path info.
*/
- @NotNull RequestPathInfo getRequestPathInfo();
+ @NotNull
+ RequestPathInfo getRequestPathInfo();
/**
* Returns the value of a request parameter as a {@link RequestParameter},
@@ -109,7 +110,8 @@ public interface SlingJakartaHttpServletRequest extends HttpServletRequest, Adap
* @see RequestParameterMap#getValue(String)
* @throws IllegalArgumentException if name is <code>null</code>.
*/
- @Nullable RequestParameter getRequestParameter(@NotNull String name);
+ @Nullable
+ RequestParameter getRequestParameter(@NotNull String name);
/**
* Returns an array of {@link RequestParameter} objects containing all of
@@ -129,7 +131,8 @@ public interface SlingJakartaHttpServletRequest extends HttpServletRequest, Adap
* @see RequestParameterMap#getValues(String)
* @throws IllegalArgumentException if name is <code>null</code>.
*/
- @Nullable RequestParameter[] getRequestParameters(@NotNull String name);
+ @Nullable
+ RequestParameter[] getRequestParameters(@NotNull String name);
/**
* Returns a <code>Map</code> of the parameters of this request.
@@ -145,7 +148,8 @@ public interface SlingJakartaHttpServletRequest extends HttpServletRequest, Adap
* parameter map are of type String. The values in the parameter map
* are of type {@link RequestParameter} array (<code>RequestParameter[]</code>).
*/
- @NotNull RequestParameterMap getRequestParameterMap();
+ @NotNull
+ RequestParameterMap getRequestParameterMap();
/**
* Returns the request parameters as instances of the
@@ -157,7 +161,8 @@ public interface SlingJakartaHttpServletRequest extends HttpServletRequest, Adap
* order.
* @since 2.3 (Sling API Bundle 2.6.0)
*/
- @NotNull List<RequestParameter> getRequestParameterList();
+ @NotNull
+ List<RequestParameter> getRequestParameterList();
/**
* Returns a <code>RequestDispatcher</code> object that acts as a wrapper
@@ -176,8 +181,8 @@ public interface SlingJakartaHttpServletRequest extends HttpServletRequest, Adap
* for the <code>resource</code> or <code>null</code> if an
* error occurs preparing the dispatcher.
*/
- @Nullable RequestDispatcher getRequestDispatcher(@NotNull String path,
- RequestDispatcherOptions options);
+ @Nullable
+ RequestDispatcher getRequestDispatcher(@NotNull String path, RequestDispatcherOptions options);
/**
* Returns a <code>RequestDispatcher</code> object that acts as a wrapper
@@ -195,8 +200,8 @@ public interface SlingJakartaHttpServletRequest extends HttpServletRequest, Adap
* for the <code>resource</code> or <code>null</code> if an
* error occurs preparing the dispatcher.
*/
- @Nullable RequestDispatcher getRequestDispatcher(@NotNull Resource resource,
- RequestDispatcherOptions options);
+ @Nullable
+ RequestDispatcher getRequestDispatcher(@NotNull Resource resource, RequestDispatcherOptions options);
/**
* Same as {@link #getRequestDispatcher(Resource,RequestDispatcherOptions)}
@@ -207,7 +212,8 @@ public interface SlingJakartaHttpServletRequest extends HttpServletRequest, Adap
* for the <code>resource</code> or <code>null</code> if an
* error occurs preparing the dispatcher.
*/
- @Nullable RequestDispatcher getRequestDispatcher(@NotNull Resource resource);
+ @Nullable
+ RequestDispatcher getRequestDispatcher(@NotNull Resource resource);
/**
* Returns the named cookie from the HTTP request or <code>null</code> if
@@ -216,7 +222,8 @@ public interface SlingJakartaHttpServletRequest extends HttpServletRequest, Adap
* @param name The name of the cookie to return.
* @return The named cookie or <code>null</code> if no such cookie exists.
*/
- @Nullable Cookie getCookie(String name);
+ @Nullable
+ Cookie getCookie(String name);
/**
* Returns the framework preferred content type for the response. The
@@ -228,7 +235,8 @@ public interface SlingJakartaHttpServletRequest extends HttpServletRequest, Adap
*
* @return preferred MIME type of the response
*/
- @Nullable String getResponseContentType();
+ @Nullable
+ String getResponseContentType();
/**
* Gets a list of content types which the framework accepts for the
@@ -243,7 +251,8 @@ public interface SlingJakartaHttpServletRequest extends HttpServletRequest, Adap
*
* @return ordered list of MIME types for the response
*/
- @NotNull Enumeration<String> getResponseContentTypes();
+ @NotNull
+ Enumeration<String> getResponseContentTypes();
/**
* Returns the resource bundle for the given locale.
@@ -253,7 +262,8 @@ public interface SlingJakartaHttpServletRequest extends HttpServletRequest, Adap
* {@link #getLocale()} is used to select the resource bundle.
* @return the resource bundle for the given locale
*/
- @Nullable ResourceBundle getResourceBundle(Locale locale);
+ @Nullable
+ ResourceBundle getResourceBundle(Locale locale);
/**
* Returns the resource bundle of the given base name for the given locale.
@@ -267,14 +277,15 @@ public interface SlingJakartaHttpServletRequest extends HttpServletRequest, Adap
* {@link #getLocale()} is used to select the resource bundle.
* @return the resource bundle for the given locale
*/
- @Nullable ResourceBundle getResourceBundle(String baseName, Locale locale);
+ @Nullable
+ ResourceBundle getResourceBundle(String baseName, Locale locale);
/**
* Returns the {@link RequestProgressTracker} of this request.
* @return The request progress tracker.
*/
- @NotNull RequestProgressTracker getRequestProgressTracker();
-
+ @NotNull
+ RequestProgressTracker getRequestProgressTracker();
/**
* Returns a {@code java.security.Principal} object containing
@@ -289,30 +300,33 @@ public interface SlingJakartaHttpServletRequest extends HttpServletRequest, Adap
* @see #getAuthType()
* @see #getRemoteUser()
*/
- @Nullable java.security.Principal getUserPrincipal();
+ @Nullable
+ java.security.Principal getUserPrincipal();
- /**
- * Returns the name of the authentication scheme used to protect
- * the servlet. All servlet containers support basic, form and client
- * certificate authentication, and may additionally support digest
- * authentication.
- * If the request is not authenticated {@code null} is returned.
- *
- * @return the authentication scheme or {code null}
- * @see getRemoteUser()
- * @see HttpServletRequest#getAuthType()
- */
- @Nullable String getAuthType();
+ /**
+ * Returns the name of the authentication scheme used to protect
+ * the servlet. All servlet containers support basic, form and client
+ * certificate authentication, and may additionally support digest
+ * authentication.
+ * If the request is not authenticated {@code null} is returned.
+ *
+ * @return the authentication scheme or {code null}
+ * @see getRemoteUser()
+ * @see HttpServletRequest#getAuthType()
+ */
+ @Nullable
+ String getAuthType();
- /**
- * Returns the login of the user making this request, if the
- * user has been authenticated, or {@code null} if the user
- * has not been authenticated.
- *
- * @return a {@code String} specifying the login of the user making
- * this request, or {@code null}
- * @see getAuthType()
- * @see HttpServletRequest#getRemoteUser()
- */
- @Nullable String getRemoteUser();
+ /**
+ * Returns the login of the user making this request, if the
+ * user has been authenticated, or {@code null} if the user
+ * has not been authenticated.
+ *
+ * @return a {@code String} specifying the login of the user making
+ * this request, or {@code null}
+ * @see getAuthType()
+ * @see HttpServletRequest#getRemoteUser()
+ */
+ @Nullable
+ String getRemoteUser();
}
diff --git a/src/main/java/org/apache/sling/api/SlingJakartaHttpServletResponse.java b/src/main/java/org/apache/sling/api/SlingJakartaHttpServletResponse.java
index d563add..6a781fd 100644
--- a/src/main/java/org/apache/sling/api/SlingJakartaHttpServletResponse.java
+++ b/src/main/java/org/apache/sling/api/SlingJakartaHttpServletResponse.java
@@ -19,7 +19,6 @@
package org.apache.sling.api;
import jakarta.servlet.http.HttpServletResponse;
-
import org.apache.sling.api.adapter.Adaptable;
import org.osgi.annotation.versioning.ProviderType;
@@ -34,7 +33,4 @@ import org.osgi.annotation.versioning.ProviderType;
* {@link Adaptable} interface.
*/
@ProviderType
-public interface SlingJakartaHttpServletResponse extends HttpServletResponse,
- Adaptable {
-
-}
+public interface SlingJakartaHttpServletResponse extends HttpServletResponse, Adaptable {}
diff --git a/src/main/java/org/apache/sling/api/adapter/Adaptable.java b/src/main/java/org/apache/sling/api/adapter/Adaptable.java
index dac47dd..7f48e72 100644
--- a/src/main/java/org/apache/sling/api/adapter/Adaptable.java
+++ b/src/main/java/org/apache/sling/api/adapter/Adaptable.java
@@ -18,9 +18,8 @@
*/
package org.apache.sling.api.adapter;
-import org.jetbrains.annotations.Nullable;
import org.jetbrains.annotations.NotNull;
-
+import org.jetbrains.annotations.Nullable;
import org.osgi.annotation.versioning.ConsumerType;
/**
@@ -52,6 +51,6 @@ public interface Adaptable {
* @return The adapter target or <code>null</code> if the object cannot
* adapt to the requested type
*/
- @Nullable <AdapterType> AdapterType adaptTo(@NotNull Class<AdapterType> type);
-
+ @Nullable
+ <AdapterType> AdapterType adaptTo(@NotNull Class<AdapterType> type);
}
diff --git a/src/main/java/org/apache/sling/api/adapter/AdapterFactory.java b/src/main/java/org/apache/sling/api/adapter/AdapterFactory.java
index 3224af5..daa4150 100644
--- a/src/main/java/org/apache/sling/api/adapter/AdapterFactory.java
+++ b/src/main/java/org/apache/sling/api/adapter/AdapterFactory.java
@@ -18,9 +18,8 @@
*/
package org.apache.sling.api.adapter;
-import org.jetbrains.annotations.Nullable;
import org.jetbrains.annotations.NotNull;
-
+import org.jetbrains.annotations.Nullable;
import org.osgi.annotation.versioning.ConsumerType;
/**
@@ -92,7 +91,6 @@ public interface AdapterFactory {
* @return The adapted object or <code>null</code> if this factory instance
* cannot adapt the object.
*/
- @Nullable <AdapterType> AdapterType getAdapter(@NotNull Object adaptable,
- @NotNull Class<AdapterType> type);
-
+ @Nullable
+ <AdapterType> AdapterType getAdapter(@NotNull Object adaptable, @NotNull Class<AdapterType> type);
}
diff --git a/src/main/java/org/apache/sling/api/adapter/AdapterManager.java b/src/main/java/org/apache/sling/api/adapter/AdapterManager.java
index 81a22ae..f656390 100644
--- a/src/main/java/org/apache/sling/api/adapter/AdapterManager.java
+++ b/src/main/java/org/apache/sling/api/adapter/AdapterManager.java
@@ -18,9 +18,8 @@
*/
package org.apache.sling.api.adapter;
-import org.jetbrains.annotations.Nullable;
import org.jetbrains.annotations.NotNull;
-
+import org.jetbrains.annotations.Nullable;
import org.osgi.annotation.versioning.ProviderType;
/**
@@ -60,7 +59,6 @@ public interface AdapterManager {
* or if the <code>adaptable</code> cannot be adapted for any other
* reason.
*/
- @Nullable <AdapterType> AdapterType getAdapter(@NotNull Object adaptable,
- @NotNull Class<AdapterType> type);
-
-}
\ No newline at end of file
+ @Nullable
+ <AdapterType> AdapterType getAdapter(@NotNull Object adaptable, @NotNull Class<AdapterType> type);
+}
diff --git a/src/main/java/org/apache/sling/api/adapter/SlingAdaptable.java b/src/main/java/org/apache/sling/api/adapter/SlingAdaptable.java
index 5adf0ce..9aa6111 100644
--- a/src/main/java/org/apache/sling/api/adapter/SlingAdaptable.java
+++ b/src/main/java/org/apache/sling/api/adapter/SlingAdaptable.java
@@ -95,15 +95,15 @@ public abstract class SlingAdaptable implements Adaptable {
@SuppressWarnings("unchecked")
public <AdapterType> AdapterType adaptTo(Class<AdapterType> type) {
AdapterType result = null;
- synchronized ( this ) {
- if ( adaptersCache != null ) {
+ synchronized (this) {
+ if (adaptersCache != null) {
result = (AdapterType) adaptersCache.get(type);
}
- if ( result == null ) {
+ if (result == null) {
final AdapterManager mgr = ADAPTER_MANAGER;
result = (mgr == null ? null : mgr.getAdapter(this, type));
- if ( result != null ) {
- if ( adaptersCache == null ) {
+ if (result != null) {
+ if (adaptersCache == null) {
adaptersCache = new HashMap<Class<?>, Object>();
}
adaptersCache.put(type, result);
diff --git a/src/main/java/org/apache/sling/api/adapter/package-info.java b/src/main/java/org/apache/sling/api/adapter/package-info.java
index 37f9449..5d5e6ef 100644
--- a/src/main/java/org/apache/sling/api/adapter/package-info.java
+++ b/src/main/java/org/apache/sling/api/adapter/package-info.java
@@ -21,4 +21,3 @@
package org.apache.sling.api.adapter;
import org.osgi.annotation.versioning.Version;
-
diff --git a/src/main/java/org/apache/sling/api/auth/Authenticator.java b/src/main/java/org/apache/sling/api/auth/Authenticator.java
index f450a79..1f33d6f 100644
--- a/src/main/java/org/apache/sling/api/auth/Authenticator.java
+++ b/src/main/java/org/apache/sling/api/auth/Authenticator.java
@@ -18,10 +18,9 @@
*/
package org.apache.sling.api.auth;
-import org.jetbrains.annotations.NotNull;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
-
+import org.jetbrains.annotations.NotNull;
import org.osgi.annotation.versioning.ProviderType;
/**
@@ -130,7 +129,9 @@ public interface Authenticator {
* @deprecated Use {@link #login(HttpServletRequest, HttpServletResponse)} instead.
*/
@Deprecated
- void login(@NotNull javax.servlet.http.HttpServletRequest request, @NotNull javax.servlet.http.HttpServletResponse response);
+ void login(
+ @NotNull javax.servlet.http.HttpServletRequest request,
+ @NotNull javax.servlet.http.HttpServletResponse response);
/**
* Logs out if the current request is authenticated.
@@ -159,5 +160,7 @@ public interface Authenticator {
* @deprecated Use {@link #logout(HttpServletRequest, HttpServletResponse)} instead.
*/
@Deprecated
- void logout(@NotNull javax.servlet.http.HttpServletRequest request, @NotNull javax.servlet.http.HttpServletResponse response);
+ void logout(
+ @NotNull javax.servlet.http.HttpServletRequest request,
+ @NotNull javax.servlet.http.HttpServletResponse response);
}
diff --git a/src/main/java/org/apache/sling/api/auth/NoAuthenticationHandlerException.java b/src/main/java/org/apache/sling/api/auth/NoAuthenticationHandlerException.java
index 12727fc..4558c14 100644
--- a/src/main/java/org/apache/sling/api/auth/NoAuthenticationHandlerException.java
+++ b/src/main/java/org/apache/sling/api/auth/NoAuthenticationHandlerException.java
@@ -42,5 +42,4 @@ public class NoAuthenticationHandlerException extends SlingException {
public NoAuthenticationHandlerException() {
super();
}
-
}
diff --git a/src/main/java/org/apache/sling/api/auth/package-info.java b/src/main/java/org/apache/sling/api/auth/package-info.java
index eabf8d2..12e2dd3 100644
--- a/src/main/java/org/apache/sling/api/auth/package-info.java
+++ b/src/main/java/org/apache/sling/api/auth/package-info.java
@@ -21,4 +21,3 @@
package org.apache.sling.api.auth;
import org.osgi.annotation.versioning.Version;
-
diff --git a/src/main/java/org/apache/sling/api/package-info.java b/src/main/java/org/apache/sling/api/package-info.java
index 7594503..7c3eaf8 100644
--- a/src/main/java/org/apache/sling/api/package-info.java
+++ b/src/main/java/org/apache/sling/api/package-info.java
@@ -21,4 +21,3 @@
package org.apache.sling.api;
import org.osgi.annotation.versioning.Version;
-
diff --git a/src/main/java/org/apache/sling/api/request/RecursionTooDeepException.java b/src/main/java/org/apache/sling/api/request/RecursionTooDeepException.java
index 0df98a0..04c8698 100644
--- a/src/main/java/org/apache/sling/api/request/RecursionTooDeepException.java
+++ b/src/main/java/org/apache/sling/api/request/RecursionTooDeepException.java
@@ -42,5 +42,4 @@ public class RecursionTooDeepException extends SlingException {
public RecursionTooDeepException(String resourcePath) {
super(resourcePath);
}
-
}
diff --git a/src/main/java/org/apache/sling/api/request/RequestDispatcherOptions.java b/src/main/java/org/apache/sling/api/request/RequestDispatcherOptions.java
index 86ed85f..61afc46 100644
--- a/src/main/java/org/apache/sling/api/request/RequestDispatcherOptions.java
+++ b/src/main/java/org/apache/sling/api/request/RequestDispatcherOptions.java
@@ -82,8 +82,7 @@ public class RequestDispatcherOptions extends HashMap<String, String> {
/**
* Creates an instance with no options set.
*/
- public RequestDispatcherOptions() {
- }
+ public RequestDispatcherOptions() {}
/**
* Creates a new instances setting options by parsing the given
@@ -114,8 +113,9 @@ public class RequestDispatcherOptions extends HashMap<String, String> {
String entry = tk.nextToken();
int equals = entry.indexOf('=');
if (equals > 0 && equals < entry.length() - 1) {
- put(entry.substring(0, equals).trim(), entry.substring(
- equals + 1).trim());
+ put(
+ entry.substring(0, equals).trim(),
+ entry.substring(equals + 1).trim());
}
}
}
@@ -204,7 +204,7 @@ public class RequestDispatcherOptions extends HashMap<String, String> {
return get(OPT_REPLACE_SUFFIX);
}
- /**
+ /**
* Sets the {@link #OPT_REPLACE_EXTENSION} option to the given
* <code>replaceExtension</code> if not <code>null</code>.
* If this value contains an empty string, the original extension
@@ -228,7 +228,7 @@ public class RequestDispatcherOptions extends HashMap<String, String> {
return get(OPT_REPLACE_EXTENSION);
}
- /**
+ /**
* Sets the {@link #OPT_PROTECT_HEADERS_ON_INCLUDE} option to the given
* value.
* @param flag The value to set
diff --git a/src/main/java/org/apache/sling/api/request/RequestParameter.java b/src/main/java/org/apache/sling/api/request/RequestParameter.java
index e1b3a6a..3a2d068 100644
--- a/src/main/java/org/apache/sling/api/request/RequestParameter.java
+++ b/src/main/java/org/apache/sling/api/request/RequestParameter.java
@@ -22,9 +22,8 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.UnsupportedEncodingException;
-import org.jetbrains.annotations.Nullable;
import org.jetbrains.annotations.NotNull;
-
+import org.jetbrains.annotations.Nullable;
import org.osgi.annotation.versioning.ProviderType;
/**
@@ -45,7 +44,8 @@ public interface RequestParameter {
* @return the name of this {@code RequestParameter}
* @since 2.4 (Sling API Bundle 2.6)
*/
- @NotNull String getName();
+ @NotNull
+ String getName();
/**
* Determines whether or not this instance represents a simple form field or
@@ -63,7 +63,8 @@ public interface RequestParameter {
* @return The content type passed by the browser or <code>null</code> if
* not defined.
*/
- @Nullable String getContentType();
+ @Nullable
+ String getContentType();
/**
* Returns the size in bytes of the parameter.
@@ -91,7 +92,8 @@ public interface RequestParameter {
* file.
* @throws IOException if an error occurs.
*/
- @Nullable InputStream getInputStream() throws IOException;
+ @Nullable
+ InputStream getInputStream() throws IOException;
/**
* Returns the original filename in the client's filesystem, as provided by
@@ -101,7 +103,8 @@ public interface RequestParameter {
*
* @return The original filename in the client's filesystem.
*/
- @Nullable String getFileName();
+ @Nullable
+ String getFileName();
/**
* Returns the contents of the parameter as a String, using the default
@@ -110,7 +113,8 @@ public interface RequestParameter {
*
* @return The contents of the parameter, as a string.
*/
- @NotNull String getString();
+ @NotNull
+ String getString();
/**
* Returns the contents of the parameter as a String, using the specified
@@ -122,6 +126,6 @@ public interface RequestParameter {
* @throws UnsupportedEncodingException if the requested character encoding
* is not available.
*/
- @NotNull String getString(@NotNull String encoding) throws UnsupportedEncodingException;
-
+ @NotNull
+ String getString(@NotNull String encoding) throws UnsupportedEncodingException;
}
diff --git a/src/main/java/org/apache/sling/api/request/RequestParameterMap.java b/src/main/java/org/apache/sling/api/request/RequestParameterMap.java
index bab958f..902b7eb 100644
--- a/src/main/java/org/apache/sling/api/request/RequestParameterMap.java
+++ b/src/main/java/org/apache/sling/api/request/RequestParameterMap.java
@@ -20,12 +20,10 @@ package org.apache.sling.api.request;
import java.util.Map;
-import org.jetbrains.annotations.Nullable;
import org.jetbrains.annotations.NotNull;
-
+import org.jetbrains.annotations.Nullable;
import org.osgi.annotation.versioning.ProviderType;
-
/**
* The <code>RequestParameterMap</code> encapsulates all request parameters of
* a request.
@@ -38,12 +36,14 @@ public interface RequestParameterMap extends Map<String, RequestParameter[]> {
* @param name The parameter name
* @return The request parameter array or {@code null}.
*/
- @Nullable RequestParameter[] getValues(@NotNull String name);
+ @Nullable
+ RequestParameter[] getValues(@NotNull String name);
/**
* Returns the first value for the named parameter or null if none
* @param name The parameter name
* @return The request parameter or {@code null}.
*/
- @Nullable RequestParameter getValue(String name);
+ @Nullable
+ RequestParameter getValue(String name);
}
diff --git a/src/main/java/org/apache/sling/api/request/RequestPathInfo.java b/src/main/java/org/apache/sling/api/request/RequestPathInfo.java
index ce07ae3..e1bece1 100644
--- a/src/main/java/org/apache/sling/api/request/RequestPathInfo.java
+++ b/src/main/java/org/apache/sling/api/request/RequestPathInfo.java
@@ -1,26 +1,26 @@
/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
package org.apache.sling.api.request;
-import org.jetbrains.annotations.Nullable;
-import org.jetbrains.annotations.NotNull;
-
import org.apache.sling.api.resource.Resource;
-
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.osgi.annotation.versioning.ProviderType;
/**
@@ -163,7 +163,8 @@ public interface RequestPathInfo {
* of the resource.
* @return The resource path
*/
- @NotNull String getResourcePath();
+ @NotNull
+ String getResourcePath();
/**
* Returns the extension from the URL or <code>null</code> if the request
@@ -174,7 +175,8 @@ public interface RequestPathInfo {
*
* @return The extension from the request URL.
*/
- @Nullable String getExtension();
+ @Nullable
+ String getExtension();
/**
* Returns the selectors decoded from the request URL as string. Returns
@@ -186,7 +188,8 @@ public interface RequestPathInfo {
* @return The selector string or {@code null}
* @see #getSelectors()
*/
- @Nullable String getSelectorString();
+ @Nullable
+ String getSelectorString();
/**
* Returns the selectors decoded from the request URL as an array of
@@ -200,7 +203,8 @@ public interface RequestPathInfo {
* @return An array of selectors
* @see #getSelectorString()
*/
- @NotNull String[] getSelectors();
+ @NotNull
+ String[] getSelectors();
/**
* Returns the suffix part of the URL or <code>null</code> if the request
@@ -211,7 +215,8 @@ public interface RequestPathInfo {
*
* @return The suffix part of the request URL.
*/
- @Nullable String getSuffix();
+ @Nullable
+ String getSuffix();
/**
* Returns the resource addressed by the suffix or null if the request does
@@ -225,5 +230,6 @@ public interface RequestPathInfo {
*
* @since 2.3 (Sling API Bundle 2.3.2)
*/
- @Nullable Resource getSuffixResource();
+ @Nullable
+ Resource getSuffixResource();
}
diff --git a/src/main/java/org/apache/sling/api/request/RequestProgressTracker.java b/src/main/java/org/apache/sling/api/request/RequestProgressTracker.java
index 32f5ebf..89aecf2 100644
--- a/src/main/java/org/apache/sling/api/request/RequestProgressTracker.java
+++ b/src/main/java/org/apache/sling/api/request/RequestProgressTracker.java
@@ -21,9 +21,8 @@ package org.apache.sling.api.request;
import java.io.PrintWriter;
import java.util.Iterator;
-import org.jetbrains.annotations.Nullable;
import org.jetbrains.annotations.NotNull;
-
+import org.jetbrains.annotations.Nullable;
import org.osgi.annotation.versioning.ProviderType;
/**
@@ -129,7 +128,8 @@ public interface RequestProgressTracker {
* If there are no messages <code>null</code> is returned.
* @return An iterator with the messages or {@code null}
*/
- @Nullable Iterator<String> getMessages();
+ @Nullable
+ Iterator<String> getMessages();
/**
* Dumps the process timer entries to the given writer, one entry per line.
diff --git a/src/main/java/org/apache/sling/api/request/RequestUtil.java b/src/main/java/org/apache/sling/api/request/RequestUtil.java
index f1f6fdf..a315808 100644
--- a/src/main/java/org/apache/sling/api/request/RequestUtil.java
+++ b/src/main/java/org/apache/sling/api/request/RequestUtil.java
@@ -22,15 +22,13 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
-import org.jetbrains.annotations.Nullable;
-
import jakarta.servlet.Servlet;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
-
-import org.jetbrains.annotations.NotNull;
import org.apache.sling.api.SlingJakartaHttpServletRequest;
import org.apache.sling.api.servlets.HttpConstants;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
/**
* Request related utility methods.
@@ -199,8 +197,8 @@ public class RequestUtil {
* <code>null</code> if it was not set.
* @since 2.8.0
*/
- public static @Nullable Object setRequestAttribute(@NotNull HttpServletRequest request,
- @NotNull String name, Object value) {
+ public static @Nullable Object setRequestAttribute(
+ @NotNull HttpServletRequest request, @NotNull String name, Object value) {
Object oldValue = request.getAttribute(name);
if (value == null) {
request.removeAttribute(name);
@@ -223,8 +221,8 @@ public class RequestUtil {
* @deprecated Use {@link #setRequestAttribute(HttpServletRequest, String, Object)}
*/
@Deprecated
- public static @Nullable Object setRequestAttribute(@NotNull javax.servlet.http.HttpServletRequest request,
- @NotNull String name, Object value) {
+ public static @Nullable Object setRequestAttribute(
+ @NotNull javax.servlet.http.HttpServletRequest request, @NotNull String name, Object value) {
Object oldValue = request.getAttribute(name);
if (value == null) {
request.removeAttribute(name);
@@ -236,22 +234,23 @@ public class RequestUtil {
/**
* Checks if the request contains a if-last-modified-since header and if the the
- * request's underlying resource has a jcr:lastModified property. if the properties were modified
+ * request's underlying resource has a jcr:lastModified property. if the properties were modified
* before the header a 304 is sent otherwise the response last modified header is set.
* @param req the request
* @param resp the response
* @return <code>true</code> if the response was set
* @since 2.8.0
*/
- public static boolean handleIfModifiedSince(@NotNull SlingJakartaHttpServletRequest req, @NotNull HttpServletResponse resp){
- boolean responseSet=false;
- long lastModified=req.getResource().getResourceMetadata().getModificationTime();
- if (lastModified!=-1){
- long modifiedTime = lastModified/1000; //seconds
- long ims = req.getDateHeader(HttpConstants.HEADER_IF_MODIFIED_SINCE)/1000; //seconds
+ public static boolean handleIfModifiedSince(
+ @NotNull SlingJakartaHttpServletRequest req, @NotNull HttpServletResponse resp) {
+ boolean responseSet = false;
+ long lastModified = req.getResource().getResourceMetadata().getModificationTime();
+ if (lastModified != -1) {
+ long modifiedTime = lastModified / 1000; // seconds
+ long ims = req.getDateHeader(HttpConstants.HEADER_IF_MODIFIED_SINCE) / 1000; // seconds
if (modifiedTime <= ims) {
resp.setStatus(HttpServletResponse.SC_NOT_MODIFIED);
- responseSet=true;
+ responseSet = true;
}
resp.setDateHeader(HttpConstants.HEADER_LAST_MODIFIED, lastModified);
}
@@ -260,7 +259,7 @@ public class RequestUtil {
/**
* Checks if the request contains a if-last-modified-since header and if the the
- * request's underlying resource has a jcr:lastModified property. if the properties were modified
+ * request's underlying resource has a jcr:lastModified property. if the properties were modified
* before the header a 304 is sent otherwise the response last modified header is set.
* @param req the request
* @param resp the response
@@ -268,15 +267,17 @@ public class RequestUtil {
* @deprecated Use {@link #handleIfModifiedSince(SlingJakartaHttpServletRequest, HttpServletResponse)} instead.
*/
@Deprecated
- public static boolean handleIfModifiedSince(@NotNull org.apache.sling.api.SlingHttpServletRequest req, @NotNull javax.servlet.http.HttpServletResponse resp){
- boolean responseSet=false;
- long lastModified=req.getResource().getResourceMetadata().getModificationTime();
- if (lastModified!=-1){
- long modifiedTime = lastModified/1000; //seconds
- long ims = req.getDateHeader(HttpConstants.HEADER_IF_MODIFIED_SINCE)/1000; //seconds
+ public static boolean handleIfModifiedSince(
+ @NotNull org.apache.sling.api.SlingHttpServletRequest req,
+ @NotNull javax.servlet.http.HttpServletResponse resp) {
+ boolean responseSet = false;
+ long lastModified = req.getResource().getResourceMetadata().getModificationTime();
+ if (lastModified != -1) {
+ long modifiedTime = lastModified / 1000; // seconds
+ long ims = req.getDateHeader(HttpConstants.HEADER_IF_MODIFIED_SINCE) / 1000; // seconds
if (modifiedTime <= ims) {
resp.setStatus(HttpServletResponse.SC_NOT_MODIFIED);
- responseSet=true;
+ responseSet = true;
}
resp.setDateHeader(HttpConstants.HEADER_LAST_MODIFIED, lastModified);
}
diff --git a/src/main/java/org/apache/sling/api/request/ResponseUtil.java b/src/main/java/org/apache/sling/api/request/ResponseUtil.java
index fa29f4b..007af1a 100644
--- a/src/main/java/org/apache/sling/api/request/ResponseUtil.java
+++ b/src/main/java/org/apache/sling/api/request/ResponseUtil.java
@@ -52,7 +52,7 @@ public class ResponseUtil {
@Override
public void write(char[] buffer, int offset, int length) throws IOException {
- for(int i = offset; i < offset + length; i++) {
+ for (int i = offset; i < offset + length; i++) {
write(buffer[i]);
}
}
@@ -64,15 +64,15 @@ public class ResponseUtil {
@Override
public void write(int c) throws IOException {
- if(c == '&') {
+ if (c == '&') {
target.write("&");
- } else if(c == '<') {
+ } else if (c == '<') {
target.write("<");
- } else if(c == '>') {
+ } else if (c == '>') {
target.write(">");
- } else if(c == '"') {
+ } else if (c == '"') {
target.write(""");
- } else if(c == '\'') {
+ } else if (c == '\'') {
target.write("'");
} else {
target.write(c);
@@ -101,17 +101,17 @@ public class ResponseUtil {
}
final StringBuilder b = new StringBuilder(input.length());
- for(int i = 0;i < input.length(); i++) {
+ for (int i = 0; i < input.length(); i++) {
final char c = input.charAt(i);
- if(c == '&') {
+ if (c == '&') {
b.append("&");
- } else if(c == '<') {
+ } else if (c == '<') {
b.append("<");
- } else if(c == '>') {
+ } else if (c == '>') {
b.append(">");
- } else if(c == '"') {
+ } else if (c == '"') {
b.append(""");
- } else if(c == '\'') {
+ } else if (c == '\'') {
b.append("'");
} else {
b.append(c);
diff --git a/src/main/java/org/apache/sling/api/request/SlingJakartaRequestEvent.java b/src/main/java/org/apache/sling/api/request/SlingJakartaRequestEvent.java
index ef2fd5c..d763f37 100644
--- a/src/main/java/org/apache/sling/api/request/SlingJakartaRequestEvent.java
+++ b/src/main/java/org/apache/sling/api/request/SlingJakartaRequestEvent.java
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.sling.api.request;
import jakarta.servlet.ServletContext;
@@ -30,46 +29,49 @@ import jakarta.servlet.ServletRequest;
*
* @since 2.8.0
* @see org.apache.sling.api.request.SlingJakartaRequestListener
-*/
+ */
public class SlingJakartaRequestEvent {
- private final ServletContext sc;
- private final ServletRequest request;
- private final EventType type;
+ private final ServletContext sc;
+ private final ServletRequest request;
+ private final EventType type;
- /**
- * type of the event
- */
- public enum EventType { EVENT_INIT, EVENT_DESTROY };
+ /**
+ * type of the event
+ */
+ public enum EventType {
+ EVENT_INIT,
+ EVENT_DESTROY
+ };
- public SlingJakartaRequestEvent (ServletContext sc, ServletRequest request, EventType type ) {
- this.sc = sc;
- this.request = request;
- this.type = type;
- }
+ public SlingJakartaRequestEvent(ServletContext sc, ServletRequest request, EventType type) {
+ this.sc = sc;
+ this.request = request;
+ this.type = type;
+ }
- /**
- * Gets the actual servlet context object as <code>ServletContext</code>
- * @return the actual servlet context.
- */
- public ServletContext getServletContext() {
- return sc;
- }
+ /**
+ * Gets the actual servlet context object as <code>ServletContext</code>
+ * @return the actual servlet context.
+ */
+ public ServletContext getServletContext() {
+ return sc;
+ }
- /**
- * Gets the actual request object as <code>ServletRequest</code>
- * @return the actual request object as <code>ServletRequest</code>
- */
- public ServletRequest getServletRequest() {
- return request;
- }
+ /**
+ * Gets the actual request object as <code>ServletRequest</code>
+ * @return the actual request object as <code>ServletRequest</code>
+ */
+ public ServletRequest getServletRequest() {
+ return request;
+ }
- /**
- * get the type of the event, eg. EVENT_INIT or EVENT_DESTROY
- * @return the type of the event as <code>EventType</code>,
- * eg. EVENT_INIT or EVENT_DESTROY
- */
- public EventType getType () {
- return type;
- }
+ /**
+ * get the type of the event, eg. EVENT_INIT or EVENT_DESTROY
+ * @return the type of the event as <code>EventType</code>,
+ * eg. EVENT_INIT or EVENT_DESTROY
+ */
+ public EventType getType() {
+ return type;
+ }
}
diff --git a/src/main/java/org/apache/sling/api/request/SlingJakartaRequestListener.java b/src/main/java/org/apache/sling/api/request/SlingJakartaRequestListener.java
index 4bc6cd3..646d1a2 100644
--- a/src/main/java/org/apache/sling/api/request/SlingJakartaRequestListener.java
+++ b/src/main/java/org/apache/sling/api/request/SlingJakartaRequestListener.java
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.sling.api.request;
import org.osgi.annotation.versioning.ConsumerType;
@@ -32,16 +31,16 @@ import org.osgi.annotation.versioning.ConsumerType;
@ConsumerType
public interface SlingJakartaRequestListener {
- String SERVICE_NAME = "org.apache.sling.api.request.event.SlingRequestListener";
+ String SERVICE_NAME = "org.apache.sling.api.request.event.SlingRequestListener";
- /**
- * This method is called from the Sling application for every
- * <code>EventType</code> appearing during the dispatching of
- * a Sling request
- *
- * @param sre the object representing the event
- *
- * @see org.apache.sling.api.request.SlingJakartaRequestEvent.EventType
- */
- void onEvent( SlingJakartaRequestEvent sre );
+ /**
+ * This method is called from the Sling application for every
+ * <code>EventType</code> appearing during the dispatching of
+ * a Sling request
+ *
+ * @param sre the object representing the event
+ *
+ * @see org.apache.sling.api.request.SlingJakartaRequestEvent.EventType
+ */
+ void onEvent(SlingJakartaRequestEvent sre);
}
diff --git a/src/main/java/org/apache/sling/api/request/SlingRequestEvent.java b/src/main/java/org/apache/sling/api/request/SlingRequestEvent.java
index 0915f1b..124563e 100644
--- a/src/main/java/org/apache/sling/api/request/SlingRequestEvent.java
+++ b/src/main/java/org/apache/sling/api/request/SlingRequestEvent.java
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.sling.api.request;
import javax.servlet.ServletContext;
@@ -31,47 +30,50 @@ import javax.servlet.ServletRequest;
* @see org.apache.sling.api.request.SlingRequestListener
* @since 2.1.0 (Sling API Bundle 2.1.0)
* @deprecated Use {@link org.apache.sling.api.request.SlingJakartaRequestEvent} instead.
-*/
+ */
@Deprecated
public class SlingRequestEvent {
- private final ServletContext sc;
- private final ServletRequest request;
- private final EventType type;
+ private final ServletContext sc;
+ private final ServletRequest request;
+ private final EventType type;
- /**
- * type of the event
- */
- public enum EventType { EVENT_INIT, EVENT_DESTROY };
+ /**
+ * type of the event
+ */
+ public enum EventType {
+ EVENT_INIT,
+ EVENT_DESTROY
+ };
- public SlingRequestEvent (ServletContext sc, ServletRequest request, EventType type ) {
- this.sc = sc;
- this.request = request;
- this.type = type;
- }
+ public SlingRequestEvent(ServletContext sc, ServletRequest request, EventType type) {
+ this.sc = sc;
+ this.request = request;
+ this.type = type;
+ }
- /**
- * Gets the actual servlet context object as <code>ServletContext</code>
- * @return the actual servlet context.
- */
- public ServletContext getServletContext() {
- return sc;
- }
+ /**
+ * Gets the actual servlet context object as <code>ServletContext</code>
+ * @return the actual servlet context.
+ */
+ public ServletContext getServletContext() {
+ return sc;
+ }
- /**
- * Gets the actual request object as <code>ServletRequest</code>
- * @return the actual request object as <code>ServletRequest</code>
- */
- public ServletRequest getServletRequest() {
- return request;
- }
+ /**
+ * Gets the actual request object as <code>ServletRequest</code>
+ * @return the actual request object as <code>ServletRequest</code>
+ */
+ public ServletRequest getServletRequest() {
+ return request;
+ }
- /**
- * get the type of the event, eg. EVENT_INIT or EVENT_DESTROY
- * @return the type of the event as <code>EventType</code>,
- * eg. EVENT_INIT or EVENT_DESTROY
- */
- public EventType getType () {
- return type;
- }
+ /**
+ * get the type of the event, eg. EVENT_INIT or EVENT_DESTROY
+ * @return the type of the event as <code>EventType</code>,
+ * eg. EVENT_INIT or EVENT_DESTROY
+ */
+ public EventType getType() {
+ return type;
+ }
}
diff --git a/src/main/java/org/apache/sling/api/request/SlingRequestListener.java b/src/main/java/org/apache/sling/api/request/SlingRequestListener.java
index 18ce06f..63bdbcc 100644
--- a/src/main/java/org/apache/sling/api/request/SlingRequestListener.java
+++ b/src/main/java/org/apache/sling/api/request/SlingRequestListener.java
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.sling.api.request;
import org.osgi.annotation.versioning.ConsumerType;
@@ -33,16 +32,16 @@ import org.osgi.annotation.versioning.ConsumerType;
@Deprecated
public interface SlingRequestListener {
- String SERVICE_NAME = "org.apache.sling.api.request.SlingRequestListener";
+ String SERVICE_NAME = "org.apache.sling.api.request.SlingRequestListener";
- /**
- * This method is called from the Sling application for every
- * <code>EventType</code> appearing during the dispatching of
- * a Sling request
- *
- * @param sre the object representing the event
- *
- * @see org.apache.sling.api.request.SlingRequestEvent.EventType
- */
- void onEvent( SlingRequestEvent sre );
+ /**
+ * This method is called from the Sling application for every
+ * <code>EventType</code> appearing during the dispatching of
+ * a Sling request
+ *
+ * @param sre the object representing the event
+ *
+ * @see org.apache.sling.api.request.SlingRequestEvent.EventType
+ */
+ void onEvent(SlingRequestEvent sre);
}
diff --git a/src/main/java/org/apache/sling/api/request/TooManyCallsException.java b/src/main/java/org/apache/sling/api/request/TooManyCallsException.java
index 22534c9..fdb173a 100644
--- a/src/main/java/org/apache/sling/api/request/TooManyCallsException.java
+++ b/src/main/java/org/apache/sling/api/request/TooManyCallsException.java
@@ -41,5 +41,4 @@ public class TooManyCallsException extends SlingException {
public TooManyCallsException(String servletName) {
super(servletName);
}
-
}
diff --git a/src/main/java/org/apache/sling/api/request/builder/Builders.java b/src/main/java/org/apache/sling/api/request/builder/Builders.java
index 18e0c81..cfb0bf4 100644
--- a/src/main/java/org/apache/sling/api/request/builder/Builders.java
+++ b/src/main/java/org/apache/sling/api/request/builder/Builders.java
@@ -89,7 +89,8 @@ public final class Builders {
* @return a request parameter
* @since 1.2 (Sling API Bundle 2.26.2)
*/
- public static @NotNull RequestParameter newRequestParameter(@NotNull String name, @NotNull String value, @NotNull Charset encoding) {
+ public static @NotNull RequestParameter newRequestParameter(
+ @NotNull String name, @NotNull String value, @NotNull Charset encoding) {
return new RequestParameterImpl(name, value, encoding);
}
@@ -103,7 +104,8 @@ public final class Builders {
* @return a request parameter
* @since 1.3 (Sling API Bundle 2.28.0)
*/
- public static @NotNull RequestParameter newRequestParameter(@NotNull String name, byte @NotNull[] value, String fileName, String contentType) {
+ public static @NotNull RequestParameter newRequestParameter(
+ @NotNull String name, byte @NotNull [] value, String fileName, String contentType) {
return new RequestParameterImpl(name, value, fileName, contentType);
}
}
diff --git a/src/main/java/org/apache/sling/api/request/builder/SlingHttpServletRequestBuilder.java b/src/main/java/org/apache/sling/api/request/builder/SlingHttpServletRequestBuilder.java
index adbfb91..53c5af2 100644
--- a/src/main/java/org/apache/sling/api/request/builder/SlingHttpServletRequestBuilder.java
+++ b/src/main/java/org/apache/sling/api/request/builder/SlingHttpServletRequestBuilder.java
@@ -20,14 +20,13 @@ package org.apache.sling.api.request.builder;
import java.util.Map;
+import jakarta.servlet.http.HttpServletRequest;
import org.apache.sling.api.SlingJakartaHttpServletRequest;
import org.apache.sling.api.request.RequestProgressTracker;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.osgi.annotation.versioning.ProviderType;
-import jakarta.servlet.http.HttpServletRequest;
-
/**
* <p>Fluent helper for building a request.</p>
* <p><strong>Note:</strong> instances of this interface are not thread-safe.</p>
@@ -42,42 +41,48 @@ public interface SlingHttpServletRequestBuilder {
* @return this object
* @throws IllegalArgumentException If method is {@code null}
*/
- @NotNull SlingHttpServletRequestBuilder withRequestMethod(@NotNull String method);
+ @NotNull
+ SlingHttpServletRequestBuilder withRequestMethod(@NotNull String method);
/**
* Sets the HTTP request's {@code Content-Type} header.
* @param contentType the {@code Content-Type} value
* @return this object
*/
- @NotNull SlingHttpServletRequestBuilder withContentType(@Nullable String contentType);
+ @NotNull
+ SlingHttpServletRequestBuilder withContentType(@Nullable String contentType);
/**
* Uses the supplied content as the request's body content.
* @param content the request body content
* @return this object
*/
- @NotNull SlingHttpServletRequestBuilder withBody(@Nullable String content);
+ @NotNull
+ SlingHttpServletRequestBuilder withBody(@Nullable String content);
/**
* Sets the optional selectors of the internal request, which influence the servlet/script resolution.
* @param selectors the selectors
* @return this object
*/
- @NotNull SlingHttpServletRequestBuilder withSelectors(@Nullable String ... selectors);
+ @NotNull
+ SlingHttpServletRequestBuilder withSelectors(@Nullable String... selectors);
/**
* Sets the optional extension of the internal request, which influences the servlet/script resolution.
* @param extension the extension
* @return this object
*/
- @NotNull SlingHttpServletRequestBuilder withExtension(@Nullable String extension);
+ @NotNull
+ SlingHttpServletRequestBuilder withExtension(@Nullable String extension);
/**
* Sets the optional suffix of the internal request.
* @param suffix the suffix
* @return this object
*/
- @NotNull SlingHttpServletRequestBuilder withSuffix(@Nullable String suffix);
+ @NotNull
+ SlingHttpServletRequestBuilder withSuffix(@Nullable String suffix);
/**
* Sets a request parameter.
@@ -86,7 +91,8 @@ public interface SlingHttpServletRequestBuilder {
* @return this object
* @throws IllegalArgumentException if either {@code key} or {@code value} is {@code null}
*/
- @NotNull SlingHttpServletRequestBuilder withParameter(@NotNull String key, @NotNull String value);
+ @NotNull
+ SlingHttpServletRequestBuilder withParameter(@NotNull String key, @NotNull String value);
/**
* Sets a request parameter.
@@ -95,14 +101,16 @@ public interface SlingHttpServletRequestBuilder {
* @return this object
* @throws IllegalArgumentException if either {@code key} or {@code values} is {@code null}
*/
- @NotNull SlingHttpServletRequestBuilder withParameter(@NotNull String key, @NotNull String[] values);
+ @NotNull
+ SlingHttpServletRequestBuilder withParameter(@NotNull String key, @NotNull String[] values);
/**
* Adds the supplied request parameters to the current ones.
* @param parameters additional parameters
* @return this object
*/
- @NotNull SlingHttpServletRequestBuilder withParameters(@Nullable Map<String, String[]> parameters);
+ @NotNull
+ SlingHttpServletRequestBuilder withParameters(@Nullable Map<String, String[]> parameters);
/**
* Uses the request dispatcher from the provided request.
@@ -112,7 +120,9 @@ public interface SlingHttpServletRequestBuilder {
* @deprecated Use {@link #useRequestDispatcherFrom(SlingJakartaHttpServletRequest)} instead
*/
@Deprecated
- @NotNull SlingHttpServletRequestBuilder useRequestDispatcherFrom(@NotNull org.apache.sling.api.SlingHttpServletRequest request);
+ @NotNull
+ SlingHttpServletRequestBuilder useRequestDispatcherFrom(
+ @NotNull org.apache.sling.api.SlingHttpServletRequest request);
/**
* Uses the request dispatcher from the provided request.
@@ -120,7 +130,9 @@ public interface SlingHttpServletRequestBuilder {
* @return this object
* @throws IllegalArgumentException if {@code request} is {@code null}
*/
- @NotNull SlingHttpServletRequestBuilder useRequestDispatcherFrom(@NotNull org.apache.sling.api.SlingJakartaHttpServletRequest request);
+ @NotNull
+ SlingHttpServletRequestBuilder useRequestDispatcherFrom(
+ @NotNull org.apache.sling.api.SlingJakartaHttpServletRequest request);
/**
* Uses the session from the provided request.
@@ -130,7 +142,8 @@ public interface SlingHttpServletRequestBuilder {
* @deprecated Use {@link #useSessionFrom(HttpServletRequest)} instead
*/
@Deprecated
- @NotNull SlingHttpServletRequestBuilder useSessionFrom(@NotNull javax.servlet.http.HttpServletRequest request);
+ @NotNull
+ SlingHttpServletRequestBuilder useSessionFrom(@NotNull javax.servlet.http.HttpServletRequest request);
/**
* Uses the attributes backed by the provided request.
@@ -140,7 +153,8 @@ public interface SlingHttpServletRequestBuilder {
* @deprecated Use {@link #useAttributesFrom(HttpServletRequest)} instead
*/
@Deprecated
- @NotNull SlingHttpServletRequestBuilder useAttributesFrom(@NotNull javax.servlet.http.HttpServletRequest request);
+ @NotNull
+ SlingHttpServletRequestBuilder useAttributesFrom(@NotNull javax.servlet.http.HttpServletRequest request);
/**
* Uses the servlet context from the provided request.
@@ -150,7 +164,8 @@ public interface SlingHttpServletRequestBuilder {
* @deprecated Use {@link #useServletContextFrom(HttpServletRequest)} instead
*/
@Deprecated
- @NotNull SlingHttpServletRequestBuilder useServletContextFrom(@NotNull javax.servlet.http.HttpServletRequest request);
+ @NotNull
+ SlingHttpServletRequestBuilder useServletContextFrom(@NotNull javax.servlet.http.HttpServletRequest request);
/**
* Uses the session from the provided request.
@@ -158,7 +173,8 @@ public interface SlingHttpServletRequestBuilder {
* @return this object
* @throws IllegalArgumentException if {@code request} is {@code null}
*/
- @NotNull SlingHttpServletRequestBuilder useSessionFrom(@NotNull HttpServletRequest request);
+ @NotNull
+ SlingHttpServletRequestBuilder useSessionFrom(@NotNull HttpServletRequest request);
/**
* Uses the attributes backed by the provided request.
@@ -166,7 +182,8 @@ public interface SlingHttpServletRequestBuilder {
* @return this object
* @throws IllegalArgumentException if {@code request} is {@code null}
*/
- @NotNull SlingHttpServletRequestBuilder useAttributesFrom(@NotNull HttpServletRequest request);
+ @NotNull
+ SlingHttpServletRequestBuilder useAttributesFrom(@NotNull HttpServletRequest request);
/**
* Uses the servlet context from the provided request.
@@ -174,7 +191,8 @@ public interface SlingHttpServletRequestBuilder {
* @return this object
* @throws IllegalArgumentException if {@code request} is {@code null}
*/
- @NotNull SlingHttpServletRequestBuilder useServletContextFrom(@NotNull HttpServletRequest request);
+ @NotNull
+ SlingHttpServletRequestBuilder useServletContextFrom(@NotNull HttpServletRequest request);
/**
* Uses the provided request progress tracker
@@ -182,7 +200,8 @@ public interface SlingHttpServletRequestBuilder {
* @return this object
* @since 1.1 (Sling API Bundle 2.25.0)
*/
- @NotNull SlingHttpServletRequestBuilder withRequestProgressTracker(@NotNull RequestProgressTracker tracker);
+ @NotNull
+ SlingHttpServletRequestBuilder withRequestProgressTracker(@NotNull RequestProgressTracker tracker);
/**
* Builds the request. Once this method has been called, the builder must not be used anymore. In order to create a new request a new
@@ -190,7 +209,8 @@ public interface SlingHttpServletRequestBuilder {
* @return a request object
* @since 1.4
*/
- @NotNull SlingJakartaHttpServletRequest buildJakartaRequest();
+ @NotNull
+ SlingJakartaHttpServletRequest buildJakartaRequest();
/**
* Builds the request. Once this method has been called, the builder must not be used anymore. In order to create a new request a new
@@ -199,5 +219,6 @@ public interface SlingHttpServletRequestBuilder {
* @deprecated Use {@link #buildJakartaRequest()} instead
*/
@Deprecated
- @NotNull org.apache.sling.api.SlingHttpServletRequest build();
+ @NotNull
+ org.apache.sling.api.SlingHttpServletRequest build();
}
diff --git a/src/main/java/org/apache/sling/api/request/builder/SlingHttpServletResponseBuilder.java b/src/main/java/org/apache/sling/api/request/builder/SlingHttpServletResponseBuilder.java
index 9c7972f..c8afbb6 100644
--- a/src/main/java/org/apache/sling/api/request/builder/SlingHttpServletResponseBuilder.java
+++ b/src/main/java/org/apache/sling/api/request/builder/SlingHttpServletResponseBuilder.java
@@ -37,7 +37,8 @@ public interface SlingHttpServletResponseBuilder {
* @deprecated Use {@link #buildJakartaResponseResult()} instead
*/
@Deprecated
- @NotNull SlingHttpServletResponseResult build();
+ @NotNull
+ SlingHttpServletResponseResult build();
/**
* Builds the response. Once this method has been called, the builder must not be used anymore. In order to create a new response a new
@@ -46,5 +47,6 @@ public interface SlingHttpServletResponseBuilder {
* @return a response object
* @since 1.4
*/
- @NotNull SlingJakartaHttpServletResponseResult buildJakartaResponseResult();
+ @NotNull
+ SlingJakartaHttpServletResponseResult buildJakartaResponseResult();
}
diff --git a/src/main/java/org/apache/sling/api/request/builder/SlingHttpServletResponseResult.java b/src/main/java/org/apache/sling/api/request/builder/SlingHttpServletResponseResult.java
index 4b40f32..73d6603 100644
--- a/src/main/java/org/apache/sling/api/request/builder/SlingHttpServletResponseResult.java
+++ b/src/main/java/org/apache/sling/api/request/builder/SlingHttpServletResponseResult.java
@@ -48,7 +48,8 @@ public interface SlingHttpServletResponseResult extends SlingHttpServletResponse
*
* @return the status message or {@code null}.
*/
- @Nullable String getStatusMessage();
+ @Nullable
+ String getStatusMessage();
/**
* Gets the named cookie.
@@ -56,14 +57,16 @@ public interface SlingHttpServletResponseResult extends SlingHttpServletResponse
* @param name the name of the cookie
* @return the cookie or {@code null} if no cookie with that name exists
*/
- @Nullable Cookie getCookie(String name);
+ @Nullable
+ Cookie getCookie(String name);
/**
* Gets all cookies.
*
* @return the array of cookies or {@code null} if no cookies were set
*/
- @Nullable Cookie[] getCookies();
+ @Nullable
+ Cookie[] getCookies();
/**
* Gets the output as a byte array.
@@ -77,5 +80,6 @@ public interface SlingHttpServletResponseResult extends SlingHttpServletResponse
*
* @return the output as a string
*/
- @NotNull String getOutputAsString();
+ @NotNull
+ String getOutputAsString();
}
diff --git a/src/main/java/org/apache/sling/api/request/builder/SlingJakartaHttpServletResponseResult.java b/src/main/java/org/apache/sling/api/request/builder/SlingJakartaHttpServletResponseResult.java
index c896eb1..224e2b4 100644
--- a/src/main/java/org/apache/sling/api/request/builder/SlingJakartaHttpServletResponseResult.java
+++ b/src/main/java/org/apache/sling/api/request/builder/SlingJakartaHttpServletResponseResult.java
@@ -19,7 +19,6 @@
package org.apache.sling.api.request.builder;
import jakarta.servlet.http.Cookie;
-
import org.apache.sling.api.SlingJakartaHttpServletResponse;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -46,7 +45,8 @@ public interface SlingJakartaHttpServletResponseResult extends SlingJakartaHttpS
*
* @return the status message or {@code null}.
*/
- @Nullable String getStatusMessage();
+ @Nullable
+ String getStatusMessage();
/**
* Gets the named cookie.
@@ -54,14 +54,16 @@ public interface SlingJakartaHttpServletResponseResult extends SlingJakartaHttpS
* @param name the name of the cookie
* @return the cookie or {@code null} if no cookie with that name exists
*/
- @Nullable Cookie getCookie(String name);
+ @Nullable
+ Cookie getCookie(String name);
/**
* Gets all cookies.
*
* @return the array of cookies or {@code null} if no cookies were set
*/
- @Nullable Cookie[] getCookies();
+ @Nullable
+ Cookie[] getCookies();
/**
* Gets the output as a byte array.
@@ -75,5 +77,6 @@ public interface SlingJakartaHttpServletResponseResult extends SlingJakartaHttpS
*
* @return the output as a string
*/
- @NotNull String getOutputAsString();
+ @NotNull
+ String getOutputAsString();
}
diff --git a/src/main/java/org/apache/sling/api/request/builder/impl/FastMessageFormat.java b/src/main/java/org/apache/sling/api/request/builder/impl/FastMessageFormat.java
index 86eed73..6e86141 100644
--- a/src/main/java/org/apache/sling/api/request/builder/impl/FastMessageFormat.java
+++ b/src/main/java/org/apache/sling/api/request/builder/impl/FastMessageFormat.java
@@ -101,5 +101,4 @@ public class FastMessageFormat {
}
}
}
-
}
diff --git a/src/main/java/org/apache/sling/api/request/builder/impl/HeaderSupport.java b/src/main/java/org/apache/sling/api/request/builder/impl/HeaderSupport.java
index f0f8793..0c011ff 100644
--- a/src/main/java/org/apache/sling/api/request/builder/impl/HeaderSupport.java
+++ b/src/main/java/org/apache/sling/api/request/builder/impl/HeaderSupport.java
@@ -76,7 +76,7 @@ public class HeaderSupport {
public String getHeader(final String name) {
final List<String> values = this.headers.get(name);
- if ( values == null ) {
+ if (values == null) {
return null;
}
return values.get(0);
@@ -84,7 +84,7 @@ public class HeaderSupport {
public int getIntHeader(String name) {
final String value = getHeader(name);
- if ( value != null ) {
+ if (value != null) {
return Integer.valueOf(value);
}
return -1;
@@ -92,12 +92,13 @@ public class HeaderSupport {
public long getDateHeader(final String name) {
final String value = getHeader(name);
- if ( value != null ) {
- try {
- final Date date = Date.from(ZonedDateTime.parse(value, RFC_1123_DATE_TIME).toInstant());
+ if (value != null) {
+ try {
+ final Date date =
+ Date.from(ZonedDateTime.parse(value, RFC_1123_DATE_TIME).toInstant());
return date.getTime();
} catch (final DateTimeParseException ex) {
- throw new IllegalArgumentException("Invalid date value: " + value, ex);
+ throw new IllegalArgumentException("Invalid date value: " + value, ex);
}
}
return -1L;
@@ -106,7 +107,7 @@ public class HeaderSupport {
public Collection<String> getHeaders(final String name) {
final List<String> values = new ArrayList<String>();
final List<String> headers = this.headers.get(name);
- if ( headers != null ) {
+ if (headers != null) {
values.addAll(headers);
}
return values;
diff --git a/src/main/java/org/apache/sling/api/request/builder/impl/RequestParameterImpl.java b/src/main/java/org/apache/sling/api/request/builder/impl/RequestParameterImpl.java
index 09b77f9..e90c430 100644
--- a/src/main/java/org/apache/sling/api/request/builder/impl/RequestParameterImpl.java
+++ b/src/main/java/org/apache/sling/api/request/builder/impl/RequestParameterImpl.java
@@ -33,7 +33,7 @@ import org.jetbrains.annotations.NotNull;
public class RequestParameterImpl implements RequestParameter {
private final @NotNull String name;
- private final byte @NotNull[] value;
+ private final byte @NotNull [] value;
private final @NotNull Charset encoding;
private final String contentType;
private final String fileName;
@@ -43,15 +43,30 @@ public class RequestParameterImpl implements RequestParameter {
this(name, value, StandardCharsets.UTF_8);
}
- public RequestParameterImpl(@NotNull final String name, @NotNull final String value, @NotNull final Charset encoding) {
- this(name, value.getBytes(encoding), encoding, null, null, true); // by default application/x-www-form-urlencoded is returning null for content type in Sling Engine
+ public RequestParameterImpl(
+ @NotNull final String name, @NotNull final String value, @NotNull final Charset encoding) {
+ this(
+ name,
+ value.getBytes(encoding),
+ encoding,
+ null,
+ null,
+ true); // by default application/x-www-form-urlencoded is returning null for content type in Sling
+ // Engine
}
- public RequestParameterImpl(@NotNull final String name, byte @NotNull[] value, String fileName, String contentType) {
+ public RequestParameterImpl(
+ @NotNull final String name, byte @NotNull [] value, String fileName, String contentType) {
this(name, value, StandardCharsets.UTF_8, fileName, contentType, false);
}
- private RequestParameterImpl(@NotNull final String name, byte @NotNull [] value, @NotNull final Charset encoding, String fileName, final String contentType, boolean isFormField) {
+ private RequestParameterImpl(
+ @NotNull final String name,
+ byte @NotNull [] value,
+ @NotNull final Charset encoding,
+ String fileName,
+ final String contentType,
+ boolean isFormField) {
this.name = name;
this.value = value;
this.contentType = contentType;
diff --git a/src/main/java/org/apache/sling/api/request/builder/impl/RequestParameterMapImpl.java b/src/main/java/org/apache/sling/api/request/builder/impl/RequestParameterMapImpl.java
index 32a3887..3a653bc 100644
--- a/src/main/java/org/apache/sling/api/request/builder/impl/RequestParameterMapImpl.java
+++ b/src/main/java/org/apache/sling/api/request/builder/impl/RequestParameterMapImpl.java
@@ -28,14 +28,13 @@ import org.jetbrains.annotations.NotNull;
/**
* Implementation of {@link RequestParameterMap}.
*/
-public class RequestParameterMapImpl extends LinkedHashMap<String, RequestParameter[]>
- implements RequestParameterMap {
-
+public class RequestParameterMapImpl extends LinkedHashMap<String, RequestParameter[]> implements RequestParameterMap {
+
public RequestParameterMapImpl(@NotNull final Map<String, String[]> params) {
- for(final Map.Entry<String, String[]> entry : params.entrySet()) {
+ for (final Map.Entry<String, String[]> entry : params.entrySet()) {
final RequestParameter[] values = new RequestParameter[entry.getValue().length];
int index = 0;
- for(final String v : entry.getValue()) {
+ for (final String v : entry.getValue()) {
values[index] = new RequestParameterImpl(entry.getKey(), v);
index++;
}
diff --git a/src/main/java/org/apache/sling/api/request/builder/impl/RequestProgressTrackerImpl.java b/src/main/java/org/apache/sling/api/request/builder/impl/RequestProgressTrackerImpl.java
index 0a664f7..55d87cf 100644
--- a/src/main/java/org/apache/sling/api/request/builder/impl/RequestProgressTrackerImpl.java
+++ b/src/main/java/org/apache/sling/api/request/builder/impl/RequestProgressTrackerImpl.java
@@ -165,21 +165,21 @@ public class RequestProgressTrackerImpl implements RequestProgressTracker {
private String formatMessage(final long offset, final String message) {
// Set exact length to avoid array copies within StringBuilder
- final StringBuilder sb = new StringBuilder(PADDING_WIDTH + 1 + message.length() + 1);
+ final StringBuilder sb = new StringBuilder(PADDING_WIDTH + 1 + message.length() + 1);
final String offsetStr = Long.toString(offset / 1000);
for (int i = PADDING_WIDTH - offsetStr.length(); i > 0; i--) {
sb.append(' ');
}
- sb.append(offsetStr).append(' ')
- .append(message.replace('\n', '_').replace('\r', '_'))
- .append('\n');
+ sb.append(offsetStr)
+ .append(' ')
+ .append(message.replace('\n', '_').replace('\r', '_'))
+ .append('\n');
return sb.toString();
}
@Override
public void dump(final PrintWriter writer) {
- logTimer(REQUEST_PROCESSING_TIMER,
- "Dumping SlingRequestProgressTracker Entries");
+ logTimer(REQUEST_PROCESSING_TIMER, "Dumping SlingRequestProgressTracker Entries");
final Iterator<String> messages = getMessages();
while (messages.hasNext()) {
@@ -241,7 +241,7 @@ public class RequestProgressTrackerImpl implements RequestProgressTracker {
sb.append(',');
sb.append(name);
sb.append('}');
- if(msg != null) {
+ if (msg != null) {
sb.append(' ');
sb.append(msg);
}
@@ -250,7 +250,7 @@ public class RequestProgressTrackerImpl implements RequestProgressTracker {
@Override
public void done() {
- if(processingEnd != -1) return;
+ if (processingEnd != -1) return;
logTimer(REQUEST_PROCESSING_TIMER, REQUEST_PROCESSING_TIMER);
processingEnd = System.nanoTime();
}
diff --git a/src/main/java/org/apache/sling/api/request/builder/impl/ServletContextImpl.java b/src/main/java/org/apache/sling/api/request/builder/impl/ServletContextImpl.java
index e518fb2..e648891 100644
--- a/src/main/java/org/apache/sling/api/request/builder/impl/ServletContextImpl.java
+++ b/src/main/java/org/apache/sling/api/request/builder/impl/ServletContextImpl.java
@@ -173,7 +173,8 @@ public class ServletContextImpl implements ServletContext {
}
@Override
- public ServletRegistration.Dynamic addServlet(final String servletName, final Class<? extends Servlet> servletClass) {
+ public ServletRegistration.Dynamic addServlet(
+ final String servletName, final Class<? extends Servlet> servletClass) {
throw new UnsupportedOperationException();
}
@@ -316,5 +317,4 @@ public class ServletContextImpl implements ServletContext {
public void setSessionTimeout(int sessionTimeout) {
throw new UnsupportedOperationException();
}
-
}
diff --git a/src/main/java/org/apache/sling/api/request/builder/impl/SlingHttpServletRequestBuilderImpl.java b/src/main/java/org/apache/sling/api/request/builder/impl/SlingHttpServletRequestBuilderImpl.java
index 6391f15..c9b297b 100644
--- a/src/main/java/org/apache/sling/api/request/builder/impl/SlingHttpServletRequestBuilderImpl.java
+++ b/src/main/java/org/apache/sling/api/request/builder/impl/SlingHttpServletRequestBuilderImpl.java
@@ -28,6 +28,11 @@ import java.util.Locale;
import java.util.Map;
import java.util.ResourceBundle;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpSession;
import org.apache.felix.http.jakartawrappers.HttpServletRequestWrapper;
import org.apache.felix.http.jakartawrappers.RequestDispatcherWrapper;
import org.apache.felix.http.jakartawrappers.ServletContextWrapper;
@@ -43,12 +48,6 @@ import org.apache.sling.api.uri.SlingUriBuilder;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
-import jakarta.servlet.RequestDispatcher;
-import jakarta.servlet.ServletContext;
-import jakarta.servlet.http.Cookie;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpSession;
-
/**
* Internal {@link SlingHttpServletRequestBuilder} implementation
*/
@@ -59,6 +58,7 @@ public class SlingHttpServletRequestBuilderImpl implements SlingHttpServletReque
/** Protocol */
static final String SECURE_PROTOCOL = "https";
+
static final String HTTP_PROTOCOL = "http";
static final String CHARSET_SEPARATOR = ";charset=";
@@ -88,6 +88,7 @@ public class SlingHttpServletRequestBuilderImpl implements SlingHttpServletReque
/** Optional content type / character encoding */
String contentType;
+
String characterEncoding;
/** Optional body */
@@ -161,7 +162,7 @@ public class SlingHttpServletRequestBuilderImpl implements SlingHttpServletReque
}
private void checkLocked() {
- if ( locked ) {
+ if (locked) {
throw new IllegalStateException("The builder can't be reused. Create a new builder instead.");
}
}
@@ -173,7 +174,7 @@ public class SlingHttpServletRequestBuilderImpl implements SlingHttpServletReque
}
@Override
- public @NotNull SlingHttpServletRequestBuilder withRequestMethod(@NotNull String method) {
+ public @NotNull SlingHttpServletRequestBuilder withRequestMethod(@NotNull String method) {
this.checkLocked();
this.checkNotNull("method", method);
this.requestMethod = method.toUpperCase();
@@ -186,7 +187,8 @@ public class SlingHttpServletRequestBuilderImpl implements SlingHttpServletReque
final int pos = type == null ? -1 : type.indexOf(SlingHttpServletRequestBuilderImpl.CHARSET_SEPARATOR);
if (pos != -1) {
this.contentType = type.substring(0, pos);
- this.characterEncoding = type.substring(pos + SlingHttpServletRequestBuilderImpl.CHARSET_SEPARATOR.length());
+ this.characterEncoding =
+ type.substring(pos + SlingHttpServletRequestBuilderImpl.CHARSET_SEPARATOR.length());
} else {
this.contentType = type;
}
@@ -201,7 +203,7 @@ public class SlingHttpServletRequestBuilderImpl implements SlingHttpServletReque
}
@Override
- public @NotNull SlingHttpServletRequestBuilder withSelectors(final String ... selectors) {
+ public @NotNull SlingHttpServletRequestBuilder withSelectors(final String... selectors) {
this.checkLocked();
this.selectors = selectors;
return this;
@@ -222,7 +224,8 @@ public class SlingHttpServletRequestBuilderImpl implements SlingHttpServletReque
}
@Override
- public @NotNull SlingHttpServletRequestBuilder withParameter(final @NotNull String key, final @NotNull String value) {
+ public @NotNull SlingHttpServletRequestBuilder withParameter(
+ final @NotNull String key, final @NotNull String value) {
this.checkLocked();
this.checkNotNull("key", key);
this.checkNotNull("value", value);
@@ -231,7 +234,8 @@ public class SlingHttpServletRequestBuilderImpl implements SlingHttpServletReque
}
@Override
- public @NotNull SlingHttpServletRequestBuilder withParameter(final @NotNull String key, final @NotNull String[] values) {
+ public @NotNull SlingHttpServletRequestBuilder withParameter(
+ final @NotNull String key, final @NotNull String[] values) {
this.checkLocked();
this.checkNotNull("key", key);
this.checkNotNull("values", values);
@@ -249,7 +253,8 @@ public class SlingHttpServletRequestBuilderImpl implements SlingHttpServletReque
}
@Override
- public @NotNull SlingHttpServletRequestBuilder useAttributesFrom(@NotNull javax.servlet.http.HttpServletRequest request) {
+ public @NotNull SlingHttpServletRequestBuilder useAttributesFrom(
+ @NotNull javax.servlet.http.HttpServletRequest request) {
this.checkLocked();
this.checkNotNull(REQUEST, request);
this.attributesProvider = new HttpServletRequestWrapper(request);
@@ -257,7 +262,8 @@ public class SlingHttpServletRequestBuilderImpl implements SlingHttpServletReque
}
@Override
- public @NotNull SlingHttpServletRequestBuilder useServletContextFrom(@NotNull javax.servlet.http.HttpServletRequest request) {
+ public @NotNull SlingHttpServletRequestBuilder useServletContextFrom(
+ @NotNull javax.servlet.http.HttpServletRequest request) {
this.checkLocked();
this.checkNotNull(REQUEST, request);
this.servletContext = new ServletContextWrapper(request.getServletContext());
@@ -265,7 +271,8 @@ public class SlingHttpServletRequestBuilderImpl implements SlingHttpServletReque
}
@Override
- public @NotNull SlingHttpServletRequestBuilder useSessionFrom(@NotNull javax.servlet.http.HttpServletRequest request) {
+ public @NotNull SlingHttpServletRequestBuilder useSessionFrom(
+ @NotNull javax.servlet.http.HttpServletRequest request) {
this.checkLocked();
this.checkNotNull(REQUEST, request);
this.sessionProvider = new HttpServletRequestWrapper(request);
@@ -274,7 +281,8 @@ public class SlingHttpServletRequestBuilderImpl implements SlingHttpServletReque
@Override
@Deprecated
- public @NotNull SlingHttpServletRequestBuilder useRequestDispatcherFrom(@NotNull org.apache.sling.api.SlingHttpServletRequest request) {
+ public @NotNull SlingHttpServletRequestBuilder useRequestDispatcherFrom(
+ @NotNull org.apache.sling.api.SlingHttpServletRequest request) {
this.checkLocked();
this.checkNotNull(REQUEST, request);
this.requestDispatcherProvider = new SlingJakartaHttpServletRequestImpl(this) {
@@ -307,14 +315,14 @@ public class SlingHttpServletRequestBuilderImpl implements SlingHttpServletReque
}
@Override
- public RequestDispatcher getRequestDispatcher(final Resource resource, final RequestDispatcherOptions options) {
+ public RequestDispatcher getRequestDispatcher(
+ final Resource resource, final RequestDispatcherOptions options) {
final javax.servlet.RequestDispatcher dispatcher = request.getRequestDispatcher(resource, options);
if (dispatcher != null) {
return new RequestDispatcherWrapper(dispatcher);
}
return null;
}
-
};
return this;
}
@@ -344,7 +352,8 @@ public class SlingHttpServletRequestBuilderImpl implements SlingHttpServletReque
}
@Override
- public @NotNull SlingHttpServletRequestBuilder useRequestDispatcherFrom(@NotNull SlingJakartaHttpServletRequest request) {
+ public @NotNull SlingHttpServletRequestBuilder useRequestDispatcherFrom(
+ @NotNull SlingJakartaHttpServletRequest request) {
this.checkLocked();
this.checkNotNull(REQUEST, request);
this.requestDispatcherProvider = request;
@@ -364,26 +373,26 @@ public class SlingHttpServletRequestBuilderImpl implements SlingHttpServletReque
this.locked = true;
this.requestPathInfo = SlingUriBuilder.createFrom(this.resource)
- .setExtension(this.extension)
- .setSuffix(this.suffix)
- .setSelectors(this.selectors)
- .build();
+ .setExtension(this.extension)
+ .setSuffix(this.suffix)
+ .setSelectors(this.selectors)
+ .build();
this.queryString = this.formatQueryString();
this.pathInfo = this.buildPathInfo();
- if ( this.servletContext == null ) {
+ if (this.servletContext == null) {
this.servletContext = new ServletContextImpl();
}
- if (this.body == null ) {
+ if (this.body == null) {
this.body = "";
}
final org.apache.sling.api.SlingHttpServletRequest req = new SlingHttpServletRequestImpl(this);
if (this.progressTracker == null) {
// if attributes are shared with a Sling request, then the progress tracker is available from there
final Object attrTracker = req.getAttribute(RequestProgressTracker.class.getName());
- if ( attrTracker instanceof RequestProgressTracker) {
- this.progressTracker = (RequestProgressTracker)attrTracker;
+ if (attrTracker instanceof RequestProgressTracker) {
+ this.progressTracker = (RequestProgressTracker) attrTracker;
} else {
this.progressTracker = Builders.newRequestProgressTracker();
}
@@ -397,26 +406,26 @@ public class SlingHttpServletRequestBuilderImpl implements SlingHttpServletReque
this.locked = true;
this.requestPathInfo = SlingUriBuilder.createFrom(this.resource)
- .setExtension(this.extension)
- .setSuffix(this.suffix)
- .setSelectors(this.selectors)
- .build();
+ .setExtension(this.extension)
+ .setSuffix(this.suffix)
+ .setSelectors(this.selectors)
+ .build();
this.queryString = this.formatQueryString();
this.pathInfo = this.buildPathInfo();
- if ( this.servletContext == null ) {
+ if (this.servletContext == null) {
this.servletContext = new ServletContextImpl();
}
- if (this.body == null ) {
+ if (this.body == null) {
this.body = "";
}
final SlingJakartaHttpServletRequest req = new SlingJakartaHttpServletRequestImpl(this);
if (this.progressTracker == null) {
// if attributes are shared with a Sling request, then the progress tracker is available from there
final Object attrTracker = req.getAttribute(RequestProgressTracker.class.getName());
- if ( attrTracker instanceof RequestProgressTracker) {
- this.progressTracker = (RequestProgressTracker)attrTracker;
+ if (attrTracker instanceof RequestProgressTracker) {
+ this.progressTracker = (RequestProgressTracker) attrTracker;
} else {
this.progressTracker = Builders.newRequestProgressTracker();
}
@@ -428,17 +437,17 @@ public class SlingHttpServletRequestBuilderImpl implements SlingHttpServletReque
final StringBuilder builder = new StringBuilder();
builder.append(this.requestPathInfo.getResourcePath());
- if ( this.requestPathInfo.getSelectorString() != null ) {
+ if (this.requestPathInfo.getSelectorString() != null) {
builder.append('.');
builder.append(this.requestPathInfo.getSelectorString());
}
- if ( this.requestPathInfo.getExtension() != null ) {
+ if (this.requestPathInfo.getExtension() != null) {
builder.append('.');
builder.append(this.requestPathInfo.getExtension());
}
- if ( this.requestPathInfo.getSuffix() != null ) {
+ if (this.requestPathInfo.getSuffix() != null) {
builder.append(this.requestPathInfo.getSuffix());
}
@@ -464,7 +473,8 @@ public class SlingHttpServletRequestBuilderImpl implements SlingHttpServletReque
}
}
- private static void formatQueryStringParameter(final StringBuilder builder, final Map.Entry<String, String[]> entry) {
+ private static void formatQueryStringParameter(
+ final StringBuilder builder, final Map.Entry<String, String[]> entry) {
for (String value : entry.getValue()) {
if (builder.length() != 0) {
builder.append('&');
diff --git a/src/main/java/org/apache/sling/api/request/builder/impl/SlingHttpServletRequestImpl.java b/src/main/java/org/apache/sling/api/request/builder/impl/SlingHttpServletRequestImpl.java
index b76ff02..348c3f1 100644
--- a/src/main/java/org/apache/sling/api/request/builder/impl/SlingHttpServletRequestImpl.java
+++ b/src/main/java/org/apache/sling/api/request/builder/impl/SlingHttpServletRequestImpl.java
@@ -18,6 +18,21 @@
*/
package org.apache.sling.api.request.builder.impl;
+import javax.servlet.AsyncContext;
+import javax.servlet.DispatcherType;
+import javax.servlet.ReadListener;
+import javax.servlet.RequestDispatcher;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.ServletInputStream;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+import javax.servlet.http.HttpUpgradeHandler;
+import javax.servlet.http.Part;
+
import java.io.BufferedReader;
import java.io.ByteArrayInputStream;
import java.io.IOException;
@@ -36,25 +51,10 @@ import java.util.Locale;
import java.util.Map;
import java.util.ResourceBundle;
-import javax.servlet.AsyncContext;
-import javax.servlet.DispatcherType;
-import javax.servlet.ReadListener;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.ServletInputStream;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-import javax.servlet.http.HttpUpgradeHandler;
-import javax.servlet.http.Part;
-
-import org.apache.felix.http.javaxwrappers.RequestDispatcherWrapper;
-import org.apache.felix.http.javaxwrappers.ServletContextWrapper;
import org.apache.felix.http.javaxwrappers.CookieWrapper;
import org.apache.felix.http.javaxwrappers.HttpSessionWrapper;
+import org.apache.felix.http.javaxwrappers.RequestDispatcherWrapper;
+import org.apache.felix.http.javaxwrappers.ServletContextWrapper;
import org.apache.sling.api.SlingHttpServletRequest;
import org.apache.sling.api.adapter.SlingAdaptable;
import org.apache.sling.api.request.RequestDispatcherOptions;
@@ -96,11 +96,11 @@ public class SlingHttpServletRequestImpl extends SlingAdaptable implements Sling
@Override
public HttpSession getSession(final boolean create) {
if (this.builder.session == null && create) {
- if ( this.builder.sessionProvider != null ) {
+ if (this.builder.sessionProvider != null) {
this.builder.session = this.builder.sessionProvider.getSession(create);
} else {
this.builder.session = new HttpSessionImpl(this.builder.servletContext);
- }
+ }
}
if (this.builder.session == null) {
return null;
@@ -115,7 +115,7 @@ public class SlingHttpServletRequestImpl extends SlingAdaptable implements Sling
@Override
public Object getAttribute(final String name) {
- if ( this.builder.attributesProvider != null ) {
+ if (this.builder.attributesProvider != null) {
return this.builder.attributesProvider.getAttribute(name);
}
return this.builder.attributeMap.get(name);
@@ -123,7 +123,7 @@ public class SlingHttpServletRequestImpl extends SlingAdaptable implements Sling
@Override
public Enumeration<String> getAttributeNames() {
- if ( this.builder.attributesProvider != null ) {
+ if (this.builder.attributesProvider != null) {
return this.builder.attributesProvider.getAttributeNames();
}
return Collections.enumeration(this.builder.attributeMap.keySet());
@@ -131,7 +131,7 @@ public class SlingHttpServletRequestImpl extends SlingAdaptable implements Sling
@Override
public void removeAttribute(final String name) {
- if ( this.builder.attributesProvider != null ) {
+ if (this.builder.attributesProvider != null) {
this.builder.attributesProvider.removeAttribute(name);
} else {
this.builder.attributeMap.remove(name);
@@ -140,7 +140,7 @@ public class SlingHttpServletRequestImpl extends SlingAdaptable implements Sling
@Override
public void setAttribute(final String name, final Object object) {
- if ( this.builder.attributesProvider != null ) {
+ if (this.builder.attributesProvider != null) {
this.builder.attributesProvider.setAttribute(name, object);
} else {
this.builder.attributeMap.put(name, object);
@@ -178,7 +178,7 @@ public class SlingHttpServletRequestImpl extends SlingAdaptable implements Sling
@Override
public RequestParameterMap getRequestParameterMap() {
- if ( this.builder.requestParameterMap == null ) {
+ if (this.builder.requestParameterMap == null) {
this.builder.requestParameterMap = new RequestParameterMapImpl(this.builder.parameters);
}
return this.builder.requestParameterMap;
@@ -192,7 +192,8 @@ public class SlingHttpServletRequestImpl extends SlingAdaptable implements Sling
@Override
public List<RequestParameter> getRequestParameterList() {
final List<RequestParameter> params = new ArrayList<>();
- for (final RequestParameter[] requestParameters : getRequestParameterMap().values()) {
+ for (final RequestParameter[] requestParameters :
+ getRequestParameterMap().values()) {
params.addAll(Arrays.asList(requestParameters));
}
return params;
@@ -289,10 +290,11 @@ public class SlingHttpServletRequestImpl extends SlingAdaptable implements Sling
@Override
public Cookie[] getCookies() {
- if ( this.builder.cookies.isEmpty() ) {
+ if (this.builder.cookies.isEmpty()) {
return null;
}
- return CookieWrapper.wrap(this.builder.cookies.values().toArray(new jakarta.servlet.http.Cookie[this.builder.cookies.size()]));
+ return CookieWrapper.wrap(
+ this.builder.cookies.values().toArray(new jakarta.servlet.http.Cookie[this.builder.cookies.size()]));
}
@Override
@@ -319,10 +321,13 @@ public class SlingHttpServletRequestImpl extends SlingAdaptable implements Sling
public String getContentType() {
if (this.builder.contentType == null) {
return null;
- } else if ( this.builder.characterEncoding == null ) {
+ } else if (this.builder.characterEncoding == null) {
return this.builder.contentType;
}
- return this.builder.contentType.concat(SlingHttpServletRequestBuilderImpl.CHARSET_SEPARATOR).concat(this.builder.characterEncoding);
+ return this.builder
+ .contentType
+ .concat(SlingHttpServletRequestBuilderImpl.CHARSET_SEPARATOR)
+ .concat(this.builder.characterEncoding);
}
@Override
@@ -377,8 +382,9 @@ public class SlingHttpServletRequestImpl extends SlingAdaptable implements Sling
@Override
public RequestDispatcher getRequestDispatcher(final String path) {
- if ( this.builder.requestDispatcherProvider != null ) {
- jakarta.servlet.RequestDispatcher dispatcher = this.builder.requestDispatcherProvider.getRequestDispatcher(path);
+ if (this.builder.requestDispatcherProvider != null) {
+ jakarta.servlet.RequestDispatcher dispatcher =
+ this.builder.requestDispatcherProvider.getRequestDispatcher(path);
if (dispatcher != null) {
return new RequestDispatcherWrapper(dispatcher);
}
@@ -389,8 +395,9 @@ public class SlingHttpServletRequestImpl extends SlingAdaptable implements Sling
@Override
public RequestDispatcher getRequestDispatcher(final String path, final RequestDispatcherOptions options) {
- if ( this.builder.requestDispatcherProvider != null ) {
- jakarta.servlet.RequestDispatcher dispatcher = this.builder.requestDispatcherProvider.getRequestDispatcher(path, options);
+ if (this.builder.requestDispatcherProvider != null) {
+ jakarta.servlet.RequestDispatcher dispatcher =
+ this.builder.requestDispatcherProvider.getRequestDispatcher(path, options);
if (dispatcher != null) {
return new RequestDispatcherWrapper(dispatcher);
}
@@ -401,8 +408,9 @@ public class SlingHttpServletRequestImpl extends SlingAdaptable implements Sling
@Override
public RequestDispatcher getRequestDispatcher(final Resource resource) {
- if ( this.builder.requestDispatcherProvider != null ) {
- jakarta.servlet.RequestDispatcher dispatcher = this.builder.requestDispatcherProvider.getRequestDispatcher(resource);
+ if (this.builder.requestDispatcherProvider != null) {
+ jakarta.servlet.RequestDispatcher dispatcher =
+ this.builder.requestDispatcherProvider.getRequestDispatcher(resource);
if (dispatcher != null) {
return new RequestDispatcherWrapper(dispatcher);
}
@@ -413,8 +421,9 @@ public class SlingHttpServletRequestImpl extends SlingAdaptable implements Sling
@Override
public RequestDispatcher getRequestDispatcher(final Resource resource, final RequestDispatcherOptions options) {
- if ( this.builder.requestDispatcherProvider != null ) {
- jakarta.servlet.RequestDispatcher dispatcher = this.builder.requestDispatcherProvider.getRequestDispatcher(resource, options);
+ if (this.builder.requestDispatcherProvider != null) {
+ jakarta.servlet.RequestDispatcher dispatcher =
+ this.builder.requestDispatcherProvider.getRequestDispatcher(resource, options);
if (dispatcher != null) {
return new RequestDispatcherWrapper(dispatcher);
}
@@ -470,11 +479,13 @@ public class SlingHttpServletRequestImpl extends SlingAdaptable implements Sling
requestUrl.append("://");
requestUrl.append(this.builder.serverName);
boolean includePort = true;
- if ( (SlingHttpServletRequestBuilderImpl.HTTP_PROTOCOL.equals(this.builder.scheme) && this.builder.serverPort == 80 )
- || (SlingHttpServletRequestBuilderImpl.SECURE_PROTOCOL.equals(this.builder.scheme) && this.builder.serverPort == 443) ) {
+ if ((SlingHttpServletRequestBuilderImpl.HTTP_PROTOCOL.equals(this.builder.scheme)
+ && this.builder.serverPort == 80)
+ || (SlingHttpServletRequestBuilderImpl.SECURE_PROTOCOL.equals(this.builder.scheme)
+ && this.builder.serverPort == 443)) {
includePort = false;
}
- if ( includePort ) {
+ if (includePort) {
requestUrl.append(':');
requestUrl.append(this.builder.serverPort);
}
diff --git a/src/main/java/org/apache/sling/api/request/builder/impl/SlingHttpServletResponseBuilderImpl.java b/src/main/java/org/apache/sling/api/request/builder/impl/SlingHttpServletResponseBuilderImpl.java
index ea50c20..ea8dcd5 100644
--- a/src/main/java/org/apache/sling/api/request/builder/impl/SlingHttpServletResponseBuilderImpl.java
+++ b/src/main/java/org/apache/sling/api/request/builder/impl/SlingHttpServletResponseBuilderImpl.java
@@ -18,8 +18,8 @@
*/
package org.apache.sling.api.request.builder.impl;
-import org.apache.sling.api.request.builder.SlingJakartaHttpServletResponseResult;
import org.apache.sling.api.request.builder.SlingHttpServletResponseBuilder;
+import org.apache.sling.api.request.builder.SlingJakartaHttpServletResponseResult;
import org.jetbrains.annotations.NotNull;
/**
@@ -31,7 +31,7 @@ public class SlingHttpServletResponseBuilderImpl implements SlingHttpServletResp
private boolean locked = false;
private void checkLocked() {
- if ( locked ) {
+ if (locked) {
throw new IllegalStateException("The builder can't be reused. Create a new builder instead.");
}
}
diff --git a/src/main/java/org/apache/sling/api/request/builder/impl/SlingHttpServletResponseResultImpl.java b/src/main/java/org/apache/sling/api/request/builder/impl/SlingHttpServletResponseResultImpl.java
index fcbf78e..3fbfd64 100644
--- a/src/main/java/org/apache/sling/api/request/builder/impl/SlingHttpServletResponseResultImpl.java
+++ b/src/main/java/org/apache/sling/api/request/builder/impl/SlingHttpServletResponseResultImpl.java
@@ -18,6 +18,11 @@
*/
package org.apache.sling.api.request.builder.impl;
+import javax.servlet.ServletOutputStream;
+import javax.servlet.WriteListener;
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletResponse;
+
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.OutputStreamWriter;
@@ -29,11 +34,6 @@ import java.util.LinkedHashMap;
import java.util.Locale;
import java.util.Map;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.WriteListener;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletResponse;
-
import org.apache.sling.api.adapter.SlingAdaptable;
import org.apache.sling.api.request.builder.SlingHttpServletResponseResult;
import org.jetbrains.annotations.NotNull;
@@ -43,9 +43,7 @@ import org.jetbrains.annotations.NotNull;
* @deprecated
*/
@Deprecated
-public class SlingHttpServletResponseResultImpl
- extends SlingAdaptable
- implements SlingHttpServletResponseResult {
+public class SlingHttpServletResponseResultImpl extends SlingAdaptable implements SlingHttpServletResponseResult {
/** Headers */
private final HeaderSupport headerSupport = new HeaderSupport();
@@ -99,10 +97,12 @@ public class SlingHttpServletResponseResultImpl
public String getContentType() {
if (this.contentType == null) {
return null;
- } else if ( this.characterEncoding == null ) {
+ } else if (this.characterEncoding == null) {
return this.contentType;
}
- return this.contentType.concat(SlingHttpServletRequestBuilderImpl.CHARSET_SEPARATOR).concat(this.characterEncoding);
+ return this.contentType
+ .concat(SlingHttpServletRequestBuilderImpl.CHARSET_SEPARATOR)
+ .concat(this.characterEncoding);
}
@Override
@@ -111,7 +111,8 @@ public class SlingHttpServletResponseResultImpl
final int pos = type == null ? -1 : type.indexOf(SlingHttpServletRequestBuilderImpl.CHARSET_SEPARATOR);
if (pos != -1) {
this.contentType = type.substring(0, pos);
- this.characterEncoding = type.substring(pos + SlingHttpServletRequestBuilderImpl.CHARSET_SEPARATOR.length());
+ this.characterEncoding =
+ type.substring(pos + SlingHttpServletRequestBuilderImpl.CHARSET_SEPARATOR.length());
} else {
this.contentType = type;
}
@@ -217,7 +218,7 @@ public class SlingHttpServletResponseResultImpl
}
private Charset getCharset() {
- if ( this.characterEncoding == null ) {
+ if (this.characterEncoding == null) {
return StandardCharsets.UTF_8;
}
return Charset.forName(this.characterEncoding);
@@ -325,7 +326,7 @@ public class SlingHttpServletResponseResultImpl
@Override
public Cookie[] getCookies() {
- if ( this.cookies.isEmpty() ) {
+ if (this.cookies.isEmpty()) {
return null;
}
return cookies.values().toArray(new Cookie[cookies.size()]);
diff --git a/src/main/java/org/apache/sling/api/request/builder/impl/SlingJakartaHttpServletRequestImpl.java b/src/main/java/org/apache/sling/api/request/builder/impl/SlingJakartaHttpServletRequestImpl.java
index 67b965b..bfa1c76 100644
--- a/src/main/java/org/apache/sling/api/request/builder/impl/SlingJakartaHttpServletRequestImpl.java
+++ b/src/main/java/org/apache/sling/api/request/builder/impl/SlingJakartaHttpServletRequestImpl.java
@@ -36,15 +36,6 @@ import java.util.Locale;
import java.util.Map;
import java.util.ResourceBundle;
-import org.apache.sling.api.SlingJakartaHttpServletRequest;
-import org.apache.sling.api.adapter.SlingAdaptable;
-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 jakarta.servlet.AsyncContext;
import jakarta.servlet.DispatcherType;
import jakarta.servlet.ReadListener;
@@ -60,6 +51,15 @@ import jakarta.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpSession;
import jakarta.servlet.http.HttpUpgradeHandler;
import jakarta.servlet.http.Part;
+import org.apache.sling.api.SlingJakartaHttpServletRequest;
+import org.apache.sling.api.adapter.SlingAdaptable;
+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;
/**
* Internal {@link SlingJakartaHttpServletRequest} implementation.
@@ -90,11 +90,11 @@ public class SlingJakartaHttpServletRequestImpl extends SlingAdaptable implement
@Override
public HttpSession getSession(final boolean create) {
if (this.builder.session == null && create) {
- if ( this.builder.sessionProvider != null ) {
+ if (this.builder.sessionProvider != null) {
this.builder.session = this.builder.sessionProvider.getSession(create);
} else {
this.builder.session = new HttpSessionImpl(this.builder.servletContext);
- }
+ }
}
return this.builder.session;
}
@@ -106,7 +106,7 @@ public class SlingJakartaHttpServletRequestImpl extends SlingAdaptable implement
@Override
public Object getAttribute(final String name) {
- if ( this.builder.attributesProvider != null ) {
+ if (this.builder.attributesProvider != null) {
return this.builder.attributesProvider.getAttribute(name);
}
return this.builder.attributeMap.get(name);
@@ -114,7 +114,7 @@ public class SlingJakartaHttpServletRequestImpl extends SlingAdaptable implement
@Override
public Enumeration<String> getAttributeNames() {
- if ( this.builder.attributesProvider != null ) {
+ if (this.builder.attributesProvider != null) {
return this.builder.attributesProvider.getAttributeNames();
}
return Collections.enumeration(this.builder.attributeMap.keySet());
@@ -122,7 +122,7 @@ public class SlingJakartaHttpServletRequestImpl extends SlingAdaptable implement
@Override
public void removeAttribute(final String name) {
- if ( this.builder.attributesProvider != null ) {
+ if (this.builder.attributesProvider != null) {
this.builder.attributesProvider.removeAttribute(name);
} else {
this.builder.attributeMap.remove(name);
@@ -131,7 +131,7 @@ public class SlingJakartaHttpServletRequestImpl extends SlingAdaptable implement
@Override
public void setAttribute(final String name, final Object object) {
- if ( this.builder.attributesProvider != null ) {
+ if (this.builder.attributesProvider != null) {
this.builder.attributesProvider.setAttribute(name, object);
} else {
this.builder.attributeMap.put(name, object);
@@ -169,7 +169,7 @@ public class SlingJakartaHttpServletRequestImpl extends SlingAdaptable implement
@Override
public RequestParameterMap getRequestParameterMap() {
- if ( this.builder.requestParameterMap == null ) {
+ if (this.builder.requestParameterMap == null) {
this.builder.requestParameterMap = new RequestParameterMapImpl(this.builder.parameters);
}
return this.builder.requestParameterMap;
@@ -183,7 +183,8 @@ public class SlingJakartaHttpServletRequestImpl extends SlingAdaptable implement
@Override
public List<RequestParameter> getRequestParameterList() {
final List<RequestParameter> params = new ArrayList<>();
- for (final RequestParameter[] requestParameters : getRequestParameterMap().values()) {
+ for (final RequestParameter[] requestParameters :
+ getRequestParameterMap().values()) {
params.addAll(Arrays.asList(requestParameters));
}
return params;
@@ -276,7 +277,7 @@ public class SlingJakartaHttpServletRequestImpl extends SlingAdaptable implement
@Override
public Cookie[] getCookies() {
- if ( this.builder.cookies.isEmpty() ) {
+ if (this.builder.cookies.isEmpty()) {
return null;
}
return this.builder.cookies.values().toArray(new Cookie[this.builder.cookies.size()]);
@@ -306,10 +307,13 @@ public class SlingJakartaHttpServletRequestImpl extends SlingAdaptable implement
public String getContentType() {
if (this.builder.contentType == null) {
return null;
- } else if ( this.builder.characterEncoding == null ) {
+ } else if (this.builder.characterEncoding == null) {
return this.builder.contentType;
}
- return this.builder.contentType.concat(SlingHttpServletRequestBuilderImpl.CHARSET_SEPARATOR).concat(this.builder.characterEncoding);
+ return this.builder
+ .contentType
+ .concat(SlingHttpServletRequestBuilderImpl.CHARSET_SEPARATOR)
+ .concat(this.builder.characterEncoding);
}
@Override
@@ -364,7 +368,7 @@ public class SlingJakartaHttpServletRequestImpl extends SlingAdaptable implement
@Override
public RequestDispatcher getRequestDispatcher(final String path) {
- if ( this.builder.requestDispatcherProvider != null ) {
+ if (this.builder.requestDispatcherProvider != null) {
return this.builder.requestDispatcherProvider.getRequestDispatcher(path);
}
throw new UnsupportedOperationException();
@@ -372,7 +376,7 @@ public class SlingJakartaHttpServletRequestImpl extends SlingAdaptable implement
@Override
public RequestDispatcher getRequestDispatcher(final String path, final RequestDispatcherOptions options) {
- if ( this.builder.requestDispatcherProvider != null ) {
+ if (this.builder.requestDispatcherProvider != null) {
return this.builder.requestDispatcherProvider.getRequestDispatcher(path, options);
}
throw new UnsupportedOperationException();
@@ -380,7 +384,7 @@ public class SlingJakartaHttpServletRequestImpl extends SlingAdaptable implement
@Override
public RequestDispatcher getRequestDispatcher(final Resource resource) {
- if ( this.builder.requestDispatcherProvider != null ) {
+ if (this.builder.requestDispatcherProvider != null) {
return this.builder.requestDispatcherProvider.getRequestDispatcher(resource);
}
throw new UnsupportedOperationException();
@@ -388,7 +392,7 @@ public class SlingJakartaHttpServletRequestImpl extends SlingAdaptable implement
@Override
public RequestDispatcher getRequestDispatcher(final Resource resource, final RequestDispatcherOptions options) {
- if ( this.builder.requestDispatcherProvider != null ) {
+ if (this.builder.requestDispatcherProvider != null) {
return this.builder.requestDispatcherProvider.getRequestDispatcher(resource, options);
}
throw new UnsupportedOperationException();
@@ -441,11 +445,13 @@ public class SlingJakartaHttpServletRequestImpl extends SlingAdaptable implement
requestUrl.append("://");
requestUrl.append(this.builder.serverName);
boolean includePort = true;
- if ( (SlingHttpServletRequestBuilderImpl.HTTP_PROTOCOL.equals(this.builder.scheme) && this.builder.serverPort == 80 )
- || (SlingHttpServletRequestBuilderImpl.SECURE_PROTOCOL.equals(this.builder.scheme) && this.builder.serverPort == 443) ) {
+ if ((SlingHttpServletRequestBuilderImpl.HTTP_PROTOCOL.equals(this.builder.scheme)
+ && this.builder.serverPort == 80)
+ || (SlingHttpServletRequestBuilderImpl.SECURE_PROTOCOL.equals(this.builder.scheme)
+ && this.builder.serverPort == 443)) {
includePort = false;
}
- if ( includePort ) {
+ if (includePort) {
requestUrl.append(':');
requestUrl.append(this.builder.serverPort);
}
diff --git a/src/main/java/org/apache/sling/api/request/builder/impl/SlingJakartaHttpServletResponseResultImpl.java b/src/main/java/org/apache/sling/api/request/builder/impl/SlingJakartaHttpServletResponseResultImpl.java
index 4cf9941..17a7d7f 100644
--- a/src/main/java/org/apache/sling/api/request/builder/impl/SlingJakartaHttpServletResponseResultImpl.java
+++ b/src/main/java/org/apache/sling/api/request/builder/impl/SlingJakartaHttpServletResponseResultImpl.java
@@ -29,21 +29,19 @@ import java.util.LinkedHashMap;
import java.util.Locale;
import java.util.Map;
-import org.apache.sling.api.adapter.SlingAdaptable;
-import org.apache.sling.api.request.builder.SlingJakartaHttpServletResponseResult;
-import org.jetbrains.annotations.NotNull;
-
import jakarta.servlet.ServletOutputStream;
import jakarta.servlet.WriteListener;
import jakarta.servlet.http.Cookie;
import jakarta.servlet.http.HttpServletResponse;
+import org.apache.sling.api.adapter.SlingAdaptable;
+import org.apache.sling.api.request.builder.SlingJakartaHttpServletResponseResult;
+import org.jetbrains.annotations.NotNull;
/**
* Internal {@link SlingJakartaHttpServletResponseResultImpl} implementation.
*/
-public class SlingJakartaHttpServletResponseResultImpl
- extends SlingAdaptable
- implements SlingJakartaHttpServletResponseResult {
+public class SlingJakartaHttpServletResponseResultImpl extends SlingAdaptable
+ implements SlingJakartaHttpServletResponseResult {
/** Headers */
private final HeaderSupport headerSupport = new HeaderSupport();
@@ -97,10 +95,12 @@ public class SlingJakartaHttpServletResponseResultImpl
public String getContentType() {
if (this.contentType == null) {
return null;
- } else if ( this.characterEncoding == null ) {
+ } else if (this.characterEncoding == null) {
return this.contentType;
}
- return this.contentType.concat(SlingHttpServletRequestBuilderImpl.CHARSET_SEPARATOR).concat(this.characterEncoding);
+ return this.contentType
+ .concat(SlingHttpServletRequestBuilderImpl.CHARSET_SEPARATOR)
+ .concat(this.characterEncoding);
}
@Override
@@ -109,7 +109,8 @@ public class SlingJakartaHttpServletResponseResultImpl
final int pos = type == null ? -1 : type.indexOf(SlingHttpServletRequestBuilderImpl.CHARSET_SEPARATOR);
if (pos != -1) {
this.contentType = type.substring(0, pos);
- this.characterEncoding = type.substring(pos + SlingHttpServletRequestBuilderImpl.CHARSET_SEPARATOR.length());
+ this.characterEncoding =
+ type.substring(pos + SlingHttpServletRequestBuilderImpl.CHARSET_SEPARATOR.length());
} else {
this.contentType = type;
}
@@ -209,7 +210,7 @@ public class SlingJakartaHttpServletResponseResultImpl
}
private Charset getCharset() {
- if ( this.characterEncoding == null ) {
+ if (this.characterEncoding == null) {
return StandardCharsets.UTF_8;
}
return Charset.forName(this.characterEncoding);
@@ -317,7 +318,7 @@ public class SlingJakartaHttpServletResponseResultImpl
@Override
public Cookie[] getCookies() {
- if ( this.cookies.isEmpty() ) {
+ if (this.cookies.isEmpty()) {
return null;
}
return cookies.values().toArray(new Cookie[cookies.size()]);
diff --git a/src/main/java/org/apache/sling/api/request/header/JakartaMediaRangeList.java b/src/main/java/org/apache/sling/api/request/header/JakartaMediaRangeList.java
index 80b70cd..bc7bf5d 100644
--- a/src/main/java/org/apache/sling/api/request/header/JakartaMediaRangeList.java
+++ b/src/main/java/org/apache/sling/api/request/header/JakartaMediaRangeList.java
@@ -1,18 +1,20 @@
/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
package org.apache.sling.api.request.header;
@@ -23,7 +25,6 @@ import java.util.Set;
import java.util.TreeSet;
import jakarta.servlet.http.HttpServletRequest;
-
import org.osgi.annotation.versioning.ConsumerType;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -57,7 +58,7 @@ public class JakartaMediaRangeList extends TreeSet<JakartaMediaRangeList.MediaRa
if (queryParam != null && queryParam.trim().length() != 0) {
init(queryParam);
} else {
- init(request.getHeader(HEADER_ACCEPT));
+ init(request.getHeader(HEADER_ACCEPT));
}
}
@@ -76,7 +77,9 @@ public class JakartaMediaRangeList extends TreeSet<JakartaMediaRangeList.MediaRa
try {
init(listStr);
} catch (Throwable t) {
- log.error("Error building MediaRangeList from '" + listStr + "' - will assume client accepts all media types", t);
+ log.error(
+ "Error building MediaRangeList from '" + listStr + "' - will assume client accepts all media types",
+ t);
init(null);
}
}
@@ -150,7 +153,7 @@ public class JakartaMediaRangeList extends TreeSet<JakartaMediaRangeList.MediaRa
ranges.add(new MediaRange(mediaRange));
}
final MediaRange preferred = prefer(ranges);
- return(preferred == null ? null : preferred.toString());
+ return (preferred == null ? null : preferred.toString());
}
/**
@@ -194,7 +197,7 @@ public class JakartaMediaRangeList extends TreeSet<JakartaMediaRangeList.MediaRa
String[] parts = exp.split(";");
this.setType(parts[0].trim());
if (parts.length > 1) {
- this.parameters = new HashMap<String, String>(parts.length - 1);
+ this.parameters = new HashMap<String, String>(parts.length - 1);
}
for (int i = 1, partsLength = parts.length; i < partsLength; i++) {
String parameter = parts[i];
@@ -219,7 +222,6 @@ public class JakartaMediaRangeList extends TreeSet<JakartaMediaRangeList.MediaRa
this.setType(supertype, subtype);
}
-
/**
* Returns <code>true</code> if this is a catch-all media range (<code>*/*</code>).
* @return <code>true</code> if this range is a catch-all media range, <code>false</code> otherwise
@@ -240,10 +242,10 @@ public class JakartaMediaRangeList extends TreeSet<JakartaMediaRangeList.MediaRa
String[] parts = typeDef.split("/");
String superType = parts[0];
String subType = WILDCARD;
- if(parts.length > 1){
+ if (parts.length > 1) {
subType = parts[1];
}
- this.setType(superType,subType);
+ this.setType(superType, subType);
}
MediaRange(String supertype, String subtype, double q) {
@@ -251,7 +253,6 @@ public class JakartaMediaRangeList extends TreeSet<JakartaMediaRangeList.MediaRa
this.q = q;
}
-
public String getParameter(String key) {
if (parameters != null) {
return parameters.get(key);
@@ -311,7 +312,8 @@ public class JakartaMediaRangeList extends TreeSet<JakartaMediaRangeList.MediaRa
public boolean equals(Object obj) {
if (obj instanceof MediaRange) {
MediaRange mr = (MediaRange) obj;
- return mr.getSupertype().equals(this.supertype) && mr.getSubtype().equals(this.subtype);
+ return mr.getSupertype().equals(this.supertype)
+ && mr.getSubtype().equals(this.subtype);
}
return super.equals(obj);
}
diff --git a/src/main/java/org/apache/sling/api/request/header/MediaRangeList.java b/src/main/java/org/apache/sling/api/request/header/MediaRangeList.java
index 4ee27f2..a0d06e9 100644
--- a/src/main/java/org/apache/sling/api/request/header/MediaRangeList.java
+++ b/src/main/java/org/apache/sling/api/request/header/MediaRangeList.java
@@ -1,29 +1,31 @@
/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
package org.apache.sling.api.request.header;
+import javax.servlet.http.HttpServletRequest;
+
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import java.util.TreeSet;
-import javax.servlet.http.HttpServletRequest;
-
import org.osgi.annotation.versioning.ConsumerType;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -57,7 +59,7 @@ public class MediaRangeList extends TreeSet<MediaRangeList.MediaRange> {
if (queryParam != null && queryParam.trim().length() != 0) {
init(queryParam);
} else {
- init(request.getHeader(HEADER_ACCEPT));
+ init(request.getHeader(HEADER_ACCEPT));
}
}
@@ -76,7 +78,9 @@ public class MediaRangeList extends TreeSet<MediaRangeList.MediaRange> {
try {
init(listStr);
} catch (Throwable t) {
- log.error("Error building MediaRangeList from '" + listStr + "' - will assume client accepts all media types", t);
+ log.error(
+ "Error building MediaRangeList from '" + listStr + "' - will assume client accepts all media types",
+ t);
init(null);
}
}
@@ -150,7 +154,7 @@ public class MediaRangeList extends TreeSet<MediaRangeList.MediaRange> {
ranges.add(new MediaRange(mediaRange));
}
final MediaRange preferred = prefer(ranges);
- return(preferred == null ? null : preferred.toString());
+ return (preferred == null ? null : preferred.toString());
}
/**
@@ -194,7 +198,7 @@ public class MediaRangeList extends TreeSet<MediaRangeList.MediaRange> {
String[] parts = exp.split(";");
this.setType(parts[0].trim());
if (parts.length > 1) {
- this.parameters = new HashMap<String, String>(parts.length - 1);
+ this.parameters = new HashMap<String, String>(parts.length - 1);
}
for (int i = 1, partsLength = parts.length; i < partsLength; i++) {
String parameter = parts[i];
@@ -219,7 +223,6 @@ public class MediaRangeList extends TreeSet<MediaRangeList.MediaRange> {
this.setType(supertype, subtype);
}
-
/**
* Returns <code>true</code> if this is a catch-all media range (<code>*/*</code>).
* @return <code>true</code> if this range is a catch-all media range, <code>false</code> otherwise
@@ -240,10 +243,10 @@ public class MediaRangeList extends TreeSet<MediaRangeList.MediaRange> {
String[] parts = typeDef.split("/");
String superType = parts[0];
String subType = WILDCARD;
- if(parts.length > 1){
+ if (parts.length > 1) {
subType = parts[1];
}
- this.setType(superType,subType);
+ this.setType(superType, subType);
}
MediaRange(String supertype, String subtype, double q) {
@@ -251,7 +254,6 @@ public class MediaRangeList extends TreeSet<MediaRangeList.MediaRange> {
this.q = q;
}
-
public String getParameter(String key) {
if (parameters != null) {
return parameters.get(key);
@@ -311,7 +313,8 @@ public class MediaRangeList extends TreeSet<MediaRangeList.MediaRange> {
public boolean equals(Object obj) {
if (obj instanceof MediaRange) {
MediaRange mr = (MediaRange) obj;
- return mr.getSupertype().equals(this.supertype) && mr.getSubtype().equals(this.subtype);
+ return mr.getSupertype().equals(this.supertype)
+ && mr.getSubtype().equals(this.subtype);
}
return super.equals(obj);
}
diff --git a/src/main/java/org/apache/sling/api/resource/AbstractResource.java b/src/main/java/org/apache/sling/api/resource/AbstractResource.java
index 1b49994..e016c68 100644
--- a/src/main/java/org/apache/sling/api/resource/AbstractResource.java
+++ b/src/main/java/org/apache/sling/api/resource/AbstractResource.java
@@ -38,9 +38,7 @@ import org.apache.sling.api.wrappers.ValueMapDecorator;
*
* @since 2.1.0 (Sling API Bundle 2.1.0)
*/
-public abstract class AbstractResource
- extends SlingAdaptable
- implements Resource {
+public abstract class AbstractResource extends SlingAdaptable implements Resource {
/**
* Returns the name of this resource.
@@ -130,7 +128,7 @@ public abstract class AbstractResource
* the adaptions are not successful an empty value map is returned.
* @see org.apache.sling.api.resource.Resource#getValueMap()
*/
- @SuppressWarnings({ "unchecked", "rawtypes" })
+ @SuppressWarnings({"unchecked", "rawtypes"})
public ValueMap getValueMap() {
// adapt to ValueMap if resource is not null
ValueMap valueMap = this.adaptTo(ValueMap.class);
diff --git a/src/main/java/org/apache/sling/api/resource/AbstractResourceVisitor.java b/src/main/java/org/apache/sling/api/resource/AbstractResourceVisitor.java
index 1d7ba0e..bb39053 100644
--- a/src/main/java/org/apache/sling/api/resource/AbstractResourceVisitor.java
+++ b/src/main/java/org/apache/sling/api/resource/AbstractResourceVisitor.java
@@ -25,12 +25,12 @@ import org.jetbrains.annotations.NotNull;
/**
* This visitor will traverse the given resource and all its children in a depth-first approach
* and call the {@link AbstractResourceVisitor#visit(Resource)} method for each visited resource.
- * It decouples the actual traversal code from application code.
- *
+ * It decouples the actual traversal code from application code.
+ *
* Concrete subclasses must implement the {@link AbstractResourceVisitor#visit(Resource)} method.
* There is no possibility to stop traversal in this visitor. If you want to skip certain
- * parts of the subtree or stop traversal at a certain point rather use
- * {@link org.apache.sling.resource.filter.ResourceStream} or
+ * parts of the subtree or stop traversal at a certain point rather use
+ * {@link org.apache.sling.resource.filter.ResourceStream} or
* {@link org.apache.sling.resource.filter.ResourceFilterStream}.
*
* @see <a href="https://en.wikipedia.org/wiki/Depth-first_search">Depth-First-Search</a>
diff --git a/src/main/java/org/apache/sling/api/resource/ModifyingResourceProvider.java b/src/main/java/org/apache/sling/api/resource/ModifyingResourceProvider.java
index 48ee421..1a8d90a 100644
--- a/src/main/java/org/apache/sling/api/resource/ModifyingResourceProvider.java
+++ b/src/main/java/org/apache/sling/api/resource/ModifyingResourceProvider.java
@@ -63,8 +63,7 @@ public interface ModifyingResourceProvider extends ResourceProvider {
*
* @throws PersistenceException If anything fails
*/
- Resource create(ResourceResolver resolver, String path, Map<String, Object> properties)
- throws PersistenceException;
+ Resource create(ResourceResolver resolver, String path, Map<String, Object> properties) throws PersistenceException;
/**
* Delete the resource at the given path.
@@ -76,8 +75,7 @@ public interface ModifyingResourceProvider extends ResourceProvider {
*
* @throws PersistenceException If anything fails
*/
- void delete(ResourceResolver resolver, String path)
- throws PersistenceException;
+ void delete(ResourceResolver resolver, String path) throws PersistenceException;
/**
* Revert all transient changes: create, delete and updates.
@@ -93,8 +91,7 @@ public interface ModifyingResourceProvider extends ResourceProvider {
*
* @throws PersistenceException If anything fails
*/
- void commit(ResourceResolver resolver)
- throws PersistenceException;
+ void commit(ResourceResolver resolver) throws PersistenceException;
/**
* Are there any transient changes?
diff --git a/src/main/java/org/apache/sling/api/resource/NonExistingResource.java b/src/main/java/org/apache/sling/api/resource/NonExistingResource.java
index bdb8bf4..95e1b97 100644
--- a/src/main/java/org/apache/sling/api/resource/NonExistingResource.java
+++ b/src/main/java/org/apache/sling/api/resource/NonExistingResource.java
@@ -37,8 +37,7 @@ public final class NonExistingResource extends SyntheticResource {
* @param resourceResolver The resource resolver.
* @param resourceURI The path of the resource.
*/
- public NonExistingResource(final ResourceResolver resourceResolver,
- final String resourceURI) {
+ public NonExistingResource(final ResourceResolver resourceResolver, final String resourceURI) {
super(resourceResolver, resourceURI, RESOURCE_TYPE_NON_EXISTING);
}
@@ -58,7 +57,7 @@ public final class NonExistingResource extends SyntheticResource {
}
/**
- *
+ *
* @return the parent resource (might be a {@link NonExistingResource} in case the parent does not exist either).
*/
public Resource getParent() {
@@ -69,5 +68,4 @@ public final class NonExistingResource extends SyntheticResource {
return parent;
}
}
-
}
diff --git a/src/main/java/org/apache/sling/api/resource/ParametrizableResourceProvider.java b/src/main/java/org/apache/sling/api/resource/ParametrizableResourceProvider.java
index 9667dfb..2ebaf45 100644
--- a/src/main/java/org/apache/sling/api/resource/ParametrizableResourceProvider.java
+++ b/src/main/java/org/apache/sling/api/resource/ParametrizableResourceProvider.java
@@ -20,9 +20,8 @@ package org.apache.sling.api.resource;
import java.util.Map;
-import org.jetbrains.annotations.Nullable;
import org.jetbrains.annotations.NotNull;
-
+import org.jetbrains.annotations.Nullable;
import org.osgi.annotation.versioning.ConsumerType;
/**
@@ -62,7 +61,7 @@ public interface ParametrizableResourceProvider {
* may be thrown in case of any problem creating the <code>Resource</code> instance.
* @see ResourceProvider#getResource(ResourceResolver, String)
*/
- @Nullable Resource getResource(@NotNull ResourceResolver resourceResolver,
- @NotNull String path,
- @NotNull Map<String, String> parameters);
+ @Nullable
+ Resource getResource(
+ @NotNull ResourceResolver resourceResolver, @NotNull String path, @NotNull Map<String, String> parameters);
}
diff --git a/src/main/java/org/apache/sling/api/resource/PersistenceException.java b/src/main/java/org/apache/sling/api/resource/PersistenceException.java
index ebde578..659005b 100644
--- a/src/main/java/org/apache/sling/api/resource/PersistenceException.java
+++ b/src/main/java/org/apache/sling/api/resource/PersistenceException.java
@@ -66,10 +66,8 @@ public class PersistenceException extends IOException {
* @param resourcePath The optional resource path
* @param propertyName The optional property name
*/
- public PersistenceException(final String msg,
- final Throwable cause,
- final String resourcePath,
- final String propertyName) {
+ public PersistenceException(
+ final String msg, final Throwable cause, final String resourcePath, final String propertyName) {
super(msg);
initCause(cause);
this.resourcePath = resourcePath;
diff --git a/src/main/java/org/apache/sling/api/resource/QueriableResourceProvider.java b/src/main/java/org/apache/sling/api/resource/QueriableResourceProvider.java
index 08a64a6..994eac8 100644
--- a/src/main/java/org/apache/sling/api/resource/QueriableResourceProvider.java
+++ b/src/main/java/org/apache/sling/api/resource/QueriableResourceProvider.java
@@ -22,7 +22,6 @@ import java.util.Iterator;
import org.osgi.annotation.versioning.ConsumerType;
-
/**
* A queriable resource provider is an extension of a resource provider.
*
diff --git a/src/main/java/org/apache/sling/api/resource/QuerySyntaxException.java b/src/main/java/org/apache/sling/api/resource/QuerySyntaxException.java
index 947c807..4268486 100644
--- a/src/main/java/org/apache/sling/api/resource/QuerySyntaxException.java
+++ b/src/main/java/org/apache/sling/api/resource/QuerySyntaxException.java
@@ -41,8 +41,7 @@ public class QuerySyntaxException extends SlingException {
this.language = language;
}
- public QuerySyntaxException(String message, String query, String language,
- Throwable cause) {
+ public QuerySyntaxException(String message, String query, String language, Throwable cause) {
super(message, cause);
this.query = query;
diff --git a/src/main/java/org/apache/sling/api/resource/RefreshableResourceProvider.java b/src/main/java/org/apache/sling/api/resource/RefreshableResourceProvider.java
index 2b353a6..c6c0a85 100644
--- a/src/main/java/org/apache/sling/api/resource/RefreshableResourceProvider.java
+++ b/src/main/java/org/apache/sling/api/resource/RefreshableResourceProvider.java
@@ -20,8 +20,6 @@ package org.apache.sling.api.resource;
import org.osgi.annotation.versioning.ConsumerType;
-
-
/**
* A resource provider might return the state when it was created and not
* update to the latest state.
diff --git a/src/main/java/org/apache/sling/api/resource/Resource.java b/src/main/java/org/apache/sling/api/resource/Resource.java
index c2dd000..d2b6308 100644
--- a/src/main/java/org/apache/sling/api/resource/Resource.java
+++ b/src/main/java/org/apache/sling/api/resource/Resource.java
@@ -1,28 +1,28 @@
/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
package org.apache.sling.api.resource;
import java.util.Iterator;
-import org.jetbrains.annotations.Nullable;
-import org.jetbrains.annotations.NotNull;
-
import org.apache.sling.api.adapter.Adaptable;
-
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.osgi.annotation.versioning.ProviderType;
/**
@@ -66,7 +66,8 @@ public interface Resource extends Adaptable {
* Returns the absolute path of this resource in the resource tree.
* @return The resource path
*/
- @NotNull String getPath();
+ @NotNull
+ String getPath();
/**
* Returns the name of this resource. The name of a resource is the last
@@ -75,7 +76,8 @@ public interface Resource extends Adaptable {
* @return The resource name
* @since 2.1 (Sling API Bundle 2.2.0)
*/
- @NotNull String getName();
+ @NotNull
+ String getName();
/**
* Returns the parent resource or <code>null</code> if this resource
@@ -89,7 +91,8 @@ public interface Resource extends Adaptable {
* @since 2.1 (Sling API Bundle 2.1.0)
* @see ResourceResolver#getParent(Resource)
*/
- @Nullable Resource getParent();
+ @Nullable
+ Resource getParent();
/**
* Returns an iterator of the direct children of this resource.
@@ -105,7 +108,8 @@ public interface Resource extends Adaptable {
* @since 2.1 (Sling API Bundle 2.1.0)
* @see ResourceResolver#listChildren(Resource)
*/
- @NotNull Iterator<Resource> listChildren();
+ @NotNull
+ Iterator<Resource> listChildren();
/**
* Returns an iterable of the direct children of this resource.
@@ -121,7 +125,8 @@ public interface Resource extends Adaptable {
* @since 2.2 (Sling API Bundle 2.2.0)
* @see ResourceResolver#getChildren(Resource)
*/
- @NotNull Iterable<Resource> getChildren();
+ @NotNull
+ Iterable<Resource> getChildren();
/**
* Returns the child at the given relative path of this resource or
@@ -139,7 +144,8 @@ public interface Resource extends Adaptable {
* @since 2.1 (Sling API Bundle 2.1.0)
* @see ResourceResolver#getResource(Resource, String)
*/
- @Nullable Resource getChild(@NotNull String relPath);
+ @Nullable
+ Resource getChild(@NotNull String relPath);
/**
* The resource type is meant to point to rendering/processing scripts,
@@ -153,7 +159,8 @@ public interface Resource extends Adaptable {
* existing, this method returns {@link #RESOURCE_TYPE_NON_EXISTING}.
* @return The resource type
*/
- @NotNull String getResourceType();
+ @NotNull
+ String getResourceType();
/**
* Returns the super type of the resource if the resource defines its
@@ -166,7 +173,8 @@ public interface Resource extends Adaptable {
* @throws IllegalStateException if this resource resolver has already been
* {@link ResourceResolver#close() closed}.
*/
- @Nullable String getResourceSuperType();
+ @Nullable
+ String getResourceSuperType();
/**
* Checks if the resource has any child resources.
@@ -200,14 +208,16 @@ public interface Resource extends Adaptable {
* @return The resource meta data
* @see ResourceMetadata
*/
- @NotNull ResourceMetadata getResourceMetadata();
+ @NotNull
+ ResourceMetadata getResourceMetadata();
/**
* Returns the {@link ResourceResolver} from which this resource has been
* retrieved.
* @return The resource resolver
*/
- @NotNull ResourceResolver getResourceResolver();
+ @NotNull
+ ResourceResolver getResourceResolver();
/**
* Returns a value map for this resource.
@@ -215,5 +225,6 @@ public interface Resource extends Adaptable {
* @return A value map
* @since 2.5 (Sling API Bundle 2.7.0)
*/
- @NotNull ValueMap getValueMap();
+ @NotNull
+ ValueMap getValueMap();
}
diff --git a/src/main/java/org/apache/sling/api/resource/ResourceDecorator.java b/src/main/java/org/apache/sling/api/resource/ResourceDecorator.java
index 23095b5..34f57e6 100644
--- a/src/main/java/org/apache/sling/api/resource/ResourceDecorator.java
+++ b/src/main/java/org/apache/sling/api/resource/ResourceDecorator.java
@@ -1,25 +1,27 @@
/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
package org.apache.sling.api.resource;
-import org.jetbrains.annotations.Nullable;
-import org.jetbrains.annotations.NotNull;
import javax.servlet.http.HttpServletRequest;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.osgi.annotation.versioning.ConsumerType;
/**
@@ -45,7 +47,8 @@ public interface ResourceDecorator {
* @param resource The resource to decorate
* @return The decorated resource, the original resource or null.
*/
- @Nullable Resource decorate(@NotNull Resource resource);
+ @Nullable
+ Resource decorate(@NotNull Resource resource);
/**
* Decorate a resource.
@@ -61,5 +64,6 @@ public interface ResourceDecorator {
* @deprecated since 2.3.0 (and JCR Resource 2.1.0), this method will not be invoked.
*/
@Deprecated
- @Nullable Resource decorate(@NotNull Resource resource, @NotNull HttpServletRequest request);
+ @Nullable
+ Resource decorate(@NotNull Resource resource, @NotNull HttpServletRequest request);
}
diff --git a/src/main/java/org/apache/sling/api/resource/ResourceMetadata.java b/src/main/java/org/apache/sling/api/resource/ResourceMetadata.java
index d980b5a..eb13051 100644
--- a/src/main/java/org/apache/sling/api/resource/ResourceMetadata.java
+++ b/src/main/java/org/apache/sling/api/resource/ResourceMetadata.java
@@ -352,7 +352,6 @@ public class ResourceMetadata extends HashMap<String, Object> {
return null;
}
-
/**
* Make this object read-only. All method calls trying to modify this object
* result in an exception!
@@ -366,7 +365,7 @@ public class ResourceMetadata extends HashMap<String, Object> {
* Check if this object is read only and if so throw an unsupported operation exception.
*/
private void checkReadOnly() {
- if ( this.isReadOnly ) {
+ if (this.isReadOnly) {
throw new UnsupportedOperationException(getClass().getSimpleName() + " is locked");
}
}
@@ -408,15 +407,15 @@ public class ResourceMetadata extends HashMap<String, Object> {
return result;
}
- // volatile for correct double-checked locking in getLockedData()
+ // volatile for correct double-checked locking in getLockedData()
private transient volatile Set<Map.Entry<String, Object>> lockedEntrySet;
private transient Set<String> lockedKeySet;
private transient Collection<Object> lockedValues;
private void getLockedData() {
- if(isReadOnly && lockedEntrySet == null) {
+ if (isReadOnly && lockedEntrySet == null) {
synchronized (this) {
- if(isReadOnly && lockedEntrySet == null) {
+ if (isReadOnly && lockedEntrySet == null) {
lockedEntrySet = Collections.unmodifiableSet(super.entrySet());
lockedKeySet = Collections.unmodifiableSet(super.keySet());
lockedValues = Collections.unmodifiableCollection(super.values());
diff --git a/src/main/java/org/apache/sling/api/resource/ResourceNotFoundException.java b/src/main/java/org/apache/sling/api/resource/ResourceNotFoundException.java
index 0303539..cd2e6c4 100644
--- a/src/main/java/org/apache/sling/api/resource/ResourceNotFoundException.java
+++ b/src/main/java/org/apache/sling/api/resource/ResourceNotFoundException.java
@@ -1,18 +1,20 @@
/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
package org.apache.sling.api.resource;
@@ -40,7 +42,7 @@ public class ResourceNotFoundException extends SlingException {
}
public ResourceNotFoundException(String resource, String message) {
- super("Resource at '"+ resource + "' not found: " + message);
+ super("Resource at '" + resource + "' not found: " + message);
this.resource = resource;
}
@@ -48,8 +50,7 @@ public class ResourceNotFoundException extends SlingException {
this(null, message, cause);
}
- public ResourceNotFoundException(String resource, String message,
- Throwable cause) {
+ public ResourceNotFoundException(String resource, String message, Throwable cause) {
super(message, cause);
this.resource = resource;
}
diff --git a/src/main/java/org/apache/sling/api/resource/ResourceProvider.java b/src/main/java/org/apache/sling/api/resource/ResourceProvider.java
index e33cbc8..71973f9 100644
--- a/src/main/java/org/apache/sling/api/resource/ResourceProvider.java
+++ b/src/main/java/org/apache/sling/api/resource/ResourceProvider.java
@@ -18,12 +18,12 @@
*/
package org.apache.sling.api.resource;
+import javax.servlet.http.HttpServletRequest;
+
import java.util.Iterator;
-import org.jetbrains.annotations.Nullable;
import org.jetbrains.annotations.NotNull;
-import javax.servlet.http.HttpServletRequest;
-
+import org.jetbrains.annotations.Nullable;
import org.osgi.annotation.versioning.ConsumerType;
/**
@@ -116,7 +116,9 @@ public interface ResourceProvider {
* @deprecated since 2.2.0 (and JCR Resource 2.1.0), this method will not be invoked.
*/
@Deprecated
- @Nullable Resource getResource(@NotNull ResourceResolver resourceResolver, @NotNull HttpServletRequest request, @NotNull String path);
+ @Nullable
+ Resource getResource(
+ @NotNull ResourceResolver resourceResolver, @NotNull HttpServletRequest request, @NotNull String path);
/**
* Returns a resource from this resource provider or {@code null} if
@@ -137,7 +139,8 @@ public interface ResourceProvider {
* @throws org.apache.sling.api.SlingException
* may be thrown in case of any problem creating the {@code Resource} instance.
*/
- @Nullable Resource getResource(@NotNull ResourceResolver resourceResolver, @NotNull String path);
+ @Nullable
+ Resource getResource(@NotNull ResourceResolver resourceResolver, @NotNull String path);
/**
* Returns an {@code Iterator} of {@link Resource} objects loaded from
@@ -168,5 +171,6 @@ public interface ResourceProvider {
* @throws org.apache.sling.api.SlingException
* If any error occurs acquiring the child resource iterator.
*/
- @Nullable Iterator<Resource> listChildren(@NotNull Resource parent);
+ @Nullable
+ Iterator<Resource> listChildren(@NotNull Resource parent);
}
diff --git a/src/main/java/org/apache/sling/api/resource/ResourceProviderFactory.java b/src/main/java/org/apache/sling/api/resource/ResourceProviderFactory.java
index 723489e..ad35196 100644
--- a/src/main/java/org/apache/sling/api/resource/ResourceProviderFactory.java
+++ b/src/main/java/org/apache/sling/api/resource/ResourceProviderFactory.java
@@ -21,7 +21,6 @@ package org.apache.sling.api.resource;
import java.util.Map;
import org.jetbrains.annotations.NotNull;
-
import org.osgi.annotation.versioning.ConsumerType;
/**
@@ -102,7 +101,8 @@ public interface ResourceProviderFactory {
* href="http://sling.apache.org/documentation/the-sling-engine/service-authentication.html">Service
* Authentication</a>
*/
- @NotNull ResourceProvider getResourceProvider(Map<String, Object> authenticationInfo) throws LoginException;
+ @NotNull
+ ResourceProvider getResourceProvider(Map<String, Object> authenticationInfo) throws LoginException;
/**
* Returns a new {@link ResourceProvider} instance with administrative
@@ -135,5 +135,6 @@ public interface ResourceProviderFactory {
* {@link ResourceResolverFactory#SUBSERVICE} properties.
*/
@Deprecated
- @NotNull ResourceProvider getAdministrativeResourceProvider(Map<String, Object> authenticationInfo) throws LoginException;
+ @NotNull
+ ResourceProvider getAdministrativeResourceProvider(Map<String, Object> authenticationInfo) throws LoginException;
}
diff --git a/src/main/java/org/apache/sling/api/resource/ResourceResolver.java b/src/main/java/org/apache/sling/api/resource/ResourceResolver.java
index 4b1b7ff..51339d2 100644
--- a/src/main/java/org/apache/sling/api/resource/ResourceResolver.java
+++ b/src/main/java/org/apache/sling/api/resource/ResourceResolver.java
@@ -22,12 +22,11 @@ import java.io.Closeable;
import java.util.Iterator;
import java.util.Map;
-import org.jetbrains.annotations.Nullable;
-import org.jetbrains.annotations.NotNull;
import jakarta.servlet.http.HttpServletRequest;
-
import org.apache.sling.api.adapter.Adaptable;
import org.apache.sling.api.resource.mapping.ResourceMapper;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.osgi.annotation.versioning.ProviderType;
/**
@@ -155,8 +154,7 @@ public interface ResourceResolver extends Adaptable, Closeable {
* @deprecated
*/
@Deprecated
- String REQUEST_ATTR_WORKSPACE_INFO = ResourceResolver.class.getName()
- + "/use.workspace";
+ String REQUEST_ATTR_WORKSPACE_INFO = ResourceResolver.class.getName() + "/use.workspace";
/**
* The name of the resource resolver attribute which is set if the resource
@@ -210,7 +208,8 @@ public interface ResourceResolver extends Adaptable, Closeable {
* @since 2.14.0
* @see <a href="https://sling.apache.org/documentation/the-sling-engine/mappings-for-resource-resolution.html">Mappings for Resource Resolution</a>
*/
- @NotNull Resource resolve(@NotNull HttpServletRequest request, @NotNull String absPath);
+ @NotNull
+ Resource resolve(@NotNull HttpServletRequest request, @NotNull String absPath);
/**
* Resolves the resource from the given <code>absPath</code> optionally
@@ -244,7 +243,8 @@ public interface ResourceResolver extends Adaptable, Closeable {
* @deprecated Use {@link #resolve(HttpServletRequest, String)} instead.
*/
@Deprecated
- @NotNull Resource resolve(@NotNull javax.servlet.http.HttpServletRequest request, @NotNull String absPath);
+ @NotNull
+ Resource resolve(@NotNull javax.servlet.http.HttpServletRequest request, @NotNull String absPath);
/**
* Resolves the resource from the given absolute path. Returns a
@@ -273,7 +273,8 @@ public interface ResourceResolver extends Adaptable, Closeable {
* {@link #close() closed}.
* @see <a href="https://sling.apache.org/documentation/the-sling-engine/mappings-for-resource-resolution.html">Mappings for Resource Resolution</a>
*/
- @NotNull Resource resolve(@NotNull String absPath);
+ @NotNull
+ Resource resolve(@NotNull String absPath);
/**
* Resolves the resource from the given <code>HttpServletRequest</code>.
@@ -302,7 +303,8 @@ public interface ResourceResolver extends Adaptable, Closeable {
* @see <a href="https://sling.apache.org/documentation/the-sling-engine/mappings-for-resource-resolution.html">Mappings for Resource Resolution</a>
*/
@Deprecated
- @NotNull Resource resolve(@NotNull javax.servlet.http.HttpServletRequest request);
+ @NotNull
+ Resource resolve(@NotNull javax.servlet.http.HttpServletRequest request);
/**
* Returns a (request) path mapped from the (resource) path applying the reverse
@@ -334,7 +336,8 @@ public interface ResourceResolver extends Adaptable, Closeable {
* @see <a href="https://tools.ietf.org/html/rfc3986#section-2.1">Percent-Encoding</a>
* @see <a href="https://sling.apache.org/documentation/the-sling-engine/mappings-for-resource-resolution.html">Mappings for Resource Resolution</a>
*/
- @NotNull String map(@NotNull String resourcePath);
+ @NotNull
+ String map(@NotNull String resourcePath);
/**
* Returns an URL mapped from the (resource) path applying the reverse
@@ -372,7 +375,8 @@ public interface ResourceResolver extends Adaptable, Closeable {
* @see <a href="https://tools.ietf.org/html/rfc3986#section-2.1">Percent-Encoding</a>
* @see <a href="https://sling.apache.org/documentation/the-sling-engine/mappings-for-resource-resolution.html">Mappings for Resource Resolution</a>
*/
- @NotNull String map(@NotNull HttpServletRequest request, @NotNull String resourcePath);
+ @NotNull
+ String map(@NotNull HttpServletRequest request, @NotNull String resourcePath);
/**
* Returns an URL mapped from the (resource) path applying the reverse
@@ -412,7 +416,8 @@ public interface ResourceResolver extends Adaptable, Closeable {
* @deprecated Use {@link #map(HttpServletRequest, String)} instead.
*/
@Deprecated
- @NotNull String map(@NotNull javax.servlet.http.HttpServletRequest request, @NotNull String resourcePath);
+ @NotNull
+ String map(@NotNull javax.servlet.http.HttpServletRequest request, @NotNull String resourcePath);
/**
* Returns a {@link Resource} object for data located at the given path.
@@ -439,7 +444,8 @@ public interface ResourceResolver extends Adaptable, Closeable {
* @throws IllegalStateException if this resource resolver has already been
* {@link #close() closed}.
*/
- @Nullable Resource getResource(@NotNull String path);
+ @Nullable
+ Resource getResource(@NotNull String path);
/**
* Returns a {@link Resource} object for data located at the given path.
@@ -469,7 +475,8 @@ public interface ResourceResolver extends Adaptable, Closeable {
* @throws IllegalStateException if this resource resolver has already been
* {@link #close() closed}.
*/
- @Nullable Resource getResource(Resource base, @NotNull String path);
+ @Nullable
+ Resource getResource(Resource base, @NotNull String path);
/**
* Returns the search path used by the {@link #getResource(String)} method
@@ -493,7 +500,8 @@ public interface ResourceResolver extends Adaptable, Closeable {
* @throws IllegalStateException if this resource resolver has already been
* {@link #close() closed}.
*/
- @NotNull String[] getSearchPath();
+ @NotNull
+ String[] getSearchPath();
/**
* Returns an <code>Iterator</code> of {@link Resource} objects loaded from
@@ -513,7 +521,8 @@ public interface ResourceResolver extends Adaptable, Closeable {
* @throws IllegalStateException if this resource resolver has already been
* {@link #close() closed}.
*/
- @NotNull Iterator<Resource> listChildren(@NotNull Resource parent);
+ @NotNull
+ Iterator<Resource> listChildren(@NotNull Resource parent);
/**
* Returns the parent resource of this resource.
@@ -531,7 +540,8 @@ public interface ResourceResolver extends Adaptable, Closeable {
* {@link #close() closed}.
* @since 2.9 (Sling API Bundle 2.11.0)
*/
- @Nullable Resource getParent(@NotNull Resource child);
+ @Nullable
+ Resource getParent(@NotNull Resource child);
/**
* Returns an <code>Iterable</code> of {@link Resource} objects loaded from
@@ -552,7 +562,8 @@ public interface ResourceResolver extends Adaptable, Closeable {
* {@link #close() closed}.
* @since 2.2 (Sling API Bundle 2.2.0)
*/
- @NotNull Iterable<Resource> getChildren(@NotNull Resource parent);
+ @NotNull
+ Iterable<Resource> getChildren(@NotNull Resource parent);
/**
* Searches for resources using the given query formulated in the given
@@ -579,7 +590,8 @@ public interface ResourceResolver extends Adaptable, Closeable {
* @throws IllegalStateException if this resource resolver has already been
* {@link #close() closed}.
*/
- @NotNull Iterator<Resource> findResources(@NotNull String query, String language);
+ @NotNull
+ Iterator<Resource> findResources(@NotNull String query, String language);
/**
* Queries the storage using the given query formulated in the given
@@ -609,7 +621,8 @@ public interface ResourceResolver extends Adaptable, Closeable {
* @throws IllegalStateException if this resource resolver has already been
* {@link #close() closed}.
*/
- @NotNull Iterator<Map<String, Object>> queryResources(@NotNull String query, String language);
+ @NotNull
+ Iterator<Map<String, Object>> queryResources(@NotNull String query, String language);
/**
* Checks if the specified resource has any direct child resources.
@@ -651,8 +664,8 @@ public interface ResourceResolver extends Adaptable, Closeable {
* {@link #close() closed}.
* @since 2.1 (Sling API Bundle 2.1.0)
*/
- @NotNull ResourceResolver clone(Map<String, Object> authenticationInfo)
- throws LoginException;
+ @NotNull
+ ResourceResolver clone(Map<String, Object> authenticationInfo) throws LoginException;
/**
* Returns <code>true</code> if this resource resolver is still usable.
@@ -703,7 +716,8 @@ public interface ResourceResolver extends Adaptable, Closeable {
* {@link #close() closed}.
* @since 2.1 (Sling API Bundle 2.1.0)
*/
- @Nullable String getUserID();
+ @Nullable
+ String getUserID();
/**
* Returns an iterator of attribute names whose value can be retrieved
@@ -714,7 +728,8 @@ public interface ResourceResolver extends Adaptable, Closeable {
* @throws IllegalStateException if this resource resolver has already been
* {@link #close() closed}.
*/
- @NotNull Iterator<String> getAttributeNames();
+ @NotNull
+ Iterator<String> getAttributeNames();
/**
* Returns the value of the given resource resolver attribute or
@@ -729,7 +744,8 @@ public interface ResourceResolver extends Adaptable, Closeable {
* @throws IllegalStateException if this resource resolver has already been
* {@link #close() closed}.
*/
- @Nullable Object getAttribute(@NotNull String name);
+ @Nullable
+ Object getAttribute(@NotNull String name);
/**
* Delete the resource
@@ -748,8 +764,7 @@ public interface ResourceResolver extends Adaptable, Closeable {
* {@link #close() closed}.
* @since 2.2 (Sling API Bundle 2.2.0)
*/
- void delete(@NotNull Resource resource)
- throws PersistenceException;
+ void delete(@NotNull Resource resource) throws PersistenceException;
/**
* Add a child resource to the given parent resource.
@@ -768,8 +783,9 @@ public interface ResourceResolver extends Adaptable, Closeable {
* {@link #close() closed}.
* @since 2.2 (Sling API Bundle 2.2.0)
*/
- @NotNull Resource create(@NotNull Resource parent, @NotNull String name, Map<String, Object> properties)
- throws PersistenceException;
+ @NotNull
+ Resource create(@NotNull Resource parent, @NotNull String name, Map<String, Object> properties)
+ throws PersistenceException;
/**
* Orders the child resources returned by {@link #getChildren(Resource)} and {@link #listChildren(Resource)} so that a given resource is listed before the given sibling resource.
@@ -788,7 +804,8 @@ public interface ResourceResolver extends Adaptable, Closeable {
* @see #listChildren(Resource)
* @see #getChildren(Resource)
*/
- boolean orderBefore(@NotNull Resource parent, @NotNull String name, @Nullable String followingSiblingName) throws UnsupportedOperationException, PersistenceException, IllegalArgumentException;
+ boolean orderBefore(@NotNull Resource parent, @NotNull String name, @Nullable String followingSiblingName)
+ throws UnsupportedOperationException, PersistenceException, IllegalArgumentException;
/**
* Revert all pending changes.
@@ -832,7 +849,8 @@ public interface ResourceResolver extends Adaptable, Closeable {
* {@link #close() closed}.
* @since 2.3 (Sling API Bundle 2.4.0)
*/
- @Nullable String getParentResourceType(final Resource resource);
+ @Nullable
+ String getParentResourceType(final Resource resource);
/**
* Returns the super type of the given resource type. This method converts
@@ -850,7 +868,8 @@ public interface ResourceResolver extends Adaptable, Closeable {
* {@link #close() closed}.
* @since 2.3 (Sling API Bundle 2.4.0)
*/
- @Nullable String getParentResourceType(final String resourceType);
+ @Nullable
+ String getParentResourceType(final String resourceType);
/**
* Returns <code>true</code> if the resource type or any of the resource's
@@ -908,8 +927,7 @@ public interface ResourceResolver extends Adaptable, Closeable {
* {@link #close() closed}.
* @since 2.9 (Sling API Bundle 2.11.0)
*/
- Resource copy(final String srcAbsPath,
- final String destAbsPath) throws PersistenceException;
+ Resource copy(final String srcAbsPath, final String destAbsPath) throws PersistenceException;
/**
* This method moves the subgraph rooted at, and including, the resource at
@@ -938,8 +956,7 @@ public interface ResourceResolver extends Adaptable, Closeable {
* {@link #close() closed}.
* @since 2.9 (Sling API Bundle 2.11.0)
*/
- Resource move(final String srcAbsPath,
- final String destAbsPath) throws PersistenceException;
+ Resource move(final String srcAbsPath, final String destAbsPath) throws PersistenceException;
/**
* Returns a mutable map to store temporary objects.
@@ -960,5 +977,6 @@ public interface ResourceResolver extends Adaptable, Closeable {
* @see #close()
* @since 2.13.0 (Sling API Bundle 2.24.0)
*/
- @NotNull Map<String,Object> getPropertyMap();
+ @NotNull
+ Map<String, Object> getPropertyMap();
}
diff --git a/src/main/java/org/apache/sling/api/resource/ResourceResolverFactory.java b/src/main/java/org/apache/sling/api/resource/ResourceResolverFactory.java
index 111c34c..9f45343 100644
--- a/src/main/java/org/apache/sling/api/resource/ResourceResolverFactory.java
+++ b/src/main/java/org/apache/sling/api/resource/ResourceResolverFactory.java
@@ -21,9 +21,8 @@ package org.apache.sling.api.resource;
import java.util.List;
import java.util.Map;
-import org.jetbrains.annotations.Nullable;
import org.jetbrains.annotations.NotNull;
-
+import org.jetbrains.annotations.Nullable;
import org.osgi.annotation.versioning.ProviderType;
/**
@@ -121,7 +120,8 @@ public interface ResourceResolverFactory {
* <code>ResourceResolver</code> with the provided credential
* data.
*/
- @NotNull ResourceResolver getResourceResolver(Map<String, Object> authenticationInfo) throws LoginException;
+ @NotNull
+ ResourceResolver getResourceResolver(Map<String, Object> authenticationInfo) throws LoginException;
/**
* Returns a new {@link ResourceResolver} instance with administrative
@@ -158,7 +158,8 @@ public interface ResourceResolverFactory {
* the {@link #getServiceResourceResolver(Map)} instead.
*/
@Deprecated
- @NotNull ResourceResolver getAdministrativeResourceResolver(Map<String, Object> authenticationInfo) throws LoginException;
+ @NotNull
+ ResourceResolver getAdministrativeResourceResolver(Map<String, Object> authenticationInfo) throws LoginException;
/**
* Returns a new {@link ResourceResolver} instance with privileges assigned
@@ -187,7 +188,8 @@ public interface ResourceResolverFactory {
* href="http://sling.apache.org/documentation/the-sling-engine/service-authentication.html">Service
* Authentication</a>
*/
- @NotNull ResourceResolver getServiceResourceResolver(Map<String, Object> authenticationInfo) throws LoginException;
+ @NotNull
+ ResourceResolver getServiceResourceResolver(Map<String, Object> authenticationInfo) throws LoginException;
/**
* Returns the {@link ResourceResolver} for the current thread.
@@ -204,7 +206,8 @@ public interface ResourceResolverFactory {
*
* @since 2.6 (Sling API Bundle 2.8.0)
*/
- @Nullable ResourceResolver getThreadResourceResolver();
+ @Nullable
+ ResourceResolver getThreadResourceResolver();
/**
* Returns the search path used by the resource resolvers to search for
@@ -219,5 +222,6 @@ public interface ResourceResolverFactory {
* @return An immutable list containing the search path
* @since 2.11 (Sling API Bundle 2.18.0)
*/
- @NotNull List<String> getSearchPath();
+ @NotNull
+ List<String> getSearchPath();
}
diff --git a/src/main/java/org/apache/sling/api/resource/ResourceUtil.java b/src/main/java/org/apache/sling/api/resource/ResourceUtil.java
index b88c284..fbe2ee7 100644
--- a/src/main/java/org/apache/sling/api/resource/ResourceUtil.java
+++ b/src/main/java/org/apache/sling/api/resource/ResourceUtil.java
@@ -57,10 +57,10 @@ public class ResourceUtil {
// ignore leading slashes
int startPos = 0;
- while ( startPos < path.length() && path.charAt(startPos) == '/' ) {
+ while (startPos < path.length() && path.charAt(startPos) == '/') {
startPos++;
}
-
+
// split into segments
final String[] parts = path.substring(startPos).split("/");
String[] newParts = new String[parts.length];
@@ -93,7 +93,7 @@ public class ResourceUtil {
}
// reconstruct (we don't use String.join as array elements might be null)
final StringBuilder sb = new StringBuilder();
- for(int i=0;i<newPartsPos;i++) {
+ for (int i = 0; i < newPartsPos; i++) {
if (i > 0 || startPos > 0) {
sb.append('/');
}
@@ -107,14 +107,14 @@ public class ResourceUtil {
*/
private static String removeTrailingSlashes(@NotNull final String path) {
int endPos = path.length() - 1;
- while ( endPos >= 0 && path.charAt(endPos) == '/' ) {
+ while (endPos >= 0 && path.charAt(endPos) == '/') {
endPos--;
}
if (endPos == path.length() - 1) {
return path;
}
// only slashes, just return one
- if ( endPos == -1 ) {
+ if (endPos == -1) {
return "/";
}
return path.substring(0, endPos + 1);
@@ -126,8 +126,8 @@ public class ResourceUtil {
* @return The number of dots or 0 if the segment contains no dot or other characters.
*/
private static int countDotsSegment(final String segment) {
- for(int i=0;i<segment.length();i++) {
- if ( segment.charAt(i) != '.' ) {
+ for (int i = 0; i < segment.length(); i++) {
+ if (segment.charAt(i) != '.') {
return 0;
}
}
@@ -209,13 +209,13 @@ public class ResourceUtil {
* @since 2.2 (Sling API Bundle 2.2.0)
*/
public static String getParent(final String path, final int level) {
- if ( level < 0 ) {
+ if (level < 0) {
throw new IllegalArgumentException("level must be non-negative");
}
String result = path;
- for(int i=0; i<level; i++) {
+ for (int i = 0; i < level; i++) {
result = getParent(result);
- if ( result == null ) {
+ if (result == null) {
break;
}
}
@@ -390,7 +390,7 @@ public class ResourceUtil {
* @return A value map.
*/
public static @NotNull ValueMap getValueMap(final Resource res) {
- if ( res == null ) {
+ if (res == null) {
// use empty map
return new ValueMapDecorator(new HashMap<String, Object>());
}
@@ -456,7 +456,7 @@ public class ResourceUtil {
*/
@Deprecated
public static @Nullable String findResourceSuperType(@NotNull final Resource resource) {
- if ( resource == null ) {
+ if (resource == null) {
return null;
}
return resource.getResourceResolver().getParentResourceType(resource);
@@ -484,7 +484,7 @@ public class ResourceUtil {
*/
@Deprecated
public static boolean isA(@NotNull final Resource resource, final String resourceType) {
- if ( resource == null ) {
+ if (resource == null) {
return false;
}
return resource.getResourceResolver().isResourceType(resource, resourceType);
@@ -504,8 +504,7 @@ public class ResourceUtil {
* @return An iterator of the adapted objects
* @since 2.0.6 (Sling API Bundle 2.0.6)
*/
- public static @NotNull <T> Iterator<T> adaptTo(final @NotNull Iterator<Resource> iterator,
- final Class<T> type) {
+ public static @NotNull <T> Iterator<T> adaptTo(final @NotNull Iterator<Resource> iterator, final Class<T> type) {
return new Iterator<T>() {
private T nextObject = seek();
@@ -558,17 +557,17 @@ public class ResourceUtil {
* @since 2.3.0 (Sling API Bundle 2.4.0)
*/
public static @NotNull Resource getOrCreateResource(
- final @NotNull ResourceResolver resolver,
- final @NotNull String path,
- final String resourceType,
- final String intermediateResourceType,
- final boolean autoCommit)
- throws PersistenceException {
+ final @NotNull ResourceResolver resolver,
+ final @NotNull String path,
+ final String resourceType,
+ final String intermediateResourceType,
+ final boolean autoCommit)
+ throws PersistenceException {
final Map<String, Object> props;
- if ( resourceType == null ) {
+ if (resourceType == null) {
props = null;
} else {
- props = Collections.singletonMap(ResourceResolver.PROPERTY_RESOURCE_TYPE, (Object)resourceType);
+ props = Collections.singletonMap(ResourceResolver.PROPERTY_RESOURCE_TYPE, (Object) resourceType);
}
return getOrCreateResource(resolver, path, props, intermediateResourceType, autoCommit);
}
@@ -598,17 +597,14 @@ public class ResourceUtil {
final Map<String, Object> resourceProperties,
final String intermediateResourceType,
final boolean autoCommit)
- throws PersistenceException {
+ throws PersistenceException {
PersistenceException mostRecentPE = null;
- for(int i=0;i<5;i++) {
+ for (int i = 0; i < 5; i++) {
try {
- return ResourceUtil.getOrCreateResourceInternal(resolver,
- path,
- resourceProperties,
- intermediateResourceType,
- autoCommit);
- } catch ( final PersistenceException pe ) {
- if ( autoCommit ) {
+ return ResourceUtil.getOrCreateResourceInternal(
+ resolver, path, resourceProperties, intermediateResourceType, autoCommit);
+ } catch (final PersistenceException pe) {
+ if (autoCommit) {
// in case of exception, revert to last clean state and retry
resolver.revert();
resolver.refresh();
@@ -642,62 +638,59 @@ public class ResourceUtil {
final Map<String, Object> resourceProperties,
final String intermediateResourceType,
final boolean autoCommit)
- throws PersistenceException {
+ throws PersistenceException {
Resource rsrc = resolver.getResource(path);
- if ( rsrc == null ) {
+ if (rsrc == null) {
final int lastPos = path.lastIndexOf('/');
final String name = path.substring(lastPos + 1);
final Resource parentResource;
- if ( lastPos == 0 ) {
+ if (lastPos == 0) {
parentResource = resolver.getResource("/");
} else {
final String parentPath = path.substring(0, lastPos);
- parentResource = getOrCreateResource(resolver,
- parentPath,
- intermediateResourceType,
- intermediateResourceType,
- autoCommit);
+ parentResource = getOrCreateResource(
+ resolver, parentPath, intermediateResourceType, intermediateResourceType, autoCommit);
}
- if ( autoCommit ) {
+ if (autoCommit) {
resolver.refresh();
}
try {
int retry = 5;
- while ( retry > 0 && rsrc == null ) {
+ while (retry > 0 && rsrc == null) {
rsrc = resolver.create(parentResource, name, resourceProperties);
// check for SNS
- if ( !name.equals(rsrc.getName()) ) {
+ if (!name.equals(rsrc.getName())) {
resolver.refresh();
resolver.delete(rsrc);
rsrc = resolver.getResource(parentResource, name);
}
retry--;
}
- if ( rsrc == null ) {
+ if (rsrc == null) {
throw new PersistenceException("Unable to create resource.");
}
- } catch ( final PersistenceException pe ) {
+ } catch (final PersistenceException pe) {
// this could be thrown because someone else tried to create this
// node concurrently
resolver.refresh();
rsrc = resolver.getResource(parentResource, name);
- if ( rsrc == null ) {
+ if (rsrc == null) {
throw pe;
}
}
- if ( autoCommit ) {
+ if (autoCommit) {
try {
resolver.commit();
resolver.refresh();
rsrc = resolver.getResource(parentResource, name);
- } catch ( final PersistenceException pe ) {
+ } catch (final PersistenceException pe) {
// try again - maybe someone else did create the resource in the meantime
// or we ran into Jackrabbit's stale item exception in a clustered environment
resolver.revert();
resolver.refresh();
rsrc = resolver.getResource(parentResource, name);
- if ( rsrc == null ) {
+ if (rsrc == null) {
rsrc = resolver.create(parentResource, name, resourceProperties);
resolver.commit();
}
@@ -722,18 +715,18 @@ public class ResourceUtil {
* closed}.
* @since 2.5 (Sling API Bundle 2.7.0)
*/
- public static String createUniqueChildName(final Resource parent, final String name)
- throws PersistenceException {
+ public static String createUniqueChildName(final Resource parent, final String name) throws PersistenceException {
if (parent.getChild(name) != null) {
// leaf node already exists, create new unique name
String childNodeName = null;
int i = 0;
do {
childNodeName = name + String.valueOf(i);
- //just so that it does not run into an infinite loop
+ // just so that it does not run into an infinite loop
// this should not happen though :)
if (i == Integer.MAX_VALUE) {
- String message = MessageFormat.format("can not find a unique name {0} for {1}", name, parent.getPath());
+ String message =
+ MessageFormat.format("can not find a unique name {0} for {1}", name, parent.getPath());
throw new PersistenceException(message);
}
i++;
@@ -752,8 +745,8 @@ public class ResourceUtil {
*/
public static @NotNull Resource unwrap(final @NotNull Resource rsrc) {
Resource result = rsrc;
- while ( result instanceof ResourceWrapper ) {
- result = ((ResourceWrapper)result).getResource();
+ while (result instanceof ResourceWrapper) {
+ result = ((ResourceWrapper) result).getResource();
}
return result;
}
@@ -776,15 +769,14 @@ public class ResourceUtil {
this.max = (batchSize < 1 ? 50 : batchSize);
}
- public void delete(@NotNull final Resource rsrc)
- throws PersistenceException {
+ public void delete(@NotNull final Resource rsrc) throws PersistenceException {
final ResourceResolver resolver = rsrc.getResourceResolver();
- for(final Resource child : rsrc.getChildren()) {
+ for (final Resource child : rsrc.getChildren()) {
delete(child);
}
resolver.delete(rsrc);
count++;
- if ( count >= max ) {
+ if (count >= max) {
resolver.commit();
count = 0;
}
diff --git a/src/main/java/org/apache/sling/api/resource/ResourceWrapper.java b/src/main/java/org/apache/sling/api/resource/ResourceWrapper.java
index 6beb2fe..fd6df9d 100644
--- a/src/main/java/org/apache/sling/api/resource/ResourceWrapper.java
+++ b/src/main/java/org/apache/sling/api/resource/ResourceWrapper.java
@@ -155,10 +155,10 @@ public class ResourceWrapper implements Resource {
*
* @since 2.4.4 (Sling API Bundle 2.5.0)
*/
- @Override
+ @Override
public boolean hasChildren() {
- return getResource().hasChildren();
- }
+ return getResource().hasChildren();
+ }
/**
* Returns the value of calling <code>isResourceType</code> on the
@@ -198,9 +198,8 @@ public class ResourceWrapper implements Resource {
@Override
public String toString() {
final String simpleName = getClass().getSimpleName();
- final String className = (simpleName.length() > 0) ? simpleName : getClass().getName();
- return className + ", type=" + getResourceType()
- + ", path=" + getPath() + ", resource=[" + getResource() + "]";
+ final String className =
+ (simpleName.length() > 0) ? simpleName : getClass().getName();
+ return className + ", type=" + getResourceType() + ", path=" + getPath() + ", resource=[" + getResource() + "]";
}
-
}
diff --git a/src/main/java/org/apache/sling/api/resource/SyntheticResource.java b/src/main/java/org/apache/sling/api/resource/SyntheticResource.java
index 1c8ab9d..d869aa0 100644
--- a/src/main/java/org/apache/sling/api/resource/SyntheticResource.java
+++ b/src/main/java/org/apache/sling/api/resource/SyntheticResource.java
@@ -46,8 +46,8 @@ public class SyntheticResource extends AbstractResource {
* @param path The resource path
* @param resourceType The type of the resource
*/
- public SyntheticResource(@NotNull ResourceResolver resourceResolver, @NotNull String path,
- @NotNull String resourceType) {
+ public SyntheticResource(
+ @NotNull ResourceResolver resourceResolver, @NotNull String path, @NotNull String resourceType) {
this.resourceResolver = resourceResolver;
this.path = path;
this.resourceType = resourceType;
@@ -62,8 +62,8 @@ public class SyntheticResource extends AbstractResource {
* @param rm The resource meta data
* @param resourceType The type of the resource
*/
- public SyntheticResource(@NotNull ResourceResolver resourceResolver, @NotNull ResourceMetadata rm,
- @NotNull String resourceType) {
+ public SyntheticResource(
+ @NotNull ResourceResolver resourceResolver, @NotNull ResourceMetadata rm, @NotNull String resourceType) {
this.resourceResolver = resourceResolver;
this.path = rm.getResolutionPath();
this.resourceType = resourceType;
@@ -114,8 +114,6 @@ public class SyntheticResource extends AbstractResource {
@Override
public String toString() {
- return getClass().getSimpleName() + ", type=" + getResourceType()
- + ", path=" + getPath();
+ return getClass().getSimpleName() + ", type=" + getResourceType() + ", path=" + getPath();
}
-
}
diff --git a/src/main/java/org/apache/sling/api/resource/ValueMap.java b/src/main/java/org/apache/sling/api/resource/ValueMap.java
index a2ce95e..538aa3c 100644
--- a/src/main/java/org/apache/sling/api/resource/ValueMap.java
+++ b/src/main/java/org/apache/sling/api/resource/ValueMap.java
@@ -49,8 +49,7 @@ public interface ValueMap extends Map<String, Object> {
/**
* Empty immutable value map.
*/
- ValueMap EMPTY = new ValueMapDecorator(
- Collections.emptyMap());
+ ValueMap EMPTY = new ValueMapDecorator(Collections.emptyMap());
/**
* Get a named property and convert it into the given type.
@@ -72,9 +71,9 @@ public interface ValueMap extends Map<String, Object> {
return null;
}
if (type.isAssignableFrom(value.getClass())) {
- return (T)value;
+ return (T) value;
}
- return ObjectConverter.convert(value,type);
+ return ObjectConverter.convert(value, type);
}
/**
@@ -83,7 +82,7 @@ public interface ValueMap extends Map<String, Object> {
* array of a primitive type. It should return the default value in this
* case.
* <br><br>
- * <b>Implementation hint</b>: In the past it was allowed to call this with a 2nd parameter being {@code null}.
+ * <b>Implementation hint</b>: In the past it was allowed to call this with a 2nd parameter being {@code null}.
* Therefore all implementations should internally call {@link #get(Object)} when the 2nd parameter
* has value {@code null}.
*
@@ -103,10 +102,10 @@ public interface ValueMap extends Map<String, Object> {
if (defaultValue == null) {
return (T) get(name);
}
- T value = (T)get(name, defaultValue.getClass());
+ T value = (T) get(name, defaultValue.getClass());
if (value == null) {
return defaultValue;
}
return value;
}
- }
+}
diff --git a/src/main/java/org/apache/sling/api/resource/external/ExternalizableInputStream.java b/src/main/java/org/apache/sling/api/resource/external/ExternalizableInputStream.java
index fc175cd..d29a8ce 100644
--- a/src/main/java/org/apache/sling/api/resource/external/ExternalizableInputStream.java
+++ b/src/main/java/org/apache/sling/api/resource/external/ExternalizableInputStream.java
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.sling.api.resource.external;
import java.net.URI;
@@ -39,6 +38,6 @@ public interface ExternalizableInputStream {
* directly and not this interface.
* @return a URI intended for any network context.
*/
- @NotNull URI getURI();
-
+ @NotNull
+ URI getURI();
}
diff --git a/src/main/java/org/apache/sling/api/resource/external/URIProvider.java b/src/main/java/org/apache/sling/api/resource/external/URIProvider.java
index 8f4422a..a2622fc 100644
--- a/src/main/java/org/apache/sling/api/resource/external/URIProvider.java
+++ b/src/main/java/org/apache/sling/api/resource/external/URIProvider.java
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.sling.api.resource.external;
import java.net.URI;
@@ -45,7 +44,8 @@ public interface URIProvider {
* @return a URI if the resource has a URI suitable for the requested scope and operation, otherwise the implementation should throw an IlleagalArgumentException.
* @throws IllegalArgumentException if a URI for the requested scope and operation cannot be provided to the caller.
*/
- @NotNull URI toURI(@NotNull Resource resource, @NotNull URIProvider.Scope scope, @NotNull URIProvider.Operation operation);
+ @NotNull
+ URI toURI(@NotNull Resource resource, @NotNull URIProvider.Scope scope, @NotNull URIProvider.Operation operation);
/**
* Defines which operation the URI may be used to perform.
diff --git a/src/main/java/org/apache/sling/api/resource/external/package-info.java b/src/main/java/org/apache/sling/api/resource/external/package-info.java
index 3b3161c..327b1dd 100644
--- a/src/main/java/org/apache/sling/api/resource/external/package-info.java
+++ b/src/main/java/org/apache/sling/api/resource/external/package-info.java
@@ -21,4 +21,3 @@
package org.apache.sling.api.resource.external;
import org.osgi.annotation.versioning.Version;
-
diff --git a/src/main/java/org/apache/sling/api/resource/mapping/ResourceMapper.java b/src/main/java/org/apache/sling/api/resource/mapping/ResourceMapper.java
index 2c441f1..2b3c2b1 100644
--- a/src/main/java/org/apache/sling/api/resource/mapping/ResourceMapper.java
+++ b/src/main/java/org/apache/sling/api/resource/mapping/ResourceMapper.java
@@ -21,7 +21,6 @@ package org.apache.sling.api.resource.mapping;
import java.util.Collection;
import jakarta.servlet.http.HttpServletRequest;
-
import org.apache.sling.api.resource.ResourceResolver;
import org.jetbrains.annotations.NotNull;
import org.osgi.annotation.versioning.ProviderType;
@@ -64,7 +63,8 @@ public interface ResourceMapper {
*
* @since 1.0.0 (Sling API Bundle 2.19.0)
*/
- @NotNull String getMapping(@NotNull String resourcePath);
+ @NotNull
+ String getMapping(@NotNull String resourcePath);
/**
* Returns an URL mapped from the (resource) path applying the reverse
@@ -84,7 +84,7 @@ public interface ResourceMapper {
* {@link ResourceResolver#resolve(HttpServletRequest, String)} method. As such the URL
* returned is expected to be an absolute URL including scheme, host, any
* servlet context path and the actual path used to resolve the resource.
-
+ *
* @param resourcePath The path for which to return a mapped path.
* @param request The http servlet request object which may be used to apply
* more mapping functionality.
@@ -93,7 +93,8 @@ public interface ResourceMapper {
* {@link ResourceResolver#close() closed}.
* @since 1.1.0
*/
- @NotNull String getMapping(@NotNull String resourcePath, @NotNull HttpServletRequest request);
+ @NotNull
+ String getMapping(@NotNull String resourcePath, @NotNull HttpServletRequest request);
/**
* Returns an URL mapped from the (resource) path applying the reverse
@@ -113,7 +114,7 @@ public interface ResourceMapper {
* {@link ResourceResolver#resolve(HttpServletRequest, String)} method. As such the URL
* returned is expected to be an absolute URL including scheme, host, any
* servlet context path and the actual path used to resolve the resource.
-
+ *
* @param resourcePath The path for which to return a mapped path.
* @param request The http servlet request object which may be used to apply
* more mapping functionality.
@@ -124,7 +125,8 @@ public interface ResourceMapper {
* @deprecated Use {@link #getMapping(String, HttpServletRequest)} instead.
*/
@Deprecated
- @NotNull String getMapping(@NotNull String resourcePath, @NotNull javax.servlet.http.HttpServletRequest request);
+ @NotNull
+ String getMapping(@NotNull String resourcePath, @NotNull javax.servlet.http.HttpServletRequest request);
/**
* Returns all possible mappings for a given {@code resourcePath} as paths.
@@ -157,7 +159,7 @@ public interface ResourceMapper {
* @param resourcePath The path for which to return a mapped path.
* @param request The http servlet request object which may be used to apply
* more mapping functionality.
-
+ *
* @return a collection of mapped URLs, in no particular order. May not be null or empty.
* @throws IllegalStateException if the underlying resource resolver has already been
* {@link ResourceResolver#close() closed}.
@@ -178,7 +180,7 @@ public interface ResourceMapper {
* @param resourcePath The path for which to return a mapped path.
* @param request The http servlet request object which may be used to apply
* more mapping functionality.
-
+ *
* @return a collection of mapped URLs, in no particular order. May not be null or empty.
* @throws IllegalStateException if the underlying resource resolver has already been
* {@link ResourceResolver#close() closed}.
@@ -186,5 +188,6 @@ public interface ResourceMapper {
* @deprecated Use {@link #getAllMappings(String, HttpServletRequest)} instead.
*/
@Deprecated
- Collection<String> getAllMappings(@NotNull String resourcePath, @NotNull javax.servlet.http.HttpServletRequest request);
+ Collection<String> getAllMappings(
+ @NotNull String resourcePath, @NotNull javax.servlet.http.HttpServletRequest request);
}
diff --git a/src/main/java/org/apache/sling/api/resource/mapping/package-info.java b/src/main/java/org/apache/sling/api/resource/mapping/package-info.java
index 00a1ea1..2b2911b 100644
--- a/src/main/java/org/apache/sling/api/resource/mapping/package-info.java
+++ b/src/main/java/org/apache/sling/api/resource/mapping/package-info.java
@@ -21,4 +21,3 @@
package org.apache.sling.api.resource.mapping;
import org.osgi.annotation.versioning.Version;
-
diff --git a/src/main/java/org/apache/sling/api/resource/observation/ResourceChange.java b/src/main/java/org/apache/sling/api/resource/observation/ResourceChange.java
index da07a80..b856792 100644
--- a/src/main/java/org/apache/sling/api/resource/observation/ResourceChange.java
+++ b/src/main/java/org/apache/sling/api/resource/observation/ResourceChange.java
@@ -20,9 +20,8 @@ package org.apache.sling.api.resource.observation;
import java.util.Set;
-import org.jetbrains.annotations.Nullable;
import org.jetbrains.annotations.NotNull;
-
+import org.jetbrains.annotations.Nullable;
import org.osgi.annotation.versioning.ConsumerType;
/**
@@ -53,11 +52,11 @@ public class ResourceChange {
* The type of the change
*/
public enum ChangeType {
- ADDED, // the resource has been added
- REMOVED, // the resource has been removed
- CHANGED, // the resource has been changed
- PROVIDER_ADDED, // a provider has been added
- PROVIDER_REMOVED // a provider has been removed
+ ADDED, // the resource has been added
+ REMOVED, // the resource has been removed
+ CHANGED, // the resource has been changed
+ PROVIDER_ADDED, // a provider has been added
+ PROVIDER_REMOVED // a provider has been removed
}
/** The resource path. */
@@ -86,9 +85,7 @@ public class ResourceChange {
* @param isExternal {code true} if the change happened on another node
* @since 1.2.0 (Sling API Bundle 2.15.0)
*/
- public ResourceChange(final @NotNull ChangeType changeType,
- final @NotNull String path,
- final boolean isExternal) {
+ public ResourceChange(final @NotNull ChangeType changeType, final @NotNull String path, final boolean isExternal) {
this.path = path;
this.changeType = changeType;
this.isExternal = isExternal;
@@ -109,7 +106,8 @@ public class ResourceChange {
* @deprecated The sets of property names are not supported anymore.
*/
@Deprecated
- public ResourceChange(final @NotNull ChangeType changeType,
+ public ResourceChange(
+ final @NotNull ChangeType changeType,
final @NotNull String path,
final boolean isExternal,
final Set<String> addedPropertyNames,
@@ -147,7 +145,7 @@ public class ResourceChange {
return this.isExternal;
}
- /**
+ /**
* Get the type of change
* @return The type of change
*/
@@ -213,12 +211,12 @@ public class ResourceChange {
public String toString() {
StringBuilder b = new StringBuilder();
b.append("ResourceChange[type=")
- .append(this.getType())
- .append(", path=")
- .append(this.getPath())
- .append(", external=")
- .append(this.isExternal)
- .append("]");
+ .append(this.getType())
+ .append(", path=")
+ .append(this.getPath())
+ .append(", external=")
+ .append(this.isExternal)
+ .append("]");
return b.toString();
}
}
diff --git a/src/main/java/org/apache/sling/api/resource/observation/ResourceChangeListener.java b/src/main/java/org/apache/sling/api/resource/observation/ResourceChangeListener.java
index 4e1c70e..3be8295 100644
--- a/src/main/java/org/apache/sling/api/resource/observation/ResourceChangeListener.java
+++ b/src/main/java/org/apache/sling/api/resource/observation/ResourceChangeListener.java
@@ -21,7 +21,6 @@ package org.apache.sling.api.resource.observation;
import java.util.List;
import org.jetbrains.annotations.NotNull;
-
import org.osgi.annotation.versioning.ConsumerType;
/**
@@ -75,7 +74,7 @@ public interface ResourceChangeListener {
* implementation might only send a single remove event for {@code /foo} but not for any child resources.
* Similarly for renaming a subtree from {@code /foo} to {@code /bar} the add event may only be sent for {@code /bar}
* but not for any child resources.
- * Therefore a listener might get remove/add events for resources that not directly match the specified paths/path patterns.
+ * Therefore a listener might get remove/add events for resources that not directly match the specified paths/path patterns.
* For example if a listener is registered for path {@code /foo/bar} and {@code /foo} is removed, the listener will get a remove event for {@code /foo}.
* The same is true if any pattern is used and any parent of a matching resource is removed/added. The listener
* must handle these events accordingly.
@@ -145,7 +144,7 @@ public interface ResourceChangeListener {
* Report resource changes based on the filter properties of this listener.
* <p>
* Note that resource changes for paths which are <strong>ancestors</strong> of the paths this
- * listener was registered to may be reported through this method. This is due to limitations of
+ * listener was registered to may be reported through this method. This is due to limitations of
* certain resource providers to provide events on a more granular level
* (e.g. for deletion or movement of resources containing (potentially nested) child resources).
* <p>
diff --git a/src/main/java/org/apache/sling/api/resource/observation/package-info.java b/src/main/java/org/apache/sling/api/resource/observation/package-info.java
index 31f2d93..b683e5b 100644
--- a/src/main/java/org/apache/sling/api/resource/observation/package-info.java
+++ b/src/main/java/org/apache/sling/api/resource/observation/package-info.java
@@ -21,4 +21,3 @@
package org.apache.sling.api.resource.observation;
import org.osgi.annotation.versioning.Version;
-
diff --git a/src/main/java/org/apache/sling/api/resource/package-info.java b/src/main/java/org/apache/sling/api/resource/package-info.java
index d46625b..22a46af 100644
--- a/src/main/java/org/apache/sling/api/resource/package-info.java
+++ b/src/main/java/org/apache/sling/api/resource/package-info.java
@@ -21,4 +21,3 @@
package org.apache.sling.api.resource;
import org.osgi.annotation.versioning.Version;
-
diff --git a/src/main/java/org/apache/sling/api/resource/path/Path.java b/src/main/java/org/apache/sling/api/resource/path/Path.java
index fc12efb..77326aa 100644
--- a/src/main/java/org/apache/sling/api/resource/path/Path.java
+++ b/src/main/java/org/apache/sling/api/resource/path/Path.java
@@ -55,9 +55,9 @@ public class Path implements Comparable<Path> {
* @throws IllegalArgumentException If the provided path is not absolute, or if the glob pattern does not start with a slash.
*/
public Path(@NotNull final String path) {
- if ( path.equals("/") ) {
+ if (path.equals("/")) {
this.path = "/";
- } else if ( path.endsWith("/") ) {
+ } else if (path.endsWith("/")) {
this.path = path.substring(0, path.length() - 1);
} else {
this.path = path;
@@ -68,11 +68,11 @@ public class Path implements Comparable<Path> {
this.regexPattern = Pattern.compile(toRegexPattern(patternPath));
int lastSlash = 0;
int pos = 1;
- while ( patternPath.length() > pos ) {
+ while (patternPath.length() > pos) {
final char c = patternPath.charAt(pos);
- if ( c == '/') {
+ if (c == '/') {
lastSlash = pos;
- } else if ( c == '*') {
+ } else if (c == '*') {
break;
}
pos++;
@@ -84,7 +84,7 @@ public class Path implements Comparable<Path> {
this.regexPattern = null;
this.prefix = this.path.equals("/") ? "/" : this.path.concat("/");
}
- if ( !this.prefix.startsWith("/") ) {
+ if (!this.prefix.startsWith("/")) {
throw new IllegalArgumentException("Path must be absolute: " + path);
}
}
@@ -113,8 +113,8 @@ public class Path implements Comparable<Path> {
* @throws IllegalArgumentException If the provided path is not absolute, or if the glob pattern does not start with a slash.
*/
public boolean matches(final String otherPath) {
- if ( otherPath.startsWith(GLOB_PREFIX) ) {
- if ( this.isPattern ) {
+ if (otherPath.startsWith(GLOB_PREFIX)) {
+ if (this.isPattern) {
// both are patterns, then they must be equal.
// need to compare Pattern.pattern() as that class does
// not implement a semantic equals(...) method
@@ -125,7 +125,7 @@ public class Path implements Comparable<Path> {
// this is path, provided argument is a pattern
// simple check, if this is root, everything is a sub pattern
- if ( "/".equals(this.path) ) {
+ if ("/".equals(this.path)) {
return true;
}
// simplest case - the prefix of the glob pattern matches already
@@ -133,13 +133,13 @@ public class Path implements Comparable<Path> {
// glob = /apps/**
// then we iterate by removing the last path segment
String subPath = otherPath;
- while ( subPath != null ) {
+ while (subPath != null) {
final Path oPath = new Path(subPath);
- if ( oPath.matches(this.path) ) {
+ if (oPath.matches(this.path)) {
return true;
}
final int lastSlash = subPath.lastIndexOf('/');
- if ( lastSlash == GLOB_PREFIX.length() ) {
+ if (lastSlash == GLOB_PREFIX.length()) {
subPath = null;
} else {
subPath = subPath.substring(0, lastSlash);
@@ -150,7 +150,7 @@ public class Path implements Comparable<Path> {
}
// provided argument is a path
- if ( !otherPath.startsWith("/") ) {
+ if (!otherPath.startsWith("/")) {
throw new IllegalArgumentException("Path must be absolute: " + otherPath);
}
if (isPattern) {
@@ -196,7 +196,7 @@ public class Path implements Comparable<Path> {
if (obj == null || !(obj instanceof Path)) {
return false;
}
- return this.getPath().equals(((Path)obj).getPath());
+ return this.getPath().equals(((Path) obj).getPath());
}
private static String toRegexPattern(String pattern) {
diff --git a/src/main/java/org/apache/sling/api/resource/path/PathBuilder.java b/src/main/java/org/apache/sling/api/resource/path/PathBuilder.java
index 72c9950..7a87c76 100644
--- a/src/main/java/org/apache/sling/api/resource/path/PathBuilder.java
+++ b/src/main/java/org/apache/sling/api/resource/path/PathBuilder.java
@@ -34,7 +34,7 @@ public final class PathBuilder {
*/
public PathBuilder(final String path) {
- if ( path == null || path.isEmpty() || path.charAt(0) != '/') {
+ if (path == null || path.isEmpty() || path.charAt(0) != '/') {
throw new IllegalArgumentException("Path '" + path + "' is not absolute");
}
@@ -49,16 +49,16 @@ public final class PathBuilder {
*/
public PathBuilder append(final String path) {
- if ( path == null || path.isEmpty() ) {
+ if (path == null || path.isEmpty()) {
throw new IllegalArgumentException("Path '" + path + "' is null or empty");
}
boolean trailingSlash = sb.charAt(sb.length() - 1) == '/';
boolean leadingSlash = path.charAt(0) == '/';
- if ( trailingSlash && leadingSlash) {
+ if (trailingSlash && leadingSlash) {
sb.append(path.substring(1));
- } else if ( !trailingSlash && !leadingSlash ) {
+ } else if (!trailingSlash && !leadingSlash) {
sb.append('/').append(path);
} else {
sb.append(path);
diff --git a/src/main/java/org/apache/sling/api/resource/path/PathSet.java b/src/main/java/org/apache/sling/api/resource/path/PathSet.java
index ceaffbd..3bb6324 100644
--- a/src/main/java/org/apache/sling/api/resource/path/PathSet.java
+++ b/src/main/java/org/apache/sling/api/resource/path/PathSet.java
@@ -32,7 +32,7 @@ import java.util.Set;
public class PathSet implements Iterable<Path> {
/** Empty path set. */
- public static final PathSet EMPTY_SET = new PathSet(Collections.<Path> emptySet());
+ public static final PathSet EMPTY_SET = new PathSet(Collections.<Path>emptySet());
/**
* Create a path set from a collection of path objects
@@ -41,7 +41,7 @@ public class PathSet implements Iterable<Path> {
*/
public static PathSet fromPathCollection(final Collection<Path> paths) {
final Set<Path> set = new HashSet<Path>();
- for(final Path p : paths) {
+ for (final Path p : paths) {
set.add(p);
}
optimize(set);
@@ -53,9 +53,9 @@ public class PathSet implements Iterable<Path> {
* @param paths The collection of path objects
* @return The path set
*/
- public static PathSet fromPaths(final Path...paths) {
+ public static PathSet fromPaths(final Path... paths) {
final Set<Path> set = new HashSet<Path>();
- for(final Path p : paths) {
+ for (final Path p : paths) {
set.add(p);
}
optimize(set);
@@ -69,7 +69,7 @@ public class PathSet implements Iterable<Path> {
*/
public static PathSet fromStringCollection(final Collection<String> paths) {
final Set<Path> set = new HashSet<Path>();
- for(final String p : paths) {
+ for (final String p : paths) {
set.add(new Path(p));
}
optimize(set);
@@ -81,9 +81,9 @@ public class PathSet implements Iterable<Path> {
* @param strings The array of strings
* @return The path set
*/
- public static PathSet fromStrings(final String...strings) {
+ public static PathSet fromStrings(final String... strings) {
final Set<Path> set = new HashSet<Path>();
- for(final String p : strings) {
+ for (final String p : strings) {
set.add(new Path(p));
}
optimize(set);
@@ -97,16 +97,16 @@ public class PathSet implements Iterable<Path> {
*/
private static void optimize(final Set<Path> set) {
final Iterator<Path> i = set.iterator();
- while ( i.hasNext() ) {
+ while (i.hasNext()) {
final Path next = i.next();
boolean found = false;
- for(final Path p : set) {
- if ( p != next && p.matches(next.getPath()) ) {
+ for (final Path p : set) {
+ if (p != next && p.matches(next.getPath())) {
found = true;
break;
}
}
- if ( found ) {
+ if (found) {
i.remove();
}
}
@@ -130,12 +130,12 @@ public class PathSet implements Iterable<Path> {
* @see Path#matches(String)
*/
public Path matches(final String otherPath) {
- for(final Path p : this.paths) {
- if ( p.matches(otherPath) ) {
- return p;
- }
- }
- return null;
+ for (final Path p : this.paths) {
+ if (p.matches(otherPath)) {
+ return p;
+ }
+ }
+ return null;
}
/**
@@ -157,8 +157,8 @@ public class PathSet implements Iterable<Path> {
*/
public PathSet getSubset(final Path path) {
final Set<Path> result = new HashSet<Path>();
- for(final Path p : this.paths) {
- if ( path.matches(p.getPath()) ) {
+ for (final Path p : this.paths) {
+ if (path.matches(p.getPath())) {
result.add(p);
}
}
@@ -173,8 +173,8 @@ public class PathSet implements Iterable<Path> {
*/
public PathSet getSubset(final PathSet set) {
final Set<Path> result = new HashSet<Path>();
- for(final Path p : this.paths) {
- if ( set.matches(p.getPath()) != null ) {
+ for (final Path p : this.paths) {
+ if (set.matches(p.getPath()) != null) {
result.add(p);
}
}
@@ -187,7 +187,7 @@ public class PathSet implements Iterable<Path> {
*/
public Set<String> toStringSet() {
final Set<String> set = new HashSet<String>();
- for(final Path p : this) {
+ for (final Path p : this) {
set.add(p.getPath());
}
return Collections.unmodifiableSet(set);
@@ -215,11 +215,11 @@ public class PathSet implements Iterable<Path> {
if (obj == null || !(obj instanceof PathSet)) {
return false;
}
- return this.paths.equals(((PathSet)obj).paths);
+ return this.paths.equals(((PathSet) obj).paths);
}
@Override
public String toString() {
return "PathSet [paths=" + paths + "]";
}
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/apache/sling/api/resource/path/package-info.java b/src/main/java/org/apache/sling/api/resource/path/package-info.java
index 233a022..6097af1 100644
--- a/src/main/java/org/apache/sling/api/resource/path/package-info.java
+++ b/src/main/java/org/apache/sling/api/resource/path/package-info.java
@@ -21,4 +21,3 @@
package org.apache.sling.api.resource.path;
import org.osgi.annotation.versioning.Version;
-
diff --git a/src/main/java/org/apache/sling/api/resource/runtime/RuntimeService.java b/src/main/java/org/apache/sling/api/resource/runtime/RuntimeService.java
index 92cff10..d5dc8a1 100644
--- a/src/main/java/org/apache/sling/api/resource/runtime/RuntimeService.java
+++ b/src/main/java/org/apache/sling/api/resource/runtime/RuntimeService.java
@@ -19,7 +19,6 @@
package org.apache.sling.api.resource.runtime;
import org.apache.sling.api.resource.runtime.dto.RuntimeDTO;
-
import org.osgi.annotation.versioning.ProviderType;
/**
diff --git a/src/main/java/org/apache/sling/api/resource/runtime/dto/AuthType.java b/src/main/java/org/apache/sling/api/resource/runtime/dto/AuthType.java
index 6d4fecb..0c56fb2 100644
--- a/src/main/java/org/apache/sling/api/resource/runtime/dto/AuthType.java
+++ b/src/main/java/org/apache/sling/api/resource/runtime/dto/AuthType.java
@@ -24,9 +24,7 @@ package org.apache.sling.api.resource.runtime.dto;
* @since 1.0.0 (Sling API Bundle 2.11.0)
*/
public enum AuthType {
-
no,
lazy,
required
-
}
diff --git a/src/main/java/org/apache/sling/api/resource/runtime/dto/FailureReason.java b/src/main/java/org/apache/sling/api/resource/runtime/dto/FailureReason.java
index 9533ff1..9b4f9da 100644
--- a/src/main/java/org/apache/sling/api/resource/runtime/dto/FailureReason.java
+++ b/src/main/java/org/apache/sling/api/resource/runtime/dto/FailureReason.java
@@ -24,9 +24,7 @@ package org.apache.sling.api.resource.runtime.dto;
* @since 1.0.0 (Sling API Bundle 2.11.0)
*/
public enum FailureReason {
-
- invalid, // invalid configuration
- shadowed, // shadowed by another provider
+ invalid, // invalid configuration
+ shadowed, // shadowed by another provider
service_not_gettable // service not gettable from service registry
-
}
diff --git a/src/main/java/org/apache/sling/api/resource/runtime/dto/ResourceProviderDTO.java b/src/main/java/org/apache/sling/api/resource/runtime/dto/ResourceProviderDTO.java
index 429ce53..9bcb844 100644
--- a/src/main/java/org/apache/sling/api/resource/runtime/dto/ResourceProviderDTO.java
+++ b/src/main/java/org/apache/sling/api/resource/runtime/dto/ResourceProviderDTO.java
@@ -29,52 +29,52 @@ public class ResourceProviderDTO {
* The name of the resource provider.
* Optional might be {@code null}.
*/
- public String name; //NOSONAR
+ public String name; // NOSONAR
/**
* The path of the resource provider.
* This is never {@code null}.
*/
- public String path; //NOSONAR
+ public String path; // NOSONAR
/**
* Whether resource access security should be used.
*/
- public boolean useResourceAccessSecurity; //NOSONAR
+ public boolean useResourceAccessSecurity; // NOSONAR
/**
* The auth handling for this provider.
* This is never {@code null}.
*/
- public AuthType authType; //NOSONAR
+ public AuthType authType; // NOSONAR
/**
* Whether the resource provider supports modifications.
*/
- public boolean modifiable; //NOSONAR
+ public boolean modifiable; // NOSONAR
/**
* Whether the resource provider supports adaptable.
*/
- public boolean adaptable; //NOSONAR
+ public boolean adaptable; // NOSONAR
/**
* Whether the resource provider supports refreshing.
*/
- public boolean refreshable; //NOSONAR
+ public boolean refreshable; // NOSONAR
/**
* Whether the resource provider supports attributes.
*/
- public boolean attributable; //NOSONAR
+ public boolean attributable; // NOSONAR
/**
* Whether the resource provider supports query languages.
*/
- public boolean supportsQueryLanguage; //NOSONAR
+ public boolean supportsQueryLanguage; // NOSONAR
/**
* The service id from the service registry.
*/
- public long serviceId; //NOSONAR
+ public long serviceId; // NOSONAR
}
diff --git a/src/main/java/org/apache/sling/api/resource/runtime/dto/ResourceProviderFailureDTO.java b/src/main/java/org/apache/sling/api/resource/runtime/dto/ResourceProviderFailureDTO.java
index 09b744c..058916d 100644
--- a/src/main/java/org/apache/sling/api/resource/runtime/dto/ResourceProviderFailureDTO.java
+++ b/src/main/java/org/apache/sling/api/resource/runtime/dto/ResourceProviderFailureDTO.java
@@ -31,5 +31,5 @@ public class ResourceProviderFailureDTO extends ResourceProviderDTO {
/**
* The reason for the failure.
*/
- public FailureReason reason; //NOSONAR
+ public FailureReason reason; // NOSONAR
}
diff --git a/src/main/java/org/apache/sling/api/resource/runtime/dto/RuntimeDTO.java b/src/main/java/org/apache/sling/api/resource/runtime/dto/RuntimeDTO.java
index c836661..9a42ae6 100644
--- a/src/main/java/org/apache/sling/api/resource/runtime/dto/RuntimeDTO.java
+++ b/src/main/java/org/apache/sling/api/resource/runtime/dto/RuntimeDTO.java
@@ -29,11 +29,11 @@ public class RuntimeDTO {
* DTOs for all active providers.
* If there is none, the array is empty.
*/
- public ResourceProviderDTO[] providers; //NOSONAR
+ public ResourceProviderDTO[] providers; // NOSONAR
/**
* DTOs for all inactive/failed providers.
* If there is none, the array is empty.
*/
- public ResourceProviderFailureDTO[] failedProviders; //NOSONAR
+ public ResourceProviderFailureDTO[] failedProviders; // NOSONAR
}
diff --git a/src/main/java/org/apache/sling/api/resource/runtime/dto/package-info.java b/src/main/java/org/apache/sling/api/resource/runtime/dto/package-info.java
index 4ee5c67..180b30a 100644
--- a/src/main/java/org/apache/sling/api/resource/runtime/dto/package-info.java
+++ b/src/main/java/org/apache/sling/api/resource/runtime/dto/package-info.java
@@ -21,4 +21,3 @@
package org.apache.sling.api.resource.runtime.dto;
import org.osgi.annotation.versioning.Version;
-
diff --git a/src/main/java/org/apache/sling/api/resource/runtime/package-info.java b/src/main/java/org/apache/sling/api/resource/runtime/package-info.java
index ed28552..d59e20f 100644
--- a/src/main/java/org/apache/sling/api/resource/runtime/package-info.java
+++ b/src/main/java/org/apache/sling/api/resource/runtime/package-info.java
@@ -21,4 +21,3 @@
package org.apache.sling.api.resource.runtime;
import org.osgi.annotation.versioning.Version;
-
diff --git a/src/main/java/org/apache/sling/api/scripting/InvalidServiceFilterSyntaxException.java b/src/main/java/org/apache/sling/api/scripting/InvalidServiceFilterSyntaxException.java
index cb45f29..450b94f 100644
--- a/src/main/java/org/apache/sling/api/scripting/InvalidServiceFilterSyntaxException.java
+++ b/src/main/java/org/apache/sling/api/scripting/InvalidServiceFilterSyntaxException.java
@@ -33,8 +33,7 @@ public class InvalidServiceFilterSyntaxException extends SlingException {
this.filter = filter;
}
- public InvalidServiceFilterSyntaxException(String filter, String reason,
- Throwable cause) {
+ public InvalidServiceFilterSyntaxException(String filter, String reason, Throwable cause) {
super(reason, cause);
this.filter = filter;
@@ -43,4 +42,4 @@ public class InvalidServiceFilterSyntaxException extends SlingException {
public String getFilter() {
return filter;
}
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/apache/sling/api/scripting/LazyBindings.java b/src/main/java/org/apache/sling/api/scripting/LazyBindings.java
index d44acd2..cc2b09d 100644
--- a/src/main/java/org/apache/sling/api/scripting/LazyBindings.java
+++ b/src/main/java/org/apache/sling/api/scripting/LazyBindings.java
@@ -1,23 +1,25 @@
-/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- ~ Licensed to the Apache Software Foundation (ASF) under one
- ~ or more contributor license agreements. See the NOTICE file
- ~ distributed with this work for additional information
- ~ regarding copyright ownership. The ASF licenses this file
- ~ to you under the Apache License, Version 2.0 (the
- ~ "License"); you may not use this file except in compliance
- ~ with the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing,
- ~ software distributed under the License is distributed on an
- ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- ~ KIND, either express or implied. See the License for the
- ~ specific language governing permissions and limitations
- ~ under the License.
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.apache.sling.api.scripting;
+import javax.script.Bindings;
+
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
@@ -26,8 +28,6 @@ import java.util.Map;
import java.util.Set;
import java.util.stream.Stream;
-import javax.script.Bindings;
-
import org.jetbrains.annotations.NotNull;
import org.osgi.annotation.versioning.ConsumerType;
@@ -71,7 +71,6 @@ public class LazyBindings extends HashMap<String, Object> implements Bindings {
this.suppliers = suppliers;
}
-
@Override
public Object put(String key, Object value) {
Object previous = this.get(key);
diff --git a/src/main/java/org/apache/sling/api/scripting/ScriptEvaluationException.java b/src/main/java/org/apache/sling/api/scripting/ScriptEvaluationException.java
index 7c8ace7..ac9d20c 100644
--- a/src/main/java/org/apache/sling/api/scripting/ScriptEvaluationException.java
+++ b/src/main/java/org/apache/sling/api/scripting/ScriptEvaluationException.java
@@ -37,8 +37,7 @@ public class ScriptEvaluationException extends SlingException {
this.scriptName = scriptName;
}
- public ScriptEvaluationException(String scriptName, String message,
- Throwable cause) {
+ public ScriptEvaluationException(String scriptName, String message, Throwable cause) {
super(message, cause);
this.scriptName = scriptName;
diff --git a/src/main/java/org/apache/sling/api/scripting/SlingBindings.java b/src/main/java/org/apache/sling/api/scripting/SlingBindings.java
index 154c8f9..1951757 100644
--- a/src/main/java/org/apache/sling/api/scripting/SlingBindings.java
+++ b/src/main/java/org/apache/sling/api/scripting/SlingBindings.java
@@ -171,8 +171,8 @@ public class SlingBindings extends LazyBindings {
@SuppressWarnings("unchecked")
protected <ObjectType> ObjectType get(final String key, final Class<ObjectType> type) {
final Object o = this.get(key);
- if ( type.isInstance(o) ) {
- return (ObjectType)o;
+ if (type.isInstance(o)) {
+ return (ObjectType) o;
}
return null;
}
@@ -183,7 +183,7 @@ public class SlingBindings extends LazyBindings {
* @param value The value
*/
protected void safePut(final String key, final Object value) {
- if ( value != null ) {
+ if (value != null) {
this.put(key, value);
}
}
@@ -203,7 +203,7 @@ public class SlingBindings extends LazyBindings {
*/
public boolean getFlush() {
Boolean value = this.get(FLUSH, Boolean.class);
- if (value != null ) {
+ if (value != null) {
return value;
}
diff --git a/src/main/java/org/apache/sling/api/scripting/SlingJakartaBindings.java b/src/main/java/org/apache/sling/api/scripting/SlingJakartaBindings.java
index 6cd721b..8d3807d 100644
--- a/src/main/java/org/apache/sling/api/scripting/SlingJakartaBindings.java
+++ b/src/main/java/org/apache/sling/api/scripting/SlingJakartaBindings.java
@@ -37,7 +37,7 @@ import org.slf4j.Logger;
*/
public class SlingJakartaBindings extends LazyBindings {
- /**
+ /**
* The name of the global scripting variable providing the
* {@link org.apache.sling.api.SlingJakartaHttpServletRequest} object (value is
* "request"). The value of the scripting variable is the same as that
@@ -168,8 +168,8 @@ public class SlingJakartaBindings extends LazyBindings {
@SuppressWarnings("unchecked")
protected <ObjectType> ObjectType get(final String key, final Class<ObjectType> type) {
final Object o = this.get(key);
- if ( type.isInstance(o) ) {
- return (ObjectType)o;
+ if (type.isInstance(o)) {
+ return (ObjectType) o;
}
return null;
}
@@ -180,7 +180,7 @@ public class SlingJakartaBindings extends LazyBindings {
* @param value The value
*/
protected void safePut(final String key, final Object value) {
- if ( value != null ) {
+ if (value != null) {
this.put(key, value);
}
}
@@ -200,7 +200,7 @@ public class SlingJakartaBindings extends LazyBindings {
*/
public boolean getFlush() {
Boolean value = this.get(FLUSH, Boolean.class);
- if (value != null ) {
+ if (value != null) {
return value;
}
diff --git a/src/main/java/org/apache/sling/api/scripting/SlingJakartaScript.java b/src/main/java/org/apache/sling/api/scripting/SlingJakartaScript.java
index 880e37e..9bd5201 100644
--- a/src/main/java/org/apache/sling/api/scripting/SlingJakartaScript.java
+++ b/src/main/java/org/apache/sling/api/scripting/SlingJakartaScript.java
@@ -18,10 +18,8 @@
*/
package org.apache.sling.api.scripting;
-import org.jetbrains.annotations.NotNull;
-
import org.apache.sling.api.resource.Resource;
-
+import org.jetbrains.annotations.NotNull;
import org.osgi.annotation.versioning.ConsumerType;
/**
@@ -43,7 +41,8 @@ public interface SlingJakartaScript {
* Returns the Resource providing the script source code.
* @return The script resource.
*/
- @NotNull Resource getScriptResource();
+ @NotNull
+ Resource getScriptResource();
/**
* Evaluates this script using the bound variables as global variables to
diff --git a/src/main/java/org/apache/sling/api/scripting/SlingJakartaScriptHelper.java b/src/main/java/org/apache/sling/api/scripting/SlingJakartaScriptHelper.java
index 1545dc7..a7e27fd 100644
--- a/src/main/java/org/apache/sling/api/scripting/SlingJakartaScriptHelper.java
+++ b/src/main/java/org/apache/sling/api/scripting/SlingJakartaScriptHelper.java
@@ -18,13 +18,12 @@
*/
package org.apache.sling.api.scripting;
-import org.jetbrains.annotations.Nullable;
-import org.jetbrains.annotations.NotNull;
import org.apache.sling.api.SlingJakartaHttpServletRequest;
import org.apache.sling.api.SlingJakartaHttpServletResponse;
import org.apache.sling.api.request.RequestDispatcherOptions;
import org.apache.sling.api.resource.Resource;
-
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.osgi.annotation.versioning.ProviderType;
/**
@@ -41,20 +40,23 @@ public interface SlingJakartaScriptHelper {
* request.
* @return The request
*/
- @NotNull SlingJakartaHttpServletRequest getRequest();
+ @NotNull
+ SlingJakartaHttpServletRequest getRequest();
/**
* Returns the {@link SlingJakartaHttpServletResponse} representing the output of
* the request.
* @return The response
*/
- @NotNull SlingJakartaHttpServletResponse getResponse();
+ @NotNull
+ SlingJakartaHttpServletResponse getResponse();
/**
* Returns the {@link SlingJakartaScriptHelper} being called to handle the request.
* @return The script
*/
- @NotNull SlingJakartaScript getScript();
+ @NotNull
+ SlingJakartaScript getScript();
/**
* Same as {@link #include(String,RequestDispatcherOptions)}, but using
@@ -341,7 +343,8 @@ public interface SlingJakartaScriptHelper {
* @param <ServiceType> The type (interface) of the service.
* @return The service instance, or {@code null} if no services are registered which implement the specified class.
*/
- @Nullable <ServiceType> ServiceType getService(@NotNull Class<ServiceType> serviceType);
+ @Nullable
+ <ServiceType> ServiceType getService(@NotNull Class<ServiceType> serviceType);
/**
* Lookup one or several services.
@@ -361,8 +364,8 @@ public interface SlingJakartaScriptHelper {
*
* @see <a href="https://osgi.org/javadoc/r5/core/org/osgi/framework/Filter.html">Filter class in OSGi</a>
*/
- @Nullable <ServiceType> ServiceType[] getServices(@NotNull Class<ServiceType> serviceType,
- String filter);
+ @Nullable
+ <ServiceType> ServiceType[] getServices(@NotNull Class<ServiceType> serviceType, String filter);
/**
* Dispose the helper. This method can be used to clean up the script helper
diff --git a/src/main/java/org/apache/sling/api/scripting/SlingScript.java b/src/main/java/org/apache/sling/api/scripting/SlingScript.java
index a708dd9..f0c5b84 100644
--- a/src/main/java/org/apache/sling/api/scripting/SlingScript.java
+++ b/src/main/java/org/apache/sling/api/scripting/SlingScript.java
@@ -18,10 +18,8 @@
*/
package org.apache.sling.api.scripting;
-import org.jetbrains.annotations.NotNull;
-
import org.apache.sling.api.resource.Resource;
-
+import org.jetbrains.annotations.NotNull;
import org.osgi.annotation.versioning.ConsumerType;
/**
@@ -44,7 +42,8 @@ public interface SlingScript {
* Returns the Resource providing the script source code.
* @return The script resource.
*/
- @NotNull Resource getScriptResource();
+ @NotNull
+ Resource getScriptResource();
/**
* Evaluates this script using the bound variables as global variables to
diff --git a/src/main/java/org/apache/sling/api/scripting/SlingScriptHelper.java b/src/main/java/org/apache/sling/api/scripting/SlingScriptHelper.java
index 08191b9..69cb549 100644
--- a/src/main/java/org/apache/sling/api/scripting/SlingScriptHelper.java
+++ b/src/main/java/org/apache/sling/api/scripting/SlingScriptHelper.java
@@ -18,14 +18,12 @@
*/
package org.apache.sling.api.scripting;
-import org.jetbrains.annotations.Nullable;
-import org.jetbrains.annotations.NotNull;
-
import org.apache.sling.api.SlingHttpServletRequest;
import org.apache.sling.api.SlingHttpServletResponse;
import org.apache.sling.api.request.RequestDispatcherOptions;
import org.apache.sling.api.resource.Resource;
-
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.osgi.annotation.versioning.ProviderType;
/**
@@ -43,20 +41,23 @@ public interface SlingScriptHelper {
* request.
* @return The request
*/
- @NotNull SlingHttpServletRequest getRequest();
+ @NotNull
+ SlingHttpServletRequest getRequest();
/**
* Returns the {@link SlingHttpServletResponse} representing the output of
* the request.
* @return The response
*/
- @NotNull SlingHttpServletResponse getResponse();
+ @NotNull
+ SlingHttpServletResponse getResponse();
/**
* Returns the {@link SlingScript} being called to handle the request.
* @return The script
*/
- @NotNull SlingScript getScript();
+ @NotNull
+ SlingScript getScript();
/**
* Same as {@link #include(String,RequestDispatcherOptions)}, but using
@@ -343,7 +344,8 @@ public interface SlingScriptHelper {
* @param <ServiceType> The type (interface) of the service.
* @return The service instance, or {@code null} if no services are registered which implement the specified class.
*/
- @Nullable <ServiceType> ServiceType getService(@NotNull Class<ServiceType> serviceType);
+ @Nullable
+ <ServiceType> ServiceType getService(@NotNull Class<ServiceType> serviceType);
/**
* Lookup one or several services.
@@ -363,8 +365,8 @@ public interface SlingScriptHelper {
*
* @see <a href="https://osgi.org/javadoc/r5/core/org/osgi/framework/Filter.html">Filter class in OSGi</a>
*/
- @Nullable <ServiceType> ServiceType[] getServices(@NotNull Class<ServiceType> serviceType,
- String filter);
+ @Nullable
+ <ServiceType> ServiceType[] getServices(@NotNull Class<ServiceType> serviceType, String filter);
/**
* Dispose the helper. This method can be used to clean up the script helper
diff --git a/src/main/java/org/apache/sling/api/scripting/SlingScriptResolver.java b/src/main/java/org/apache/sling/api/scripting/SlingScriptResolver.java
index 3d536db..666e34b 100644
--- a/src/main/java/org/apache/sling/api/scripting/SlingScriptResolver.java
+++ b/src/main/java/org/apache/sling/api/scripting/SlingScriptResolver.java
@@ -1,18 +1,20 @@
/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
package org.apache.sling.api.scripting;
@@ -50,5 +52,6 @@ public interface SlingScriptResolver {
* <code>null</code> otherwise.
* @throws org.apache.sling.api.SlingException If an error occurrs trying to resolve the name.
*/
- @Nullable SlingScript findScript(@NotNull ResourceResolver resourceResolver, @NotNull String name);
+ @Nullable
+ SlingScript findScript(@NotNull ResourceResolver resourceResolver, @NotNull String name);
}
diff --git a/src/main/java/org/apache/sling/api/scripting/package-info.java b/src/main/java/org/apache/sling/api/scripting/package-info.java
index 1772977..d9e29c4 100644
--- a/src/main/java/org/apache/sling/api/scripting/package-info.java
+++ b/src/main/java/org/apache/sling/api/scripting/package-info.java
@@ -21,4 +21,3 @@
package org.apache.sling.api.scripting;
import org.osgi.annotation.versioning.Version;
-
diff --git a/src/main/java/org/apache/sling/api/security/AccessSecurityException.java b/src/main/java/org/apache/sling/api/security/AccessSecurityException.java
index 46dda29..3a281be 100644
--- a/src/main/java/org/apache/sling/api/security/AccessSecurityException.java
+++ b/src/main/java/org/apache/sling/api/security/AccessSecurityException.java
@@ -38,7 +38,7 @@ public class AccessSecurityException extends Exception {
/**
* Constructs a new instance of this class with the specified detail
* message.
- *
+ *
* @param message
* the detail message. The detail message is saved for later
* retrieval by the {@link #getMessage()} method.
@@ -50,7 +50,7 @@ public class AccessSecurityException extends Exception {
/**
* Constructs a new instance of this class with the specified detail message
* and root cause.
- *
+ *
* @param message
* the detail message. The detail message is saved for later
* retrieval by the {@link #getMessage()} method.
@@ -63,7 +63,7 @@ public class AccessSecurityException extends Exception {
/**
* Constructs a new instance of this class with the specified root cause.
- *
+ *
* @param rootCause
* root failure cause
*/
diff --git a/src/main/java/org/apache/sling/api/security/ResourceAccessSecurity.java b/src/main/java/org/apache/sling/api/security/ResourceAccessSecurity.java
index 5845f91..e0d0451 100644
--- a/src/main/java/org/apache/sling/api/security/ResourceAccessSecurity.java
+++ b/src/main/java/org/apache/sling/api/security/ResourceAccessSecurity.java
@@ -18,12 +18,10 @@
*/
package org.apache.sling.api.security;
-import org.jetbrains.annotations.Nullable;
-import org.jetbrains.annotations.NotNull;
-
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceResolver;
-
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.osgi.annotation.versioning.ProviderType;
/**
@@ -87,7 +85,8 @@ public interface ResourceAccessSecurity {
* @param resource The resource to test.
* @return null if {@link Resource} cannot be read
*/
- @Nullable Resource getReadableResource(Resource resource);
+ @Nullable
+ Resource getReadableResource(Resource resource);
/**
* Check whether a resource can be created at the path.
@@ -168,7 +167,7 @@ public interface ResourceAccessSecurity {
* @return the transformed query
* @throws AccessSecurityException If access is denied
*/
- @NotNull String transformQuery(@NotNull String query, @NotNull String language, @NotNull ResourceResolver resourceResolver)
- throws AccessSecurityException;
-
-}
\ No newline at end of file
+ @NotNull
+ String transformQuery(@NotNull String query, @NotNull String language, @NotNull ResourceResolver resourceResolver)
+ throws AccessSecurityException;
+}
diff --git a/src/main/java/org/apache/sling/api/security/package-info.java b/src/main/java/org/apache/sling/api/security/package-info.java
index 6ed80f7..7aa637d 100644
--- a/src/main/java/org/apache/sling/api/security/package-info.java
+++ b/src/main/java/org/apache/sling/api/security/package-info.java
@@ -21,4 +21,3 @@
package org.apache.sling.api.security;
import org.osgi.annotation.versioning.Version;
-
diff --git a/src/main/java/org/apache/sling/api/servlets/ErrorHandler.java b/src/main/java/org/apache/sling/api/servlets/ErrorHandler.java
index a8dcf7e..c666775 100644
--- a/src/main/java/org/apache/sling/api/servlets/ErrorHandler.java
+++ b/src/main/java/org/apache/sling/api/servlets/ErrorHandler.java
@@ -50,8 +50,7 @@ public interface ErrorHandler {
* @throws IOException May be thrown if an error occurrs sending the
* response.
*/
- void handleError(int status, String message,
- SlingHttpServletRequest request, SlingHttpServletResponse response)
+ void handleError(int status, String message, SlingHttpServletRequest request, SlingHttpServletResponse response)
throws IOException;
/**
@@ -68,7 +67,6 @@ public interface ErrorHandler {
* @throws IOException May be thrown if an error occurrs sending the
* response.
*/
- void handleError(Throwable throwable, SlingHttpServletRequest request,
- SlingHttpServletResponse response) throws IOException;
-
+ void handleError(Throwable throwable, SlingHttpServletRequest request, SlingHttpServletResponse response)
+ throws IOException;
}
diff --git a/src/main/java/org/apache/sling/api/servlets/HtmlResponse.java b/src/main/java/org/apache/sling/api/servlets/HtmlResponse.java
index 6e477a4..bf3240b 100644
--- a/src/main/java/org/apache/sling/api/servlets/HtmlResponse.java
+++ b/src/main/java/org/apache/sling/api/servlets/HtmlResponse.java
@@ -1,21 +1,25 @@
/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
package org.apache.sling.api.servlets;
+import javax.servlet.http.HttpServletResponse;
+
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStream;
@@ -25,8 +29,6 @@ import java.io.Writer;
import java.util.HashMap;
import java.util.Map;
-import javax.servlet.http.HttpServletResponse;
-
import org.apache.sling.api.request.ResponseUtil;
/**
@@ -241,12 +243,12 @@ public class HtmlResponse {
public int getStatusCode() {
Integer status = getProperty(PN_STATUS_CODE, Integer.class);
if (status == null) {
- if (getError() != null) {
- //if there was an error
- status = HttpServletResponse.SC_INTERNAL_SERVER_ERROR;
- } else {
- status = HttpServletResponse.SC_OK;
- }
+ if (getError() != null) {
+ // if there was an error
+ status = HttpServletResponse.SC_INTERNAL_SERVER_ERROR;
+ } else {
+ status = HttpServletResponse.SC_OK;
+ }
}
return status;
}
@@ -463,8 +465,7 @@ public class HtmlResponse {
* @param setStatus whether to set the status code on the response
* @throws IOException if an i/o exception occurs
*/
- public void send(HttpServletResponse response, boolean setStatus)
- throws IOException {
+ public void send(HttpServletResponse response, boolean setStatus) throws IOException {
prepare();
if (setStatus) {
@@ -492,7 +493,7 @@ public class HtmlResponse {
while ((read = in.read()) >= 0) {
char c = (char) read;
switch (state) {
- // initial
+ // initial
case 0:
if (c == '$') {
state = 1;
@@ -500,7 +501,7 @@ public class HtmlResponse {
out.write(c);
}
break;
- // $ read
+ // $ read
case 1:
if (c == '{') {
state = 2;
@@ -510,7 +511,7 @@ public class HtmlResponse {
out.write(c);
}
break;
- // { read
+ // { read
case 2:
if (c == '}') {
state = 0;
@@ -527,5 +528,4 @@ public class HtmlResponse {
in.close();
out.flush();
}
-
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/apache/sling/api/servlets/HttpConstants.java b/src/main/java/org/apache/sling/api/servlets/HttpConstants.java
index 2c86228..6b3a4da 100644
--- a/src/main/java/org/apache/sling/api/servlets/HttpConstants.java
+++ b/src/main/java/org/apache/sling/api/servlets/HttpConstants.java
@@ -1,18 +1,20 @@
/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
package org.apache.sling.api.servlets;
@@ -38,5 +40,4 @@ public class HttpConstants {
public static final String HEADER_IF_MATCH = "If-Match";
public static final String HEADER_IF_MODIFIED_SINCE = "If-Modified-Since";
public static final String HEADER_LAST_MODIFIED = "Last-Modified";
-
}
diff --git a/src/main/java/org/apache/sling/api/servlets/JakartaErrorHandler.java b/src/main/java/org/apache/sling/api/servlets/JakartaErrorHandler.java
index 86d7df2..9a95cb3 100644
--- a/src/main/java/org/apache/sling/api/servlets/JakartaErrorHandler.java
+++ b/src/main/java/org/apache/sling/api/servlets/JakartaErrorHandler.java
@@ -49,8 +49,11 @@ public interface JakartaErrorHandler {
* @throws IOException May be thrown if an error occurrs sending the
* response.
*/
- void handleError(int status, String message,
- SlingJakartaHttpServletRequest request, SlingJakartaHttpServletResponse response)
+ void handleError(
+ int status,
+ String message,
+ SlingJakartaHttpServletRequest request,
+ SlingJakartaHttpServletResponse response)
throws IOException;
/**
@@ -67,7 +70,7 @@ public interface JakartaErrorHandler {
* @throws IOException May be thrown if an error occurrs sending the
* response.
*/
- void handleError(Throwable throwable, SlingJakartaHttpServletRequest request,
- SlingJakartaHttpServletResponse response) throws IOException;
-
+ void handleError(
+ Throwable throwable, SlingJakartaHttpServletRequest request, SlingJakartaHttpServletResponse response)
+ throws IOException;
}
diff --git a/src/main/java/org/apache/sling/api/servlets/JakartaOptingServlet.java b/src/main/java/org/apache/sling/api/servlets/JakartaOptingServlet.java
index bf934e3..5cb47d1 100644
--- a/src/main/java/org/apache/sling/api/servlets/JakartaOptingServlet.java
+++ b/src/main/java/org/apache/sling/api/servlets/JakartaOptingServlet.java
@@ -18,10 +18,9 @@
*/
package org.apache.sling.api.servlets;
+import jakarta.servlet.Servlet;
import org.apache.sling.api.SlingJakartaHttpServletRequest;
import org.jetbrains.annotations.NotNull;
-import jakarta.servlet.Servlet;
-
import org.osgi.annotation.versioning.ConsumerType;
/**
@@ -49,5 +48,4 @@ public interface JakartaOptingServlet extends Servlet {
* <code>false</code> otherwise
*/
boolean accepts(@NotNull SlingJakartaHttpServletRequest request);
-
}
diff --git a/src/main/java/org/apache/sling/api/servlets/OptingServlet.java b/src/main/java/org/apache/sling/api/servlets/OptingServlet.java
index 9dad4b1..bc8098d 100644
--- a/src/main/java/org/apache/sling/api/servlets/OptingServlet.java
+++ b/src/main/java/org/apache/sling/api/servlets/OptingServlet.java
@@ -18,11 +18,10 @@
*/
package org.apache.sling.api.servlets;
-import org.jetbrains.annotations.NotNull;
import javax.servlet.Servlet;
import org.apache.sling.api.SlingHttpServletRequest;
-
+import org.jetbrains.annotations.NotNull;
import org.osgi.annotation.versioning.ConsumerType;
/**
@@ -52,5 +51,4 @@ public interface OptingServlet extends Servlet {
* <code>false</code> otherwise
*/
boolean accepts(@NotNull SlingHttpServletRequest request);
-
}
diff --git a/src/main/java/org/apache/sling/api/servlets/ServletResolver.java b/src/main/java/org/apache/sling/api/servlets/ServletResolver.java
index e6b7a7f..a2278d9 100644
--- a/src/main/java/org/apache/sling/api/servlets/ServletResolver.java
+++ b/src/main/java/org/apache/sling/api/servlets/ServletResolver.java
@@ -18,14 +18,12 @@
*/
package org.apache.sling.api.servlets;
-import org.jetbrains.annotations.Nullable;
-import org.jetbrains.annotations.NotNull;
import jakarta.servlet.Servlet;
-
import org.apache.sling.api.SlingJakartaHttpServletRequest;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceResolver;
-
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.osgi.annotation.versioning.ProviderType;
/**
@@ -64,8 +62,8 @@ public interface ServletResolver {
* @throws NullPointerException If {@code request} is null.
* @since 2.5.0
*/
- @Nullable Servlet resolve(@NotNull SlingJakartaHttpServletRequest request);
-
+ @Nullable
+ Servlet resolve(@NotNull SlingJakartaHttpServletRequest request);
/**
* Resolves a <code>jakarta.servlet.Servlet</code> whose
@@ -96,7 +94,8 @@ public interface ServletResolver {
* @since 2.1 (Sling API Bundle 2.1.0)
* @since 2.5.0
*/
- @Nullable Servlet resolve(@NotNull Resource resource, @NotNull String scriptName);
+ @Nullable
+ Servlet resolve(@NotNull Resource resource, @NotNull String scriptName);
/**
* Resolves a <code>jakarta.servlet.Servlet</code> whose
@@ -123,7 +122,8 @@ public interface ServletResolver {
* @throws IllegalArgumentException If {@code resolver} is null.
* @since 2.5.0
*/
- @Nullable Servlet resolve(@NotNull ResourceResolver resolver, @NotNull String scriptName);
+ @Nullable
+ Servlet resolve(@NotNull ResourceResolver resolver, @NotNull String scriptName);
/**
* Resolves a <code>javax.servlet.Servlet</code> whose
@@ -150,7 +150,8 @@ public interface ServletResolver {
* @deprecated Use {@link #resolve(SlingJakartaHttpServletRequest)} instead.
*/
@Deprecated
- @Nullable javax.servlet.Servlet resolveServlet(@NotNull org.apache.sling.api.SlingHttpServletRequest request);
+ @Nullable
+ javax.servlet.Servlet resolveServlet(@NotNull org.apache.sling.api.SlingHttpServletRequest request);
/**
* Resolves a <code>javax.servlet.Servlet</code> whose
@@ -182,7 +183,8 @@ public interface ServletResolver {
* @deprecated Use {@link #resolve(Resource, String)} instead.
*/
@Deprecated
- @Nullable javax.servlet.Servlet resolveServlet(@NotNull Resource resource, @NotNull String scriptName);
+ @Nullable
+ javax.servlet.Servlet resolveServlet(@NotNull Resource resource, @NotNull String scriptName);
/**
* Resolves a <code>javax.servlet.Servlet</code> whose
@@ -211,5 +213,6 @@ public interface ServletResolver {
* @deprecated Use {@link #resolve(ResourceResolver, String)} instead.
*/
@Deprecated
- @Nullable javax.servlet.Servlet resolveServlet(@NotNull ResourceResolver resolver, @NotNull String scriptName);
+ @Nullable
+ javax.servlet.Servlet resolveServlet(@NotNull ResourceResolver resolver, @NotNull String scriptName);
}
diff --git a/src/main/java/org/apache/sling/api/servlets/SlingAllMethodsServlet.java b/src/main/java/org/apache/sling/api/servlets/SlingAllMethodsServlet.java
index e6ba8f0..f5dd7e7 100644
--- a/src/main/java/org/apache/sling/api/servlets/SlingAllMethodsServlet.java
+++ b/src/main/java/org/apache/sling/api/servlets/SlingAllMethodsServlet.java
@@ -1,30 +1,32 @@
/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
package org.apache.sling.api.servlets;
+import javax.servlet.ServletException;
+
import java.io.IOException;
import java.lang.reflect.Method;
import java.util.Map;
-import org.jetbrains.annotations.NotNull;
-import javax.servlet.ServletException;
-
import org.apache.sling.api.SlingHttpServletRequest;
import org.apache.sling.api.SlingHttpServletResponse;
+import org.jetbrains.annotations.NotNull;
/**
* Helper base class for data modifying Servlets used in Sling. This class
@@ -62,9 +64,8 @@ public class SlingAllMethodsServlet extends SlingSafeMethodsServlet {
* @throws IOException If the error status cannot be reported back to the
* client.
*/
- protected void doPost(@NotNull SlingHttpServletRequest request,
- @NotNull SlingHttpServletResponse response) throws ServletException,
- IOException {
+ protected void doPost(@NotNull SlingHttpServletRequest request, @NotNull SlingHttpServletResponse response)
+ throws ServletException, IOException {
handleMethodNotImplemented(request, response);
}
@@ -85,9 +86,8 @@ public class SlingAllMethodsServlet extends SlingSafeMethodsServlet {
* @throws IOException If the error status cannot be reported back to the
* client.
*/
- protected void doPut(@NotNull SlingHttpServletRequest request,
- @NotNull SlingHttpServletResponse response) throws ServletException,
- IOException {
+ protected void doPut(@NotNull SlingHttpServletRequest request, @NotNull SlingHttpServletResponse response)
+ throws ServletException, IOException {
handleMethodNotImplemented(request, response);
}
@@ -108,9 +108,8 @@ public class SlingAllMethodsServlet extends SlingSafeMethodsServlet {
* @throws IOException If the error status cannot be reported back to the
* client.
*/
- protected void doDelete(@NotNull SlingHttpServletRequest request,
- @NotNull SlingHttpServletResponse response) throws ServletException,
- IOException {
+ protected void doDelete(@NotNull SlingHttpServletRequest request, @NotNull SlingHttpServletResponse response)
+ throws ServletException, IOException {
handleMethodNotImplemented(request, response);
}
@@ -131,9 +130,8 @@ public class SlingAllMethodsServlet extends SlingSafeMethodsServlet {
* @throws ServletException Forwarded from any of the dispatched methods
* @throws IOException Forwarded from any of the dispatched methods
*/
- protected boolean mayService(@NotNull SlingHttpServletRequest request,
- @NotNull SlingHttpServletResponse response) throws ServletException,
- IOException {
+ protected boolean mayService(@NotNull SlingHttpServletRequest request, @NotNull SlingHttpServletResponse response)
+ throws ServletException, IOException {
// assume the method is known for now
if (super.mayService(request, response)) {
@@ -175,8 +173,7 @@ public class SlingAllMethodsServlet extends SlingSafeMethodsServlet {
* @return A <code>StringBuffer</code> containing the list of HTTP methods
* supported.
*/
- protected @NotNull StringBuffer getAllowedRequestMethods(
- @NotNull Map<String, Method> declaredMethods) {
+ protected @NotNull StringBuffer getAllowedRequestMethods(@NotNull Map<String, Method> declaredMethods) {
StringBuffer allowBuf = super.getAllowedRequestMethods(declaredMethods);
// add more method names depending on the methods found
diff --git a/src/main/java/org/apache/sling/api/servlets/SlingJakartaAllMethodsServlet.java b/src/main/java/org/apache/sling/api/servlets/SlingJakartaAllMethodsServlet.java
index 56268eb..2aae281 100644
--- a/src/main/java/org/apache/sling/api/servlets/SlingJakartaAllMethodsServlet.java
+++ b/src/main/java/org/apache/sling/api/servlets/SlingJakartaAllMethodsServlet.java
@@ -1,18 +1,20 @@
/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
package org.apache.sling.api.servlets;
@@ -20,11 +22,10 @@ import java.io.IOException;
import java.lang.reflect.Method;
import java.util.Map;
-import org.jetbrains.annotations.NotNull;
import jakarta.servlet.ServletException;
-
import org.apache.sling.api.SlingJakartaHttpServletRequest;
import org.apache.sling.api.SlingJakartaHttpServletResponse;
+import org.jetbrains.annotations.NotNull;
/**
* Helper base class for data modifying Servlets used in Sling. This class
@@ -61,9 +62,9 @@ public class SlingJakartaAllMethodsServlet extends SlingJakartaSafeMethodsServle
* @throws IOException If the error status cannot be reported back to the
* client.
*/
- protected void doPost(@NotNull SlingJakartaHttpServletRequest request,
- @NotNull SlingJakartaHttpServletResponse response) throws ServletException,
- IOException {
+ protected void doPost(
+ @NotNull SlingJakartaHttpServletRequest request, @NotNull SlingJakartaHttpServletResponse response)
+ throws ServletException, IOException {
handleMethodNotImplemented(request, response);
}
@@ -84,9 +85,9 @@ public class SlingJakartaAllMethodsServlet extends SlingJakartaSafeMethodsServle
* @throws IOException If the error status cannot be reported back to the
* client.
*/
- protected void doPut(@NotNull SlingJakartaHttpServletRequest request,
- @NotNull SlingJakartaHttpServletResponse response) throws ServletException,
- IOException {
+ protected void doPut(
+ @NotNull SlingJakartaHttpServletRequest request, @NotNull SlingJakartaHttpServletResponse response)
+ throws ServletException, IOException {
handleMethodNotImplemented(request, response);
}
@@ -107,9 +108,9 @@ public class SlingJakartaAllMethodsServlet extends SlingJakartaSafeMethodsServle
* @throws IOException If the error status cannot be reported back to the
* client.
*/
- protected void doDelete(@NotNull SlingJakartaHttpServletRequest request,
- @NotNull SlingJakartaHttpServletResponse response) throws ServletException,
- IOException {
+ protected void doDelete(
+ @NotNull SlingJakartaHttpServletRequest request, @NotNull SlingJakartaHttpServletResponse response)
+ throws ServletException, IOException {
handleMethodNotImplemented(request, response);
}
@@ -130,9 +131,9 @@ public class SlingJakartaAllMethodsServlet extends SlingJakartaSafeMethodsServle
* @throws ServletException Forwarded from any of the dispatched methods
* @throws IOException Forwarded from any of the dispatched methods
*/
- protected boolean mayService(@NotNull SlingJakartaHttpServletRequest request,
- @NotNull SlingJakartaHttpServletResponse response) throws ServletException,
- IOException {
+ protected boolean mayService(
+ @NotNull SlingJakartaHttpServletRequest request, @NotNull SlingJakartaHttpServletResponse response)
+ throws ServletException, IOException {
// assume the method is known for now
if (super.mayService(request, response)) {
@@ -174,8 +175,7 @@ public class SlingJakartaAllMethodsServlet extends SlingJakartaSafeMethodsServle
* @return A <code>StringBuffer</code> containing the list of HTTP methods
* supported.
*/
- protected @NotNull StringBuffer getAllowedRequestMethods(
- @NotNull Map<String, Method> declaredMethods) {
+ protected @NotNull StringBuffer getAllowedRequestMethods(@NotNull Map<String, Method> declaredMethods) {
StringBuffer allowBuf = super.getAllowedRequestMethods(declaredMethods);
// add more method names depending on the methods found
diff --git a/src/main/java/org/apache/sling/api/servlets/SlingJakartaSafeMethodsServlet.java b/src/main/java/org/apache/sling/api/servlets/SlingJakartaSafeMethodsServlet.java
index 14a0380..0a40327 100644
--- a/src/main/java/org/apache/sling/api/servlets/SlingJakartaSafeMethodsServlet.java
+++ b/src/main/java/org/apache/sling/api/servlets/SlingJakartaSafeMethodsServlet.java
@@ -1,18 +1,20 @@
/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
package org.apache.sling.api.servlets;
@@ -26,10 +28,6 @@ import java.util.Enumeration;
import java.util.HashMap;
import java.util.Map;
-import org.apache.sling.api.SlingJakartaHttpServletRequest;
-import org.apache.sling.api.SlingJakartaHttpServletResponse;
-import org.apache.sling.api.wrappers.SlingJakartaHttpServletResponseWrapper;
-import org.jetbrains.annotations.NotNull;
import jakarta.servlet.GenericServlet;
import jakarta.servlet.ServletException;
import jakarta.servlet.ServletOutputStream;
@@ -37,7 +35,10 @@ import jakarta.servlet.ServletRequest;
import jakarta.servlet.ServletResponse;
import jakarta.servlet.WriteListener;
import jakarta.servlet.http.HttpServletResponse;
-
+import org.apache.sling.api.SlingJakartaHttpServletRequest;
+import org.apache.sling.api.SlingJakartaHttpServletResponse;
+import org.apache.sling.api.wrappers.SlingJakartaHttpServletResponseWrapper;
+import org.jetbrains.annotations.NotNull;
/**
* Helper base class for read-only Servlets used in Sling. This base class is
@@ -92,9 +93,9 @@ public class SlingJakartaSafeMethodsServlet extends GenericServlet {
* {@link #doGet(SlingJakartaHttpServletRequest, SlingJakartaHttpServletResponse)}
* method called by this implementation.
*/
- protected void doHead(@NotNull SlingJakartaHttpServletRequest request,
- @NotNull SlingJakartaHttpServletResponse response) throws ServletException,
- IOException {
+ protected void doHead(
+ @NotNull SlingJakartaHttpServletRequest request, @NotNull SlingJakartaHttpServletResponse response)
+ throws ServletException, IOException {
// the null-output wrapper
NoBodyResponse wrappedResponse = new NoBodyResponse(response);
@@ -123,9 +124,9 @@ public class SlingJakartaSafeMethodsServlet extends GenericServlet {
* @throws IOException If the error status cannot be reported back to the
* client.
*/
- protected void doGet(@NotNull SlingJakartaHttpServletRequest request,
- @NotNull SlingJakartaHttpServletResponse response) throws ServletException,
- IOException {
+ protected void doGet(
+ @NotNull SlingJakartaHttpServletRequest request, @NotNull SlingJakartaHttpServletResponse response)
+ throws ServletException, IOException {
handleMethodNotImplemented(request, response);
}
@@ -147,9 +148,9 @@ public class SlingJakartaSafeMethodsServlet extends GenericServlet {
* @throws ServletException Not thrown by this implementation.
* @throws IOException Not thrown by this implementation.
*/
- protected void doOptions(@NotNull SlingJakartaHttpServletRequest request,
- @NotNull SlingJakartaHttpServletResponse response) throws ServletException,
- IOException {
+ protected void doOptions(
+ @NotNull SlingJakartaHttpServletRequest request, @NotNull SlingJakartaHttpServletResponse response)
+ throws ServletException, IOException {
Map<String, Method> methods = getAllDeclaredMethods(getClass());
StringBuffer allowBuf = getAllowedRequestMethods(methods);
response.setHeader("Allow", allowBuf.toString());
@@ -169,9 +170,9 @@ public class SlingJakartaSafeMethodsServlet extends GenericServlet {
* @throws IOException May be thrown if there is an problem sending back the
* request headers in the response stream.
*/
- protected void doTrace(@NotNull SlingJakartaHttpServletRequest request,
- @NotNull SlingJakartaHttpServletResponse response) throws ServletException,
- IOException {
+ protected void doTrace(
+ @NotNull SlingJakartaHttpServletRequest request, @NotNull SlingJakartaHttpServletResponse response)
+ throws ServletException, IOException {
String CRLF = "\r\n";
@@ -225,9 +226,9 @@ public class SlingJakartaSafeMethodsServlet extends GenericServlet {
* @throws IOException If the error status cannot be reported back to the
* client.
*/
- protected void doGeneric(@NotNull SlingJakartaHttpServletRequest request,
- @NotNull SlingJakartaHttpServletResponse response) throws ServletException,
- IOException {
+ protected void doGeneric(
+ @NotNull SlingJakartaHttpServletRequest request, @NotNull SlingJakartaHttpServletResponse response)
+ throws ServletException, IOException {
handleMethodNotImplemented(request, response);
}
@@ -253,9 +254,9 @@ public class SlingJakartaSafeMethodsServlet extends GenericServlet {
* @throws ServletException Forwarded from any of the dispatched methods
* @throws IOException Forwarded from any of the dispatched methods
*/
- protected boolean mayService(@NotNull SlingJakartaHttpServletRequest request,
- @NotNull SlingJakartaHttpServletResponse response) throws ServletException,
- IOException {
+ protected boolean mayService(
+ @NotNull SlingJakartaHttpServletRequest request, @NotNull SlingJakartaHttpServletResponse response)
+ throws ServletException, IOException {
// assume the method is known for now
boolean methodKnown = true;
@@ -289,8 +290,9 @@ public class SlingJakartaSafeMethodsServlet extends GenericServlet {
* @param response The HTTP response to which the error status is sent.
* @throws IOException Thrown if the status cannot be sent to the client.
*/
- protected void handleMethodNotImplemented(@NotNull SlingJakartaHttpServletRequest request,
- @NotNull SlingJakartaHttpServletResponse response) throws IOException {
+ protected void handleMethodNotImplemented(
+ @NotNull SlingJakartaHttpServletRequest request, @NotNull SlingJakartaHttpServletResponse response)
+ throws IOException {
String protocol = request.getProtocol();
String msg = "Method " + request.getMethod() + " not supported";
@@ -303,7 +305,6 @@ public class SlingJakartaSafeMethodsServlet extends GenericServlet {
// otherwise use 400 Bad Request
response.sendError(HttpServletResponse.SC_BAD_REQUEST, msg);
-
}
}
@@ -335,9 +336,9 @@ public class SlingJakartaSafeMethodsServlet extends GenericServlet {
* {@link #doGeneric(SlingJakartaHttpServletRequest, SlingJakartaHttpServletResponse)}
* methods.
*/
- protected void service(@NotNull SlingJakartaHttpServletRequest request,
- @NotNull SlingJakartaHttpServletResponse response) throws ServletException,
- IOException {
+ protected void service(
+ @NotNull SlingJakartaHttpServletRequest request, @NotNull SlingJakartaHttpServletResponse response)
+ throws ServletException, IOException {
// first try to handle the request by the known methods
boolean methodKnown = mayService(request, response);
@@ -369,16 +370,13 @@ public class SlingJakartaSafeMethodsServlet extends GenericServlet {
public void service(@NotNull ServletRequest req, @NotNull ServletResponse res)
throws ServletException, IOException {
- if ((req instanceof SlingJakartaHttpServletRequest)
- && (res instanceof SlingJakartaHttpServletResponse)) {
+ if ((req instanceof SlingJakartaHttpServletRequest) && (res instanceof SlingJakartaHttpServletResponse)) {
- service((SlingJakartaHttpServletRequest) req,
- (SlingJakartaHttpServletResponse) res);
+ service((SlingJakartaHttpServletRequest) req, (SlingJakartaHttpServletResponse) res);
} else {
throw new ServletException("Not a Sling HTTP request/response");
-
}
}
@@ -413,8 +411,7 @@ public class SlingJakartaSafeMethodsServlet extends GenericServlet {
* @return A <code>StringBuffer</code> containing the list of HTTP methods
* supported.
*/
- protected StringBuffer getAllowedRequestMethods(
- Map<String, Method> declaredMethods) {
+ protected StringBuffer getAllowedRequestMethods(Map<String, Method> declaredMethods) {
StringBuffer allowBuf = new StringBuffer();
// OPTIONS and TRACE are always supported by this servlet
@@ -422,14 +419,12 @@ public class SlingJakartaSafeMethodsServlet extends GenericServlet {
allowBuf.append(", ").append(HttpConstants.METHOD_TRACE);
// add more method names depending on the methods found
- if (declaredMethods.containsKey("doHead")
- && !declaredMethods.containsKey("doGet")) {
+ if (declaredMethods.containsKey("doHead") && !declaredMethods.containsKey("doGet")) {
allowBuf.append(", ").append(HttpConstants.METHOD_HEAD);
} else if (declaredMethods.containsKey("doGet")) {
allowBuf.append(", ").append(HttpConstants.METHOD_GET);
allowBuf.append(", ").append(HttpConstants.METHOD_HEAD);
-
}
return allowBuf;
@@ -449,8 +444,7 @@ public class SlingJakartaSafeMethodsServlet extends GenericServlet {
*/
private Map<String, Method> getAllDeclaredMethods(Class<?> c) {
// stop (and do not include) the AbstractSlingServletClass
- if (c == null
- || c.getName().equals(SlingJakartaSafeMethodsServlet.class.getName())) {
+ if (c == null || c.getName().equals(SlingJakartaSafeMethodsServlet.class.getName())) {
return new HashMap<String, Method>();
}
@@ -461,8 +455,7 @@ public class SlingJakartaSafeMethodsServlet extends GenericServlet {
Method[] declaredMethods = c.getDeclaredMethods();
for (Method method : declaredMethods) {
// only consider public and protected methods
- if (Modifier.isProtected(method.getModifiers())
- || Modifier.isPublic(method.getModifiers())) {
+ if (Modifier.isProtected(method.getModifiers()) || Modifier.isPublic(method.getModifiers())) {
methodSet.put(method.getName(), method);
}
}
diff --git a/src/main/java/org/apache/sling/api/servlets/SlingSafeMethodsServlet.java b/src/main/java/org/apache/sling/api/servlets/SlingSafeMethodsServlet.java
index e8f8e38..e9ec129 100644
--- a/src/main/java/org/apache/sling/api/servlets/SlingSafeMethodsServlet.java
+++ b/src/main/java/org/apache/sling/api/servlets/SlingSafeMethodsServlet.java
@@ -1,21 +1,31 @@
/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
package org.apache.sling.api.servlets;
+import javax.servlet.GenericServlet;
+import javax.servlet.ServletException;
+import javax.servlet.ServletOutputStream;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.WriteListener;
+import javax.servlet.http.HttpServletResponse;
+
import java.io.IOException;
import java.io.OutputStreamWriter;
import java.io.PrintWriter;
@@ -26,18 +36,10 @@ import java.util.Enumeration;
import java.util.HashMap;
import java.util.Map;
-import org.jetbrains.annotations.NotNull;
-import javax.servlet.GenericServlet;
-import javax.servlet.ServletException;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.WriteListener;
-import javax.servlet.http.HttpServletResponse;
-
import org.apache.sling.api.SlingHttpServletRequest;
import org.apache.sling.api.SlingHttpServletResponse;
import org.apache.sling.api.wrappers.SlingHttpServletResponseWrapper;
+import org.jetbrains.annotations.NotNull;
/**
* Helper base class for read-only Servlets used in Sling. This base class is
@@ -93,9 +95,8 @@ public class SlingSafeMethodsServlet extends GenericServlet {
* {@link #doGet(SlingHttpServletRequest, SlingHttpServletResponse)}
* method called by this implementation.
*/
- protected void doHead(@NotNull SlingHttpServletRequest request,
- @NotNull SlingHttpServletResponse response) throws ServletException,
- IOException {
+ protected void doHead(@NotNull SlingHttpServletRequest request, @NotNull SlingHttpServletResponse response)
+ throws ServletException, IOException {
// the null-output wrapper
NoBodyResponse wrappedResponse = new NoBodyResponse(response);
@@ -124,9 +125,8 @@ public class SlingSafeMethodsServlet extends GenericServlet {
* @throws IOException If the error status cannot be reported back to the
* client.
*/
- protected void doGet(@NotNull SlingHttpServletRequest request,
- @NotNull SlingHttpServletResponse response) throws ServletException,
- IOException {
+ protected void doGet(@NotNull SlingHttpServletRequest request, @NotNull SlingHttpServletResponse response)
+ throws ServletException, IOException {
handleMethodNotImplemented(request, response);
}
@@ -148,9 +148,8 @@ public class SlingSafeMethodsServlet extends GenericServlet {
* @throws ServletException Not thrown by this implementation.
* @throws IOException Not thrown by this implementation.
*/
- protected void doOptions(@NotNull SlingHttpServletRequest request,
- @NotNull SlingHttpServletResponse response) throws ServletException,
- IOException {
+ protected void doOptions(@NotNull SlingHttpServletRequest request, @NotNull SlingHttpServletResponse response)
+ throws ServletException, IOException {
Map<String, Method> methods = getAllDeclaredMethods(getClass());
StringBuffer allowBuf = getAllowedRequestMethods(methods);
response.setHeader("Allow", allowBuf.toString());
@@ -170,9 +169,8 @@ public class SlingSafeMethodsServlet extends GenericServlet {
* @throws IOException May be thrown if there is an problem sending back the
* request headers in the response stream.
*/
- protected void doTrace(@NotNull SlingHttpServletRequest request,
- @NotNull SlingHttpServletResponse response) throws ServletException,
- IOException {
+ protected void doTrace(@NotNull SlingHttpServletRequest request, @NotNull SlingHttpServletResponse response)
+ throws ServletException, IOException {
String CRLF = "\r\n";
@@ -226,9 +224,8 @@ public class SlingSafeMethodsServlet extends GenericServlet {
* @throws IOException If the error status cannot be reported back to the
* client.
*/
- protected void doGeneric(@NotNull SlingHttpServletRequest request,
- @NotNull SlingHttpServletResponse response) throws ServletException,
- IOException {
+ protected void doGeneric(@NotNull SlingHttpServletRequest request, @NotNull SlingHttpServletResponse response)
+ throws ServletException, IOException {
handleMethodNotImplemented(request, response);
}
@@ -254,9 +251,8 @@ public class SlingSafeMethodsServlet extends GenericServlet {
* @throws ServletException Forwarded from any of the dispatched methods
* @throws IOException Forwarded from any of the dispatched methods
*/
- protected boolean mayService(@NotNull SlingHttpServletRequest request,
- @NotNull SlingHttpServletResponse response) throws ServletException,
- IOException {
+ protected boolean mayService(@NotNull SlingHttpServletRequest request, @NotNull SlingHttpServletResponse response)
+ throws ServletException, IOException {
// assume the method is known for now
boolean methodKnown = true;
@@ -290,8 +286,8 @@ public class SlingSafeMethodsServlet extends GenericServlet {
* @param response The HTTP response to which the error status is sent.
* @throws IOException Thrown if the status cannot be sent to the client.
*/
- protected void handleMethodNotImplemented(@NotNull SlingHttpServletRequest request,
- @NotNull SlingHttpServletResponse response) throws IOException {
+ protected void handleMethodNotImplemented(
+ @NotNull SlingHttpServletRequest request, @NotNull SlingHttpServletResponse response) throws IOException {
String protocol = request.getProtocol();
String msg = "Method " + request.getMethod() + " not supported";
@@ -304,7 +300,6 @@ public class SlingSafeMethodsServlet extends GenericServlet {
// otherwise use 400 Bad Request
response.sendError(HttpServletResponse.SC_BAD_REQUEST, msg);
-
}
}
@@ -336,9 +331,8 @@ public class SlingSafeMethodsServlet extends GenericServlet {
* {@link #doGeneric(SlingHttpServletRequest, SlingHttpServletResponse)}
* methods.
*/
- protected void service(@NotNull SlingHttpServletRequest request,
- @NotNull SlingHttpServletResponse response) throws ServletException,
- IOException {
+ protected void service(@NotNull SlingHttpServletRequest request, @NotNull SlingHttpServletResponse response)
+ throws ServletException, IOException {
// first try to handle the request by the known methods
boolean methodKnown = mayService(request, response);
@@ -370,16 +364,13 @@ public class SlingSafeMethodsServlet extends GenericServlet {
public void service(@NotNull ServletRequest req, @NotNull ServletResponse res)
throws ServletException, IOException {
- if ((req instanceof SlingHttpServletRequest)
- && (res instanceof SlingHttpServletResponse)) {
+ if ((req instanceof SlingHttpServletRequest) && (res instanceof SlingHttpServletResponse)) {
- service((SlingHttpServletRequest) req,
- (SlingHttpServletResponse) res);
+ service((SlingHttpServletRequest) req, (SlingHttpServletResponse) res);
} else {
throw new ServletException("Not a Sling HTTP request/response");
-
}
}
@@ -414,8 +405,7 @@ public class SlingSafeMethodsServlet extends GenericServlet {
* @return A <code>StringBuffer</code> containing the list of HTTP methods
* supported.
*/
- protected StringBuffer getAllowedRequestMethods(
- Map<String, Method> declaredMethods) {
+ protected StringBuffer getAllowedRequestMethods(Map<String, Method> declaredMethods) {
StringBuffer allowBuf = new StringBuffer();
// OPTIONS and TRACE are always supported by this servlet
@@ -423,14 +413,12 @@ public class SlingSafeMethodsServlet extends GenericServlet {
allowBuf.append(", ").append(HttpConstants.METHOD_TRACE);
// add more method names depending on the methods found
- if (declaredMethods.containsKey("doHead")
- && !declaredMethods.containsKey("doGet")) {
+ if (declaredMethods.containsKey("doHead") && !declaredMethods.containsKey("doGet")) {
allowBuf.append(", ").append(HttpConstants.METHOD_HEAD);
} else if (declaredMethods.containsKey("doGet")) {
allowBuf.append(", ").append(HttpConstants.METHOD_GET);
allowBuf.append(", ").append(HttpConstants.METHOD_HEAD);
-
}
return allowBuf;
@@ -450,8 +438,7 @@ public class SlingSafeMethodsServlet extends GenericServlet {
*/
private Map<String, Method> getAllDeclaredMethods(Class<?> c) {
// stop (and do not include) the AbstractSlingServletClass
- if (c == null
- || c.getName().equals(SlingSafeMethodsServlet.class.getName())) {
+ if (c == null || c.getName().equals(SlingSafeMethodsServlet.class.getName())) {
return new HashMap<String, Method>();
}
@@ -462,8 +449,7 @@ public class SlingSafeMethodsServlet extends GenericServlet {
Method[] declaredMethods = c.getDeclaredMethods();
for (Method method : declaredMethods) {
// only consider public and protected methods
- if (Modifier.isProtected(method.getModifiers())
- || Modifier.isPublic(method.getModifiers())) {
+ if (Modifier.isProtected(method.getModifiers()) || Modifier.isPublic(method.getModifiers())) {
methodSet.put(method.getName(), method);
}
}
@@ -578,5 +564,4 @@ public class SlingSafeMethodsServlet extends GenericServlet {
// nothing to do
}
}
-
}
diff --git a/src/main/java/org/apache/sling/api/servlets/package-info.java b/src/main/java/org/apache/sling/api/servlets/package-info.java
index 45fde49..5d5a400 100644
--- a/src/main/java/org/apache/sling/api/servlets/package-info.java
+++ b/src/main/java/org/apache/sling/api/servlets/package-info.java
@@ -21,4 +21,3 @@
package org.apache.sling.api.servlets;
import org.osgi.annotation.versioning.Version;
-
diff --git a/src/main/java/org/apache/sling/api/uri/SlingUri.java b/src/main/java/org/apache/sling/api/uri/SlingUri.java
index bfe8022..e74d302 100644
--- a/src/main/java/org/apache/sling/api/uri/SlingUri.java
+++ b/src/main/java/org/apache/sling/api/uri/SlingUri.java
@@ -37,7 +37,7 @@ import org.osgi.annotation.versioning.ProviderType;
* <p>
* Opposed to {@link URI}, the regular getters of {@code SlingUri} will not return decoded values, rather the values for user info, path,
* query and fragment are returned exactly as set before.
- *
+ *
* @since 1.0.0 (Sling API Bundle 2.23.0)
*/
@ProviderType
@@ -45,7 +45,7 @@ public interface SlingUri extends RequestPathInfo {
/**
* Returns the {@link URI}.
- *
+ *
* @return the URI
*/
@NotNull
@@ -53,7 +53,7 @@ public interface SlingUri extends RequestPathInfo {
/**
* Returns the URI as String.
- *
+ *
* @return the URI string
*/
@NotNull
@@ -61,7 +61,7 @@ public interface SlingUri extends RequestPathInfo {
/**
* Returns the scheme.
- *
+ *
* @return the scheme or null if not set
*/
@Nullable
@@ -69,7 +69,7 @@ public interface SlingUri extends RequestPathInfo {
/**
* Returns the user info.
- *
+ *
* @return the user info of the SlingUri or null if not set
*/
@Nullable
@@ -77,7 +77,7 @@ public interface SlingUri extends RequestPathInfo {
/**
* Returns the host.
- *
+ *
* @return returns the host of the SlingUri or null if not set
*/
@Nullable
@@ -85,14 +85,14 @@ public interface SlingUri extends RequestPathInfo {
/**
* Returns the port.
- *
+ *
* @return returns the port of the SlingUri or -1 if not set
*/
int getPort();
/**
* Returns the resource path.
- *
+ *
* @return returns the resource path or null if the URI does not contain a path.
*/
@Override
@@ -101,7 +101,7 @@ public interface SlingUri extends RequestPathInfo {
/**
* Returns the selector string.
- *
+ *
* @return returns the selector string or null if the URI does not contain selector(s) (in line with {@link RequestPathInfo})
*/
@Override
@@ -110,7 +110,7 @@ public interface SlingUri extends RequestPathInfo {
/**
* Returns the selectors array.
- *
+ *
* @return the selectors array (empty if the URI does not contain selector(s), never null)
*/
@Override
@@ -119,7 +119,7 @@ public interface SlingUri extends RequestPathInfo {
/**
* Returns the extension.
- *
+ *
* @return the extension or null if the URI does not contain an extension
*/
@Override
@@ -128,7 +128,7 @@ public interface SlingUri extends RequestPathInfo {
/**
* Returns the path parameters.
- *
+ *
* @return the path parameters or an empty Map if the URI does not contain any
*/
@NotNull
@@ -136,7 +136,7 @@ public interface SlingUri extends RequestPathInfo {
/**
* Returns the suffix part of the URI
- *
+ *
* @return the suffix string or null if the URI does not contain a suffix
*/
@Override
@@ -145,7 +145,7 @@ public interface SlingUri extends RequestPathInfo {
/**
* Returns the joint path of resource path, selectors, extension and suffix.
- *
+ *
* @return the path or null if no path is set
*/
@Nullable
@@ -153,7 +153,7 @@ public interface SlingUri extends RequestPathInfo {
/**
* Returns the query.
- *
+ *
* @return the query part of the URI or null if the URI does not contain a query
*/
@Nullable
@@ -161,7 +161,7 @@ public interface SlingUri extends RequestPathInfo {
/**
* Returns the fragment.
- *
+ *
* @return the fragment or null if the URI does not contain a fragment
*/
@Nullable
@@ -169,7 +169,7 @@ public interface SlingUri extends RequestPathInfo {
/**
* Returns the scheme-specific part of the URI, compare with Javadoc of {@link URI}.
- *
+ *
* @return scheme specific part of the URI
*/
@Nullable
@@ -182,7 +182,7 @@ public interface SlingUri extends RequestPathInfo {
* <li>the URI does not contain a suffix</li>
* <li>if the suffix resource could not be found</li>
* </ul>
- *
+ *
* @return the suffix resource if available or null
*/
@Override
@@ -191,42 +191,42 @@ public interface SlingUri extends RequestPathInfo {
/**
* Returns true the URI is either a relative or absolute path (this is the case if scheme and host is empty and the URI path is set)
- *
+ *
* @return returns true for path URIs
*/
boolean isPath();
/**
* Returns true if the URI has an absolute path starting with a slash ('/').
- *
+ *
* @return true if the URI is an absolute path
*/
boolean isAbsolutePath();
/**
* Returns true if the URI is a relative path (no scheme and path does not start with '/').
- *
+ *
* @return true if URI is a relative path
*/
boolean isRelativePath();
/**
* Returns true the URI is an absolute URI.
- *
+ *
* @return true if the URI is an absolute URI containing a scheme.
*/
boolean isAbsolute();
/**
* Returns true for opaque URIs like e.g. mailto:jon@example.com.
- *
+ *
* @return true if the URI is an opaque URI
*/
boolean isOpaque();
/**
* Shortcut to adjust Sling URIs, e.g. {@code slingUri = slingUri.adjust(b -> b.setExtension("html")); }.
- *
+ *
* @param builderConsumer the consumer (e.g. {@code b -> b.setExtension("html")})
* @return the adjusted SlingUri (new instance)
*/
@@ -236,5 +236,4 @@ public interface SlingUri extends RequestPathInfo {
builderConsumer.accept(builder);
return builder.build();
}
-
}
diff --git a/src/main/java/org/apache/sling/api/uri/SlingUriBuilder.java b/src/main/java/org/apache/sling/api/uri/SlingUriBuilder.java
index b342e4a..abea56f 100644
--- a/src/main/java/org/apache/sling/api/uri/SlingUriBuilder.java
+++ b/src/main/java/org/apache/sling/api/uri/SlingUriBuilder.java
@@ -83,7 +83,8 @@ public class SlingUriBuilder {
static final String CHAR_SLASH = "/";
static final String SELECTOR_DOT_REGEX = "\\.(?!\\.?/)"; // (?!\\.?/) to avoid matching ./ and ../
static final String PATH_PARAMETERS_REGEX = ";([a-zA-z0-9]+)=(?:\\'([^']*)\\'|([^/]+))";
- static final String BEST_EFFORT_INVALID_URI_MATCHER = "^(?:([^:#@]+):)?(?://(?:([^@#]+)@)?([^/#:]+)(?::([0-9]+))?)?(?:([^?#]+))?(?:\\?([^#]*))?(?:#(.*))?$";
+ static final String BEST_EFFORT_INVALID_URI_MATCHER =
+ "^(?:([^:#@]+):)?(?://(?:([^@#]+)@)?([^/#:]+)(?::([0-9]+))?)?(?:([^?#]+))?(?:\\?([^#]*))?(?:#(.*))?$";
/**
* Creates a builder without any URI parameters set.
@@ -103,8 +104,7 @@ public class SlingUriBuilder {
*/
@NotNull
public static SlingUriBuilder createFrom(@NotNull SlingUri slingUri) {
- return create()
- .setScheme(slingUri.getScheme())
+ return create().setScheme(slingUri.getScheme())
.setUserInfo(slingUri.getUserInfo())
.setHost(slingUri.getHost())
.setPort(slingUri.getPort())
@@ -116,9 +116,10 @@ public class SlingUriBuilder {
.setQuery(slingUri.getQuery())
.setFragment(slingUri.getFragment())
.setSchemeSpecificPart(slingUri.isOpaque() ? slingUri.getSchemeSpecificPart() : null)
- .setResourceResolver(slingUri instanceof ImmutableSlingUri
- ? ((ImmutableSlingUri) slingUri).getData().resourceResolver
- : null);
+ .setResourceResolver(
+ slingUri instanceof ImmutableSlingUri
+ ? ((ImmutableSlingUri) slingUri).getData().resourceResolver
+ : null);
}
/**
@@ -129,9 +130,7 @@ public class SlingUriBuilder {
*/
@NotNull
public static SlingUriBuilder createFrom(@NotNull Resource resource) {
- return create()
- .setResourcePath(resource.getPath())
- .setResourceResolver(resource.getResourceResolver());
+ return create().setResourcePath(resource.getPath()).setResourceResolver(resource.getResourceResolver());
}
/**
@@ -143,8 +142,7 @@ public class SlingUriBuilder {
@NotNull
public static SlingUriBuilder createFrom(@NotNull RequestPathInfo requestPathInfo) {
Resource suffixResource = requestPathInfo.getSuffixResource();
- return create()
- .setResourceResolver(suffixResource != null ? suffixResource.getResourceResolver() : null)
+ return create().setResourceResolver(suffixResource != null ? suffixResource.getResourceResolver() : null)
.setResourcePath(requestPathInfo.getResourcePath())
.setSelectors(requestPathInfo.getSelectors())
.setExtension(requestPathInfo.getExtension())
@@ -161,8 +159,7 @@ public class SlingUriBuilder {
@Deprecated
@NotNull
public static SlingUriBuilder createFrom(@NotNull org.apache.sling.api.SlingHttpServletRequest request) {
- @NotNull
- ResourceResolver resourceResolver = request.getResourceResolver();
+ @NotNull ResourceResolver resourceResolver = request.getResourceResolver();
@NotNull
SlingUriBuilder uriBuilder = createFrom(request.getRequestPathInfo())
.setResourceResolver(resourceResolver)
@@ -172,13 +169,11 @@ public class SlingUriBuilder {
.setQuery(request.getQueryString());
// SLING-11347 - check if the original request was using a mapped path
- @Nullable
- String resourcePath = uriBuilder.getResourcePath();
+ @Nullable String resourcePath = uriBuilder.getResourcePath();
if (resourcePath != null) {
- @NotNull
- String mappedResourcePath = resourceResolver.map(request, resourcePath);
- if (!resourcePath.equals(mappedResourcePath) &&
- request.getPathInfo().startsWith(mappedResourcePath)) {
+ @NotNull String mappedResourcePath = resourceResolver.map(request, resourcePath);
+ if (!resourcePath.equals(mappedResourcePath)
+ && request.getPathInfo().startsWith(mappedResourcePath)) {
// mapped path is different from the resource path and
// the request path was the mapped path, so switch to it
uriBuilder.setResourcePath(mappedResourcePath);
@@ -196,8 +191,7 @@ public class SlingUriBuilder {
*/
@NotNull
public static SlingUriBuilder createFrom(@NotNull SlingJakartaHttpServletRequest request) {
- @NotNull
- ResourceResolver resourceResolver = request.getResourceResolver();
+ @NotNull ResourceResolver resourceResolver = request.getResourceResolver();
@NotNull
SlingUriBuilder uriBuilder = createFrom(request.getRequestPathInfo())
.setResourceResolver(resourceResolver)
@@ -207,13 +201,11 @@ public class SlingUriBuilder {
.setQuery(request.getQueryString());
// SLING-11347 - check if the original request was using a mapped path
- @Nullable
- String resourcePath = uriBuilder.getResourcePath();
+ @Nullable String resourcePath = uriBuilder.getResourcePath();
if (resourcePath != null) {
- @NotNull
- String mappedResourcePath = resourceResolver.map(request, resourcePath);
- if (!resourcePath.equals(mappedResourcePath) &&
- request.getPathInfo().startsWith(mappedResourcePath)) {
+ @NotNull String mappedResourcePath = resourceResolver.map(request, resourcePath);
+ if (!resourcePath.equals(mappedResourcePath)
+ && request.getPathInfo().startsWith(mappedResourcePath)) {
// mapped path is different from the resource path and
// the request path was the mapped path, so switch to it
uriBuilder.setResourcePath(mappedResourcePath);
@@ -240,8 +232,7 @@ public class SlingUriBuilder {
if (FILE_SCHEME.equals(uri.getScheme()) && uriHost == null) {
uriHost = ""; // ensure three slashes in file URIs without host
}
- return create()
- .setResourceResolver(resourceResolver)
+ return create().setResourceResolver(resourceResolver)
.setScheme(uri.getScheme())
.setUserInfo(uri.getRawUserInfo())
.setHost(uriHost)
@@ -286,14 +277,12 @@ public class SlingUriBuilder {
String fragment = matcher.groupCount() >= 7 ? matcher.group(7) : null;
if (!isBlank(scheme) && isBlank(host)) {
// opaque case
- return create()
- .setResourceResolver(resourceResolver)
+ return create().setResourceResolver(resourceResolver)
.setScheme(scheme)
.setSchemeSpecificPart(path)
.setFragment(fragment);
} else if (!isBlank(host) || !isBlank(path)) {
- return create()
- .setResourceResolver(resourceResolver)
+ return create().setResourceResolver(resourceResolver)
.setScheme(scheme)
.setUserInfo(userInfo)
.setHost(host)
@@ -302,9 +291,7 @@ public class SlingUriBuilder {
.setQuery(query)
.setFragment(fragment);
} else {
- return create()
- .setResourceResolver(resourceResolver)
- .setSchemeSpecificPart(uriStr);
+ return create().setResourceResolver(resourceResolver).setSchemeSpecificPart(uriStr);
}
}
@@ -338,8 +325,7 @@ public class SlingUriBuilder {
// to ensure a builder is used only once (as the ImmutableSlingUri being created in build() is sharing its state)
private boolean isBuilt = false;
- private SlingUriBuilder() {
- }
+ private SlingUriBuilder() {}
/**
* Set the user info of the URI.
@@ -407,7 +393,8 @@ public class SlingUriBuilder {
if (path != null && path.startsWith(SlingUriBuilder.CHAR_SLASH) && resourceResolver != null) {
setResourcePath(path);
rebaseResourcePath();
- } else if (path != null && (dotMatcher = Pattern.compile(SELECTOR_DOT_REGEX).matcher(path)).find()) {
+ } else if (path != null
+ && (dotMatcher = Pattern.compile(SELECTOR_DOT_REGEX).matcher(path)).find()) {
int firstDotPosition = dotMatcher.start();
setPathWithDefinedResourcePosition(path, firstDotPosition);
} else {
@@ -494,7 +481,7 @@ public class SlingUriBuilder {
return this;
}
this.selectors.clear();
- if ( selectors != null ) {
+ if (selectors != null) {
Arrays.stream(selectors).forEach(this.selectors::add);
}
return this;
@@ -931,9 +918,7 @@ public class SlingUriBuilder {
* @return returns true for path URIs
*/
public boolean isPath() {
- return isBlank(scheme)
- && isBlank(host)
- && isNotBlank(resourcePath);
+ return isBlank(scheme) && isBlank(host) && isNotBlank(resourcePath);
}
/**
@@ -1016,7 +1001,10 @@ public class SlingUriBuilder {
if (pathBits.length > 1) {
setSelectors(Arrays.copyOfRange(pathBits, 0, pathBits.length - 1));
}
- setExtension(pathBits.length > 0 && pathBits[pathBits.length - 1].length() > 0 ? pathBits[pathBits.length - 1] : null);
+ setExtension(
+ pathBits.length > 0 && pathBits[pathBits.length - 1].length() > 0
+ ? pathBits[pathBits.length - 1]
+ : null);
setSuffix(firstSlashAfterFirstDotPosition > -1 ? path.substring(firstSlashAfterFirstDotPosition) : null);
}
@@ -1054,8 +1042,12 @@ public class SlingUriBuilder {
pathBuilder.append(resourcePath);
if (includePathParamters && !pathParameters.isEmpty()) {
for (Map.Entry<String, String> pathParameter : pathParameters.entrySet()) {
- pathBuilder.append(CHAR_SEMICOLON + pathParameter.getKey() + CHAR_EQUALS +
- CHAR_SINGLEQUOTE + pathParameter.getValue() + CHAR_SINGLEQUOTE);
+ pathBuilder.append(CHAR_SEMICOLON
+ + pathParameter.getKey()
+ + CHAR_EQUALS
+ + CHAR_SINGLEQUOTE
+ + pathParameter.getValue()
+ + CHAR_SINGLEQUOTE);
}
}
@@ -1078,7 +1070,6 @@ public class SlingUriBuilder {
return pathBuilder.toString();
}
-
// read-only view on the builder data (to avoid another copy of the data into a new object)
private class ImmutableSlingUri implements SlingUri {
@@ -1223,70 +1214,44 @@ public class SlingUriBuilder {
@Override
public boolean equals(Object obj) {
- if (this == obj)
- return true;
- if (obj == null)
- return false;
- if (getClass() != obj.getClass())
- return false;
+ if (this == obj) return true;
+ if (obj == null) return false;
+ if (getClass() != obj.getClass()) return false;
ImmutableSlingUri other = (ImmutableSlingUri) obj;
if (extension == null) {
- if (other.getData().extension != null)
- return false;
- } else if (!extension.equals(other.getData().extension))
- return false;
+ if (other.getData().extension != null) return false;
+ } else if (!extension.equals(other.getData().extension)) return false;
if (fragment == null) {
- if (other.getData().fragment != null)
- return false;
- } else if (!fragment.equals(other.getData().fragment))
- return false;
+ if (other.getData().fragment != null) return false;
+ } else if (!fragment.equals(other.getData().fragment)) return false;
if (host == null) {
- if (other.getData().host != null)
- return false;
- } else if (!host.equals(other.getData().host))
- return false;
+ if (other.getData().host != null) return false;
+ } else if (!host.equals(other.getData().host)) return false;
if (pathParameters == null) {
- if (other.getData().pathParameters != null)
- return false;
- } else if (!pathParameters.equals(other.getData().pathParameters))
- return false;
- if (port != other.getData().port)
- return false;
+ if (other.getData().pathParameters != null) return false;
+ } else if (!pathParameters.equals(other.getData().pathParameters)) return false;
+ if (port != other.getData().port) return false;
if (query == null) {
- if (other.getData().query != null)
- return false;
- } else if (!query.equals(other.getData().query))
- return false;
+ if (other.getData().query != null) return false;
+ } else if (!query.equals(other.getData().query)) return false;
if (resourcePath == null) {
- if (other.getData().resourcePath != null)
- return false;
- } else if (!resourcePath.equals(other.getData().resourcePath))
- return false;
+ if (other.getData().resourcePath != null) return false;
+ } else if (!resourcePath.equals(other.getData().resourcePath)) return false;
if (scheme == null) {
- if (other.getData().scheme != null)
- return false;
- } else if (!scheme.equals(other.getData().scheme))
- return false;
+ if (other.getData().scheme != null) return false;
+ } else if (!scheme.equals(other.getData().scheme)) return false;
if (schemeSpecificPart == null) {
- if (other.getData().schemeSpecificPart != null)
- return false;
- } else if (!schemeSpecificPart.equals(other.getData().schemeSpecificPart))
- return false;
+ if (other.getData().schemeSpecificPart != null) return false;
+ } else if (!schemeSpecificPart.equals(other.getData().schemeSpecificPart)) return false;
if (selectors == null) {
- if (other.getData().selectors != null)
- return false;
- } else if (!selectors.equals(other.getData().selectors))
- return false;
+ if (other.getData().selectors != null) return false;
+ } else if (!selectors.equals(other.getData().selectors)) return false;
if (suffix == null) {
- if (other.getData().suffix != null)
- return false;
- } else if (!suffix.equals(other.getData().suffix))
- return false;
+ if (other.getData().suffix != null) return false;
+ } else if (!suffix.equals(other.getData().suffix)) return false;
if (userInfo == null) {
- if (other.getData().userInfo != null)
- return false;
- } else if (!userInfo.equals(other.getData().userInfo))
- return false;
+ if (other.getData().userInfo != null) return false;
+ } else if (!userInfo.equals(other.getData().userInfo)) return false;
return true;
}
}
@@ -1354,5 +1319,4 @@ public class SlingUriBuilder {
throw new UnsupportedOperationException("remove");
}
}
-
}
diff --git a/src/main/java/org/apache/sling/api/uri/package-info.java b/src/main/java/org/apache/sling/api/uri/package-info.java
index 06d95ce..fd7de7f 100644
--- a/src/main/java/org/apache/sling/api/uri/package-info.java
+++ b/src/main/java/org/apache/sling/api/uri/package-info.java
@@ -20,4 +20,3 @@
package org.apache.sling.api.uri;
import org.osgi.annotation.versioning.Version;
-
diff --git a/src/main/java/org/apache/sling/api/wrappers/CompositeValueMap.java b/src/main/java/org/apache/sling/api/wrappers/CompositeValueMap.java
index 4f90022..561e809 100644
--- a/src/main/java/org/apache/sling/api/wrappers/CompositeValueMap.java
+++ b/src/main/java/org/apache/sling/api/wrappers/CompositeValueMap.java
@@ -36,7 +36,7 @@ import org.jetbrains.annotations.Nullable;
* In case you would like to avoid duplicating properties on multiple resources,
* you can use a <code>CompositeValueMap</code> to get a concatenated map of
* properties.
- *
+ *
* @since 2.3 (Sling API Bundle 2.5.0)
*
* @deprecated Use {@link ValueMapUtil#merge(ValueMap...)} instead. Note that it
@@ -102,9 +102,9 @@ public class CompositeValueMap implements ValueMap {
return null;
}
if (type.isAssignableFrom(value.getClass())) {
- return (T)value;
+ return (T) value;
}
- return ObjectConverter.convert(value,type);
+ return ObjectConverter.convert(value, type);
}
/**
@@ -116,7 +116,7 @@ public class CompositeValueMap implements ValueMap {
if (defaultValue == null) {
return (T) get(name);
}
- T value = (T)get(name, defaultValue.getClass());
+ T value = (T) get(name, defaultValue.getClass());
if (value == null) {
return defaultValue;
}
@@ -135,7 +135,7 @@ public class CompositeValueMap implements ValueMap {
* {@inheritDoc}
*/
public boolean isEmpty() {
- if ( defaults.size() > 0 || (merge && properties.size() > 0) ) {
+ if (defaults.size() > 0 || (merge && properties.size() > 0)) {
return false;
}
return size() == 0;
@@ -236,7 +236,7 @@ public class CompositeValueMap implements ValueMap {
// Add missing defaults
for (final Entry<String, Object> entry : defaults.entrySet()) {
- if ( ! entries.containsKey(entry.getKey()) ) {
+ if (!entries.containsKey(entry.getKey())) {
entries.put(entry.getKey(), entry.getValue());
}
}
diff --git a/src/main/java/org/apache/sling/api/wrappers/DeepReadModifiableValueMapDecorator.java b/src/main/java/org/apache/sling/api/wrappers/DeepReadModifiableValueMapDecorator.java
index 9c18d5a..5b07ea4 100644
--- a/src/main/java/org/apache/sling/api/wrappers/DeepReadModifiableValueMapDecorator.java
+++ b/src/main/java/org/apache/sling/api/wrappers/DeepReadModifiableValueMapDecorator.java
@@ -27,9 +27,7 @@ import org.apache.sling.api.resource.ValueMap;
* based on the resource tree and also supports {@link ModifiableValueMap}.
* @since 2.5 (Sling API Bundle 2.7.0)
*/
-public class DeepReadModifiableValueMapDecorator
- extends DeepReadValueMapDecorator
- implements ModifiableValueMap {
+public class DeepReadModifiableValueMapDecorator extends DeepReadValueMapDecorator implements ModifiableValueMap {
public DeepReadModifiableValueMapDecorator(final Resource resource, final ValueMap base) {
super(resource, base);
diff --git a/src/main/java/org/apache/sling/api/wrappers/DeepReadValueMapDecorator.java b/src/main/java/org/apache/sling/api/wrappers/DeepReadValueMapDecorator.java
index eff451f..51f73b5 100644
--- a/src/main/java/org/apache/sling/api/wrappers/DeepReadValueMapDecorator.java
+++ b/src/main/java/org/apache/sling/api/wrappers/DeepReadValueMapDecorator.java
@@ -45,13 +45,13 @@ public class DeepReadValueMapDecorator extends ValueMapDecorator {
private ValueMap getValueMap(final String name) {
final int pos = name.lastIndexOf("/");
- if ( pos == -1 ) {
+ if (pos == -1) {
return this.base;
}
final Resource rsrc = this.resolver.getResource(pathPrefix + name.substring(0, pos));
- if ( rsrc != null ) {
+ if (rsrc != null) {
final ValueMap vm = rsrc.adaptTo(ValueMap.class);
- if ( vm != null ) {
+ if (vm != null) {
return vm;
}
}
@@ -60,7 +60,7 @@ public class DeepReadValueMapDecorator extends ValueMapDecorator {
private String getPropertyName(final String name) {
final int pos = name.lastIndexOf("/");
- if ( pos == -1 ) {
+ if (pos == -1) {
return name;
}
return name.substring(pos + 1);
@@ -88,7 +88,7 @@ public class DeepReadValueMapDecorator extends ValueMapDecorator {
*/
@Override
public boolean containsKey(final Object key) {
- if ( key == null ) {
+ if (key == null) {
return false;
}
final String name = key.toString();
@@ -100,7 +100,7 @@ public class DeepReadValueMapDecorator extends ValueMapDecorator {
*/
@Override
public Object get(final Object key) {
- if ( key == null ) {
+ if (key == null) {
return null;
}
final String name = key.toString();
diff --git a/src/main/java/org/apache/sling/api/wrappers/IteratorWrapper.java b/src/main/java/org/apache/sling/api/wrappers/IteratorWrapper.java
index 820b086..fd9efbd 100644
--- a/src/main/java/org/apache/sling/api/wrappers/IteratorWrapper.java
+++ b/src/main/java/org/apache/sling/api/wrappers/IteratorWrapper.java
@@ -1,19 +1,21 @@
-/*******************************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.apache.sling.api.wrappers;
import java.util.Iterator;
diff --git a/src/main/java/org/apache/sling/api/wrappers/JakartaToJavaxFilterWrapper.java b/src/main/java/org/apache/sling/api/wrappers/JakartaToJavaxFilterWrapper.java
index 042845e..6587970 100644
--- a/src/main/java/org/apache/sling/api/wrappers/JakartaToJavaxFilterWrapper.java
+++ b/src/main/java/org/apache/sling/api/wrappers/JakartaToJavaxFilterWrapper.java
@@ -18,13 +18,6 @@
*/
package org.apache.sling.api.wrappers;
-import java.io.IOException;
-
-import org.apache.felix.http.jakartawrappers.FilterConfigWrapper;
-import org.apache.felix.http.javaxwrappers.ServletExceptionUtil;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
import javax.servlet.Filter;
import javax.servlet.FilterChain;
import javax.servlet.FilterConfig;
@@ -32,6 +25,13 @@ import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
+import java.io.IOException;
+
+import org.apache.felix.http.jakartawrappers.FilterConfigWrapper;
+import org.apache.felix.http.javaxwrappers.ServletExceptionUtil;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
/**
* This class wraps a filter based on the Jakarta Servlet API
* to implement Servlet API 3.
@@ -54,7 +54,7 @@ public class JakartaToJavaxFilterWrapper implements Filter {
private final jakarta.servlet.Filter filter;
public JakartaToJavaxFilterWrapper(final jakarta.servlet.Filter filter) {
- this.filter = filter;
+ this.filter = filter;
}
@Override
@@ -70,9 +70,10 @@ public class JakartaToJavaxFilterWrapper implements Filter {
public void doFilter(final ServletRequest request, final ServletResponse response, final FilterChain chain)
throws IOException, ServletException {
try {
- this.filter.doFilter(JavaxToJakartaRequestWrapper.toJakartaRequest(request),
- JavaxToJakartaResponseWrapper.toJakartaResponse(response),
- new FilterChainWrapper(chain));
+ this.filter.doFilter(
+ JavaxToJakartaRequestWrapper.toJakartaRequest(request),
+ JavaxToJakartaResponseWrapper.toJakartaResponse(response),
+ new FilterChainWrapper(chain));
} catch (final jakarta.servlet.ServletException e) {
throw ServletExceptionUtil.getServletException(e);
}
@@ -83,7 +84,7 @@ public class JakartaToJavaxFilterWrapper implements Filter {
this.filter.destroy();
}
- public static class FilterChainWrapper implements jakarta.servlet.FilterChain{
+ public static class FilterChainWrapper implements jakarta.servlet.FilterChain {
private final FilterChain filterChain;
@@ -92,14 +93,16 @@ public class JakartaToJavaxFilterWrapper implements Filter {
}
@Override
- public void doFilter(final jakarta.servlet.ServletRequest request, final jakarta.servlet.ServletResponse response)
+ public void doFilter(
+ final jakarta.servlet.ServletRequest request, final jakarta.servlet.ServletResponse response)
throws IOException, jakarta.servlet.ServletException {
try {
- this.filterChain.doFilter(JakartaToJavaxRequestWrapper.toJavaxRequest(request), JakartaToJavaxResponseWrapper.toJavaxResponse(response));
+ this.filterChain.doFilter(
+ JakartaToJavaxRequestWrapper.toJavaxRequest(request),
+ JakartaToJavaxResponseWrapper.toJavaxResponse(response));
} catch (final javax.servlet.ServletException e) {
throw org.apache.felix.http.jakartawrappers.ServletExceptionUtil.getServletException(e);
}
}
}
}
-
diff --git a/src/main/java/org/apache/sling/api/wrappers/JakartaToJavaxRequestWrapper.java b/src/main/java/org/apache/sling/api/wrappers/JakartaToJavaxRequestWrapper.java
index 2d6594a..65108c9 100644
--- a/src/main/java/org/apache/sling/api/wrappers/JakartaToJavaxRequestWrapper.java
+++ b/src/main/java/org/apache/sling/api/wrappers/JakartaToJavaxRequestWrapper.java
@@ -18,11 +18,16 @@
*/
package org.apache.sling.api.wrappers;
+import javax.servlet.RequestDispatcher;
+import javax.servlet.http.Cookie;
+
import java.util.Enumeration;
import java.util.List;
import java.util.Locale;
import java.util.ResourceBundle;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import org.apache.felix.http.javaxwrappers.CookieWrapper;
import org.apache.felix.http.javaxwrappers.HttpServletRequestWrapper;
import org.apache.felix.http.javaxwrappers.RequestDispatcherWrapper;
@@ -39,20 +44,12 @@ import org.apache.sling.api.resource.ResourceResolver;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
-import jakarta.servlet.ServletRequest;
-import jakarta.servlet.http.HttpServletRequest;
-
-import javax.servlet.RequestDispatcher;
-import javax.servlet.http.Cookie;
-
/**
* Wrapper for {@link SlingJakartaHttpServletRequest} to adapt it to the Javax Servlet API.
* @since 2.9.0
*/
@SuppressWarnings("deprecation")
-public class JakartaToJavaxRequestWrapper
- extends HttpServletRequestWrapper
- implements SlingHttpServletRequest {
+public class JakartaToJavaxRequestWrapper extends HttpServletRequestWrapper implements SlingHttpServletRequest {
/**
* Create a new wrapper
@@ -61,23 +58,23 @@ public class JakartaToJavaxRequestWrapper
*/
public static javax.servlet.ServletRequest toJavaxRequest(final ServletRequest request) {
if (request instanceof JavaxToJakartaRequestWrapper) {
- return ((JavaxToJakartaRequestWrapper)request).getRequest();
+ return ((JavaxToJakartaRequestWrapper) request).getRequest();
}
if (request instanceof SlingJakartaHttpServletRequest) {
- return new JakartaToJavaxRequestWrapper((SlingJakartaHttpServletRequest)request);
+ return new JakartaToJavaxRequestWrapper((SlingJakartaHttpServletRequest) request);
}
if (request instanceof HttpServletRequest) {
- return new HttpServletRequestWrapper((HttpServletRequest)request);
+ return new HttpServletRequestWrapper((HttpServletRequest) request);
}
return new ServletRequestWrapper(request);
}
public static javax.servlet.http.HttpServletRequest toJavaxRequest(final HttpServletRequest request) {
- return (javax.servlet.http.HttpServletRequest)toJavaxRequest((ServletRequest)request);
+ return (javax.servlet.http.HttpServletRequest) toJavaxRequest((ServletRequest) request);
}
public static SlingHttpServletRequest toJavaxRequest(final SlingJakartaHttpServletRequest request) {
- return (SlingHttpServletRequest)toJavaxRequest((ServletRequest)request);
+ return (SlingHttpServletRequest) toJavaxRequest((ServletRequest) request);
}
private final SlingJakartaHttpServletRequest wrappedRequest;
@@ -97,7 +94,8 @@ public class JakartaToJavaxRequestWrapper
}
@Override
- public @Nullable RequestDispatcher getRequestDispatcher(@NotNull final String path, final RequestDispatcherOptions options) {
+ public @Nullable RequestDispatcher getRequestDispatcher(
+ @NotNull final String path, final RequestDispatcherOptions options) {
final jakarta.servlet.RequestDispatcher dispatcher = this.wrappedRequest.getRequestDispatcher(path, options);
if (dispatcher != null) {
return new RequestDispatcherWrapper(dispatcher);
@@ -106,14 +104,15 @@ public class JakartaToJavaxRequestWrapper
}
@Override
- public @Nullable RequestDispatcher getRequestDispatcher(@NotNull final Resource resource,
- RequestDispatcherOptions options) {
- final jakarta.servlet.RequestDispatcher dispatcher = this.wrappedRequest.getRequestDispatcher(resource, options);
- if (dispatcher != null) {
- return new RequestDispatcherWrapper(dispatcher);
- }
- return null;
- }
+ public @Nullable RequestDispatcher getRequestDispatcher(
+ @NotNull final Resource resource, RequestDispatcherOptions options) {
+ final jakarta.servlet.RequestDispatcher dispatcher =
+ this.wrappedRequest.getRequestDispatcher(resource, options);
+ if (dispatcher != null) {
+ return new RequestDispatcherWrapper(dispatcher);
+ }
+ return null;
+ }
@Override
public @Nullable RequestDispatcher getRequestDispatcher(@NotNull final Resource resource) {
diff --git a/src/main/java/org/apache/sling/api/wrappers/JakartaToJavaxResponseWrapper.java b/src/main/java/org/apache/sling/api/wrappers/JakartaToJavaxResponseWrapper.java
index f18220f..c5303de 100644
--- a/src/main/java/org/apache/sling/api/wrappers/JakartaToJavaxResponseWrapper.java
+++ b/src/main/java/org/apache/sling/api/wrappers/JakartaToJavaxResponseWrapper.java
@@ -18,6 +18,8 @@
*/
package org.apache.sling.api.wrappers;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.felix.http.javaxwrappers.HttpServletResponseWrapper;
import org.apache.felix.http.javaxwrappers.ServletResponseWrapper;
import org.apache.sling.api.SlingHttpServletResponse;
@@ -25,17 +27,12 @@ import org.apache.sling.api.SlingJakartaHttpServletResponse;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
-import jakarta.servlet.ServletResponse;
-import jakarta.servlet.http.HttpServletResponse;
-
/**
* Wrapper for {@link SlingJakartaHttpServletResponse} to adapt it to the Jacax Servlet API.
* @since 2.9.0
*/
@SuppressWarnings("deprecation")
-public class JakartaToJavaxResponseWrapper
- extends HttpServletResponseWrapper
- implements SlingHttpServletResponse {
+public class JakartaToJavaxResponseWrapper extends HttpServletResponseWrapper implements SlingHttpServletResponse {
/**
* Create a new wrapper
@@ -44,23 +41,23 @@ public class JakartaToJavaxResponseWrapper
*/
public static javax.servlet.ServletResponse toJavaxResponse(final ServletResponse Response) {
if (Response instanceof JavaxToJakartaResponseWrapper) {
- return ((JavaxToJakartaResponseWrapper)Response).getResponse();
+ return ((JavaxToJakartaResponseWrapper) Response).getResponse();
}
if (Response instanceof SlingJakartaHttpServletResponse) {
- return new JakartaToJavaxResponseWrapper((SlingJakartaHttpServletResponse)Response);
+ return new JakartaToJavaxResponseWrapper((SlingJakartaHttpServletResponse) Response);
}
if (Response instanceof HttpServletResponse) {
- return new HttpServletResponseWrapper((HttpServletResponse)Response);
+ return new HttpServletResponseWrapper((HttpServletResponse) Response);
}
return new ServletResponseWrapper(Response);
}
public static javax.servlet.http.HttpServletResponse toJavaxResponse(final HttpServletResponse Response) {
- return (javax.servlet.http.HttpServletResponse)toJavaxResponse((ServletResponse)Response);
+ return (javax.servlet.http.HttpServletResponse) toJavaxResponse((ServletResponse) Response);
}
public static SlingHttpServletResponse toJavaxResponse(final SlingJakartaHttpServletResponse Response) {
- return (SlingHttpServletResponse)toJavaxResponse((ServletResponse)Response);
+ return (SlingHttpServletResponse) toJavaxResponse((ServletResponse) Response);
}
private final SlingJakartaHttpServletResponse wrappedResponse;
diff --git a/src/main/java/org/apache/sling/api/wrappers/JakartaToJavaxServletWrapper.java b/src/main/java/org/apache/sling/api/wrappers/JakartaToJavaxServletWrapper.java
index 93bde6a..7bb3c89 100644
--- a/src/main/java/org/apache/sling/api/wrappers/JakartaToJavaxServletWrapper.java
+++ b/src/main/java/org/apache/sling/api/wrappers/JakartaToJavaxServletWrapper.java
@@ -18,6 +18,12 @@
*/
package org.apache.sling.api.wrappers;
+import javax.servlet.Servlet;
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+
import java.io.IOException;
import org.apache.felix.http.jakartawrappers.ServletConfigWrapper;
@@ -28,12 +34,6 @@ import org.apache.sling.api.servlets.OptingServlet;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
-import javax.servlet.Servlet;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-
/**
* This class wraps a servlet based on the Jakarta Servlet API
* to implement Servlet API 3.
@@ -60,7 +60,7 @@ public class JakartaToJavaxServletWrapper implements Servlet {
private final jakarta.servlet.Servlet servlet;
public JakartaToJavaxServletWrapper(final jakarta.servlet.Servlet servlet) {
- this.servlet = servlet;
+ this.servlet = servlet;
}
@Override
@@ -75,7 +75,9 @@ public class JakartaToJavaxServletWrapper implements Servlet {
@Override
public void service(final ServletRequest req, final ServletResponse res) throws ServletException, IOException {
try {
- this.servlet.service(JavaxToJakartaRequestWrapper.toJakartaRequest(req), JavaxToJakartaResponseWrapper.toJakartaResponse(res));
+ this.servlet.service(
+ JavaxToJakartaRequestWrapper.toJakartaRequest(req),
+ JavaxToJakartaResponseWrapper.toJakartaResponse(res));
} catch (final jakarta.servlet.ServletException e) {
throw ServletExceptionUtil.getServletException(e);
}
@@ -99,7 +101,8 @@ public class JakartaToJavaxServletWrapper implements Servlet {
return servlet.getServletInfo();
}
- public static class JakartaToJavaxOptingServletWrapper extends JakartaToJavaxServletWrapper implements OptingServlet {
+ public static class JakartaToJavaxOptingServletWrapper extends JakartaToJavaxServletWrapper
+ implements OptingServlet {
private final JakartaOptingServlet servlet;
@@ -114,4 +117,3 @@ public class JakartaToJavaxServletWrapper implements Servlet {
}
}
}
-
diff --git a/src/main/java/org/apache/sling/api/wrappers/JavaxToJakartaFilterWrapper.java b/src/main/java/org/apache/sling/api/wrappers/JavaxToJakartaFilterWrapper.java
index 77f1160..3ada19e 100644
--- a/src/main/java/org/apache/sling/api/wrappers/JavaxToJakartaFilterWrapper.java
+++ b/src/main/java/org/apache/sling/api/wrappers/JavaxToJakartaFilterWrapper.java
@@ -20,17 +20,16 @@ package org.apache.sling.api.wrappers;
import java.io.IOException;
-import org.apache.felix.http.javaxwrappers.FilterConfigWrapper;
-import org.apache.felix.http.jakartawrappers.ServletExceptionUtil;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
import jakarta.servlet.Filter;
import jakarta.servlet.FilterChain;
import jakarta.servlet.FilterConfig;
import jakarta.servlet.ServletException;
import jakarta.servlet.ServletRequest;
import jakarta.servlet.ServletResponse;
+import org.apache.felix.http.jakartawrappers.ServletExceptionUtil;
+import org.apache.felix.http.javaxwrappers.FilterConfigWrapper;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
/**
* This class wraps a filter based on the Servlet API 3
@@ -54,7 +53,7 @@ public class JavaxToJakartaFilterWrapper implements Filter {
private final javax.servlet.Filter filter;
public JavaxToJakartaFilterWrapper(final javax.servlet.Filter filter) {
- this.filter = filter;
+ this.filter = filter;
}
@Override
@@ -70,9 +69,10 @@ public class JavaxToJakartaFilterWrapper implements Filter {
public void doFilter(final ServletRequest request, final ServletResponse response, final FilterChain chain)
throws IOException, ServletException {
try {
- this.filter.doFilter(JakartaToJavaxRequestWrapper.toJavaxRequest(request),
- JakartaToJavaxResponseWrapper.toJavaxResponse(response),
- new FilterChainWrapper(chain));
+ this.filter.doFilter(
+ JakartaToJavaxRequestWrapper.toJavaxRequest(request),
+ JakartaToJavaxResponseWrapper.toJavaxResponse(response),
+ new FilterChainWrapper(chain));
} catch (final javax.servlet.ServletException e) {
throw ServletExceptionUtil.getServletException(e);
}
@@ -83,7 +83,7 @@ public class JavaxToJakartaFilterWrapper implements Filter {
this.filter.destroy();
}
- public static class FilterChainWrapper implements javax.servlet.FilterChain{
+ public static class FilterChainWrapper implements javax.servlet.FilterChain {
private final FilterChain filterChain;
@@ -95,11 +95,12 @@ public class JavaxToJakartaFilterWrapper implements Filter {
public void doFilter(final javax.servlet.ServletRequest request, final javax.servlet.ServletResponse response)
throws IOException, javax.servlet.ServletException {
try {
- this.filterChain.doFilter(JavaxToJakartaRequestWrapper.toJakartaRequest(request), JavaxToJakartaResponseWrapper.toJakartaResponse(response));
+ this.filterChain.doFilter(
+ JavaxToJakartaRequestWrapper.toJakartaRequest(request),
+ JavaxToJakartaResponseWrapper.toJakartaResponse(response));
} catch (final jakarta.servlet.ServletException e) {
throw org.apache.felix.http.javaxwrappers.ServletExceptionUtil.getServletException(e);
}
}
}
}
-
diff --git a/src/main/java/org/apache/sling/api/wrappers/JavaxToJakartaRequestWrapper.java b/src/main/java/org/apache/sling/api/wrappers/JavaxToJakartaRequestWrapper.java
index 8b83561..0aca665 100644
--- a/src/main/java/org/apache/sling/api/wrappers/JavaxToJakartaRequestWrapper.java
+++ b/src/main/java/org/apache/sling/api/wrappers/JavaxToJakartaRequestWrapper.java
@@ -23,6 +23,10 @@ import java.util.List;
import java.util.Locale;
import java.util.ResourceBundle;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
import org.apache.felix.http.jakartawrappers.CookieWrapper;
import org.apache.felix.http.jakartawrappers.HttpServletRequestWrapper;
import org.apache.felix.http.jakartawrappers.RequestDispatcherWrapper;
@@ -39,19 +43,12 @@ import org.apache.sling.api.resource.ResourceResolver;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
-import jakarta.servlet.RequestDispatcher;
-import jakarta.servlet.ServletRequest;
-import jakarta.servlet.http.Cookie;
-import jakarta.servlet.http.HttpServletRequest;
-
/**
* Wrapper for {@link SlingHttpServletRequest} to adapt it to the Jakarta Servlet API.
* @since 2.9.0
*/
@SuppressWarnings("deprecation")
-public class JavaxToJakartaRequestWrapper
- extends HttpServletRequestWrapper
- implements SlingJakartaHttpServletRequest {
+public class JavaxToJakartaRequestWrapper extends HttpServletRequestWrapper implements SlingJakartaHttpServletRequest {
/**
* Create a new wrapper
@@ -60,23 +57,23 @@ public class JavaxToJakartaRequestWrapper
*/
public static ServletRequest toJakartaRequest(final javax.servlet.ServletRequest request) {
if (request instanceof JakartaToJavaxRequestWrapper) {
- return ((JakartaToJavaxRequestWrapper)request).getRequest();
+ return ((JakartaToJavaxRequestWrapper) request).getRequest();
}
if (request instanceof SlingHttpServletRequest) {
- return new JavaxToJakartaRequestWrapper((SlingHttpServletRequest)request);
+ return new JavaxToJakartaRequestWrapper((SlingHttpServletRequest) request);
}
if (request instanceof javax.servlet.http.HttpServletRequest) {
- return new HttpServletRequestWrapper((javax.servlet.http.HttpServletRequest)request);
+ return new HttpServletRequestWrapper((javax.servlet.http.HttpServletRequest) request);
}
return new ServletRequestWrapper(request);
}
public static HttpServletRequest toJakartaRequest(final javax.servlet.http.HttpServletRequest request) {
- return (HttpServletRequest)toJakartaRequest((javax.servlet.ServletRequest)request);
+ return (HttpServletRequest) toJakartaRequest((javax.servlet.ServletRequest) request);
}
public static SlingJakartaHttpServletRequest toJakartaRequest(final SlingHttpServletRequest request) {
- return (SlingJakartaHttpServletRequest)toJakartaRequest((javax.servlet.ServletRequest)request);
+ return (SlingJakartaHttpServletRequest) toJakartaRequest((javax.servlet.ServletRequest) request);
}
private final SlingHttpServletRequest wrappedRequest;
@@ -96,7 +93,8 @@ public class JavaxToJakartaRequestWrapper
}
@Override
- public @Nullable RequestDispatcher getRequestDispatcher(@NotNull final String path, final RequestDispatcherOptions options) {
+ public @Nullable RequestDispatcher getRequestDispatcher(
+ @NotNull final String path, final RequestDispatcherOptions options) {
final javax.servlet.RequestDispatcher dispatcher = this.wrappedRequest.getRequestDispatcher(path, options);
if (dispatcher != null) {
return new RequestDispatcherWrapper(dispatcher);
@@ -105,14 +103,14 @@ public class JavaxToJakartaRequestWrapper
}
@Override
- public @Nullable RequestDispatcher getRequestDispatcher(@NotNull final Resource resource,
- RequestDispatcherOptions options) {
- final javax.servlet.RequestDispatcher dispatcher = this.wrappedRequest.getRequestDispatcher(resource, options);
- if (dispatcher != null) {
- return new RequestDispatcherWrapper(dispatcher);
- }
- return null;
- }
+ public @Nullable RequestDispatcher getRequestDispatcher(
+ @NotNull final Resource resource, RequestDispatcherOptions options) {
+ final javax.servlet.RequestDispatcher dispatcher = this.wrappedRequest.getRequestDispatcher(resource, options);
+ if (dispatcher != null) {
+ return new RequestDispatcherWrapper(dispatcher);
+ }
+ return null;
+ }
@Override
public @Nullable RequestDispatcher getRequestDispatcher(@NotNull final Resource resource) {
diff --git a/src/main/java/org/apache/sling/api/wrappers/JavaxToJakartaResponseWrapper.java b/src/main/java/org/apache/sling/api/wrappers/JavaxToJakartaResponseWrapper.java
index cecae0e..242bc9e 100644
--- a/src/main/java/org/apache/sling/api/wrappers/JavaxToJakartaResponseWrapper.java
+++ b/src/main/java/org/apache/sling/api/wrappers/JavaxToJakartaResponseWrapper.java
@@ -18,6 +18,8 @@
*/
package org.apache.sling.api.wrappers;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.felix.http.jakartawrappers.HttpServletResponseWrapper;
import org.apache.felix.http.jakartawrappers.ServletResponseWrapper;
import org.apache.sling.api.SlingHttpServletResponse;
@@ -25,17 +27,13 @@ import org.apache.sling.api.SlingJakartaHttpServletResponse;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
-import jakarta.servlet.ServletResponse;
-import jakarta.servlet.http.HttpServletResponse;
-
/**
* Wrapper for {@link SlingHttpServletResponse} to adapt it to the Jacax Servlet API.
* @since 2.9.0
*/
@SuppressWarnings("deprecation")
-public class JavaxToJakartaResponseWrapper
- extends HttpServletResponseWrapper
- implements SlingJakartaHttpServletResponse {
+public class JavaxToJakartaResponseWrapper extends HttpServletResponseWrapper
+ implements SlingJakartaHttpServletResponse {
/**
* Create a new wrapper
@@ -44,23 +42,23 @@ public class JavaxToJakartaResponseWrapper
*/
public static ServletResponse toJakartaResponse(final javax.servlet.ServletResponse response) {
if (response instanceof JakartaToJavaxResponseWrapper) {
- return ((JakartaToJavaxResponseWrapper)response).getResponse();
+ return ((JakartaToJavaxResponseWrapper) response).getResponse();
}
if (response instanceof SlingHttpServletResponse) {
- return new JavaxToJakartaResponseWrapper((SlingHttpServletResponse)response);
+ return new JavaxToJakartaResponseWrapper((SlingHttpServletResponse) response);
}
if (response instanceof javax.servlet.http.HttpServletResponse) {
- return new HttpServletResponseWrapper((javax.servlet.http.HttpServletResponse)response);
+ return new HttpServletResponseWrapper((javax.servlet.http.HttpServletResponse) response);
}
return new ServletResponseWrapper(response);
}
public static HttpServletResponse toJakartaResponse(final javax.servlet.http.HttpServletResponse response) {
- return (HttpServletResponse)toJakartaResponse((javax.servlet.ServletResponse)response);
+ return (HttpServletResponse) toJakartaResponse((javax.servlet.ServletResponse) response);
}
public static SlingJakartaHttpServletResponse toJakartaResponse(final SlingHttpServletResponse response) {
- return (SlingJakartaHttpServletResponse)toJakartaResponse((javax.servlet.ServletResponse)response);
+ return (SlingJakartaHttpServletResponse) toJakartaResponse((javax.servlet.ServletResponse) response);
}
private final SlingHttpServletResponse wrappedResponse;
diff --git a/src/main/java/org/apache/sling/api/wrappers/JavaxToJakartaServletWrapper.java b/src/main/java/org/apache/sling/api/wrappers/JavaxToJakartaServletWrapper.java
index e535dca..2739aae 100644
--- a/src/main/java/org/apache/sling/api/wrappers/JavaxToJakartaServletWrapper.java
+++ b/src/main/java/org/apache/sling/api/wrappers/JavaxToJakartaServletWrapper.java
@@ -20,20 +20,19 @@ package org.apache.sling.api.wrappers;
import java.io.IOException;
-import org.apache.felix.http.javaxwrappers.ServletConfigWrapper;
+import jakarta.servlet.Servlet;
+import jakarta.servlet.ServletConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
import org.apache.felix.http.jakartawrappers.ServletExceptionUtil;
+import org.apache.felix.http.javaxwrappers.ServletConfigWrapper;
import org.apache.sling.api.SlingJakartaHttpServletRequest;
import org.apache.sling.api.servlets.JakartaOptingServlet;
import org.apache.sling.api.servlets.OptingServlet;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
-import jakarta.servlet.Servlet;
-import jakarta.servlet.ServletConfig;
-import jakarta.servlet.ServletException;
-import jakarta.servlet.ServletRequest;
-import jakarta.servlet.ServletResponse;
-
/**
* This class wraps a servlet based on the Servlet API 3
* to implement Jakarta Servlet API.
@@ -60,7 +59,7 @@ public class JavaxToJakartaServletWrapper implements Servlet {
private final javax.servlet.Servlet servlet;
public JavaxToJakartaServletWrapper(final javax.servlet.Servlet servlet) {
- this.servlet = servlet;
+ this.servlet = servlet;
}
@Override
@@ -75,7 +74,9 @@ public class JavaxToJakartaServletWrapper implements Servlet {
@Override
public void service(final ServletRequest req, final ServletResponse res) throws ServletException, IOException {
try {
- this.servlet.service(JakartaToJavaxRequestWrapper.toJavaxRequest(req), JakartaToJavaxResponseWrapper.toJavaxResponse(res));
+ this.servlet.service(
+ JakartaToJavaxRequestWrapper.toJavaxRequest(req),
+ JakartaToJavaxResponseWrapper.toJavaxResponse(res));
} catch (final javax.servlet.ServletException e) {
throw ServletExceptionUtil.getServletException(e);
}
@@ -99,7 +100,8 @@ public class JavaxToJakartaServletWrapper implements Servlet {
return servlet.getServletInfo();
}
- public static class JavaxToJakartaOptingServletWrapper extends JavaxToJakartaServletWrapper implements JakartaOptingServlet {
+ public static class JavaxToJakartaOptingServletWrapper extends JavaxToJakartaServletWrapper
+ implements JakartaOptingServlet {
private final OptingServlet servlet;
@@ -114,4 +116,3 @@ public class JavaxToJakartaServletWrapper implements Servlet {
}
}
}
-
diff --git a/src/main/java/org/apache/sling/api/wrappers/ModifiableValueMapDecorator.java b/src/main/java/org/apache/sling/api/wrappers/ModifiableValueMapDecorator.java
index d84be2c..bc04156 100644
--- a/src/main/java/org/apache/sling/api/wrappers/ModifiableValueMapDecorator.java
+++ b/src/main/java/org/apache/sling/api/wrappers/ModifiableValueMapDecorator.java
@@ -26,12 +26,10 @@ import org.apache.sling.api.resource.ModifiableValueMap;
* <code>ModifiableValueMapDecorator</code> decorates another {@link Map}
* to provide a basic implementation for the additional methods
* of a {@link ModifiableValueMap}.
- *
+ *
* @since 2.2 (Sling API Bundle 2.7.0)
*/
-public class ModifiableValueMapDecorator
-extends ValueMapDecorator
-implements ModifiableValueMap {
+public class ModifiableValueMapDecorator extends ValueMapDecorator implements ModifiableValueMap {
/**
* Creates a new wrapper around a given map.
@@ -40,4 +38,4 @@ implements ModifiableValueMap {
public ModifiableValueMapDecorator(final Map<String, Object> base) {
super(base);
}
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/apache/sling/api/wrappers/RequestPathInfoWrapper.java b/src/main/java/org/apache/sling/api/wrappers/RequestPathInfoWrapper.java
index b1d8d02..46a37e0 100644
--- a/src/main/java/org/apache/sling/api/wrappers/RequestPathInfoWrapper.java
+++ b/src/main/java/org/apache/sling/api/wrappers/RequestPathInfoWrapper.java
@@ -31,7 +31,7 @@ import org.jetbrains.annotations.Nullable;
public class RequestPathInfoWrapper implements RequestPathInfo {
private final @NotNull RequestPathInfo delegate;
-
+
public RequestPathInfoWrapper(@NotNull RequestPathInfo delegate) {
this.delegate = delegate;
}
diff --git a/src/main/java/org/apache/sling/api/wrappers/ResourceResolverWrapper.java b/src/main/java/org/apache/sling/api/wrappers/ResourceResolverWrapper.java
index a37adb2..49eec89 100644
--- a/src/main/java/org/apache/sling/api/wrappers/ResourceResolverWrapper.java
+++ b/src/main/java/org/apache/sling/api/wrappers/ResourceResolverWrapper.java
@@ -1,33 +1,34 @@
-/*******************************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.apache.sling.api.wrappers;
import java.util.Iterator;
import java.util.Map;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
import jakarta.servlet.http.HttpServletRequest;
-
import org.apache.sling.api.resource.LoginException;
import org.apache.sling.api.resource.PersistenceException;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.api.resource.ResourceWrapper;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.osgi.annotation.versioning.ConsumerType;
/**
@@ -215,7 +216,8 @@ public class ResourceResolverWrapper implements ResourceResolver {
return new Iterable<Resource>() {
@Override
public Iterator<Resource> iterator() {
- return new ResourceIteratorWrapper(resourceResolverWrapper, wrapped.getChildren(parent).iterator());
+ return new ResourceIteratorWrapper(
+ resourceResolverWrapper, wrapped.getChildren(parent).iterator());
}
};
}
@@ -305,14 +307,15 @@ public class ResourceResolverWrapper implements ResourceResolver {
*/
@NotNull
@Override
- public Resource create(@NotNull Resource parent, @NotNull String name, Map<String, Object> properties) throws PersistenceException {
+ public Resource create(@NotNull Resource parent, @NotNull String name, Map<String, Object> properties)
+ throws PersistenceException {
return ResourceResolverResourceWrapper.wrap(this, wrapped.create(parent, name, properties));
}
@Override
public boolean orderBefore(@NotNull Resource parent, @NotNull String name, @Nullable String followingSiblingName)
throws UnsupportedOperationException, PersistenceException, IllegalArgumentException {
- return wrapped.orderBefore(parent, name, followingSiblingName);
+ return wrapped.orderBefore(parent, name, followingSiblingName);
}
@Override
@@ -377,7 +380,7 @@ public class ResourceResolverWrapper implements ResourceResolver {
}
@Override
- public Map<String,Object> getPropertyMap() {
+ public Map<String, Object> getPropertyMap() {
return wrapped.getPropertyMap();
}
diff --git a/src/main/java/org/apache/sling/api/wrappers/SlingHttpServletRequestWrapper.java b/src/main/java/org/apache/sling/api/wrappers/SlingHttpServletRequestWrapper.java
index 201f215..c49da80 100644
--- a/src/main/java/org/apache/sling/api/wrappers/SlingHttpServletRequestWrapper.java
+++ b/src/main/java/org/apache/sling/api/wrappers/SlingHttpServletRequestWrapper.java
@@ -18,15 +18,15 @@
*/
package org.apache.sling.api.wrappers;
+import javax.servlet.RequestDispatcher;
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletRequestWrapper;
+
import java.util.Enumeration;
import java.util.List;
import java.util.Locale;
import java.util.ResourceBundle;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequestWrapper;
-
import org.apache.sling.api.SlingHttpServletRequest;
import org.apache.sling.api.request.RequestDispatcherOptions;
import org.apache.sling.api.request.RequestParameter;
@@ -43,8 +43,7 @@ import org.apache.sling.api.resource.ResourceResolver;
* @deprecated Use {@link SlingJakartaHttpServletRequestWrapper}
*/
@Deprecated
-public class SlingHttpServletRequestWrapper extends HttpServletRequestWrapper
- implements SlingHttpServletRequest {
+public class SlingHttpServletRequestWrapper extends HttpServletRequestWrapper implements SlingHttpServletRequest {
/**
* Create a wrapper for the supplied wrappedRequest
@@ -79,14 +78,12 @@ public class SlingHttpServletRequestWrapper extends HttpServletRequestWrapper
}
@Override
- public RequestDispatcher getRequestDispatcher(Resource resource,
- RequestDispatcherOptions options) {
+ public RequestDispatcher getRequestDispatcher(Resource resource, RequestDispatcherOptions options) {
return getSlingRequest().getRequestDispatcher(resource, options);
}
@Override
- public RequestDispatcher getRequestDispatcher(String path,
- RequestDispatcherOptions options) {
+ public RequestDispatcher getRequestDispatcher(String path, RequestDispatcherOptions options) {
return getSlingRequest().getRequestDispatcher(path, options);
}
diff --git a/src/main/java/org/apache/sling/api/wrappers/SlingHttpServletResponseWrapper.java b/src/main/java/org/apache/sling/api/wrappers/SlingHttpServletResponseWrapper.java
index df16f40..0419f4c 100644
--- a/src/main/java/org/apache/sling/api/wrappers/SlingHttpServletResponseWrapper.java
+++ b/src/main/java/org/apache/sling/api/wrappers/SlingHttpServletResponseWrapper.java
@@ -33,8 +33,7 @@ import org.apache.sling.api.SlingHttpServletResponse;
* @deprecated Use {@link SlingJakartaHttpServletResponseWrapper}
*/
@Deprecated
-public class SlingHttpServletResponseWrapper extends HttpServletResponseWrapper
- implements SlingHttpServletResponse {
+public class SlingHttpServletResponseWrapper extends HttpServletResponseWrapper implements SlingHttpServletResponse {
/**
* Create a wrapper for the supplied wrappedRequest
diff --git a/src/main/java/org/apache/sling/api/wrappers/SlingJakartaHttpServletRequestWrapper.java b/src/main/java/org/apache/sling/api/wrappers/SlingJakartaHttpServletRequestWrapper.java
index 5a56e26..f07ca6d 100644
--- a/src/main/java/org/apache/sling/api/wrappers/SlingJakartaHttpServletRequestWrapper.java
+++ b/src/main/java/org/apache/sling/api/wrappers/SlingJakartaHttpServletRequestWrapper.java
@@ -26,7 +26,6 @@ import java.util.ResourceBundle;
import jakarta.servlet.RequestDispatcher;
import jakarta.servlet.http.Cookie;
import jakarta.servlet.http.HttpServletRequestWrapper;
-
import org.apache.sling.api.SlingJakartaHttpServletRequest;
import org.apache.sling.api.request.RequestDispatcherOptions;
import org.apache.sling.api.request.RequestParameter;
@@ -78,14 +77,12 @@ public class SlingJakartaHttpServletRequestWrapper extends HttpServletRequestWra
}
@Override
- public RequestDispatcher getRequestDispatcher(Resource resource,
- RequestDispatcherOptions options) {
+ public RequestDispatcher getRequestDispatcher(Resource resource, RequestDispatcherOptions options) {
return getSlingRequest().getRequestDispatcher(resource, options);
}
@Override
- public RequestDispatcher getRequestDispatcher(String path,
- RequestDispatcherOptions options) {
+ public RequestDispatcher getRequestDispatcher(String path, RequestDispatcherOptions options) {
return getSlingRequest().getRequestDispatcher(path, options);
}
diff --git a/src/main/java/org/apache/sling/api/wrappers/SlingJakartaHttpServletResponseWrapper.java b/src/main/java/org/apache/sling/api/wrappers/SlingJakartaHttpServletResponseWrapper.java
index b943a13..7f89cea 100644
--- a/src/main/java/org/apache/sling/api/wrappers/SlingJakartaHttpServletResponseWrapper.java
+++ b/src/main/java/org/apache/sling/api/wrappers/SlingJakartaHttpServletResponseWrapper.java
@@ -19,7 +19,6 @@
package org.apache.sling.api.wrappers;
import jakarta.servlet.http.HttpServletResponseWrapper;
-
import org.apache.sling.api.SlingJakartaHttpServletResponse;
/**
diff --git a/src/main/java/org/apache/sling/api/wrappers/ValueMapDecorator.java b/src/main/java/org/apache/sling/api/wrappers/ValueMapDecorator.java
index bf24b3f..f4d28e4 100644
--- a/src/main/java/org/apache/sling/api/wrappers/ValueMapDecorator.java
+++ b/src/main/java/org/apache/sling/api/wrappers/ValueMapDecorator.java
@@ -54,14 +54,14 @@ public class ValueMapDecorator implements ValueMap {
public <T> T get(@NotNull String name, @NotNull Class<T> type) {
if (base instanceof ValueMap) {
// shortcut if decorated map is ValueMap
- return ((ValueMap)base).get(name, type);
+ return ((ValueMap) base).get(name, type);
}
Object value = get(name);
if (value == null) {
return null;
}
if (type.isAssignableFrom(value.getClass())) {
- return (T)value;
+ return (T) value;
}
return ObjectConverter.convert(value, type);
}
@@ -75,7 +75,7 @@ public class ValueMapDecorator implements ValueMap {
public <T> T get(@NotNull String name, @NotNull T defaultValue) {
if (base instanceof ValueMap) {
// shortcut if decorated map is ValueMap
- return ((ValueMap)base).get(name, defaultValue);
+ return ((ValueMap) base).get(name, defaultValue);
}
if (defaultValue == null) {
return (T) get(name);
@@ -203,6 +203,4 @@ public class ValueMapDecorator implements ValueMap {
public boolean equals(Object obj) {
return base.equals(obj);
}
-
-
}
diff --git a/src/main/java/org/apache/sling/api/wrappers/ValueMapUtil.java b/src/main/java/org/apache/sling/api/wrappers/ValueMapUtil.java
index a17513d..7e903ea 100644
--- a/src/main/java/org/apache/sling/api/wrappers/ValueMapUtil.java
+++ b/src/main/java/org/apache/sling/api/wrappers/ValueMapUtil.java
@@ -1,23 +1,23 @@
/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
package org.apache.sling.api.wrappers;
-import static java.util.Arrays.asList;
-
import java.util.List;
import org.apache.sling.api.resource.ValueMap;
@@ -25,6 +25,8 @@ import org.apache.sling.api.wrappers.impl.CachingValueMap;
import org.apache.sling.api.wrappers.impl.MergingValueMap;
import org.jetbrains.annotations.NotNull;
+import static java.util.Arrays.asList;
+
/**
* Factory methods to create {@code ValueMap}s.
* @since 2.7
@@ -96,6 +98,5 @@ public final class ValueMapUtil {
/**
* private constructor to hide implicit public one
*/
- private ValueMapUtil() {
- }
+ private ValueMapUtil() {}
}
diff --git a/src/main/java/org/apache/sling/api/wrappers/impl/CachingValueMap.java b/src/main/java/org/apache/sling/api/wrappers/impl/CachingValueMap.java
index 9a7ae0f..93deb94 100644
--- a/src/main/java/org/apache/sling/api/wrappers/impl/CachingValueMap.java
+++ b/src/main/java/org/apache/sling/api/wrappers/impl/CachingValueMap.java
@@ -18,16 +18,16 @@
*/
package org.apache.sling.api.wrappers.impl;
-import org.apache.sling.api.resource.ValueMap;
-import org.apache.sling.api.wrappers.ValueMapUtil;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
import java.util.Set;
+import org.apache.sling.api.resource.ValueMap;
+import org.apache.sling.api.wrappers.ValueMapUtil;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
/**
* ValueMap decorator that caches key-value pairs that were accessed before.
*
@@ -69,7 +69,7 @@ public class CachingValueMap implements ValueMap {
@Override
public Object get(Object key) {
- return key instanceof String ? cache.computeIfAbsent((String)key, delegate::get) : null;
+ return key instanceof String ? cache.computeIfAbsent((String) key, delegate::get) : null;
}
@NotNull
diff --git a/src/main/java/org/apache/sling/api/wrappers/impl/JcrRules.java b/src/main/java/org/apache/sling/api/wrappers/impl/JcrRules.java
index 4ce7405..a53498f 100644
--- a/src/main/java/org/apache/sling/api/wrappers/impl/JcrRules.java
+++ b/src/main/java/org/apache/sling/api/wrappers/impl/JcrRules.java
@@ -1,37 +1,37 @@
-/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- ~ Licensed to the Apache Software Foundation (ASF) under one
- ~ or more contributor license agreements. See the NOTICE file
- ~ distributed with this work for additional information
- ~ regarding copyright ownership. The ASF licenses this file
- ~ to you under the Apache License, Version 2.0 (the
- ~ "License"); you may not use this file except in compliance
- ~ with the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing,
- ~ software distributed under the License is distributed on an
- ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- ~ KIND, either express or implied. See the License for the
- ~ specific language governing permissions and limitations
- ~ under the License.
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.apache.sling.api.wrappers.impl;
+import javax.jcr.Binary;
+import javax.jcr.Value;
+
import java.io.InputStream;
import java.math.BigDecimal;
import java.util.Calendar;
-import javax.jcr.Binary;
-import javax.jcr.Value;
-
import org.osgi.util.converter.ConverterBuilder;
import org.osgi.util.converter.ConverterFunction;
import org.osgi.util.converter.TypeRule;
public final class JcrRules {
- private JcrRules(){}
+ private JcrRules() {}
static void addJcrRules(ConverterBuilder converterBuilder) {
converterBuilder.rule(new TypeRule<Value, String>(Value.class, String.class, value -> {
@@ -91,5 +91,4 @@ public final class JcrRules {
}
}));
}
-
}
diff --git a/src/main/java/org/apache/sling/api/wrappers/impl/MergingValueMap.java b/src/main/java/org/apache/sling/api/wrappers/impl/MergingValueMap.java
index f21ab62..0954faf 100644
--- a/src/main/java/org/apache/sling/api/wrappers/impl/MergingValueMap.java
+++ b/src/main/java/org/apache/sling/api/wrappers/impl/MergingValueMap.java
@@ -136,10 +136,7 @@ public class MergingValueMap implements ValueMap {
@NotNull
private Stream<String> keyStream() {
- return valueMaps.stream()
- .map(Map::keySet)
- .flatMap(Collection::stream)
- .distinct();
+ return valueMaps.stream().map(Map::keySet).flatMap(Collection::stream).distinct();
}
@NotNull
diff --git a/src/main/java/org/apache/sling/api/wrappers/impl/ObjectConverter.java b/src/main/java/org/apache/sling/api/wrappers/impl/ObjectConverter.java
index 5e17a24..6c6e31e 100644
--- a/src/main/java/org/apache/sling/api/wrappers/impl/ObjectConverter.java
+++ b/src/main/java/org/apache/sling/api/wrappers/impl/ObjectConverter.java
@@ -41,19 +41,17 @@ public final class ObjectConverter {
static {
ConverterBuilder converterBuilder = Converters.newConverterBuilder()
- .rule(new TypeRule<String, Calendar>(String.class, Calendar.class,
- ObjectConverter::toCalendar))
- .rule(new TypeRule<Date, Calendar>(Date.class, Calendar.class,
- ObjectConverter::toCalendar))
+ .rule(new TypeRule<String, Calendar>(String.class, Calendar.class, ObjectConverter::toCalendar))
+ .rule(new TypeRule<Date, Calendar>(Date.class, Calendar.class, ObjectConverter::toCalendar))
.rule(new TypeRule<String, Date>(String.class, Date.class, ObjectConverter::toDate))
- .rule(new TypeRule<Calendar, String>(Calendar.class, String.class,
- ObjectConverter::toString))
+ .rule(new TypeRule<Calendar, String>(Calendar.class, String.class, ObjectConverter::toString))
.rule(new TypeRule<Date, String>(Date.class, String.class, ObjectConverter::toString))
- .rule(new TypeRule<Calendar, Date>(Calendar.class, Date.class,
- ObjectConverter::toDate))
+ .rule(new TypeRule<Calendar, Date>(Calendar.class, Date.class, ObjectConverter::toDate))
.rule(new TypeRule<>(Calendar.class, ZonedDateTime.class, ObjectConverter::toZonedDateTime))
- .rule(new TypeRule<ZonedDateTime, Calendar>(ZonedDateTime.class, Calendar.class, ObjectConverter::toCalendar))
- .rule(new TypeRule<ZonedDateTime, String>(ZonedDateTime.class, String.class, ObjectConverter::toString));
+ .rule(new TypeRule<ZonedDateTime, Calendar>(
+ ZonedDateTime.class, Calendar.class, ObjectConverter::toCalendar))
+ .rule(new TypeRule<ZonedDateTime, String>(
+ ZonedDateTime.class, String.class, ObjectConverter::toString));
try {
JcrRules.addJcrRules(converterBuilder);
} catch (NoClassDefFoundError e) {
@@ -76,11 +74,15 @@ public final class ObjectConverter {
}
private static ZonedDateTime toZonedDateTime(Calendar calendar) {
- return ZonedDateTime.ofInstant(calendar.toInstant(), calendar.getTimeZone().toZoneId().normalized());
+ return ZonedDateTime.ofInstant(
+ calendar.toInstant(), calendar.getTimeZone().toZoneId().normalized());
}
private static String toString(Calendar cal) {
- return ZonedDateTime.ofInstant(Instant.ofEpochMilli(cal.getTimeInMillis()), cal.getTimeZone().toZoneId()).format(DateTimeFormatter.ISO_OFFSET_DATE_TIME);
+ return ZonedDateTime.ofInstant(
+ Instant.ofEpochMilli(cal.getTimeInMillis()),
+ cal.getTimeZone().toZoneId())
+ .format(DateTimeFormatter.ISO_OFFSET_DATE_TIME);
}
private static String toString(Date cal) {
@@ -108,7 +110,7 @@ public final class ObjectConverter {
/**
* Converts the object to the given type.
- *
+ *
* @param obj
* object
* @param type
@@ -127,5 +129,4 @@ public final class ObjectConverter {
return null;
}
}
-
}
diff --git a/src/main/java/org/apache/sling/spi/resource/provider/ObservationReporter.java b/src/main/java/org/apache/sling/spi/resource/provider/ObservationReporter.java
index 6a05f7f..0c149bc 100644
--- a/src/main/java/org/apache/sling/spi/resource/provider/ObservationReporter.java
+++ b/src/main/java/org/apache/sling/spi/resource/provider/ObservationReporter.java
@@ -20,9 +20,8 @@ package org.apache.sling.spi.resource.provider;
import java.util.List;
-import org.jetbrains.annotations.NotNull;
-
import org.apache.sling.api.resource.observation.ResourceChange;
+import org.jetbrains.annotations.NotNull;
import org.osgi.annotation.versioning.ProviderType;
/**
@@ -40,7 +39,8 @@ public interface ObservationReporter {
* reporter is bound to.
* @return A list of observer configurations, the list might be empty.
*/
- @NotNull List<ObserverConfiguration> getObserverConfigurations();
+ @NotNull
+ List<ObserverConfiguration> getObserverConfigurations();
/**
* A resource provider can inform about a list of changes.
@@ -81,7 +81,6 @@ public interface ObservationReporter {
* @param distribute Whether the changes should be distributed to other instances.
* @since 1.1.0 (Sling API Bundle 2.15.0)
*/
- void reportChanges(@NotNull ObserverConfiguration config,
- @NotNull Iterable<ResourceChange> changes,
- boolean distribute);
+ void reportChanges(
+ @NotNull ObserverConfiguration config, @NotNull Iterable<ResourceChange> changes, boolean distribute);
}
diff --git a/src/main/java/org/apache/sling/spi/resource/provider/ObserverConfiguration.java b/src/main/java/org/apache/sling/spi/resource/provider/ObserverConfiguration.java
index 0c3f00e..5e05810 100644
--- a/src/main/java/org/apache/sling/spi/resource/provider/ObserverConfiguration.java
+++ b/src/main/java/org/apache/sling/spi/resource/provider/ObserverConfiguration.java
@@ -20,10 +20,9 @@ package org.apache.sling.spi.resource.provider;
import java.util.Set;
-import org.jetbrains.annotations.NotNull;
-
import org.apache.sling.api.resource.observation.ResourceChange;
import org.apache.sling.api.resource.path.PathSet;
+import org.jetbrains.annotations.NotNull;
import org.osgi.annotation.versioning.ProviderType;
/**
@@ -55,20 +54,23 @@ public interface ObserverConfiguration {
* The set of paths this listener is interested in. Each entry is absolute.
* @return Non empty set of paths
*/
- @NotNull PathSet getPaths();
+ @NotNull
+ PathSet getPaths();
/**
* The set of excluded paths.
* All the paths are sub paths from one entry of {@link #getPaths()}
* @return A set of excluded paths, might be empty.
*/
- @NotNull PathSet getExcludedPaths();
+ @NotNull
+ PathSet getExcludedPaths();
/**
* The set of types listeners are interested in.
* @return Non empty set of types
*/
- @NotNull Set<ResourceChange.ChangeType> getChangeTypes();
+ @NotNull
+ Set<ResourceChange.ChangeType> getChangeTypes();
/**
* Set containing the set of property names which
@@ -77,7 +79,8 @@ public interface ObserverConfiguration {
* underlying might ignore this.
* @return Set containing the set of property names or {@code null}
*/
- @NotNull Set<String> getPropertyNamesHint();
+ @NotNull
+ Set<String> getPropertyNamesHint();
/**
* Checks whether a path matches one of the paths of this configuration
diff --git a/src/main/java/org/apache/sling/spi/resource/provider/ProviderContext.java b/src/main/java/org/apache/sling/spi/resource/provider/ProviderContext.java
index d5abb0d..0bfa4c4 100644
--- a/src/main/java/org/apache/sling/spi/resource/provider/ProviderContext.java
+++ b/src/main/java/org/apache/sling/spi/resource/provider/ProviderContext.java
@@ -18,9 +18,8 @@
*/
package org.apache.sling.spi.resource.provider;
-import org.jetbrains.annotations.NotNull;
-
import org.apache.sling.api.resource.path.PathSet;
+import org.jetbrains.annotations.NotNull;
import org.osgi.annotation.versioning.ProviderType;
/**
@@ -35,7 +34,7 @@ public interface ProviderContext {
long OBSERVATION_LISTENER_CHANGED = 1;
/** This bit is set in {@link ResourceProvider#update(long)} if exclude paths changed. */
- long EXCLUDED_PATHS_CHANGED = 2;
+ long EXCLUDED_PATHS_CHANGED = 2;
/**
* Get the observation reporter for this instance.
@@ -47,7 +46,8 @@ public interface ProviderContext {
*
* @return The observation reporter.
*/
- @NotNull ObservationReporter getObservationReporter();
+ @NotNull
+ ObservationReporter getObservationReporter();
/**
* Set of paths which are "hidden" by other resource providers.
diff --git a/src/main/java/org/apache/sling/spi/resource/provider/QueryLanguageProvider.java b/src/main/java/org/apache/sling/spi/resource/provider/QueryLanguageProvider.java
index 7ba48fb..bd2c5be 100644
--- a/src/main/java/org/apache/sling/spi/resource/provider/QueryLanguageProvider.java
+++ b/src/main/java/org/apache/sling/spi/resource/provider/QueryLanguageProvider.java
@@ -20,13 +20,11 @@ package org.apache.sling.spi.resource.provider;
import java.util.Iterator;
-import org.jetbrains.annotations.NotNull;
-
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ValueMap;
+import org.jetbrains.annotations.NotNull;
import org.osgi.annotation.versioning.ConsumerType;
-
/**
* The JCR query provider supports querying based on the JCR spec.
* Calls from {@link org.apache.sling.api.resource.ResourceResolver#findResources(String, String)} and
diff --git a/src/main/java/org/apache/sling/spi/resource/provider/ResolveContext.java b/src/main/java/org/apache/sling/spi/resource/provider/ResolveContext.java
index 6837600..90b9379 100644
--- a/src/main/java/org/apache/sling/spi/resource/provider/ResolveContext.java
+++ b/src/main/java/org/apache/sling/spi/resource/provider/ResolveContext.java
@@ -18,10 +18,9 @@
*/
package org.apache.sling.spi.resource.provider;
-import org.jetbrains.annotations.Nullable;
-import org.jetbrains.annotations.NotNull;
-
import org.apache.sling.api.resource.ResourceResolver;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.osgi.annotation.versioning.ProviderType;
/**
@@ -40,20 +39,23 @@ public interface ResolveContext<T> {
* Get the current resource resolver.
* @return The resource resolver.
*/
- @NotNull ResourceResolver getResourceResolver();
+ @NotNull
+ ResourceResolver getResourceResolver();
/**
* This is the object returned by {@link ResourceProvider#authenticate(Map)}
* @return The data object or {@code null}
*/
- @Nullable T getProviderState();
+ @Nullable
+ T getProviderState();
/**
* Return a resolve context for the parent resource provider.
* @return A resolve context or {@code null} if there is no parent.
* @see #getParentResourceProvider()
*/
- @Nullable ResolveContext<?> getParentResolveContext();
+ @Nullable
+ ResolveContext<?> getParentResolveContext();
/**
* Return the parent resource provider.
@@ -62,5 +64,6 @@ public interface ResolveContext<T> {
* instance.
* @return The parent provider or {@code null} if there is no parent.
*/
- @Nullable ResourceProvider<?> getParentResourceProvider();
+ @Nullable
+ ResourceProvider<?> getParentResourceProvider();
}
diff --git a/src/main/java/org/apache/sling/spi/resource/provider/ResourceContext.java b/src/main/java/org/apache/sling/spi/resource/provider/ResourceContext.java
index 15c925f..573e1c5 100644
--- a/src/main/java/org/apache/sling/spi/resource/provider/ResourceContext.java
+++ b/src/main/java/org/apache/sling/spi/resource/provider/ResourceContext.java
@@ -21,7 +21,6 @@ package org.apache.sling.spi.resource.provider;
import java.util.Map;
import org.jetbrains.annotations.Nullable;
-
import org.osgi.annotation.versioning.ProviderType;
/**
@@ -38,7 +37,8 @@ public interface ResourceContext {
* map could contain the path parameters of the url.
* @return A non empty map with parameters or {@code null}.
*/
- @Nullable Map<String, String> getResolveParameters();
+ @Nullable
+ Map<String, String> getResolveParameters();
/**
* "Empty" instance, not providing any additional information.
diff --git a/src/main/java/org/apache/sling/spi/resource/provider/ResourceProvider.java b/src/main/java/org/apache/sling/spi/resource/provider/ResourceProvider.java
index 0a2662f..0bf19df 100644
--- a/src/main/java/org/apache/sling/spi/resource/provider/ResourceProvider.java
+++ b/src/main/java/org/apache/sling/spi/resource/provider/ResourceProvider.java
@@ -22,13 +22,12 @@ import java.util.Collection;
import java.util.Iterator;
import java.util.Map;
-import org.jetbrains.annotations.Nullable;
-import org.jetbrains.annotations.NotNull;
-
import org.apache.sling.api.resource.LoginException;
import org.apache.sling.api.resource.PersistenceException;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceUtil;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.osgi.annotation.versioning.ConsumerType;
/**
@@ -229,7 +228,7 @@ public abstract class ResourceProvider<T> {
*/
public static final String RESOURCE_TYPE_SYNTHETIC = "sling:syntheticResourceProviderResource";
- /**
+ /**
* Mode for the resource provide
* The value is either {@link #MODE_OVERLAY} (default) or {@link #MODE_PASSTHROUGH}.
* The overlay mode is the default. With this mode a resource provider is completely overlaying a
@@ -243,14 +242,14 @@ public abstract class ResourceProvider<T> {
*/
public static final String PROPERTY_MODE = "provider.mode";
- /**
+ /**
* Default mode.
* The resource provider overlays everything from the parent provider.
* @since 1.4
*/
public static final String MODE_OVERLAY = "overlay";
- /**
+ /**
* Passthrough mode.
* The implementation passes certain functionality through to the parent resource provider.
* @since 1.4
@@ -349,8 +348,7 @@ public abstract class ResourceProvider<T> {
* href="http://sling.apache.org/documentation/the-sling-engine/service-authentication.html">Service
* Authentication</a>
*/
- public @Nullable T authenticate(final @NotNull Map<String, Object> authenticationInfo)
- throws LoginException {
+ public @Nullable T authenticate(final @NotNull Map<String, Object> authenticationInfo) throws LoginException {
return null;
}
@@ -442,7 +440,8 @@ public abstract class ResourceProvider<T> {
* @throws org.apache.sling.api.SlingException
* may be thrown in case of any problem creating the {@code Resource} instance.
*/
- public abstract @Nullable Resource getResource(@NotNull final ResolveContext<T> ctx,
+ public abstract @Nullable Resource getResource(
+ @NotNull final ResolveContext<T> ctx,
@NotNull final String path,
@NotNull final ResourceContext resourceContext,
@Nullable final Resource parent);
@@ -477,7 +476,8 @@ public abstract class ResourceProvider<T> {
* @throws org.apache.sling.api.SlingException
* If any error occurs acquiring the child resource iterator.
*/
- public abstract @Nullable Iterator<Resource> listChildren(final @NotNull ResolveContext<T> ctx, final @NotNull Resource parent);
+ public abstract @Nullable Iterator<Resource> listChildren(
+ final @NotNull ResolveContext<T> ctx, final @NotNull Resource parent);
/**
* Returns a collection of attribute names whose value can be retrieved
@@ -532,16 +532,17 @@ public abstract class ResourceProvider<T> {
*
* @throws PersistenceException If anything fails
*/
- public @NotNull Resource create(final @NotNull ResolveContext<T> ctx, final String path, final Map<String, Object> properties)
- throws PersistenceException {
+ public @NotNull Resource create(
+ final @NotNull ResolveContext<T> ctx, final String path, final Map<String, Object> properties)
+ throws PersistenceException {
throw new UnsupportedOperationException("create is not supported.");
}
/**
* Orders the child resources returned by {@link #listChildren(ResolveContext, Resource)} so that a given resource is listed before the given sibling resource.
- *
+ *
* The changes are transient until {@link #commit(ResolveContext)} is called..
- *
+ *
* @param ctx The {@link ResolveContext}.
* @param parent the parent resource containing the child resources to order.
* @param name the name of the child resource in {@code parent} to order. Must be an existing child name.
@@ -553,7 +554,11 @@ public abstract class ResourceProvider<T> {
* @since 1.3.0 (Sling API Bundle 2.24.0)
* @see #listChildren(ResolveContext, Resource)
*/
- public boolean orderBefore(final @NotNull ResolveContext<T> ctx, final @NotNull Resource parent, final @NotNull String name, final @Nullable String followingSiblingName)
+ public boolean orderBefore(
+ final @NotNull ResolveContext<T> ctx,
+ final @NotNull Resource parent,
+ final @NotNull String name,
+ final @Nullable String followingSiblingName)
throws PersistenceException {
throw new UnsupportedOperationException("orderBefore is not supported.");
}
@@ -572,7 +577,7 @@ public abstract class ResourceProvider<T> {
* @throws PersistenceException If anything fails
*/
public void delete(final @NotNull ResolveContext<T> ctx, final @NotNull Resource resource)
- throws PersistenceException {
+ throws PersistenceException {
throw new UnsupportedOperationException("delete is not supported.");
}
@@ -597,8 +602,7 @@ public abstract class ResourceProvider<T> {
* @param ctx The {@link ResolveContext}.
* @throws PersistenceException If anything fails
*/
- public void commit(final @NotNull ResolveContext<T> ctx)
- throws PersistenceException {
+ public void commit(final @NotNull ResolveContext<T> ctx) throws PersistenceException {
// nothing to do here
}
@@ -649,8 +653,8 @@ public abstract class ResourceProvider<T> {
* @return The adapter target or {@code null} if the provider cannot
* be adapt to the requested type.
*/
- public @Nullable <AdapterType> AdapterType adaptTo(final @NotNull ResolveContext<T> ctx,
- final @NotNull Class<AdapterType> type) {
+ public @Nullable <AdapterType> AdapterType adaptTo(
+ final @NotNull ResolveContext<T> ctx, final @NotNull Class<AdapterType> type) {
return null;
}
@@ -676,9 +680,9 @@ public abstract class ResourceProvider<T> {
* @throws PersistenceException If an error occurs.
* @return {@code true} if the provider can perform the copy
*/
- public boolean copy(final @NotNull ResolveContext<T> ctx,
- final @NotNull String srcAbsPath,
- final @NotNull String destAbsPath) throws PersistenceException {
+ public boolean copy(
+ final @NotNull ResolveContext<T> ctx, final @NotNull String srcAbsPath, final @NotNull String destAbsPath)
+ throws PersistenceException {
return false;
}
@@ -704,9 +708,9 @@ public abstract class ResourceProvider<T> {
* @throws PersistenceException If an error occurs.
* @return {@code true} if the provider can perform the move
*/
- public boolean move(final @NotNull ResolveContext<T> ctx,
- final @NotNull String srcAbsPath,
- final @NotNull String destAbsPath) throws PersistenceException {
+ public boolean move(
+ final @NotNull ResolveContext<T> ctx, final @NotNull String srcAbsPath, final @NotNull String destAbsPath)
+ throws PersistenceException {
return false;
}
}
diff --git a/src/main/java/org/apache/sling/spi/resource/provider/package-info.java b/src/main/java/org/apache/sling/spi/resource/provider/package-info.java
index f0f196d..8cbc88f 100644
--- a/src/main/java/org/apache/sling/spi/resource/provider/package-info.java
+++ b/src/main/java/org/apache/sling/spi/resource/provider/package-info.java
@@ -21,4 +21,3 @@
package org.apache.sling.spi.resource.provider;
import org.osgi.annotation.versioning.Version;
-
diff --git a/src/test/java/org/apache/sling/api/SlingExceptionTest.java b/src/test/java/org/apache/sling/api/SlingExceptionTest.java
index 3cb27c7..de70ca9 100644
--- a/src/test/java/org/apache/sling/api/SlingExceptionTest.java
+++ b/src/test/java/org/apache/sling/api/SlingExceptionTest.java
@@ -19,7 +19,6 @@
package org.apache.sling.api;
import junit.framework.TestCase;
-
import org.junit.Test;
public class SlingExceptionTest {
@@ -58,5 +57,4 @@ public class SlingExceptionTest {
TestCase.assertEquals(message, e.getMessage());
TestCase.assertEquals(cause, e.getCause());
}
-
}
diff --git a/src/test/java/org/apache/sling/api/adapter/SlingAdaptableTest.java b/src/test/java/org/apache/sling/api/adapter/SlingAdaptableTest.java
index 9f0d247..4886e2f 100644
--- a/src/test/java/org/apache/sling/api/adapter/SlingAdaptableTest.java
+++ b/src/test/java/org/apache/sling/api/adapter/SlingAdaptableTest.java
@@ -18,17 +18,15 @@
*/
package org.apache.sling.api.adapter;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
import static org.mockito.Mockito.*;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
public class SlingAdaptableTest {
private SlingAdaptable sut;
@@ -50,38 +48,35 @@ public class SlingAdaptableTest {
@Test
public void testAdaptToWithCache() {
SlingAdaptable.setAdapterManager(adapterMgr);
- when (adapterMgr.getAdapter(any(), eq(TestAdapterType.class))).thenReturn(new TestAdapterType());
+ when(adapterMgr.getAdapter(any(), eq(TestAdapterType.class))).thenReturn(new TestAdapterType());
assertNotNull(sut.adaptTo(TestAdapterType.class));
- verify(adapterMgr,times(1)).getAdapter(any(), eq(TestAdapterType.class));
-
+ verify(adapterMgr, times(1)).getAdapter(any(), eq(TestAdapterType.class));
+
// the 2nd time it has to come out of the cache
assertNotNull(sut.adaptTo(TestAdapterType.class));
- verify(adapterMgr,times(1)).getAdapter(any(), eq(TestAdapterType.class));
+ verify(adapterMgr, times(1)).getAdapter(any(), eq(TestAdapterType.class));
assertNull(sut.adaptTo(TestAdapterType2.class));
- when (adapterMgr.getAdapter(any(), eq(TestAdapterType2.class))).thenReturn(new TestAdapterType2());
+ when(adapterMgr.getAdapter(any(), eq(TestAdapterType2.class))).thenReturn(new TestAdapterType2());
assertNotNull(sut.adaptTo(TestAdapterType2.class));
assertNotNull(sut.adaptTo(TestAdapterType.class));
}
-
+
// SLING-10371
@Test()
public void testNestedAdaptTo() {
SlingAdaptable.setAdapterManager(adapterMgr);
SuperTypeCallingAdaptable adaptable = new SuperTypeCallingAdaptable();
- when(adapterMgr.getAdapter(eq(adaptable),eq(TestAdapterType.class)))
- .thenAnswer(invocation -> {
- SlingAdaptable a = (SlingAdaptable) invocation.getArgument(0);
- a.adaptTo(String.class); // trigger nested invocation
- return new TestAdapterType();
- });
- when(adapterMgr.getAdapter(eq(adaptable),eq(String.class)))
- .thenAnswer(invocation -> {
+ when(adapterMgr.getAdapter(eq(adaptable), eq(TestAdapterType.class))).thenAnswer(invocation -> {
+ SlingAdaptable a = (SlingAdaptable) invocation.getArgument(0);
+ a.adaptTo(String.class); // trigger nested invocation
+ return new TestAdapterType();
+ });
+ when(adapterMgr.getAdapter(eq(adaptable), eq(String.class))).thenAnswer(invocation -> {
return "someValue";
});
assertNotNull(adaptable.adaptTo(TestAdapterType.class));
}
-
public class SuperTypeCallingAdaptable extends SlingAdaptable {
@Override
@@ -102,4 +97,4 @@ public class SlingAdaptableTest {
// pseudo adaptable
public class TestAdapterType2 {}
-}
\ No newline at end of file
+}
diff --git a/src/test/java/org/apache/sling/api/request/RequestDispatcherOptionsTest.java b/src/test/java/org/apache/sling/api/request/RequestDispatcherOptionsTest.java
index 05f81c5..8514a6d 100644
--- a/src/test/java/org/apache/sling/api/request/RequestDispatcherOptionsTest.java
+++ b/src/test/java/org/apache/sling/api/request/RequestDispatcherOptionsTest.java
@@ -18,92 +18,98 @@
*/
package org.apache.sling.api.request;
+import org.junit.Test;
+
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
-import org.junit.Test;
-
-
public class RequestDispatcherOptionsTest {
- @Test public void testNullString() {
- final RequestDispatcherOptions result = new RequestDispatcherOptions(
- null);
+ @Test
+ public void testNullString() {
+ final RequestDispatcherOptions result = new RequestDispatcherOptions(null);
assertTrue(result.isEmpty());
}
- @Test public void testEmptyString() {
+ @Test
+ public void testEmptyString() {
final RequestDispatcherOptions result = new RequestDispatcherOptions("");
assertTrue(result.isEmpty());
}
- @Test public void testSingleOption() {
- final RequestDispatcherOptions result = new RequestDispatcherOptions(
- "forceResourceType= widget");
+ @Test
+ public void testSingleOption() {
+ final RequestDispatcherOptions result = new RequestDispatcherOptions("forceResourceType= widget");
assertNotNull(result);
- assertEquals("Expected option found (" + result + ")", "widget",
- result.get(RequestDispatcherOptions.OPT_FORCE_RESOURCE_TYPE));
- assertEquals("Expected option found (" + result + ")", "widget",
- result.getForceResourceType());
+ assertEquals(
+ "Expected option found (" + result + ")",
+ "widget",
+ result.get(RequestDispatcherOptions.OPT_FORCE_RESOURCE_TYPE));
+ assertEquals("Expected option found (" + result + ")", "widget", result.getForceResourceType());
}
- @Test public void testResourceTypeSlashShortcut() {
+ @Test
+ public void testResourceTypeSlashShortcut() {
// a single option with no comma or colon means "forceResourceType"
- final RequestDispatcherOptions result = new RequestDispatcherOptions(
- "\t components/widget ");
+ final RequestDispatcherOptions result = new RequestDispatcherOptions("\t components/widget ");
assertNotNull(result);
- assertEquals("Expected option found (" + result + ")",
- "components/widget",
- result.get(RequestDispatcherOptions.OPT_FORCE_RESOURCE_TYPE));
- assertEquals("Expected option found (" + result + ")",
- "components/widget", result.getForceResourceType());
+ assertEquals(
+ "Expected option found (" + result + ")",
+ "components/widget",
+ result.get(RequestDispatcherOptions.OPT_FORCE_RESOURCE_TYPE));
+ assertEquals("Expected option found (" + result + ")", "components/widget", result.getForceResourceType());
}
- @Test public void testResourceTypeColonShortcut() {
+ @Test
+ public void testResourceTypeColonShortcut() {
// a single option with no comma or colon means "forceResourceType"
- final RequestDispatcherOptions result = new RequestDispatcherOptions(
- "\t components:widget ");
+ final RequestDispatcherOptions result = new RequestDispatcherOptions("\t components:widget ");
assertNotNull(result);
- assertEquals("Expected option found (" + result + ")",
- "components:widget",
- result.get(RequestDispatcherOptions.OPT_FORCE_RESOURCE_TYPE));
- assertEquals("Expected option found (" + result + ")",
- "components:widget", result.getForceResourceType());
+ assertEquals(
+ "Expected option found (" + result + ")",
+ "components:widget",
+ result.get(RequestDispatcherOptions.OPT_FORCE_RESOURCE_TYPE));
+ assertEquals("Expected option found (" + result + ")", "components:widget", result.getForceResourceType());
}
- @Test public void testTwoOptions() {
- final RequestDispatcherOptions result = new RequestDispatcherOptions(
- "forceResourceType= components:widget, replaceSelectors = xyz ,");
+ @Test
+ public void testTwoOptions() {
+ final RequestDispatcherOptions result =
+ new RequestDispatcherOptions("forceResourceType= components:widget, replaceSelectors = xyz ,");
assertNotNull(result);
- assertEquals("Expected option found (" + result + ")",
- "components:widget",
- result.get(RequestDispatcherOptions.OPT_FORCE_RESOURCE_TYPE));
- assertEquals("Expected option found (" + result + ")",
- "components:widget", result.getForceResourceType());
- assertEquals("Expected option found (" + result + ")", "xyz",
- result.get(RequestDispatcherOptions.OPT_REPLACE_SELECTORS));
- assertEquals("Expected option found (" + result + ")", "xyz",
- result.getReplaceSelectors());
+ assertEquals(
+ "Expected option found (" + result + ")",
+ "components:widget",
+ result.get(RequestDispatcherOptions.OPT_FORCE_RESOURCE_TYPE));
+ assertEquals("Expected option found (" + result + ")", "components:widget", result.getForceResourceType());
+ assertEquals(
+ "Expected option found (" + result + ")",
+ "xyz",
+ result.get(RequestDispatcherOptions.OPT_REPLACE_SELECTORS));
+ assertEquals("Expected option found (" + result + ")", "xyz", result.getReplaceSelectors());
}
- @Test public void testReplaceExtensionSetterGetter() {
+ @Test
+ public void testReplaceExtensionSetterGetter() {
final RequestDispatcherOptions result = new RequestDispatcherOptions();
assertNull(result.getReplaceExtension());
result.setReplaceExtension("foo");
assertEquals("foo", result.getReplaceExtension());
result.setReplaceExtension(null);
assertEquals("foo", result.getReplaceExtension());
- }
+ }
- @Test public void testReplaceExtensionConstructor() {
+ @Test
+ public void testReplaceExtensionConstructor() {
final RequestDispatcherOptions result = new RequestDispatcherOptions("replaceExtension=foo");
assertEquals("foo", result.getReplaceExtension());
}
- @Test public void testProtectHeadersOnInclude() {
+ @Test
+ public void testProtectHeadersOnInclude() {
final RequestDispatcherOptions options = new RequestDispatcherOptions();
assertNull(options.get(RequestDispatcherOptions.OPT_PROTECT_HEADERS_ON_INCLUDE));
assertFalse(options.isProtectHeadersOnInclude());
diff --git a/src/test/java/org/apache/sling/api/request/RequestUtilTest.java b/src/test/java/org/apache/sling/api/request/RequestUtilTest.java
index c886d0e..7becc9a 100644
--- a/src/test/java/org/apache/sling/api/request/RequestUtilTest.java
+++ b/src/test/java/org/apache/sling/api/request/RequestUtilTest.java
@@ -20,31 +20,36 @@ package org.apache.sling.api.request;
import javax.servlet.http.HttpServletResponse;
+import junit.framework.TestCase;
import org.apache.sling.api.SlingJakartaHttpServletRequest;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceMetadata;
import org.mockito.Mockito;
-import junit.framework.TestCase;
-
public class RequestUtilTest extends TestCase {
@SuppressWarnings("deprecation")
- public void testHandleIfModifiedSince(){
- assertTrue(RequestUtil.handleIfModifiedSince(getMockRequest(1309268989938L,1309269042730L),getMockResponse()));
+ public void testHandleIfModifiedSince() {
+ assertTrue(
+ RequestUtil.handleIfModifiedSince(getMockRequest(1309268989938L, 1309269042730L), getMockResponse()));
- assertFalse(RequestUtil.handleIfModifiedSince(getMockRequest(1309269042730L,1309268989938L),getMockResponse()));
- assertFalse(RequestUtil.handleIfModifiedSince(getMockRequest(-1,1309268989938L),getMockResponse()));
+ assertFalse(
+ RequestUtil.handleIfModifiedSince(getMockRequest(1309269042730L, 1309268989938L), getMockResponse()));
+ assertFalse(RequestUtil.handleIfModifiedSince(getMockRequest(-1, 1309268989938L), getMockResponse()));
}
- public void testHandleIfModifiedSinceJakarta(){
- assertTrue(RequestUtil.handleIfModifiedSince(getMockRequestJakarta(1309268989938L,1309269042730L), getMockResponseJakarta()));
+ public void testHandleIfModifiedSinceJakarta() {
+ assertTrue(RequestUtil.handleIfModifiedSince(
+ getMockRequestJakarta(1309268989938L, 1309269042730L), getMockResponseJakarta()));
- assertFalse(RequestUtil.handleIfModifiedSince(getMockRequestJakarta(1309269042730L,1309268989938L),getMockResponseJakarta()));
- assertFalse(RequestUtil.handleIfModifiedSince(getMockRequestJakarta(-1,1309268989938L),getMockResponseJakarta()));
+ assertFalse(RequestUtil.handleIfModifiedSince(
+ getMockRequestJakarta(1309269042730L, 1309268989938L), getMockResponseJakarta()));
+ assertFalse(
+ RequestUtil.handleIfModifiedSince(getMockRequestJakarta(-1, 1309268989938L), getMockResponseJakarta()));
}
- protected SlingJakartaHttpServletRequest getMockRequestJakarta(final long modificationTime, final long ifModifiedSince) {
+ protected SlingJakartaHttpServletRequest getMockRequestJakarta(
+ final long modificationTime, final long ifModifiedSince) {
SlingJakartaHttpServletRequest r = Mockito.mock(SlingJakartaHttpServletRequest.class);
Mockito.when(r.getDateHeader(Mockito.anyString())).thenReturn(ifModifiedSince);
final String path = "/foo/node";
@@ -58,8 +63,10 @@ public class RequestUtilTest extends TestCase {
}
@SuppressWarnings("deprecation")
- protected org.apache.sling.api.SlingHttpServletRequest getMockRequest(final long modificationTime, final long ifModifiedSince) {
- org.apache.sling.api.SlingHttpServletRequest r = Mockito.mock(org.apache.sling.api.SlingHttpServletRequest.class);
+ protected org.apache.sling.api.SlingHttpServletRequest getMockRequest(
+ final long modificationTime, final long ifModifiedSince) {
+ org.apache.sling.api.SlingHttpServletRequest r =
+ Mockito.mock(org.apache.sling.api.SlingHttpServletRequest.class);
Mockito.when(r.getDateHeader(Mockito.anyString())).thenReturn(ifModifiedSince);
final String path = "/foo/node";
final Resource mr = Mockito.mock(Resource.class);
@@ -71,11 +78,13 @@ public class RequestUtilTest extends TestCase {
return r;
}
- public void testParserAcceptHeader(){
- assertEquals(RequestUtil.parserAcceptHeader("compress;q=0.5, gzip;q=1.0").get("compress"), 0.5);
- assertEquals(RequestUtil.parserAcceptHeader("compress,gzip").get("compress"),1.0);
- assertEquals(RequestUtil.parserAcceptHeader("compress").get("compress"),1.0);
- assertEquals(RequestUtil.parserAcceptHeader("compress;q=string,gzip;q=1.0").get("compress"), 1.0);
+ public void testParserAcceptHeader() {
+ assertEquals(
+ RequestUtil.parserAcceptHeader("compress;q=0.5, gzip;q=1.0").get("compress"), 0.5);
+ assertEquals(RequestUtil.parserAcceptHeader("compress,gzip").get("compress"), 1.0);
+ assertEquals(RequestUtil.parserAcceptHeader("compress").get("compress"), 1.0);
+ assertEquals(
+ RequestUtil.parserAcceptHeader("compress;q=string,gzip;q=1.0").get("compress"), 1.0);
assertNull(RequestUtil.parserAcceptHeader("compress;q=0.5, gzip;q=1.0").get("compres"));
}
@@ -85,7 +94,8 @@ public class RequestUtilTest extends TestCase {
}
protected jakarta.servlet.http.HttpServletResponse getMockResponseJakarta() {
- final jakarta.servlet.http.HttpServletResponse res = Mockito.mock(jakarta.servlet.http.HttpServletResponse.class);
+ final jakarta.servlet.http.HttpServletResponse res =
+ Mockito.mock(jakarta.servlet.http.HttpServletResponse.class);
return res;
}
}
diff --git a/src/test/java/org/apache/sling/api/request/ResponseUtilTest.java b/src/test/java/org/apache/sling/api/request/ResponseUtilTest.java
index 006de8d..7c264a8 100644
--- a/src/test/java/org/apache/sling/api/request/ResponseUtilTest.java
+++ b/src/test/java/org/apache/sling/api/request/ResponseUtilTest.java
@@ -18,8 +18,6 @@
*/
package org.apache.sling.api.request;
-import static org.junit.Assert.assertEquals;
-
import java.io.IOException;
import java.io.StringWriter;
import java.io.Writer;
@@ -32,32 +30,34 @@ import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
+import static org.junit.Assert.assertEquals;
+
@RunWith(Parameterized.class)
public class ResponseUtilTest {
-
+
private final String input;
private final String expected;
-
+
@Parameters
public static Collection<Object[]> data() {
final List<Object[]> result = new ArrayList<Object[]>();
- result.add(new Object[] { "", "" });
- result.add(new Object[] { "The quick brown fox runs over the lazy dog", null });
- result.add(new Object[] { "&><'\"", "&><'"" });
- result.add(new Object[] { "1&2>3<4'5\"6", "1&2>3<4'5"6" });
+ result.add(new Object[] {"", ""});
+ result.add(new Object[] {"The quick brown fox runs over the lazy dog", null});
+ result.add(new Object[] {"&><'\"", "&><'""});
+ result.add(new Object[] {"1&2>3<4'5\"6", "1&2>3<4'5"6"});
return result;
}
-
+
public ResponseUtilTest(String input, String expected) {
this.input = input;
this.expected = expected == null ? input : expected;
}
-
+
@Test
public void testEscapeXml() {
assertEquals(expected, ResponseUtil.escapeXml(input));
}
-
+
@Test
public void testXmlWriter() throws IOException {
final StringWriter w = new StringWriter();
diff --git a/src/test/java/org/apache/sling/api/request/builder/BuildersTest.java b/src/test/java/org/apache/sling/api/request/builder/BuildersTest.java
index 7aa4a69..7d12c14 100644
--- a/src/test/java/org/apache/sling/api/request/builder/BuildersTest.java
+++ b/src/test/java/org/apache/sling/api/request/builder/BuildersTest.java
@@ -18,11 +18,6 @@
*/
package org.apache.sling.api.request.builder;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-
import java.io.IOException;
import java.io.InputStream;
import java.io.UnsupportedEncodingException;
@@ -37,14 +32,19 @@ import org.jetbrains.annotations.NotNull;
import org.junit.Test;
import org.mockito.Mockito;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+
public class BuildersTest {
- @Test(expected = IllegalArgumentException.class)
+ @Test(expected = IllegalArgumentException.class)
public void createRequestBuilderNullResource() {
Builders.newRequestBuilder(null);
}
- @Test
+ @Test
public void createRequestBuilder() {
final ResourceResolver resolver = Mockito.mock(ResourceResolver.class);
final Resource resource = Mockito.mock(Resource.class);
@@ -60,7 +60,8 @@ public class BuildersTest {
assertEquals("html", req.getRequestPathInfo().getExtension());
assertEquals("/content/page", req.getRequestPathInfo().getResourcePath());
assertEquals("tidy.json", req.getRequestPathInfo().getSelectorString());
- assertArrayEquals(new String[] {"tidy", "json"}, req.getRequestPathInfo().getSelectors());
+ assertArrayEquals(
+ new String[] {"tidy", "json"}, req.getRequestPathInfo().getSelectors());
assertNull(req.getRequestPathInfo().getSuffix());
assertNull(req.getRequestPathInfo().getSuffixResource());
@@ -71,7 +72,7 @@ public class BuildersTest {
public void createResponseBuilder() {
final SlingHttpServletResponseBuilder builder = Builders.newResponseBuilder();
final SlingHttpServletResponseResult result = builder.build();
- assertNotNull(result);
+ assertNotNull(result);
}
@Test
@@ -81,8 +82,7 @@ public class BuildersTest {
@Test
public void createRequestParameter() throws UnsupportedEncodingException {
- @NotNull
- RequestParameter rp = Builders.newRequestParameter("key", "value");
+ @NotNull RequestParameter rp = Builders.newRequestParameter("key", "value");
assertNotNull(rp);
assertEquals("key", rp.getName());
assertEquals("value", rp.getString());
@@ -91,8 +91,7 @@ public class BuildersTest {
@Test
public void createRequestParameterWithCharset() throws UnsupportedEncodingException {
- @NotNull
- RequestParameter rp = Builders.newRequestParameter("key", "value", StandardCharsets.UTF_16);
+ @NotNull RequestParameter rp = Builders.newRequestParameter("key", "value", StandardCharsets.UTF_16);
assertNotNull(rp);
assertEquals("key", rp.getName());
assertEquals("value", rp.getString());
diff --git a/src/test/java/org/apache/sling/api/request/builder/impl/FastMessageFormatTest.java b/src/test/java/org/apache/sling/api/request/builder/impl/FastMessageFormatTest.java
index 22b1803..faa69ef 100644
--- a/src/test/java/org/apache/sling/api/request/builder/impl/FastMessageFormatTest.java
+++ b/src/test/java/org/apache/sling/api/request/builder/impl/FastMessageFormatTest.java
@@ -1,28 +1,30 @@
/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
package org.apache.sling.api.request.builder.impl;
-import org.junit.Test;
-
import java.text.MessageFormat;
import java.util.Arrays;
import java.util.Calendar;
import java.util.Date;
+import org.junit.Test;
+
import static org.junit.Assert.assertEquals;
public class FastMessageFormatTest {
@@ -30,36 +32,36 @@ public class FastMessageFormatTest {
@Test
public void testFormat() {
FormatTest[] tests = {
- // Data types
- new FormatTest("{0}", 1),
- new FormatTest("{0}", Integer.MAX_VALUE),
- new FormatTest("{0}", Long.MAX_VALUE),
- new FormatTest("{0}", Math.PI),
- new FormatTest("{0}", 123456.123456),
- new FormatTest("{0}", Float.MAX_VALUE),
- new FormatTest("{0}", new Date()),
- new FormatTest("{0}", Calendar.getInstance()),
- new FormatTest("{0}", true),
- new FormatTest("{0}", false),
- new FormatTest("{0}", new int[] {1,2,3}),
- new FormatTest("{0}", (Object) new Integer[] {1,2,3}),
- new FormatTest("{0}", Arrays.asList(1, 2, 3)),
- new FormatTest("{0}", "text"),
+ // Data types
+ new FormatTest("{0}", 1),
+ new FormatTest("{0}", Integer.MAX_VALUE),
+ new FormatTest("{0}", Long.MAX_VALUE),
+ new FormatTest("{0}", Math.PI),
+ new FormatTest("{0}", 123456.123456),
+ new FormatTest("{0}", Float.MAX_VALUE),
+ new FormatTest("{0}", new Date()),
+ new FormatTest("{0}", Calendar.getInstance()),
+ new FormatTest("{0}", true),
+ new FormatTest("{0}", false),
+ new FormatTest("{0}", new int[] {1, 2, 3}),
+ new FormatTest("{0}", (Object) new Integer[] {1, 2, 3}),
+ new FormatTest("{0}", Arrays.asList(1, 2, 3)),
+ new FormatTest("{0}", "text"),
- // Patterns
- new FormatTest("{0}{0}", 1, 2),
- new FormatTest("a{0}b{1}c", 1, 2),
- new FormatTest("a{0}b{1}c{2}d", 1, 2, 3),
- new FormatTest("a{0}bb{1}ccc{2}dddd", 10, 20, 30),
- new FormatTest("c{1}b{0}a", 1, 2),
- new FormatTest("c{1}b{0}a{1}c", 1, 2),
+ // Patterns
+ new FormatTest("{0}{0}", 1, 2),
+ new FormatTest("a{0}b{1}c", 1, 2),
+ new FormatTest("a{0}b{1}c{2}d", 1, 2, 3),
+ new FormatTest("a{0}bb{1}ccc{2}dddd", 10, 20, 30),
+ new FormatTest("c{1}b{0}a", 1, 2),
+ new FormatTest("c{1}b{0}a{1}c", 1, 2),
- // Type/style
- new FormatTest("c{0,number,#.##}b{0}a{1}c", 1, 2),
- new FormatTest("{0,number,#.##}", 1.2345),
+ // Type/style
+ new FormatTest("c{0,number,#.##}b{0}a{1}c", 1, 2),
+ new FormatTest("{0,number,#.##}", 1.2345),
- // Escaping
- new FormatTest("'{0}'", 1)
+ // Escaping
+ new FormatTest("'{0}'", 1)
};
FastMessageFormat fastMessageFormat = new FastMessageFormat();
@@ -73,6 +75,7 @@ public class FastMessageFormatTest {
private static class FormatTest {
final String pattern;
final Object[] args;
+
public FormatTest(String pattern, Object... args) {
this.pattern = pattern;
this.args = args;
diff --git a/src/test/java/org/apache/sling/api/request/builder/impl/HeaderSupportTest.java b/src/test/java/org/apache/sling/api/request/builder/impl/HeaderSupportTest.java
index 1bc7071..4a2c05f 100644
--- a/src/test/java/org/apache/sling/api/request/builder/impl/HeaderSupportTest.java
+++ b/src/test/java/org/apache/sling/api/request/builder/impl/HeaderSupportTest.java
@@ -18,20 +18,21 @@
*/
package org.apache.sling.api.request.builder.impl;
+import java.util.ArrayList;
+import java.util.Arrays;
+
+import org.junit.Test;
+
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-import java.util.ArrayList;
-import java.util.Arrays;
-
-import org.junit.Test;
-
public class HeaderSupportTest {
-
- @Test public void testDateHeaders() {
+
+ @Test
+ public void testDateHeaders() {
final HeaderSupport support = new HeaderSupport();
// no header set, return -1
assertEquals(-1L, support.getDateHeader("date"));
@@ -48,12 +49,13 @@ public class HeaderSupportTest {
try {
support.getDateHeader("nodate");
fail();
- } catch ( final IllegalArgumentException iae) {
+ } catch (final IllegalArgumentException iae) {
// expected
}
}
- @Test public void testIntDateHeaders() {
+ @Test
+ public void testIntDateHeaders() {
final HeaderSupport support = new HeaderSupport();
// no header set, return -1
assertEquals(-1L, support.getIntHeader("number"));
@@ -66,12 +68,13 @@ public class HeaderSupportTest {
try {
support.getIntHeader("nonumber");
fail();
- } catch ( final NumberFormatException nfe) {
+ } catch (final NumberFormatException nfe) {
// expected
}
}
- @Test public void testAddSetHeaders() {
+ @Test
+ public void testAddSetHeaders() {
final HeaderSupport support = new HeaderSupport();
support.addHeader("string", "a");
support.addHeader("string", "b");
@@ -105,7 +108,7 @@ public class HeaderSupportTest {
assertTrue(support.containsHeader("date"));
assertFalse(support.containsHeader("foo"));
-
+
assertTrue(support.getHeaders("foo").isEmpty());
assertEquals(Arrays.asList("string", "number", "date"), new ArrayList<>(support.getHeaderNames()));
diff --git a/src/test/java/org/apache/sling/api/request/builder/impl/HttpSessionImplTest.java b/src/test/java/org/apache/sling/api/request/builder/impl/HttpSessionImplTest.java
index 53fc58e..6920e68 100644
--- a/src/test/java/org/apache/sling/api/request/builder/impl/HttpSessionImplTest.java
+++ b/src/test/java/org/apache/sling/api/request/builder/impl/HttpSessionImplTest.java
@@ -18,14 +18,14 @@
*/
package org.apache.sling.api.request.builder.impl;
+import org.junit.Test;
+
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
-import org.junit.Test;
-
public class HttpSessionImplTest {
@Test
@@ -76,7 +76,7 @@ public class HttpSessionImplTest {
public void testIsNew() {
HttpSessionImpl httpSession = new HttpSessionImpl(new ServletContextImpl());
assertTrue(httpSession.isNew());
- }
+ }
@Test
public void testGetLastAccessedTime() {
diff --git a/src/test/java/org/apache/sling/api/request/builder/impl/RequestParameterImplTest.java b/src/test/java/org/apache/sling/api/request/builder/impl/RequestParameterImplTest.java
index b0b9d12..4fdb739 100644
--- a/src/test/java/org/apache/sling/api/request/builder/impl/RequestParameterImplTest.java
+++ b/src/test/java/org/apache/sling/api/request/builder/impl/RequestParameterImplTest.java
@@ -18,13 +18,6 @@
*/
package org.apache.sling.api.request.builder.impl;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
import java.io.IOException;
import java.io.InputStream;
import java.nio.charset.StandardCharsets;
@@ -32,15 +25,23 @@ import java.util.Arrays;
import org.junit.Test;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
public class RequestParameterImplTest {
- @Test
+ @Test
public void testTextualParameter() throws IOException {
final RequestParameterImpl param = new RequestParameterImpl("foo", "bar");
assertEquals("foo", param.getName());
assertEquals("bar", param.getString());
assertArrayEquals("bar".getBytes(StandardCharsets.UTF_8), param.get());
- assertNull(param.getContentType()); // compare with https://github.com/apache/sling-org-apache-sling-engine/blob/8b6b5b273f667b7e156b37a791493b00b87cc733/src/main/java/org/apache/sling/engine/impl/parameters/ContainerRequestParameter.java#L73
+ assertNull(param.getContentType()); // compare with
+ // https://github.com/apache/sling-org-apache-sling-engine/blob/8b6b5b273f667b7e156b37a791493b00b87cc733/src/main/java/org/apache/sling/engine/impl/parameters/ContainerRequestParameter.java#L73
try (InputStream is = param.getInputStream()) {
byte[] actualValue = new byte[30];
int length = is.read(actualValue);
@@ -56,9 +57,9 @@ public class RequestParameterImplTest {
assertEquals(param.getString(), param.toString());
}
... 6955 lines suppressed ...