Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id C09A3200C44 for ; Mon, 27 Mar 2017 19:27:36 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id BF6A2160B9A; Mon, 27 Mar 2017 17:27:36 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 1A4F9160B7B for ; Mon, 27 Mar 2017 19:27:35 +0200 (CEST) Received: (qmail 2885 invoked by uid 500); 27 Mar 2017 17:27:35 -0000 Mailing-List: contact commits-help@camel.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@camel.apache.org Delivered-To: mailing list commits@camel.apache.org Received: (qmail 2779 invoked by uid 99); 27 Mar 2017 17:27:33 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 27 Mar 2017 17:27:33 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 7CF7ADFFD7; Mon, 27 Mar 2017 17:27:33 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: zregvart@apache.org To: commits@camel.apache.org Date: Mon, 27 Mar 2017 17:27:33 -0000 Message-Id: <709569e583204cb787c9f9cdd550e847@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/4] camel git commit: CAMEL-11075 AbstractSalesforceTestBase::doCreat... archived-at: Mon, 27 Mar 2017 17:27:36 -0000 Repository: camel Updated Branches: refs/heads/master df8f7318c -> 87dc6fc29 CAMEL-11075 AbstractSalesforceTestBase::doCreat... ...eRouteBuilder should be optional Makes the `doCreateRouteBuilder` optional, not abstract so that the integration tests that do not need routes do not need to provide an empty method. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/9c9c32d7 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/9c9c32d7 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/9c9c32d7 Branch: refs/heads/master Commit: 9c9c32d7956046a69482bfe91a207104c736a28f Parents: df8f731 Author: Zoran Regvart Authored: Mon Mar 27 15:28:42 2017 +0200 Committer: Zoran Regvart Committed: Mon Mar 27 19:19:09 2017 +0200 ---------------------------------------------------------------------- .../component/salesforce/AbstractSalesforceTestBase.java | 8 +++++++- .../camel/component/salesforce/ApprovalIntegrationTest.java | 9 --------- .../salesforce/CompositeApiTreeIntegrationTest.java | 9 --------- 3 files changed, 7 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/9c9c32d7/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/AbstractSalesforceTestBase.java ---------------------------------------------------------------------- diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/AbstractSalesforceTestBase.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/AbstractSalesforceTestBase.java index 7be8404..0cbbe35 100644 --- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/AbstractSalesforceTestBase.java +++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/AbstractSalesforceTestBase.java @@ -32,7 +32,13 @@ public abstract class AbstractSalesforceTestBase extends CamelTestSupport { return doCreateRouteBuilder(); } - protected abstract RouteBuilder doCreateRouteBuilder() throws Exception; + protected RouteBuilder doCreateRouteBuilder() throws Exception { + return new RouteBuilder() { + @Override + public void configure() throws Exception { + } + }; + } protected void createComponent() throws Exception { // create the component http://git-wip-us.apache.org/repos/asf/camel/blob/9c9c32d7/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/ApprovalIntegrationTest.java ---------------------------------------------------------------------- diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/ApprovalIntegrationTest.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/ApprovalIntegrationTest.java index 789958b..4ce8965 100644 --- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/ApprovalIntegrationTest.java +++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/ApprovalIntegrationTest.java @@ -94,15 +94,6 @@ public class ApprovalIntegrationTest extends AbstractApprovalIntegrationTest { approvalResult.size()); } - @Override - protected RouteBuilder doCreateRouteBuilder() throws Exception { - return new RouteBuilder() { - @Override - public void configure() throws Exception { - } - }; - } - @Parameters(name = "format = {0}") public static Iterable formats() { return Arrays.asList("JSON", "XML"); http://git-wip-us.apache.org/repos/asf/camel/blob/9c9c32d7/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/CompositeApiTreeIntegrationTest.java ---------------------------------------------------------------------- diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/CompositeApiTreeIntegrationTest.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/CompositeApiTreeIntegrationTest.java index 0a73df5..2ebd1e0 100644 --- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/CompositeApiTreeIntegrationTest.java +++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/CompositeApiTreeIntegrationTest.java @@ -102,15 +102,6 @@ public class CompositeApiTreeIntegrationTest extends AbstractSalesforceTestBase assertNotNull("Simple asset on the contact of the third account should have Id set", asset.getId()); } - @Override - protected RouteBuilder doCreateRouteBuilder() throws Exception { - return new RouteBuilder() { - @Override - public void configure() throws Exception { - } - }; - } - @Parameters(name = "format = {0}") public static Iterable formats() { return Arrays.asList("JSON", "XML");