CAMEL-7201 Renamed the implemations as Camel usually does
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/fe052fc9 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/fe052fc9 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/fe052fc9 Branch: refs/heads/master Commit: fe052fc920b7c84002a0f3564f4c0d301ecda35b Parents: 62c8b7a Author: Willem Jiang <[email protected]> Authored: Mon Feb 17 13:16:03 2014 +0800 Committer: Willem Jiang <[email protected]> Committed: Mon Feb 17 13:16:03 2014 +0800 ---------------------------------------------------------------------- .../crypto/DefaultPGPPassphraseAccessor.java | 54 ++++++++++ .../crypto/DefaultPGPPublicKeyAccess.java | 53 ++++++++++ .../crypto/DefaultPGPSecretKeyAccess.java | 100 +++++++++++++++++++ .../crypto/PGPPassphraseAccessorDefault.java | 54 ---------- .../crypto/PGPPublicKeyAccessDefault.java | 53 ---------- .../crypto/PGPSecretKeyAccessDefault.java | 100 ------------------- .../converter/crypto/PGPDataFormatTest.java | 8 +- .../crypto/PGPKeyAccessDataFormatTest.java | 4 +- 8 files changed, 213 insertions(+), 213 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/fe052fc9/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/DefaultPGPPassphraseAccessor.java ---------------------------------------------------------------------- diff --git a/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/DefaultPGPPassphraseAccessor.java b/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/DefaultPGPPassphraseAccessor.java new file mode 100644 index 0000000..21c2105 --- /dev/null +++ b/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/DefaultPGPPassphraseAccessor.java @@ -0,0 +1,54 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.camel.converter.crypto; + +import java.util.Map; + +/** + * 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. + */ +import org.apache.camel.util.ObjectHelper; + +public class DefaultPGPPassphraseAccessor implements PGPPassphraseAccessor { + + private final Map<String, String> userId2Passphrase; + + public DefaultPGPPassphraseAccessor(Map<String, String> userId2Passphrase) { + ObjectHelper.notNull(userId2Passphrase, "userIdPassphrase"); + + this.userId2Passphrase = userId2Passphrase; + } + + @Override + public String getPassphrase(String userId) { + return userId2Passphrase.get(userId); + } + +} http://git-wip-us.apache.org/repos/asf/camel/blob/fe052fc9/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/DefaultPGPPublicKeyAccess.java ---------------------------------------------------------------------- diff --git a/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/DefaultPGPPublicKeyAccess.java b/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/DefaultPGPPublicKeyAccess.java new file mode 100644 index 0000000..5017732 --- /dev/null +++ b/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/DefaultPGPPublicKeyAccess.java @@ -0,0 +1,53 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.camel.converter.crypto; + +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.util.List; + +import org.apache.camel.Exchange; +import org.apache.camel.util.ObjectHelper; +import org.bouncycastle.openpgp.PGPException; +import org.bouncycastle.openpgp.PGPPublicKey; +import org.bouncycastle.openpgp.PGPPublicKeyRingCollection; +import org.bouncycastle.openpgp.PGPUtil; + +/** + * Caches a public key ring. + * + */ +public class DefaultPGPPublicKeyAccess implements PGPPublicKeyAccess { + + private final PGPPublicKeyRingCollection pgpPublicKeyRing; + + public DefaultPGPPublicKeyAccess(byte[] publicKeyRing) throws IOException, PGPException { + ObjectHelper.notNull(publicKeyRing, "publicKeyRing"); + pgpPublicKeyRing = new PGPPublicKeyRingCollection(PGPUtil.getDecoderStream(new ByteArrayInputStream(publicKeyRing))); + } + + @Override + public List<PGPPublicKey> getEncryptionKeys(Exchange exchange, List<String> useridParts) throws Exception { + return PGPDataFormatUtil.findPublicKeys(useridParts, true, pgpPublicKeyRing); + } + + @Override + public PGPPublicKey getPublicKey(Exchange exchange, long keyId) throws Exception { + return pgpPublicKeyRing.getPublicKey(keyId); + } + +} http://git-wip-us.apache.org/repos/asf/camel/blob/fe052fc9/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/DefaultPGPSecretKeyAccess.java ---------------------------------------------------------------------- diff --git a/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/DefaultPGPSecretKeyAccess.java b/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/DefaultPGPSecretKeyAccess.java new file mode 100644 index 0000000..f57ee40 --- /dev/null +++ b/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/DefaultPGPSecretKeyAccess.java @@ -0,0 +1,100 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.camel.converter.crypto; + +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import org.apache.camel.Exchange; +import org.apache.camel.util.ObjectHelper; +import org.bouncycastle.openpgp.PGPException; +import org.bouncycastle.openpgp.PGPPrivateKey; +import org.bouncycastle.openpgp.PGPSecretKeyRingCollection; +import org.bouncycastle.openpgp.PGPUtil; + +/** + * Caches a Secret Keyring. Assumes that the password for all private keys is + * the same. + * + */ +public class DefaultPGPSecretKeyAccess implements PGPSecretKeyAccess { + + private final Map<String, List<PGPSecretKeyAndPrivateKeyAndUserId>> userIdPart2SecretKeyList = new HashMap<String, List<PGPSecretKeyAndPrivateKeyAndUserId>>( + 3); + + private final Map<Long, PGPPrivateKey> keyId2PrivateKey = new HashMap<Long, PGPPrivateKey>(3); + + private final PGPSecretKeyRingCollection pgpSecretKeyring; + + private final String password; + + private final String provider; + + /** + * + * @param secretKeyRing + * secret key ring as byte array + * @param password + * password for the private keys, assuming that all private keys + * have the same password + * @param provider + * @throws PGPException + * @throws IOException + */ + public DefaultPGPSecretKeyAccess(byte[] secretKeyRing, String password, String provider) throws PGPException, IOException { + ObjectHelper.notNull(secretKeyRing, "secretKeyRing"); + ObjectHelper.notEmpty(password, "password"); + ObjectHelper.notEmpty(provider, "provider"); + pgpSecretKeyring = new PGPSecretKeyRingCollection(PGPUtil.getDecoderStream(new ByteArrayInputStream(secretKeyRing))); + this.password = password; + this.provider = provider; + } + + @Override + public List<PGPSecretKeyAndPrivateKeyAndUserId> getSignerKeys(Exchange exchange, List<String> useridParts) throws Exception { + List<PGPSecretKeyAndPrivateKeyAndUserId> result = new ArrayList<PGPSecretKeyAndPrivateKeyAndUserId>(3); + for (String useridPart : useridParts) { + List<PGPSecretKeyAndPrivateKeyAndUserId> partResult = userIdPart2SecretKeyList.get(useridPart); + if (partResult == null) { + partResult = PGPDataFormatUtil.findSecretKeysWithPrivateKeyAndUserId(Collections.singletonMap(useridPart, password), + provider, pgpSecretKeyring); + userIdPart2SecretKeyList.put(useridPart, partResult); + } + result.addAll(partResult); + } + return result; + } + + @Override + public PGPPrivateKey getPrivateKey(Exchange exchange, long keyId) throws Exception { + Long keyIdLong = Long.valueOf(keyId); + PGPPrivateKey result = keyId2PrivateKey.get(keyIdLong); + if (result == null) { + result = PGPDataFormatUtil.findPrivateKeyWithkeyId(keyId, password, null, provider, pgpSecretKeyring); + if (result != null) { + keyId2PrivateKey.put(keyIdLong, result); + } + } + return result; + } + +} http://git-wip-us.apache.org/repos/asf/camel/blob/fe052fc9/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/PGPPassphraseAccessorDefault.java ---------------------------------------------------------------------- diff --git a/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/PGPPassphraseAccessorDefault.java b/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/PGPPassphraseAccessorDefault.java deleted file mode 100644 index 6796ccd..0000000 --- a/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/PGPPassphraseAccessorDefault.java +++ /dev/null @@ -1,54 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.camel.converter.crypto; - -import java.util.Map; - -/** - * 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. - */ -import org.apache.camel.util.ObjectHelper; - -public class PGPPassphraseAccessorDefault implements PGPPassphraseAccessor { - - private final Map<String, String> userId2Passphrase; - - public PGPPassphraseAccessorDefault(Map<String, String> userId2Passphrase) { - ObjectHelper.notNull(userId2Passphrase, "userIdPassphrase"); - - this.userId2Passphrase = userId2Passphrase; - } - - @Override - public String getPassphrase(String userId) { - return userId2Passphrase.get(userId); - } - -} http://git-wip-us.apache.org/repos/asf/camel/blob/fe052fc9/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/PGPPublicKeyAccessDefault.java ---------------------------------------------------------------------- diff --git a/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/PGPPublicKeyAccessDefault.java b/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/PGPPublicKeyAccessDefault.java deleted file mode 100644 index 5e05d04..0000000 --- a/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/PGPPublicKeyAccessDefault.java +++ /dev/null @@ -1,53 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.camel.converter.crypto; - -import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.util.List; - -import org.apache.camel.Exchange; -import org.apache.camel.util.ObjectHelper; -import org.bouncycastle.openpgp.PGPException; -import org.bouncycastle.openpgp.PGPPublicKey; -import org.bouncycastle.openpgp.PGPPublicKeyRingCollection; -import org.bouncycastle.openpgp.PGPUtil; - -/** - * Caches a public key ring. - * - */ -public class PGPPublicKeyAccessDefault implements PGPPublicKeyAccess { - - private final PGPPublicKeyRingCollection pgpPublicKeyRing; - - public PGPPublicKeyAccessDefault(byte[] publicKeyRing) throws IOException, PGPException { - ObjectHelper.notNull(publicKeyRing, "publicKeyRing"); - pgpPublicKeyRing = new PGPPublicKeyRingCollection(PGPUtil.getDecoderStream(new ByteArrayInputStream(publicKeyRing))); - } - - @Override - public List<PGPPublicKey> getEncryptionKeys(Exchange exchange, List<String> useridParts) throws Exception { - return PGPDataFormatUtil.findPublicKeys(useridParts, true, pgpPublicKeyRing); - } - - @Override - public PGPPublicKey getPublicKey(Exchange exchange, long keyId) throws Exception { - return pgpPublicKeyRing.getPublicKey(keyId); - } - -} http://git-wip-us.apache.org/repos/asf/camel/blob/fe052fc9/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/PGPSecretKeyAccessDefault.java ---------------------------------------------------------------------- diff --git a/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/PGPSecretKeyAccessDefault.java b/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/PGPSecretKeyAccessDefault.java deleted file mode 100644 index a0c07d7..0000000 --- a/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/PGPSecretKeyAccessDefault.java +++ /dev/null @@ -1,100 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.camel.converter.crypto; - -import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.apache.camel.Exchange; -import org.apache.camel.util.ObjectHelper; -import org.bouncycastle.openpgp.PGPException; -import org.bouncycastle.openpgp.PGPPrivateKey; -import org.bouncycastle.openpgp.PGPSecretKeyRingCollection; -import org.bouncycastle.openpgp.PGPUtil; - -/** - * Caches a Secret Keyring. Assumes that the password for all private keys is - * the same. - * - */ -public class PGPSecretKeyAccessDefault implements PGPSecretKeyAccess { - - private final Map<String, List<PGPSecretKeyAndPrivateKeyAndUserId>> userIdPart2SecretKeyList = new HashMap<String, List<PGPSecretKeyAndPrivateKeyAndUserId>>( - 3); - - private final Map<Long, PGPPrivateKey> keyId2PrivateKey = new HashMap<Long, PGPPrivateKey>(3); - - private final PGPSecretKeyRingCollection pgpSecretKeyring; - - private final String password; - - private final String provider; - - /** - * - * @param secretKeyRing - * secret key ring as byte array - * @param password - * password for the private keys, assuming that all private keys - * have the same password - * @param provider - * @throws PGPException - * @throws IOException - */ - public PGPSecretKeyAccessDefault(byte[] secretKeyRing, String password, String provider) throws PGPException, IOException { - ObjectHelper.notNull(secretKeyRing, "secretKeyRing"); - ObjectHelper.notEmpty(password, "password"); - ObjectHelper.notEmpty(provider, "provider"); - pgpSecretKeyring = new PGPSecretKeyRingCollection(PGPUtil.getDecoderStream(new ByteArrayInputStream(secretKeyRing))); - this.password = password; - this.provider = provider; - } - - @Override - public List<PGPSecretKeyAndPrivateKeyAndUserId> getSignerKeys(Exchange exchange, List<String> useridParts) throws Exception { - List<PGPSecretKeyAndPrivateKeyAndUserId> result = new ArrayList<PGPSecretKeyAndPrivateKeyAndUserId>(3); - for (String useridPart : useridParts) { - List<PGPSecretKeyAndPrivateKeyAndUserId> partResult = userIdPart2SecretKeyList.get(useridPart); - if (partResult == null) { - partResult = PGPDataFormatUtil.findSecretKeysWithPrivateKeyAndUserId(Collections.singletonMap(useridPart, password), - provider, pgpSecretKeyring); - userIdPart2SecretKeyList.put(useridPart, partResult); - } - result.addAll(partResult); - } - return result; - } - - @Override - public PGPPrivateKey getPrivateKey(Exchange exchange, long keyId) throws Exception { - Long keyIdLong = Long.valueOf(keyId); - PGPPrivateKey result = keyId2PrivateKey.get(keyIdLong); - if (result == null) { - result = PGPDataFormatUtil.findPrivateKeyWithkeyId(keyId, password, null, provider, pgpSecretKeyring); - if (result != null) { - keyId2PrivateKey.put(keyIdLong, result); - } - } - return result; - } - -} http://git-wip-us.apache.org/repos/asf/camel/blob/fe052fc9/components/camel-crypto/src/test/java/org/apache/camel/converter/crypto/PGPDataFormatTest.java ---------------------------------------------------------------------- diff --git a/components/camel-crypto/src/test/java/org/apache/camel/converter/crypto/PGPDataFormatTest.java b/components/camel-crypto/src/test/java/org/apache/camel/converter/crypto/PGPDataFormatTest.java index ab4a1b1..1bc343d 100644 --- a/components/camel-crypto/src/test/java/org/apache/camel/converter/crypto/PGPDataFormatTest.java +++ b/components/camel-crypto/src/test/java/org/apache/camel/converter/crypto/PGPDataFormatTest.java @@ -326,7 +326,7 @@ public class PGPDataFormatTest extends AbstractPGPDataFormatTest { Map<String, String> userId2Passphrase = new HashMap<String, String>(); userId2Passphrase.put("Third (comment third) <[email protected]>", "sdude"); userId2Passphrase.put("Second <[email protected]>", "sdude"); - PGPPassphraseAccessor passphraseAccessorSeveralKeys = new PGPPassphraseAccessorDefault(userId2Passphrase); + PGPPassphraseAccessor passphraseAccessorSeveralKeys = new DefaultPGPPassphraseAccessor(userId2Passphrase); pgpSignAndEncryptSeveralSignerKeys.setPassphraseAccessor(passphraseAccessorSeveralKeys); PGPDataFormat pgpVerifyAndDecryptSeveralSignerKeys = new PGPDataFormat(); @@ -398,9 +398,9 @@ public class PGPDataFormatTest extends AbstractPGPDataFormatTest { }, new RouteBuilder() { public void configure() throws Exception { - PGPPublicKeyAccess publicKeyAccess = new PGPPublicKeyAccessDefault(getPublicKeyRing()); + PGPPublicKeyAccess publicKeyAccess = new DefaultPGPPublicKeyAccess(getPublicKeyRing()); //password cannot be set dynamically! - PGPSecretKeyAccess secretKeyAccess = new PGPSecretKeyAccessDefault(getSecKeyRing(), "sdude", getProvider()); + PGPSecretKeyAccess secretKeyAccess = new DefaultPGPSecretKeyAccess(getSecKeyRing(), "sdude", getProvider()); PGPKeyAccessDataFormat dfEncryptSignKeyAccess = new PGPKeyAccessDataFormat(); dfEncryptSignKeyAccess.setPublicKeyAccess(publicKeyAccess); @@ -438,7 +438,7 @@ public class PGPDataFormatTest extends AbstractPGPDataFormatTest { public static PGPPassphraseAccessor getPassphraseAccessor() { Map<String, String> userId2Passphrase = Collections.singletonMap("Super <[email protected]>", "sdude"); - PGPPassphraseAccessor passphraseAccessor = new PGPPassphraseAccessorDefault(userId2Passphrase); + PGPPassphraseAccessor passphraseAccessor = new DefaultPGPPassphraseAccessor(userId2Passphrase); return passphraseAccessor; } http://git-wip-us.apache.org/repos/asf/camel/blob/fe052fc9/components/camel-crypto/src/test/java/org/apache/camel/converter/crypto/PGPKeyAccessDataFormatTest.java ---------------------------------------------------------------------- diff --git a/components/camel-crypto/src/test/java/org/apache/camel/converter/crypto/PGPKeyAccessDataFormatTest.java b/components/camel-crypto/src/test/java/org/apache/camel/converter/crypto/PGPKeyAccessDataFormatTest.java index c597c15..0731402 100644 --- a/components/camel-crypto/src/test/java/org/apache/camel/converter/crypto/PGPKeyAccessDataFormatTest.java +++ b/components/camel-crypto/src/test/java/org/apache/camel/converter/crypto/PGPKeyAccessDataFormatTest.java @@ -26,8 +26,8 @@ public class PGPKeyAccessDataFormatTest extends CamelTestSupport { return new RouteBuilder() { public void configure() throws Exception { - PGPPublicKeyAccess publicKeyAccess = new PGPPublicKeyAccessDefault(PGPDataFormatTest.getPublicKeyRing()); - PGPSecretKeyAccess secretKeyAccess = new PGPSecretKeyAccessDefault(PGPDataFormatTest.getSecKeyRing(), "sdude", "BC"); + PGPPublicKeyAccess publicKeyAccess = new DefaultPGPPublicKeyAccess(PGPDataFormatTest.getPublicKeyRing()); + PGPSecretKeyAccess secretKeyAccess = new DefaultPGPSecretKeyAccess(PGPDataFormatTest.getSecKeyRing(), "sdude", "BC"); PGPKeyAccessDataFormat dt = new PGPKeyAccessDataFormat(); dt.setPublicKeyAccess(publicKeyAccess); dt.setSecretKeyAccess(secretKeyAccess);
