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 1C894200B98 for ; Mon, 3 Oct 2016 19:56:14 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 1A976160AE5; Mon, 3 Oct 2016 17:56:14 +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 56C6D160ACD for ; Mon, 3 Oct 2016 19:56:13 +0200 (CEST) Received: (qmail 28771 invoked by uid 500); 3 Oct 2016 17:56:12 -0000 Mailing-List: contact commits-help@cayenne.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cayenne.apache.org Delivered-To: mailing list commits@cayenne.apache.org Received: (qmail 28762 invoked by uid 99); 3 Oct 2016 17:56:12 -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, 03 Oct 2016 17:56:12 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 2A828DFBA0; Mon, 3 Oct 2016 17:56:11 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: aadamchik@apache.org To: commits@cayenne.apache.org Date: Mon, 03 Oct 2016 17:56:11 -0000 Message-Id: <8dbcf17395e24e0bb0807c2862523db4@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/2] cayenne git commit: cleanup archived-at: Mon, 03 Oct 2016 17:56:14 -0000 Repository: cayenne Updated Branches: refs/heads/master a811b44e5 -> 1d81cf612 cleanup Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/616ec62b Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/616ec62b Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/616ec62b Branch: refs/heads/master Commit: 616ec62ba45fbb956518d20d9043362c012e435a Parents: a811b44 Author: Andrus Adamchik Authored: Mon Oct 3 20:14:22 2016 +0300 Committer: Andrus Adamchik Committed: Mon Oct 3 20:14:22 2016 +0300 ---------------------------------------------------------------------- .../tools/dbimport/DefaultDbImportAction.java | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/616ec62b/cayenne-tools/src/main/java/org/apache/cayenne/tools/dbimport/DefaultDbImportAction.java ---------------------------------------------------------------------- diff --git a/cayenne-tools/src/main/java/org/apache/cayenne/tools/dbimport/DefaultDbImportAction.java b/cayenne-tools/src/main/java/org/apache/cayenne/tools/dbimport/DefaultDbImportAction.java index 9118d34..ab20b4e 100644 --- a/cayenne-tools/src/main/java/org/apache/cayenne/tools/dbimport/DefaultDbImportAction.java +++ b/cayenne-tools/src/main/java/org/apache/cayenne/tools/dbimport/DefaultDbImportAction.java @@ -124,7 +124,7 @@ public class DefaultDbImportAction implements DbImportAction { DbAdapter adapter = adapterFactory.createAdapter(dataNodeDescriptor, dataSource); DataMap loadedFomDb; - try(Connection connection = dataSource.getConnection()) { + try (Connection connection = dataSource.getConnection()) { loadedFomDb = load(config, adapter, connection); } @@ -172,7 +172,7 @@ public class DefaultDbImportAction implements DbImportAction { } }; - DataMap executed = execute(delegate, + DataMap executed = applyTokens(delegate, existing, log(sort(reverse(mergerTokenFactory, mergeTokens))), config.getNameGenerator()); @@ -224,9 +224,9 @@ public class DefaultDbImportAction implements DbImportAction { return null; } - private List reverse( - MergerTokenFactory mergerTokenFactory, - Iterable mergeTokens) throws IOException { + private List reverse(MergerTokenFactory mergerTokenFactory, Iterable mergeTokens) + throws IOException { + List tokens = new LinkedList<>(); for (MergerToken token : mergeTokens) { if (token instanceof AbstractToModelToken) { @@ -237,10 +237,7 @@ public class DefaultDbImportAction implements DbImportAction { return tokens; } - /** - * Performs configured schema operations via DbGenerator. - */ - private DataMap execute(ModelMergeDelegate mergeDelegate, + private DataMap applyTokens(ModelMergeDelegate mergeDelegate, DataMap dataMap, Collection tokens, ObjectNameGenerator nameGenerator) {