Fix for issue #1

Bump version to 2.0.9

Author: altenhof

cf-java-logging-support-core/pom.xml

@@ -24,7 +24,7 @@
   <parent>
     <groupId>com.sap.hcp.cf.logging</groupId>
     <artifactId>cf-java-logging-support-parent</artifactId>
-    <version>2.0.8</version>
+    <version>2.0.9</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <profiles>

cf-java-logging-support-core/src/main/java/com/sap/hcp/cf/logging/common/converter/DefaultMessageConverter.java

@@ -11,9 +11,11 @@ public class DefaultMessageConverter {
 
 	private boolean flatten = false;
 	private boolean escape = false;
-	private static Pattern OBJ_PATTERN = Pattern.compile("\\s*\\{([^}]+)}");
-	private static Pattern ARRAY_PATTERN = Pattern.compile("\\s*\\[([^\\]]+)]");
-	
+	private static final String LBRACE = "{";
+	private static final String RBRACE = "}";
+	private static final String LBRACKET = "[";
+	private static final String RBRACKET = "]";
+
 	public boolean isFlatten() {
 		return flatten;
 	}
@@ -52,13 +54,13 @@ public void convert(String message, StringBuilder appendTo) {
 	}
 
 	private String flattenMsg(String msg) {
-			Matcher m = OBJ_PATTERN.matcher(msg);
-			if (m.matches()) {
-				return m.group(1);
+			String trimmedMsg = msg.trim();
+
+			if (trimmedMsg.indexOf(LBRACE) == 0 && trimmedMsg.lastIndexOf(RBRACE) == trimmedMsg.length()-1) {
+				return trimmedMsg.substring(1, trimmedMsg.length()-1);
 			}
-			m = ARRAY_PATTERN.matcher(msg);
-			if (m.matches()) {
-				return m.group(1);
+			if (trimmedMsg.indexOf(LBRACKET) == 0 && trimmedMsg.lastIndexOf(RBRACKET) == trimmedMsg.length()-1) {
+				return trimmedMsg.substring(1, trimmedMsg.length()-1);
 			}
 			return msg;
 		}

cf-java-logging-support-core/src/test/java/com/sap/hcp/cf/logging/common/converter/TestJsonMessageConverter.java

@@ -73,7 +73,43 @@ public void testLogRecordMsgFlattened() {
 	public void testEscapedMessage() {
 		DefaultMessageConverter jmc = new DefaultMessageConverter();
 		String strangeMsg = TEST_MSG_NO_ARGS + STRANGE_SEQ;
-		assertThat(formatMsg(jmc,strangeMsg), is(strangeMsg));	
-		
+		assertThat(formatMsg(jmc,strangeMsg), is(strangeMsg));
 	}
+
+	@Test
+	public void testObjNestedBraces() {
+		String nestedBracesMsg = "\"request\": \"/Foo(${bar})\"";
+		String logMsg = " {" + nestedBracesMsg + "}  ";
+		DefaultMessageConverter jmc = new DefaultMessageConverter();
+		jmc.setFlatten(true);
+		assertThat(formatMsg(jmc,logMsg), is(nestedBracesMsg));
+	}
+
+	@Test
+	public void testObjIncompleteNestedBraces() {
+		String nestedBracesMsg = "\"request\": \"/Foo(${bar)\"";
+		String logMsg = " {" + nestedBracesMsg + "}  ";
+		DefaultMessageConverter jmc = new DefaultMessageConverter();
+		jmc.setFlatten(true);
+		assertThat(formatMsg(jmc,logMsg), is(nestedBracesMsg));
+	}
+
+	@Test
+	public void testInvalidObjNestedBraces() {
+		String nestedBracesMsg = "\"request\": \"/Foo(${bar)\"";
+		String logMsg = " {" + nestedBracesMsg;
+		DefaultMessageConverter jmc = new DefaultMessageConverter();
+		jmc.setFlatten(true);
+		assertThat(formatMsg(jmc,logMsg), is(logMsg));
+	}
+
+	@Test
+	public void testObjNestedBrackets() {
+		String nestedBracketsMsg = "\"request\", \"/Foo($[bar])\"";
+		String logMsg = " [" + nestedBracketsMsg + "]  ";
+		DefaultMessageConverter jmc = new DefaultMessageConverter();
+		jmc.setFlatten(true);
+		assertThat(formatMsg(jmc,logMsg), is(nestedBracketsMsg));
+	}
+
 }

cf-java-logging-support-jersey/pom.xml

@@ -9,7 +9,7 @@
   	<relativePath>../pom.xml</relativePath>
   	<groupId>com.sap.hcp.cf.logging</groupId>
   	<artifactId>cf-java-logging-support-parent</artifactId>
-  	<version>2.0.8</version>
+  	<version>2.0.9</version>
   </parent>
 
   <name>cf-java-logging-support-jersey</name>

cf-java-logging-support-log4j2/pom.xml

@@ -11,7 +11,7 @@
 		<relativePath>../pom.xml</relativePath>
 		<groupId>com.sap.hcp.cf.logging</groupId>
 		<artifactId>cf-java-logging-support-parent</artifactId>
-		<version>2.0.8</version>
+		<version>2.0.9</version>
 	</parent>
 
 	<properties>

cf-java-logging-support-logback/pom.xml

@@ -10,7 +10,7 @@
   	<relativePath>../pom.xml</relativePath>
   	<groupId>com.sap.hcp.cf.logging</groupId>
   	<artifactId>cf-java-logging-support-parent</artifactId>
-  	<version>2.0.8</version>
+  	<version>2.0.9</version>
   </parent>
 
   <properties>

cf-java-logging-support-servlet/pom.xml

@@ -9,7 +9,7 @@
   <parent>
   	<groupId>com.sap.hcp.cf.logging</groupId>
   	<artifactId>cf-java-logging-support-parent</artifactId>
-  	<version>2.0.8</version>
+  	<version>2.0.9</version>
   	<relativePath>../pom.xml</relativePath>
   </parent>
 

pom.xml

@@ -4,7 +4,7 @@
 
   <groupId>com.sap.hcp.cf.logging</groupId>
   <artifactId>cf-java-logging-support-parent</artifactId>
-  <version>2.0.8</version>
+  <version>2.0.9</version>
   <packaging>pom</packaging>
 
   <name>Cloud Foundry Java logging support components</name>

sample/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.sap.hcp.cf.logging</groupId>
 		<artifactId>cf-java-logging-support-parent</artifactId>
-		<version>2.0.8</version>
+		<version>2.0.9</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>