Add default matcher for mdc.

* DSL has been removed as does not add any functionality.

Author: jsalinaspolo

.editorconfig

@@ -14,6 +14,7 @@ indent_style = space
 indent_size = 2
 continuation_indent_size = 4
 wildcard_import_limit = 9999
+curly_bracket_next_line = false
 
 [Makefile]
 indent_style = tab

README.md

@@ -8,32 +8,23 @@ LogCapture is a testing library for asserting logging messages.
 
 ## How it works
 
-Using the DSL:
-
-```java
-captureLogEvents(() -> log.info("a message"))
-  .logged(aLog().info()
-    .withMessage("a message"))
-
 ```
-
 Using JUnit Rule:
 
 ```java
 @Rule
-public LogCaptureRule logCaptureRule = new LogCaptureRule();
+public LogCaptureRule logCapture = new LogCaptureRule();
 
 @Test
 public void verify_logs_using_rule() {
   log.info("a message");
 
-  logCaptureRule.logged(aLog().info().withMessage("a message"));
+  logCapture.logged(aLog().info().withMessage("a message"));
 }
 ```
 
 More example how to use the library at [ExampleShould.java](https://github.com/mustaine/logcapture/blob/master/src/test/java/com/logcapture/example/ExampleShould.java) 
 
-
 ## Binaries
 
 Binaries and dependency information for Maven, Ivy, Gradle and others can be found at [http://search.maven.org](http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22com.jspcore%22%20AND%20a%3A%22logcapture%22).

build.gradle

@@ -14,7 +14,7 @@ plugins {
 }
 
 group 'com.jspcore'
-version '0.4.7-SNAPSHOT'
+version '0.5.0-SNAPSHOT'
 description = 'A testing library for assert logging messages.'
 
 apply plugin: 'idea'
@@ -31,19 +31,19 @@ repositories {
 }
 
 ext {
-  junit5_version = "5.2.0"
+  junit5_version = "5.5.0"
 }
 
 dependencies {
   api "org.hamcrest:hamcrest-library:2.1"
   implementation "org.slf4j:slf4j-api:1.7.22"
-  implementation "ch.qos.logback:logback-classic:1.1.8"
+  implementation "ch.qos.logback:logback-classic:1.2.3"
   implementation "org.awaitility:awaitility:3.1.6"
   implementation "junit:junit:4.12"
   implementation "org.junit.jupiter:junit-jupiter-api:$junit5_version"
   implementation 'org.spockframework:spock-core:1.3-groovy-2.5'
 
-  testImplementation "org.assertj:assertj-core:3.6.1"
+  testImplementation "org.assertj:assertj-core:3.12.2"
   testImplementation "org.junit.jupiter:junit-jupiter-engine:$junit5_version"
   testImplementation "org.junit.jupiter:junit-jupiter-params:$junit5_version"
   testImplementation "org.junit.vintage:junit-vintage-engine:$junit5_version"
@@ -100,17 +100,13 @@ task sourceJar(type: Jar) {
   from sourceSets.main.allJava
 }
 
-wrapper {
-  gradleVersion = '5.4'
-}
-
 publishing {
   publications {
     MyPublication(MavenPublication) {
       from components.java
       groupId 'com.jspcore'
       artifactId 'logcapture'
-      version '0.4.7'
+      version '0.5.0'
 
       artifacts {
         artifact sourceJar {
@@ -144,8 +140,8 @@ bintray {
     licenses = ['MIT']
     vcsUrl = 'https://github.com/mustaine/logcapture.git'
     version {
-      name = '0.4.7'
-      vcsTag = '0.4.7'
+      name = '0.5.0'
+      vcsTag = '0.5.0'
       released = new Date()
     }
   }

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.5.1-bin.zip

src/main/groovy/com/logcapture/spock/LogCaptureSpec.groovy

@@ -31,7 +31,7 @@ class LogCaptureSpec extends Specification {
   }
 
   LogCaptureSpec logged(Matcher<List<ILoggingEvent>> expectedLoggingMessage) {
-    new LogCapture<>(logAppender.events(), null).logged(expectedLoggingMessage)
+    new LogCapture<>(logAppender.events()).logged(expectedLoggingMessage)
     return this
   }
 }

src/main/groovy/com/logcapture/spock/LogCaptureTrait.groovy

@@ -1,4 +1,4 @@
-package com.logcapture.junit
+package com.logcapture.spock
 
 import ch.qos.logback.classic.Logger
 import ch.qos.logback.classic.spi.ILoggingEvent
@@ -28,7 +28,7 @@ trait LogCaptureTrait {
   }
 
   LogCaptureTrait logged(Matcher<List<ILoggingEvent>> expectedLoggingMessage) {
-    new LogCapture<>(logAppender.events(), null).logged(expectedLoggingMessage)
+    new LogCapture<>(logAppender.events()).logged(expectedLoggingMessage)
     return this
   }
 }

src/main/java/com/logcapture/Await.java

@@ -1,58 +1,24 @@
 package com.logcapture;
 
 import ch.qos.logback.classic.spi.ILoggingEvent;
-import com.logcapture.assertion.ExpectedLoggingMessage;
 import com.logcapture.assertion.VerificationException;
 import org.hamcrest.Matcher;
 
 import java.util.List;
-import java.util.function.Consumer;
-import java.util.function.Supplier;
 
 public class LogCapture<T> {
 
   private final List<ILoggingEvent> events;
-  private final T result;
 
-  public LogCapture(List<ILoggingEvent> events, T result) {
+  public LogCapture(List<ILoggingEvent> events) {
     this.events = events;
-    this.result = result;
   }
 
   public LogCapture<T> logged(Matcher<List<ILoggingEvent>> expectedLoggingMessage) {
-      if (expectedLoggingMessage.matches(events)) {
-        return this;
+    if (expectedLoggingMessage.matches(events)) {
+      return this;
     }
 
     throw VerificationException.forUnmatchedLog(expectedLoggingMessage, events);
   }
-
-  public LogCapture<T> assertions(Consumer<T> assertions) {
-    assertions.accept(result);
-    return this;
-  }
-
-  public static LogCapture<Void> captureLogEvents(Runnable codeBlock) {
-    return LogbackInterceptor.captureLogEvents(codeBlock);
-  }
-
-  public static LogCapture<Void> captureLogEvents(Runnable codeBlock, String loggerName) {
-    return LogbackInterceptor.captureLogEvents(codeBlock, loggerName);
-  }
-
-  public static <T> LogCapture<T> captureLogEvents(Supplier<T> codeBlock) {
-    return LogbackInterceptor.captureLogEvents(codeBlock);
-  }
-
-  public static <T> LogCapture<T> captureLogEvents(Supplier<T> codeBlock, String loggerName) {
-    return LogbackInterceptor.captureLogEvents(codeBlock, loggerName);
-  }
-
-  public static Await<Void> captureLogEventsAsync(Runnable codeBlock) {
-    return (duration, condition) -> LogbackInterceptor.captureLogEventsAsync(codeBlock, duration, condition);
-  }
-
-  public static <T> Await<T> captureLogEventsAsync(Supplier<T> codeBlock) {
-    return (duration, condition) -> LogbackInterceptor.captureLogEventsAsync(codeBlock, duration, condition);
-  }
 }

src/main/java/com/logcapture/LogCapture.java

@@ -27,7 +27,7 @@ public boolean matches(ILoggingEvent event) {
     }
 
     return expectedMessageMatcher.matches(event.getThrowableProxy().getMessage()) &&
-      expectedException.matches(event.getThrowableProxy());
+        expectedException.matches(event.getThrowableProxy());
   }
 
   public ExpectedLoggedException withMessage(Matcher<String> expectedMessageMatcher) {
@@ -38,9 +38,9 @@ public ExpectedLoggedException withMessage(Matcher<String> expectedMessageMatche
   @Override
   public String toString() {
     return "ExpectedLoggedException{" +
-      "expectedMessageMatcher=" + expectedMessageMatcher +
-      ", expectedException=" + expectedException +
-      '}';
+        "expectedMessageMatcher=" + expectedMessageMatcher +
+        ", expectedException=" + expectedException +
+        '}';
   }
 
   public static final ExpectedLoggedException ANYTHING = new ExpectedLoggedException() {

src/main/java/com/logcapture/LogbackInterceptor.java

@@ -136,6 +136,11 @@ public ExpectedLoggingMessage length(Matcher<Integer> expectedLengthMatcher) {
     return this;
   }
 
+  public ExpectedLoggingMessage withMdc(String mdcKey, String mdcValue) {
+    withMdc(mdcKey, equalTo(mdcValue));
+    return this;
+  }
+
   public ExpectedLoggingMessage withMdc(String mdcKey, Matcher<String> mdcValue) {
     mdcMatcher.put(mdcKey, mdcValue);
     return this;

src/main/java/com/logcapture/assertion/ExpectedLoggedException.java

@@ -14,18 +14,18 @@ private VerificationException(String message) {
 
   public static VerificationException forUnmatchedLog(Matcher<List<ILoggingEvent>> expectedLogMessage, List<ILoggingEvent> logEvents) {
     return new VerificationException(String.format(
-      "Expected matching: \n%s\nLogs received: \n%s",
-      expectedLogMessage.toString(),
-      logEvents.stream()
-        .map(VerificationException::formatLogEvent)
-        .collect(Collectors.joining("\n"))
+        "Expected matching: \n%s\nLogs received: \n%s",
+        expectedLogMessage.toString(),
+        logEvents.stream()
+            .map(VerificationException::formatLogEvent)
+            .collect(Collectors.joining("\n"))
     ));
   }
 
   private static String formatLogEvent(ILoggingEvent log) {
     return String.format("level: %s marker: %s mdc: %s message: %s", log.getLevel(),
-                         log.getMarker(),
-                         log.getMDCPropertyMap(),
-                         log.getFormattedMessage());
+        log.getMarker(),
+        log.getMDCPropertyMap(),
+        log.getFormattedMessage());
   }
 }

src/main/java/com/logcapture/assertion/ExpectedLoggingMessage.java

@@ -53,7 +53,7 @@ public void evaluate() throws Throwable {
   }
 
   public LogCaptureRule logged(Matcher<List<ILoggingEvent>> expectedLoggingMessage) {
-    new LogCapture<>(logAppender.events(), null).logged(expectedLoggingMessage);
+    new LogCapture<>(logAppender.events()).logged(expectedLoggingMessage);
     return this;
   }
 }

src/main/java/com/logcapture/assertion/VerificationException.java

@@ -42,7 +42,7 @@ public void afterEach(ExtensionContext context) {
   }
 
   public LogCaptureExtension logged(Matcher<List<ILoggingEvent>> expectedLoggingMessage) {
-    new LogCapture<>(logAppender.events(), null).logged(expectedLoggingMessage);
+    new LogCapture<>(logAppender.events()).logged(expectedLoggingMessage);
     return this;
   }
 

src/main/java/com/logcapture/junit/LogCaptureRule.java

@@ -3,7 +3,7 @@
 import org.hamcrest.BaseMatcher;
 import org.hamcrest.Description;
 
-  public class TypedAnythingMatcher<T> extends BaseMatcher<T> {
+public class TypedAnythingMatcher<T> extends BaseMatcher<T> {
 
   @Override
   public boolean matches(Object item) {

src/main/java/com/logcapture/junit5/LogCaptureExtension.java

@@ -1,7 +1,6 @@
 package com.logcapture.spock
 
 import com.logcapture.junit.LogCaptureRuleShould
-import com.logcapture.junit.LogCaptureTrait
 import org.slf4j.LoggerFactory
 import spock.lang.Shared
 import spock.lang.Specification