You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2011/06/09 13:36:42 UTC
svn commit: r1133804 -
/camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/XMLSecurityDataFormat.java
Author: davsclaus
Date: Thu Jun 9 11:36:42 2011
New Revision: 1133804
URL: http://svn.apache.org/viewvc?rev=1133804&view=rev
Log:
Fixed CS
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/XMLSecurityDataFormat.java
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/XMLSecurityDataFormat.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/XMLSecurityDataFormat.java?rev=1133804&r1=1133803&r2=1133804&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/XMLSecurityDataFormat.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/XMLSecurityDataFormat.java Thu Jun 9 11:36:42 2011
@@ -58,26 +58,19 @@ public class XMLSecurityDataFormat exten
}
public XMLSecurityDataFormat(String secureTag, boolean secureTagContents, String passPhrase) {
- this();
- this.setSecureTag(secureTag);
- this.setSecureTagContents(secureTagContents);
+ this(secureTag, secureTagContents);
this.setPassPhrase(passPhrase);
}
public XMLSecurityDataFormat(String secureTag, boolean secureTagContents, String passPhrase,
String xmlCipherAlgorithm) {
- this();
- this.setSecureTag(secureTag);
- this.setSecureTagContents(secureTagContents);
+ this(secureTag, secureTagContents, passPhrase);
this.setXmlCipherAlgorithm(xmlCipherAlgorithm);
- this.setKeyCipherAlgorithm(keyCipherAlgorithm);
}
-
- public XMLSecurityDataFormat(String secureTag, boolean secureTagContents, String recipientKeyAlias,
- String xmlCipherAlgorithm, String keyCipherAlgorithm) {
- this();
- this.setSecureTag(secureTag);
- this.setSecureTagContents(secureTagContents);
+
+ public XMLSecurityDataFormat(String secureTag, boolean secureTagContents, String recipientKeyAlias,
+ String xmlCipherAlgorithm, String keyCipherAlgorithm) {
+ this(secureTag, secureTagContents);
this.setRecipientKeyAlias(recipientKeyAlias);
this.setXmlCipherAlgorithm(xmlCipherAlgorithm);
this.setKeyCipherAlgorithm(keyCipherAlgorithm);
@@ -103,11 +96,11 @@ public class XMLSecurityDataFormat exten
} else {
setProperty(dataFormat, "xmlCipherAlgorithm", TRIPLEDES);
}
- if(getKeyCipherAlgorithm() != null) {
- setProperty(dataFormat, "keyCipherAlgorithm", getKeyCipherAlgorithm());
+ if (getKeyCipherAlgorithm() != null) {
+ setProperty(dataFormat, "keyCipherAlgorithm", getKeyCipherAlgorithm());
}
- if(getRecipientKeyAlias() != null) {
- setProperty(dataFormat, "recipientKeyAlias", getRecipientKeyAlias());
+ if (getRecipientKeyAlias() != null) {
+ setProperty(dataFormat, "recipientKeyAlias", getRecipientKeyAlias());
}
}
@@ -146,20 +139,20 @@ public class XMLSecurityDataFormat exten
public boolean isSecureTagContents() {
return secureTagContents != null && secureTagContents;
}
-
+
public void setKeyCipherAlgorithm(String keyCipherAlgorithm) {
- this.keyCipherAlgorithm = keyCipherAlgorithm;
+ this.keyCipherAlgorithm = keyCipherAlgorithm;
}
-
+
public String getKeyCipherAlgorithm() {
- return keyCipherAlgorithm;
+ return keyCipherAlgorithm;
}
-
+
public void setRecipientKeyAlias(String recipientKeyAlias) {
this.recipientKeyAlias = recipientKeyAlias;
}
-
+
public String getRecipientKeyAlias() {
- return recipientKeyAlias;
+ return recipientKeyAlias;
}
}