You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by co...@apache.org on 2015/12/21 13:35:23 UTC
svn commit: r1721141 [1/2] - in /webservices/wss4j/trunk: ./ bindings/
build-tools/src/main/resources/ policy/src/main/java/org/apache/wss4j/policy/
policy/src/main/java/org/apache/wss4j/policy/builders/
policy/src/main/java/org/apache/wss4j/policy/model/
Author: coheigea
Date: Mon Dec 21 12:35:23 2015
New Revision: 1721141
URL: http://svn.apache.org/viewvc?rev=1721141&view=rev
Log:
Some checkstyle work
Added:
webservices/wss4j/trunk/build-tools/src/main/resources/wss4j-checkstyle.xml
Modified:
webservices/wss4j/trunk/bindings/pom.xml
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/SP11Constants.java
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/SP13Constants.java
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/SPConstants.java
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/SPUtils.java
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/ContentEncryptedElementsBuilder.java
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/EncryptionTokenBuilder.java
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/InitiatorEncryptionTokenBuilder.java
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/InitiatorSignatureTokenBuilder.java
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/InitiatorTokenBuilder.java
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/IssuedTokenBuilder.java
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/ProtectionTokenBuilder.java
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/RecipientEncryptionTokenBuilder.java
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/RecipientSignatureTokenBuilder.java
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/RecipientTokenBuilder.java
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/RelTokenBuilder.java
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/RequiredPartsBuilder.java
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/SignatureTokenBuilder.java
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/SignedElementsBuilder.java
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/SignedPartsBuilder.java
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/SupportingTokensBuilder.java
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/TransportTokenBuilder.java
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/WSS10Builder.java
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/WSS11Builder.java
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/AbstractBinding.java
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/AbstractSymmetricAsymmetricBinding.java
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/AbstractToken.java
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/AlgorithmSuite.java
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/HttpsToken.java
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/KerberosToken.java
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/Layout.java
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/RelToken.java
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/RequiredParts.java
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/SamlToken.java
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/SecureConversationToken.java
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/SecurityContextToken.java
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/SignedParts.java
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/SpnegoContextToken.java
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/UsernameToken.java
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/X509Token.java
webservices/wss4j/trunk/pom.xml
Modified: webservices/wss4j/trunk/bindings/pom.xml
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/bindings/pom.xml?rev=1721141&r1=1721140&r2=1721141&view=diff
==============================================================================
--- webservices/wss4j/trunk/bindings/pom.xml (original)
+++ webservices/wss4j/trunk/bindings/pom.xml Mon Dec 21 12:35:23 2015
@@ -40,4 +40,17 @@
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>disable-checkstyle</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <properties>
+ <checkstyle.skip>true</checkstyle.skip>
+ </properties>
+ </profile>
+ </profiles>
+
+
</project>
Added: webservices/wss4j/trunk/build-tools/src/main/resources/wss4j-checkstyle.xml
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/build-tools/src/main/resources/wss4j-checkstyle.xml?rev=1721141&view=auto
==============================================================================
--- webservices/wss4j/trunk/build-tools/src/main/resources/wss4j-checkstyle.xml (added)
+++ webservices/wss4j/trunk/build-tools/src/main/resources/wss4j-checkstyle.xml Mon Dec 21 12:35:23 2015
@@ -0,0 +1,150 @@
+<?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
+ 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.
+-->
+
+<!DOCTYPE module PUBLIC
+ "-//Puppy Crawl//DTD Check Configuration 1.2//EN"
+ "http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
+
+<module name="Checker">
+
+ <!-- Checks that property files contain the same keys. -->
+ <!-- See http://checkstyle.sf.net/config_misc.html#Translation -->
+ <module name="Translation"/>
+
+ <module name="FileLength"/>
+
+ <!-- Following interprets the header file as regular expressions. -->
+ <!-- <module name="RegexpHeader"/> -->
+
+ <module name="FileTabCharacter">
+ <property name="eachLine" value="true"/>
+ </module>
+
+ <module name="RegexpSingleline">
+ <!-- \s matches whitespace character, $ matches end of line. -->
+ <property name="format" value="^[^\s][^\*].*\s+$"/>
+ <property name="message" value="Line has trailing spaces."/>
+ </module>
+
+ <module name="TreeWalker">
+
+ <!-- required for SuppressWarningsFilter (and other Suppress* rules not used here) -->
+ <!-- see http://checkstyle.sourceforge.net/config_annotation.html#SuppressWarningsHolder -->
+ <module name="SuppressWarningsHolder"/>
+
+
+ <!-- Checks for Naming Conventions. -->
+ <!-- See http://checkstyle.sf.net/config_naming.html -->
+ <module name="ConstantName"/>
+ <module name="LocalFinalVariableName"/>
+ <module name="LocalVariableName"/>
+ <module name="MemberName"/>
+ <module name="MethodName"/>
+ <module name="PackageName"/>
+ <module name="ParameterName"/>
+ <module name="StaticVariableName"/>
+ <module name="TypeName"/>
+
+
+ <!-- Checks for imports -->
+ <!-- See http://checkstyle.sf.net/config_import.html -->
+ <!--module name="AvoidStarImport"/-->
+ <module name="IllegalImport"/> <!-- defaults to sun.* packages -->
+ <module name="RedundantImport"/>
+ <module name="UnusedImports"/>
+
+
+ <!-- Checks for Size Violations. -->
+ <!-- See http://checkstyle.sf.net/config_sizes.html -->
+ <module name="LineLength">
+ <property name="max" value="120"/>
+ <property name="ignorePattern" value="^ *\* *"/>
+ </module>
+ <module name="MethodLength">
+ <property name="max" value="200"/>
+ </module>
+ <module name="ParameterNumber">
+ <property name="max" value="8"/>
+ </module>
+
+
+ <!-- Checks for whitespace -->
+ <!-- See http://checkstyle.sf.net/config_whitespace.html -->
+ <module name="EmptyForIteratorPad"/>
+ <module name="MethodParamPad"/>
+ <module name="NoWhitespaceAfter"/>
+ <module name="NoWhitespaceBefore"/>
+ <module name="OperatorWrap"/>
+ <module name="ParenPad"/>
+ <module name="TypecastParenPad"/>
+ <module name="WhitespaceAfter"/>
+ <module name="WhitespaceAround"/>
+
+
+ <!-- Modifier Checks -->
+ <!-- See http://checkstyle.sf.net/config_modifiers.html -->
+ <module name="ModifierOrder"/>
+ <module name="RedundantModifier"/>
+
+
+ <!-- Checks for blocks. You know, those {}'s -->
+ <!-- See http://checkstyle.sf.net/config_blocks.html -->
+ <module name="AvoidNestedBlocks"/>
+ <module name="EmptyBlock"/>
+ <module name="LeftCurly"/>
+ <module name="NeedBraces"/>
+ <module name="RightCurly"/>
+
+
+ <!-- Checks for common coding problems -->
+ <!-- See http://checkstyle.sf.net/config_coding.html -->
+ <!-- module name="AvoidInlineConditionals"/ -->
+ <module name="EmptyStatement"/>
+ <module name="EqualsHashCode"/>
+ <module name="IllegalInstantiation"/>
+
+
+ <!-- Checks for class design -->
+ <!-- See http://checkstyle.sf.net/config_design.html -->
+ <module name="FinalClass"/>
+ <module name="InterfaceIsType"/>
+
+
+ <!-- Miscellaneous other checks. -->
+ <!-- See http://checkstyle.sf.net/config_misc.html -->
+ <module name="ArrayTypeStyle"/>
+ <module name="UpperEll"/>
+
+ <module name="FileContentsHolder"/>
+
+ </module>
+
+ <!-- Support @SuppressWarnings (added in Checkstyle 5.7) -->
+ <!-- see http://checkstyle.sourceforge.net/config.html#SuppressWarningsFilter -->
+ <module name="SuppressWarningsFilter"/>
+
+ <!-- Checks properties file for a duplicated properties. -->
+ <!-- See http://checkstyle.sourceforge.net/config_misc.html#UniqueProperties -->
+ <module name="UniqueProperties"/>
+
+ <module name="SuppressionCommentFilter"/>
+
+</module>
Modified: webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/SP11Constants.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/SP11Constants.java?rev=1721141&r1=1721140&r2=1721141&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/SP11Constants.java (original)
+++ webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/SP11Constants.java Mon Dec 21 12:35:23 2015
@@ -34,26 +34,26 @@ public class SP11Constants extends SPCon
return sp11Constants;
}
- public final static String SP_NS = "http://schemas.xmlsoap.org/ws/2005/07/securitypolicy";
+ public static final String SP_NS = "http://schemas.xmlsoap.org/ws/2005/07/securitypolicy";
- public final static String SP_PREFIX = "sp";
+ public static final String SP_PREFIX = "sp";
public static final QName INCLUDE_TOKEN = new QName(
SP11Constants.SP_NS, SPConstants.ATTR_INCLUDE_TOKEN, SP11Constants.SP_PREFIX);
- public final static String INCLUDE_NEVER =
+ public static final String INCLUDE_NEVER =
SP11Constants.SP_NS + SPConstants.INCLUDE_TOKEN_NEVER_SUFFIX;
- public final static String INCLUDE_ONCE =
+ public static final String INCLUDE_ONCE =
SP11Constants.SP_NS + SPConstants.INCLUDE_TOKEN_ONCE_SUFFIX;
- public final static String INCLUDE_ALWAYS_TO_RECIPIENT =
+ public static final String INCLUDE_ALWAYS_TO_RECIPIENT =
SP11Constants.SP_NS + SPConstants.INCLUDE_TOKEN_ALWAYS_TO_RECIPIENT_SUFFIX;
- public final static String INCLUDE_ALWAYS_TO_INITIATOR =
+ public static final String INCLUDE_ALWAYS_TO_INITIATOR =
SP11Constants.SP_NS + SPConstants.INCLUDE_TOKEN_ALWAYS_TO_INITIATOR_SUFFIX;
- public final static String INCLUDE_ALWAYS =
+ public static final String INCLUDE_ALWAYS =
SP11Constants.SP_NS + SPConstants.INCLUDE_TOKEN_ALWAYS_SUFFIX;
public static final QName ATTR_XPATH_VERSION = new QName(
@@ -317,7 +317,7 @@ public class SP11Constants extends SPCon
public static final QName BOOTSTRAP_POLICY = new QName(
SP11Constants.SP_NS, SPConstants.BOOTSTRAP_POLICY, SP11Constants.SP_PREFIX);
- public final static QName XPATH = new QName(
+ public static final QName XPATH = new QName(
SP11Constants.SP_NS, SPConstants.XPATH_EXPR, SP11Constants.SP_PREFIX);
public static final QName HEADER = new QName(
Modified: webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/SP13Constants.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/SP13Constants.java?rev=1721141&r1=1721140&r2=1721141&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/SP13Constants.java (original)
+++ webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/SP13Constants.java Mon Dec 21 12:35:23 2015
@@ -35,8 +35,8 @@ public class SP13Constants extends SP12C
return sp13Constants;
}
- public final static String SP_NS = "http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200802";
- public final static String SP_PREFIX = "sp13";
+ public static final String SP_NS = "http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200802";
+ public static final String SP_PREFIX = "sp13";
public static final QName CONTENT_SIGNATURE_TRANSFORM = new QName(
SP13Constants.SP_NS, SPConstants.CONTENT_SIGNATURE_TRANSFORM, SP13Constants.SP_PREFIX);
Modified: webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/SPConstants.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/SPConstants.java?rev=1721141&r1=1721140&r2=1721141&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/SPConstants.java (original)
+++ webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/SPConstants.java Mon Dec 21 12:35:23 2015
@@ -45,16 +45,16 @@ public abstract class SPConstants {
this.prefix = prefix;
}
- private static final Map<String, SPVersion> lookup = new HashMap<>();
+ private static final Map<String, SPVersion> LOOKUP = new HashMap<>();
static {
for (SPVersion spVersion : EnumSet.allOf(SPVersion.class)) {
- lookup.put(spVersion.namespace, spVersion);
+ LOOKUP.put(spVersion.namespace, spVersion);
}
}
public static SPVersion getSPVersion(String namespace) {
- return lookup.get(namespace);
+ return LOOKUP.get(namespace);
}
public SPConstants getSPConstants() {
@@ -73,270 +73,272 @@ public abstract class SPConstants {
public static final String P_LOCALNAME = "Policy";
- public final static String LAYOUT = "Layout";
+ public static final String LAYOUT = "Layout";
/**
* Security Header Layout : Strict
*/
- public final static String LAYOUT_STRICT = "Strict";
+ public static final String LAYOUT_STRICT = "Strict";
/**
* Security Header Layout : Lax
*/
- public final static String LAYOUT_LAX = "Lax";
+ public static final String LAYOUT_LAX = "Lax";
/**
* Security Header Layout : LaxTsFirst
*/
- public final static String LAYOUT_LAX_TIMESTAMP_FIRST = "LaxTsFirst";
+ public static final String LAYOUT_LAX_TIMESTAMP_FIRST = "LaxTsFirst";
/**
* Security Header Layout : LaxTsLast
*/
- public final static String LAYOUT_LAX_TIMESTAMP_LAST = "LaxTsLast";
+ public static final String LAYOUT_LAX_TIMESTAMP_LAST = "LaxTsLast";
////////////////////////////////////////////////////////////////////////////////////////////////
/**
* Protection Order : EncryptBeforeSigning
*/
- public final static String ENCRYPT_BEFORE_SIGNING = "EncryptBeforeSigning";
+ public static final String ENCRYPT_BEFORE_SIGNING = "EncryptBeforeSigning";
/**
* Protection Order : SignBeforeEncrypting
*/
- public final static String SIGN_BEFORE_ENCRYPTING = "SignBeforeEncrypting";
+ public static final String SIGN_BEFORE_ENCRYPTING = "SignBeforeEncrypting";
////////////////////////////////////////////////////////////////////////////////////////////////
- public final static String ENCRYPT_SIGNATURE = "EncryptSignature";
+ public static final String ENCRYPT_SIGNATURE = "EncryptSignature";
////////////////////////////////////////////////////////////////////////////////////////////////
- public final static String PROTECT_TOKENS = "ProtectTokens";
+ public static final String PROTECT_TOKENS = "ProtectTokens";
////////////////////////////////////////////////////////////////////////////////////////////////
- public final static String ONLY_SIGN_ENTIRE_HEADERS_AND_BODY = "OnlySignEntireHeadersAndBody";
+ public static final String ONLY_SIGN_ENTIRE_HEADERS_AND_BODY = "OnlySignEntireHeadersAndBody";
////////////////////////////////////////////////////////////////////////////////////////////////
- public final static String INCLUDE_TIMESTAMP = "IncludeTimestamp";
+ public static final String INCLUDE_TIMESTAMP = "IncludeTimestamp";
////////////////////////////////////////////////////////////////////////////////////////////////
- public final static String SIGNED_PARTS = "SignedParts";
+ public static final String SIGNED_PARTS = "SignedParts";
- public final static String ENCRYPTED_PARTS = "EncryptedParts";
+ public static final String ENCRYPTED_PARTS = "EncryptedParts";
- public final static String SIGNED_ELEMENTS = "SignedElements";
+ public static final String SIGNED_ELEMENTS = "SignedElements";
- public final static String ENCRYPTED_ELEMENTS = "EncryptedElements";
+ public static final String ENCRYPTED_ELEMENTS = "EncryptedElements";
- public final static String REQUIRED_ELEMENTS = "RequiredElements";
+ public static final String REQUIRED_ELEMENTS = "RequiredElements";
- public final static String CONTENT_ENCRYPTED_ELEMENTS = "ContentEncryptedElements";
+ public static final String CONTENT_ENCRYPTED_ELEMENTS = "ContentEncryptedElements";
- public final static String REQUIRED_PARTS = "RequiredParts";
+ public static final String REQUIRED_PARTS = "RequiredParts";
- public final static String XPATH_VERSION = "XPathVersion";
+ public static final String XPATH_VERSION = "XPathVersion";
- public final static String XPATH_EXPR = "XPath";
+ public static final String XPATH_EXPR = "XPath";
- public final static String XPATH2_EXPR = "Xpath2";
+ public static final String XPATH2_EXPR = "Xpath2";
- public final static String FILTER = "Filter";
+ public static final String FILTER = "Filter";
////////////////////////////////////////////////////////////////////////////////////////////////
// X509 Token types
- public final static String X509_TOKEN = "X509Token";
+ public static final String X509_TOKEN = "X509Token";
- public final static String WSS_X509_V1_TOKEN10 = "WssX509V1Token10";
+ public static final String WSS_X509_V1_TOKEN10 = "WssX509V1Token10";
- public final static String WSS_X509_V3_TOKEN10 = "WssX509V3Token10";
+ public static final String WSS_X509_V3_TOKEN10 = "WssX509V3Token10";
- public final static String WSS_X509_PKCS7_TOKEN10 = "WssX509Pkcs7Token10";
+ public static final String WSS_X509_PKCS7_TOKEN10 = "WssX509Pkcs7Token10";
- public final static String WSS_X509_PKI_PATH_V1_TOKEN10 = "WssX509PkiPathV1Token10";
+ public static final String WSS_X509_PKI_PATH_V1_TOKEN10 = "WssX509PkiPathV1Token10";
- public final static String WSS_X509_V1_TOKEN11 = "WssX509V1Token11";
+ public static final String WSS_X509_V1_TOKEN11 = "WssX509V1Token11";
- public final static String WSS_X509_V3_TOKEN11 = "WssX509V3Token11";
+ public static final String WSS_X509_V3_TOKEN11 = "WssX509V3Token11";
- public final static String WSS_X509_PKCS7_TOKEN11 = "WssX509Pkcs7Token11";
+ public static final String WSS_X509_PKCS7_TOKEN11 = "WssX509Pkcs7Token11";
- public final static String WSS_X509_PKI_PATH_V1_TOKEN11 = "WssX509PkiPathV1Token11";
+ public static final String WSS_X509_PKI_PATH_V1_TOKEN11 = "WssX509PkiPathV1Token11";
- public final static String USERNAME_TOKEN = "UsernameToken";
+ public static final String USERNAME_TOKEN = "UsernameToken";
- public final static String USERNAME_TOKEN10 = "WssUsernameToken10";
+ public static final String USERNAME_TOKEN10 = "WssUsernameToken10";
- public final static String USERNAME_TOKEN11 = "WssUsernameToken11";
+ public static final String USERNAME_TOKEN11 = "WssUsernameToken11";
- public final static String TRANSPORT_TOKEN = "TransportToken";
+ public static final String TRANSPORT_TOKEN = "TransportToken";
- public final static String HTTPS_TOKEN = "HttpsToken";
+ public static final String HTTPS_TOKEN = "HttpsToken";
- public final static String KERBEROS_TOKEN = "KerberosToken";
+ public static final String KERBEROS_TOKEN = "KerberosToken";
- public final static String SPNEGO_CONTEXT_TOKEN = "SpnegoContextToken";
+ public static final String SPNEGO_CONTEXT_TOKEN = "SpnegoContextToken";
- public final static String REQUIRE_CLIENT_CERTIFICATE = "RequireClientCertificate";
+ public static final String REQUIRE_CLIENT_CERTIFICATE = "RequireClientCertificate";
- public final static String HTTP_BASIC_AUTHENTICATION = "HttpBasicAuthentication";
+ public static final String HTTP_BASIC_AUTHENTICATION = "HttpBasicAuthentication";
- public final static String HTTP_DIGEST_AUTHENTICATION = "HttpDigestAuthentication";
+ public static final String HTTP_DIGEST_AUTHENTICATION = "HttpDigestAuthentication";
- public final static String SECURITY_CONTEXT_TOKEN = "SecurityContextToken";
+ public static final String SECURITY_CONTEXT_TOKEN = "SecurityContextToken";
- public final static String SECURE_CONVERSATION_TOKEN = "SecureConversationToken";
+ public static final String SECURE_CONVERSATION_TOKEN = "SecureConversationToken";
- public final static String SAML_TOKEN = "SamlToken";
+ public static final String SAML_TOKEN = "SamlToken";
- public final static String REL_TOKEN = "RelToken";
+ public static final String REL_TOKEN = "RelToken";
- public final static String KEY_VALUE_TOKEN = "KeyValueToken";
+ public static final String KEY_VALUE_TOKEN = "KeyValueToken";
- public final static String RSA_KEY_VALUE = "RsaKeyValue";
+ public static final String RSA_KEY_VALUE = "RsaKeyValue";
- public final static String ISSUED_TOKEN = "IssuedToken";
+ public static final String ISSUED_TOKEN = "IssuedToken";
- public final static String SIGNATURE_TOKEN = "SignatureToken";
+ public static final String SIGNATURE_TOKEN = "SignatureToken";
- public final static String ENCRYPTION_TOKEN = "EncryptionToken";
+ public static final String ENCRYPTION_TOKEN = "EncryptionToken";
- public final static String PROTECTION_TOKEN = "ProtectionToken";
+ public static final String PROTECTION_TOKEN = "ProtectionToken";
- public final static String INITIATOR_TOKEN = "InitiatorToken";
+ public static final String INITIATOR_TOKEN = "InitiatorToken";
- public final static String INITIATOR_SIGNATURE_TOKEN = "InitiatorSignatureToken";
+ public static final String INITIATOR_SIGNATURE_TOKEN = "InitiatorSignatureToken";
- public final static String INITIATOR_ENCRYPTION_TOKEN = "InitiatorEncryptionToken";
+ public static final String INITIATOR_ENCRYPTION_TOKEN = "InitiatorEncryptionToken";
- public final static String RECIPIENT_TOKEN = "RecipientToken";
+ public static final String RECIPIENT_TOKEN = "RecipientToken";
- public final static String RECIPIENT_SIGNATURE_TOKEN = "RecipientSignatureToken";
+ public static final String RECIPIENT_SIGNATURE_TOKEN = "RecipientSignatureToken";
- public final static String RECIPIENT_ENCRYPTION_TOKEN = "RecipientEncryptionToken";
+ public static final String RECIPIENT_ENCRYPTION_TOKEN = "RecipientEncryptionToken";
- public final static String SUPPORTING_TOKENS = "SupportingTokens";
+ public static final String SUPPORTING_TOKENS = "SupportingTokens";
- public final static String SIGNED_SUPPORTING_TOKENS = "SignedSupportingTokens";
+ public static final String SIGNED_SUPPORTING_TOKENS = "SignedSupportingTokens";
- public final static String ENDORSING_SUPPORTING_TOKENS = "EndorsingSupportingTokens";
+ public static final String ENDORSING_SUPPORTING_TOKENS = "EndorsingSupportingTokens";
- public final static String SIGNED_ENDORSING_SUPPORTING_TOKENS = "SignedEndorsingSupportingTokens";
+ public static final String SIGNED_ENDORSING_SUPPORTING_TOKENS = "SignedEndorsingSupportingTokens";
- public final static String ENCRYPTED_SUPPORTING_TOKENS = "EncryptedSupportingTokens";
+ public static final String ENCRYPTED_SUPPORTING_TOKENS = "EncryptedSupportingTokens";
- public final static String SIGNED_ENCRYPTED_SUPPORTING_TOKENS = "SignedEncryptedSupportingTokens";
+ public static final String SIGNED_ENCRYPTED_SUPPORTING_TOKENS = "SignedEncryptedSupportingTokens";
- public final static String ENDORSING_ENCRYPTED_SUPPORTING_TOKENS = "EndorsingEncryptedSupportingTokens";
+ public static final String ENDORSING_ENCRYPTED_SUPPORTING_TOKENS = "EndorsingEncryptedSupportingTokens";
- public final static String SIGNED_ENDORSING_ENCRYPTED_SUPPORTING_TOKENS = "SignedEndorsingEncryptedSupportingTokens";
+ public static final String SIGNED_ENDORSING_ENCRYPTED_SUPPORTING_TOKENS =
+ "SignedEndorsingEncryptedSupportingTokens";
////////////////////////////////////////////////////////////////////////////////////////////////
- public final static String ALGORITHM_SUITE = "AlgorithmSuite";
+ public static final String ALGORITHM_SUITE = "AlgorithmSuite";
- public final static String ALGO_SUITE_BASIC256 = "Basic256";
+ public static final String ALGO_SUITE_BASIC256 = "Basic256";
- public final static String ALGO_SUITE_BASIC192 = "Basic192";
+ public static final String ALGO_SUITE_BASIC192 = "Basic192";
- public final static String ALGO_SUITE_BASIC128 = "Basic128";
+ public static final String ALGO_SUITE_BASIC128 = "Basic128";
- public final static String ALGO_SUITE_TRIPLE_DES = "TripleDes";
+ public static final String ALGO_SUITE_TRIPLE_DES = "TripleDes";
- public final static String ALGO_SUITE_BASIC256_RSA15 = "Basic256Rsa15";
+ public static final String ALGO_SUITE_BASIC256_RSA15 = "Basic256Rsa15";
- public final static String ALGO_SUITE_BASIC192_RSA15 = "Basic192Rsa15";
+ public static final String ALGO_SUITE_BASIC192_RSA15 = "Basic192Rsa15";
- public final static String ALGO_SUITE_BASIC128_RSA15 = "Basic128Rsa15";
+ public static final String ALGO_SUITE_BASIC128_RSA15 = "Basic128Rsa15";
- public final static String ALGO_SUITE_TRIPLE_DES_RSA15 = "TripleDesRsa15";
+ public static final String ALGO_SUITE_TRIPLE_DES_RSA15 = "TripleDesRsa15";
- public final static String ALGO_SUITE_BASIC256_SHA256 = "Basic256Sha256";
+ public static final String ALGO_SUITE_BASIC256_SHA256 = "Basic256Sha256";
- public final static String ALGO_SUITE_BASIC192_SHA256 = "Basic192Sha256";
+ public static final String ALGO_SUITE_BASIC192_SHA256 = "Basic192Sha256";
- public final static String ALGO_SUITE_BASIC128_SHA256 = "Basic128Sha256";
+ public static final String ALGO_SUITE_BASIC128_SHA256 = "Basic128Sha256";
- public final static String ALGO_SUITE_TRIPLE_DES_SHA256 = "TripleDesSha256";
+ public static final String ALGO_SUITE_TRIPLE_DES_SHA256 = "TripleDesSha256";
- public final static String ALGO_SUITE_BASIC256_SHA256_RSA15 = "Basic256Sha256Rsa15";
+ public static final String ALGO_SUITE_BASIC256_SHA256_RSA15 = "Basic256Sha256Rsa15";
- public final static String ALGO_SUITE_BASIC192_SHA256_RSA15 = "Basic192Sha256Rsa15";
+ public static final String ALGO_SUITE_BASIC192_SHA256_RSA15 = "Basic192Sha256Rsa15";
- public final static String ALGO_SUITE_BASIC128_SHA256_RSA15 = "Basic128Sha256Rsa15";
+ public static final String ALGO_SUITE_BASIC128_SHA256_RSA15 = "Basic128Sha256Rsa15";
- public final static String ALGO_SUITE_TRIPLE_DES_SHA256_RSA15 = "TripleDesSha256Rsa15";
+ public static final String ALGO_SUITE_TRIPLE_DES_SHA256_RSA15 = "TripleDesSha256Rsa15";
// /
// /Algorithms
// /
- public final static String HMAC_SHA1 = "http://www.w3.org/2000/09/xmldsig#hmac-sha1";
+ public static final String HMAC_SHA1 = "http://www.w3.org/2000/09/xmldsig#hmac-sha1";
- public final static String RSA_SHA1 = "http://www.w3.org/2000/09/xmldsig#rsa-sha1";
+ public static final String RSA_SHA1 = "http://www.w3.org/2000/09/xmldsig#rsa-sha1";
- public final static String RSA_SHA256 = "http://www.w3.org/2001/04/xmldsig-more#rsa-sha256";
+ public static final String RSA_SHA256 = "http://www.w3.org/2001/04/xmldsig-more#rsa-sha256";
- public final static String RSA_SHA384 = "http://www.w3.org/2001/04/xmldsig-more#rsa-sha384";
+ public static final String RSA_SHA384 = "http://www.w3.org/2001/04/xmldsig-more#rsa-sha384";
- public final static String RSA_SHA512 = "http://www.w3.org/2001/04/xmldsig-more#rsa-sha512";
+ public static final String RSA_SHA512 = "http://www.w3.org/2001/04/xmldsig-more#rsa-sha512";
- public final static String SHA1 = "http://www.w3.org/2000/09/xmldsig#sha1";
+ public static final String SHA1 = "http://www.w3.org/2000/09/xmldsig#sha1";
- public final static String SHA256 = "http://www.w3.org/2001/04/xmlenc#sha256";
+ public static final String SHA256 = "http://www.w3.org/2001/04/xmlenc#sha256";
- public final static String SHA512 = "http://www.w3.org/2001/04/xmlenc#sha512";
+ public static final String SHA512 = "http://www.w3.org/2001/04/xmlenc#sha512";
- public final static String AES128 = "http://www.w3.org/2001/04/xmlenc#aes128-cbc";
+ public static final String AES128 = "http://www.w3.org/2001/04/xmlenc#aes128-cbc";
- public final static String AES192 = "http://www.w3.org/2001/04/xmlenc#aes192-cbc";
+ public static final String AES192 = "http://www.w3.org/2001/04/xmlenc#aes192-cbc";
- public final static String AES256 = "http://www.w3.org/2001/04/xmlenc#aes256-cbc";
+ public static final String AES256 = "http://www.w3.org/2001/04/xmlenc#aes256-cbc";
- public final static String TRIPLE_DES = "http://www.w3.org/2001/04/xmlenc#tripledes-cbc";
+ public static final String TRIPLE_DES = "http://www.w3.org/2001/04/xmlenc#tripledes-cbc";
- public final static String KW_AES128 = "http://www.w3.org/2001/04/xmlenc#kw-aes128";
+ public static final String KW_AES128 = "http://www.w3.org/2001/04/xmlenc#kw-aes128";
- public final static String KW_AES192 = "http://www.w3.org/2001/04/xmlenc#kw-aes192";
+ public static final String KW_AES192 = "http://www.w3.org/2001/04/xmlenc#kw-aes192";
- public final static String KW_AES256 = "http://www.w3.org/2001/04/xmlenc#kw-aes256";
+ public static final String KW_AES256 = "http://www.w3.org/2001/04/xmlenc#kw-aes256";
- public final static String KW_TRIPLE_DES = "http://www.w3.org/2001/04/xmlenc#kw-tripledes";
+ public static final String KW_TRIPLE_DES = "http://www.w3.org/2001/04/xmlenc#kw-tripledes";
- public final static String KW_RSA_OAEP = "http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p";
+ public static final String KW_RSA_OAEP = "http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p";
- public final static String KW_RSA15 = "http://www.w3.org/2001/04/xmlenc#rsa-1_5";
+ public static final String KW_RSA15 = "http://www.w3.org/2001/04/xmlenc#rsa-1_5";
- public final static String P_SHA1 = "http://schemas.xmlsoap.org/ws/2005/02/sc/dk/p_sha1";
+ public static final String P_SHA1 = "http://schemas.xmlsoap.org/ws/2005/02/sc/dk/p_sha1";
- public final static String P_SHA1_L128 = "http://schemas.xmlsoap.org/ws/2005/02/sc/dk/p_sha1";
+ public static final String P_SHA1_L128 = "http://schemas.xmlsoap.org/ws/2005/02/sc/dk/p_sha1";
- public final static String P_SHA1_L192 = "http://schemas.xmlsoap.org/ws/2005/02/sc/dk/p_sha1";
+ public static final String P_SHA1_L192 = "http://schemas.xmlsoap.org/ws/2005/02/sc/dk/p_sha1";
- public final static String P_SHA1_L256 = "http://schemas.xmlsoap.org/ws/2005/02/sc/dk/p_sha1";
+ public static final String P_SHA1_L256 = "http://schemas.xmlsoap.org/ws/2005/02/sc/dk/p_sha1";
- public final static String XPATH = "http://www.w3.org/TR/1999/REC-xpath-19991116";
+ public static final String XPATH = "http://www.w3.org/TR/1999/REC-xpath-19991116";
- public final static String XPATH20 = "http://www.w3.org/2002/06/xmldsig-filter2";
+ public static final String XPATH20 = "http://www.w3.org/2002/06/xmldsig-filter2";
- public final static String C14N = "http://www.w3.org/TR/2001/REC-xml-c14n-20010315";
+ public static final String C14N = "http://www.w3.org/TR/2001/REC-xml-c14n-20010315";
- public final static String C14N11 = "http://www.w3.org/2006/12/xml-c14n11";
+ public static final String C14N11 = "http://www.w3.org/2006/12/xml-c14n11";
- public final static String EX_C14N = "http://www.w3.org/2001/10/xml-exc-c14n#";
+ public static final String EX_C14N = "http://www.w3.org/2001/10/xml-exc-c14n#";
- public final static String SNT = "http://www.w3.org/TR/soap12-n11n";
+ public static final String SNT = "http://www.w3.org/TR/soap12-n11n";
- public final static String STRT10 = "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-soap-message-security-1.0#STR-Transform";
+ public static final String STRT10 =
+ "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-soap-message-security-1.0#STR-Transform";
// /////////////////////////////////////////////////////////////////////////////////////////////
@@ -354,7 +356,7 @@ public abstract class SPConstants {
////////////////////////////////////////////////////////////////////////////////////////////////
- public final static String ATTR_INCLUDE_TOKEN = "IncludeToken";
+ public static final String ATTR_INCLUDE_TOKEN = "IncludeToken";
public static final String INCLUDE_TOKEN_NEVER_SUFFIX = "/IncludeToken/Never";
@@ -502,16 +504,16 @@ public abstract class SPConstants {
INCLUDE_TOKEN_ALWAYS_TO_INITIATOR,
INCLUDE_TOKEN_ALWAYS;
- private static final Map<String, IncludeTokenType> lookup = new HashMap<>();
+ private static final Map<String, IncludeTokenType> LOOKUP = new HashMap<>();
static {
for (IncludeTokenType u : EnumSet.allOf(IncludeTokenType.class)) {
- lookup.put(u.name(), u);
+ LOOKUP.put(u.name(), u);
}
}
public static IncludeTokenType lookUp(String name) {
- return lookup.get(name);
+ return LOOKUP.get(name);
}
}
Modified: webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/SPUtils.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/SPUtils.java?rev=1721141&r1=1721140&r2=1721141&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/SPUtils.java (original)
+++ webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/SPUtils.java Mon Dec 21 12:35:23 2015
@@ -29,7 +29,7 @@ import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
import org.w3c.dom.Text;
-public class SPUtils {
+public final class SPUtils {
private SPUtils() {
}
@@ -137,7 +137,7 @@ public class SPUtils {
String value = attr.getValue();
if ("true".equalsIgnoreCase(value) || "1".equals(value)) {
if (SP13Constants.SP_NS.equals(element.getNamespaceURI())) {
- throw new IllegalArgumentException("Ignorable attribute not allowed. @see http://docs.oasis-open.org/ws-sx/ws-securitypolicy/v1.3/os/ws-securitypolicy-1.3-spec-os.html#_Toc212617792");
+ throw new IllegalArgumentException("Ignorable attribute not allowed.");
}
return true;
}
@@ -188,7 +188,10 @@ public class SPUtils {
} else if (prefix == null && "xmlns".equals(attr.getLocalName())) {
xmlStreamWriter.writeDefaultNamespace(attr.getValue());
} else {
- xmlStreamWriter.writeAttribute(prefix, attr.getNamespaceURI(), attr.getLocalName(), attr.getValue());
+ xmlStreamWriter.writeAttribute(prefix,
+ attr.getNamespaceURI(),
+ attr.getLocalName(),
+ attr.getValue());
}
}
//write ns after processing element namespaces to prevent redeclarations
Modified: webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/ContentEncryptedElementsBuilder.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/ContentEncryptedElementsBuilder.java?rev=1721141&r1=1721140&r2=1721141&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/ContentEncryptedElementsBuilder.java (original)
+++ webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/ContentEncryptedElementsBuilder.java Mon Dec 21 12:35:23 2015
@@ -38,7 +38,8 @@ public class ContentEncryptedElementsBui
final SPConstants.SPVersion spVersion = SPConstants.SPVersion.getSPVersion(element.getNamespaceURI());
final String xPathVersion = getXPathVersion(element);
final List<XPath> xPaths = getXPathExpressions(element, spVersion);
- ContentEncryptedElements contentEncryptedElements = new ContentEncryptedElements(spVersion, xPathVersion, xPaths);
+ ContentEncryptedElements contentEncryptedElements =
+ new ContentEncryptedElements(spVersion, xPathVersion, xPaths);
contentEncryptedElements.setOptional(SPUtils.isOptional(element));
contentEncryptedElements.setIgnorable(SPUtils.isIgnorable(element));
return contentEncryptedElements;
Modified: webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/EncryptionTokenBuilder.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/EncryptionTokenBuilder.java?rev=1721141&r1=1721140&r2=1721141&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/EncryptionTokenBuilder.java (original)
+++ webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/EncryptionTokenBuilder.java Mon Dec 21 12:35:23 2015
@@ -37,7 +37,8 @@ public class EncryptionTokenBuilder impl
public Assertion build(Element element, AssertionBuilderFactory factory) throws IllegalArgumentException {
final SPConstants.SPVersion spVersion = SPConstants.SPVersion.getSPVersion(element.getNamespaceURI());
final Element nestedPolicyElement = SPUtils.getFirstPolicyChildElement(element);
- final Policy nestedPolicy = nestedPolicyElement != null ? factory.getPolicyEngine().getPolicy(nestedPolicyElement) : new Policy();
+ final Policy nestedPolicy =
+ nestedPolicyElement != null ? factory.getPolicyEngine().getPolicy(nestedPolicyElement) : new Policy();
EncryptionToken encryptionToken = new EncryptionToken(
spVersion,
nestedPolicy
Modified: webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/InitiatorEncryptionTokenBuilder.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/InitiatorEncryptionTokenBuilder.java?rev=1721141&r1=1721140&r2=1721141&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/InitiatorEncryptionTokenBuilder.java (original)
+++ webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/InitiatorEncryptionTokenBuilder.java Mon Dec 21 12:35:23 2015
@@ -38,7 +38,8 @@ public class InitiatorEncryptionTokenBui
final SPConstants.SPVersion spVersion = SPConstants.SPVersion.getSPVersion(element.getNamespaceURI());
final Element nestedPolicyElement = SPUtils.getFirstPolicyChildElement(element);
- final Policy nestedPolicy = nestedPolicyElement != null ? factory.getPolicyEngine().getPolicy(nestedPolicyElement) : new Policy();
+ final Policy nestedPolicy =
+ nestedPolicyElement != null ? factory.getPolicyEngine().getPolicy(nestedPolicyElement) : new Policy();
InitiatorEncryptionToken initiatorEncryptionToken = new InitiatorEncryptionToken(
spVersion,
nestedPolicy
Modified: webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/InitiatorSignatureTokenBuilder.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/InitiatorSignatureTokenBuilder.java?rev=1721141&r1=1721140&r2=1721141&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/InitiatorSignatureTokenBuilder.java (original)
+++ webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/InitiatorSignatureTokenBuilder.java Mon Dec 21 12:35:23 2015
@@ -38,7 +38,8 @@ public class InitiatorSignatureTokenBuil
final SPConstants.SPVersion spVersion = SPConstants.SPVersion.getSPVersion(element.getNamespaceURI());
final Element nestedPolicyElement = SPUtils.getFirstPolicyChildElement(element);
- final Policy nestedPolicy = nestedPolicyElement != null ? factory.getPolicyEngine().getPolicy(nestedPolicyElement) : new Policy();
+ final Policy nestedPolicy =
+ nestedPolicyElement != null ? factory.getPolicyEngine().getPolicy(nestedPolicyElement) : new Policy();
InitiatorSignatureToken initiatorSignatureToken = new InitiatorSignatureToken(
spVersion,
nestedPolicy
Modified: webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/InitiatorTokenBuilder.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/InitiatorTokenBuilder.java?rev=1721141&r1=1721140&r2=1721141&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/InitiatorTokenBuilder.java (original)
+++ webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/InitiatorTokenBuilder.java Mon Dec 21 12:35:23 2015
@@ -38,7 +38,8 @@ public class InitiatorTokenBuilder imple
final SPConstants.SPVersion spVersion = SPConstants.SPVersion.getSPVersion(element.getNamespaceURI());
final Element nestedPolicyElement = SPUtils.getFirstPolicyChildElement(element);
- final Policy nestedPolicy = nestedPolicyElement != null ? factory.getPolicyEngine().getPolicy(nestedPolicyElement) : new Policy();
+ final Policy nestedPolicy =
+ nestedPolicyElement != null ? factory.getPolicyEngine().getPolicy(nestedPolicyElement) : new Policy();
InitiatorToken initiatorToken = new InitiatorToken(
spVersion,
nestedPolicy
Modified: webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/IssuedTokenBuilder.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/IssuedTokenBuilder.java?rev=1721141&r1=1721140&r2=1721141&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/IssuedTokenBuilder.java (original)
+++ webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/IssuedTokenBuilder.java Mon Dec 21 12:35:23 2015
@@ -49,7 +49,8 @@ public class IssuedTokenBuilder implemen
throw new IllegalArgumentException("sp:IssuedToken must have an inner wsp:Policy element");
}
final Policy nestedPolicy = factory.getPolicyEngine().getPolicy(nestedPolicyElement);
- final Element requestSecurityTokenTemplate = SPUtils.getFirstChildElement(element, spVersion.getSPConstants().getRequestSecurityTokenTemplate());
+ final Element requestSecurityTokenTemplate =
+ SPUtils.getFirstChildElement(element, spVersion.getSPConstants().getRequestSecurityTokenTemplate());
if (requestSecurityTokenTemplate == null) {
throw new IllegalArgumentException("sp:IssuedToken must have a sp:RequestSecurityTokenTemplate element");
}
Modified: webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/ProtectionTokenBuilder.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/ProtectionTokenBuilder.java?rev=1721141&r1=1721140&r2=1721141&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/ProtectionTokenBuilder.java (original)
+++ webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/ProtectionTokenBuilder.java Mon Dec 21 12:35:23 2015
@@ -37,7 +37,8 @@ public class ProtectionTokenBuilder impl
public Assertion build(Element element, AssertionBuilderFactory factory) throws IllegalArgumentException {
final SPConstants.SPVersion spVersion = SPConstants.SPVersion.getSPVersion(element.getNamespaceURI());
final Element nestedPolicyElement = SPUtils.getFirstPolicyChildElement(element);
- final Policy nestedPolicy = nestedPolicyElement != null ? factory.getPolicyEngine().getPolicy(nestedPolicyElement) : new Policy();
+ final Policy nestedPolicy =
+ nestedPolicyElement != null ? factory.getPolicyEngine().getPolicy(nestedPolicyElement) : new Policy();
ProtectionToken protectionToken = new ProtectionToken(
spVersion,
nestedPolicy
Modified: webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/RecipientEncryptionTokenBuilder.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/RecipientEncryptionTokenBuilder.java?rev=1721141&r1=1721140&r2=1721141&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/RecipientEncryptionTokenBuilder.java (original)
+++ webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/RecipientEncryptionTokenBuilder.java Mon Dec 21 12:35:23 2015
@@ -38,7 +38,8 @@ public class RecipientEncryptionTokenBui
final SPConstants.SPVersion spVersion = SPConstants.SPVersion.getSPVersion(element.getNamespaceURI());
final Element nestedPolicyElement = SPUtils.getFirstPolicyChildElement(element);
- final Policy nestedPolicy = nestedPolicyElement != null ? factory.getPolicyEngine().getPolicy(nestedPolicyElement) : new Policy();
+ final Policy nestedPolicy =
+ nestedPolicyElement != null ? factory.getPolicyEngine().getPolicy(nestedPolicyElement) : new Policy();
RecipientEncryptionToken recipientEncryptionToken = new RecipientEncryptionToken(
spVersion,
nestedPolicy
Modified: webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/RecipientSignatureTokenBuilder.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/RecipientSignatureTokenBuilder.java?rev=1721141&r1=1721140&r2=1721141&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/RecipientSignatureTokenBuilder.java (original)
+++ webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/RecipientSignatureTokenBuilder.java Mon Dec 21 12:35:23 2015
@@ -38,7 +38,8 @@ public class RecipientSignatureTokenBuil
final SPConstants.SPVersion spVersion = SPConstants.SPVersion.getSPVersion(element.getNamespaceURI());
final Element nestedPolicyElement = SPUtils.getFirstPolicyChildElement(element);
- final Policy nestedPolicy = nestedPolicyElement != null ? factory.getPolicyEngine().getPolicy(nestedPolicyElement) : new Policy();
+ final Policy nestedPolicy =
+ nestedPolicyElement != null ? factory.getPolicyEngine().getPolicy(nestedPolicyElement) : new Policy();
RecipientSignatureToken recipientSignatureToken = new RecipientSignatureToken(
spVersion,
nestedPolicy
Modified: webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/RecipientTokenBuilder.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/RecipientTokenBuilder.java?rev=1721141&r1=1721140&r2=1721141&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/RecipientTokenBuilder.java (original)
+++ webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/RecipientTokenBuilder.java Mon Dec 21 12:35:23 2015
@@ -38,7 +38,8 @@ public class RecipientTokenBuilder imple
final SPConstants.SPVersion spVersion = SPConstants.SPVersion.getSPVersion(element.getNamespaceURI());
final Element nestedPolicyElement = SPUtils.getFirstPolicyChildElement(element);
- final Policy nestedPolicy = nestedPolicyElement != null ? factory.getPolicyEngine().getPolicy(nestedPolicyElement) : new Policy();
+ final Policy nestedPolicy =
+ nestedPolicyElement != null ? factory.getPolicyEngine().getPolicy(nestedPolicyElement) : new Policy();
RecipientToken recipientToken = new RecipientToken(
spVersion,
nestedPolicy
Modified: webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/RelTokenBuilder.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/RelTokenBuilder.java?rev=1721141&r1=1721140&r2=1721141&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/RelTokenBuilder.java (original)
+++ webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/RelTokenBuilder.java Mon Dec 21 12:35:23 2015
@@ -48,7 +48,8 @@ public class RelTokenBuilder implements
}
final Element nestedPolicyElement = SPUtils.getFirstPolicyChildElement(element);
final Element claims = SPUtils.getFirstChildElement(element, spVersion.getSPConstants().getClaims());
- final Policy nestedPolicy = nestedPolicyElement != null ? factory.getPolicyEngine().getPolicy(nestedPolicyElement) : new Policy();
+ final Policy nestedPolicy =
+ nestedPolicyElement != null ? factory.getPolicyEngine().getPolicy(nestedPolicyElement) : new Policy();
RelToken relToken = new RelToken(
spVersion,
spVersion.getSPConstants().getInclusionFromAttributeValue(includeTokenValue),
Modified: webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/RequiredPartsBuilder.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/RequiredPartsBuilder.java?rev=1721141&r1=1721140&r2=1721141&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/RequiredPartsBuilder.java (original)
+++ webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/RequiredPartsBuilder.java Mon Dec 21 12:35:23 2015
@@ -50,13 +50,15 @@ public class RequiredPartsBuilder implem
List<Header> headers = new ArrayList<>();
Element child = SPUtils.getFirstChildElement(element);
while (child != null) {
- if (SPConstants.HEADER.equals(child.getLocalName()) && spVersion.getNamespace().equals(child.getNamespaceURI())) {
+ if (SPConstants.HEADER.equals(child.getLocalName())
+ && spVersion.getNamespace().equals(child.getNamespaceURI())) {
String headerName = child.getAttributeNS(null, SPConstants.NAME);
if ("".equals(headerName)) {
if (ignoreNameElement) {
headerName = null;
} else {
- throw new IllegalArgumentException("sp:" + element.getLocalName() + "/sp:" + child.getLocalName() + " must have a Name attribute");
+ throw new IllegalArgumentException("sp:" + element.getLocalName()
+ + "/sp:" + child.getLocalName() + " must have a Name attribute");
}
}
String headerNamespace = child.getAttributeNS(null, SPConstants.NAMESPACE);
Modified: webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/SignatureTokenBuilder.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/SignatureTokenBuilder.java?rev=1721141&r1=1721140&r2=1721141&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/SignatureTokenBuilder.java (original)
+++ webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/SignatureTokenBuilder.java Mon Dec 21 12:35:23 2015
@@ -37,7 +37,8 @@ public class SignatureTokenBuilder imple
public Assertion build(Element element, AssertionBuilderFactory factory) throws IllegalArgumentException {
final SPConstants.SPVersion spVersion = SPConstants.SPVersion.getSPVersion(element.getNamespaceURI());
final Element nestedPolicyElement = SPUtils.getFirstPolicyChildElement(element);
- final Policy nestedPolicy = nestedPolicyElement != null ? factory.getPolicyEngine().getPolicy(nestedPolicyElement) : new Policy();
+ final Policy nestedPolicy =
+ nestedPolicyElement != null ? factory.getPolicyEngine().getPolicy(nestedPolicyElement) : new Policy();
SignatureToken signatureToken = new SignatureToken(
spVersion,
nestedPolicy
Modified: webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/SignedElementsBuilder.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/SignedElementsBuilder.java?rev=1721141&r1=1721140&r2=1721141&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/SignedElementsBuilder.java (original)
+++ webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/SignedElementsBuilder.java Mon Dec 21 12:35:23 2015
@@ -58,8 +58,9 @@ public class SignedElementsBuilder imple
Element child = SPUtils.getFirstChildElement(element);
while (child != null) {
+ QName xpathExpression = spVersion.getSPConstants().getXPathExpression();
if (SPConstants.XPATH_EXPR.equals(child.getLocalName())
- && spVersion.getSPConstants().getXPathExpression().getNamespaceURI().equals(child.getNamespaceURI())) {
+ && xpathExpression.getNamespaceURI().equals(child.getNamespaceURI())) {
Map<String, String> declaredNamespaces = new HashMap<>();
addDeclaredNamespaces(child, declaredNamespaces);
xPaths.add(new XPath(child.getTextContent().trim(), XPath.Version.V1, null, declaredNamespaces));
@@ -74,8 +75,9 @@ public class SignedElementsBuilder imple
Element child = SPUtils.getFirstChildElement(element);
while (child != null) {
+ QName xpathExpression = spVersion.getSPConstants().getXPath2Expression();
if (SPConstants.XPATH2_EXPR.equals(child.getLocalName())
- && spVersion.getSPConstants().getXPath2Expression().getNamespaceURI().equals(child.getNamespaceURI())) {
+ && xpathExpression.getNamespaceURI().equals(child.getNamespaceURI())) {
Map<String, String> declaredNamespaces = new HashMap<>();
addDeclaredNamespaces(child, declaredNamespaces);
String filter = child.getAttributeNS(null, SPConstants.FILTER);
Modified: webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/SignedPartsBuilder.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/SignedPartsBuilder.java?rev=1721141&r1=1721140&r2=1721141&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/SignedPartsBuilder.java (original)
+++ webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/SignedPartsBuilder.java Mon Dec 21 12:35:23 2015
@@ -55,8 +55,12 @@ public class SignedPartsBuilder extends
while (child != null) {
if (spVersion.getSPConstants().getAttachments().getLocalPart().equals(child.getLocalName())
&& spVersion.getSPConstants().getAttachments().getNamespaceURI().equals(child.getNamespaceURI())) {
- boolean contentSignatureTransform = SPUtils.hasChildElementWithName(child, spVersion.getSPConstants().getContentSignatureTransform());
- boolean attachmentCompleteSignatureTransform = SPUtils.hasChildElementWithName(child, spVersion.getSPConstants().getAttachmentCompleteSignatureTransform());
+ boolean contentSignatureTransform =
+ SPUtils.hasChildElementWithName(child, spVersion.getSPConstants().getContentSignatureTransform());
+ QName completeSigTransform =
+ spVersion.getSPConstants().getAttachmentCompleteSignatureTransform();
+ boolean attachmentCompleteSignatureTransform =
+ SPUtils.hasChildElementWithName(child, completeSigTransform);
return new Attachments(spVersion, contentSignatureTransform, attachmentCompleteSignatureTransform);
}
child = SPUtils.getNextSiblingElement(child);
Modified: webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/SupportingTokensBuilder.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/SupportingTokensBuilder.java?rev=1721141&r1=1721140&r2=1721141&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/SupportingTokensBuilder.java (original)
+++ webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/SupportingTokensBuilder.java Mon Dec 21 12:35:23 2015
@@ -39,7 +39,8 @@ public class SupportingTokensBuilder imp
final SPConstants.SPVersion spVersion = SPConstants.SPVersion.getSPVersion(element.getNamespaceURI());
final QName supportingTokenType = SPUtils.getElementQName(element);
final Element nestedPolicyElement = SPUtils.getFirstPolicyChildElement(element);
- final Policy nestedPolicy = nestedPolicyElement != null ? factory.getPolicyEngine().getPolicy(nestedPolicyElement) : new Policy();
+ final Policy nestedPolicy =
+ nestedPolicyElement != null ? factory.getPolicyEngine().getPolicy(nestedPolicyElement) : new Policy();
SupportingTokens supportingTokens = new SupportingTokens(
spVersion,
supportingTokenType,
Modified: webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/TransportTokenBuilder.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/TransportTokenBuilder.java?rev=1721141&r1=1721140&r2=1721141&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/TransportTokenBuilder.java (original)
+++ webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/TransportTokenBuilder.java Mon Dec 21 12:35:23 2015
@@ -38,7 +38,8 @@ public class TransportTokenBuilder imple
final SPConstants.SPVersion spVersion = SPConstants.SPVersion.getSPVersion(element.getNamespaceURI());
final Element nestedPolicyElement = SPUtils.getFirstPolicyChildElement(element);
- final Policy nestedPolicy = nestedPolicyElement != null ? factory.getPolicyEngine().getPolicy(nestedPolicyElement) : new Policy();
+ final Policy nestedPolicy =
+ nestedPolicyElement != null ? factory.getPolicyEngine().getPolicy(nestedPolicyElement) : new Policy();
TransportToken transportToken = new TransportToken(
spVersion,
nestedPolicy
Modified: webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/WSS10Builder.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/WSS10Builder.java?rev=1721141&r1=1721140&r2=1721141&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/WSS10Builder.java (original)
+++ webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/WSS10Builder.java Mon Dec 21 12:35:23 2015
@@ -38,7 +38,8 @@ public class WSS10Builder implements Ass
final SPConstants.SPVersion spVersion = SPConstants.SPVersion.getSPVersion(element.getNamespaceURI());
final Element nestedPolicyElement = SPUtils.getFirstPolicyChildElement(element);
- final Policy nestedPolicy = nestedPolicyElement != null ? factory.getPolicyEngine().getPolicy(nestedPolicyElement) : new Policy();
+ final Policy nestedPolicy =
+ nestedPolicyElement != null ? factory.getPolicyEngine().getPolicy(nestedPolicyElement) : new Policy();
Wss10 wss10 = new Wss10(
spVersion,
nestedPolicy
Modified: webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/WSS11Builder.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/WSS11Builder.java?rev=1721141&r1=1721140&r2=1721141&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/WSS11Builder.java (original)
+++ webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/WSS11Builder.java Mon Dec 21 12:35:23 2015
@@ -38,7 +38,8 @@ public class WSS11Builder implements Ass
final SPConstants.SPVersion spVersion = SPConstants.SPVersion.getSPVersion(element.getNamespaceURI());
final Element nestedPolicyElement = SPUtils.getFirstPolicyChildElement(element);
- final Policy nestedPolicy = nestedPolicyElement != null ? factory.getPolicyEngine().getPolicy(nestedPolicyElement) : new Policy();
+ final Policy nestedPolicy =
+ nestedPolicyElement != null ? factory.getPolicyEngine().getPolicy(nestedPolicyElement) : new Policy();
Wss11 wss11 = new Wss11(
spVersion,
nestedPolicy
Modified: webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/AbstractBinding.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/AbstractBinding.java?rev=1721141&r1=1721140&r2=1721141&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/AbstractBinding.java (original)
+++ webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/AbstractBinding.java Mon Dec 21 12:35:23 2015
@@ -97,7 +97,8 @@ public abstract class AbstractBinding ex
}
}
if (binding.getAlgorithmSuite() == null && binding.getVersion() != SPVersion.SP11) {
- throw new IllegalArgumentException("sp:" + getName().getLocalPart() + " must have an inner sp:AlgorithmSuite element");
+ throw new IllegalArgumentException("sp:" + getName().getLocalPart()
+ + " must have an inner sp:AlgorithmSuite element");
}
}
Modified: webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/AbstractSymmetricAsymmetricBinding.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/AbstractSymmetricAsymmetricBinding.java?rev=1721141&r1=1721140&r2=1721141&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/AbstractSymmetricAsymmetricBinding.java (original)
+++ webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/AbstractSymmetricAsymmetricBinding.java Mon Dec 21 12:35:23 2015
@@ -30,16 +30,16 @@ public abstract class AbstractSymmetricA
EncryptBeforeSigning,
SignBeforeEncrypting;
- private static final Map<String, ProtectionOrder> lookup = new HashMap<>();
+ private static final Map<String, ProtectionOrder> LOOKUP = new HashMap<>();
static {
for (ProtectionOrder u : EnumSet.allOf(ProtectionOrder.class)) {
- lookup.put(u.name(), u);
+ LOOKUP.put(u.name(), u);
}
}
public static ProtectionOrder lookUp(String name) {
- return lookup.get(name);
+ return LOOKUP.get(name);
}
}
Modified: webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/AbstractToken.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/AbstractToken.java?rev=1721141&r1=1721140&r2=1721141&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/AbstractToken.java (original)
+++ webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/AbstractToken.java Mon Dec 21 12:35:23 2015
@@ -39,16 +39,16 @@ public abstract class AbstractToken exte
RequireExplicitDerivedKeys,
RequireImpliedDerivedKeys;
- private static final Map<String, X509Token.DerivedKeys> lookup = new HashMap<>();
+ private static final Map<String, X509Token.DerivedKeys> LOOKUP = new HashMap<>();
static {
for (DerivedKeys u : EnumSet.allOf(DerivedKeys.class)) {
- lookup.put(u.name(), u);
+ LOOKUP.put(u.name(), u);
}
}
public static DerivedKeys lookUp(String name) {
- return lookup.get(name);
+ return LOOKUP.get(name);
}
}
@@ -141,10 +141,14 @@ public abstract class AbstractToken exte
);
}
if (!isNormalized() && isOptional()) {
- writer.writeAttribute(Constants.ATTR_WSP, writer.getNamespaceContext().getNamespaceURI(Constants.ATTR_WSP), Constants.ATTR_OPTIONAL, "true");
+ writer.writeAttribute(Constants.ATTR_WSP,
+ writer.getNamespaceContext().getNamespaceURI(Constants.ATTR_WSP),
+ Constants.ATTR_OPTIONAL, "true");
}
if (isIgnorable()) {
- writer.writeAttribute(Constants.ATTR_WSP, writer.getNamespaceContext().getNamespaceURI(Constants.ATTR_WSP), Constants.ATTR_IGNORABLE, "true");
+ writer.writeAttribute(Constants.ATTR_WSP,
+ writer.getNamespaceContext().getNamespaceURI(Constants.ATTR_WSP),
+ Constants.ATTR_IGNORABLE, "true");
}
if (getIssuer() != null) {
SPUtils.serialize(getIssuer(), writer);
Modified: webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/AlgorithmSuite.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/AlgorithmSuite.java?rev=1721141&r1=1721140&r2=1721141&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/AlgorithmSuite.java (original)
+++ webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/AlgorithmSuite.java Mon Dec 21 12:35:23 2015
@@ -31,14 +31,14 @@ import java.util.*;
public class AlgorithmSuite extends AbstractSecurityAssertion implements PolicyContainingAssertion {
- protected static final Map<String, AlgorithmSuiteType> algorithmSuiteTypes = new HashMap<>();
+ protected static final Map<String, AlgorithmSuiteType> ALGORITHM_SUITE_TYPES = new HashMap<>();
private static final int MAX_SKL = 256;
private static final int MIN_AKL = 1024;
private static final int MAX_AKL = 4096;
static {
- algorithmSuiteTypes.put("Basic256", new AlgorithmSuiteType(
+ ALGORITHM_SUITE_TYPES.put("Basic256", new AlgorithmSuiteType(
"Basic256",
SPConstants.SHA1,
SPConstants.AES256,
@@ -48,7 +48,7 @@ public class AlgorithmSuite extends Abst
SPConstants.P_SHA1_L192,
256, 192, 256,
MAX_SKL, MIN_AKL, MAX_AKL));
- algorithmSuiteTypes.put("Basic192", new AlgorithmSuiteType(
+ ALGORITHM_SUITE_TYPES.put("Basic192", new AlgorithmSuiteType(
"Basic192",
SPConstants.SHA1,
SPConstants.AES192,
@@ -58,7 +58,7 @@ public class AlgorithmSuite extends Abst
SPConstants.P_SHA1_L192,
192, 192, 192,
MAX_SKL, MIN_AKL, MAX_AKL));
- algorithmSuiteTypes.put("Basic128", new AlgorithmSuiteType(
+ ALGORITHM_SUITE_TYPES.put("Basic128", new AlgorithmSuiteType(
"Basic128",
SPConstants.SHA1,
SPConstants.AES128,
@@ -68,7 +68,7 @@ public class AlgorithmSuite extends Abst
SPConstants.P_SHA1_L128,
128, 128, 128,
MAX_SKL, MIN_AKL, MAX_AKL));
- algorithmSuiteTypes.put("TripleDes", new AlgorithmSuiteType(
+ ALGORITHM_SUITE_TYPES.put("TripleDes", new AlgorithmSuiteType(
"TripleDes",
SPConstants.SHA1,
SPConstants.TRIPLE_DES,
@@ -78,7 +78,7 @@ public class AlgorithmSuite extends Abst
SPConstants.P_SHA1_L192,
192, 192, 192,
MAX_SKL, MIN_AKL, MAX_AKL));
- algorithmSuiteTypes.put("Basic256Rsa15", new AlgorithmSuiteType(
+ ALGORITHM_SUITE_TYPES.put("Basic256Rsa15", new AlgorithmSuiteType(
"Basic256Rsa15",
SPConstants.SHA1,
SPConstants.AES256,
@@ -88,7 +88,7 @@ public class AlgorithmSuite extends Abst
SPConstants.P_SHA1_L192,
256, 192, 256,
MAX_SKL, MIN_AKL, MAX_AKL));
- algorithmSuiteTypes.put("Basic192Rsa15", new AlgorithmSuiteType(
+ ALGORITHM_SUITE_TYPES.put("Basic192Rsa15", new AlgorithmSuiteType(
"Basic192Rsa15",
SPConstants.SHA1,
SPConstants.AES192,
@@ -98,7 +98,7 @@ public class AlgorithmSuite extends Abst
SPConstants.P_SHA1_L192,
192, 192, 192,
MAX_SKL, MIN_AKL, MAX_AKL));
- algorithmSuiteTypes.put("Basic128Rsa15", new AlgorithmSuiteType(
+ ALGORITHM_SUITE_TYPES.put("Basic128Rsa15", new AlgorithmSuiteType(
"Basic128Rsa15",
SPConstants.SHA1,
SPConstants.AES128,
@@ -108,7 +108,7 @@ public class AlgorithmSuite extends Abst
SPConstants.P_SHA1_L128,
128, 128, 128,
MAX_SKL, MIN_AKL, MAX_AKL));
- algorithmSuiteTypes.put("TripleDesRsa15", new AlgorithmSuiteType(
+ ALGORITHM_SUITE_TYPES.put("TripleDesRsa15", new AlgorithmSuiteType(
"TripleDesRsa15",
SPConstants.SHA1,
SPConstants.TRIPLE_DES,
@@ -118,7 +118,7 @@ public class AlgorithmSuite extends Abst
SPConstants.P_SHA1_L192,
192, 192, 192,
MAX_SKL, MIN_AKL, MAX_AKL));
- algorithmSuiteTypes.put("Basic256Sha256", new AlgorithmSuiteType(
+ ALGORITHM_SUITE_TYPES.put("Basic256Sha256", new AlgorithmSuiteType(
"Basic256Sha256",
SPConstants.SHA256,
SPConstants.AES256,
@@ -128,7 +128,7 @@ public class AlgorithmSuite extends Abst
SPConstants.P_SHA1_L192,
256, 192, 256,
MAX_SKL, MIN_AKL, MAX_AKL));
- algorithmSuiteTypes.put("Basic192Sha256", new AlgorithmSuiteType(
+ ALGORITHM_SUITE_TYPES.put("Basic192Sha256", new AlgorithmSuiteType(
"Basic192Sha256",
SPConstants.SHA256,
SPConstants.AES192,
@@ -138,7 +138,7 @@ public class AlgorithmSuite extends Abst
SPConstants.P_SHA1_L192,
192, 192, 192,
MAX_SKL, MIN_AKL, MAX_AKL));
- algorithmSuiteTypes.put("Basic128Sha256", new AlgorithmSuiteType(
+ ALGORITHM_SUITE_TYPES.put("Basic128Sha256", new AlgorithmSuiteType(
"Basic128Sha256",
SPConstants.SHA256,
SPConstants.AES128,
@@ -148,7 +148,7 @@ public class AlgorithmSuite extends Abst
SPConstants.P_SHA1_L128,
128, 128, 128,
MAX_SKL, MIN_AKL, MAX_AKL));
- algorithmSuiteTypes.put("TripleDesSha256", new AlgorithmSuiteType(
+ ALGORITHM_SUITE_TYPES.put("TripleDesSha256", new AlgorithmSuiteType(
"TripleDesSha256",
SPConstants.SHA256,
SPConstants.TRIPLE_DES,
@@ -158,7 +158,7 @@ public class AlgorithmSuite extends Abst
SPConstants.P_SHA1_L192,
192, 192, 192,
MAX_SKL, MIN_AKL, MAX_AKL));
- algorithmSuiteTypes.put("Basic256Sha256Rsa15", new AlgorithmSuiteType(
+ ALGORITHM_SUITE_TYPES.put("Basic256Sha256Rsa15", new AlgorithmSuiteType(
"Basic256Sha256Rsa15",
SPConstants.SHA256,
SPConstants.AES256,
@@ -168,7 +168,7 @@ public class AlgorithmSuite extends Abst
SPConstants.P_SHA1_L192,
256, 192, 256,
MAX_SKL, MIN_AKL, MAX_AKL));
- algorithmSuiteTypes.put("Basic192Sha256Rsa15", new AlgorithmSuiteType(
+ ALGORITHM_SUITE_TYPES.put("Basic192Sha256Rsa15", new AlgorithmSuiteType(
"Basic192Sha256Rsa15",
SPConstants.SHA256,
SPConstants.AES192,
@@ -178,7 +178,7 @@ public class AlgorithmSuite extends Abst
SPConstants.P_SHA1_L192,
192, 192, 192,
MAX_SKL, MIN_AKL, MAX_AKL));
- algorithmSuiteTypes.put("Basic128Sha256Rsa15", new AlgorithmSuiteType(
+ ALGORITHM_SUITE_TYPES.put("Basic128Sha256Rsa15", new AlgorithmSuiteType(
"Basic128Sha256Rsa15",
SPConstants.SHA256,
SPConstants.AES128,
@@ -188,7 +188,7 @@ public class AlgorithmSuite extends Abst
SPConstants.P_SHA1_L128,
128, 128, 128,
MAX_SKL, MIN_AKL, MAX_AKL));
- algorithmSuiteTypes.put("TripleDesSha256Rsa15", new AlgorithmSuiteType(
+ ALGORITHM_SUITE_TYPES.put("TripleDesSha256Rsa15", new AlgorithmSuiteType(
"TripleDesSha256Rsa15",
SPConstants.SHA256,
SPConstants.TRIPLE_DES,
@@ -329,16 +329,16 @@ public class AlgorithmSuite extends Abst
XPathFilter20(SPConstants.XPATH20),
AbsXPath(SPConstants.ABS_XPATH);
- private static final Map<String, XPathType> lookup = new HashMap<>();
+ private static final Map<String, XPathType> LOOKUP = new HashMap<>();
static {
for (XPathType u : EnumSet.allOf(XPathType.class)) {
- lookup.put(u.name(), u);
+ LOOKUP.put(u.name(), u);
}
}
public static XPathType lookUp(String name) {
- return lookup.get(name);
+ return LOOKUP.get(name);
}
private String value;
@@ -357,18 +357,18 @@ public class AlgorithmSuite extends Abst
InclusiveC14N(SPConstants.C14N),
InclusiveC14N11(SPConstants.C14N11);
- private static final Map<String, C14NType> lookup = new HashMap<>();
+ private static final Map<String, C14NType> LOOKUP = new HashMap<>();
static {
for (C14NType u : EnumSet.allOf(C14NType.class)) {
- lookup.put(u.name(), u);
+ LOOKUP.put(u.name(), u);
}
}
private String value;
public static C14NType lookUp(String name) {
- return lookup.get(name);
+ return LOOKUP.get(name);
}
public String getValue() {
@@ -384,16 +384,16 @@ public class AlgorithmSuite extends Abst
SOAPNormalizationNone(null),
SOAPNormalization10(SPConstants.SOAP_NORMALIZATION_10);
- private static final Map<String, SOAPNormType> lookup = new HashMap<>();
+ private static final Map<String, SOAPNormType> LOOKUP = new HashMap<>();
static {
for (SOAPNormType u : EnumSet.allOf(SOAPNormType.class)) {
- lookup.put(u.name(), u);
+ LOOKUP.put(u.name(), u);
}
}
public static SOAPNormType lookUp(String name) {
- return lookup.get(name);
+ return LOOKUP.get(name);
}
private String value;
@@ -411,16 +411,16 @@ public class AlgorithmSuite extends Abst
STRTransformNone(null),
STRTransform10(SPConstants.STR_TRANSFORM_10);
- private static final Map<String, STRType> lookup = new HashMap<>();
+ private static final Map<String, STRType> LOOKUP = new HashMap<>();
static {
for (STRType u : EnumSet.allOf(STRType.class)) {
- lookup.put(u.name(), u);
+ LOOKUP.put(u.name(), u);
}
}
public static STRType lookUp(String name) {
- return lookup.get(name);
+ return LOOKUP.get(name);
}
private String value;
@@ -492,7 +492,7 @@ public class AlgorithmSuite extends Abst
parseCustomAssertion(assertion);
continue;
}
- AlgorithmSuiteType algorithmSuiteType = algorithmSuiteTypes.get(assertionName);
+ AlgorithmSuiteType algorithmSuiteType = ALGORITHM_SUITE_TYPES.get(assertionName);
if (algorithmSuiteType != null) {
if (algorithmSuite.getAlgorithmSuiteType() != null) {
throw new IllegalArgumentException(SPConstants.ERR_INVALID_POLICY);
@@ -593,7 +593,7 @@ public class AlgorithmSuite extends Abst
}
public static Collection<String> getSupportedAlgorithmSuiteNames() {
- return algorithmSuiteTypes.keySet();
+ return ALGORITHM_SUITE_TYPES.keySet();
}
public void setSymmetricSignature(String symmetricSignature) {
Modified: webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/HttpsToken.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/HttpsToken.java?rev=1721141&r1=1721140&r2=1721141&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/HttpsToken.java (original)
+++ webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/HttpsToken.java Mon Dec 21 12:35:23 2015
@@ -33,16 +33,16 @@ public class HttpsToken extends Abstract
HttpDigestAuthentication,
RequireClientCertificate;
- private static final Map<String, AuthenticationType> lookup = new HashMap<>();
+ private static final Map<String, AuthenticationType> LOOKUP = new HashMap<>();
static {
for (AuthenticationType u : EnumSet.allOf(AuthenticationType.class)) {
- lookup.put(u.name(), u);
+ LOOKUP.put(u.name(), u);
}
}
public static AuthenticationType lookUp(String name) {
- return lookup.get(name);
+ return LOOKUP.get(name);
}
}
Modified: webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/KerberosToken.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/KerberosToken.java?rev=1721141&r1=1721140&r2=1721141&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/KerberosToken.java (original)
+++ webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/KerberosToken.java Mon Dec 21 12:35:23 2015
@@ -32,16 +32,16 @@ public class KerberosToken extends Abstr
WssKerberosV5ApReqToken11,
WssGssKerberosV5ApReqToken11;
- private static final Map<String, ApReqTokenType> lookup = new HashMap<>();
+ private static final Map<String, ApReqTokenType> LOOKUP = new HashMap<>();
static {
for (ApReqTokenType u : EnumSet.allOf(ApReqTokenType.class)) {
- lookup.put(u.name(), u);
+ LOOKUP.put(u.name(), u);
}
}
public static ApReqTokenType lookUp(String name) {
- return lookup.get(name);
+ return LOOKUP.get(name);
}
}
@@ -63,7 +63,8 @@ public class KerberosToken extends Abstr
@Override
protected AbstractSecurityAssertion cloneAssertion(Policy nestedPolicy) {
- return new KerberosToken(getVersion(), getIncludeTokenType(), getIssuer(), getIssuerName(), getClaims(), nestedPolicy);
+ return new KerberosToken(getVersion(), getIncludeTokenType(), getIssuer(),
+ getIssuerName(), getClaims(), nestedPolicy);
}
protected void parseNestedPolicy(Policy nestedPolicy, KerberosToken kerberosToken) {
@@ -85,8 +86,10 @@ public class KerberosToken extends Abstr
kerberosToken.setDerivedKeys(derivedKeys);
continue;
}
- if (getVersion().getSPConstants().getRequireKeyIdentifierReference().getLocalPart().equals(assertionName)
- && getVersion().getSPConstants().getRequireKeyIdentifierReference().getNamespaceURI().equals(assertionNamespace)) {
+ QName requireKeyIdentifierRef =
+ getVersion().getSPConstants().getRequireKeyIdentifierReference();
+ if (requireKeyIdentifierRef.getLocalPart().equals(assertionName)
+ && requireKeyIdentifierRef.getNamespaceURI().equals(assertionNamespace)) {
if (kerberosToken.isRequireKeyIdentifierReference()) {
throw new IllegalArgumentException(SPConstants.ERR_INVALID_POLICY);
}
Modified: webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/Layout.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/Layout.java?rev=1721141&r1=1721140&r2=1721141&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/Layout.java (original)
+++ webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/Layout.java Mon Dec 21 12:35:23 2015
@@ -37,16 +37,16 @@ public class Layout extends AbstractSecu
LaxTsFirst,
LaxTsLast;
- private static final Map<String, LayoutType> lookup = new HashMap<>();
+ private static final Map<String, LayoutType> LOOKUP = new HashMap<>();
static {
for (LayoutType u : EnumSet.allOf(LayoutType.class)) {
- lookup.put(u.name(), u);
+ LOOKUP.put(u.name(), u);
}
}
public static LayoutType lookUp(String name) {
- return lookup.get(name);
+ return LOOKUP.get(name);
}
}