[3/4] camel git commit: Polished
Polished
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ab2ed8c3
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ab2ed8c3
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ab2ed8c3
Branch: refs/heads/master
Commit: ab2ed8c356f038a52fe97f89764a2b82f3ec
Parents: 7a85395
Author: Claus Ibsen
Authored: Wed Apr 12 14:56:34 2017 +0200
Committer: Claus Ibsen
Committed: Wed Apr 12 14:56:34 2017 +0200
--
.../src/main/java/org/apache/camel/component/file/FileEndpoint.java | 1 -
1 file changed, 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/ab2ed8c3/camel-core/src/main/java/org/apache/camel/component/file/FileEndpoint.java
--
diff --git
a/camel-core/src/main/java/org/apache/camel/component/file/FileEndpoint.java
b/camel-core/src/main/java/org/apache/camel/component/file/FileEndpoint.java
index db5f140..8a1ed20 100644
--- a/camel-core/src/main/java/org/apache/camel/component/file/FileEndpoint.java
+++ b/camel-core/src/main/java/org/apache/camel/component/file/FileEndpoint.java
@@ -239,7 +239,6 @@ public class FileEndpoint extends GenericFileEndpoint
{
this.probeContentType = probeContentType;
}
-
public String getExtendedAttributes() {
return extendedAttributes;
}
[3/4] camel git commit: Polished
Polished
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/3f25826b
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/3f25826b
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/3f25826b
Branch: refs/heads/camel-2.16.x
Commit: 3f25826b1871c3a8c491141721a5d4225b203e05
Parents: 58ed161
Author: Claus Ibsen
Authored: Sat Feb 13 13:03:56 2016 +0100
Committer: Claus Ibsen
Committed: Sat Feb 13 13:22:54 2016 +0100
--
.../java/org/apache/camel/http/common/HttpCommonEndpoint.java | 6 ++
1 file changed, 6 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/3f25826b/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpCommonEndpoint.java
--
diff --git
a/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpCommonEndpoint.java
b/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpCommonEndpoint.java
index 2856c48..8c1ee9c 100644
---
a/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpCommonEndpoint.java
+++
b/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpCommonEndpoint.java
@@ -138,11 +138,17 @@ public abstract class HttpCommonEndpoint extends
DefaultEndpoint implements Head
// Properties
//-
+/**
+ * @deprecated use {@link #getHttpBinding()}
+ */
@Deprecated
public HttpBinding getBinding() {
return httpBinding;
}
+/**
+ * @deprecated use {@link #setHttpBinding(HttpBinding)}
+ */
@Deprecated
public void setBinding(HttpBinding httpBinding) {
setHttpBinding(httpBinding);
[3/4] camel git commit: Polished formatting
Polished formatting
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/883b8cff
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/883b8cff
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/883b8cff
Branch: refs/heads/master
Commit: 883b8cffb1db531cfb46dfcd346eed11e6148a00
Parents: 440bd94
Author: Dhiraj Bokde
Authored: Tue Sep 22 16:39:00 2015 -0700
Committer: Dhiraj Bokde
Committed: Tue Sep 22 16:39:00 2015 -0700
--
.../salesforce/internal/dto/LoginToken.java | 4 +-
.../salesforce/internal/LoginTokenTest.java | 83
2 files changed, 52 insertions(+), 35 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/883b8cff/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/dto/LoginToken.java
--
diff --git
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/dto/LoginToken.java
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/dto/LoginToken.java
index e429bc5..7f7e2c6 100644
---
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/dto/LoginToken.java
+++
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/dto/LoginToken.java
@@ -22,7 +22,7 @@ import org.codehaus.jackson.annotate.JsonProperty;
/**
* DTO for Salesforce login
*/
-@JsonIgnoreProperties(ignoreUnknown=true)
+@JsonIgnoreProperties(ignoreUnknown = true)
public class LoginToken {
private String accessToken;
@@ -36,7 +36,7 @@ public class LoginToken {
private String issuedAt;
private String tokenType;
-
+
private String isReadOnly;
@JsonProperty("access_token")
http://git-wip-us.apache.org/repos/asf/camel/blob/883b8cff/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/internal/LoginTokenTest.java
--
diff --git
a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/internal/LoginTokenTest.java
b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/internal/LoginTokenTest.java
index d20b662..5d08d49 100644
---
a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/internal/LoginTokenTest.java
+++
b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/internal/LoginTokenTest.java
@@ -1,3 +1,19 @@
+/**
+ * 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.component.salesforce.internal;
import org.apache.camel.component.salesforce.internal.dto.LoginToken;
@@ -5,41 +21,42 @@ import org.codehaus.jackson.map.ObjectMapper;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+
import static org.junit.Assert.*;
public class LoginTokenTest {
-
- private static final Logger LOG =
LoggerFactory.getLogger(SessionIntegrationTest.class);
-
- @Test
- public void testLoginTokenWithUnknownFields() throws Exception {
-
- String salesforceOAuthResponse = "{\n" +
- "\"access_token\":
\"00!ARMAQKg_lg_hGaRElvizVFBQHoCpvX8tzwGnROQ0_MDPXSceMeZHtm3JHkPmMhlgK0Km3rpJkwxwHInd_8o022KsDy.p4O.X\",\n"
+
- "\"is_readonly\": \"false\",\n" +
- "\"signature\":
\"XX+MYU+JrOXPSbpHa2ihMpSvUqow1iTPh7Q=\",\n" +
- "\"instance_url\":
\"https://--xxx.cs5.my.salesforce.com\",\n"; +
- "\"id
[3/4] camel git commit: Polished
Polished
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/38f9d3bc
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/38f9d3bc
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/38f9d3bc
Branch: refs/heads/camel-2.15.x
Commit: 38f9d3bc8955fcee6010d12e093b63461b1ed504
Parents: 990c6b5
Author: Claus Ibsen
Authored: Fri Aug 7 16:39:42 2015 +0200
Committer: Claus Ibsen
Committed: Fri Aug 7 16:57:07 2015 +0200
--
.../java/org/apache/camel/component/kafka/KafkaConsumer.java | 8
1 file changed, 4 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/38f9d3bc/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaConsumer.java
--
diff --git
a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaConsumer.java
b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaConsumer.java
index 1657fa7..cb2dc9d 100644
---
a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaConsumer.java
+++
b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaConsumer.java
@@ -121,11 +121,11 @@ public class KafkaConsumer extends DefaultConsumer {
class BatchingConsumerTask implements Runnable {
private KafkaStream stream;
-private CyclicBarrier berrier;
+private CyclicBarrier barrier;
-public BatchingConsumerTask(KafkaStream stream,
CyclicBarrier berrier) {
+public BatchingConsumerTask(KafkaStream stream,
CyclicBarrier barrier) {
this.stream = stream;
-this.berrier = berrier;
+this.barrier = barrier;
}
public void run() {
@@ -160,7 +160,7 @@ public class KafkaConsumer extends DefaultConsumer {
if (processed >= endpoint.getBatchSize() || consumerTimeout
|| (processed > 0 && !hasNext)) { // Need to commit the
offset for the last round
try {
-berrier.await(endpoint.getBarrierAwaitTimeoutMs(),
TimeUnit.MILLISECONDS);
+barrier.await(endpoint.getBarrierAwaitTimeoutMs(),
TimeUnit.MILLISECONDS);
if (!consumerTimeout) {
processed = 0;
}
[3/4] camel git commit: Polished the configuration default setting of camel-netty component
Polished the configuration default setting of camel-netty component Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/b046a673 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b046a673 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b046a673 Branch: refs/heads/master Commit: b046a673e57977a7d5009dc6338fcf41cfa92730 Parents: 5f59322 Author: Willem Jiang Authored: Tue Mar 31 17:33:58 2015 +0800 Committer: Willem Jiang Committed: Tue Mar 31 17:42:44 2015 +0800 -- .../org/apache/camel/component/netty/NettyConfiguration.java | 6 +++--- .../org/apache/camel/component/netty4/NettyConfiguration.java | 7 --- 2 files changed, 7 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/b046a673/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyConfiguration.java -- diff --git a/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyConfiguration.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyConfiguration.java index ccbbef9..847ca45 100644 --- a/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyConfiguration.java +++ b/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyConfiguration.java @@ -90,11 +90,11 @@ public class NettyConfiguration extends NettyServerBootstrapConfiguration implem private long producerPoolMinEvictableIdle = 5 * 60 * 1000L; @UriParam(defaultValue = "true") private boolean producerPoolEnabled = true; -@UriParam +@UriParam(defaultValue = "false") private boolean udpConnectionlessSending; -@UriParam +@UriParam(defaultValue = "false") private boolean clientMode; - + /** * Returns a copy of this configuration */ http://git-wip-us.apache.org/repos/asf/camel/blob/b046a673/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyConfiguration.java -- diff --git a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyConfiguration.java b/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyConfiguration.java index 2e2244d..d315f43 100644 --- a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyConfiguration.java +++ b/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyConfiguration.java @@ -72,7 +72,7 @@ public class NettyConfiguration extends NettyServerBootstrapConfiguration implem private LoggingLevel serverExceptionCaughtLogLevel = LoggingLevel.WARN; @UriParam(defaultValue = "DEBUG") private LoggingLevel serverClosedChannelExceptionCaughtLogLevel = LoggingLevel.DEBUG; -@UriParam(defaultValue = "false") +@UriParam(defaultValue = "true") private boolean allowDefaultCodec = true; @UriParam private ClientInitializerFactory clientInitializerFactory; @@ -90,10 +90,11 @@ public class NettyConfiguration extends NettyServerBootstrapConfiguration implem private long producerPoolMinEvictableIdle = 5 * 60 * 1000L; @UriParam(defaultValue = "true") private boolean producerPoolEnabled = true; -@UriParam +@UriParam(defaultValue = "false") private boolean udpConnectionlessSending; -@UriParam +@UriParam(defaultValue = "false") private boolean clientMode; + /** * Returns a copy of this configuration
