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 41852200C8B for ; Mon, 22 May 2017 20:32:46 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 40465160BBF; Mon, 22 May 2017 18:32:46 +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 86E85160BAD for ; Mon, 22 May 2017 20:32:45 +0200 (CEST) Received: (qmail 80862 invoked by uid 500); 22 May 2017 18:32:44 -0000 Mailing-List: contact commits-help@ambari.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ambari-dev@ambari.apache.org Delivered-To: mailing list commits@ambari.apache.org Received: (qmail 80853 invoked by uid 99); 22 May 2017 18:32:44 -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, 22 May 2017 18:32:44 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 84124E00AF; Mon, 22 May 2017 18:32:44 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: oleewere@apache.org To: commits@ambari.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: ambari git commit: AMBARI-21033 ADDENDUM - Log Search use POJOs for input configuration (oleewere) Date: Mon, 22 May 2017 18:32:44 +0000 (UTC) archived-at: Mon, 22 May 2017 18:32:46 -0000 Repository: ambari Updated Branches: refs/heads/trunk 6c6832144 -> 0626b789b AMBARI-21033 ADDENDUM - Log Search use POJOs for input configuration (oleewere) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/0626b789 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/0626b789 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/0626b789 Branch: refs/heads/trunk Commit: 0626b789ba477c494dc5a260b2bca61e3d906690 Parents: 6c68321 Author: oleewere Authored: Mon May 22 20:31:16 2017 +0200 Committer: oleewere Committed: Mon May 22 20:31:24 2017 +0200 ---------------------------------------------------------------------- .../config/api/LogSearchConfigFactoryTest.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/0626b789/ambari-logsearch/ambari-logsearch-config-api/src/test/java/org/apache/ambari/logsearch/config/api/LogSearchConfigFactoryTest.java ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-config-api/src/test/java/org/apache/ambari/logsearch/config/api/LogSearchConfigFactoryTest.java b/ambari-logsearch/ambari-logsearch-config-api/src/test/java/org/apache/ambari/logsearch/config/api/LogSearchConfigFactoryTest.java index 8e7154e..425694f 100644 --- a/ambari-logsearch/ambari-logsearch-config-api/src/test/java/org/apache/ambari/logsearch/config/api/LogSearchConfigFactoryTest.java +++ b/ambari-logsearch/ambari-logsearch-config-api/src/test/java/org/apache/ambari/logsearch/config/api/LogSearchConfigFactoryTest.java @@ -20,14 +20,12 @@ package org.apache.ambari.logsearch.config.api; import java.util.Collections; +import java.util.HashMap; +import java.util.Map; -import org.apache.ambari.logsearch.config.api.LogSearchConfig; -import org.apache.ambari.logsearch.config.api.LogSearchConfigFactory; import org.apache.ambari.logsearch.config.api.LogSearchConfig.Component; import org.junit.Test; -import com.google.common.collect.ImmutableMap; - import junit.framework.Assert; public class LogSearchConfigFactoryTest { @@ -42,17 +40,19 @@ public class LogSearchConfigFactoryTest { @Test public void testCustomConfig() throws Exception { + Map logsearchConfClassMap = new HashMap<>(); + logsearchConfClassMap.put("logsearch.config.class", "org.apache.ambari.logsearch.config.api.LogSearchConfigClass2"); LogSearchConfig config = LogSearchConfigFactory.createLogSearchConfig(Component.SERVER, - ImmutableMap.of("logsearch.config.class", "org.apache.ambari.logsearch.config.api.LogSearchConfigClass2"), - LogSearchConfigClass1.class); + logsearchConfClassMap, LogSearchConfigClass1.class); Assert.assertSame(config.getClass(), LogSearchConfigClass2.class); } @Test(expected = IllegalArgumentException.class) public void testNonConfigClass() throws Exception { + Map logsearchConfClassMap = new HashMap<>(); + logsearchConfClassMap.put("logsearch.config.class", "org.apache.ambari.logsearch.config.api.NonLogSearchConfigClass"); LogSearchConfigFactory.createLogSearchConfig(Component.SERVER, - ImmutableMap.of("logsearch.config.class", "org.apache.ambari.logsearch.config.api.NonLogSearchConfigClass"), - LogSearchConfigClass1.class); + logsearchConfClassMap, LogSearchConfigClass1.class); } }