Keep outputwriters in server copy

copy the builded outputwriters when building a server from an other one
jmxtrans · Mar 30, 2021 · 42aa877 · 42aa877
1 parent 058df19
commit 42aa877
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 0 deletions.
diff --git a/jmxtrans-core/src/main/java/com/googlecode/jmxtrans/ServerListBuilder.java b/jmxtrans-core/src/main/java/com/googlecode/jmxtrans/ServerListBuilder.java
@@ -110,6 +110,7 @@ public void addOutputWriters(@Nonnull Iterable<OutputWriterFactory> outputWriter
 
 		public Server build() {
 			Server.Builder builder = Server.builder(server)
+					.clearOutputWriters()
 					.addOutputWriters(createOutputWriters(temporaryOutputWriters))
 					.clearQueries();
 			for (Map.Entry<Query, Set<OutputWriterFactory>> queryEntry : queries.entrySet()) {

diff --git a/jmxtrans-core/src/main/java/com/googlecode/jmxtrans/model/Server.java b/jmxtrans-core/src/main/java/com/googlecode/jmxtrans/model/Server.java
@@ -31,7 +31,9 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Iterables;
 import com.google.inject.name.Named;
+import com.googlecode.jmxtrans.ServerListBuilder;
 import com.googlecode.jmxtrans.connections.JMXConnection;
 import com.googlecode.jmxtrans.connections.JmxConnectionProvider;
 import com.sun.tools.attach.VirtualMachine;
@@ -508,6 +510,7 @@ private Builder(Server server) {
 			this.local = server.local;
 			this.ssl = server.ssl;
 			this.queries.addAll(server.queries);
+			Iterables.addAll(this.outputWriters, server.outputWriters);
 			this.pool = server.pool;
 		}
 
@@ -531,6 +534,11 @@ public Builder addOutputWriterFactory(OutputWriterFactory outputWriterFactory) {
 			return this;
 		}
 
+		public Builder clearOutputWriters() {
+			this.outputWriters.clear();
+			return this;
+		}
+
 		public Builder addOutputWriters(Collection<OutputWriter> outputWriters) {
 			this.outputWriters.addAll(outputWriters);
 			return this;

diff --git a/jmxtrans-core/src/test/java/com/googlecode/jmxtrans/ServerListBuilderTest.java b/jmxtrans-core/src/test/java/com/googlecode/jmxtrans/ServerListBuilderTest.java
@@ -73,6 +73,24 @@ public void outputWritersAreReusedOnServers() {
 		assertThat(createdServer.getOutputWriters()).hasSize(3);
 	}
 
+	@Test
+	public void outputWritersAreKeptOnServerCopy() {
+		Server server1 = Server.builder(dummyServer())
+				.addOutputWriterFactory(new DummyOutputWriterFactory("output 1"))
+				.addOutputWriterFactory(new DummyOutputWriterFactory("output 2"))
+				.build();
+
+		ImmutableList<Server> serverList = new ServerListBuilder()
+				.add(ImmutableList.of(server1))
+				.build();
+		assertThat(serverList).hasSize(1);
+
+		Server createdServer = serverList.iterator().next();
+
+		Server server2 = Server.builder(createdServer).build();
+		assertThat(server2.getOutputWriters()).hasSize(2);
+	}
+
 	@Test
 	public void outputWritersAreReusedOnQueries() {
 		Query q1 = Query.builder(dummyQuery())