svn commit: r1793026 - in /sling/trunk/bundles/extensions/xss/src: main/java/org/apache/sling/xss/ main/java/org/apache/sling/xss/impl/ test/java/org/apache/sling/xss/impl/

[pauls]

Author: pauls
Date: Fri Apr 28 09:39:08 2017
New Revision: 1793026

URL: http://svn.apache.org/viewvc?rev=1793026&view=rev
Log:
Remove unused methods from XSSAPI and drop XSSAPIAdapterFactory (SLING-6793).

Removed:
    
sling/trunk/bundles/extensions/xss/src/main/java/org/apache/sling/xss/impl/XSSAPIAdapterFactory.java
Modified:
    
sling/trunk/bundles/extensions/xss/src/main/java/org/apache/sling/xss/XSSAPI.java
    
sling/trunk/bundles/extensions/xss/src/main/java/org/apache/sling/xss/impl/XSSAPIImpl.java
    
sling/trunk/bundles/extensions/xss/src/test/java/org/apache/sling/xss/impl/XSSAPIImplTest.java

Modified: 
sling/trunk/bundles/extensions/xss/src/main/java/org/apache/sling/xss/XSSAPI.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/xss/src/main/java/org/apache/sling/xss/XSSAPI.java?rev=1793026&r1=1793025&r2=1793026&view=diff
==============================================================================
--- 
sling/trunk/bundles/extensions/xss/src/main/java/org/apache/sling/xss/XSSAPI.java
 (original)
+++ 
sling/trunk/bundles/extensions/xss/src/main/java/org/apache/sling/xss/XSSAPI.java
 Fri Apr 28 09:39:08 2017
@@ -239,27 +239,4 @@ public interface XSSAPI {
     @Nonnull
     String filterHTML(@Nullable String source);
 
-
-    // 
=============================================================================================
-    // JCR-based URL MAPPING
-    //
-
-    /**
-     * Returns an XSSAPI instance capable of mapping resource URLs.
-     * EITHER THIS OR THE RESOURCERESOLVER VERSION MUST BE USED WHEN 
VALIDATING HREFs!
-     *
-     * @param request the request from which to obtain the {@link 
org.apache.sling.xss.XSSAPI}
-     * @return an XSSAPI service capable of validating hrefs.
-     */
-    XSSAPI getRequestSpecificAPI(SlingHttpServletRequest request);
-
-    /**
-     * Returns an XSSAPI instance capable of mapping resource URLs.
-     * EITHER THIS OR THE REQUEST VERSION MUST BE USED WHEN VALIDATING HREFs!
-     *
-     * @param resourceResolver the resolver from which to obtain the {@link 
org.apache.sling.xss.XSSAPI}
-     * @return an XSSAPI service capable of validating hrefs.
-     */
-    XSSAPI getResourceResolverSpecificAPI(ResourceResolver resourceResolver);
-
 }

Modified: 
sling/trunk/bundles/extensions/xss/src/main/java/org/apache/sling/xss/impl/XSSAPIImpl.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/xss/src/main/java/org/apache/sling/xss/impl/XSSAPIImpl.java?rev=1793026&r1=1793025&r2=1793026&view=diff
==============================================================================
--- 
sling/trunk/bundles/extensions/xss/src/main/java/org/apache/sling/xss/impl/XSSAPIImpl.java
 (original)
+++ 
sling/trunk/bundles/extensions/xss/src/main/java/org/apache/sling/xss/impl/XSSAPIImpl.java
 Fri Apr 28 09:39:08 2017
@@ -468,24 +468,4 @@ public class XSSAPIImpl implements XSSAP
     public String filterHTML(String source) {
         return xssFilter.filter(ProtectionContext.HTML_HTML_CONTENT, source);
     }
-
-    // 
=============================================================================================
-    // JCR-NAMESPACE MANGLING
-    //
-
-    /**
-     * @see 
org.apache.sling.xss.XSSAPI#getRequestSpecificAPI(org.apache.sling.api.SlingHttpServletRequest)
-     */
-    @Override
-    public XSSAPI getRequestSpecificAPI(final SlingHttpServletRequest request) 
{
-        return this;
-    }
-
-    /**
-     * @see 
org.apache.sling.xss.XSSAPI#getResourceResolverSpecificAPI(org.apache.sling.api.resource.ResourceResolver)
-     */
-    @Override
-    public XSSAPI getResourceResolverSpecificAPI(final ResourceResolver 
resourceResolver) {
-        return this;
-    }
 }

Modified: 
sling/trunk/bundles/extensions/xss/src/test/java/org/apache/sling/xss/impl/XSSAPIImplTest.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/xss/src/test/java/org/apache/sling/xss/impl/XSSAPIImplTest.java?rev=1793026&r1=1793025&r2=1793026&view=diff
==============================================================================
--- 
sling/trunk/bundles/extensions/xss/src/test/java/org/apache/sling/xss/impl/XSSAPIImplTest.java
 (original)
+++ 
sling/trunk/bundles/extensions/xss/src/test/java/org/apache/sling/xss/impl/XSSAPIImplTest.java
 Fri Apr 28 09:39:08 2017
@@ -68,11 +68,6 @@ public class XSSAPIImplTest {
                     return url.replaceAll("jcr:", "_jcr_");
                 }
             });
-
-            SlingHttpServletRequest mockRequest = 
mock(SlingHttpServletRequest.class);
-            when(mockRequest.getResourceResolver()).thenReturn(mockResolver);
-
-            xssAPI = xssAPI.getRequestSpecificAPI(mockRequest);
         } catch (Exception e) {
             e.printStackTrace();
         }