[sling-org-apache-sling-xss] 04/22: SLING-4185 The org.apache.sling.xss bundle should properly export its API

[ro...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to annotated tag org.apache.sling.xss-1.0.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-xss.git

commit 8b8e0d59f2e9fb52f4123709f108d7a188649f97
Author: Felix Meschberger <fm...@apache.org>
AuthorDate: Wed Nov 19 16:08:50 2014 +0000

    SLING-4185 The org.apache.sling.xss bundle should properly export its API
    
    Applying slightly modified patch by Radu Cotescu (Thanks alot).
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/xss@1640585 13f79535-47bb-0310-9956-ffa450edef68
---
 src/main/java/org/apache/sling/xss/JSONUtil.java          | 8 +++++---
 src/main/java/org/apache/sling/xss/ProtectionContext.java | 3 +--
 src/main/java/org/apache/sling/xss/XSSAPI.java            | 3 +++
 src/main/java/org/apache/sling/xss/XSSFilter.java         | 5 +++--
 src/main/java/org/apache/sling/xss/package-info.java      | 2 --
 5 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/main/java/org/apache/sling/xss/JSONUtil.java b/src/main/java/org/apache/sling/xss/JSONUtil.java
index 468804e..d2f516e 100644
--- a/src/main/java/org/apache/sling/xss/JSONUtil.java
+++ b/src/main/java/org/apache/sling/xss/JSONUtil.java
@@ -24,16 +24,18 @@ import org.apache.sling.commons.json.io.JSONWriter;
  * JSON utilities
  * <p/>
  * Support for handling xss protected values with JSON objects and JSON writers.
- *
- * @since 1.0.0
  */
-public class JSONUtil {
+public final class JSONUtil {
 
     /**
      * Key suffix for XSS protected properties
      */
     public static final String KEY_SUFFIX_XSS = "_xss";
 
+    // no instantiation
+    private JSONUtil() {
+    }
+
     /**
      * Puts a xss protected value into a JSON object.
      * The value is put under the provided key.
diff --git a/src/main/java/org/apache/sling/xss/ProtectionContext.java b/src/main/java/org/apache/sling/xss/ProtectionContext.java
index 6a39986..f48f158 100644
--- a/src/main/java/org/apache/sling/xss/ProtectionContext.java
+++ b/src/main/java/org/apache/sling/xss/ProtectionContext.java
@@ -16,13 +16,12 @@
  ******************************************************************************/
 package org.apache.sling.xss;
 
+
 /**
  * This enumeration defines the context for executing XSS protection.
  * <p/>
  * The specified rules refer to
  * http://www.owasp.org/index.php/XSS_%28Cross_Site_Scripting%29_Prevention_Cheat_Sheet
- *
- * @since 1.0
  */
 public enum ProtectionContext {
     /**
diff --git a/src/main/java/org/apache/sling/xss/XSSAPI.java b/src/main/java/org/apache/sling/xss/XSSAPI.java
index 09801a6..076e104 100644
--- a/src/main/java/org/apache/sling/xss/XSSAPI.java
+++ b/src/main/java/org/apache/sling/xss/XSSAPI.java
@@ -20,6 +20,8 @@ package org.apache.sling.xss;
 import org.apache.sling.api.SlingHttpServletRequest;
 import org.apache.sling.api.resource.ResourceResolver;
 
+import aQute.bnd.annotation.ProviderType;
+
 /**
  * A service providing validators and encoders for XSS protection during the composition of HTML
  * pages.
@@ -31,6 +33,7 @@ import org.apache.sling.api.resource.ResourceResolver;
  * <p/>
  * When in doubt, use a validator.
  */
+@ProviderType
 public interface XSSAPI {
 
     // =============================================================================================
diff --git a/src/main/java/org/apache/sling/xss/XSSFilter.java b/src/main/java/org/apache/sling/xss/XSSFilter.java
index f988cff..4f212c0 100644
--- a/src/main/java/org/apache/sling/xss/XSSFilter.java
+++ b/src/main/java/org/apache/sling/xss/XSSFilter.java
@@ -16,12 +16,13 @@
  ******************************************************************************/
 package org.apache.sling.xss;
 
+import aQute.bnd.annotation.ProviderType;
+
 /**
  * This service should be used to protect output against potential XSS attacks.
  * The protection is context based.
- *
- * @since 1.0
  */
+@ProviderType
 public interface XSSFilter {
 
     /**
diff --git a/src/main/java/org/apache/sling/xss/package-info.java b/src/main/java/org/apache/sling/xss/package-info.java
index 1ff8554..546d328 100644
--- a/src/main/java/org/apache/sling/xss/package-info.java
+++ b/src/main/java/org/apache/sling/xss/package-info.java
@@ -20,9 +20,7 @@
  * @version 1.0.0
  */
 @Version("1.0.0")
-@Export(optional = "provide:=true")
 package org.apache.sling.xss;
 
-import aQute.bnd.annotation.Export;
 import aQute.bnd.annotation.Version;
 

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.