You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2014/06/06 08:49:39 UTC
[1/5] git commit: Polish the code of camel-dropbox
Repository: camel
Updated Branches:
refs/heads/master b3fed9d77 -> 5ebf252c2
Polish the code of camel-dropbox
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/83f43417
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/83f43417
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/83f43417
Branch: refs/heads/master
Commit: 83f434179edb78d5edd97c32c37217e789d21d41
Parents: a0b87d9
Author: Willem Jiang <wi...@gmail.com>
Authored: Fri Jun 6 14:31:53 2014 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Fri Jun 6 14:42:41 2014 +0800
----------------------------------------------------------------------
.../component/dropbox/core/DropboxAPIFacade.java | 18 +++++++++---------
.../component/dropbox/dto/DropboxDelResult.java | 6 +-----
.../component/dropbox/dto/DropboxMoveResult.java | 6 +-----
.../dropbox/dto/DropboxSearchResult.java | 5 +----
.../integration/producer/DropboxDelProducer.java | 5 +----
.../integration/producer/DropboxMoveProducer.java | 5 +----
.../producer/DropboxSearchProducer.java | 5 +----
7 files changed, 15 insertions(+), 35 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/83f43417/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/core/DropboxAPIFacade.java
----------------------------------------------------------------------
diff --git a/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/core/DropboxAPIFacade.java b/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/core/DropboxAPIFacade.java
index aba52f6..9edfcc6 100755
--- a/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/core/DropboxAPIFacade.java
+++ b/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/core/DropboxAPIFacade.java
@@ -63,7 +63,7 @@ public final class DropboxAPIFacade {
public static DropboxAPIFacade getInstance(DbxClient client) {
if (instance == null) {
instance = new DropboxAPIFacade();
- instance.client = client;
+ DropboxAPIFacade.client = client;
}
return instance;
}
@@ -87,7 +87,7 @@ public final class DropboxAPIFacade {
String dropboxPath = remotePath == null ? localPath : remotePath;
DbxEntry entry = null;
try {
- entry = instance.client.getMetadata(dropboxPath);
+ entry = DropboxAPIFacade.client.getMetadata(dropboxPath);
} catch (DbxException e) {
throw new DropboxException(dropboxPath + " does not exist or can't obtain metadata");
}
@@ -173,7 +173,7 @@ public final class DropboxAPIFacade {
uploadMode = DbxWriteMode.add();
}
uploadedFile =
- instance.client.uploadFile(dropboxPath,
+ DropboxAPIFacade.client.uploadFile(dropboxPath,
uploadMode, inputFile.length(), inputStream);
return uploadedFile;
} finally {
@@ -195,7 +195,7 @@ public final class DropboxAPIFacade {
if (query == null) {
LOG.info("search no query");
try {
- listing = instance.client.getMetadataWithChildren(remotePath);
+ listing = DropboxAPIFacade.client.getMetadataWithChildren(remotePath);
} catch (DbxException e) {
throw new DropboxException(remotePath + " does not exist or can't obtain metadata");
}
@@ -204,7 +204,7 @@ public final class DropboxAPIFacade {
LOG.info("search by query:" + query);
List<DbxEntry> entries = null;
try {
- entries = instance.client.searchFileAndFolderNames(remotePath, query);
+ entries = DropboxAPIFacade.client.searchFileAndFolderNames(remotePath, query);
} catch (DbxException e) {
throw new DropboxException(remotePath + " does not exist or can't obtain metadata");
}
@@ -223,7 +223,7 @@ public final class DropboxAPIFacade {
public DropboxResult del(String remotePath) throws DropboxException {
DropboxResult result = null;
try {
- instance.client.delete(remotePath);
+ DropboxAPIFacade.client.delete(remotePath);
} catch (DbxException e) {
throw new DropboxException(remotePath + " does not exist or can't obtain metadata");
}
@@ -242,7 +242,7 @@ public final class DropboxAPIFacade {
public DropboxResult move(String remotePath, String newRemotePath) throws DropboxException {
DropboxResult result = null;
try {
- instance.client.move(remotePath, newRemotePath);
+ DropboxAPIFacade.client.move(remotePath, newRemotePath);
} catch (DbxException e) {
throw new DropboxException(remotePath + " does not exist or can't obtain metadata");
}
@@ -271,7 +271,7 @@ public final class DropboxAPIFacade {
private void downloadFilesInFolder(String path, Map<String, ByteArrayOutputStream> resultEntries) throws DropboxException {
DbxEntry.WithChildren listing = null;
try {
- listing = instance.client.getMetadataWithChildren(path);
+ listing = DropboxAPIFacade.client.getMetadataWithChildren(path);
} catch (DbxException e) {
throw new DropboxException(path + " does not exist or can't obtain metadata");
}
@@ -299,7 +299,7 @@ public final class DropboxAPIFacade {
ByteArrayOutputStream baos = new ByteArrayOutputStream();
DbxEntry.File downloadedFile;
try {
- downloadedFile = instance.client.getFile(path, null, baos);
+ downloadedFile = DropboxAPIFacade.client.getFile(path, null, baos);
} catch (DbxException e) {
throw new DropboxException(path + " does not exist or can't obtain metadata");
} catch (IOException e) {
http://git-wip-us.apache.org/repos/asf/camel/blob/83f43417/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/dto/DropboxDelResult.java
----------------------------------------------------------------------
diff --git a/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/dto/DropboxDelResult.java b/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/dto/DropboxDelResult.java
index 50ed909..1963c11 100755
--- a/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/dto/DropboxDelResult.java
+++ b/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/dto/DropboxDelResult.java
@@ -18,13 +18,9 @@ package org.apache.camel.component.dropbox.dto;
import org.apache.camel.Exchange;
import org.apache.camel.component.dropbox.util.DropboxResultHeader;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
public class DropboxDelResult extends DropboxResult {
-
- private static final transient Logger LOG = LoggerFactory.getLogger(DropboxDelResult.class);
-
+
/**
* Object payload contained in Exchange
* Exchange Body is populated with the remote path deleted on dropbox.
http://git-wip-us.apache.org/repos/asf/camel/blob/83f43417/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/dto/DropboxMoveResult.java
----------------------------------------------------------------------
diff --git a/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/dto/DropboxMoveResult.java b/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/dto/DropboxMoveResult.java
index 8337f62..fd4e171 100755
--- a/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/dto/DropboxMoveResult.java
+++ b/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/dto/DropboxMoveResult.java
@@ -18,14 +18,10 @@ package org.apache.camel.component.dropbox.dto;
import org.apache.camel.Exchange;
import org.apache.camel.component.dropbox.util.DropboxResultHeader;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
public class DropboxMoveResult extends DropboxResult {
-
- private static final transient Logger LOG = LoggerFactory.getLogger(DropboxMoveResult.class);
-
+
/**
* Object payload contained in Exchange
* Exchange Header and Body contains the mode path
http://git-wip-us.apache.org/repos/asf/camel/blob/83f43417/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/dto/DropboxSearchResult.java
----------------------------------------------------------------------
diff --git a/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/dto/DropboxSearchResult.java b/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/dto/DropboxSearchResult.java
index 97a5972..b17a48a 100755
--- a/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/dto/DropboxSearchResult.java
+++ b/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/dto/DropboxSearchResult.java
@@ -19,16 +19,13 @@ package org.apache.camel.component.dropbox.dto;
import java.util.List;
import com.dropbox.core.DbxEntry;
+
import org.apache.camel.Exchange;
import org.apache.camel.component.dropbox.util.DropboxResultHeader;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
public class DropboxSearchResult extends DropboxResult {
- private static final transient Logger LOG = LoggerFactory.getLogger(DropboxSearchResult.class);
-
/**
* Object payload contained in Exchange
* Exchange Header is populated with the remote paths found.
http://git-wip-us.apache.org/repos/asf/camel/blob/83f43417/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/integration/producer/DropboxDelProducer.java
----------------------------------------------------------------------
diff --git a/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/integration/producer/DropboxDelProducer.java b/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/integration/producer/DropboxDelProducer.java
index f81ed34..4b2128e 100755
--- a/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/integration/producer/DropboxDelProducer.java
+++ b/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/integration/producer/DropboxDelProducer.java
@@ -21,12 +21,9 @@ import org.apache.camel.component.dropbox.DropboxConfiguration;
import org.apache.camel.component.dropbox.DropboxEndpoint;
import org.apache.camel.component.dropbox.core.DropboxAPIFacade;
import org.apache.camel.component.dropbox.dto.DropboxResult;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
public class DropboxDelProducer extends DropboxProducer {
- private static final transient Logger LOG = LoggerFactory.getLogger(DropboxDelProducer.class);
-
+
public DropboxDelProducer(DropboxEndpoint endpoint, DropboxConfiguration configuration) {
super(endpoint, configuration);
}
http://git-wip-us.apache.org/repos/asf/camel/blob/83f43417/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/integration/producer/DropboxMoveProducer.java
----------------------------------------------------------------------
diff --git a/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/integration/producer/DropboxMoveProducer.java b/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/integration/producer/DropboxMoveProducer.java
index 7ab6142..0ca0fce 100755
--- a/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/integration/producer/DropboxMoveProducer.java
+++ b/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/integration/producer/DropboxMoveProducer.java
@@ -21,12 +21,9 @@ import org.apache.camel.component.dropbox.DropboxConfiguration;
import org.apache.camel.component.dropbox.DropboxEndpoint;
import org.apache.camel.component.dropbox.core.DropboxAPIFacade;
import org.apache.camel.component.dropbox.dto.DropboxResult;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
public class DropboxMoveProducer extends DropboxProducer {
- private static final transient Logger LOG = LoggerFactory.getLogger(DropboxMoveProducer.class);
-
+
public DropboxMoveProducer(DropboxEndpoint endpoint, DropboxConfiguration configuration) {
super(endpoint, configuration);
}
http://git-wip-us.apache.org/repos/asf/camel/blob/83f43417/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/integration/producer/DropboxSearchProducer.java
----------------------------------------------------------------------
diff --git a/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/integration/producer/DropboxSearchProducer.java b/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/integration/producer/DropboxSearchProducer.java
index d15e91e..c924ad6 100755
--- a/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/integration/producer/DropboxSearchProducer.java
+++ b/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/integration/producer/DropboxSearchProducer.java
@@ -21,12 +21,9 @@ import org.apache.camel.component.dropbox.DropboxConfiguration;
import org.apache.camel.component.dropbox.DropboxEndpoint;
import org.apache.camel.component.dropbox.core.DropboxAPIFacade;
import org.apache.camel.component.dropbox.dto.DropboxResult;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
public class DropboxSearchProducer extends DropboxProducer {
- private static final transient Logger LOG = LoggerFactory.getLogger(DropboxSearchProducer.class);
-
+
public DropboxSearchProducer(DropboxEndpoint endpoint, DropboxConfiguration configuration) {
super(endpoint, configuration);
}
[3/5] git commit: Removed the usage of the deprecated API in camel-rx
Posted by ni...@apache.org.
Removed the usage of the deprecated API in camel-rx
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/b62e932b
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b62e932b
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b62e932b
Branch: refs/heads/master
Commit: b62e932b162af5dccfcdc3daa087ba21924b7d21
Parents: b3fed9d
Author: Willem Jiang <wi...@gmail.com>
Authored: Fri Jun 6 13:13:03 2014 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Fri Jun 6 14:42:41 2014 +0800
----------------------------------------------------------------------
.../src/main/java/org/apache/camel/rx/ReactiveCamel.java | 2 +-
.../java/org/apache/camel/rx/support/EndpointSubscribeFunc.java | 2 +-
.../java/org/apache/camel/rx/support/EndpointSubscription.java | 2 +-
.../java/org/apache/camel/rx/support/ExchangeToBodyFunc1.java | 2 +-
.../java/org/apache/camel/rx/support/ExchangeToMessageFunc1.java | 2 +-
.../java/org/apache/camel/rx/support/ObservableProcessor.java | 3 +--
.../java/org/apache/camel/rx/support/ProcessorToObserver.java | 2 +-
.../src/test/java/org/apache/camel/rx/ObservableBodyTest.java | 4 ++--
.../src/test/java/org/apache/camel/rx/ObservableMessageTest.java | 4 ++--
.../test/java/org/apache/camel/rx/ToObservableAndMapTest.java | 4 ++--
.../src/test/java/org/apache/camel/rx/ToObservableBodyTest.java | 4 ++--
.../src/test/java/org/apache/camel/rx/ToObservableTest.java | 2 +-
12 files changed, 16 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/b62e932b/components/camel-rx/src/main/java/org/apache/camel/rx/ReactiveCamel.java
----------------------------------------------------------------------
diff --git a/components/camel-rx/src/main/java/org/apache/camel/rx/ReactiveCamel.java b/components/camel-rx/src/main/java/org/apache/camel/rx/ReactiveCamel.java
index b104ebf..368cb53 100644
--- a/components/camel-rx/src/main/java/org/apache/camel/rx/ReactiveCamel.java
+++ b/components/camel-rx/src/main/java/org/apache/camel/rx/ReactiveCamel.java
@@ -27,7 +27,7 @@ import org.apache.camel.rx.support.ExchangeToMessageFunc1;
import org.apache.camel.rx.support.ObserverSender;
import org.apache.camel.util.CamelContextHelper;
import rx.Observable;
-import rx.util.functions.Func1;
+import rx.functions.Func1;
/**
* Provides the <a href="https://rx.codeplex.com/">Reactive Extensions</a> support for
http://git-wip-us.apache.org/repos/asf/camel/blob/b62e932b/components/camel-rx/src/main/java/org/apache/camel/rx/support/EndpointSubscribeFunc.java
----------------------------------------------------------------------
diff --git a/components/camel-rx/src/main/java/org/apache/camel/rx/support/EndpointSubscribeFunc.java b/components/camel-rx/src/main/java/org/apache/camel/rx/support/EndpointSubscribeFunc.java
index 7e6cf17..d118f5a 100644
--- a/components/camel-rx/src/main/java/org/apache/camel/rx/support/EndpointSubscribeFunc.java
+++ b/components/camel-rx/src/main/java/org/apache/camel/rx/support/EndpointSubscribeFunc.java
@@ -22,7 +22,7 @@ import rx.Observable;
import rx.Observer;
import rx.Subscriber;
import rx.Subscription;
-import rx.util.functions.Func1;
+import rx.functions.Func1;
public class EndpointSubscribeFunc<T> implements Observable.OnSubscribeFunc<T>, Observable.OnSubscribe<T> {
http://git-wip-us.apache.org/repos/asf/camel/blob/b62e932b/components/camel-rx/src/main/java/org/apache/camel/rx/support/EndpointSubscription.java
----------------------------------------------------------------------
diff --git a/components/camel-rx/src/main/java/org/apache/camel/rx/support/EndpointSubscription.java b/components/camel-rx/src/main/java/org/apache/camel/rx/support/EndpointSubscription.java
index 8769561..f7c8f6c 100644
--- a/components/camel-rx/src/main/java/org/apache/camel/rx/support/EndpointSubscription.java
+++ b/components/camel-rx/src/main/java/org/apache/camel/rx/support/EndpointSubscription.java
@@ -26,7 +26,7 @@ import org.apache.camel.Processor;
import org.apache.camel.util.ServiceHelper;
import rx.Observer;
import rx.Subscription;
-import rx.util.functions.Func1;
+import rx.functions.Func1;
/**
* An RX {@link Subscription} on a Camel {@link Endpoint}
http://git-wip-us.apache.org/repos/asf/camel/blob/b62e932b/components/camel-rx/src/main/java/org/apache/camel/rx/support/ExchangeToBodyFunc1.java
----------------------------------------------------------------------
diff --git a/components/camel-rx/src/main/java/org/apache/camel/rx/support/ExchangeToBodyFunc1.java b/components/camel-rx/src/main/java/org/apache/camel/rx/support/ExchangeToBodyFunc1.java
index 98effe1..e8fb350 100644
--- a/components/camel-rx/src/main/java/org/apache/camel/rx/support/ExchangeToBodyFunc1.java
+++ b/components/camel-rx/src/main/java/org/apache/camel/rx/support/ExchangeToBodyFunc1.java
@@ -19,7 +19,7 @@ package org.apache.camel.rx.support;
import org.apache.camel.Exchange;
import org.apache.camel.Message;
-import rx.util.functions.Func1;
+import rx.functions.Func1;
/**
* A simple {@link Func1} to convert an {@link Exchange} to the given type using the
http://git-wip-us.apache.org/repos/asf/camel/blob/b62e932b/components/camel-rx/src/main/java/org/apache/camel/rx/support/ExchangeToMessageFunc1.java
----------------------------------------------------------------------
diff --git a/components/camel-rx/src/main/java/org/apache/camel/rx/support/ExchangeToMessageFunc1.java b/components/camel-rx/src/main/java/org/apache/camel/rx/support/ExchangeToMessageFunc1.java
index 6f54100..59911f3 100644
--- a/components/camel-rx/src/main/java/org/apache/camel/rx/support/ExchangeToMessageFunc1.java
+++ b/components/camel-rx/src/main/java/org/apache/camel/rx/support/ExchangeToMessageFunc1.java
@@ -19,7 +19,7 @@ package org.apache.camel.rx.support;
import org.apache.camel.Exchange;
import org.apache.camel.Message;
-import rx.util.functions.Func1;
+import rx.functions.Func1;
/**
* A simple {@link Func1} to convert an {@link Exchange} to its IN {@link Message}
http://git-wip-us.apache.org/repos/asf/camel/blob/b62e932b/components/camel-rx/src/main/java/org/apache/camel/rx/support/ObservableProcessor.java
----------------------------------------------------------------------
diff --git a/components/camel-rx/src/main/java/org/apache/camel/rx/support/ObservableProcessor.java b/components/camel-rx/src/main/java/org/apache/camel/rx/support/ObservableProcessor.java
index cf03583..7767a58 100644
--- a/components/camel-rx/src/main/java/org/apache/camel/rx/support/ObservableProcessor.java
+++ b/components/camel-rx/src/main/java/org/apache/camel/rx/support/ObservableProcessor.java
@@ -19,11 +19,10 @@ package org.apache.camel.rx.support;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.support.ServiceSupport;
-
import rx.Observable;
+import rx.functions.Func1;
import rx.subjects.PublishSubject;
import rx.subjects.Subject;
-import rx.util.functions.Func1;
/**
* A base class for implementing a {@link Processor} which provides access to an {@link Observable}
http://git-wip-us.apache.org/repos/asf/camel/blob/b62e932b/components/camel-rx/src/main/java/org/apache/camel/rx/support/ProcessorToObserver.java
----------------------------------------------------------------------
diff --git a/components/camel-rx/src/main/java/org/apache/camel/rx/support/ProcessorToObserver.java b/components/camel-rx/src/main/java/org/apache/camel/rx/support/ProcessorToObserver.java
index fff8668..cfbe4bc 100644
--- a/components/camel-rx/src/main/java/org/apache/camel/rx/support/ProcessorToObserver.java
+++ b/components/camel-rx/src/main/java/org/apache/camel/rx/support/ProcessorToObserver.java
@@ -20,7 +20,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import rx.Observer;
-import rx.util.functions.Func1;
+import rx.functions.Func1;
/**
* A {@link Processor} which invokes an underling {@link Observer} as messages
http://git-wip-us.apache.org/repos/asf/camel/blob/b62e932b/components/camel-rx/src/test/java/org/apache/camel/rx/ObservableBodyTest.java
----------------------------------------------------------------------
diff --git a/components/camel-rx/src/test/java/org/apache/camel/rx/ObservableBodyTest.java b/components/camel-rx/src/test/java/org/apache/camel/rx/ObservableBodyTest.java
index 5b2cf41..c9478c2 100644
--- a/components/camel-rx/src/test/java/org/apache/camel/rx/ObservableBodyTest.java
+++ b/components/camel-rx/src/test/java/org/apache/camel/rx/ObservableBodyTest.java
@@ -25,8 +25,8 @@ import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
import rx.Observable;
-import rx.util.functions.Action1;
-import rx.util.functions.Func1;
+import rx.functions.Action1;
+import rx.functions.Func1;
public class ObservableBodyTest extends CamelTestSupport {
protected MyObservableBody observableBody = new MyObservableBody();
http://git-wip-us.apache.org/repos/asf/camel/blob/b62e932b/components/camel-rx/src/test/java/org/apache/camel/rx/ObservableMessageTest.java
----------------------------------------------------------------------
diff --git a/components/camel-rx/src/test/java/org/apache/camel/rx/ObservableMessageTest.java b/components/camel-rx/src/test/java/org/apache/camel/rx/ObservableMessageTest.java
index d952797..1370419 100644
--- a/components/camel-rx/src/test/java/org/apache/camel/rx/ObservableMessageTest.java
+++ b/components/camel-rx/src/test/java/org/apache/camel/rx/ObservableMessageTest.java
@@ -26,8 +26,8 @@ import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
import rx.Observable;
-import rx.util.functions.Action1;
-import rx.util.functions.Func1;
+import rx.functions.Action1;
+import rx.functions.Func1;
public class ObservableMessageTest extends CamelTestSupport {
protected MyObservableMessage observableMessage = new MyObservableMessage();
http://git-wip-us.apache.org/repos/asf/camel/blob/b62e932b/components/camel-rx/src/test/java/org/apache/camel/rx/ToObservableAndMapTest.java
----------------------------------------------------------------------
diff --git a/components/camel-rx/src/test/java/org/apache/camel/rx/ToObservableAndMapTest.java b/components/camel-rx/src/test/java/org/apache/camel/rx/ToObservableAndMapTest.java
index b159918..a73a711 100644
--- a/components/camel-rx/src/test/java/org/apache/camel/rx/ToObservableAndMapTest.java
+++ b/components/camel-rx/src/test/java/org/apache/camel/rx/ToObservableAndMapTest.java
@@ -23,8 +23,8 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import rx.Observable;
-import rx.util.functions.Action1;
-import rx.util.functions.Func1;
+import rx.functions.Action1;
+import rx.functions.Func1;
/**
*/
http://git-wip-us.apache.org/repos/asf/camel/blob/b62e932b/components/camel-rx/src/test/java/org/apache/camel/rx/ToObservableBodyTest.java
----------------------------------------------------------------------
diff --git a/components/camel-rx/src/test/java/org/apache/camel/rx/ToObservableBodyTest.java b/components/camel-rx/src/test/java/org/apache/camel/rx/ToObservableBodyTest.java
index 6974e8b..0a753f9 100644
--- a/components/camel-rx/src/test/java/org/apache/camel/rx/ToObservableBodyTest.java
+++ b/components/camel-rx/src/test/java/org/apache/camel/rx/ToObservableBodyTest.java
@@ -22,8 +22,8 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import rx.Observable;
-import rx.util.functions.Action1;
-import rx.util.functions.Func1;
+import rx.functions.Action1;
+import rx.functions.Func1;
/**
*/
http://git-wip-us.apache.org/repos/asf/camel/blob/b62e932b/components/camel-rx/src/test/java/org/apache/camel/rx/ToObservableTest.java
----------------------------------------------------------------------
diff --git a/components/camel-rx/src/test/java/org/apache/camel/rx/ToObservableTest.java b/components/camel-rx/src/test/java/org/apache/camel/rx/ToObservableTest.java
index a670333..300580a 100644
--- a/components/camel-rx/src/test/java/org/apache/camel/rx/ToObservableTest.java
+++ b/components/camel-rx/src/test/java/org/apache/camel/rx/ToObservableTest.java
@@ -23,7 +23,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import rx.Observable;
-import rx.util.functions.Action1;
+import rx.functions.Action1;
/**
*/
[2/5] git commit: Refactored the camel-rmi unit tests code
Posted by ni...@apache.org.
Refactored the camel-rmi unit tests code
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a0b87d90
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a0b87d90
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a0b87d90
Branch: refs/heads/master
Commit: a0b87d903c70da01611c4f7f8fb3babf7f469aa5
Parents: b62e932
Author: Willem Jiang <wi...@gmail.com>
Authored: Fri Jun 6 13:43:42 2014 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Fri Jun 6 14:42:41 2014 +0800
----------------------------------------------------------------------
.../camel/component/rmi/RmiConcurrencyTest.java | 36 ++----------
.../component/rmi/RmiDamnExceptionTest.java | 34 +-----------
.../rmi/RmiIllegalArgumentExceptionTest.java | 37 ++-----------
.../camel/component/rmi/RmiRouteTest.java | 36 ++----------
.../component/rmi/RmiRouteTestSupport.java | 58 ++++++++++++++++++++
5 files changed, 73 insertions(+), 128 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/a0b87d90/components/camel-rmi/src/test/java/org/apache/camel/component/rmi/RmiConcurrencyTest.java
----------------------------------------------------------------------
diff --git a/components/camel-rmi/src/test/java/org/apache/camel/component/rmi/RmiConcurrencyTest.java b/components/camel-rmi/src/test/java/org/apache/camel/component/rmi/RmiConcurrencyTest.java
index 5428ba7..213c315 100644
--- a/components/camel-rmi/src/test/java/org/apache/camel/component/rmi/RmiConcurrencyTest.java
+++ b/components/camel-rmi/src/test/java/org/apache/camel/component/rmi/RmiConcurrencyTest.java
@@ -16,8 +16,6 @@
*/
package org.apache.camel.component.rmi;
-import java.net.URL;
-import java.net.URLClassLoader;
import java.rmi.registry.LocateRegistry;
import java.util.concurrent.Callable;
import java.util.concurrent.ExecutorService;
@@ -25,22 +23,15 @@ import java.util.concurrent.Executors;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.impl.JndiRegistry;
-import org.apache.camel.test.AvailablePortFinder;
-import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
/**
* @version
*/
-public class RmiConcurrencyTest extends CamelTestSupport {
+public class RmiConcurrencyTest extends RmiRouteTestSupport {
- private int port;
-
- protected int getPort() {
- if (port == 0) {
- port = AvailablePortFinder.getNextAvailable(37500);
- }
- return port;
+ protected int getStartPort() {
+ return 37500;
}
@Override
@@ -105,24 +96,5 @@ public class RmiConcurrencyTest extends CamelTestSupport {
}
};
}
-
- private boolean classPathHasSpaces() {
- ClassLoader cl = getClass().getClassLoader();
- if (cl instanceof URLClassLoader) {
- URLClassLoader ucl = (URLClassLoader)cl;
- URL[] urls = ucl.getURLs();
- for (URL url : urls) {
- if (url.getPath().contains(" ")) {
- log.error("=======================================================================");
- log.error(" TEST Skipped: " + this.getClass().getName());
- log.error(" Your probably on windows. We detected that the classpath");
- log.error(" has a space in it. Try running maven with the following option: ");
- log.error(" -Dmaven.repo.local=C:\\DOCUME~1\\userid\\.m2\\repository");
- log.error("=======================================================================");
- return true;
- }
- }
- }
- return false;
- }
+
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/a0b87d90/components/camel-rmi/src/test/java/org/apache/camel/component/rmi/RmiDamnExceptionTest.java
----------------------------------------------------------------------
diff --git a/components/camel-rmi/src/test/java/org/apache/camel/component/rmi/RmiDamnExceptionTest.java b/components/camel-rmi/src/test/java/org/apache/camel/component/rmi/RmiDamnExceptionTest.java
index 5112b1d..32e7f0f 100644
--- a/components/camel-rmi/src/test/java/org/apache/camel/component/rmi/RmiDamnExceptionTest.java
+++ b/components/camel-rmi/src/test/java/org/apache/camel/component/rmi/RmiDamnExceptionTest.java
@@ -16,29 +16,20 @@
*/
package org.apache.camel.component.rmi;
-import java.net.URL;
-import java.net.URLClassLoader;
import java.rmi.registry.LocateRegistry;
import org.apache.camel.CamelExecutionException;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.impl.JndiRegistry;
-import org.apache.camel.test.AvailablePortFinder;
-import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
/**
* @version
*/
-public class RmiDamnExceptionTest extends CamelTestSupport {
+public class RmiDamnExceptionTest extends RmiRouteTestSupport {
- private int port;
-
- protected int getPort() {
- if (port == 0) {
- port = AvailablePortFinder.getNextAvailable(37501);
- }
- return port;
+ protected int getStartPort() {
+ return 37501;
}
@Override
@@ -89,23 +80,4 @@ public class RmiDamnExceptionTest extends CamelTestSupport {
};
}
- private boolean classPathHasSpaces() {
- ClassLoader cl = getClass().getClassLoader();
- if (cl instanceof URLClassLoader) {
- URLClassLoader ucl = (URLClassLoader)cl;
- URL[] urls = ucl.getURLs();
- for (URL url : urls) {
- if (url.getPath().contains(" ")) {
- log.error("=======================================================================");
- log.error(" TEST Skipped: " + this.getClass().getName());
- log.error(" Your probably on windows. We detected that the classpath");
- log.error(" has a space in it. Try running maven with the following option: ");
- log.error(" -Dmaven.repo.local=C:\\DOCUME~1\\userid\\.m2\\repository");
- log.error("=======================================================================");
- return true;
- }
- }
- }
- return false;
- }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/a0b87d90/components/camel-rmi/src/test/java/org/apache/camel/component/rmi/RmiIllegalArgumentExceptionTest.java
----------------------------------------------------------------------
diff --git a/components/camel-rmi/src/test/java/org/apache/camel/component/rmi/RmiIllegalArgumentExceptionTest.java b/components/camel-rmi/src/test/java/org/apache/camel/component/rmi/RmiIllegalArgumentExceptionTest.java
index e2ef31e..e567274 100644
--- a/components/camel-rmi/src/test/java/org/apache/camel/component/rmi/RmiIllegalArgumentExceptionTest.java
+++ b/components/camel-rmi/src/test/java/org/apache/camel/component/rmi/RmiIllegalArgumentExceptionTest.java
@@ -16,32 +16,22 @@
*/
package org.apache.camel.component.rmi;
-import java.net.URL;
-import java.net.URLClassLoader;
import java.rmi.RemoteException;
import java.rmi.registry.LocateRegistry;
import org.apache.camel.CamelExecutionException;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.impl.JndiRegistry;
-import org.apache.camel.test.AvailablePortFinder;
-import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
/**
* @version
*/
-public class RmiIllegalArgumentExceptionTest extends CamelTestSupport {
+public class RmiIllegalArgumentExceptionTest extends RmiRouteTestSupport {
+ private boolean created;
- private static boolean created;
-
- private int port;
-
- protected int getPort() {
- if (port == 0) {
- port = AvailablePortFinder.getNextAvailable(37502);
- }
- return port;
+ protected int getStartPort() {
+ return 37502;
}
@Override
@@ -97,23 +87,4 @@ public class RmiIllegalArgumentExceptionTest extends CamelTestSupport {
};
}
- private boolean classPathHasSpaces() {
- ClassLoader cl = getClass().getClassLoader();
- if (cl instanceof URLClassLoader) {
- URLClassLoader ucl = (URLClassLoader)cl;
- URL[] urls = ucl.getURLs();
- for (URL url : urls) {
- if (url.getPath().contains(" ")) {
- log.error("=======================================================================");
- log.error(" TEST Skipped: " + this.getClass().getName());
- log.error(" Your probably on windows. We detected that the classpath");
- log.error(" has a space in it. Try running maven with the following option: ");
- log.error(" -Dmaven.repo.local=C:\\DOCUME~1\\userid\\.m2\\repository");
- log.error("=======================================================================");
- return true;
- }
- }
- }
- return false;
- }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/a0b87d90/components/camel-rmi/src/test/java/org/apache/camel/component/rmi/RmiRouteTest.java
----------------------------------------------------------------------
diff --git a/components/camel-rmi/src/test/java/org/apache/camel/component/rmi/RmiRouteTest.java b/components/camel-rmi/src/test/java/org/apache/camel/component/rmi/RmiRouteTest.java
index 717e509..da67a8f 100644
--- a/components/camel-rmi/src/test/java/org/apache/camel/component/rmi/RmiRouteTest.java
+++ b/components/camel-rmi/src/test/java/org/apache/camel/component/rmi/RmiRouteTest.java
@@ -16,8 +16,6 @@
*/
package org.apache.camel.component.rmi;
-import java.net.URL;
-import java.net.URLClassLoader;
import java.rmi.registry.LocateRegistry;
import org.apache.camel.CamelContext;
@@ -25,23 +23,16 @@ import org.apache.camel.Endpoint;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.bean.ProxyHelper;
import org.apache.camel.impl.DefaultCamelContext;
-import org.apache.camel.test.AvailablePortFinder;
-import org.apache.camel.test.junit4.TestSupport;
import org.apache.camel.util.jndi.JndiContext;
import org.junit.Test;
/**
* @version
*/
-public class RmiRouteTest extends TestSupport {
+public class RmiRouteTest extends RmiRouteTestSupport {
- private int port;
-
- protected int getPort() {
- if (port == 0) {
- port = AvailablePortFinder.getNextAvailable(37503);
- }
- return port;
+ protected int getStartPort() {
+ return 37503;
}
@Test
@@ -90,24 +81,5 @@ public class RmiRouteTest extends TestSupport {
// END SNIPPET: route
};
}
-
- private boolean classPathHasSpaces() {
- ClassLoader cl = getClass().getClassLoader();
- if (cl instanceof URLClassLoader) {
- URLClassLoader ucl = (URLClassLoader)cl;
- URL[] urls = ucl.getURLs();
- for (URL url : urls) {
- if (url.getPath().contains(" ")) {
- log.error("=======================================================================");
- log.error(" TEST Skipped: " + this.getClass().getName());
- log.error(" Your probably on windows. We detected that the classpath");
- log.error(" has a space in it. Try running maven with the following option: ");
- log.error(" -Dmaven.repo.local=C:\\DOCUME~1\\userid\\.m2\\repository");
- log.error("=======================================================================");
- return true;
- }
- }
- }
- return false;
- }
+
}
http://git-wip-us.apache.org/repos/asf/camel/blob/a0b87d90/components/camel-rmi/src/test/java/org/apache/camel/component/rmi/RmiRouteTestSupport.java
----------------------------------------------------------------------
diff --git a/components/camel-rmi/src/test/java/org/apache/camel/component/rmi/RmiRouteTestSupport.java b/components/camel-rmi/src/test/java/org/apache/camel/component/rmi/RmiRouteTestSupport.java
new file mode 100644
index 0000000..4eaad64
--- /dev/null
+++ b/components/camel-rmi/src/test/java/org/apache/camel/component/rmi/RmiRouteTestSupport.java
@@ -0,0 +1,58 @@
+/**
+ * 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.rmi;
+
+import java.net.URL;
+import java.net.URLClassLoader;
+
+import org.apache.camel.test.AvailablePortFinder;
+import org.apache.camel.test.junit4.CamelTestSupport;
+
+public abstract class RmiRouteTestSupport extends CamelTestSupport {
+ private int port;
+
+ protected abstract int getStartPort();
+
+
+ protected int getPort() {
+ if (port == 0) {
+ port = AvailablePortFinder.getNextAvailable(getStartPort());
+ }
+ return port;
+ }
+
+ protected boolean classPathHasSpaces() {
+ ClassLoader cl = getClass().getClassLoader();
+ if (cl instanceof URLClassLoader) {
+ URLClassLoader ucl = (URLClassLoader)cl;
+ URL[] urls = ucl.getURLs();
+ for (URL url : urls) {
+ if (url.getPath().contains(" ")) {
+ log.error("=======================================================================");
+ log.error(" TEST Skipped: " + this.getClass().getName());
+ log.error(" Your probably on windows. We detected that the classpath");
+ log.error(" has a space in it. Try running maven with the following option: ");
+ log.error(" -Dmaven.repo.local=C:\\DOCUME~1\\userid\\.m2\\repository");
+ log.error("=======================================================================");
+ return true;
+ }
+ }
+ }
+ return false;
+ }
+
+}
[5/5] git commit: Removed the unused imports
Posted by ni...@apache.org.
Removed the unused imports
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/5ebf252c
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/5ebf252c
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/5ebf252c
Branch: refs/heads/master
Commit: 5ebf252c204d12a4a2cd8e26780670226296e4bc
Parents: f36ddd0
Author: Willem Jiang <wi...@gmail.com>
Authored: Fri Jun 6 14:41:52 2014 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Fri Jun 6 14:42:42 2014 +0800
----------------------------------------------------------------------
.../main/java/org/apache/camel/spi/TypeConverterRegistry.java | 2 --
.../camel/dataformat/beanio/csv/CsvTestWithProperties.java | 1 -
.../apache/camel/dataformat/bindy/csv/BindyCsvDataFormat.java | 1 -
.../apache/camel/component/cache/DefaultCacheManagerFactory.java | 2 --
.../apache/camel/test/cxf/blueprint/CxfEndpointBeansTest.java | 4 ----
.../apache/camel/test/cxf/blueprint/CxfRsEndpointBeansTest.java | 2 --
6 files changed, 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/5ebf252c/camel-core/src/main/java/org/apache/camel/spi/TypeConverterRegistry.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/spi/TypeConverterRegistry.java b/camel-core/src/main/java/org/apache/camel/spi/TypeConverterRegistry.java
index 3896fbc..d5a1114 100644
--- a/camel-core/src/main/java/org/apache/camel/spi/TypeConverterRegistry.java
+++ b/camel-core/src/main/java/org/apache/camel/spi/TypeConverterRegistry.java
@@ -16,12 +16,10 @@
*/
package org.apache.camel.spi;
-import java.util.Iterator;
import java.util.List;
import org.apache.camel.StaticService;
import org.apache.camel.TypeConverter;
-import org.apache.camel.util.KeyValueHolder;
/**
* Registry for type converters.
http://git-wip-us.apache.org/repos/asf/camel/blob/5ebf252c/components/camel-beanio/src/test/java/org/apache/camel/dataformat/beanio/csv/CsvTestWithProperties.java
----------------------------------------------------------------------
diff --git a/components/camel-beanio/src/test/java/org/apache/camel/dataformat/beanio/csv/CsvTestWithProperties.java b/components/camel-beanio/src/test/java/org/apache/camel/dataformat/beanio/csv/CsvTestWithProperties.java
index 3963995..43d0ca3 100644
--- a/components/camel-beanio/src/test/java/org/apache/camel/dataformat/beanio/csv/CsvTestWithProperties.java
+++ b/components/camel-beanio/src/test/java/org/apache/camel/dataformat/beanio/csv/CsvTestWithProperties.java
@@ -20,7 +20,6 @@ import java.util.Properties;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.dataformat.beanio.BeanIODataFormat;
-import org.apache.camel.spi.DataFormat;
public class CsvTestWithProperties extends CsvTest {
http://git-wip-us.apache.org/repos/asf/camel/blob/5ebf252c/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/csv/BindyCsvDataFormat.java
----------------------------------------------------------------------
diff --git a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/csv/BindyCsvDataFormat.java b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/csv/BindyCsvDataFormat.java
index 10bb9e0..d8ef0c6 100755
--- a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/csv/BindyCsvDataFormat.java
+++ b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/csv/BindyCsvDataFormat.java
@@ -32,7 +32,6 @@ import org.apache.camel.Exchange;
import org.apache.camel.dataformat.bindy.BindyAbstractDataFormat;
import org.apache.camel.dataformat.bindy.BindyAbstractFactory;
import org.apache.camel.dataformat.bindy.BindyCsvFactory;
-import org.apache.camel.dataformat.bindy.annotation.DataField;
import org.apache.camel.dataformat.bindy.annotation.Link;
import org.apache.camel.dataformat.bindy.util.ConverterUtils;
import org.apache.camel.spi.DataFormat;
http://git-wip-us.apache.org/repos/asf/camel/blob/5ebf252c/components/camel-cache/src/main/java/org/apache/camel/component/cache/DefaultCacheManagerFactory.java
----------------------------------------------------------------------
diff --git a/components/camel-cache/src/main/java/org/apache/camel/component/cache/DefaultCacheManagerFactory.java b/components/camel-cache/src/main/java/org/apache/camel/component/cache/DefaultCacheManagerFactory.java
index 69cf3f7..a41cd90 100644
--- a/components/camel-cache/src/main/java/org/apache/camel/component/cache/DefaultCacheManagerFactory.java
+++ b/components/camel-cache/src/main/java/org/apache/camel/component/cache/DefaultCacheManagerFactory.java
@@ -19,8 +19,6 @@ package org.apache.camel.component.cache;
import java.io.InputStream;
import net.sf.ehcache.CacheManager;
-
-import org.apache.camel.impl.DefaultComponent;
import org.apache.camel.util.IOHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
http://git-wip-us.apache.org/repos/asf/camel/blob/5ebf252c/tests/camel-blueprint-cxf-test/src/test/java/org/apache/camel/test/cxf/blueprint/CxfEndpointBeansTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-blueprint-cxf-test/src/test/java/org/apache/camel/test/cxf/blueprint/CxfEndpointBeansTest.java b/tests/camel-blueprint-cxf-test/src/test/java/org/apache/camel/test/cxf/blueprint/CxfEndpointBeansTest.java
index b7972e9..2fae9ca 100644
--- a/tests/camel-blueprint-cxf-test/src/test/java/org/apache/camel/test/cxf/blueprint/CxfEndpointBeansTest.java
+++ b/tests/camel-blueprint-cxf-test/src/test/java/org/apache/camel/test/cxf/blueprint/CxfEndpointBeansTest.java
@@ -28,13 +28,9 @@ import org.apache.camel.ProducerTemplate;
import org.apache.camel.component.cxf.CXFTestSupport;
import org.apache.camel.component.cxf.CxfEndpoint;
import org.apache.camel.component.cxf.common.message.CxfConstants;
-import org.apache.camel.component.cxf.jaxrs.CxfRsEndpoint;
import org.apache.camel.test.blueprint.CamelBlueprintTestSupport;
import org.apache.camel.util.URISupport;
-import org.apache.cxf.jaxrs.JAXRSServerFactoryBean;
-import org.apache.cxf.jaxrs.client.JAXRSClientFactoryBean;
import org.apache.cxf.transport.http.HTTPException;
-
import org.junit.Test;
public class CxfEndpointBeansTest extends CamelBlueprintTestSupport {
http://git-wip-us.apache.org/repos/asf/camel/blob/5ebf252c/tests/camel-blueprint-cxf-test/src/test/java/org/apache/camel/test/cxf/blueprint/CxfRsEndpointBeansTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-blueprint-cxf-test/src/test/java/org/apache/camel/test/cxf/blueprint/CxfRsEndpointBeansTest.java b/tests/camel-blueprint-cxf-test/src/test/java/org/apache/camel/test/cxf/blueprint/CxfRsEndpointBeansTest.java
index 7792dbc..7f2131d 100644
--- a/tests/camel-blueprint-cxf-test/src/test/java/org/apache/camel/test/cxf/blueprint/CxfRsEndpointBeansTest.java
+++ b/tests/camel-blueprint-cxf-test/src/test/java/org/apache/camel/test/cxf/blueprint/CxfRsEndpointBeansTest.java
@@ -16,8 +16,6 @@
*/
package org.apache.camel.test.cxf.blueprint;
-import java.util.Properties;
-import org.apache.camel.component.cxf.CXFTestSupport;
import org.apache.camel.component.cxf.jaxrs.CxfRsEndpoint;
import org.apache.camel.test.blueprint.CamelBlueprintTestSupport;
import org.apache.cxf.jaxrs.JAXRSServerFactoryBean;
[4/5] git commit: Polish the code of camel examples
Posted by ni...@apache.org.
Polish the code of camel examples
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f36ddd05
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f36ddd05
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f36ddd05
Branch: refs/heads/master
Commit: f36ddd05158d0b81b700259ce54e30012cbe0e71
Parents: 83f4341
Author: Willem Jiang <wi...@gmail.com>
Authored: Fri Jun 6 14:41:31 2014 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Fri Jun 6 14:42:42 2014 +0800
----------------------------------------------------------------------
.../org/apache/camel/example/cxf/httptojms/CamelCxfExample.java | 3 +--
.../src/main/java/org/apache/camel/example/sql/OrderBean.java | 4 ++--
.../src/main/java/org/apache/camel/example/sql/OrderBean.java | 4 ++--
3 files changed, 5 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/f36ddd05/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/httptojms/CamelCxfExample.java
----------------------------------------------------------------------
diff --git a/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/httptojms/CamelCxfExample.java b/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/httptojms/CamelCxfExample.java
index 712ee86..d543799 100644
--- a/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/httptojms/CamelCxfExample.java
+++ b/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/httptojms/CamelCxfExample.java
@@ -39,8 +39,7 @@ public final class CamelCxfExample {
private static final String WSDL_LOCATION = "wsdlURL=wsdl/hello_world.wsdl";
private static final String SERVICE_NAME = "serviceName={http://apache.org/hello_world_soap_http}SOAPService";
private static final String SOAP_OVER_HTTP_ROUTER = "portName={http://apache.org/hello_world_soap_http}SoapOverHttpRouter";
- private static final String SOAP_OVER_JMS = "portName={http://apache.org/hello_world_soap_http}SoapOverJms";
-
+
private static final String ROUTER_ENDPOINT_URI = "cxf://" + ROUTER_ADDRESS + "?" + SERVICE_CLASS + "&"
+ WSDL_LOCATION + "&" + SERVICE_NAME + "&" + SOAP_OVER_HTTP_ROUTER + "&dataFormat=POJO";
http://git-wip-us.apache.org/repos/asf/camel/blob/f36ddd05/examples/camel-example-sql-blueprint/src/main/java/org/apache/camel/example/sql/OrderBean.java
----------------------------------------------------------------------
diff --git a/examples/camel-example-sql-blueprint/src/main/java/org/apache/camel/example/sql/OrderBean.java b/examples/camel-example-sql-blueprint/src/main/java/org/apache/camel/example/sql/OrderBean.java
index f32b255..acd7015 100644
--- a/examples/camel-example-sql-blueprint/src/main/java/org/apache/camel/example/sql/OrderBean.java
+++ b/examples/camel-example-sql-blueprint/src/main/java/org/apache/camel/example/sql/OrderBean.java
@@ -31,7 +31,7 @@ public class OrderBean {
/**
* Generates a new order structured as a {@link Map}
*/
- public Map generateOrder() {
+ public Map<String, Object> generateOrder() {
Map<String, Object> answer = new HashMap<String, Object>();
answer.put("id", counter++);
answer.put("item", counter % 2 == 0 ? 111 : 222);
@@ -46,7 +46,7 @@ public class OrderBean {
* @param data the order as a {@link Map}
* @return the transformed order
*/
- public String processOrder(Map data) {
+ public String processOrder(Map<String, Object> data) {
return "Processed order id " + data.get("id") + " item " + data.get("item") + " of " + data.get("amount") + " copies of " + data.get("description");
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/f36ddd05/examples/camel-example-sql/src/main/java/org/apache/camel/example/sql/OrderBean.java
----------------------------------------------------------------------
diff --git a/examples/camel-example-sql/src/main/java/org/apache/camel/example/sql/OrderBean.java b/examples/camel-example-sql/src/main/java/org/apache/camel/example/sql/OrderBean.java
index f32b255..acd7015 100644
--- a/examples/camel-example-sql/src/main/java/org/apache/camel/example/sql/OrderBean.java
+++ b/examples/camel-example-sql/src/main/java/org/apache/camel/example/sql/OrderBean.java
@@ -31,7 +31,7 @@ public class OrderBean {
/**
* Generates a new order structured as a {@link Map}
*/
- public Map generateOrder() {
+ public Map<String, Object> generateOrder() {
Map<String, Object> answer = new HashMap<String, Object>();
answer.put("id", counter++);
answer.put("item", counter % 2 == 0 ? 111 : 222);
@@ -46,7 +46,7 @@ public class OrderBean {
* @param data the order as a {@link Map}
* @return the transformed order
*/
- public String processOrder(Map data) {
+ public String processOrder(Map<String, Object> data) {
return "Processed order id " + data.get("id") + " item " + data.get("item") + " of " + data.get("amount") + " copies of " + data.get("description");
}
}