This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch CAMEL-13870
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/CAMEL-13870 by this push:
new 02e2b52 CAMEL-13870: Fast property configuration of Camel endpoints.
Work in progress.
02e2b52 is described below
commit 02e2b52e9c134baf50854e4edf2f90b26f56dbd1
Author: Claus Ibsen <[email protected]>
AuthorDate: Wed Aug 21 11:32:11 2019 +0200
CAMEL-13870: Fast property configuration of Camel endpoints. Work in
progress.
---
.../src/main/docs/crypto-cms-component.adoc | 6 +++---
.../component/crypto/cms/CryptoCmsEndpoint.java | 16 ++++++++++++++++
.../common/CryptoCmsUnMarshallerConfiguration.java | 5 +----
.../crypto/cms/common/CryptoCmsUnmarshaller.java | 2 +-
.../cms/common/DefaultCryptoCmsConfiguration.java | 11 ++++-------
.../DefaultCryptoCmsUnMarshallerConfiguration.java | 9 ++++-----
.../DefaultEnvelopedDataDecryptorConfiguration.java | 17 ++++++-----------
.../sig/DefaultSignedDataVerifierConfiguration.java | 14 +++++++-------
.../crypto/cms/sig/SignedDataVerifier.java | 4 ++--
.../cms/sig/SignedDataVerifierConfiguration.java | 4 ++--
.../cms/sig/SignedDataVerifierFromHeader.java | 4 ++--
.../dsl/CryptoCmsEndpointBuilderFactory.java | 21 +++++++++------------
12 files changed, 57 insertions(+), 56 deletions(-)
diff --git
a/components/camel-crypto-cms/src/main/docs/crypto-cms-component.adoc
b/components/camel-crypto-cms/src/main/docs/crypto-cms-component.adoc
index 8583a92..3585b75 100644
--- a/components/camel-crypto-cms/src/main/docs/crypto-cms-component.adoc
+++ b/components/camel-crypto-cms/src/main/docs/crypto-cms-component.adoc
@@ -79,7 +79,7 @@ with the following path and query parameters:
| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic
property binding (Camel 2.x) or the newer property binding with additional
capabilities | false | boolean
| *synchronous* (advanced) | Sets whether synchronous processing should be
strictly used, or Camel is allowed to use asynchronous processing (if
supported). | false | boolean
| *password* (decrypt) | Sets the password of the private keys. It is assumed
that all private keys in the keystore have the same password. If not set then
it is assumed that the password of the private keys is given by the keystore
password given in the KeyStoreParameters. | | Char[]
-| *fromBase64* (decrypt_verify) | If true then the CMS message is base 64
encoded and must be decoded during the processing. Default value is false. |
false | Boolean
+| *fromBase64* (decrypt_verify) | If true then the CMS message is base 64
encoded and must be decoded during the processing. Default value is false. |
false | boolean
| *contentEncryptionAlgorithm* (encrypt) | Encryption algorithm, for example
DESede/CBC/PKCS5Padding. Further possible values: DESede/CBC/PKCS5Padding,
AES/CBC/PKCS5Padding, Camellia/CBC/PKCS5Padding, CAST5/CBC/PKCS5Padding. | |
String
| *originatorInformation Provider* (encrypt) | Provider for the originator
info. See \https://tools.ietf.org/html/rfc5652#section-6.1. The default value
is null. | | OriginatorInformation Provider
| *recipient* (encrypt) | Recipient Info: reference to a bean which implements
the interface org.apache.camel.component.crypto.cms.api.TransRecipientInfo | |
List
@@ -88,8 +88,8 @@ with the following path and query parameters:
| *toBase64* (encrypt_sign) | Indicates whether the Signed Data or Enveloped
Data instance shall be base 64 encoded. Default value is false. | false |
Boolean
| *includeContent* (sign) | Indicates whether the signed content should be
included into the Signed Data instance. If false then a detached Signed Data
instance is created in the header CamelCryptoCmsSignedData. | true | Boolean
| *signer* (sign) | Signer information: reference to bean(s) which implements
org.apache.camel.component.crypto.cms.api.SignerInfo. Multiple values can be
separated by comma | | String
-| *signedDataHeaderBase64* (verify) | Indicates whether the value in the
header CamelCryptoCmsSignedData is base64 encoded. Default value is false. Only
relevant for detached signatures. In the detached signature case, the header
contains the Signed Data object. | false | Boolean
-| *verifySignaturesOfAll Signers* (verify) | If true then the signatures of
all signers contained in the Signed Data object are verified. If false then
only one signature whose signer info matches with one of the specified
certificates is verified. Default value is true. | true | Boolean
+| *signedDataHeaderBase64* (verify) | Indicates whether the value in the
header CamelCryptoCmsSignedData is base64 encoded. Default value is false. Only
relevant for detached signatures. In the detached signature case, the header
contains the Signed Data object. | false | boolean
+| *verifySignaturesOfAll Signers* (verify) | If true then the signatures of
all signers contained in the Signed Data object are verified. If false then
only one signature whose signer info matches with one of the specified
certificates is verified. Default value is true. | true | boolean
|===
// endpoint options: END
// spring-boot-auto-configure options: START
diff --git
a/components/camel-crypto-cms/src/main/java/org/apache/camel/component/crypto/cms/CryptoCmsEndpoint.java
b/components/camel-crypto-cms/src/main/java/org/apache/camel/component/crypto/cms/CryptoCmsEndpoint.java
index 1296e79..2e85951 100644
---
a/components/camel-crypto-cms/src/main/java/org/apache/camel/component/crypto/cms/CryptoCmsEndpoint.java
+++
b/components/camel-crypto-cms/src/main/java/org/apache/camel/component/crypto/cms/CryptoCmsEndpoint.java
@@ -64,6 +64,22 @@ public class CryptoCmsEndpoint extends DefaultEndpoint {
return name;
}
+ public SignedDataCreatorConfiguration getSignConfig() {
+ return signConfig;
+ }
+
+ public DefaultSignedDataVerifierConfiguration getVerifyConfig() {
+ return verifyConfig;
+ }
+
+ public EnvelopedDataEncryptorConfiguration getEncryptConfig() {
+ return encryptConfig;
+ }
+
+ public DefaultEnvelopedDataDecryptorConfiguration getDecryptConfig() {
+ return decryptConfig;
+ }
+
/**
* Set the Crypto operation from that supplied after the crypto scheme in
* the endpoint uri e.g. crypto-cms:sign sets sign as the operation.
diff --git
a/components/camel-crypto-cms/src/main/java/org/apache/camel/component/crypto/cms/common/CryptoCmsUnMarshallerConfiguration.java
b/components/camel-crypto-cms/src/main/java/org/apache/camel/component/crypto/cms/common/CryptoCmsUnMarshallerConfiguration.java
index e9e2ad7..257d748 100644
---
a/components/camel-crypto-cms/src/main/java/org/apache/camel/component/crypto/cms/common/CryptoCmsUnMarshallerConfiguration.java
+++
b/components/camel-crypto-cms/src/main/java/org/apache/camel/component/crypto/cms/common/CryptoCmsUnMarshallerConfiguration.java
@@ -16,12 +16,9 @@
*/
package org.apache.camel.component.crypto.cms.common;
-import org.apache.camel.Exchange;
-import org.apache.camel.component.crypto.cms.exception.CryptoCmsException;
-
public interface CryptoCmsUnMarshallerConfiguration {
/** Indicates whether the message in-body is base 64 encocded. */
- Boolean isFromBase64(Exchange exchange) throws CryptoCmsException;
+ boolean isFromBase64();
}
diff --git
a/components/camel-crypto-cms/src/main/java/org/apache/camel/component/crypto/cms/common/CryptoCmsUnmarshaller.java
b/components/camel-crypto-cms/src/main/java/org/apache/camel/component/crypto/cms/common/CryptoCmsUnmarshaller.java
index ac9b1e0..15de8cb 100644
---
a/components/camel-crypto-cms/src/main/java/org/apache/camel/component/crypto/cms/common/CryptoCmsUnmarshaller.java
+++
b/components/camel-crypto-cms/src/main/java/org/apache/camel/component/crypto/cms/common/CryptoCmsUnmarshaller.java
@@ -56,7 +56,7 @@ public abstract class CryptoCmsUnmarshaller implements
Processor {
Message out = exchange.getOut();
out.copyFrom(exchange.getIn());
- if (config.isFromBase64(exchange)) {
+ if (config.isFromBase64()) {
stream = new Base64InputStream(stream);
}
Object result = unmarshalInternal(stream, exchange);
diff --git
a/components/camel-crypto-cms/src/main/java/org/apache/camel/component/crypto/cms/common/DefaultCryptoCmsConfiguration.java
b/components/camel-crypto-cms/src/main/java/org/apache/camel/component/crypto/cms/common/DefaultCryptoCmsConfiguration.java
index ef185b1..cbfe495 100644
---
a/components/camel-crypto-cms/src/main/java/org/apache/camel/component/crypto/cms/common/DefaultCryptoCmsConfiguration.java
+++
b/components/camel-crypto-cms/src/main/java/org/apache/camel/component/crypto/cms/common/DefaultCryptoCmsConfiguration.java
@@ -39,13 +39,13 @@ public abstract class DefaultCryptoCmsConfiguration {
* public keys, decryptor private keys depending on the operation. Use
* either this parameter or the parameter 'keystore'.
*/
- public void setKeyStoreParameters(KeyStoreParameters keyStoreParameters)
throws CryptoCmsException {
+ public void setKeyStoreParameters(KeyStoreParameters keyStoreParameters) {
this.keyStoreParameters = keyStoreParameters;
if (keyStoreParameters != null) {
try {
this.keyStore = keyStoreParameters.createKeyStore();
} catch (GeneralSecurityException | IOException e) {
- throw new CryptoCmsException("Problem during generating the
keystore", e);
+ throw new RuntimeException("Problem during generating the
keystore", e);
}
}
}
@@ -59,14 +59,11 @@ public abstract class DefaultCryptoCmsConfiguration {
this.keyStore = keyStore;
}
- protected KeyStore getKeyStore() throws CryptoCmsException {
- if (keyStore == null) {
- throw new CryptoCmsException("Keystore not configured");
- }
+ public KeyStore getKeyStore() {
return keyStore;
}
- protected KeyStoreParameters getKeyStoreParameters() {
+ public KeyStoreParameters getKeyStoreParameters() {
return keyStoreParameters;
}
}
diff --git
a/components/camel-crypto-cms/src/main/java/org/apache/camel/component/crypto/cms/common/DefaultCryptoCmsUnMarshallerConfiguration.java
b/components/camel-crypto-cms/src/main/java/org/apache/camel/component/crypto/cms/common/DefaultCryptoCmsUnMarshallerConfiguration.java
index c11da86..779bada 100644
---
a/components/camel-crypto-cms/src/main/java/org/apache/camel/component/crypto/cms/common/DefaultCryptoCmsUnMarshallerConfiguration.java
+++
b/components/camel-crypto-cms/src/main/java/org/apache/camel/component/crypto/cms/common/DefaultCryptoCmsUnMarshallerConfiguration.java
@@ -16,22 +16,21 @@
*/
package org.apache.camel.component.crypto.cms.common;
-import org.apache.camel.Exchange;
import org.apache.camel.spi.UriParam;
import org.apache.camel.spi.UriParams;
@UriParams
public class DefaultCryptoCmsUnMarshallerConfiguration extends
DefaultCryptoCmsConfiguration implements CryptoCmsUnMarshallerConfiguration {
- @UriParam(label = "decrypt_verify", defaultValue = "false")
- private Boolean fromBase64 = Boolean.FALSE;
+ @UriParam(label = "decrypt_verify")
+ private boolean fromBase64;
public DefaultCryptoCmsUnMarshallerConfiguration() {
super();
}
@Override
- public Boolean isFromBase64(Exchange exchange) {
+ public boolean isFromBase64() {
return fromBase64;
}
@@ -39,7 +38,7 @@ public class DefaultCryptoCmsUnMarshallerConfiguration
extends DefaultCryptoCmsC
* If <tt>true</tt> then the CMS message is base 64 encoded and must be
* decoded during the processing. Default value is <code>false</code>.
*/
- public void setFromBase64(Boolean base64) {
+ public void setFromBase64(boolean base64) {
this.fromBase64 = base64;
}
}
diff --git
a/components/camel-crypto-cms/src/main/java/org/apache/camel/component/crypto/cms/crypt/DefaultEnvelopedDataDecryptorConfiguration.java
b/components/camel-crypto-cms/src/main/java/org/apache/camel/component/crypto/cms/crypt/DefaultEnvelopedDataDecryptorConfiguration.java
index fe1805f..cae2d7e 100644
---
a/components/camel-crypto-cms/src/main/java/org/apache/camel/component/crypto/cms/crypt/DefaultEnvelopedDataDecryptorConfiguration.java
+++
b/components/camel-crypto-cms/src/main/java/org/apache/camel/component/crypto/cms/crypt/DefaultEnvelopedDataDecryptorConfiguration.java
@@ -38,8 +38,7 @@ import org.apache.camel.spi.UriParams;
import org.apache.camel.support.jsse.KeyStoreParameters;
/**
- * The defualt implementation fetches the private key and certificate from a
- * keystore.
+ * The defualt implementation fetches the private key and certificate from a
keystore.
*/
@UriParams
public class DefaultEnvelopedDataDecryptorConfiguration extends
DefaultCryptoCmsUnMarshallerConfiguration implements
EnvelopedDataDecryptorConfiguration, Cloneable {
@@ -61,27 +60,25 @@ public class DefaultEnvelopedDataDecryptorConfiguration
extends DefaultCryptoCms
this.password = password;
}
- protected char[] getPassword(Exchange exchange) throws CryptoCmsException {
+ public char[] getPassword() {
if (password == null) {
if (getKeyStoreParameters() != null) {
String passwordS = getKeyStoreParameters().getPassword();
if (passwordS == null) {
- throw new CryptoCmsException("Password for private keys
not configured");
+ throw new RuntimeException("Password for private keys not
configured");
} else {
return passwordS.toCharArray();
}
} else {
- throw new CryptoCmsException("Password for private keys not
configured");
+ throw new RuntimeException("Password for private keys not
configured");
}
} else {
return password;
}
-
}
@Override
public Collection<PrivateKeyWithCertificate>
getPrivateKeyCertificateCollection(Exchange exchange) throws CryptoCmsException
{
-
KeyStore keystore = getKeyStore();
try {
List<PrivateKeyWithCertificate> privateKeys = new
ArrayList<>(keystore.size());
@@ -91,10 +88,8 @@ public class DefaultEnvelopedDataDecryptorConfiguration
extends DefaultCryptoCms
// only key entries are relevant!
continue;
}
- Key privateKey = keystore.getKey(alias, getPassword(exchange));
- if (privateKey instanceof PrivateKey) { // we currently only
- // support
- // assymmetric keys
+ Key privateKey = keystore.getKey(alias, getPassword());
+ if (privateKey instanceof PrivateKey) { // we currently only
support assymmetric keys
Certificate cert = keystore.getCertificate(alias);
if (cert instanceof X509Certificate) {
privateKeys.add(new
PrivateKeyWithCertificate((PrivateKey)privateKey, (X509Certificate)cert));
diff --git
a/components/camel-crypto-cms/src/main/java/org/apache/camel/component/crypto/cms/sig/DefaultSignedDataVerifierConfiguration.java
b/components/camel-crypto-cms/src/main/java/org/apache/camel/component/crypto/cms/sig/DefaultSignedDataVerifierConfiguration.java
index bd1ab60..c863b6c 100644
---
a/components/camel-crypto-cms/src/main/java/org/apache/camel/component/crypto/cms/sig/DefaultSignedDataVerifierConfiguration.java
+++
b/components/camel-crypto-cms/src/main/java/org/apache/camel/component/crypto/cms/sig/DefaultSignedDataVerifierConfiguration.java
@@ -39,11 +39,11 @@ import org.apache.camel.spi.UriParams;
@UriParams
public class DefaultSignedDataVerifierConfiguration extends
DefaultCryptoCmsUnMarshallerConfiguration implements
SignedDataVerifierConfiguration, Cloneable {
- @UriParam(label = "verify", defaultValue = "false")
- private Boolean signedDataHeaderBase64 = Boolean.FALSE;
+ @UriParam(label = "verify")
+ private boolean signedDataHeaderBase64;
@UriParam(label = "verify", defaultValue = "true")
- private Boolean verifySignaturesOfAllSigners = Boolean.TRUE;
+ private boolean verifySignaturesOfAllSigners = true;
/**
* Indicates whether the value in the header CamelCryptoCmsSignedData is
@@ -52,12 +52,12 @@ public class DefaultSignedDataVerifierConfiguration extends
DefaultCryptoCmsUnMa
* Only relevant for detached signatures. In the detached signature case,
* the header contains the Signed Data object.
*/
- public void setSignedDataHeaderBase64(Boolean signedDataHeaderBase64) {
+ public void setSignedDataHeaderBase64(boolean signedDataHeaderBase64) {
this.signedDataHeaderBase64 = signedDataHeaderBase64;
}
@Override
- public Boolean isSignedDataHeaderBase64(Exchange exchange) throws
CryptoCmsException {
+ public boolean isSignedDataHeaderBase64() {
return signedDataHeaderBase64;
}
@@ -67,12 +67,12 @@ public class DefaultSignedDataVerifierConfiguration extends
DefaultCryptoCmsUnMa
* signature whose signer info matches with one of the specified
* certificates is verified. Default value is <code>true</code>.
*/
- public void setVerifySignaturesOfAllSigners(Boolean
verifySignaturesOfAllSigners) {
+ public void setVerifySignaturesOfAllSigners(boolean
verifySignaturesOfAllSigners) {
this.verifySignaturesOfAllSigners = verifySignaturesOfAllSigners;
}
@Override
- public Boolean isVerifySignaturesOfAllSigners(Exchange exchange) throws
CryptoCmsException {
+ public boolean isVerifySignaturesOfAllSigners() {
return verifySignaturesOfAllSigners;
}
diff --git
a/components/camel-crypto-cms/src/main/java/org/apache/camel/component/crypto/cms/sig/SignedDataVerifier.java
b/components/camel-crypto-cms/src/main/java/org/apache/camel/component/crypto/cms/sig/SignedDataVerifier.java
index a97bb33..06972d2 100644
---
a/components/camel-crypto-cms/src/main/java/org/apache/camel/component/crypto/cms/sig/SignedDataVerifier.java
+++
b/components/camel-crypto-cms/src/main/java/org/apache/camel/component/crypto/cms/sig/SignedDataVerifier.java
@@ -170,7 +170,7 @@ public class SignedDataVerifier extends
CryptoCmsUnmarshaller {
Collection<X509CertificateHolder> certCollection =
certStore.getMatches(signer.getSID());
if (certCollection.isEmpty()) {
- if (conf.isVerifySignaturesOfAllSigners(exchange)) {
+ if (conf.isVerifySignaturesOfAllSigners()) {
throw new
CryptoCmsNoCertificateForSignerInfoException("KCS7/CMS signature verification
failed. The public key for the signer information with"
+
signerInformationToString(signer) + " cannot be found in the configured
certificates: "
+
certsToString(allowedVerifyCerts));
@@ -185,7 +185,7 @@ public class SignedDataVerifier extends
CryptoCmsUnmarshaller {
if (signer.verify(new
JcaSimpleSignerInfoVerifierBuilder().setProvider(BouncyCastleProvider.PROVIDER_NAME).build(cert)))
{
LOG.debug("Verification successful");
atLeastOneSignatureVerified = true;
- if (!conf.isVerifySignaturesOfAllSigners(exchange)) {
+ if (!conf.isVerifySignaturesOfAllSigners()) {
return;
}
} else {
diff --git
a/components/camel-crypto-cms/src/main/java/org/apache/camel/component/crypto/cms/sig/SignedDataVerifierConfiguration.java
b/components/camel-crypto-cms/src/main/java/org/apache/camel/component/crypto/cms/sig/SignedDataVerifierConfiguration.java
index 67e0de3..42f5d60 100644
---
a/components/camel-crypto-cms/src/main/java/org/apache/camel/component/crypto/cms/sig/SignedDataVerifierConfiguration.java
+++
b/components/camel-crypto-cms/src/main/java/org/apache/camel/component/crypto/cms/sig/SignedDataVerifierConfiguration.java
@@ -31,7 +31,7 @@ public interface SignedDataVerifierConfiguration extends
CryptoCmsUnMarshallerCo
* {@link CryptoCmsConstants#CAMEL_CRYPTO_CMS_SIGNED_DATA} is base64
* encoded.
*/
- Boolean isSignedDataHeaderBase64(Exchange exchange) throws
CryptoCmsException;
+ boolean isSignedDataHeaderBase64();
/**
* If <code>true</code> then the signatures of all signers are checked. If
@@ -39,7 +39,7 @@ public interface SignedDataVerifierConfiguration extends
CryptoCmsUnMarshallerCo
* with one of the specified certificates and verifies only the signature
of
* the first found signer.
*/
- Boolean isVerifySignaturesOfAllSigners(Exchange exchange) throws
CryptoCmsException;
+ boolean isVerifySignaturesOfAllSigners();
/**
* Returns the collection of certificates whose public keys are used to
diff --git
a/components/camel-crypto-cms/src/main/java/org/apache/camel/component/crypto/cms/sig/SignedDataVerifierFromHeader.java
b/components/camel-crypto-cms/src/main/java/org/apache/camel/component/crypto/cms/sig/SignedDataVerifierFromHeader.java
index eff0287..d97cc3b 100644
---
a/components/camel-crypto-cms/src/main/java/org/apache/camel/component/crypto/cms/sig/SignedDataVerifierFromHeader.java
+++
b/components/camel-crypto-cms/src/main/java/org/apache/camel/component/crypto/cms/sig/SignedDataVerifierFromHeader.java
@@ -68,7 +68,7 @@ public class SignedDataVerifierFromHeader extends
SignedDataVerifier {
protected void processSignedDataHeader(Exchange exchange, InputStream
signature) throws Exception { // NOPMD
// all exceptions must be caught and re-thrown in order to make a
// clean-up, see code below
- if (conf.isSignedDataHeaderBase64(exchange)) {
+ if (conf.isSignedDataHeaderBase64()) {
signature = new Base64InputStream(signature);
}
@@ -79,7 +79,7 @@ public class SignedDataVerifierFromHeader extends
SignedDataVerifier {
Message out = exchange.getOut();
out.copyFrom(exchange.getIn());
- if (conf.isFromBase64(exchange)) {
+ if (conf.isFromBase64()) {
stream = new Base64InputStream(stream);
}
unmarshalInternal(stream, signature, exchange);
diff --git
a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/CryptoCmsEndpointBuilderFactory.java
b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/CryptoCmsEndpointBuilderFactory.java
index 9d6ab4f..cd0e594 100644
---
a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/CryptoCmsEndpointBuilderFactory.java
+++
b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/CryptoCmsEndpointBuilderFactory.java
@@ -132,11 +132,11 @@ public interface CryptoCmsEndpointBuilderFactory {
* If true then the CMS message is base 64 encoded and must be decoded
* during the processing. Default value is false.
*
- * The option is a: <code>java.lang.Boolean</code> type.
+ * The option is a: <code>boolean</code> type.
*
* Group: decrypt_verify
*/
- default CryptoCmsEndpointBuilder fromBase64(Boolean fromBase64) {
+ default CryptoCmsEndpointBuilder fromBase64(boolean fromBase64) {
setProperty("fromBase64", fromBase64);
return this;
}
@@ -144,8 +144,7 @@ public interface CryptoCmsEndpointBuilderFactory {
* If true then the CMS message is base 64 encoded and must be decoded
* during the processing. Default value is false.
*
- * The option will be converted to a <code>java.lang.Boolean</code>
- * type.
+ * The option will be converted to a <code>boolean</code> type.
*
* Group: decrypt_verify
*/
@@ -379,12 +378,12 @@ public interface CryptoCmsEndpointBuilderFactory {
* signatures. In the detached signature case, the header contains the
* Signed Data object.
*
- * The option is a: <code>java.lang.Boolean</code> type.
+ * The option is a: <code>boolean</code> type.
*
* Group: verify
*/
default CryptoCmsEndpointBuilder signedDataHeaderBase64(
- Boolean signedDataHeaderBase64) {
+ boolean signedDataHeaderBase64) {
setProperty("signedDataHeaderBase64", signedDataHeaderBase64);
return this;
}
@@ -394,8 +393,7 @@ public interface CryptoCmsEndpointBuilderFactory {
* signatures. In the detached signature case, the header contains the
* Signed Data object.
*
- * The option will be converted to a <code>java.lang.Boolean</code>
- * type.
+ * The option will be converted to a <code>boolean</code> type.
*
* Group: verify
*/
@@ -410,12 +408,12 @@ public interface CryptoCmsEndpointBuilderFactory {
* signer info matches with one of the specified certificates is
* verified. Default value is true.
*
- * The option is a: <code>java.lang.Boolean</code> type.
+ * The option is a: <code>boolean</code> type.
*
* Group: verify
*/
default CryptoCmsEndpointBuilder verifySignaturesOfAllSigners(
- Boolean verifySignaturesOfAllSigners) {
+ boolean verifySignaturesOfAllSigners) {
setProperty("verifySignaturesOfAllSigners",
verifySignaturesOfAllSigners);
return this;
}
@@ -425,8 +423,7 @@ public interface CryptoCmsEndpointBuilderFactory {
* signer info matches with one of the specified certificates is
* verified. Default value is true.
*
- * The option will be converted to a <code>java.lang.Boolean</code>
- * type.
+ * The option will be converted to a <code>boolean</code> type.
*
* Group: verify
*/
