You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2019/08/02 08:57:37 UTC
[camel] branch master updated (bfbc97a -> 76f8153)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from bfbc97a Removed unused imports
new 2edbf90 Camel-Crypto: Fixed CS
new 76f8153 Camel-Management-impl: Fixed CS
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../java/org/apache/camel/converter/crypto/CryptoDataFormat.java | 6 +++---
.../org/apache/camel/management/ManagedStartupFailedTest.java | 8 ++++----
2 files changed, 7 insertions(+), 7 deletions(-)
[camel] 02/02: Camel-Management-impl: Fixed CS
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 76f8153b2e88c86eabcddd27e681d95dabfa7a9e
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Fri Aug 2 10:57:14 2019 +0200
Camel-Management-impl: Fixed CS
---
.../org/apache/camel/management/ManagedStartupFailedTest.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/core/camel-management-impl/src/test/java/org/apache/camel/management/ManagedStartupFailedTest.java b/core/camel-management-impl/src/test/java/org/apache/camel/management/ManagedStartupFailedTest.java
index 54c1c37..76ec8bc 100644
--- a/core/camel-management-impl/src/test/java/org/apache/camel/management/ManagedStartupFailedTest.java
+++ b/core/camel-management-impl/src/test/java/org/apache/camel/management/ManagedStartupFailedTest.java
@@ -1,13 +1,13 @@
-/**
+/*
* 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
- * <p>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
+ *
+ * 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.
[camel] 01/02: Camel-Crypto: Fixed CS
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 2edbf90e459bb5e3678c5db24d740c4e894de102
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Fri Aug 2 10:50:05 2019 +0200
Camel-Crypto: Fixed CS
---
.../java/org/apache/camel/converter/crypto/CryptoDataFormat.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/CryptoDataFormat.java b/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/CryptoDataFormat.java
index 075f099..6d0b3a9 100644
--- a/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/CryptoDataFormat.java
+++ b/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/CryptoDataFormat.java
@@ -28,6 +28,9 @@ import javax.crypto.CipherInputStream;
import javax.crypto.CipherOutputStream;
import javax.crypto.spec.IvParameterSpec;
+import static javax.crypto.Cipher.DECRYPT_MODE;
+import static javax.crypto.Cipher.ENCRYPT_MODE;
+
import org.apache.camel.Exchange;
import org.apache.camel.spi.DataFormat;
import org.apache.camel.spi.DataFormatName;
@@ -39,9 +42,6 @@ import org.apache.camel.util.IOHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static javax.crypto.Cipher.DECRYPT_MODE;
-import static javax.crypto.Cipher.ENCRYPT_MODE;
-
/**
* <code>CryptoDataFormat</code> uses a specified key and algorithm to encrypt,
* decrypt and verify exchange payloads. The Data format allows an