You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by pa...@apache.org on 2017/06/02 21:59:53 UTC
svn commit: r1797463 - in /sling/trunk/contrib/extensions/slf4j-mdc: ./
src/test/java/org/apache/sling/extensions/mdc/integration/
src/test/java/org/apache/sling/extensions/mdc/integration/servlet/
Author: pauls
Date: Fri Jun 2 21:59:53 2017
New Revision: 1797463
URL: http://svn.apache.org/viewvc?rev=1797463&view=rev
Log:
SLING-6934: Remove org.json from slf4j-mdc
Modified:
sling/trunk/contrib/extensions/slf4j-mdc/pom.xml
sling/trunk/contrib/extensions/slf4j-mdc/src/test/java/org/apache/sling/extensions/mdc/integration/ITMDCFilter.java
sling/trunk/contrib/extensions/slf4j-mdc/src/test/java/org/apache/sling/extensions/mdc/integration/ServerConfiguration.java
sling/trunk/contrib/extensions/slf4j-mdc/src/test/java/org/apache/sling/extensions/mdc/integration/servlet/MDCStateServlet.java
Modified: sling/trunk/contrib/extensions/slf4j-mdc/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/slf4j-mdc/pom.xml?rev=1797463&r1=1797462&r2=1797463&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/slf4j-mdc/pom.xml (original)
+++ sling/trunk/contrib/extensions/slf4j-mdc/pom.xml Fri Jun 2 21:59:53 2017
@@ -209,9 +209,9 @@
<version>4.10</version>
</dependency>
<dependency>
- <groupId>org.json</groupId>
- <artifactId>json</artifactId>
- <version>20070829</version>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.commons.johnzon</artifactId>
+ <version>1.0.0</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: sling/trunk/contrib/extensions/slf4j-mdc/src/test/java/org/apache/sling/extensions/mdc/integration/ITMDCFilter.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/slf4j-mdc/src/test/java/org/apache/sling/extensions/mdc/integration/ITMDCFilter.java?rev=1797463&r1=1797462&r2=1797463&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/slf4j-mdc/src/test/java/org/apache/sling/extensions/mdc/integration/ITMDCFilter.java (original)
+++ sling/trunk/contrib/extensions/slf4j-mdc/src/test/java/org/apache/sling/extensions/mdc/integration/ITMDCFilter.java Fri Jun 2 21:59:53 2017
@@ -25,7 +25,6 @@ import org.apache.sling.testing.tools.ht
import org.apache.sling.testing.tools.http.RequestCustomizer;
import org.apache.sling.testing.tools.http.RequestExecutor;
import org.apache.sling.testing.tools.retry.RetryLoop;
-import org.json.JSONObject;
import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.Before;
@@ -39,8 +38,12 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.IOException;
+import java.io.StringReader;
import java.util.concurrent.TimeUnit;
+import javax.json.Json;
+import javax.json.JsonObject;
+
import static junit.framework.Assert.assertNull;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@@ -85,7 +88,7 @@ public class ITMDCFilter {
RequestExecutor result = executor.execute(
rb.buildGetRequest("/mdc","foo","bar"));
- JSONObject jb = new JSONObject(result.getContent());
+ JsonObject jb = Json.createReader(new StringReader(result.getContent())).readObject();
assertEquals("/mdc", jb.getString("req.requestURI"));
assertEquals("foo=bar", jb.getString("req.queryString"));
assertEquals(ServerConfiguration.getServerUrl() + "/mdc", jb.getString("req.requestURL"));
@@ -113,7 +116,7 @@ public class ITMDCFilter {
.withHeader("mdc-test-header", "foo-test-header")
);
- JSONObject jb = new JSONObject(result.getContent());
+ JsonObject jb = Json.createReader(new StringReader(result.getContent())).readObject();
log.info("Response {}",result.getContent());
assertEquals("/mdc", jb.getString("req.requestURI"));
@@ -124,7 +127,7 @@ public class ITMDCFilter {
assertEquals("foo-test-cookie", jb.getString("mdc-test-cookie"));
//Only configured params must be returned
- assertFalse(jb.has("ignored-param"));
+ assertFalse(jb.containsKey("ignored-param"));
}
Modified: sling/trunk/contrib/extensions/slf4j-mdc/src/test/java/org/apache/sling/extensions/mdc/integration/ServerConfiguration.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/slf4j-mdc/src/test/java/org/apache/sling/extensions/mdc/integration/ServerConfiguration.java?rev=1797463&r1=1797462&r2=1797463&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/slf4j-mdc/src/test/java/org/apache/sling/extensions/mdc/integration/ServerConfiguration.java (original)
+++ sling/trunk/contrib/extensions/slf4j-mdc/src/test/java/org/apache/sling/extensions/mdc/integration/ServerConfiguration.java Fri Jun 2 21:59:53 2017
@@ -87,7 +87,7 @@ public class ServerConfiguration {
mavenBundle("org.apache.felix", "org.apache.felix.http.jetty").versionAsInProject().startLevel(3),
mavenBundle("org.apache.felix", "org.apache.felix.http.whiteboard").versionAsInProject().startLevel(5),
mavenBundle("org.apache.felix", "org.apache.felix.scr").versionAsInProject(),
- wrappedBundle(mavenBundle("org.json", "json").versionAsInProject()),
+ mavenBundle("org.apache.sling", "org.apache.sling.commons.johnzon").versionAsInProject(),
systemProperty("pax.exam.osgi.unresolved.fail").value("fail"),
systemProperty("org.osgi.service.http.port").value(getServerPort()),
cleanCaches(),
Modified: sling/trunk/contrib/extensions/slf4j-mdc/src/test/java/org/apache/sling/extensions/mdc/integration/servlet/MDCStateServlet.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/slf4j-mdc/src/test/java/org/apache/sling/extensions/mdc/integration/servlet/MDCStateServlet.java?rev=1797463&r1=1797462&r2=1797463&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/slf4j-mdc/src/test/java/org/apache/sling/extensions/mdc/integration/servlet/MDCStateServlet.java (original)
+++ sling/trunk/contrib/extensions/slf4j-mdc/src/test/java/org/apache/sling/extensions/mdc/integration/servlet/MDCStateServlet.java Fri Jun 2 21:59:53 2017
@@ -18,7 +18,6 @@
*/
package org.apache.sling.extensions.mdc.integration.servlet;
-import org.json.JSONObject;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
import org.osgi.service.cm.Configuration;
@@ -26,6 +25,9 @@ import org.osgi.service.cm.Configuration
import org.osgi.util.tracker.ServiceTracker;
import org.slf4j.MDC;
+import javax.json.Json;
+import javax.json.JsonObject;
+import javax.json.stream.JsonGenerator;
import javax.servlet.Servlet;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
@@ -33,9 +35,12 @@ import javax.servlet.http.HttpServletReq
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.PrintWriter;
+import java.io.StringReader;
import java.util.Dictionary;
import java.util.Hashtable;
+import java.util.Map;
import java.util.Properties;
+import java.util.Map.Entry;
public class MDCStateServlet extends HttpServlet implements BundleActivator{
private ServiceTracker configAdminTracker;
@@ -62,8 +67,17 @@ public class MDCStateServlet extends Htt
return;
}
- JSONObject jb = new JSONObject(MDC.getCopyOfContextMap());
- pw.print(jb.toString());
+ Map<String, String> copyOfContextMap = MDC.getCopyOfContextMap();
+ JsonGenerator json = Json.createGenerator(pw);
+ json.writeStartObject();
+ if (copyOfContextMap != null) {
+ for (Entry<String, String> entry : copyOfContextMap.entrySet())
+ {
+ json.write(entry.getKey(), entry.getValue());
+ }
+ }
+ json.writeEnd();
+ json.flush();
}
private void createTestConfig() throws IOException {