[camel] branch master updated: Fixed tests

[davsclaus]

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

davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/master by this push:
     new 362bbf7  Fixed tests
362bbf7 is described below

commit 362bbf732dcef8b78b72e93c100d3f8576b94067
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Fri Jan 18 10:14:12 2019 +0100

    Fixed tests
---
 .../src/main/java/org/apache/camel/converter/crypto/PGPDataFormat.java  | 2 ++
 .../java/org/apache/camel/converter/crypto/PGPKeyAccessDataFormat.java  | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git 
a/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/PGPDataFormat.java
 
b/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/PGPDataFormat.java
index 6aa3aef..7c73529 100644
--- 
a/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/PGPDataFormat.java
+++ 
b/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/PGPDataFormat.java
@@ -24,6 +24,7 @@ import java.util.List;
 import java.util.Map;
 
 import org.apache.camel.Exchange;
+import org.apache.camel.spi.annotations.Dataformat;
 import org.bouncycastle.openpgp.PGPException;
 import org.bouncycastle.openpgp.PGPPrivateKey;
 import org.bouncycastle.openpgp.PGPPublicKey;
@@ -36,6 +37,7 @@ import org.bouncycastle.openpgp.PGPPublicKeyRingCollection;
  * <p>
  * See also {@link PGPKeyAccessDataFormat}.
  */
+@Dataformat("pgp")
 public class PGPDataFormat extends PGPKeyAccessDataFormat implements 
PGPPublicKeyAccessor, PGPSecretKeyAccessor {
     
     public static final String KEY_FILE_NAME = "CamelPGPDataFormatKeyFileName";
diff --git 
a/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/PGPKeyAccessDataFormat.java
 
b/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/PGPKeyAccessDataFormat.java
index fcfe0ae..b7b001a 100644
--- 
a/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/PGPKeyAccessDataFormat.java
+++ 
b/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/PGPKeyAccessDataFormat.java
@@ -78,7 +78,6 @@ import org.slf4j.LoggerFactory;
  * If you want to provide the key access via keyrings in the format of a byte
  * array or file, then you should use the class {@link PGPDataFormat}.
  */
-@Dataformat("pgp")
 public class PGPKeyAccessDataFormat extends ServiceSupport implements 
DataFormat, DataFormatName {
 
     public static final String KEY_USERID = "CamelPGPDataFormatKeyUserid";