Author: ngn
Date: Tue Apr 19 21:45:00 2011
New Revision: 1095221
URL: http://svn.apache.org/viewvc?rev=1095221&view=rev
Log:
Removing trailing white space
Modified:
mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/addressing/stringprep/NodePrep.java
mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/addressing/stringprep/ResourcePrep.java
mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/addressing/stringprep/StringPrep.java
mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/addressing/stringprep/StringPrepConstants.java
mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/addressing/stringprep/StringPrepViolationException.java
mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/state/resourcebinding/ResourceState.java
mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/addressing/EntityConformanceTestCase.java
mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/addressing/EntityUtilsTestCase.java
mina/vysper/trunk/server/extensions/xep0124-xep0206-bosh/src/examples/resources/flxhr/checkplayer.js
mina/vysper/trunk/server/extensions/xep0124-xep0206-bosh/src/examples/resources/flxhr/flCookie.js
mina/vysper/trunk/server/extensions/xep0124-xep0206-bosh/src/examples/resources/flxhr/flXHR.js
mina/vysper/trunk/server/extensions/xep0124-xep0206-bosh/src/examples/resources/flxhr/flXHR.vbs
mina/vysper/trunk/server/extensions/xep0124-xep0206-bosh/src/examples/resources/flxhr/flensed.js
mina/vysper/trunk/server/extensions/xep0124-xep0206-bosh/src/examples/resources/flxhr/swfobject.js
mina/vysper/trunk/speccompliance/src/main/java/org/apache/vysper/compliance/SpecCompliant.java
Modified:
mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/addressing/stringprep/NodePrep.java
URL:
http://svn.apache.org/viewvc/mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/addressing/stringprep/NodePrep.java?rev=1095221&r1=1095220&r2=1095221&view=diff
==============================================================================
---
mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/addressing/stringprep/NodePrep.java
(original)
+++
mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/addressing/stringprep/NodePrep.java
Tue Apr 19 21:45:00 2011
@@ -1,85 +1,85 @@
-/*
- * 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.vysper.xmpp.addressing.stringprep;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
-
-import org.apache.vysper.compliance.SpecCompliant;
-import org.apache.vysper.compliance.SpecCompliant.ComplianceStatus;
-
-/**
- * This class is used to prepare a Node Identifier for further usage.
- *
- * see RFC3920:3.3
- * see RFC3920:Appendix A
- * see http://www.ietf.org/rfc/rfc3920.txt
- * @author Gerolf Seitz ([email protected])
- *
- */
-@SpecCompliant(spec = "RFC3920", section = "A", status =
ComplianceStatus.IN_PROGRESS)
-public class NodePrep extends StringPrep {
-
- private static final NodePrep INSTANCE = new NodePrep();
-
- /**
- * Applies the Nodeprep profile to the given node.
- *
- * @param node
- * the node to prepare
- * @return the prepared node
- * @throws StringPrepViolationException
- * in case the Nodeprep profile can't be applied
- */
- public static String prepare(String node) throws
StringPrepViolationException {
- return INSTANCE.prepareString(node);
- }
-
- private NodePrep() {
- }
-
- @Override
- @SpecCompliant(spec = "RFC3920", section = "A.3", status =
ComplianceStatus.FINISHED)
- protected Map<String, String> buildMapping() {
- Map<String, String> mapping = new HashMap<String, String>();
- mapping.putAll(StringPrepConstants.B_1_CommonlyMappedtoNothing);
-
mapping.putAll(StringPrepConstants.B_2_MappingForCaseFoldingUsedWithKFC);
-
- return mapping;
- }
-
- @Override
- @SpecCompliant(spec = "RFC3920", section = "A.5", status =
ComplianceStatus.FINISHED)
- protected Set<String> buildProhibitedSet() {
- Set<String> prohibited = super.buildProhibitedSet();
-
- prohibited.add("\\u0022");
- prohibited.add("\u0026");
- prohibited.add("\u0027");
- prohibited.add("\u002F");
- prohibited.add("\u003A");
- prohibited.add("\u003C");
- prohibited.add("\u003E");
- prohibited.add("\u0040");
-
- return prohibited;
- }
-}
+/*
+ * 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.vysper.xmpp.addressing.stringprep;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
+import org.apache.vysper.compliance.SpecCompliant;
+import org.apache.vysper.compliance.SpecCompliant.ComplianceStatus;
+
+/**
+ * This class is used to prepare a Node Identifier for further usage.
+ *
+ * see RFC3920:3.3
+ * see RFC3920:Appendix A
+ * see http://www.ietf.org/rfc/rfc3920.txt
+ * @author Gerolf Seitz ([email protected])
+ *
+ */
+@SpecCompliant(spec = "RFC3920", section = "A", status =
ComplianceStatus.IN_PROGRESS)
+public class NodePrep extends StringPrep {
+
+ private static final NodePrep INSTANCE = new NodePrep();
+
+ /**
+ * Applies the Nodeprep profile to the given node.
+ *
+ * @param node
+ * the node to prepare
+ * @return the prepared node
+ * @throws StringPrepViolationException
+ * in case the Nodeprep profile can't be applied
+ */
+ public static String prepare(String node) throws
StringPrepViolationException {
+ return INSTANCE.prepareString(node);
+ }
+
+ private NodePrep() {
+ }
+
+ @Override
+ @SpecCompliant(spec = "RFC3920", section = "A.3", status =
ComplianceStatus.FINISHED)
+ protected Map<String, String> buildMapping() {
+ Map<String, String> mapping = new HashMap<String, String>();
+ mapping.putAll(StringPrepConstants.B_1_CommonlyMappedtoNothing);
+
mapping.putAll(StringPrepConstants.B_2_MappingForCaseFoldingUsedWithKFC);
+
+ return mapping;
+ }
+
+ @Override
+ @SpecCompliant(spec = "RFC3920", section = "A.5", status =
ComplianceStatus.FINISHED)
+ protected Set<String> buildProhibitedSet() {
+ Set<String> prohibited = super.buildProhibitedSet();
+
+ prohibited.add("\\u0022");
+ prohibited.add("\u0026");
+ prohibited.add("\u0027");
+ prohibited.add("\u002F");
+ prohibited.add("\u003A");
+ prohibited.add("\u003C");
+ prohibited.add("\u003E");
+ prohibited.add("\u0040");
+
+ return prohibited;
+ }
+}
Modified:
mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/addressing/stringprep/ResourcePrep.java
URL:
http://svn.apache.org/viewvc/mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/addressing/stringprep/ResourcePrep.java?rev=1095221&r1=1095220&r2=1095221&view=diff
==============================================================================
---
mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/addressing/stringprep/ResourcePrep.java
(original)
+++
mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/addressing/stringprep/ResourcePrep.java
Tue Apr 19 21:45:00 2011
@@ -1,82 +1,82 @@
-/*
- * 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.vysper.xmpp.addressing.stringprep;
-
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-import org.apache.vysper.compliance.SpecCompliant;
-import org.apache.vysper.compliance.SpecCompliant.ComplianceStatus;
-
-/**
- * This class is used to prepare a Resource Identifier for further usage.
- *
- * see RFC3920:3.4
- * see RFC3920:Appendix B
- * see http://www.ietf.org/rfc/rfc3920.txt
- * @author Gerolf Seitz ([email protected])
- *
- */
-public class ResourcePrep extends StringPrep {
-
- private static final ResourcePrep INSTANCE = new ResourcePrep();
-
- /**
- * Applies the Resourceprep profile to the given resource.
- *
- * @param resource
- * the resource to prepare
- * @return the prepared resource
- * @throws StringPrepViolationException
- * in case the Resourceprep profile can't be applied
- */
- public static String prepare(String resource) throws
StringPrepViolationException {
- return INSTANCE.prepareString(resource);
- }
-
- private ResourcePrep() {
-
- }
-
- @Override
- @SpecCompliant(spec = "RFC3920", section = "B.3", status =
ComplianceStatus.FINISHED)
- protected Map<String, String> buildMapping() {
- return StringPrepConstants.B_1_CommonlyMappedtoNothing;
- }
-
- @Override
- @SpecCompliant(spec = "RFC3920", section = "B.5", status =
ComplianceStatus.FINISHED)
- protected Set<String> buildProhibitedSet() {
- Set<String> set = new HashSet<String>();
- set.addAll(StringPrepConstants.C_1_2_NonAsciiSpaceCharacters);
- set.addAll(StringPrepConstants.C_2_1_AsciiControlCharacters);
- set.addAll(StringPrepConstants.C_2_2_NonAsciiControlCharacters);
- set.addAll(StringPrepConstants.C_3_PrivateUse);
- set.addAll(StringPrepConstants.C_4_NonCharacterCodePoints);
- set.addAll(StringPrepConstants.C_5_SurrogateCodes);
- set.addAll(StringPrepConstants.C_6_InappropriateForPlainText);
-
set.addAll(StringPrepConstants.C_7_InappropriateForCanonicalRepresentation);
-
set.addAll(StringPrepConstants.C_8_ChangeDisplayPropertiesOrAreDeprecated);
- set.addAll(StringPrepConstants.C_9_TaggingCharacters);
-
- return set;
- }
-}
+/*
+ * 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.vysper.xmpp.addressing.stringprep;
+
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import org.apache.vysper.compliance.SpecCompliant;
+import org.apache.vysper.compliance.SpecCompliant.ComplianceStatus;
+
+/**
+ * This class is used to prepare a Resource Identifier for further usage.
+ *
+ * see RFC3920:3.4
+ * see RFC3920:Appendix B
+ * see http://www.ietf.org/rfc/rfc3920.txt
+ * @author Gerolf Seitz ([email protected])
+ *
+ */
+public class ResourcePrep extends StringPrep {
+
+ private static final ResourcePrep INSTANCE = new ResourcePrep();
+
+ /**
+ * Applies the Resourceprep profile to the given resource.
+ *
+ * @param resource
+ * the resource to prepare
+ * @return the prepared resource
+ * @throws StringPrepViolationException
+ * in case the Resourceprep profile can't be applied
+ */
+ public static String prepare(String resource) throws
StringPrepViolationException {
+ return INSTANCE.prepareString(resource);
+ }
+
+ private ResourcePrep() {
+
+ }
+
+ @Override
+ @SpecCompliant(spec = "RFC3920", section = "B.3", status =
ComplianceStatus.FINISHED)
+ protected Map<String, String> buildMapping() {
+ return StringPrepConstants.B_1_CommonlyMappedtoNothing;
+ }
+
+ @Override
+ @SpecCompliant(spec = "RFC3920", section = "B.5", status =
ComplianceStatus.FINISHED)
+ protected Set<String> buildProhibitedSet() {
+ Set<String> set = new HashSet<String>();
+ set.addAll(StringPrepConstants.C_1_2_NonAsciiSpaceCharacters);
+ set.addAll(StringPrepConstants.C_2_1_AsciiControlCharacters);
+ set.addAll(StringPrepConstants.C_2_2_NonAsciiControlCharacters);
+ set.addAll(StringPrepConstants.C_3_PrivateUse);
+ set.addAll(StringPrepConstants.C_4_NonCharacterCodePoints);
+ set.addAll(StringPrepConstants.C_5_SurrogateCodes);
+ set.addAll(StringPrepConstants.C_6_InappropriateForPlainText);
+
set.addAll(StringPrepConstants.C_7_InappropriateForCanonicalRepresentation);
+
set.addAll(StringPrepConstants.C_8_ChangeDisplayPropertiesOrAreDeprecated);
+ set.addAll(StringPrepConstants.C_9_TaggingCharacters);
+
+ return set;
+ }
+}
Modified:
mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/addressing/stringprep/StringPrep.java
URL:
http://svn.apache.org/viewvc/mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/addressing/stringprep/StringPrep.java?rev=1095221&r1=1095220&r2=1095221&view=diff
==============================================================================
---
mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/addressing/stringprep/StringPrep.java
(original)
+++
mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/addressing/stringprep/StringPrep.java
Tue Apr 19 21:45:00 2011
@@ -1,150 +1,150 @@
-/*
- * 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.vysper.xmpp.addressing.stringprep;
-
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-import org.apache.vysper.compliance.SpecCompliant;
-
-/**
- * Use this class to prepare a String according to the Stringprep profile. The
- * methods {@link #buildMapping()} and {@link #buildProhibitedSet()} can be
- * overridden to modify the behavior of the Stringprep check.
- *
- * see http://www.ietf.org/rfc/rfc3454.txt
- *
- * @author Gerolf Seitz ([email protected])
- *
- */
-@SpecCompliant(spec = "RFC3454")
-public class StringPrep {
-
- private Map<String, String> mapping;
-
- private Set<String> prohibited;
-
- /**
- * Construct.
- */
- public StringPrep() {
- mapping = buildMapping();
- prohibited = buildProhibitedSet();
- }
-
- /**
- * Prepares the given {@link String} according to the Stringprep
- * specification.
- *
- * @param str
- * the string to prepare
- * @return the prepared {@link String}
- * @throws StringPrepViolationException
- * in case the {@link String} cannot be prepared
- */
- public String prepareString(String str) throws
StringPrepViolationException {
- // 1. map -> RFC3454:3
- for (int i = 0; i < str.length(); i++) {
- String codePoint = codePointAt(str, i);
- if (mapping.containsKey(codePoint)) {
- str = str.replace(codePoint, mapping.get(codePoint));
- }
- }
- // TODO: 2. normalize -> RFC3454:4
-
- // 3. prohibit -> RFC3454:5
- for (int i = 0; i < str.length(); i++) {
- String codePoint = codePointAt(str, i);
- if (prohibited.contains(codePoint)) {
- throw new
StringPrepViolationException(String.format("character '%s' prohibited!",
codePoint));
- }
- }
-
- // 4. check bidi -> RFC3454:6
- boolean containsRAndAlCat = false;
- boolean containsLCat = false;
- for (int i = 0; i < str.length() && NAND(containsRAndAlCat,
containsLCat); i++) {
- String codePoint = codePointAt(str, i);
- containsRAndAlCat |=
StringPrepConstants.D_1_CharactersWithBiDiPropertiesRorAl.contains(codePoint);
- containsLCat |=
StringPrepConstants.D_2_CharactersWithBiDiPropertyL.contains(codePoint);
- }
- if (containsRAndAlCat && containsLCat) {
- throw new StringPrepViolationException("invalid bidi sequence");
- }
- if (containsRAndAlCat) {
- if
(!StringPrepConstants.D_1_CharactersWithBiDiPropertiesRorAl.contains(codePointAt(str,
0))
- ||
!StringPrepConstants.D_1_CharactersWithBiDiPropertiesRorAl.contains(codePointAt(str,
str
- .length() - 1))) {
- throw new StringPrepViolationException("invalid bidi
sequence");
- }
- }
-
- return str;
- }
-
- /**
- * Override this method and return a custom map of character mappings to
- * alter the Stringprep behavior.
- *
- * @return a {@link Map}<String, String> containing all character mappings
- */
- protected Map<String, String> buildMapping() {
- Map<String, String> mapping = new HashMap<String, String>();
- mapping.putAll(StringPrepConstants.B_1_CommonlyMappedtoNothing);
-
mapping.putAll(StringPrepConstants.B_2_MappingForCaseFoldingUsedWithKFC);
-
mapping.putAll(StringPrepConstants.B_3_MappingForCaseFoldingWithNoNormalization);
-
- return mapping;
- }
-
- /**
- * Override this method and return a custom set of prohibited characters to
- * alter the Stringprep behavior.
- *
- * @return a {@link Set}<String> containing all characters that are
- * prohibited
- */
- protected Set<String> buildProhibitedSet() {
- Set<String> prohibited = new HashSet<String>();
- prohibited.addAll(StringPrepConstants.C_1_1_AsciiSpaceCharacters);
- prohibited.addAll(StringPrepConstants.C_1_2_NonAsciiSpaceCharacters);
- prohibited.addAll(StringPrepConstants.C_2_1_AsciiControlCharacters);
- prohibited.addAll(StringPrepConstants.C_2_2_NonAsciiControlCharacters);
- prohibited.addAll(StringPrepConstants.C_3_PrivateUse);
- prohibited.addAll(StringPrepConstants.C_4_NonCharacterCodePoints);
- prohibited.addAll(StringPrepConstants.C_5_SurrogateCodes);
- prohibited.addAll(StringPrepConstants.C_6_InappropriateForPlainText);
-
prohibited.addAll(StringPrepConstants.C_7_InappropriateForCanonicalRepresentation);
-
prohibited.addAll(StringPrepConstants.C_8_ChangeDisplayPropertiesOrAreDeprecated);
- prohibited.addAll(StringPrepConstants.C_9_TaggingCharacters);
- return prohibited;
- }
-
- private String codePointAt(String node, int i) {
- int c = node.codePointAt(i);
- return new String(Character.toChars(c));
- }
-
- private boolean NAND(boolean a, boolean b) {
- return (!(a || b)) || (a ^ b);
- }
-}
+/*
+ * 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.vysper.xmpp.addressing.stringprep;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import org.apache.vysper.compliance.SpecCompliant;
+
+/**
+ * Use this class to prepare a String according to the Stringprep profile. The
+ * methods {@link #buildMapping()} and {@link #buildProhibitedSet()} can be
+ * overridden to modify the behavior of the Stringprep check.
+ *
+ * see http://www.ietf.org/rfc/rfc3454.txt
+ *
+ * @author Gerolf Seitz ([email protected])
+ *
+ */
+@SpecCompliant(spec = "RFC3454")
+public class StringPrep {
+
+ private Map<String, String> mapping;
+
+ private Set<String> prohibited;
+
+ /**
+ * Construct.
+ */
+ public StringPrep() {
+ mapping = buildMapping();
+ prohibited = buildProhibitedSet();
+ }
+
+ /**
+ * Prepares the given {@link String} according to the Stringprep
+ * specification.
+ *
+ * @param str
+ * the string to prepare
+ * @return the prepared {@link String}
+ * @throws StringPrepViolationException
+ * in case the {@link String} cannot be prepared
+ */
+ public String prepareString(String str) throws
StringPrepViolationException {
+ // 1. map -> RFC3454:3
+ for (int i = 0; i < str.length(); i++) {
+ String codePoint = codePointAt(str, i);
+ if (mapping.containsKey(codePoint)) {
+ str = str.replace(codePoint, mapping.get(codePoint));
+ }
+ }
+ // TODO: 2. normalize -> RFC3454:4
+
+ // 3. prohibit -> RFC3454:5
+ for (int i = 0; i < str.length(); i++) {
+ String codePoint = codePointAt(str, i);
+ if (prohibited.contains(codePoint)) {
+ throw new
StringPrepViolationException(String.format("character '%s' prohibited!",
codePoint));
+ }
+ }
+
+ // 4. check bidi -> RFC3454:6
+ boolean containsRAndAlCat = false;
+ boolean containsLCat = false;
+ for (int i = 0; i < str.length() && NAND(containsRAndAlCat,
containsLCat); i++) {
+ String codePoint = codePointAt(str, i);
+ containsRAndAlCat |=
StringPrepConstants.D_1_CharactersWithBiDiPropertiesRorAl.contains(codePoint);
+ containsLCat |=
StringPrepConstants.D_2_CharactersWithBiDiPropertyL.contains(codePoint);
+ }
+ if (containsRAndAlCat && containsLCat) {
+ throw new StringPrepViolationException("invalid bidi sequence");
+ }
+ if (containsRAndAlCat) {
+ if
(!StringPrepConstants.D_1_CharactersWithBiDiPropertiesRorAl.contains(codePointAt(str,
0))
+ ||
!StringPrepConstants.D_1_CharactersWithBiDiPropertiesRorAl.contains(codePointAt(str,
str
+ .length() - 1))) {
+ throw new StringPrepViolationException("invalid bidi
sequence");
+ }
+ }
+
+ return str;
+ }
+
+ /**
+ * Override this method and return a custom map of character mappings to
+ * alter the Stringprep behavior.
+ *
+ * @return a {@link Map}<String, String> containing all character mappings
+ */
+ protected Map<String, String> buildMapping() {
+ Map<String, String> mapping = new HashMap<String, String>();
+ mapping.putAll(StringPrepConstants.B_1_CommonlyMappedtoNothing);
+
mapping.putAll(StringPrepConstants.B_2_MappingForCaseFoldingUsedWithKFC);
+
mapping.putAll(StringPrepConstants.B_3_MappingForCaseFoldingWithNoNormalization);
+
+ return mapping;
+ }
+
+ /**
+ * Override this method and return a custom set of prohibited characters to
+ * alter the Stringprep behavior.
+ *
+ * @return a {@link Set}<String> containing all characters that are
+ * prohibited
+ */
+ protected Set<String> buildProhibitedSet() {
+ Set<String> prohibited = new HashSet<String>();
+ prohibited.addAll(StringPrepConstants.C_1_1_AsciiSpaceCharacters);
+ prohibited.addAll(StringPrepConstants.C_1_2_NonAsciiSpaceCharacters);
+ prohibited.addAll(StringPrepConstants.C_2_1_AsciiControlCharacters);
+ prohibited.addAll(StringPrepConstants.C_2_2_NonAsciiControlCharacters);
+ prohibited.addAll(StringPrepConstants.C_3_PrivateUse);
+ prohibited.addAll(StringPrepConstants.C_4_NonCharacterCodePoints);
+ prohibited.addAll(StringPrepConstants.C_5_SurrogateCodes);
+ prohibited.addAll(StringPrepConstants.C_6_InappropriateForPlainText);
+
prohibited.addAll(StringPrepConstants.C_7_InappropriateForCanonicalRepresentation);
+
prohibited.addAll(StringPrepConstants.C_8_ChangeDisplayPropertiesOrAreDeprecated);
+ prohibited.addAll(StringPrepConstants.C_9_TaggingCharacters);
+ return prohibited;
+ }
+
+ private String codePointAt(String node, int i) {
+ int c = node.codePointAt(i);
+ return new String(Character.toChars(c));
+ }
+
+ private boolean NAND(boolean a, boolean b) {
+ return (!(a || b)) || (a ^ b);
+ }
+}
