Merge pull request #558 from hazendaz/master

Restructure all packaging in samples / fix missing items / fixes coveralls issues

Author: hazendaz

mybatis-spring-boot-samples/mybatis-spring-boot-sample-annotation/src/main/java/sample/mybatis/SampleAnnotationApplication.java renamed to mybatis-spring-boot-samples/mybatis-spring-boot-sample-annotation/src/main/java/sample/mybatis/annotation/SampleAnnotationApplication.java

@@ -13,13 +13,13 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package sample.mybatis;
+package sample.mybatis.annotation;
 
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
-import sample.mybatis.mapper.CityMapper;
+import sample.mybatis.annotation.mapper.CityMapper;
 
 @SpringBootApplication
 public class SampleAnnotationApplication implements CommandLineRunner {

mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/main/java/sample/mybatis/domain/City.java renamed to mybatis-spring-boot-samples/mybatis-spring-boot-sample-annotation/src/main/java/sample/mybatis/annotation/domain/City.java

@@ -13,7 +13,7 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package sample.mybatis.domain;
+package sample.mybatis.annotation.domain;
 
 import java.io.Serializable;
 

mybatis-spring-boot-samples/mybatis-spring-boot-sample-annotation/src/main/java/sample/mybatis/annotation/mapper/CityMapper.java

@@ -0,0 +1,33 @@
+/*
+ *    Copyright 2015-2021 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 sample.mybatis.annotation.mapper;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import sample.mybatis.annotation.domain.City;
+
+/**
+ * @author Eddú Meléndez
+ */
+@Mapper
+public interface CityMapper {
+
+  @Select("select id, name, state, country from city where state = #{state}")
+  City findByState(@Param("state") String state);
+
+}

mybatis-spring-boot-samples/mybatis-spring-boot-sample-annotation/src/main/resources/application.properties

@@ -1,5 +1,5 @@
 #
-#    Copyright 2015-2019 the original author or authors.
+#    Copyright 2015-2021 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.
@@ -15,4 +15,4 @@
 #
 
 logging.level.root=WARN
-logging.level.sample.mybatis.mapper=TRACE
+logging.level.sample.mybatis.annotation.mapper=TRACE

mybatis-spring-boot-samples/mybatis-spring-boot-sample-annotation/src/test/java/extensions/annotation/CaptureSystemOutput.java

@@ -0,0 +1,263 @@
+/*
+ *    Copyright 2015-2021 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 extensions.annotation;
+
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.allOf;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.PrintStream;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.hamcrest.Matcher;
+import org.junit.jupiter.api.extension.AfterAllCallback;
+import org.junit.jupiter.api.extension.AfterEachCallback;
+import org.junit.jupiter.api.extension.BeforeAllCallback;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.api.extension.ExtensionContext;
+import org.junit.jupiter.api.extension.ExtensionContext.Namespace;
+import org.junit.jupiter.api.extension.ExtensionContext.Store;
+import org.junit.jupiter.api.extension.ParameterContext;
+import org.junit.jupiter.api.extension.ParameterResolver;
+import org.junit.platform.commons.support.ReflectionSupport;
+
+/**
+ * {@code @CaptureSystemOutput} is a JUnit JUpiter extension for capturing output to {@code System.out} and
+ * {@code System.err} with expectations supported via Hamcrest matchers.
+ *
+ * <h4>Example Usage</h4>
+ *
+ * <pre style="code">
+ * {@literal @}Test
+ * {@literal @}CaptureSystemOutput
+ * void systemOut(OutputCapture outputCapture) {
+ *     outputCapture.expect(containsString("System.out!"));
+ *
+ *     System.out.println("Printed to System.out!");
+ * }
+ *
+ * {@literal @}Test
+ * {@literal @}CaptureSystemOutput
+ * void systemErr(OutputCapture outputCapture) {
+ *     outputCapture.expect(containsString("System.err!"));
+ *
+ *     System.err.println("Printed to System.err!");
+ * }
+ * </pre>
+ *
+ * <p>
+ * Based on code from Spring Boot's <a href=
+ * "https://github.com/spring-projects/spring-boot/blob/d3c34ee3d1bfd3db4a98678c524e145ef9bca51c/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/rule/OutputCapture.java">OutputCapture</a>
+ * rule for JUnit 4 by Phillip Webb and Andy Wilkinson.
+ *
+ * <p>
+ * Borrowing source from Sam Brannen as listed online at spring and stackoverflow from here <a href=
+ * "https://github.com/sbrannen/junit5-demo/blob/master/src/test/java/extensions/CaptureSystemOutput.java">CaptureSystemOutput</a>
+ *
+ * <p>
+ * Additional changes to Sam Brannen logic supplied by kazuki43zoo from here <a href=
+ * "https://github.com/kazuki43zoo/mybatis-spring-boot/commit/317c9809326baba1f6ee0a0f8c2c471cd75993b3">enhancement
+ * capture</a>
+ *
+ * @author Sam Brannen
+ * @author Phillip Webb
+ * @author Andy Wilkinson
+ */
+@Target({ TYPE, METHOD })
+@Retention(RUNTIME)
+@ExtendWith(CaptureSystemOutput.Extension.class)
+public @interface CaptureSystemOutput {
+
+  class Extension implements BeforeAllCallback, AfterAllCallback, AfterEachCallback, ParameterResolver {
+
+    @Override
+    public void beforeAll(ExtensionContext context) {
+      getOutputCapture(context).captureOutput();
+    }
+
+    public void afterAll(ExtensionContext context) {
+      getOutputCapture(context).releaseOutput();
+    }
+
+    @Override
+    public void afterEach(ExtensionContext context) {
+      OutputCapture outputCapture = getOutputCapture(context);
+      try {
+        if (!outputCapture.matchers.isEmpty()) {
+          String output = outputCapture.toString();
+          assertThat(output, allOf(outputCapture.matchers));
+        }
+      } finally {
+        outputCapture.reset();
+      }
+    }
+
+    @Override
+    public boolean supportsParameter(ParameterContext parameterContext, ExtensionContext extensionContext) {
+      boolean isTestMethodLevel = extensionContext.getTestMethod().isPresent();
+      boolean isOutputCapture = parameterContext.getParameter().getType() == OutputCapture.class;
+      return isTestMethodLevel && isOutputCapture;
+    }
+
+    @Override
+    public Object resolveParameter(ParameterContext parameterContext, ExtensionContext extensionContext) {
+      return getOutputCapture(extensionContext);
+    }
+
+    private OutputCapture getOutputCapture(ExtensionContext context) {
+      return getOrComputeIfAbsent(getStore(context), OutputCapture.class);
+    }
+
+    private <V> V getOrComputeIfAbsent(Store store, Class<V> type) {
+      return store.getOrComputeIfAbsent(type, ReflectionSupport::newInstance, type);
+    }
+
+    private Store getStore(ExtensionContext context) {
+      return context.getStore(Namespace.create(getClass()));
+    }
+
+  }
+
+  /**
+   * {@code OutputCapture} captures output to {@code System.out} and {@code System.err}.
+   *
+   * <p>
+   * To obtain an instance of {@code OutputCapture}, declare a parameter of type {@code OutputCapture} in a JUnit
+   * Jupiter {@code @Test}, {@code @BeforeEach}, or {@code @AfterEach} method.
+   *
+   * <p>
+   * {@linkplain #expect Expectations} are supported via Hamcrest matchers.
+   *
+   * <p>
+   * To obtain all output to {@code System.out} and {@code System.err}, simply invoke {@link #toString()}.
+   *
+   * @author Phillip Webb
+   * @author Andy Wilkinson
+   * @author Sam Brannen
+   */
+  static class OutputCapture {
+
+    private final List<Matcher<? super String>> matchers = new ArrayList<>();
+
+    private CaptureOutputStream captureOut;
+
+    private CaptureOutputStream captureErr;
+
+    private ByteArrayOutputStream copy;
+
+    void captureOutput() {
+      this.copy = new ByteArrayOutputStream();
+      this.captureOut = new CaptureOutputStream(System.out, this.copy);
+      this.captureErr = new CaptureOutputStream(System.err, this.copy);
+      System.setOut(new PrintStream(this.captureOut));
+      System.setErr(new PrintStream(this.captureErr));
+    }
+
+    void releaseOutput() {
+      System.setOut(this.captureOut.getOriginal());
+      System.setErr(this.captureErr.getOriginal());
+      this.copy = null;
+    }
+
+    private void flush() {
+      try {
+        this.captureOut.flush();
+        this.captureErr.flush();
+      } catch (IOException ex) {
+        // ignore
+      }
+    }
+
+    /**
+     * Verify that the captured output is matched by the supplied {@code matcher}.
+     *
+     * <p>
+     * Verification is performed after the test method has executed.
+     *
+     * @param matcher
+     *          the matcher
+     */
+    public void expect(Matcher<? super String> matcher) {
+      this.matchers.add(matcher);
+    }
+
+    /**
+     * Return all captured output to {@code System.out} and {@code System.err} as a single string.
+     */
+    @Override
+    public String toString() {
+      flush();
+      return this.copy.toString();
+    }
+
+    void reset() {
+      this.matchers.clear();
+      this.copy.reset();
+    }
+
+    private static class CaptureOutputStream extends OutputStream {
+
+      private final PrintStream original;
+
+      private final OutputStream copy;
+
+      CaptureOutputStream(PrintStream original, OutputStream copy) {
+        this.original = original;
+        this.copy = copy;
+      }
+
+      PrintStream getOriginal() {
+        return this.original;
+      }
+
+      @Override
+      public void write(int b) throws IOException {
+        this.copy.write(b);
+        this.original.write(b);
+        this.original.flush();
+      }
+
+      @Override
+      public void write(byte[] b) throws IOException {
+        write(b, 0, b.length);
+      }
+
+      @Override
+      public void write(byte[] b, int off, int len) throws IOException {
+        this.copy.write(b, off, len);
+        this.original.write(b, off, len);
+      }
+
+      @Override
+      public void flush() throws IOException {
+        this.copy.flush();
+        this.original.flush();
+      }
+
+    }
+
+  }
+
+}

mybatis-spring-boot-samples/mybatis-spring-boot-sample-annotation/src/test/java/sample/mybatis/SampleMybatisApplicationMainTest.java renamed to mybatis-spring-boot-samples/mybatis-spring-boot-sample-annotation/src/test/java/sample/mybatis/annotation/SampleMybatisApplicationMainTest.java

@@ -13,14 +13,14 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package sample.mybatis;
+package sample.mybatis.annotation;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 import org.junit.jupiter.api.Test;
 
-import extensions.CaptureSystemOutput;
-import extensions.CaptureSystemOutput.OutputCapture;
+import extensions.annotation.CaptureSystemOutput;
+import extensions.annotation.CaptureSystemOutput.OutputCapture;
 
 /**
  * @author Kazuki Shimizu

mybatis-spring-boot-samples/mybatis-spring-boot-sample-annotation/src/test/java/sample/mybatis/SampleMybatisApplicationTest.java renamed to mybatis-spring-boot-samples/mybatis-spring-boot-sample-annotation/src/test/java/sample/mybatis/annotation/SampleMybatisApplicationTest.java

@@ -13,15 +13,15 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package sample.mybatis;
+package sample.mybatis.annotation;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
 
-import extensions.CaptureSystemOutput;
-import extensions.CaptureSystemOutput.OutputCapture;
+import extensions.annotation.CaptureSystemOutput;
+import extensions.annotation.CaptureSystemOutput.OutputCapture;
 
 /**
  * @author Eddú Meléndez

mybatis-spring-boot-samples/mybatis-spring-boot-sample-web/src/test/java/sample/mybatis/mapper/CityMapperTest.java renamed to mybatis-spring-boot-samples/mybatis-spring-boot-sample-annotation/src/test/java/sample/mybatis/annotation/mapper/CityMapperTest.java

@@ -13,15 +13,15 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package sample.mybatis.mapper;
+package sample.mybatis.annotation.mapper;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 import org.junit.jupiter.api.Test;
 import org.mybatis.spring.boot.test.autoconfigure.MybatisTest;
 import org.springframework.beans.factory.annotation.Autowired;
 
-import sample.mybatis.domain.City;
+import sample.mybatis.annotation.domain.City;
 
 /**
  * Tests for {@link CityMapper}.