Repository: flume Updated Branches: refs/heads/flume-1.9 cbfa4faa6 -> 46ea007df
FLUME-3295 Revert "FLUME-2957. Remove Guava from our public API" This reverts commit 7f85df9e473ee675d461d5b76650694c5a6c0088. This closes #252 Reviewers: Denes Arvay (Ferenc Szabo via Ferenc Szabo) Project: http://git-wip-us.apache.org/repos/asf/flume/repo Commit: http://git-wip-us.apache.org/repos/asf/flume/commit/46ea007d Tree: http://git-wip-us.apache.org/repos/asf/flume/tree/46ea007d Diff: http://git-wip-us.apache.org/repos/asf/flume/diff/46ea007d Branch: refs/heads/flume-1.9 Commit: 46ea007df718b06813f6cee29e9dd06e26abaf6f Parents: cbfa4fa Author: Ferenc Szabo <[email protected]> Authored: Fri Nov 30 14:28:47 2018 +0100 Committer: Ferenc Szabo <[email protected]> Committed: Fri Nov 30 14:28:47 2018 +0100 ---------------------------------------------------------------------- .../src/main/java/org/apache/flume/Context.java | 5 ++--- .../org/apache/flume/source/MultiportSyslogTCPSource.java | 3 ++- .../agent/embedded/TestEmbeddedAgentEmbeddedSource.java | 6 +++--- .../org/apache/flume/node/MaterializedConfiguration.java | 8 ++++---- .../apache/flume/node/SimpleMaterializedConfiguration.java | 6 +++--- .../src/main/java/org/apache/flume/sink/http/HttpSink.java | 3 ++- 6 files changed, 16 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flume/blob/46ea007d/flume-ng-configuration/src/main/java/org/apache/flume/Context.java ---------------------------------------------------------------------- diff --git a/flume-ng-configuration/src/main/java/org/apache/flume/Context.java b/flume-ng-configuration/src/main/java/org/apache/flume/Context.java index 90d7816..9f21b69 100644 --- a/flume-ng-configuration/src/main/java/org/apache/flume/Context.java +++ b/flume-ng-configuration/src/main/java/org/apache/flume/Context.java @@ -49,9 +49,8 @@ public class Context { * Gets a copy of the backing map structure. * @return immutable copy of backing map structure */ - public Map<String, String> getParameters() { + public ImmutableMap<String, String> getParameters() { synchronized (parameters) { - return ImmutableMap.copyOf(parameters); } } @@ -84,7 +83,7 @@ public class Context { * @throws IllegalArguemntException if the given prefix does not end with * a period character. */ - public Map<String, String> getSubProperties(String prefix) { + public ImmutableMap<String, String> getSubProperties(String prefix) { Preconditions.checkArgument(prefix.endsWith("."), "The given prefix does not end with a period (" + prefix + ")"); Map<String, String> result = Maps.newHashMap(); http://git-wip-us.apache.org/repos/asf/flume/blob/46ea007d/flume-ng-core/src/main/java/org/apache/flume/source/MultiportSyslogTCPSource.java ---------------------------------------------------------------------- diff --git a/flume-ng-core/src/main/java/org/apache/flume/source/MultiportSyslogTCPSource.java b/flume-ng-core/src/main/java/org/apache/flume/source/MultiportSyslogTCPSource.java index 9cd7de5..ee9aa41 100644 --- a/flume-ng-core/src/main/java/org/apache/flume/source/MultiportSyslogTCPSource.java +++ b/flume-ng-core/src/main/java/org/apache/flume/source/MultiportSyslogTCPSource.java @@ -20,6 +20,7 @@ package org.apache.flume.source; import com.google.common.base.Preconditions; import com.google.common.base.Throwables; +import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; import java.io.IOException; @@ -121,7 +122,7 @@ public class MultiportSyslogTCPSource extends SslContextAwareAbstractSource impl // clear any previous charset configuration and reconfigure it portCharsets.clear(); { - Map<String, String> portCharsetCfg = context.getSubProperties( + ImmutableMap<String, String> portCharsetCfg = context.getSubProperties( SyslogSourceConfigurationConstants.CONFIG_PORT_CHARSET_PREFIX); for (Map.Entry<String, String> entry : portCharsetCfg.entrySet()) { String portStr = entry.getKey(); http://git-wip-us.apache.org/repos/asf/flume/blob/46ea007d/flume-ng-embedded-agent/src/test/java/org/apache/flume/agent/embedded/TestEmbeddedAgentEmbeddedSource.java ---------------------------------------------------------------------- diff --git a/flume-ng-embedded-agent/src/test/java/org/apache/flume/agent/embedded/TestEmbeddedAgentEmbeddedSource.java b/flume-ng-embedded-agent/src/test/java/org/apache/flume/agent/embedded/TestEmbeddedAgentEmbeddedSource.java index ae59444..c122a12 100644 --- a/flume-ng-embedded-agent/src/test/java/org/apache/flume/agent/embedded/TestEmbeddedAgentEmbeddedSource.java +++ b/flume-ng-embedded-agent/src/test/java/org/apache/flume/agent/embedded/TestEmbeddedAgentEmbeddedSource.java @@ -75,21 +75,21 @@ public class TestEmbeddedAgentEmbeddedSource { config = new MaterializedConfiguration() { @Override - public Map<String, SourceRunner> getSourceRunners() { + public ImmutableMap<String, SourceRunner> getSourceRunners() { Map<String, SourceRunner> result = Maps.newHashMap(); result.put("source", sourceRunner); return ImmutableMap.copyOf(result); } @Override - public Map<String, SinkRunner> getSinkRunners() { + public ImmutableMap<String, SinkRunner> getSinkRunners() { Map<String, SinkRunner> result = Maps.newHashMap(); result.put("sink", sinkRunner); return ImmutableMap.copyOf(result); } @Override - public Map<String, Channel> getChannels() { + public ImmutableMap<String, Channel> getChannels() { Map<String, Channel> result = Maps.newHashMap(); result.put("channel", channel); return ImmutableMap.copyOf(result); http://git-wip-us.apache.org/repos/asf/flume/blob/46ea007d/flume-ng-node/src/main/java/org/apache/flume/node/MaterializedConfiguration.java ---------------------------------------------------------------------- diff --git a/flume-ng-node/src/main/java/org/apache/flume/node/MaterializedConfiguration.java b/flume-ng-node/src/main/java/org/apache/flume/node/MaterializedConfiguration.java index fa3ef55..a80bfdf 100644 --- a/flume-ng-node/src/main/java/org/apache/flume/node/MaterializedConfiguration.java +++ b/flume-ng-node/src/main/java/org/apache/flume/node/MaterializedConfiguration.java @@ -23,7 +23,7 @@ import org.apache.flume.Channel; import org.apache.flume.SinkRunner; import org.apache.flume.SourceRunner; -import java.util.Map; +import com.google.common.collect.ImmutableMap; /** * MaterializedConfiguration represents the materialization of a Flume @@ -38,10 +38,10 @@ public interface MaterializedConfiguration { public void addChannel(String name, Channel channel); - public Map<String, SourceRunner> getSourceRunners(); + public ImmutableMap<String, SourceRunner> getSourceRunners(); - public Map<String, SinkRunner> getSinkRunners(); + public ImmutableMap<String, SinkRunner> getSinkRunners(); - public Map<String, Channel> getChannels(); + public ImmutableMap<String, Channel> getChannels(); } http://git-wip-us.apache.org/repos/asf/flume/blob/46ea007d/flume-ng-node/src/main/java/org/apache/flume/node/SimpleMaterializedConfiguration.java ---------------------------------------------------------------------- diff --git a/flume-ng-node/src/main/java/org/apache/flume/node/SimpleMaterializedConfiguration.java b/flume-ng-node/src/main/java/org/apache/flume/node/SimpleMaterializedConfiguration.java index fa58dff..a652390 100644 --- a/flume-ng-node/src/main/java/org/apache/flume/node/SimpleMaterializedConfiguration.java +++ b/flume-ng-node/src/main/java/org/apache/flume/node/SimpleMaterializedConfiguration.java @@ -61,17 +61,17 @@ public class SimpleMaterializedConfiguration implements MaterializedConfiguratio } @Override - public Map<String, Channel> getChannels() { + public ImmutableMap<String, Channel> getChannels() { return ImmutableMap.copyOf(channels); } @Override - public Map<String, SourceRunner> getSourceRunners() { + public ImmutableMap<String, SourceRunner> getSourceRunners() { return ImmutableMap.copyOf(sourceRunners); } @Override - public Map<String, SinkRunner> getSinkRunners() { + public ImmutableMap<String, SinkRunner> getSinkRunners() { return ImmutableMap.copyOf(sinkRunners); } http://git-wip-us.apache.org/repos/asf/flume/blob/46ea007d/flume-ng-sinks/flume-http-sink/src/main/java/org/apache/flume/sink/http/HttpSink.java ---------------------------------------------------------------------- diff --git a/flume-ng-sinks/flume-http-sink/src/main/java/org/apache/flume/sink/http/HttpSink.java b/flume-ng-sinks/flume-http-sink/src/main/java/org/apache/flume/sink/http/HttpSink.java index d4d7ad9..56c983a 100644 --- a/flume-ng-sinks/flume-http-sink/src/main/java/org/apache/flume/sink/http/HttpSink.java +++ b/flume-ng-sinks/flume-http-sink/src/main/java/org/apache/flume/sink/http/HttpSink.java @@ -18,6 +18,7 @@ */ package org.apache.flume.sink.http; +import com.google.common.collect.ImmutableMap; import org.apache.flume.Channel; import org.apache.flume.Context; import org.apache.flume.Event; @@ -324,7 +325,7 @@ public class HttpSink extends AbstractSink implements Configurable { final Context context, final Map<String, Boolean> override) { - Map<String, String> config = context.getSubProperties( + ImmutableMap<String, String> config = context.getSubProperties( propertyName + "."); if (config != null) {
