camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject [2/5] camel git commit: CAMEL-9430 fix configuration getter/setter in BraintreeComponent
Date Fri, 08 Jan 2016 17:53:26 GMT
CAMEL-9430 fix configuration getter/setter in BraintreeComponent


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/67522c82
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/67522c82
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/67522c82

Branch: refs/heads/master
Commit: 67522c82ec65b2198ed36d6d0d868376df548003
Parents: e8b0019
Author: lburgazzoli <lburgazzoli@gmail.com>
Authored: Fri Jan 8 11:28:45 2016 +0100
Committer: Claus Ibsen <davsclaus@apache.org>
Committed: Fri Jan 8 18:39:49 2016 +0100

----------------------------------------------------------------------
 components/camel-braintree/pom.xml                       |  7 -------
 .../camel/component/braintree/BraintreeComponent.java    | 11 ++++++++---
 2 files changed, 8 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/67522c82/components/camel-braintree/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-braintree/pom.xml b/components/camel-braintree/pom.xml
index 2b6e9c0..5df70ad 100644
--- a/components/camel-braintree/pom.xml
+++ b/components/camel-braintree/pom.xml
@@ -50,17 +50,10 @@
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>com.braintreepayments.gateway</groupId>
-      <artifactId>braintree-java</artifactId>
-      <version>${braintree-gateway-version}</version>
-    </dependency>
-    <!--
-    <dependency>
       <groupId>org.apache.servicemix.bundles</groupId>
       <artifactId>org.apache.servicemix.bundles.braintree-java</artifactId>
       <version>${braintree-gateway-bundle-version}</version>
     </dependency>
-    -->
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-lang3</artifactId>

http://git-wip-us.apache.org/repos/asf/camel/blob/67522c82/components/camel-braintree/src/main/java/org/apache/camel/component/braintree/BraintreeComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-braintree/src/main/java/org/apache/camel/component/braintree/BraintreeComponent.java
b/components/camel-braintree/src/main/java/org/apache/camel/component/braintree/BraintreeComponent.java
index 15f127f..37ce334 100644
--- a/components/camel-braintree/src/main/java/org/apache/camel/component/braintree/BraintreeComponent.java
+++ b/components/camel-braintree/src/main/java/org/apache/camel/component/braintree/BraintreeComponent.java
@@ -16,9 +16,6 @@
  */
 package org.apache.camel.component.braintree;
 
-import java.util.HashMap;
-import java.util.Map;
-
 import com.braintreegateway.BraintreeGateway;
 import org.apache.camel.CamelContext;
 import org.apache.camel.Endpoint;
@@ -26,6 +23,9 @@ import org.apache.camel.component.braintree.internal.BraintreeApiCollection;
 import org.apache.camel.component.braintree.internal.BraintreeApiName;
 import org.apache.camel.util.component.AbstractApiComponent;
 
+import java.util.HashMap;
+import java.util.Map;
+
 
 /**
  * Represents the component that manages {@link BraintreeEndpoint}.
@@ -63,6 +63,11 @@ public class BraintreeComponent extends AbstractApiComponent<BraintreeApiName,
B
         super.setConfiguration(configuration);
     }
 
+    @Override
+    public BraintreeConfiguration getConfiguration() {
+        return super.getConfiguration();
+    }
+
     private synchronized BraintreeGateway getGateway(BraintreeConfiguration configuration)
{
         BraintreeGateway gateway = gateways.get(configuration.getMerchantId());
         if (gateway == null) {


Mime
View raw message