From 5ea86e2f53f062b3868586f76e18d25c596fa005 Mon Sep 17 00:00:00 2001
From: Ilayaperumal Gopinathan <igopinathan@pivotal.io>
Date: Wed, 23 Nov 2016 20:41:49 +0530
Subject: [PATCH] Remove logback config from spring-cloud-stream-binder-test

Resolves #704

Configure default logging level

Use EnvironmentPostProcessor to set default config props
---
 .../BinderTestEnvironmentPostProcessor.java   | 41 +++++++++++++++++++
 .../main/resources/META-INF/spring.factories  |  2 +
 .../src/main/resources/logback.xml            | 12 ------
 3 files changed, 43 insertions(+), 12 deletions(-)
 create mode 100644 spring-cloud-stream-binder-test/src/main/java/org/springframework/cloud/stream/binder/BinderTestEnvironmentPostProcessor.java
 create mode 100644 spring-cloud-stream-binder-test/src/main/resources/META-INF/spring.factories
 delete mode 100644 spring-cloud-stream-binder-test/src/main/resources/logback.xml

diff --git a/spring-cloud-stream-binder-test/src/main/java/org/springframework/cloud/stream/binder/BinderTestEnvironmentPostProcessor.java b/spring-cloud-stream-binder-test/src/main/java/org/springframework/cloud/stream/binder/BinderTestEnvironmentPostProcessor.java
new file mode 100644
index 000000000..b29de73fd
--- /dev/null
+++ b/spring-cloud-stream-binder-test/src/main/java/org/springframework/cloud/stream/binder/BinderTestEnvironmentPostProcessor.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.stream.binder;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.env.EnvironmentPostProcessor;
+import org.springframework.core.env.ConfigurableEnvironment;
+import org.springframework.core.env.MapPropertySource;
+
+/**
+ * An {@link EnvironmentPostProcessor} that sets some common configuration properties (log config etc.,) for binder tests.
+ *
+ * @author Ilayaperumal Gopinathan
+ */
+public class BinderTestEnvironmentPostProcessor implements EnvironmentPostProcessor {
+
+	@Override
+	public void postProcessEnvironment(ConfigurableEnvironment environment, SpringApplication application) {
+		Map<String, Object> propertiesToAdd = new HashMap<>();
+		propertiesToAdd.put("logging.pattern.console", "%d{ISO8601} %5p %t %c{2}:%L - %m%n");
+		propertiesToAdd.put("logging.level.root", "WARN");
+		environment.getPropertySources().addLast(new MapPropertySource("binderTestPropertiesConfig", propertiesToAdd));
+	}
+}
diff --git a/spring-cloud-stream-binder-test/src/main/resources/META-INF/spring.factories b/spring-cloud-stream-binder-test/src/main/resources/META-INF/spring.factories
new file mode 100644
index 000000000..9a0f710e7
--- /dev/null
+++ b/spring-cloud-stream-binder-test/src/main/resources/META-INF/spring.factories
@@ -0,0 +1,2 @@
+org.springframework.boot.env.EnvironmentPostProcessor=\
+  org.springframework.cloud.stream.binder.BinderTestEnvironmentPostProcessor
diff --git a/spring-cloud-stream-binder-test/src/main/resources/logback.xml b/spring-cloud-stream-binder-test/src/main/resources/logback.xml
deleted file mode 100644
index 234bb6c40..000000000
--- a/spring-cloud-stream-binder-test/src/main/resources/logback.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<configuration>
-  <appender name="stdout" class="ch.qos.logback.core.ConsoleAppender">
-    <encoder>
-      <pattern>%d{ISO8601} %5p %t %c{2}:%L - %m%n</pattern>
-    </encoder>
-  </appender>
-  <logger name="org.springframework.web.client.RestTemplate" level="ERROR"/>
-  <logger name="org.apache.hadoop.util.NativeCodeLoader" level="ERROR"/>
-  <root level="WARN">
-    <appender-ref ref="stdout"/>
-  </root>
-</configuration>