diff --git a/JGit/src/test/java/com/baeldung/jgit/JGitBugTest.java b/JGit/src/test/java/com/baeldung/jgit/JGitBugIntegrationTest.java similarity index 96% rename from JGit/src/test/java/com/baeldung/jgit/JGitBugTest.java rename to JGit/src/test/java/com/baeldung/jgit/JGitBugIntegrationTest.java index acad4e395f..ed7168b2c2 100644 --- a/JGit/src/test/java/com/baeldung/jgit/JGitBugTest.java +++ b/JGit/src/test/java/com/baeldung/jgit/JGitBugIntegrationTest.java @@ -11,7 +11,7 @@ import static org.junit.Assert.assertNotNull; /** * Tests which show issues with JGit that we reported upstream. */ -public class JGitBugTest { +public class JGitBugIntegrationTest { @Test public void testRevWalkDisposeClosesReader() throws IOException { try (Repository repo = Helper.openJGitRepository()) { diff --git a/JGit/src/test/java/com/baeldung/jgit/porcelain/PorcelainTest.java b/JGit/src/test/java/com/baeldung/jgit/porcelain/PorcelainUnitTest.java similarity index 91% rename from JGit/src/test/java/com/baeldung/jgit/porcelain/PorcelainTest.java rename to JGit/src/test/java/com/baeldung/jgit/porcelain/PorcelainUnitTest.java index ce3a41e657..d3b3358664 100644 --- a/JGit/src/test/java/com/baeldung/jgit/porcelain/PorcelainTest.java +++ b/JGit/src/test/java/com/baeldung/jgit/porcelain/PorcelainUnitTest.java @@ -2,7 +2,7 @@ package com.baeldung.jgit.porcelain; import org.junit.Test; -public class PorcelainTest { +public class PorcelainUnitTest { @Test public void runSamples() throws Exception { // simply call all the samples to see any severe problems with the samples diff --git a/Twitter4J/src/test/java/com/baeldung/ApplicationTest.java b/Twitter4J/src/test/java/com/baeldung/ApplicationIntegrationTest.java similarity index 95% rename from Twitter4J/src/test/java/com/baeldung/ApplicationTest.java rename to Twitter4J/src/test/java/com/baeldung/ApplicationIntegrationTest.java index a1c778679c..4696283faa 100644 --- a/Twitter4J/src/test/java/com/baeldung/ApplicationTest.java +++ b/Twitter4J/src/test/java/com/baeldung/ApplicationIntegrationTest.java @@ -9,7 +9,7 @@ import org.junit.Test; import twitter4j.TwitterException; -public class ApplicationTest { +public class ApplicationIntegrationTest { /** * In order run this jUnit test you need to configure your API details in the twitter4j.properties diff --git a/algorithms/pom.xml b/algorithms/pom.xml index 2fa5ba12f8..967bcbc706 100644 --- a/algorithms/pom.xml +++ b/algorithms/pom.xml @@ -1,24 +1,24 @@ - 4.0.0 - com.baeldung - algorithms - 0.0.1-SNAPSHOT + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + com.baeldung + algorithms + 0.0.1-SNAPSHOT - - 1.5.0 - 1.16.12 - 3.6.1 - + + 1.5.0 + 1.16.12 + 3.6.1 + - - com.baeldung - parent-modules - 1.0.0-SNAPSHOT - + + com.baeldung + parent-modules + 1.0.0-SNAPSHOT + - - + + org.apache.commons commons-math3 ${commons-math3.version} @@ -30,40 +30,40 @@ provided - io.jenetics - jenetics - 3.7.0 - - + io.jenetics + jenetics + 3.7.0 + + - - - - - org.codehaus.mojo - exec-maven-plugin - ${exec-maven-plugin.version} - - - - - - - - org.codehaus.mojo - cobertura-maven-plugin - 2.7 - - - - com/baeldung/algorithms/dijkstra/* - - - com/baeldung/algorithms/dijkstra/* - - - - - - + + + + + org.codehaus.mojo + exec-maven-plugin + ${exec-maven-plugin.version} + + + + + + + + org.codehaus.mojo + cobertura-maven-plugin + 2.7 + + + + com/baeldung/algorithms/dijkstra/* + + + com/baeldung/algorithms/dijkstra/* + + + + + + diff --git a/algorithms/src/test/java/com/baeldung/algorithms/primechecker/PrimeCheckerTest.java b/algorithms/src/test/java/com/baeldung/algorithms/primechecker/PrimeCheckerUnitTest.java similarity index 98% rename from algorithms/src/test/java/com/baeldung/algorithms/primechecker/PrimeCheckerTest.java rename to algorithms/src/test/java/com/baeldung/algorithms/primechecker/PrimeCheckerUnitTest.java index 95602340a6..9203131397 100644 --- a/algorithms/src/test/java/com/baeldung/algorithms/primechecker/PrimeCheckerTest.java +++ b/algorithms/src/test/java/com/baeldung/algorithms/primechecker/PrimeCheckerUnitTest.java @@ -5,7 +5,7 @@ import org.junit.Test; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -public class PrimeCheckerTest { +public class PrimeCheckerUnitTest { private final BigIntegerPrimeChecker primeChecker = new BigIntegerPrimeChecker(); diff --git a/annotations/annotation-processing/pom.xml b/annotations/annotation-processing/pom.xml index e88e441b3e..df6f9d44b7 100644 --- a/annotations/annotation-processing/pom.xml +++ b/annotations/annotation-processing/pom.xml @@ -1,7 +1,7 @@ + xmlns="http://maven.apache.org/POM/4.0.0" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 diff --git a/annotations/annotation-user/pom.xml b/annotations/annotation-user/pom.xml index a365f35c11..eb827b2ea5 100644 --- a/annotations/annotation-user/pom.xml +++ b/annotations/annotation-user/pom.xml @@ -1,7 +1,6 @@ - + 4.0.0 @@ -13,11 +12,6 @@ annotation-user - - 4.12 - 3.6.0 - - @@ -26,31 +20,6 @@ ${project.parent.version} - - junit - junit - ${junit.version} - test - - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - ${maven-compiler-plugin.version} - - 1.8 - 1.8 - - - - - - - \ No newline at end of file diff --git a/annotations/annotation-user/src/test/java/com/baeldung/annotation/PersonBuilderTest.java b/annotations/annotation-user/src/test/java/com/baeldung/annotation/PersonBuilderUnitTest.java similarity index 90% rename from annotations/annotation-user/src/test/java/com/baeldung/annotation/PersonBuilderTest.java rename to annotations/annotation-user/src/test/java/com/baeldung/annotation/PersonBuilderUnitTest.java index 8d01f8a517..d5f758089a 100644 --- a/annotations/annotation-user/src/test/java/com/baeldung/annotation/PersonBuilderTest.java +++ b/annotations/annotation-user/src/test/java/com/baeldung/annotation/PersonBuilderUnitTest.java @@ -4,7 +4,7 @@ import org.junit.Test; import static org.junit.Assert.assertEquals; -public class PersonBuilderTest { +public class PersonBuilderUnitTest { @Test public void whenBuildPersonWithBuilder_thenObjectHasPropertyValues() { diff --git a/apache-bval/src/test/java/com/baeldung/validation/ValidationTest.java b/apache-bval/src/test/java/com/baeldung/validation/ValidationIntegrationTest.java similarity index 98% rename from apache-bval/src/test/java/com/baeldung/validation/ValidationTest.java rename to apache-bval/src/test/java/com/baeldung/validation/ValidationIntegrationTest.java index cd58d4460a..ecbcd100da 100644 --- a/apache-bval/src/test/java/com/baeldung/validation/ValidationTest.java +++ b/apache-bval/src/test/java/com/baeldung/validation/ValidationIntegrationTest.java @@ -17,7 +17,7 @@ import static org.junit.Assert.*; import com.baeldung.model.User; -public class ValidationTest { +public class ValidationIntegrationTest { private static ValidatorFactory validatorFactory; private static Validator validator; diff --git a/apache-cxf/cxf-aegis/pom.xml b/apache-cxf/cxf-aegis/pom.xml index b436b03305..6d8aa85679 100644 --- a/apache-cxf/cxf-aegis/pom.xml +++ b/apache-cxf/cxf-aegis/pom.xml @@ -8,7 +8,7 @@ 0.0.1-SNAPSHOT - 3.1.8 + 3.1.8 diff --git a/apache-cxf/cxf-aegis/src/test/java/com/baeldung/cxf/aegis/BaeldungTest.java b/apache-cxf/cxf-aegis/src/test/java/com/baeldung/cxf/aegis/BaeldungIntegrationTest.java similarity index 99% rename from apache-cxf/cxf-aegis/src/test/java/com/baeldung/cxf/aegis/BaeldungTest.java rename to apache-cxf/cxf-aegis/src/test/java/com/baeldung/cxf/aegis/BaeldungIntegrationTest.java index 935b283cb4..b28b987cfa 100644 --- a/apache-cxf/cxf-aegis/src/test/java/com/baeldung/cxf/aegis/BaeldungTest.java +++ b/apache-cxf/cxf-aegis/src/test/java/com/baeldung/cxf/aegis/BaeldungIntegrationTest.java @@ -26,7 +26,7 @@ import org.apache.cxf.aegis.AegisReader; import org.apache.cxf.aegis.AegisWriter; import org.apache.cxf.aegis.type.AegisType; -public class BaeldungTest { +public class BaeldungIntegrationTest { private AegisContext context; private String fileName = "baeldung.xml"; diff --git a/apache-cxf/cxf-introduction/pom.xml b/apache-cxf/cxf-introduction/pom.xml index 6e0ceaba7e..1b9ba22230 100644 --- a/apache-cxf/cxf-introduction/pom.xml +++ b/apache-cxf/cxf-introduction/pom.xml @@ -4,18 +4,18 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 cxf-introduction - + com.baeldung apache-cxf 0.0.1-SNAPSHOT - + 3.1.8 - 2.19.1 + 2.19.1 - + @@ -36,7 +36,7 @@ - + org.apache.cxf diff --git a/apache-cxf/cxf-jaxrs-implementation/pom.xml b/apache-cxf/cxf-jaxrs-implementation/pom.xml index 61a5132f19..981e0ef7aa 100644 --- a/apache-cxf/cxf-jaxrs-implementation/pom.xml +++ b/apache-cxf/cxf-jaxrs-implementation/pom.xml @@ -4,20 +4,20 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 cxf-jaxrs-implementation - + com.baeldung apache-cxf 0.0.1-SNAPSHOT - + UTF-8 3.1.8 4.5.2 - 2.19.1 + 2.19.1 - + @@ -38,7 +38,7 @@ - + org.apache.cxf diff --git a/apache-cxf/cxf-spring/pom.xml b/apache-cxf/cxf-spring/pom.xml index dffcc3ee1b..2cd700680b 100644 --- a/apache-cxf/cxf-spring/pom.xml +++ b/apache-cxf/cxf-spring/pom.xml @@ -8,7 +8,7 @@ apache-cxf 0.0.1-SNAPSHOT - + org.apache.cxf @@ -42,7 +42,7 @@ ${javax.servlet-api.version} - + @@ -63,7 +63,7 @@ - + live @@ -102,7 +102,7 @@ - + maven-surefire-plugin ${surefire.version} @@ -123,17 +123,17 @@ - + - + 3.1.8 4.3.4.RELEASE 3.1.0 - - 2.6 + + 2.6 2.19.1 - 1.6.1 + 1.6.1 - + diff --git a/apache-cxf/pom.xml b/apache-cxf/pom.xml index 37ee279ce2..3bc3853f2b 100644 --- a/apache-cxf/pom.xml +++ b/apache-cxf/pom.xml @@ -10,8 +10,8 @@ com.baeldung parent-modules 1.0.0-SNAPSHOT - - + + cxf-introduction cxf-spring diff --git a/apache-fop/pom.xml b/apache-fop/pom.xml index bb2552ec5b..f7439dc244 100644 --- a/apache-fop/pom.xml +++ b/apache-fop/pom.xml @@ -11,41 +11,10 @@ com.baeldung parent-modules 1.0.0-SNAPSHOT - - + + - - - - org.slf4j - jcl-over-slf4j - ${org.slf4j.version} - - - - - - org.hamcrest - hamcrest-core - ${org.hamcrest.version} - test - - - org.hamcrest - hamcrest-library - ${org.hamcrest.version} - test - - - - org.mockito - mockito-core - ${mockito.version} - test - - - org.apache.xmlgraphics fop @@ -62,7 +31,7 @@ commons-logging commons-logging - + @@ -80,7 +49,7 @@ commons-logging commons-logging - + @@ -154,11 +123,6 @@ 4.3 8.0.2 r938 - - - 1.3 - 1.10.19 - \ No newline at end of file diff --git a/apache-poi/pom.xml b/apache-poi/pom.xml index a747dc6952..22c0cd156a 100644 --- a/apache-poi/pom.xml +++ b/apache-poi/pom.xml @@ -9,8 +9,8 @@ com.baeldung parent-modules 1.0.0-SNAPSHOT - - + + 3.15 1.0.6 @@ -31,7 +31,7 @@ commons-logging commons-logging - - + + diff --git a/apache-poi/src/test/java/com/baeldung/jexcel/JExcelTest.java b/apache-poi/src/test/java/com/baeldung/jexcel/JExcelIntegrationTest.java similarity index 97% rename from apache-poi/src/test/java/com/baeldung/jexcel/JExcelTest.java rename to apache-poi/src/test/java/com/baeldung/jexcel/JExcelIntegrationTest.java index 72272913d5..41efd9d9ba 100644 --- a/apache-poi/src/test/java/com/baeldung/jexcel/JExcelTest.java +++ b/apache-poi/src/test/java/com/baeldung/jexcel/JExcelIntegrationTest.java @@ -21,7 +21,7 @@ import org.junit.Test; import org.junit.Before; import org.junit.After; -public class JExcelTest { +public class JExcelIntegrationTest { private JExcelHelper jExcelHelper; private static String FILE_NAME = "temp.xls"; diff --git a/apache-poi/src/test/java/com/baeldung/poi/excel/ExcelTest.java b/apache-poi/src/test/java/com/baeldung/poi/excel/ExcelIntegrationTest.java similarity index 97% rename from apache-poi/src/test/java/com/baeldung/poi/excel/ExcelTest.java rename to apache-poi/src/test/java/com/baeldung/poi/excel/ExcelIntegrationTest.java index ad36f46f02..5d7ccb9b94 100644 --- a/apache-poi/src/test/java/com/baeldung/poi/excel/ExcelTest.java +++ b/apache-poi/src/test/java/com/baeldung/poi/excel/ExcelIntegrationTest.java @@ -18,7 +18,7 @@ import org.junit.Test; import org.junit.Before; import org.junit.After; -public class ExcelTest { +public class ExcelIntegrationTest { private ExcelPOIHelper excelPOIHelper; private static String FILE_NAME = "temp.xlsx"; diff --git a/apache-poi/src/test/java/com/baeldung/poi/word/WordTest.java b/apache-poi/src/test/java/com/baeldung/poi/word/WordIntegrationTest.java similarity index 94% rename from apache-poi/src/test/java/com/baeldung/poi/word/WordTest.java rename to apache-poi/src/test/java/com/baeldung/poi/word/WordIntegrationTest.java index bc1011a03a..98b5c5b520 100644 --- a/apache-poi/src/test/java/com/baeldung/poi/word/WordTest.java +++ b/apache-poi/src/test/java/com/baeldung/poi/word/WordIntegrationTest.java @@ -14,12 +14,12 @@ import org.apache.poi.xwpf.usermodel.XWPFRun; import org.junit.BeforeClass; import org.junit.Test; -public class WordTest { +public class WordIntegrationTest { static WordDocument wordDocument; @BeforeClass public static void generateMSWordFile() throws Exception { - WordTest.wordDocument = new WordDocument(); + WordIntegrationTest.wordDocument = new WordDocument(); wordDocument.handleSimpleDoc(); } diff --git a/apache-solrj/pom.xml b/apache-solrj/pom.xml index 0c7eaababf..ea696b024b 100644 --- a/apache-solrj/pom.xml +++ b/apache-solrj/pom.xml @@ -1,9 +1,9 @@ - 4.0.0 - com.baeldung - apache-solrj - 0.0.1-SNAPSHOT + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + com.baeldung + apache-solrj + 0.0.1-SNAPSHOT jar apache-solrj @@ -11,13 +11,13 @@ com.baeldung parent-modules 1.0.0-SNAPSHOT - + - - - org.apache.solr - solr-solrj - 6.4.0 - - + + + org.apache.solr + solr-solrj + 6.4.0 + + \ No newline at end of file diff --git a/apache-thrift/pom.xml b/apache-thrift/pom.xml index 271dfeb88f..91e51a7092 100644 --- a/apache-thrift/pom.xml +++ b/apache-thrift/pom.xml @@ -10,8 +10,8 @@ com.baeldung parent-modules 1.0.0-SNAPSHOT - - + + 1.8 0.10.0 @@ -28,7 +28,7 @@ commons-logging commons-logging - + @@ -48,7 +48,9 @@ generate-sources - add-source + + add-source + generated diff --git a/apache-thrift/src/test/java/com/baeldung/thrift/CrossPlatformServiceTest.java b/apache-thrift/src/test/java/com/baeldung/thrift/CrossPlatformServiceIntegrationTest.java similarity index 94% rename from apache-thrift/src/test/java/com/baeldung/thrift/CrossPlatformServiceTest.java rename to apache-thrift/src/test/java/com/baeldung/thrift/CrossPlatformServiceIntegrationTest.java index 4ba9ef2914..7d4b41c400 100644 --- a/apache-thrift/src/test/java/com/baeldung/thrift/CrossPlatformServiceTest.java +++ b/apache-thrift/src/test/java/com/baeldung/thrift/CrossPlatformServiceIntegrationTest.java @@ -6,7 +6,7 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; -public class CrossPlatformServiceTest { +public class CrossPlatformServiceIntegrationTest { private CrossPlatformServiceServer server = new CrossPlatformServiceServer(); diff --git a/apache-velocity/pom.xml b/apache-velocity/pom.xml index 593ae6c188..69633ebbab 100644 --- a/apache-velocity/pom.xml +++ b/apache-velocity/pom.xml @@ -1,5 +1,5 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 com.baeldung @@ -13,8 +13,8 @@ com.baeldung parent-modules 1.0.0-SNAPSHOT - - + + 1.8 1.2 @@ -33,12 +33,7 @@ org.apache.velocity velocity-tools - ${velocity-tools-version} - - - org.slf4j - jcl-over-slf4j - ${org.slf4j.version} + ${velocity-tools-version} org.apache.httpcomponents @@ -50,7 +45,7 @@ commons-logging commons-logging - + diff --git a/autovalue/pom.xml b/autovalue/pom.xml index 0f75261504..9e6aeff866 100644 --- a/autovalue/pom.xml +++ b/autovalue/pom.xml @@ -10,7 +10,7 @@ com.baeldung parent-modules 1.0.0-SNAPSHOT - + diff --git a/aws/pom.xml b/aws/pom.xml index 10a2835763..8d60240c87 100644 --- a/aws/pom.xml +++ b/aws/pom.xml @@ -1,81 +1,81 @@ - 4.0.0 - com.baeldung - aws - 0.1.0-SNAPSHOT - jar - aws + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + com.baeldung + aws + 0.1.0-SNAPSHOT + jar + aws - - com.baeldung - parent-modules - 1.0.0-SNAPSHOT - - - - 2.5 - 1.3.0 - 1.1.0 - 2.8.0 - + + com.baeldung + parent-modules + 1.0.0-SNAPSHOT + - - - com.amazonaws - aws-lambda-java-core - ${aws-lambda-java-core.version} - - - commons-logging - commons-logging - - - + + 2.5 + 1.3.0 + 1.1.0 + 2.8.0 + - - com.amazonaws - aws-lambda-java-events - ${aws-lambda-java-events.version} - - - commons-logging - commons-logging - - - + + + com.amazonaws + aws-lambda-java-core + ${aws-lambda-java-core.version} + + + commons-logging + commons-logging + + + - - commons-io - commons-io - ${commons-io.version} - + + com.amazonaws + aws-lambda-java-events + ${aws-lambda-java-events.version} + + + commons-logging + commons-logging + + + - - com.google.code.gson - gson - ${gson.version} - - + + commons-io + commons-io + ${commons-io.version} + - - - - org.apache.maven.plugins - maven-shade-plugin - 3.0.0 - - false - - - - package - - shade - - - - - - + + com.google.code.gson + gson + ${gson.version} + + + + + + + org.apache.maven.plugins + maven-shade-plugin + 3.0.0 + + false + + + + package + + shade + + + + + + \ No newline at end of file diff --git a/axon/pom.xml b/axon/pom.xml index 3f9106e0d5..97fe607cad 100644 --- a/axon/pom.xml +++ b/axon/pom.xml @@ -1,7 +1,6 @@ - + parent-modules com.baeldung diff --git a/axon/src/test/java/com/baeldung/axon/MessagesAggregateTest.java b/axon/src/test/java/com/baeldung/axon/MessagesAggregateIntegrationTest.java similarity index 96% rename from axon/src/test/java/com/baeldung/axon/MessagesAggregateTest.java rename to axon/src/test/java/com/baeldung/axon/MessagesAggregateIntegrationTest.java index bbeff18f27..ad099d2c2b 100644 --- a/axon/src/test/java/com/baeldung/axon/MessagesAggregateTest.java +++ b/axon/src/test/java/com/baeldung/axon/MessagesAggregateIntegrationTest.java @@ -12,7 +12,7 @@ import org.junit.Test; import java.util.UUID; -public class MessagesAggregateTest { +public class MessagesAggregateIntegrationTest { private FixtureConfiguration fixture; diff --git a/cdi/pom.xml b/cdi/pom.xml index 6b7a360760..da0672afde 100644 --- a/cdi/pom.xml +++ b/cdi/pom.xml @@ -11,13 +11,13 @@ com.baeldung parent-modules 1.0.0-SNAPSHOT - - + + org.springframework spring-core - ${spring.version} + ${spring.version} org.springframework diff --git a/core-java-9/src/test/java/com/baeldung/java9/Java9OptionalsStreamTest.java b/core-java-9/src/test/java/com/baeldung/java9/Java9OptionalsStreamUnitTest.java similarity index 97% rename from core-java-9/src/test/java/com/baeldung/java9/Java9OptionalsStreamTest.java rename to core-java-9/src/test/java/com/baeldung/java9/Java9OptionalsStreamUnitTest.java index a6060b1a9d..7a28a4b977 100644 --- a/core-java-9/src/test/java/com/baeldung/java9/Java9OptionalsStreamTest.java +++ b/core-java-9/src/test/java/com/baeldung/java9/Java9OptionalsStreamUnitTest.java @@ -10,7 +10,7 @@ import java.util.stream.Stream; import org.junit.Test; -public class Java9OptionalsStreamTest { +public class Java9OptionalsStreamUnitTest { private static List> listOfOptionals = Arrays.asList(Optional.empty(), Optional.of("foo"), Optional.empty(), Optional.of("bar")); diff --git a/core-java-9/src/test/java/com/baeldung/java9/MultiResultionImageTest.java b/core-java-9/src/test/java/com/baeldung/java9/MultiResultionImageUnitTest.java similarity index 94% rename from core-java-9/src/test/java/com/baeldung/java9/MultiResultionImageTest.java rename to core-java-9/src/test/java/com/baeldung/java9/MultiResultionImageUnitTest.java index c0a5042b58..2c383a44b4 100644 --- a/core-java-9/src/test/java/com/baeldung/java9/MultiResultionImageTest.java +++ b/core-java-9/src/test/java/com/baeldung/java9/MultiResultionImageUnitTest.java @@ -11,7 +11,7 @@ import java.util.List; import org.junit.Test; -public class MultiResultionImageTest { +public class MultiResultionImageUnitTest { @Test public void baseMultiResImageTest() { diff --git a/core-java-9/src/test/java/com/baeldung/java9/OptionalToStreamTest.java b/core-java-9/src/test/java/com/baeldung/java9/OptionalToStreamUnitTest.java similarity index 93% rename from core-java-9/src/test/java/com/baeldung/java9/OptionalToStreamTest.java rename to core-java-9/src/test/java/com/baeldung/java9/OptionalToStreamUnitTest.java index 56b4bb7b8c..adb3171eec 100644 --- a/core-java-9/src/test/java/com/baeldung/java9/OptionalToStreamTest.java +++ b/core-java-9/src/test/java/com/baeldung/java9/OptionalToStreamUnitTest.java @@ -6,7 +6,7 @@ import java.util.stream.Stream; import org.junit.Test; import static org.junit.Assert.assertEquals; -public class OptionalToStreamTest { +public class OptionalToStreamUnitTest { @Test public void testOptionalToStream() { diff --git a/core-java-9/src/test/java/com/baeldung/java9/SetExamplesTest.java b/core-java-9/src/test/java/com/baeldung/java9/SetExamplesUnitTest.java similarity index 94% rename from core-java-9/src/test/java/com/baeldung/java9/SetExamplesTest.java rename to core-java-9/src/test/java/com/baeldung/java9/SetExamplesUnitTest.java index 0f8db83d9c..9e7e8e6e4b 100644 --- a/core-java-9/src/test/java/com/baeldung/java9/SetExamplesTest.java +++ b/core-java-9/src/test/java/com/baeldung/java9/SetExamplesUnitTest.java @@ -5,7 +5,7 @@ import org.junit.Test; import static org.junit.Assert.assertEquals; -public class SetExamplesTest { +public class SetExamplesUnitTest { @Test public void testUnmutableSet() { diff --git a/core-java-9/src/test/java/com/baeldung/java9/concurrent/future/CompletableFutureTest.java b/core-java-9/src/test/java/com/baeldung/java9/concurrent/future/CompletableFutureUnitTest.java similarity index 98% rename from core-java-9/src/test/java/com/baeldung/java9/concurrent/future/CompletableFutureTest.java rename to core-java-9/src/test/java/com/baeldung/java9/concurrent/future/CompletableFutureUnitTest.java index b71c211177..5d52acb284 100644 --- a/core-java-9/src/test/java/com/baeldung/java9/concurrent/future/CompletableFutureTest.java +++ b/core-java-9/src/test/java/com/baeldung/java9/concurrent/future/CompletableFutureUnitTest.java @@ -9,7 +9,7 @@ import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; import org.junit.Test; -public class CompletableFutureTest { +public class CompletableFutureUnitTest { @Test public void testDelay () throws Exception { Object input = new Object(); diff --git a/core-java-9/src/test/java/com/baeldung/java9/httpclient/SimpleHttpRequestsTest.java b/core-java-9/src/test/java/com/baeldung/java9/httpclient/SimpleHttpRequestsUnitTest.java similarity index 96% rename from core-java-9/src/test/java/com/baeldung/java9/httpclient/SimpleHttpRequestsTest.java rename to core-java-9/src/test/java/com/baeldung/java9/httpclient/SimpleHttpRequestsUnitTest.java index 442a18cbf3..4a704139a1 100644 --- a/core-java-9/src/test/java/com/baeldung/java9/httpclient/SimpleHttpRequestsTest.java +++ b/core-java-9/src/test/java/com/baeldung/java9/httpclient/SimpleHttpRequestsUnitTest.java @@ -24,7 +24,7 @@ import javax.net.ssl.SSLParameters; import org.junit.Before; import org.junit.Test; -public class SimpleHttpRequestsTest { +public class SimpleHttpRequestsUnitTest { private URI httpURI; diff --git a/core-java-9/src/test/java/com/baeldung/java9/language/DiamondTest.java b/core-java-9/src/test/java/com/baeldung/java9/language/DiamondUnitTest.java similarity index 92% rename from core-java-9/src/test/java/com/baeldung/java9/language/DiamondTest.java rename to core-java-9/src/test/java/com/baeldung/java9/language/DiamondUnitTest.java index 33da6486f4..4868d37b6a 100644 --- a/core-java-9/src/test/java/com/baeldung/java9/language/DiamondTest.java +++ b/core-java-9/src/test/java/com/baeldung/java9/language/DiamondUnitTest.java @@ -2,7 +2,7 @@ package com.baeldung.java9.language; import org.junit.Test; -public class DiamondTest { +public class DiamondUnitTest { static class FooClass { FooClass(X x) { diff --git a/core-java-9/src/test/java/com/baeldung/java9/language/PrivateInterfaceTest.java b/core-java-9/src/test/java/com/baeldung/java9/language/PrivateInterfaceUnitTest.java similarity index 82% rename from core-java-9/src/test/java/com/baeldung/java9/language/PrivateInterfaceTest.java rename to core-java-9/src/test/java/com/baeldung/java9/language/PrivateInterfaceUnitTest.java index 29ef3930f8..fb00fe45c3 100644 --- a/core-java-9/src/test/java/com/baeldung/java9/language/PrivateInterfaceTest.java +++ b/core-java-9/src/test/java/com/baeldung/java9/language/PrivateInterfaceUnitTest.java @@ -3,7 +3,7 @@ package com.baeldung.java9.language; import com.baeldung.java9.language.PrivateInterface; import org.junit.Test; -public class PrivateInterfaceTest { +public class PrivateInterfaceUnitTest { @Test public void test() { diff --git a/core-java-9/src/test/java/com/baeldung/java9/language/TryWithResourcesTest.java b/core-java-9/src/test/java/com/baeldung/java9/language/TryWithResourcesUnitTest.java similarity index 94% rename from core-java-9/src/test/java/com/baeldung/java9/language/TryWithResourcesTest.java rename to core-java-9/src/test/java/com/baeldung/java9/language/TryWithResourcesUnitTest.java index 6bec3125cc..d623bd9965 100644 --- a/core-java-9/src/test/java/com/baeldung/java9/language/TryWithResourcesTest.java +++ b/core-java-9/src/test/java/com/baeldung/java9/language/TryWithResourcesUnitTest.java @@ -3,7 +3,7 @@ package com.baeldung.java9.language; import static org.junit.Assert.assertEquals; import org.junit.Test; -public class TryWithResourcesTest { +public class TryWithResourcesUnitTest { static int closeCount = 0; diff --git a/core-java-9/src/test/java/com/baeldung/java9/language/collections/ListFactoryMethodsTest.java b/core-java-9/src/test/java/com/baeldung/java9/language/collections/ListFactoryMethodsUnitTest.java similarity index 97% rename from core-java-9/src/test/java/com/baeldung/java9/language/collections/ListFactoryMethodsTest.java rename to core-java-9/src/test/java/com/baeldung/java9/language/collections/ListFactoryMethodsUnitTest.java index 8e19d00b6a..8f7c588c15 100644 --- a/core-java-9/src/test/java/com/baeldung/java9/language/collections/ListFactoryMethodsTest.java +++ b/core-java-9/src/test/java/com/baeldung/java9/language/collections/ListFactoryMethodsUnitTest.java @@ -9,7 +9,7 @@ import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; -public class ListFactoryMethodsTest { +public class ListFactoryMethodsUnitTest { @Test public void whenListCreated_thenSuccess() { diff --git a/core-java-9/src/test/java/com/baeldung/java9/language/collections/MapFactoryMethodsTest.java b/core-java-9/src/test/java/com/baeldung/java9/language/collections/MapFactoryMethodsUnitTest.java similarity index 97% rename from core-java-9/src/test/java/com/baeldung/java9/language/collections/MapFactoryMethodsTest.java rename to core-java-9/src/test/java/com/baeldung/java9/language/collections/MapFactoryMethodsUnitTest.java index 13469ff93d..dba5b76dfb 100644 --- a/core-java-9/src/test/java/com/baeldung/java9/language/collections/MapFactoryMethodsTest.java +++ b/core-java-9/src/test/java/com/baeldung/java9/language/collections/MapFactoryMethodsUnitTest.java @@ -8,7 +8,7 @@ import org.junit.Test; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; -public class MapFactoryMethodsTest { +public class MapFactoryMethodsUnitTest { @Test public void whenMapCreated_thenSuccess() { diff --git a/core-java-9/src/test/java/com/baeldung/java9/language/collections/SetFactoryMethodsTest.java b/core-java-9/src/test/java/com/baeldung/java9/language/collections/SetFactoryMethodsUnitTest.java similarity index 97% rename from core-java-9/src/test/java/com/baeldung/java9/language/collections/SetFactoryMethodsTest.java rename to core-java-9/src/test/java/com/baeldung/java9/language/collections/SetFactoryMethodsUnitTest.java index b8537d7c82..82e0fed917 100644 --- a/core-java-9/src/test/java/com/baeldung/java9/language/collections/SetFactoryMethodsTest.java +++ b/core-java-9/src/test/java/com/baeldung/java9/language/collections/SetFactoryMethodsUnitTest.java @@ -9,7 +9,7 @@ import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; -public class SetFactoryMethodsTest { +public class SetFactoryMethodsUnitTest { @Test public void whenSetCreated_thenSuccess() { diff --git a/core-java-9/src/test/java/com/baeldung/java9/language/stream/CollectorImprovementTest.java b/core-java-9/src/test/java/com/baeldung/java9/language/stream/CollectorImprovementUnitTest.java similarity index 97% rename from core-java-9/src/test/java/com/baeldung/java9/language/stream/CollectorImprovementTest.java rename to core-java-9/src/test/java/com/baeldung/java9/language/stream/CollectorImprovementUnitTest.java index ea76a76a5f..b3bef5edec 100644 --- a/core-java-9/src/test/java/com/baeldung/java9/language/stream/CollectorImprovementTest.java +++ b/core-java-9/src/test/java/com/baeldung/java9/language/stream/CollectorImprovementUnitTest.java @@ -8,7 +8,7 @@ import java.util.function.Function; import static org.junit.Assert.assertEquals; -public class CollectorImprovementTest { +public class CollectorImprovementUnitTest { @Test public void givenList_whenSatifyPredicate_thenMapValueWithOccurences() { List numbers = List.of(1, 2, 3, 5, 5); diff --git a/core-java-9/src/test/java/com/baeldung/java9/language/stream/StreamFeaturesTest.java b/core-java-9/src/test/java/com/baeldung/java9/language/stream/StreamFeaturesUnitTest.java similarity index 98% rename from core-java-9/src/test/java/com/baeldung/java9/language/stream/StreamFeaturesTest.java rename to core-java-9/src/test/java/com/baeldung/java9/language/stream/StreamFeaturesUnitTest.java index 72d17498a9..97e391e5b0 100644 --- a/core-java-9/src/test/java/com/baeldung/java9/language/stream/StreamFeaturesTest.java +++ b/core-java-9/src/test/java/com/baeldung/java9/language/stream/StreamFeaturesUnitTest.java @@ -12,7 +12,7 @@ import java.util.stream.Stream; import static java.lang.Integer.*; import static org.junit.Assert.assertEquals; -public class StreamFeaturesTest { +public class StreamFeaturesUnitTest { public static class TakeAndDropWhileTest { diff --git a/core-java-9/src/test/java/com/baeldung/java9/process/ProcessAPIEnhancementsTest.java b/core-java-9/src/test/java/com/baeldung/java9/process/ProcessAPIEnhancementsUnitTest.java similarity index 99% rename from core-java-9/src/test/java/com/baeldung/java9/process/ProcessAPIEnhancementsTest.java rename to core-java-9/src/test/java/com/baeldung/java9/process/ProcessAPIEnhancementsUnitTest.java index 1129a10d17..9a227a9c8f 100644 --- a/core-java-9/src/test/java/com/baeldung/java9/process/ProcessAPIEnhancementsTest.java +++ b/core-java-9/src/test/java/com/baeldung/java9/process/ProcessAPIEnhancementsUnitTest.java @@ -16,7 +16,7 @@ import org.slf4j.LoggerFactory; * Created by sanaulla on 2/23/2017. */ -public class ProcessAPIEnhancementsTest { +public class ProcessAPIEnhancementsUnitTest { Logger log = LoggerFactory.getLogger(ProcessAPIEnhancementsTest.class); diff --git a/core-java-9/src/test/java/com/baeldung/java9/process/ProcessApi.java b/core-java-9/src/test/java/com/baeldung/java9/process/ProcessApiUnitTest.java similarity index 96% rename from core-java-9/src/test/java/com/baeldung/java9/process/ProcessApi.java rename to core-java-9/src/test/java/com/baeldung/java9/process/ProcessApiUnitTest.java index 9c9951bc54..e125f10da7 100644 --- a/core-java-9/src/test/java/com/baeldung/java9/process/ProcessApi.java +++ b/core-java-9/src/test/java/com/baeldung/java9/process/ProcessApiUnitTest.java @@ -20,7 +20,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -public class ProcessApi { +public class ProcessApiUnitTest { @Before public void init() { diff --git a/core-java-9/src/test/java/com/baeldung/java9/reactive/BaeldungBatchSubscriberImplTest.java b/core-java-9/src/test/java/com/baeldung/java9/reactive/BaeldungBatchSubscriberImplIntegrationTest.java similarity index 94% rename from core-java-9/src/test/java/com/baeldung/java9/reactive/BaeldungBatchSubscriberImplTest.java rename to core-java-9/src/test/java/com/baeldung/java9/reactive/BaeldungBatchSubscriberImplIntegrationTest.java index 388d3efdd8..cbc3946999 100644 --- a/core-java-9/src/test/java/com/baeldung/java9/reactive/BaeldungBatchSubscriberImplTest.java +++ b/core-java-9/src/test/java/com/baeldung/java9/reactive/BaeldungBatchSubscriberImplIntegrationTest.java @@ -13,7 +13,7 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.Stopwatch; -public class BaeldungBatchSubscriberImplTest { +public class BaeldungBatchSubscriberImplIntegrationTest { private static final int ITEM_SIZE = 10; private SubmissionPublisher publisher; diff --git a/core-java-9/src/test/java/com/baeldung/java9/reactive/BaeldungSubscriberImplTest.java b/core-java-9/src/test/java/com/baeldung/java9/reactive/BaeldungSubscriberImplIntegrationTest.java similarity index 95% rename from core-java-9/src/test/java/com/baeldung/java9/reactive/BaeldungSubscriberImplTest.java rename to core-java-9/src/test/java/com/baeldung/java9/reactive/BaeldungSubscriberImplIntegrationTest.java index 5638c0a431..6fd093b362 100644 --- a/core-java-9/src/test/java/com/baeldung/java9/reactive/BaeldungSubscriberImplTest.java +++ b/core-java-9/src/test/java/com/baeldung/java9/reactive/BaeldungSubscriberImplIntegrationTest.java @@ -13,7 +13,7 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.Stopwatch; -public class BaeldungSubscriberImplTest { +public class BaeldungSubscriberImplIntegrationTest { private static final int ITEM_SIZE = 10; private SubmissionPublisher publisher; diff --git a/core-java-9/src/test/java/com/baeldung/java9/stackwalker/StackWalkerDemoTest.java b/core-java-9/src/test/java/com/baeldung/java9/stackwalker/StackWalkerDemoUnitTest.java similarity index 89% rename from core-java-9/src/test/java/com/baeldung/java9/stackwalker/StackWalkerDemoTest.java rename to core-java-9/src/test/java/com/baeldung/java9/stackwalker/StackWalkerDemoUnitTest.java index b523b7dfb2..584d59d9cd 100644 --- a/core-java-9/src/test/java/com/baeldung/java9/stackwalker/StackWalkerDemoTest.java +++ b/core-java-9/src/test/java/com/baeldung/java9/stackwalker/StackWalkerDemoUnitTest.java @@ -2,7 +2,7 @@ package com.baeldung.java9.stackwalker; import org.junit.Test; -public class StackWalkerDemoTest { +public class StackWalkerDemoUnitTest { @Test public void giveStalkWalker_whenWalkingTheStack_thenShowStackFrames() { diff --git a/core-java/README.md b/core-java/README.md index ead65ab166..c17677c23c 100644 --- a/core-java/README.md +++ b/core-java/README.md @@ -101,3 +101,4 @@ - [HashSet and TreeSet Comparison](http://www.baeldung.com/java-hashset-vs-treeset) - [How to Perform a Simple HTTP Request in Java](http://www.baeldung.com/java-http-request) - [Call Methods at Runtime Using Java Reflection](http://www.baeldung.com/java-method-reflection) +- [Guide to DelayQueue](http://www.baeldung.com/java-delay-queue) diff --git a/core-java/pom.xml b/core-java/pom.xml index 6f00618330..bcec20b1e1 100644 --- a/core-java/pom.xml +++ b/core-java/pom.xml @@ -1,363 +1,392 @@ - 4.0.0 - com.baeldung - core-java - 0.1.0-SNAPSHOT - jar + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + com.baeldung + core-java + 0.1.0-SNAPSHOT + jar - core-java + core-java - - com.baeldung - parent-modules - 1.0.0-SNAPSHOT - - - - - - - net.sourceforge.collections - collections-generic - ${collections-generic.version} - - - com.google.guava - guava - ${guava.version} - + - - org.apache.commons - commons-collections4 - ${commons-collections4.version} - + + + net.sourceforge.collections + collections-generic + ${collections-generic.version} + + + com.google.guava + guava + ${guava.version} + - - commons-io - commons-io - ${commons-io.version} - + + org.apache.commons + commons-collections4 + ${commons-collections4.version} + - - org.apache.commons - commons-lang3 - ${commons-lang3.version} - + + commons-io + commons-io + ${commons-io.version} + - - org.apache.commons - commons-math3 - ${commons-math3.version} - + + org.apache.commons + commons-lang3 + ${commons-lang3.version} + - - org.bouncycastle - bcprov-jdk15on - ${bouncycastle.version} - + + org.apache.commons + commons-math3 + ${commons-math3.version} + - - org.unix4j - unix4j-command - ${unix4j.version} - + + org.bouncycastle + bcprov-jdk15on + ${bouncycastle.version} + - - com.googlecode.grep4j - grep4j - ${grep4j.version} - - + + org.unix4j + unix4j-command + ${unix4j.version} + - + + com.googlecode.grep4j + grep4j + ${grep4j.version} + + - - com.fasterxml.jackson.core - jackson-databind - ${jackson.version} - + - - - org.slf4j - jcl-over-slf4j - ${org.slf4j.version} - - - - org.projectlombok - lombok - ${lombok.version} - provided - - - - - mysql - mysql-connector-java - ${mysql.version} - + + com.fasterxml.jackson.core + jackson-databind + ${jackson.version} + - + - - org.hamcrest - hamcrest-all - 1.3 - test - + + org.slf4j + slf4j-api + ${org.slf4j.version} + + + ch.qos.logback + logback-classic + ${logback.version} + + + + org.slf4j + jcl-over-slf4j + ${org.slf4j.version} + + + + org.slf4j + log4j-over-slf4j + ${org.slf4j.version} + + + org.projectlombok + lombok + ${lombok.version} + provided + - - org.hamcrest - hamcrest-core - ${org.hamcrest.version} - test - - - org.hamcrest - hamcrest-library - ${org.hamcrest.version} - test - + - - org.assertj - assertj-core - ${assertj.version} - test - + + org.hamcrest + hamcrest-all + 1.3 + test + - - org.mockito - mockito-core - ${mockito.version} - test - - - com.jayway.awaitility - awaitility - ${avaitility.version} - test - + + junit + junit + ${junit.version} + test + + + + org.hamcrest + hamcrest-core + ${org.hamcrest.version} + test + + + org.hamcrest + hamcrest-library + ${org.hamcrest.version} + test + + + + org.assertj + assertj-core + ${assertj.version} + test + + + + org.mockito + mockito-core + ${mockito.version} + test + + + com.jayway.awaitility + awaitility + ${avaitility.version} + test + + + + commons-codec + commons-codec + ${commons-codec.version} + + + + org.javamoney + moneta + 1.1 + - - commons-codec - commons-codec - ${commons-codec.version} - - - - org.javamoney - moneta - 1.1 - org.owasp.esapi esapi 2.1.0.1 - - - commons-logging - commons-logging - - - + - - org.owasp.esapi - esapi - 2.1.0.1 - - - commons-logging - commons-logging - - - + - + + core-java + + + src/main/resources + true + + - - core-java - - - src/main/resources - true - - + - - - org.apache.maven.plugins - maven-dependency-plugin - - - copy-dependencies - prepare-package - - copy-dependencies - - - ${project.build.directory}/libs - - - - + + org.apache.maven.plugins + maven-compiler-plugin + ${maven-compiler-plugin.version} + + 1.8 + 1.8 + + - - org.apache.maven.plugins - maven-jar-plugin - - - - true - libs/ - org.baeldung.executable.ExecutableMavenJar - - - - - - org.apache.maven.plugins - maven-assembly-plugin - - - package - - single - - - ${project.basedir} - - - org.baeldung.executable.ExecutableMavenJar - - - - jar-with-dependencies - - - - - - - org.apache.maven.plugins - maven-shade-plugin - - - - shade - - - true - - - org.baeldung.executable.ExecutableMavenJar - - - - - - - - com.jolira - onejar-maven-plugin - - - - org.baeldung.executable.ExecutableMavenJar - true - ${project.build.finalName}-onejar.${project.packaging} - - - one-jar - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - - repackage - - - spring-boot - org.baeldung.executable.ExecutableMavenJar - - - - - + + org.apache.maven.plugins + maven-surefire-plugin + + + **/*IntegrationTest.java + **/*LongRunningUnitTest.java + **/*ManualTest.java + + true + + - + + org.apache.maven.plugins + maven-dependency-plugin + + + copy-dependencies + prepare-package + + copy-dependencies + + + ${project.build.directory}/libs + + + + - - - integration - - - - org.apache.maven.plugins - maven-surefire-plugin - - - integration-test - - test - - - - **/*ManualTest.java - - - **/*IntegrationTest.java - - - - - - - json - - - - - - - + + org.apache.maven.plugins + maven-jar-plugin + + + + true + libs/ + org.baeldung.executable.ExecutableMavenJar + + + + - - - 2.8.5 - - - 6.0.6 + + org.apache.maven.plugins + maven-assembly-plugin + + + package + + single + + + ${project.basedir} + + + org.baeldung.executable.ExecutableMavenJar + + + + jar-with-dependencies + + + + + - - 21.0 - 3.5 - 1.55 - 1.10 - 3.6.1 - 2.5 - 4.1 - 4.01 - 0.4 - 1.8.7 - 1.16.12 + + org.apache.maven.plugins + maven-shade-plugin + + + + shade + + + true + + + org.baeldung.executable.ExecutableMavenJar + + + + + + - - 1.3 - 1.10.19 - 3.6.1 - 1.7.0 + + com.jolira + onejar-maven-plugin + + + + org.baeldung.executable.ExecutableMavenJar + true + ${project.build.finalName}-onejar.${project.packaging} + + + one-jar + + + + - + + org.springframework.boot + spring-boot-maven-plugin + + + + repackage + + + spring-boot + org.baeldung.executable.ExecutableMavenJar + + + + - + + + + + + + integration + + + + org.apache.maven.plugins + maven-surefire-plugin + + + integration-test + + test + + + + **/*ManualTest.java + + + **/*IntegrationTest.java + + + + + + + json + + + + + + + + + + + 2.8.5 + + + 1.7.21 + 1.1.7 + + + 21.0 + 3.5 + 1.55 + 1.10 + 3.6.1 + 2.5 + 4.1 + 4.01 + 0.4 + 1.8.7 + 1.16.12 + + + 1.3 + 4.12 + 1.10.19 + 3.6.1 + 1.7.0 + + + 3.6.0 + 2.19.1 + + + + \ No newline at end of file diff --git a/core-java/src/main/java/com/baeldung/concurrent/delayqueue/DelayObject.java b/core-java/src/main/java/com/baeldung/concurrent/delayqueue/DelayObject.java new file mode 100644 index 0000000000..aa4ca58d6a --- /dev/null +++ b/core-java/src/main/java/com/baeldung/concurrent/delayqueue/DelayObject.java @@ -0,0 +1,35 @@ +package com.baeldung.concurrent.delayqueue; + +import com.google.common.primitives.Ints; + +import java.util.concurrent.Delayed; +import java.util.concurrent.TimeUnit; + +public class DelayObject implements Delayed { + private String data; + private long startTime; + + public DelayObject(String data, long delayInMilliseconds) { + this.data = data; + this.startTime = System.currentTimeMillis() + delayInMilliseconds; + } + + @Override + public long getDelay(TimeUnit unit) { + long diff = startTime - System.currentTimeMillis(); + return unit.convert(diff, TimeUnit.MILLISECONDS); + } + + @Override + public int compareTo(Delayed o) { + return Ints.saturatedCast(this.startTime - ((DelayObject) o).startTime); + } + + @Override + public String toString() { + return "{" + + "data='" + data + '\'' + + ", startTime=" + startTime + + '}'; + } +} \ No newline at end of file diff --git a/core-java/src/main/java/com/baeldung/concurrent/delayqueue/DelayQueueConsumer.java b/core-java/src/main/java/com/baeldung/concurrent/delayqueue/DelayQueueConsumer.java new file mode 100644 index 0000000000..8a969bf7aa --- /dev/null +++ b/core-java/src/main/java/com/baeldung/concurrent/delayqueue/DelayQueueConsumer.java @@ -0,0 +1,30 @@ +package com.baeldung.concurrent.delayqueue; + +import java.util.concurrent.BlockingQueue; +import java.util.concurrent.atomic.AtomicInteger; + + +public class DelayQueueConsumer implements Runnable { + private BlockingQueue queue; + private final Integer numberOfElementsToTake; + public final AtomicInteger numberOfConsumedElements = new AtomicInteger(); + + public DelayQueueConsumer(BlockingQueue queue, Integer numberOfElementsToTake) { + this.queue = queue; + this.numberOfElementsToTake = numberOfElementsToTake; + } + + + @Override + public void run() { + for (int i = 0; i < numberOfElementsToTake; i++) { + try { + DelayObject object = queue.take(); + numberOfConsumedElements.incrementAndGet(); + System.out.println("Consumer take: " + object); + } catch (InterruptedException e) { + e.printStackTrace(); + } + } + } +} \ No newline at end of file diff --git a/core-java/src/main/java/com/baeldung/concurrent/delayqueue/DelayQueueProducer.java b/core-java/src/main/java/com/baeldung/concurrent/delayqueue/DelayQueueProducer.java new file mode 100644 index 0000000000..617f19b9ac --- /dev/null +++ b/core-java/src/main/java/com/baeldung/concurrent/delayqueue/DelayQueueProducer.java @@ -0,0 +1,34 @@ +package com.baeldung.concurrent.delayqueue; + +import java.util.UUID; +import java.util.concurrent.BlockingQueue; + + +public class DelayQueueProducer implements Runnable { + private BlockingQueue queue; + private final Integer numberOfElementsToProduce; + private final Integer delayOfEachProducedMessageMilliseconds; + + public DelayQueueProducer(BlockingQueue queue, + Integer numberOfElementsToProduce, + Integer delayOfEachProducedMessageMilliseconds) { + this.queue = queue; + this.numberOfElementsToProduce = numberOfElementsToProduce; + this.delayOfEachProducedMessageMilliseconds = delayOfEachProducedMessageMilliseconds; + } + + @Override + public void run() { + for (int i = 0; i < numberOfElementsToProduce; i++) { + DelayObject object + = new DelayObject(UUID.randomUUID().toString(), delayOfEachProducedMessageMilliseconds); + System.out.println("Put object = " + object); + try { + queue.put(object); + Thread.sleep(500); + } catch (InterruptedException ie) { + ie.printStackTrace(); + } + } + } +} \ No newline at end of file diff --git a/core-java/src/main/java/com/baeldung/serialization/Address.java b/core-java/src/main/java/com/baeldung/serialization/Address.java new file mode 100644 index 0000000000..524ecb1ffc --- /dev/null +++ b/core-java/src/main/java/com/baeldung/serialization/Address.java @@ -0,0 +1,15 @@ +package com.baeuldung.serialization; + +public class Address { + + private int houseNumber; + + public int getHouseNumber() { + return houseNumber; + } + + public void setHouseNumber(int houseNumber) { + this.houseNumber = houseNumber; + } + +} diff --git a/core-java/src/main/java/com/baeldung/serialization/Employee.java b/core-java/src/main/java/com/baeldung/serialization/Employee.java new file mode 100644 index 0000000000..69beeb0b49 --- /dev/null +++ b/core-java/src/main/java/com/baeldung/serialization/Employee.java @@ -0,0 +1,44 @@ +package com.baeuldung.serialization; + +import java.io.IOException; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; +import java.io.Serializable; + +public class Employee implements Serializable { + + private static final long serialVersionUID = 1L; + + private transient Address address; // not an serializable object + private Person person; + + public Address getAddress() { + return address; + } + + public void setAddress(Address address) { + this.address = address; + } + + public Person getPerson() { + return person; + } + + public void setPerson(Person person) { + this.person = person; + } + + private void writeObject(ObjectOutputStream oos) throws IOException { + oos.defaultWriteObject(); + oos.writeObject(address.getHouseNumber()); + } + + private void readObject(ObjectInputStream ois) throws ClassNotFoundException, IOException { + ois.defaultReadObject(); + Integer houseNumber = (Integer) ois.readObject(); + Address a = new Address(); + a.setHouseNumber(houseNumber); + this.setAddress(a); + } + +} diff --git a/core-java/src/main/java/com/baeldung/serialization/Person.java b/core-java/src/main/java/com/baeldung/serialization/Person.java new file mode 100644 index 0000000000..23d0601e03 --- /dev/null +++ b/core-java/src/main/java/com/baeldung/serialization/Person.java @@ -0,0 +1,30 @@ +package com.baeuldung.serialization; +import java.io.Serializable; + +public class Person implements Serializable { + + /** + * + */ + private static final long serialVersionUID = 1L; + + private int age; + private String name; + + public int getAge() { + return age; + } + + public void setAge(int age) { + this.age = age; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + +} diff --git a/core-java/src/main/java/com/baeldung/stackoverflowerror/RecursionWithCorrectTerminationCondition.java b/core-java/src/main/java/com/baeldung/stackoverflowerror/RecursionWithCorrectTerminationCondition.java index 0c0c392532..16d771f389 100644 --- a/core-java/src/main/java/com/baeldung/stackoverflowerror/RecursionWithCorrectTerminationCondition.java +++ b/core-java/src/main/java/com/baeldung/stackoverflowerror/RecursionWithCorrectTerminationCondition.java @@ -1,7 +1,7 @@ package com.baeldung.stackoverflowerror; public class RecursionWithCorrectTerminationCondition { - public static int calculateFactorial(final int number) { + public int calculateFactorial(final int number) { return number <= 1 ? 1 : number * calculateFactorial(number - 1); } } diff --git a/core-java/src/main/java/com/baeldung/string/StringHelper.java b/core-java/src/main/java/com/baeldung/string/StringHelper.java index ad2a0b3419..adf8d70531 100644 --- a/core-java/src/main/java/com/baeldung/string/StringHelper.java +++ b/core-java/src/main/java/com/baeldung/string/StringHelper.java @@ -21,6 +21,10 @@ public class StringHelper { public static String removeLastCharRegexOptional(String s) { return Optional.ofNullable(s) .map(str -> str.replaceAll(".$", "")) +<<<<<<< HEAD .orElse(s); +======= + .orElse(null); +>>>>>>> refs/remotes/eugenp/master } } diff --git a/core-java/src/main/resources/datasource.properties b/core-java/src/main/resources/datasource.properties new file mode 100644 index 0000000000..61df0d45f7 --- /dev/null +++ b/core-java/src/main/resources/datasource.properties @@ -0,0 +1,6 @@ +dataSourceClassName=//TBD +dataSource.user=//TBD +dataSource.password=//TBD +dataSource.databaseName=//TBD +dataSource.portNumber=//TBD +dataSource.serverName=//TBD \ No newline at end of file diff --git a/core-java/src/test/java/com/baeldung/arraycopy/ArrayCopyUtilTest.java b/core-java/src/test/java/com/baeldung/arraycopy/ArrayCopyUtilUnitTest.java similarity index 99% rename from core-java/src/test/java/com/baeldung/arraycopy/ArrayCopyUtilTest.java rename to core-java/src/test/java/com/baeldung/arraycopy/ArrayCopyUtilUnitTest.java index 2235e55338..6b6f5dbe2a 100644 --- a/core-java/src/test/java/com/baeldung/arraycopy/ArrayCopyUtilTest.java +++ b/core-java/src/test/java/com/baeldung/arraycopy/ArrayCopyUtilUnitTest.java @@ -9,7 +9,7 @@ import org.junit.Test; import java.util.Arrays; -public class ArrayCopyUtilTest { +public class ArrayCopyUtilUnitTest { private static Employee[] employees; private static final int MAX = 2; diff --git a/core-java/src/test/java/com/baeldung/concurrent/accumulator/LongAccumulatorTest.java b/core-java/src/test/java/com/baeldung/concurrent/accumulator/LongAccumulatorUnitTest.java similarity index 97% rename from core-java/src/test/java/com/baeldung/concurrent/accumulator/LongAccumulatorTest.java rename to core-java/src/test/java/com/baeldung/concurrent/accumulator/LongAccumulatorUnitTest.java index 3a0092cf24..11c27ff980 100644 --- a/core-java/src/test/java/com/baeldung/concurrent/accumulator/LongAccumulatorTest.java +++ b/core-java/src/test/java/com/baeldung/concurrent/accumulator/LongAccumulatorUnitTest.java @@ -11,7 +11,7 @@ import java.util.stream.IntStream; import static junit.framework.TestCase.assertEquals; -public class LongAccumulatorTest { +public class LongAccumulatorUnitTest { @Test public void givenLongAccumulator_whenApplyActionOnItFromMultipleThrads_thenShouldProduceProperResult() throws InterruptedException { diff --git a/core-java/src/test/java/com/baeldung/concurrent/adder/LongAdderTest.java b/core-java/src/test/java/com/baeldung/concurrent/adder/LongAdderUnitTest.java similarity index 98% rename from core-java/src/test/java/com/baeldung/concurrent/adder/LongAdderTest.java rename to core-java/src/test/java/com/baeldung/concurrent/adder/LongAdderUnitTest.java index 77d1e9de27..34428a153c 100644 --- a/core-java/src/test/java/com/baeldung/concurrent/adder/LongAdderTest.java +++ b/core-java/src/test/java/com/baeldung/concurrent/adder/LongAdderUnitTest.java @@ -11,7 +11,7 @@ import java.util.stream.IntStream; import static com.jayway.awaitility.Awaitility.await; import static junit.framework.TestCase.assertEquals; -public class LongAdderTest { +public class LongAdderUnitTest { @Test public void givenMultipleThread_whenTheyWriteToSharedLongAdder_thenShouldCalculateSumForThem() throws InterruptedException { //given diff --git a/core-java/src/test/java/com/baeldung/concurrent/copyonwrite/CopyOnWriteArrayListTest.java b/core-java/src/test/java/com/baeldung/concurrent/copyonwrite/CopyOnWriteArrayListUnitTest.java similarity index 97% rename from core-java/src/test/java/com/baeldung/concurrent/copyonwrite/CopyOnWriteArrayListTest.java rename to core-java/src/test/java/com/baeldung/concurrent/copyonwrite/CopyOnWriteArrayListUnitTest.java index c71c193372..9111403155 100644 --- a/core-java/src/test/java/com/baeldung/concurrent/copyonwrite/CopyOnWriteArrayListTest.java +++ b/core-java/src/test/java/com/baeldung/concurrent/copyonwrite/CopyOnWriteArrayListUnitTest.java @@ -11,7 +11,7 @@ import java.util.concurrent.CopyOnWriteArrayList; import static org.assertj.core.api.Assertions.assertThat; -public class CopyOnWriteArrayListTest { +public class CopyOnWriteArrayListUnitTest { @Test public void givenCopyOnWriteList_whenIterateAndAddElementToUnderneathList_thenShouldNotChangeIterator() { diff --git a/core-java/src/test/java/com/baeldung/concurrent/delayqueue/DelayQueueIntegrationTest.java b/core-java/src/test/java/com/baeldung/concurrent/delayqueue/DelayQueueIntegrationTest.java new file mode 100644 index 0000000000..6490c6c094 --- /dev/null +++ b/core-java/src/test/java/com/baeldung/concurrent/delayqueue/DelayQueueIntegrationTest.java @@ -0,0 +1,78 @@ +package com.baeldung.concurrent.delayqueue; + +import org.junit.FixMethodOrder; +import org.junit.Test; +import org.junit.runners.MethodSorters; + +import java.util.concurrent.*; + +import static junit.framework.TestCase.assertEquals; + +@FixMethodOrder(MethodSorters.NAME_ASCENDING) +public class DelayQueueIntegrationTest { + @Test + public void givenDelayQueue_whenProduceElement_thenShouldConsumeAfterGivenDelay() throws InterruptedException { + //given + ExecutorService executor = Executors.newFixedThreadPool(2); + BlockingQueue queue = new DelayQueue<>(); + int numberOfElementsToProduce = 2; + int delayOfEachProducedMessageMilliseconds = 500; + DelayQueueConsumer consumer = new DelayQueueConsumer(queue, numberOfElementsToProduce); + DelayQueueProducer producer + = new DelayQueueProducer(queue, numberOfElementsToProduce, delayOfEachProducedMessageMilliseconds); + + //when + executor.submit(producer); + executor.submit(consumer); + + //then + executor.awaitTermination(5, TimeUnit.SECONDS); + executor.shutdown(); + assertEquals(consumer.numberOfConsumedElements.get(), numberOfElementsToProduce); + + } + + @Test + public void givenDelayQueue_whenProduceElementWithHugeDelay_thenConsumerWasNotAbleToConsumeMessageInGivenTime() throws InterruptedException { + //given + ExecutorService executor = Executors.newFixedThreadPool(2); + BlockingQueue queue = new DelayQueue<>(); + int numberOfElementsToProduce = 1; + int delayOfEachProducedMessageMilliseconds = 10_000; + DelayQueueConsumer consumer = new DelayQueueConsumer(queue, numberOfElementsToProduce); + DelayQueueProducer producer + = new DelayQueueProducer(queue, numberOfElementsToProduce, delayOfEachProducedMessageMilliseconds); + + //when + executor.submit(producer); + executor.submit(consumer); + + //then + executor.awaitTermination(5, TimeUnit.SECONDS); + executor.shutdown(); + assertEquals(consumer.numberOfConsumedElements.get(), 0); + + } + + @Test + public void givenDelayQueue_whenProduceElementWithNegativeDelay_thenConsumeMessageImmediately() throws InterruptedException { + //given + ExecutorService executor = Executors.newFixedThreadPool(2); + BlockingQueue queue = new DelayQueue<>(); + int numberOfElementsToProduce = 1; + int delayOfEachProducedMessageMilliseconds = -10_000; + DelayQueueConsumer consumer = new DelayQueueConsumer(queue, numberOfElementsToProduce); + DelayQueueProducer producer + = new DelayQueueProducer(queue, numberOfElementsToProduce, delayOfEachProducedMessageMilliseconds); + + //when + executor.submit(producer); + executor.submit(consumer); + + //then + executor.awaitTermination(1, TimeUnit.SECONDS); + executor.shutdown(); + assertEquals(consumer.numberOfConsumedElements.get(), 1); + + } +} \ No newline at end of file diff --git a/core-java/src/test/java/com/baeldung/concurrent/locks/SharedObjectWithLockManualTest.java b/core-java/src/test/java/com/baeldung/concurrent/locks/SharedObjectWithLockManualTest.java index 9b82ced642..4dccbc3e26 100644 --- a/core-java/src/test/java/com/baeldung/concurrent/locks/SharedObjectWithLockManualTest.java +++ b/core-java/src/test/java/com/baeldung/concurrent/locks/SharedObjectWithLockManualTest.java @@ -66,9 +66,7 @@ public class SharedObjectWithLockManualTest { private void executeThreads(SharedObjectWithLock object, int threadCount, ExecutorService service) { for (int i = 0; i < threadCount; i++) { - service.execute(() -> { - object.perform(); - }); + service.execute(object::perform); } } diff --git a/core-java/src/test/java/com/baeldung/concurrent/phaser/PhaserTest.java b/core-java/src/test/java/com/baeldung/concurrent/phaser/PhaserUnitTest.java similarity index 97% rename from core-java/src/test/java/com/baeldung/concurrent/phaser/PhaserTest.java rename to core-java/src/test/java/com/baeldung/concurrent/phaser/PhaserUnitTest.java index 7ba1b1ebd9..a7b56e1151 100644 --- a/core-java/src/test/java/com/baeldung/concurrent/phaser/PhaserTest.java +++ b/core-java/src/test/java/com/baeldung/concurrent/phaser/PhaserUnitTest.java @@ -11,7 +11,7 @@ import java.util.concurrent.Phaser; import static junit.framework.TestCase.assertEquals; @FixMethodOrder(MethodSorters.NAME_ASCENDING) -public class PhaserTest { +public class PhaserUnitTest { @Test public void givenPhaser_whenCoordinateWorksBetweenThreads_thenShouldCoordinateBetweenMultiplePhases() { diff --git a/core-java/src/test/java/com/baeldung/dateapi/JavaDurationTest.java b/core-java/src/test/java/com/baeldung/dateapi/JavaDurationUnitTest.java similarity index 97% rename from core-java/src/test/java/com/baeldung/dateapi/JavaDurationTest.java rename to core-java/src/test/java/com/baeldung/dateapi/JavaDurationUnitTest.java index f4bfc0f55c..db6b353ba6 100644 --- a/core-java/src/test/java/com/baeldung/dateapi/JavaDurationTest.java +++ b/core-java/src/test/java/com/baeldung/dateapi/JavaDurationUnitTest.java @@ -9,7 +9,7 @@ import java.time.temporal.ChronoUnit; import org.junit.Test; -public class JavaDurationTest { +public class JavaDurationUnitTest { @Test public void test2() { diff --git a/core-java/src/test/java/com/baeldung/dateapi/JavaPeriodTest.java b/core-java/src/test/java/com/baeldung/dateapi/JavaPeriodUnitTest.java similarity index 96% rename from core-java/src/test/java/com/baeldung/dateapi/JavaPeriodTest.java rename to core-java/src/test/java/com/baeldung/dateapi/JavaPeriodUnitTest.java index a0bede49b5..81e9153a51 100644 --- a/core-java/src/test/java/com/baeldung/dateapi/JavaPeriodTest.java +++ b/core-java/src/test/java/com/baeldung/dateapi/JavaPeriodUnitTest.java @@ -9,9 +9,9 @@ import java.time.Period; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; -public class JavaPeriodTest { +public class JavaPeriodUnitTest { - private static final Logger LOG = Logger.getLogger(JavaPeriodTest.class); + private static final Logger LOG = Logger.getLogger(JavaPeriodUnitTest.class); @Test public void whenTestPeriod_thenOk() { diff --git a/core-java/src/test/java/com/baeldung/dynamicproxy/DynamicProxyTest.java b/core-java/src/test/java/com/baeldung/dynamicproxy/DynamicProxyIntegrationTest.java similarity index 73% rename from core-java/src/test/java/com/baeldung/dynamicproxy/DynamicProxyTest.java rename to core-java/src/test/java/com/baeldung/dynamicproxy/DynamicProxyIntegrationTest.java index dc7f9366ba..96d544b005 100644 --- a/core-java/src/test/java/com/baeldung/dynamicproxy/DynamicProxyTest.java +++ b/core-java/src/test/java/com/baeldung/dynamicproxy/DynamicProxyIntegrationTest.java @@ -9,18 +9,18 @@ import java.util.Map; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; -public class DynamicProxyTest { +public class DynamicProxyIntegrationTest { @Test public void givenDynamicProxy_thenPutWorks() { - Map proxyInstance = (Map) Proxy.newProxyInstance(DynamicProxyTest.class.getClassLoader(), new Class[] { Map.class }, new DynamicInvocationHandler()); + Map proxyInstance = (Map) Proxy.newProxyInstance(DynamicProxyIntegrationTest.class.getClassLoader(), new Class[] { Map.class }, new DynamicInvocationHandler()); proxyInstance.put("hello", "world"); } @Test public void givenInlineDynamicProxy_thenGetWorksOtherMethodsDoNot() { - Map proxyInstance = (Map) Proxy.newProxyInstance(DynamicProxyTest.class.getClassLoader(), new Class[] { Map.class }, (proxy, method, methodArgs) -> { + Map proxyInstance = (Map) Proxy.newProxyInstance(DynamicProxyIntegrationTest.class.getClassLoader(), new Class[] { Map.class }, (proxy, method, methodArgs) -> { if (method.getName().equals("get")) { return 42; @@ -43,12 +43,12 @@ public class DynamicProxyTest { @Test public void givenTimingDynamicProxy_thenMethodInvokationsProduceTiming() { - Map mapProxyInstance = (Map) Proxy.newProxyInstance(DynamicProxyTest.class.getClassLoader(), new Class[] { Map.class }, new TimingDynamicInvocationHandler(new HashMap<>())); + Map mapProxyInstance = (Map) Proxy.newProxyInstance(DynamicProxyIntegrationTest.class.getClassLoader(), new Class[] { Map.class }, new TimingDynamicInvocationHandler(new HashMap<>())); mapProxyInstance.put("hello", "world"); assertEquals("world", mapProxyInstance.get("hello")); - CharSequence csProxyInstance = (CharSequence) Proxy.newProxyInstance(DynamicProxyTest.class.getClassLoader(), new Class[] { CharSequence.class }, new TimingDynamicInvocationHandler("Hello World")); + CharSequence csProxyInstance = (CharSequence) Proxy.newProxyInstance(DynamicProxyIntegrationTest.class.getClassLoader(), new Class[] { CharSequence.class }, new TimingDynamicInvocationHandler("Hello World")); assertEquals('l', csProxyInstance.charAt(2)); assertEquals(11, csProxyInstance.length()); diff --git a/core-java/src/test/java/com/baeldung/file/FileOperationsUnitTest.java b/core-java/src/test/java/com/baeldung/file/FileOperationsManualTest.java similarity index 97% rename from core-java/src/test/java/com/baeldung/file/FileOperationsUnitTest.java rename to core-java/src/test/java/com/baeldung/file/FileOperationsManualTest.java index 16d0cb570b..74886bdb53 100644 --- a/core-java/src/test/java/com/baeldung/file/FileOperationsUnitTest.java +++ b/core-java/src/test/java/com/baeldung/file/FileOperationsManualTest.java @@ -14,8 +14,7 @@ import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; import java.util.stream.Stream; - -public class FileOperationsUnitTest { +public class FileOperationsManualTest { @Test public void givenFileName_whenUsingClassloader_thenFileData() throws IOException { @@ -33,7 +32,7 @@ public class FileOperationsUnitTest { public void givenFileNameAsAbsolutePath_whenUsingClasspath_thenFileData() throws IOException { String expectedData = "Hello World from fileTest.txt!!!"; - Class clazz = FileOperationsUnitTest.class; + Class clazz = FileOperationsManualTest.class; InputStream inputStream = clazz.getResourceAsStream("/fileTest.txt"); String data = readFromInputStream(inputStream); diff --git a/core-java/src/test/java/com/baeldung/generics/GenericsTest.java b/core-java/src/test/java/com/baeldung/generics/GenericsUnitTest.java similarity index 98% rename from core-java/src/test/java/com/baeldung/generics/GenericsTest.java rename to core-java/src/test/java/com/baeldung/generics/GenericsUnitTest.java index 6cbc0eba05..aca0b182a0 100644 --- a/core-java/src/test/java/com/baeldung/generics/GenericsTest.java +++ b/core-java/src/test/java/com/baeldung/generics/GenericsUnitTest.java @@ -9,7 +9,7 @@ import static org.hamcrest.CoreMatchers.hasItems; import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.fail; -public class GenericsTest { +public class GenericsUnitTest { // testing the generic method with Integer @Test diff --git a/core-java/src/test/java/com/baeldung/grep/GrepWithUnix4JTest.java b/core-java/src/test/java/com/baeldung/grep/GrepWithUnix4JIntegrationTest.java similarity index 97% rename from core-java/src/test/java/com/baeldung/grep/GrepWithUnix4JTest.java rename to core-java/src/test/java/com/baeldung/grep/GrepWithUnix4JIntegrationTest.java index 628518a12f..3ea7acf620 100644 --- a/core-java/src/test/java/com/baeldung/grep/GrepWithUnix4JTest.java +++ b/core-java/src/test/java/com/baeldung/grep/GrepWithUnix4JIntegrationTest.java @@ -12,7 +12,7 @@ import org.unix4j.line.Line; import static org.unix4j.unix.Grep.*; import static org.unix4j.unix.cut.CutOption.*; -public class GrepWithUnix4JTest { +public class GrepWithUnix4JIntegrationTest { private File fileToGrep; diff --git a/core-java/src/test/java/com/baeldung/guava/GuavaBiMapTest.java b/core-java/src/test/java/com/baeldung/guava/GuavaBiMapUnitTest.java similarity index 99% rename from core-java/src/test/java/com/baeldung/guava/GuavaBiMapTest.java rename to core-java/src/test/java/com/baeldung/guava/GuavaBiMapUnitTest.java index 0997c93a72..b44d2db1aa 100644 --- a/core-java/src/test/java/com/baeldung/guava/GuavaBiMapTest.java +++ b/core-java/src/test/java/com/baeldung/guava/GuavaBiMapUnitTest.java @@ -9,7 +9,7 @@ import com.google.common.collect.EnumHashBiMap; import com.google.common.collect.HashBiMap; import com.google.common.collect.ImmutableBiMap; -public class GuavaBiMapTest { +public class GuavaBiMapUnitTest { @Test public void whenQueryByValue_returnsKey() { final BiMap capitalCountryBiMap = HashBiMap.create(); diff --git a/core-java/src/test/java/com/baeldung/hashing/SHA256HashingTest.java b/core-java/src/test/java/com/baeldung/hashing/SHA256HashingUnitTest.java similarity index 96% rename from core-java/src/test/java/com/baeldung/hashing/SHA256HashingTest.java rename to core-java/src/test/java/com/baeldung/hashing/SHA256HashingUnitTest.java index ce77b824d8..270cc8be9a 100644 --- a/core-java/src/test/java/com/baeldung/hashing/SHA256HashingTest.java +++ b/core-java/src/test/java/com/baeldung/hashing/SHA256HashingUnitTest.java @@ -4,7 +4,7 @@ import org.junit.Test; import static org.junit.Assert.*; -public class SHA256HashingTest { +public class SHA256HashingUnitTest { private static String originalValue = "abc123"; private static String hashedValue = "6ca13d52ca70c883e0f0bb101e425a89e8624de51db2d2392593af6a84118090"; diff --git a/core-java/src/test/java/com/baeldung/hexToAscii/HexToAscii.java b/core-java/src/test/java/com/baeldung/hexToAscii/HexToAsciiUnitTest.java similarity index 92% rename from core-java/src/test/java/com/baeldung/hexToAscii/HexToAscii.java rename to core-java/src/test/java/com/baeldung/hexToAscii/HexToAsciiUnitTest.java index 2a3c4b109e..145ccd639f 100644 --- a/core-java/src/test/java/com/baeldung/hexToAscii/HexToAscii.java +++ b/core-java/src/test/java/com/baeldung/hexToAscii/HexToAsciiUnitTest.java @@ -1,13 +1,13 @@ package com.baeldung.hexToAscii; -import static org.junit.Assert.assertEquals; - import org.junit.Test; -public class HexToAscii { +import static org.junit.Assert.assertEquals; + +public class HexToAsciiUnitTest { @Test - public static void whenHexToAscii() { + public void whenHexToAscii() { String asciiString = "http://www.baeldung.com/jackson-serialize-dates"; String hexEquivalent = "687474703a2f2f7777772e6261656c64756e672e636f6d2f6a61636b736f6e2d73657269616c697a652d6461746573"; @@ -15,7 +15,7 @@ public class HexToAscii { } @Test - public static void whenAsciiToHex() { + public void whenAsciiToHex() { String asciiString = "http://www.baeldung.com/jackson-serialize-dates"; String hexEquivalent = "687474703a2f2f7777772e6261656c64756e672e636f6d2f6a61636b736f6e2d73657269616c697a652d6461746573"; diff --git a/core-java/src/test/java/com/baeldung/http/HttpRequestTest.java b/core-java/src/test/java/com/baeldung/http/HttpRequestLiveTest.java similarity index 99% rename from core-java/src/test/java/com/baeldung/http/HttpRequestTest.java rename to core-java/src/test/java/com/baeldung/http/HttpRequestLiveTest.java index f238f7df7c..691615a1b4 100644 --- a/core-java/src/test/java/com/baeldung/http/HttpRequestTest.java +++ b/core-java/src/test/java/com/baeldung/http/HttpRequestLiveTest.java @@ -17,7 +17,7 @@ import java.util.List; import java.util.Map; import java.util.Optional; -public class HttpRequestTest { +public class HttpRequestLiveTest { @Test public void whenGetRequest_thenOk() throws IOException { diff --git a/core-java/src/test/java/com/baeldung/java/collections/ConcurrentModificationExceptionTest.java b/core-java/src/test/java/com/baeldung/java/collections/ConcurrentModificationExceptionUnitTest.java similarity index 97% rename from core-java/src/test/java/com/baeldung/java/collections/ConcurrentModificationExceptionTest.java rename to core-java/src/test/java/com/baeldung/java/collections/ConcurrentModificationExceptionUnitTest.java index d12f07286b..d0d8c3923c 100644 --- a/core-java/src/test/java/com/baeldung/java/collections/ConcurrentModificationExceptionTest.java +++ b/core-java/src/test/java/com/baeldung/java/collections/ConcurrentModificationExceptionUnitTest.java @@ -8,7 +8,7 @@ import java.util.concurrent.CopyOnWriteArrayList; import static java.util.Arrays.asList; import static org.junit.Assert.assertEquals; -public class ConcurrentModificationExceptionTest { +public class ConcurrentModificationExceptionUnitTest { @Test public void changingContentWithSetDoesNotThrowConcurrentModificationException() throws Exception { diff --git a/core-java/src/test/java/com/baeldung/java/concurrentmap/ConcurrentNavigableMapManualTests.java b/core-java/src/test/java/com/baeldung/java/concurrentmap/ConcurrentNavigableMapManualTest.java similarity index 98% rename from core-java/src/test/java/com/baeldung/java/concurrentmap/ConcurrentNavigableMapManualTests.java rename to core-java/src/test/java/com/baeldung/java/concurrentmap/ConcurrentNavigableMapManualTest.java index 3cd93a4d44..768c31ee80 100644 --- a/core-java/src/test/java/com/baeldung/java/concurrentmap/ConcurrentNavigableMapManualTests.java +++ b/core-java/src/test/java/com/baeldung/java/concurrentmap/ConcurrentNavigableMapManualTest.java @@ -12,7 +12,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertTrue; -public class ConcurrentNavigableMapManualTests { +public class ConcurrentNavigableMapManualTest { @Test public void givenSkipListMap_whenAccessInMultiThreads_thenOrderingStable() throws InterruptedException { diff --git a/core-java/src/test/java/com/baeldung/java/conversion/IterableStreamConversionTest.java b/core-java/src/test/java/com/baeldung/java/conversion/IterableStreamConversionUnitTest.java similarity index 95% rename from core-java/src/test/java/com/baeldung/java/conversion/IterableStreamConversionTest.java rename to core-java/src/test/java/com/baeldung/java/conversion/IterableStreamConversionUnitTest.java index e2f6c6a500..99e8088054 100644 --- a/core-java/src/test/java/com/baeldung/java/conversion/IterableStreamConversionTest.java +++ b/core-java/src/test/java/com/baeldung/java/conversion/IterableStreamConversionUnitTest.java @@ -11,7 +11,7 @@ import java.util.stream.StreamSupport; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.collection.IsIterableContainingInOrder.contains; -public class IterableStreamConversionTest { +public class IterableStreamConversionUnitTest { @Test public void givenIterable_whenConvertedToStream_thenNotNull() { diff --git a/core-java/src/test/java/com/baeldung/java/conversion/StringConversionTest.java b/core-java/src/test/java/com/baeldung/java/conversion/StringConversionUnitTest.java similarity index 99% rename from core-java/src/test/java/com/baeldung/java/conversion/StringConversionTest.java rename to core-java/src/test/java/com/baeldung/java/conversion/StringConversionUnitTest.java index 9a4ac053af..fbbbb21ccd 100644 --- a/core-java/src/test/java/com/baeldung/java/conversion/StringConversionTest.java +++ b/core-java/src/test/java/com/baeldung/java/conversion/StringConversionUnitTest.java @@ -15,7 +15,7 @@ import org.junit.Test; import com.baeldung.datetime.UseLocalDateTime; -public class StringConversionTest { +public class StringConversionUnitTest { @Test public void whenConvertedToInt_thenCorrect() { diff --git a/core-java/src/test/java/com/baeldung/java/countingChars/CountCharsExampleUnitTest.java b/core-java/src/test/java/com/baeldung/java/countingChars/CountCharsExampleUnitTest.java new file mode 100644 index 0000000000..aeb33fe875 --- /dev/null +++ b/core-java/src/test/java/com/baeldung/java/countingChars/CountCharsExampleUnitTest.java @@ -0,0 +1,93 @@ +package com.baeldung.java.countingChars; + +import com.google.common.base.CharMatcher; +import org.apache.commons.lang.StringUtils; +import org.junit.Test; + +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +import static org.junit.Assert.assertEquals; + + +/*** + * Example of counting chars in a String. + */ +public class CountCharsExampleUnitTest { + + @Test + public void givenString_whenUsingLoop_thenCountChars() { + String someString = "elephant"; + char someChar = 'e'; + int count = 0; + for (int i = 0; i < someString.length(); i++) { + if (someString.charAt(i) == someChar) { + count++; + } + } + assertEquals(2, count); + } + + @Test + public void givenString_whenUsingReplace_thenCountChars() { + String someString = "elephant"; + int count = someString.length() - someString.replace("e", "").length(); + assertEquals(2, count); + } + + @Test + public void givenString_whenUsingSplit_thenCountChars() { + String someString = "elephant"; + int count = someString.split("e", -1).length - 1; + assertEquals(2, count); + } + + @Test + public void givenString_whenUsingReqExp_thenCountChars() { + Pattern pattern = Pattern.compile("[^e]*e"); + Matcher matcher = pattern.matcher("elephant"); + int count = 0; + while (matcher.find()) { + count++; + } + assertEquals(2, count); + } + + @Test + public void givenString_whenUsingRecursion_thenCountChars() { + int count = useRecursion("elephant", 'e', 0); + assertEquals(2, count); + } + + private int useRecursion(String someString, char searchedChar, int index) { + if (index >= someString.length()) { + return 0; + } + + int count = someString.charAt(index) == searchedChar ? 1 : 0; + return count + useRecursion(someString, searchedChar, index + 1); + } + + @Test + public void givenString_whenUsingStringUtils_thenCountChars() throws InterruptedException { + int count = StringUtils.countMatches("elephant", "e"); + assertEquals(2, count); + } + + @Test + public void givenString_whenUsingJava8Features_thenCountChars() { + String someString = "elephant"; + long count = someString.chars().filter(ch -> ch == 'e').count(); + assertEquals(2, count); + + long count2 = someString.codePoints().filter(ch -> ch == 'e').count(); + assertEquals(2, count2); + } + + @Test + public void givenString_whenUsingGuavaCharMatcher_thenCountChars() { + int count = CharMatcher.is('e').countIn("elephant"); + assertEquals(2, count); + } + +} diff --git a/core-java/src/test/java/com/baeldung/java/doublebrace/DoubleBraceTest.java b/core-java/src/test/java/com/baeldung/java/doublebrace/DoubleBraceUnitTest.java similarity index 97% rename from core-java/src/test/java/com/baeldung/java/doublebrace/DoubleBraceTest.java rename to core-java/src/test/java/com/baeldung/java/doublebrace/DoubleBraceUnitTest.java index 531aa8970d..b03b01d074 100644 --- a/core-java/src/test/java/com/baeldung/java/doublebrace/DoubleBraceTest.java +++ b/core-java/src/test/java/com/baeldung/java/doublebrace/DoubleBraceUnitTest.java @@ -11,7 +11,7 @@ import static java.util.stream.Collectors.collectingAndThen; import static java.util.stream.Collectors.toSet; import static org.junit.Assert.assertTrue; -public class DoubleBraceTest { +public class DoubleBraceUnitTest { @Test public void whenInitializeSetWithoutDoubleBraces_containsElements() { diff --git a/core-java/src/test/java/com/baeldung/java/map/MapTest.java b/core-java/src/test/java/com/baeldung/java/map/MapUnitTest.java similarity index 99% rename from core-java/src/test/java/com/baeldung/java/map/MapTest.java rename to core-java/src/test/java/com/baeldung/java/map/MapUnitTest.java index ecdc3c5c70..7582eb87fb 100644 --- a/core-java/src/test/java/com/baeldung/java/map/MapTest.java +++ b/core-java/src/test/java/com/baeldung/java/map/MapUnitTest.java @@ -9,8 +9,8 @@ import java.util.Map.Entry; import static org.junit.Assert.*; -public class MapTest { - private static final Logger LOG = LoggerFactory.getLogger(MapTest.class); +public class MapUnitTest { + private static final Logger LOG = LoggerFactory.getLogger(MapUnitTest.class); @Test diff --git a/core-java/src/test/java/com/baeldung/java/nio2/FileTest.java b/core-java/src/test/java/com/baeldung/java/nio2/FileIntegrationTest.java similarity index 99% rename from core-java/src/test/java/com/baeldung/java/nio2/FileTest.java rename to core-java/src/test/java/com/baeldung/java/nio2/FileIntegrationTest.java index 587f4ab34a..d1cf81e4ce 100644 --- a/core-java/src/test/java/com/baeldung/java/nio2/FileTest.java +++ b/core-java/src/test/java/com/baeldung/java/nio2/FileIntegrationTest.java @@ -13,7 +13,7 @@ import java.util.UUID; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -public class FileTest { +public class FileIntegrationTest { private static final String TEMP_DIR = String.format("%s/temp%s", System.getProperty("user.home"), UUID.randomUUID().toString()); @BeforeClass diff --git a/core-java/src/test/java/com/baeldung/java/nio2/async/AsyncEchoTest.java b/core-java/src/test/java/com/baeldung/java/nio2/async/AsyncEchoIntegrationTest.java similarity index 95% rename from core-java/src/test/java/com/baeldung/java/nio2/async/AsyncEchoTest.java rename to core-java/src/test/java/com/baeldung/java/nio2/async/AsyncEchoIntegrationTest.java index 9e20a7144f..3cfac0e90f 100644 --- a/core-java/src/test/java/com/baeldung/java/nio2/async/AsyncEchoTest.java +++ b/core-java/src/test/java/com/baeldung/java/nio2/async/AsyncEchoIntegrationTest.java @@ -8,7 +8,7 @@ import java.io.IOException; import static org.junit.Assert.assertEquals; -public class AsyncEchoTest { +public class AsyncEchoIntegrationTest { Process server; AsyncEchoClient client; diff --git a/core-java/src/test/java/com/baeldung/java/nio2/async/AsyncFileTest.java b/core-java/src/test/java/com/baeldung/java/nio2/async/AsyncFileIntegrationTest.java similarity index 96% rename from core-java/src/test/java/com/baeldung/java/nio2/async/AsyncFileTest.java rename to core-java/src/test/java/com/baeldung/java/nio2/async/AsyncFileIntegrationTest.java index 4395017e63..e2f7a0303a 100644 --- a/core-java/src/test/java/com/baeldung/java/nio2/async/AsyncFileTest.java +++ b/core-java/src/test/java/com/baeldung/java/nio2/async/AsyncFileIntegrationTest.java @@ -16,7 +16,7 @@ import java.util.concurrent.Future; import static org.junit.Assert.assertEquals; -public class AsyncFileTest { +public class AsyncFileIntegrationTest { @Test public void givenPath_whenReadsContentWithFuture_thenCorrect() throws IOException, ExecutionException, InterruptedException { Path path = Paths.get(URI.create(this.getClass().getClassLoader().getResource("file.txt").toString())); @@ -36,7 +36,7 @@ public class AsyncFileTest { @Test public void givenPath_whenReadsContentWithCompletionHandler_thenCorrect() throws IOException { - Path path = Paths.get(URI.create(AsyncFileTest.class.getResource("/file.txt").toString())); + Path path = Paths.get(URI.create(AsyncFileIntegrationTest.class.getResource("/file.txt").toString())); AsynchronousFileChannel fileChannel = AsynchronousFileChannel.open(path, StandardOpenOption.READ); ByteBuffer buffer = ByteBuffer.allocate(1024); diff --git a/core-java/src/test/java/com/baeldung/java/nio2/attributes/BasicAttribsTest.java b/core-java/src/test/java/com/baeldung/java/nio2/attributes/BasicAttribsIntegrationTest.java similarity index 96% rename from core-java/src/test/java/com/baeldung/java/nio2/attributes/BasicAttribsTest.java rename to core-java/src/test/java/com/baeldung/java/nio2/attributes/BasicAttribsIntegrationTest.java index 2fef04e9d4..9f84aa60d6 100644 --- a/core-java/src/test/java/com/baeldung/java/nio2/attributes/BasicAttribsTest.java +++ b/core-java/src/test/java/com/baeldung/java/nio2/attributes/BasicAttribsIntegrationTest.java @@ -16,9 +16,9 @@ import java.nio.file.attribute.FileTime; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -public class BasicAttribsTest { +public class BasicAttribsIntegrationTest { - private static final Logger LOG = LoggerFactory.getLogger(BasicAttribsTest.class); + private static final Logger LOG = LoggerFactory.getLogger(BasicAttribsIntegrationTest.class); private static final String HOME = System.getProperty("user.home"); diff --git a/core-java/src/test/java/com/baeldung/java/set/SetTest.java b/core-java/src/test/java/com/baeldung/java/set/SetUnitTest.java similarity index 98% rename from core-java/src/test/java/com/baeldung/java/set/SetTest.java rename to core-java/src/test/java/com/baeldung/java/set/SetUnitTest.java index d669333b5c..b7badf1bbf 100644 --- a/core-java/src/test/java/com/baeldung/java/set/SetTest.java +++ b/core-java/src/test/java/com/baeldung/java/set/SetUnitTest.java @@ -9,9 +9,9 @@ import java.util.*; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -public class SetTest { +public class SetUnitTest { - private static final Logger LOG = LoggerFactory.getLogger(SetTest.class); + private static final Logger LOG = LoggerFactory.getLogger(SetUnitTest.class); @Test public void givenTreeSet_whenRetrievesObjects_thenNaturalOrder() { diff --git a/core-java/src/test/java/com/baeldung/java8/Java8FindAnyFindFirstTest.java b/core-java/src/test/java/com/baeldung/java8/Java8FindAnyFindFirstUnitTest.java similarity index 96% rename from core-java/src/test/java/com/baeldung/java8/Java8FindAnyFindFirstTest.java rename to core-java/src/test/java/com/baeldung/java8/Java8FindAnyFindFirstUnitTest.java index 87f7eb1018..8c2e0628fa 100644 --- a/core-java/src/test/java/com/baeldung/java8/Java8FindAnyFindFirstTest.java +++ b/core-java/src/test/java/com/baeldung/java8/Java8FindAnyFindFirstUnitTest.java @@ -11,7 +11,7 @@ import static org.hamcrest.Matchers.is; import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; -public class Java8FindAnyFindFirstTest { +public class Java8FindAnyFindFirstUnitTest { @Test public void createStream_whenFindAnyResultIsPresent_thenCorrect() { diff --git a/core-java/src/test/java/com/baeldung/java8/Java8ForEachTest.java b/core-java/src/test/java/com/baeldung/java8/Java8ForEachUnitTest.java similarity index 95% rename from core-java/src/test/java/com/baeldung/java8/Java8ForEachTest.java rename to core-java/src/test/java/com/baeldung/java8/Java8ForEachUnitTest.java index 07d2411e49..6a485e939f 100644 --- a/core-java/src/test/java/com/baeldung/java8/Java8ForEachTest.java +++ b/core-java/src/test/java/com/baeldung/java8/Java8ForEachUnitTest.java @@ -8,9 +8,9 @@ import java.util.ArrayList; import java.util.List; import java.util.function.Consumer; -public class Java8ForEachTest { +public class Java8ForEachUnitTest { - private static final Logger LOG = LoggerFactory.getLogger(Java8ForEachTest.class); + private static final Logger LOG = LoggerFactory.getLogger(Java8ForEachUnitTest.class); @Test public void compareForEachMethods_thenPrintResults() { diff --git a/core-java/src/test/java/com/baeldung/java8/Java8MaxMinTest.java b/core-java/src/test/java/com/baeldung/java8/Java8MaxMinUnitTest.java similarity index 97% rename from core-java/src/test/java/com/baeldung/java8/Java8MaxMinTest.java rename to core-java/src/test/java/com/baeldung/java8/Java8MaxMinUnitTest.java index b0e514124d..4979338452 100644 --- a/core-java/src/test/java/com/baeldung/java8/Java8MaxMinTest.java +++ b/core-java/src/test/java/com/baeldung/java8/Java8MaxMinUnitTest.java @@ -10,7 +10,7 @@ import java.util.NoSuchElementException; import static org.junit.Assert.assertEquals; -public class Java8MaxMinTest { +public class Java8MaxMinUnitTest { @Test public void whenListIsOfIntegerThenMaxCanBeDoneUsingIntegerComparator() { diff --git a/core-java/src/test/java/com/baeldung/java8/comparator/Java8ComparatorTest.java b/core-java/src/test/java/com/baeldung/java8/comparator/Java8ComparatorUnitTest.java similarity index 99% rename from core-java/src/test/java/com/baeldung/java8/comparator/Java8ComparatorTest.java rename to core-java/src/test/java/com/baeldung/java8/comparator/Java8ComparatorUnitTest.java index 62dd18972e..26536ba705 100644 --- a/core-java/src/test/java/com/baeldung/java8/comparator/Java8ComparatorTest.java +++ b/core-java/src/test/java/com/baeldung/java8/comparator/Java8ComparatorUnitTest.java @@ -8,7 +8,7 @@ import org.junit.Test; import lombok.Data; import static org.junit.Assert.assertTrue; -public class Java8ComparatorTest { +public class Java8ComparatorUnitTest { private Employee[] employees; private Employee[] employeesArrayWithNulls; diff --git a/core-java/src/test/java/com/baeldung/java8/lambda/exceptions/LambdaExceptionWrappersTest.java b/core-java/src/test/java/com/baeldung/java8/lambda/exceptions/LambdaExceptionWrappersUnitTest.java similarity index 94% rename from core-java/src/test/java/com/baeldung/java8/lambda/exceptions/LambdaExceptionWrappersTest.java rename to core-java/src/test/java/com/baeldung/java8/lambda/exceptions/LambdaExceptionWrappersUnitTest.java index db9631655f..0fd6f7dfe8 100644 --- a/core-java/src/test/java/com/baeldung/java8/lambda/exceptions/LambdaExceptionWrappersTest.java +++ b/core-java/src/test/java/com/baeldung/java8/lambda/exceptions/LambdaExceptionWrappersUnitTest.java @@ -11,9 +11,9 @@ import java.util.List; import static com.baeldung.java8.lambda.exceptions.LambdaExceptionWrappers.*; -public class LambdaExceptionWrappersTest { +public class LambdaExceptionWrappersUnitTest { - private static final Logger LOG = LoggerFactory.getLogger(LambdaExceptionWrappersTest.class); + private static final Logger LOG = LoggerFactory.getLogger(LambdaExceptionWrappersUnitTest.class); private List integers; diff --git a/core-java/src/test/java/com/baeldung/java8/optional/OptionalTest.java b/core-java/src/test/java/com/baeldung/java8/optional/OptionalUnitTest.java similarity index 99% rename from core-java/src/test/java/com/baeldung/java8/optional/OptionalTest.java rename to core-java/src/test/java/com/baeldung/java8/optional/OptionalUnitTest.java index 13e42e0806..0085de6327 100644 --- a/core-java/src/test/java/com/baeldung/java8/optional/OptionalTest.java +++ b/core-java/src/test/java/com/baeldung/java8/optional/OptionalUnitTest.java @@ -13,9 +13,9 @@ import java.util.Optional; import static org.junit.Assert.*; -public class OptionalTest { +public class OptionalUnitTest { - private static final Logger LOG = LoggerFactory.getLogger(OptionalTest.class); + private static final Logger LOG = LoggerFactory.getLogger(OptionalUnitTest.class); // creating Optional diff --git a/core-java/src/test/java/com/baeldung/jdbc/JdbcTest.java b/core-java/src/test/java/com/baeldung/jdbc/JdbcIntegrationTest.java similarity index 97% rename from core-java/src/test/java/com/baeldung/jdbc/JdbcTest.java rename to core-java/src/test/java/com/baeldung/jdbc/JdbcIntegrationTest.java index ff786c7267..926fdb3833 100644 --- a/core-java/src/test/java/com/baeldung/jdbc/JdbcTest.java +++ b/core-java/src/test/java/com/baeldung/jdbc/JdbcIntegrationTest.java @@ -21,9 +21,9 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; -public class JdbcTest { +public class JdbcIntegrationTest { - private static final Logger LOG = Logger.getLogger(JdbcTest.class); + private static final Logger LOG = Logger.getLogger(JdbcIntegrationTest.class); private Connection con; diff --git a/core-java/src/test/java/com/baeldung/junit4vstestng/DivisibilityTest.java b/core-java/src/test/java/com/baeldung/junit4vstestng/DivisibilityUnitTest.java similarity index 91% rename from core-java/src/test/java/com/baeldung/junit4vstestng/DivisibilityTest.java rename to core-java/src/test/java/com/baeldung/junit4vstestng/DivisibilityUnitTest.java index dec7dbe6aa..b8fe701f57 100644 --- a/core-java/src/test/java/com/baeldung/junit4vstestng/DivisibilityTest.java +++ b/core-java/src/test/java/com/baeldung/junit4vstestng/DivisibilityUnitTest.java @@ -5,7 +5,7 @@ import static org.junit.Assert.assertEquals; import org.junit.BeforeClass; import org.junit.Test; -public class DivisibilityTest { +public class DivisibilityUnitTest { private static int number; diff --git a/core-java/src/test/java/com/baeldung/junit4vstestng/ParametrizedTests.java b/core-java/src/test/java/com/baeldung/junit4vstestng/ParametrizedUnitTest.java similarity index 88% rename from core-java/src/test/java/com/baeldung/junit4vstestng/ParametrizedTests.java rename to core-java/src/test/java/com/baeldung/junit4vstestng/ParametrizedUnitTest.java index e9a9c6a07a..b46d4e895d 100644 --- a/core-java/src/test/java/com/baeldung/junit4vstestng/ParametrizedTests.java +++ b/core-java/src/test/java/com/baeldung/junit4vstestng/ParametrizedUnitTest.java @@ -11,12 +11,12 @@ import java.util.Arrays; import java.util.Collection; @RunWith(value = Parameterized.class) -public class ParametrizedTests { +public class ParametrizedUnitTest { private int value; private boolean isEven; - public ParametrizedTests(int value, boolean isEven) { + public ParametrizedUnitTest(int value, boolean isEven) { this.value = value; this.isEven = isEven; } diff --git a/core-java/src/test/java/com/baeldung/junit4vstestng/RegistrationTest.java b/core-java/src/test/java/com/baeldung/junit4vstestng/RegistrationUnitTest.java similarity index 81% rename from core-java/src/test/java/com/baeldung/junit4vstestng/RegistrationTest.java rename to core-java/src/test/java/com/baeldung/junit4vstestng/RegistrationUnitTest.java index 4aa1fa1a17..08a9f1e1c4 100644 --- a/core-java/src/test/java/com/baeldung/junit4vstestng/RegistrationTest.java +++ b/core-java/src/test/java/com/baeldung/junit4vstestng/RegistrationUnitTest.java @@ -5,8 +5,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class RegistrationTest { - private static final Logger LOGGER = LoggerFactory.getLogger(RegistrationTest.class); +public class RegistrationUnitTest { + private static final Logger LOGGER = LoggerFactory.getLogger(RegistrationUnitTest.class); @Test public void whenCalledFromSuite_thanOK() { diff --git a/core-java/src/test/java/com/baeldung/junit4vstestng/SignInTest.java b/core-java/src/test/java/com/baeldung/junit4vstestng/SignInUnitTest.java similarity index 84% rename from core-java/src/test/java/com/baeldung/junit4vstestng/SignInTest.java rename to core-java/src/test/java/com/baeldung/junit4vstestng/SignInUnitTest.java index bb908ff37e..a49fb454ea 100644 --- a/core-java/src/test/java/com/baeldung/junit4vstestng/SignInTest.java +++ b/core-java/src/test/java/com/baeldung/junit4vstestng/SignInUnitTest.java @@ -4,8 +4,8 @@ import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class SignInTest { - private static final Logger LOGGER = LoggerFactory.getLogger(SignInTest.class); +public class SignInUnitTest { + private static final Logger LOGGER = LoggerFactory.getLogger(SignInUnitTest.class); @Test public void whenCalledFromSuite_thanOK() { diff --git a/core-java/src/test/java/com/baeldung/junit4vstestng/SortedTests.java b/core-java/src/test/java/com/baeldung/junit4vstestng/SortedUnitTest.java similarity index 94% rename from core-java/src/test/java/com/baeldung/junit4vstestng/SortedTests.java rename to core-java/src/test/java/com/baeldung/junit4vstestng/SortedUnitTest.java index fe0ec1469c..0ddd161393 100644 --- a/core-java/src/test/java/com/baeldung/junit4vstestng/SortedTests.java +++ b/core-java/src/test/java/com/baeldung/junit4vstestng/SortedUnitTest.java @@ -7,7 +7,7 @@ import org.junit.Test; import org.junit.runners.MethodSorters; @FixMethodOrder(MethodSorters.NAME_ASCENDING) -public class SortedTests { +public class SortedUnitTest { @Test public void a_givenString_whenChangedtoInt_thenTrue() { diff --git a/core-java/src/test/java/com/baeldung/junit4vstestng/StringCaseTest.java b/core-java/src/test/java/com/baeldung/junit4vstestng/StringCaseUnitTest.java similarity index 91% rename from core-java/src/test/java/com/baeldung/junit4vstestng/StringCaseTest.java rename to core-java/src/test/java/com/baeldung/junit4vstestng/StringCaseUnitTest.java index 520017e4c1..16a881f7e7 100644 --- a/core-java/src/test/java/com/baeldung/junit4vstestng/StringCaseTest.java +++ b/core-java/src/test/java/com/baeldung/junit4vstestng/StringCaseUnitTest.java @@ -5,7 +5,7 @@ import static org.junit.Assert.assertEquals; import org.junit.BeforeClass; import org.junit.Test; -public class StringCaseTest { +public class StringCaseUnitTest { private static String data; diff --git a/core-java/src/test/java/com/baeldung/junit4vstestng/SuiteTest.java b/core-java/src/test/java/com/baeldung/junit4vstestng/SuiteTest.java index effd7fa10a..5095217efc 100644 --- a/core-java/src/test/java/com/baeldung/junit4vstestng/SuiteTest.java +++ b/core-java/src/test/java/com/baeldung/junit4vstestng/SuiteTest.java @@ -4,7 +4,7 @@ import org.junit.runner.RunWith; import org.junit.runners.Suite; @RunWith(Suite.class) -@Suite.SuiteClasses({ RegistrationTest.class, SignInTest.class }) +@Suite.SuiteClasses({ RegistrationUnitTest.class, SignInUnitTest.class }) public class SuiteTest { } diff --git a/core-java/src/test/java/com/baeldung/junit4vstestng/SummationServiceTest.java b/core-java/src/test/java/com/baeldung/junit4vstestng/SummationServiceIntegrationTest.java similarity index 96% rename from core-java/src/test/java/com/baeldung/junit4vstestng/SummationServiceTest.java rename to core-java/src/test/java/com/baeldung/junit4vstestng/SummationServiceIntegrationTest.java index 7d1bf3b7af..e85496ba7e 100644 --- a/core-java/src/test/java/com/baeldung/junit4vstestng/SummationServiceTest.java +++ b/core-java/src/test/java/com/baeldung/junit4vstestng/SummationServiceIntegrationTest.java @@ -11,7 +11,7 @@ import org.junit.Test; import java.util.ArrayList; import java.util.List; -public class SummationServiceTest { +public class SummationServiceIntegrationTest { private static List numbers; @BeforeClass diff --git a/core-java/src/test/java/com/baeldung/list/flattennestedlist/FlattenNestedListTest.java b/core-java/src/test/java/com/baeldung/list/flattennestedlist/FlattenNestedListUnitTest.java similarity index 97% rename from core-java/src/test/java/com/baeldung/list/flattennestedlist/FlattenNestedListTest.java rename to core-java/src/test/java/com/baeldung/list/flattennestedlist/FlattenNestedListUnitTest.java index 93962e7831..50abb4bc92 100644 --- a/core-java/src/test/java/com/baeldung/list/flattennestedlist/FlattenNestedListTest.java +++ b/core-java/src/test/java/com/baeldung/list/flattennestedlist/FlattenNestedListUnitTest.java @@ -13,7 +13,7 @@ import java.util.stream.Collectors; import org.hamcrest.collection.IsIterableContainingInOrder; import org.junit.Test; -public class FlattenNestedListTest { +public class FlattenNestedListUnitTest { List> lol = asList(asList("one:one"), asList("two:one", "two:two", "two:three"), asList("three:one", "three:two", "three:three", "three:four")); @Test diff --git a/core-java/src/test/java/com/baeldung/list/listoflist/ListOfListsTest.java b/core-java/src/test/java/com/baeldung/list/listoflist/ListOfListsUnitTest.java similarity index 98% rename from core-java/src/test/java/com/baeldung/list/listoflist/ListOfListsTest.java rename to core-java/src/test/java/com/baeldung/list/listoflist/ListOfListsUnitTest.java index 674a2f89bc..75f8b8359f 100644 --- a/core-java/src/test/java/com/baeldung/list/listoflist/ListOfListsTest.java +++ b/core-java/src/test/java/com/baeldung/list/listoflist/ListOfListsUnitTest.java @@ -7,7 +7,7 @@ import static org.junit.Assert.assertEquals; import org.junit.Before; import org.junit.Test; -public class ListOfListsTest { +public class ListOfListsUnitTest { private List> listOfLists = new ArrayList>(); private ArrayList penList = new ArrayList<>(); diff --git a/core-java/src/test/java/com/baeldung/mappedbytebuffer/MappedByteBufferTest.java b/core-java/src/test/java/com/baeldung/mappedbytebuffer/MappedByteBufferUnitTest.java similarity index 98% rename from core-java/src/test/java/com/baeldung/mappedbytebuffer/MappedByteBufferTest.java rename to core-java/src/test/java/com/baeldung/mappedbytebuffer/MappedByteBufferUnitTest.java index 4064d38267..22457d196e 100644 --- a/core-java/src/test/java/com/baeldung/mappedbytebuffer/MappedByteBufferTest.java +++ b/core-java/src/test/java/com/baeldung/mappedbytebuffer/MappedByteBufferUnitTest.java @@ -16,7 +16,7 @@ import java.util.List; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; -public class MappedByteBufferTest { +public class MappedByteBufferUnitTest { @Test diff --git a/core-java/src/test/java/com/baeldung/money/JavaMoneyTest.java b/core-java/src/test/java/com/baeldung/money/JavaMoneyUnitTest.java similarity index 96% rename from core-java/src/test/java/com/baeldung/money/JavaMoneyTest.java rename to core-java/src/test/java/com/baeldung/money/JavaMoneyUnitTest.java index 140560d079..69906543a9 100644 --- a/core-java/src/test/java/com/baeldung/money/JavaMoneyTest.java +++ b/core-java/src/test/java/com/baeldung/money/JavaMoneyUnitTest.java @@ -21,7 +21,7 @@ import java.util.Locale; import static org.junit.Assert.*; -public class JavaMoneyTest { +public class JavaMoneyUnitTest { @Test public void givenCurrencyCode_whenString_thanExist() { diff --git a/core-java/src/test/java/com/baeldung/scripting/NashornTest.java b/core-java/src/test/java/com/baeldung/scripting/NashornUnitTest.java similarity index 88% rename from core-java/src/test/java/com/baeldung/scripting/NashornTest.java rename to core-java/src/test/java/com/baeldung/scripting/NashornUnitTest.java index 9b6f61361a..fe1a7d4bd4 100644 --- a/core-java/src/test/java/com/baeldung/scripting/NashornTest.java +++ b/core-java/src/test/java/com/baeldung/scripting/NashornUnitTest.java @@ -9,7 +9,7 @@ import java.io.InputStreamReader; import java.util.List; import java.util.Map; -public class NashornTest { +public class NashornUnitTest { private ScriptEngine engine; @@ -20,17 +20,17 @@ public class NashornTest { @Test public void trim() throws ScriptException { - engine.eval(new InputStreamReader(NashornTest.class.getResourceAsStream("/js/trim.js"))); + engine.eval(new InputStreamReader(NashornUnitTest.class.getResourceAsStream("/js/trim.js"))); } @Test public void locations() throws ScriptException { - engine.eval(new InputStreamReader(NashornTest.class.getResourceAsStream("/js/locations.js"))); + engine.eval(new InputStreamReader(NashornUnitTest.class.getResourceAsStream("/js/locations.js"))); } @Test public void bindProperties() throws ScriptException { - engine.eval(new InputStreamReader(NashornTest.class.getResourceAsStream("/js/bind.js"))); + engine.eval(new InputStreamReader(NashornUnitTest.class.getResourceAsStream("/js/bind.js"))); } @Test @@ -40,7 +40,7 @@ public class NashornTest { @Test public void typedArrays() throws ScriptException { - engine.eval(new InputStreamReader(NashornTest.class.getResourceAsStream("/js/typed_arrays.js"))); + engine.eval(new InputStreamReader(NashornUnitTest.class.getResourceAsStream("/js/typed_arrays.js"))); } @Test diff --git a/core-java/src/test/java/com/baeldung/serialization/PersonUnitTest.java b/core-java/src/test/java/com/baeldung/serialization/PersonUnitTest.java new file mode 100644 index 0000000000..86bd3f9c8d --- /dev/null +++ b/core-java/src/test/java/com/baeldung/serialization/PersonUnitTest.java @@ -0,0 +1,64 @@ +package com.baeuldung.serialization; + +import static org.junit.Assert.assertTrue; + +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; + +import org.junit.Test; + +public class PersonUnitTest { + + @Test + public void whenSerializingAndDeserializing_ThenObjectIsTheSame() throws IOException, ClassNotFoundException { + Person p = new Person(); + p.setAge(20); + p.setName("Joe"); + + FileOutputStream fileOutputStream = new FileOutputStream("yofile.txt"); + ObjectOutputStream objectOutputStream = new ObjectOutputStream(fileOutputStream); + objectOutputStream.writeObject(p); + objectOutputStream.flush(); + objectOutputStream.close(); + + FileInputStream fileInputStream = new FileInputStream("yofile.txt"); + ObjectInputStream objectInputStream = new ObjectInputStream(fileInputStream); + Person p2 = (Person) objectInputStream.readObject(); + objectInputStream.close(); + + assertTrue(p2.getAge() == p.getAge()); + assertTrue(p2.getName().equals(p.getName())); + } + + @Test + public void whenCustomSerializingAndDeserializing_ThenObjectIsTheSame() throws IOException, ClassNotFoundException { + Person p = new Person(); + p.setAge(20); + p.setName("Joe"); + + Address a = new Address(); + a.setHouseNumber(1); + + Employee e = new Employee(); + e.setPerson(p); + e.setAddress(a); + + FileOutputStream fileOutputStream = new FileOutputStream("yofile2.txt"); + ObjectOutputStream objectOutputStream = new ObjectOutputStream(fileOutputStream); + objectOutputStream.writeObject(e); + objectOutputStream.flush(); + objectOutputStream.close(); + + FileInputStream fileInputStream = new FileInputStream("yofile2.txt"); + ObjectInputStream objectInputStream = new ObjectInputStream(fileInputStream); + Employee e2 = (Employee) objectInputStream.readObject(); + objectInputStream.close(); + + assertTrue(e2.getPerson().getAge() == e.getPerson().getAge()); + assertTrue(e2.getAddress().getHouseNumber() == (e.getAddress().getHouseNumber())); + } + +} diff --git a/core-java/src/test/java/com/baeldung/stackoverflowerror/CyclicDependancyManualTest.java b/core-java/src/test/java/com/baeldung/stackoverflowerror/CyclicDependancyManualTest.java index 9a53a83b2a..9b86770453 100644 --- a/core-java/src/test/java/com/baeldung/stackoverflowerror/CyclicDependancyManualTest.java +++ b/core-java/src/test/java/com/baeldung/stackoverflowerror/CyclicDependancyManualTest.java @@ -4,13 +4,8 @@ import static org.junit.Assert.fail; import org.junit.Test; public class CyclicDependancyManualTest { - @Test + @Test(expected = StackOverflowError.class) public void whenInstanciatingClassOne_thenThrowsException() { - try { ClassOne obj = new ClassOne(); - fail(); - } catch (StackOverflowError soe) { - soe.printStackTrace(); - } } } diff --git a/core-java/src/test/java/com/baeldung/stackoverflowerror/InfiniteRecursionWithTerminationConditionManualTest.java b/core-java/src/test/java/com/baeldung/stackoverflowerror/InfiniteRecursionWithTerminationConditionManualTest.java index a262ee86a0..996d0e9017 100644 --- a/core-java/src/test/java/com/baeldung/stackoverflowerror/InfiniteRecursionWithTerminationConditionManualTest.java +++ b/core-java/src/test/java/com/baeldung/stackoverflowerror/InfiniteRecursionWithTerminationConditionManualTest.java @@ -6,7 +6,7 @@ import org.junit.Test; public class InfiniteRecursionWithTerminationConditionManualTest { @Test - public void givenPositiveIntNoOne_whenCalcFact_thenThrowsException() { + public void givenPositiveIntNoOne_whenCalcFact_thenCorrectlyCalc() { int numToCalcFactorial = 1; InfiniteRecursionWithTerminationCondition irtc = new InfiniteRecursionWithTerminationCondition(); @@ -14,23 +14,18 @@ public class InfiniteRecursionWithTerminationConditionManualTest { } @Test - public void givenPositiveIntGtOne_whenCalcFact_thenThrowsException() { + public void givenPositiveIntGtOne_whenCalcFact_thenCorrectlyCalc() { int numToCalcFactorial = 5; InfiniteRecursionWithTerminationCondition irtc = new InfiniteRecursionWithTerminationCondition(); assertEquals(120, irtc.calculateFactorial(numToCalcFactorial)); } - @Test + @Test(expected = StackOverflowError.class) public void givenNegativeInt_whenCalcFact_thenThrowsException() { - try { int numToCalcFactorial = -1; InfiniteRecursionWithTerminationCondition irtc = new InfiniteRecursionWithTerminationCondition(); irtc.calculateFactorial(numToCalcFactorial); - fail(); - } catch (StackOverflowError soe) { - soe.printStackTrace(); - } } } diff --git a/core-java/src/test/java/com/baeldung/stackoverflowerror/RecursionWithCorrectTerminationConditionManualTest.java b/core-java/src/test/java/com/baeldung/stackoverflowerror/RecursionWithCorrectTerminationConditionManualTest.java new file mode 100644 index 0000000000..a4269aef56 --- /dev/null +++ b/core-java/src/test/java/com/baeldung/stackoverflowerror/RecursionWithCorrectTerminationConditionManualTest.java @@ -0,0 +1,15 @@ +package com.baeldung.stackoverflowerror; + +import static junit.framework.TestCase.assertEquals; + +import org.junit.Test; + +public class RecursionWithCorrectTerminationConditionManualTest { + @Test + public void givenNegativeInt_whenCalcFact_thenCorrectlyCalc() { + int numToCalcFactorial = -1; + RecursionWithCorrectTerminationCondition rctc = new RecursionWithCorrectTerminationCondition(); + + assertEquals(1, rctc.calculateFactorial(numToCalcFactorial)); + } +} diff --git a/core-java/src/test/java/com/baeldung/stackoverflowerror/UnintendedInfiniteRecursionManualTest.java b/core-java/src/test/java/com/baeldung/stackoverflowerror/UnintendedInfiniteRecursionManualTest.java index c643da4aeb..65126efff2 100644 --- a/core-java/src/test/java/com/baeldung/stackoverflowerror/UnintendedInfiniteRecursionManualTest.java +++ b/core-java/src/test/java/com/baeldung/stackoverflowerror/UnintendedInfiniteRecursionManualTest.java @@ -7,8 +7,7 @@ public class UnintendedInfiniteRecursionManualTest { @Test(expected = StackOverflowError.class) public void givenPositiveIntNoOne_whenCalFact_thenThrowsException() { int numToCalcFactorial= 1; - UnintendedInfiniteRecursion uir - = new UnintendedInfiniteRecursion(); + UnintendedInfiniteRecursion uir = new UnintendedInfiniteRecursion(); uir.calculateFactorial(numToCalcFactorial); } @@ -16,8 +15,7 @@ public class UnintendedInfiniteRecursionManualTest { @Test(expected = StackOverflowError.class) public void givenPositiveIntGtOne_whenCalcFact_thenThrowsException() { int numToCalcFactorial= 2; - UnintendedInfiniteRecursion uir - = new UnintendedInfiniteRecursion(); + UnintendedInfiniteRecursion uir = new UnintendedInfiniteRecursion(); uir.calculateFactorial(numToCalcFactorial); } @@ -25,8 +23,7 @@ public class UnintendedInfiniteRecursionManualTest { @Test(expected = StackOverflowError.class) public void givenNegativeInt_whenCalcFact_thenThrowsException() { int numToCalcFactorial= -1; - UnintendedInfiniteRecursion uir - = new UnintendedInfiniteRecursion(); + UnintendedInfiniteRecursion uir = new UnintendedInfiniteRecursion(); uir.calculateFactorial(numToCalcFactorial); } diff --git a/core-java/src/test/java/com/baeldung/stream/InfiniteStreamTest.java b/core-java/src/test/java/com/baeldung/stream/InfiniteStreamUnitTest.java similarity index 97% rename from core-java/src/test/java/com/baeldung/stream/InfiniteStreamTest.java rename to core-java/src/test/java/com/baeldung/stream/InfiniteStreamUnitTest.java index a1537a1735..fa482b8dfe 100644 --- a/core-java/src/test/java/com/baeldung/stream/InfiniteStreamTest.java +++ b/core-java/src/test/java/com/baeldung/stream/InfiniteStreamUnitTest.java @@ -13,7 +13,7 @@ import java.util.stream.Stream; import static org.junit.Assert.assertEquals; -public class InfiniteStreamTest { +public class InfiniteStreamUnitTest { @Test public void givenInfiniteStream_whenUseIntermediateLimitMethod_thenShouldTerminateInFiniteTime() { diff --git a/core-java/src/test/java/com/baeldung/string/JoinerSplitterTest.java b/core-java/src/test/java/com/baeldung/string/JoinerSplitterUnitTest.java similarity index 97% rename from core-java/src/test/java/com/baeldung/string/JoinerSplitterTest.java rename to core-java/src/test/java/com/baeldung/string/JoinerSplitterUnitTest.java index a89f89b8d5..d58c1026d0 100644 --- a/core-java/src/test/java/com/baeldung/string/JoinerSplitterTest.java +++ b/core-java/src/test/java/com/baeldung/string/JoinerSplitterUnitTest.java @@ -9,7 +9,7 @@ import org.junit.Test; import com.baeldung.string.JoinerSplitter; -public class JoinerSplitterTest { +public class JoinerSplitterUnitTest { @Test public void provided_array_convert_to_stream_and_convert_to_string() { diff --git a/core-java/src/test/java/com/baeldung/string/SplitTest.java b/core-java/src/test/java/com/baeldung/string/SplitTest.java deleted file mode 100644 index d2e307e68d..0000000000 --- a/core-java/src/test/java/com/baeldung/string/SplitTest.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.baeldung.string; - -import org.apache.commons.lang.StringUtils; -import org.junit.Test; - -import java.util.Arrays; - -import static org.junit.Assert.assertArrayEquals; - -public class SplitTest { - - @Test - public void givenString_whenSplit_thenRetrunsArray_through_JavaLangString() { - assertArrayEquals("split by comma", Arrays.asList("peter", "james", "thomas").toArray(), "peter,james,thomas".split(",")); - assertArrayEquals("split by whitespace", Arrays.asList("car", "jeep", "scooter").toArray(), "car jeep scooter".split(" ")); - assertArrayEquals("split by hyphen", Arrays.asList("1", "120", "232323").toArray(), "1-120-232323".split("-")); - assertArrayEquals("split by dot", Arrays.asList("192", "168", "1", "178").toArray(), "192.168.1.178".split("\\.")); - assertArrayEquals("split by a regex", Arrays.asList("b", "a", "e", "l", "d", "u", "n", "g").toArray(), - "b a, e, l.d u, n g".split("\\s+|,\\s*|\\.\\s*")); - } - - @Test - public void givenString_whenSplit_thenRetrunsArray_through_StringUtils() { - StringUtils.split("car jeep scooter"); - - assertArrayEquals("split by whitespace", Arrays.asList("car", "jeep", "scooter").toArray(), StringUtils.split("car jeep scooter")); - assertArrayEquals("split by space, extra spaces ignored", Arrays.asList("car", "jeep", "scooter").toArray(), - StringUtils.split("car jeep scooter")); - assertArrayEquals("split by colon", Arrays.asList("car", "jeep", "scooter").toArray(), StringUtils.split("car:jeep:scooter", ":")); - assertArrayEquals("split by dot", Arrays.asList("car", "jeep", "scooter").toArray(), StringUtils.split("car.jeep.scooter", ".")); - } -} diff --git a/core-java/src/test/java/com/baeldung/string/SplitUnitTest.java b/core-java/src/test/java/com/baeldung/string/SplitUnitTest.java new file mode 100644 index 0000000000..2a3df4c44f --- /dev/null +++ b/core-java/src/test/java/com/baeldung/string/SplitUnitTest.java @@ -0,0 +1,58 @@ +package com.baeldung.string; + +import com.google.common.base.Splitter; +import org.apache.commons.lang.StringUtils; +import org.assertj.core.util.Lists; +import org.junit.Test; + +import java.util.List; + +import static org.assertj.core.api.Assertions.assertThat; + +public class SplitUnitTest { + + @Test + public void givenString_whenSplit_thenReturnsArray_through_JavaLangString() { + assertThat("peter,james,thomas".split(",")) + .containsExactly("peter", "james", "thomas"); + + assertThat("car jeep scooter".split(" ")) + .containsExactly("car", "jeep", "scooter"); + + assertThat("1-120-232323".split("-")) + .containsExactly("1", "120", "232323"); + + assertThat("192.168.1.178".split("\\.")) + .containsExactly("192", "168", "1", "178"); + + assertThat("b a, e, l.d u, n g".split("\\s+|,\\s*|\\.\\s*")) + .containsExactly("b", "a", "e", "l", "d", "u", "n", "g"); + } + + @Test + public void givenString_whenSplit_thenReturnsArray_through_StringUtils() { + StringUtils.split("car jeep scooter"); + + assertThat(StringUtils.split("car jeep scooter")) + .containsExactly("car", "jeep", "scooter"); + + assertThat(StringUtils.split("car jeep scooter")) + .containsExactly("car", "jeep", "scooter"); + + assertThat(StringUtils.split("car:jeep:scooter", ":")) + .containsExactly("car", "jeep", "scooter"); + + assertThat(StringUtils.split("car.jeep.scooter", ".")) + .containsExactly("car", "jeep", "scooter"); + } + + @Test + public void givenString_whenSplit_thenReturnsIterable_Splitter() { + //given + Iterable result = Splitter.on(',').trimResults().omitEmptyStrings().split("car,jeep,, scooter"); + List resultList = Lists.newArrayList(result); + + assertThat(resultList) + .containsExactly("car", "jeep", "scooter"); + } +} diff --git a/core-java/src/test/java/com/baeldung/string/StringHelperTest.java b/core-java/src/test/java/com/baeldung/string/StringHelperUnitTest.java similarity index 99% rename from core-java/src/test/java/com/baeldung/string/StringHelperTest.java rename to core-java/src/test/java/com/baeldung/string/StringHelperUnitTest.java index 48a9fb9364..427f02ba16 100644 --- a/core-java/src/test/java/com/baeldung/string/StringHelperTest.java +++ b/core-java/src/test/java/com/baeldung/string/StringHelperUnitTest.java @@ -5,7 +5,7 @@ import static org.junit.Assert.assertNotEquals; import org.apache.commons.lang3.StringUtils; import org.junit.Test; -public class StringHelperTest { +public class StringHelperUnitTest { public static final String TEST_STRING = "abcdef"; public static final String NULL_STRING = null; diff --git a/core-java/src/test/java/com/baeldung/stringtokenizer/TokenizerTest.java b/core-java/src/test/java/com/baeldung/stringtokenizer/TokenizerUnitTest.java similarity index 96% rename from core-java/src/test/java/com/baeldung/stringtokenizer/TokenizerTest.java rename to core-java/src/test/java/com/baeldung/stringtokenizer/TokenizerUnitTest.java index eed42a2f96..3c6e86b52c 100644 --- a/core-java/src/test/java/com/baeldung/stringtokenizer/TokenizerTest.java +++ b/core-java/src/test/java/com/baeldung/stringtokenizer/TokenizerUnitTest.java @@ -7,7 +7,7 @@ import java.util.List; import static org.junit.Assert.assertEquals; -public class TokenizerTest { +public class TokenizerUnitTest { private final MyTokenizer myTokenizer = new MyTokenizer(); private final List expectedTokensForString = Arrays.asList("Welcome", "to", "baeldung.com"); diff --git a/core-java/src/test/java/com/baeldung/synchronousqueue/SynchronousQueueTest.java b/core-java/src/test/java/com/baeldung/synchronousqueue/SynchronousQueueUnitTest.java similarity index 97% rename from core-java/src/test/java/com/baeldung/synchronousqueue/SynchronousQueueTest.java rename to core-java/src/test/java/com/baeldung/synchronousqueue/SynchronousQueueUnitTest.java index 86e1c0825d..79339d1680 100644 --- a/core-java/src/test/java/com/baeldung/synchronousqueue/SynchronousQueueTest.java +++ b/core-java/src/test/java/com/baeldung/synchronousqueue/SynchronousQueueUnitTest.java @@ -12,9 +12,9 @@ import java.util.concurrent.atomic.AtomicInteger; import static junit.framework.TestCase.assertEquals; @FixMethodOrder(MethodSorters.NAME_ASCENDING) -public class SynchronousQueueTest { +public class SynchronousQueueUnitTest { - private static final Logger LOG = LoggerFactory.getLogger(SynchronousQueueTest.class); + private static final Logger LOG = LoggerFactory.getLogger(SynchronousQueueUnitTest.class); @Test diff --git a/core-java/src/test/java/com/baeldung/unsafe/UnsafeTest.java b/core-java/src/test/java/com/baeldung/unsafe/UnsafeUnitTest.java similarity index 99% rename from core-java/src/test/java/com/baeldung/unsafe/UnsafeTest.java rename to core-java/src/test/java/com/baeldung/unsafe/UnsafeUnitTest.java index 9f53e38969..6aa59e68d0 100644 --- a/core-java/src/test/java/com/baeldung/unsafe/UnsafeTest.java +++ b/core-java/src/test/java/com/baeldung/unsafe/UnsafeUnitTest.java @@ -14,7 +14,7 @@ import java.util.stream.IntStream; import static junit.framework.Assert.assertTrue; import static junit.framework.TestCase.assertEquals; -public class UnsafeTest { +public class UnsafeUnitTest { private Unsafe unsafe; diff --git a/core-java/src/test/java/com/baeldung/weakhashmap/WeakHashMapTest.java b/core-java/src/test/java/com/baeldung/weakhashmap/WeakHashMapUnitTest.java similarity index 98% rename from core-java/src/test/java/com/baeldung/weakhashmap/WeakHashMapTest.java rename to core-java/src/test/java/com/baeldung/weakhashmap/WeakHashMapUnitTest.java index 1c5a261eea..d7bcb31867 100644 --- a/core-java/src/test/java/com/baeldung/weakhashmap/WeakHashMapTest.java +++ b/core-java/src/test/java/com/baeldung/weakhashmap/WeakHashMapUnitTest.java @@ -9,7 +9,7 @@ import java.util.concurrent.TimeUnit; import static com.jayway.awaitility.Awaitility.await; import static org.junit.Assert.assertTrue; -public class WeakHashMapTest { +public class WeakHashMapUnitTest { @Test public void givenWeakHashMap_whenCacheValueThatHasNoReferenceToIt_GCShouldReclaimThatObject() { diff --git a/core-java/src/test/java/org/baeldung/java/io/JavaInputStreamToXUnitTest.java b/core-java/src/test/java/org/baeldung/java/io/JavaInputStreamToXUnitTest.java index 6d6d4d9c9b..0e20e75869 100644 --- a/core-java/src/test/java/org/baeldung/java/io/JavaInputStreamToXUnitTest.java +++ b/core-java/src/test/java/org/baeldung/java/io/JavaInputStreamToXUnitTest.java @@ -36,7 +36,7 @@ public class JavaInputStreamToXUnitTest { final StringBuilder textBuilder = new StringBuilder(); try (Reader reader = new BufferedReader(new InputStreamReader(inputStream, Charset.forName(StandardCharsets.UTF_8.name())))) { - int c = 0; + int c; while ((c = reader.read()) != -1) { textBuilder.append((char) c); } @@ -50,7 +50,7 @@ public class JavaInputStreamToXUnitTest { final InputStream inputStream = new ByteArrayInputStream(originalString.getBytes()); // exampleString.getBytes(StandardCharsets.UTF_8); // When - String text = null; + String text; try (Scanner scanner = new Scanner(inputStream, StandardCharsets.UTF_8.name())) { text = scanner.useDelimiter("\\A").next(); } @@ -81,7 +81,7 @@ public class JavaInputStreamToXUnitTest { final InputStream inputStream = new ByteArrayInputStream(originalString.getBytes()); // When - String text = null; + String text; try (final Reader reader = new InputStreamReader(inputStream)) { text = CharStreams.toString(reader); } @@ -210,5 +210,24 @@ public class JavaInputStreamToXUnitTest { FileUtils.copyInputStreamToFile(initialStream, targetFile); } + + @Test + public final void givenUsingPlainJava_whenConvertingAnInputStreamToString_thenCorrect() throws IOException { + String originalString = randomAlphabetic(8); + InputStream inputStream = new ByteArrayInputStream(originalString.getBytes()); + + ByteArrayOutputStream buffer = new ByteArrayOutputStream(); + int nRead; + byte[] data = new byte[1024]; + while ((nRead = inputStream.read(data, 0, data.length)) != -1) { + buffer.write(data, 0, nRead); + } + + buffer.flush(); + byte[] byteArray = buffer.toByteArray(); + + String text = new String(byteArray, StandardCharsets.UTF_8); + assertThat(text, equalTo(originalString)); + } } diff --git a/core-java/src/test/java/org/baeldung/java/sorting/JavaSorting.java b/core-java/src/test/java/org/baeldung/java/sorting/JavaSortingUnitTest.java similarity index 71% rename from core-java/src/test/java/org/baeldung/java/sorting/JavaSorting.java rename to core-java/src/test/java/org/baeldung/java/sorting/JavaSortingUnitTest.java index 72730aeb8b..277e037615 100644 --- a/core-java/src/test/java/org/baeldung/java/sorting/JavaSorting.java +++ b/core-java/src/test/java/org/baeldung/java/sorting/JavaSortingUnitTest.java @@ -1,34 +1,20 @@ package org.baeldung.java.sorting; -import static org.junit.Assert.assertTrue; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.Comparator; -import java.util.HashMap; -import java.util.HashSet; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; - +import com.google.common.primitives.Ints; import org.apache.commons.lang3.ArrayUtils; import org.junit.Before; import org.junit.Test; -import com.google.common.primitives.Ints; +import java.util.*; +import java.util.Map.Entry; -public class JavaSorting { +import static org.junit.Assert.assertTrue; + +public class JavaSortingUnitTest { private int[] toSort; private int[] sortedInts; private int[] sortedRangeInts; - // private Integer [] integers; - // private Integer [] sortedIntegers; - // private List integersList; - // private List sortedIntegersList; private Employee[] employees; private Employee[] employeesSorted; private Employee[] employeesSortedByAge; @@ -41,19 +27,11 @@ public class JavaSorting { sortedInts = new int[] { 1, 5, 7, 66, 88, 89, 123, 200, 255 }; sortedRangeInts = new int[] { 5, 1, 89, 7, 88, 200, 255, 123, 66 }; - // integers = new Integer[] - // { 5, 1, 89, 255, 7, 88, 200, 123, 66 }; - // sortedIntegers = new Integer[] - // {1, 5, 7, 66, 88, 89, 123, 200, 255}; - // - // integersList = Arrays.asList(new Integer[] { 5, 1, 89, 255, 7, 88, 200, 123, 66 }); - // sortedIntegersList = Arrays.asList(new Integer[] {1, 5, 7, 66, 88, 89, 123, 200, 255}); - employees = new Employee[] { new Employee("John", 23, 5000), new Employee("Steve", 26, 6000), new Employee("Frank", 33, 7000), new Employee("Earl", 43, 10000), new Employee("Jessica", 23, 4000), new Employee("Pearl", 33, 6000) }; employeesSorted = new Employee[] { new Employee("Earl", 43, 10000), new Employee("Frank", 33, 70000), new Employee("Jessica", 23, 4000), new Employee("John", 23, 5000), new Employee("Pearl", 33, 4000), new Employee("Steve", 26, 6000) }; employeesSortedByAge = new Employee[] { new Employee("John", 23, 5000), new Employee("Jessica", 23, 4000), new Employee("Steve", 26, 6000), new Employee("Frank", 33, 70000), new Employee("Pearl", 33, 4000), new Employee("Earl", 43, 10000) }; - HashMap map = new HashMap<>(); + map = new HashMap<>(); map.put(55, "John"); map.put(22, "Apple"); map.put(66, "Earl"); @@ -73,12 +51,7 @@ public class JavaSorting { @Test public void givenIntegerArray_whenUsingSort_thenSortedArray() { Integer[] integers = ArrayUtils.toObject(toSort); - Arrays.sort(integers, new Comparator() { - @Override - public int compare(Integer a, Integer b) { - return a - b; - } - }); + Arrays.sort(integers, Comparator.comparingInt(a -> a)); assertTrue(Arrays.equals(integers, ArrayUtils.toObject(sortedInts))); } @@ -86,9 +59,7 @@ public class JavaSorting { @Test public void givenArray_whenUsingSortWithLambdas_thenSortedArray() { Integer[] integersToSort = ArrayUtils.toObject(toSort); - Arrays.sort(integersToSort, (a, b) -> { - return a - b; - }); + Arrays.sort(integersToSort, Comparator.comparingInt(a -> a)); assertTrue(Arrays.equals(integersToSort, ArrayUtils.toObject(sortedInts))); } @@ -136,12 +107,7 @@ public class JavaSorting { Integer[] sortedKeys = new Integer[] { 6, 12, 22, 55, 66, 77 }; List> entries = new ArrayList<>(map.entrySet()); - Collections.sort(entries, new Comparator>() { - @Override - public int compare(Entry o1, Entry o2) { - return o1.getKey().compareTo(o2.getKey()); - } - }); + entries.sort(Comparator.comparing(Entry::getKey)); HashMap sortedMap = new LinkedHashMap<>(); for (Map.Entry entry : entries) { sortedMap.put(entry.getKey(), entry.getValue()); @@ -155,12 +121,7 @@ public class JavaSorting { String[] sortedValues = new String[] { "Apple", "Earl", "George", "John", "Pearl", "Rocky" }; List> entries = new ArrayList<>(map.entrySet()); - Collections.sort(entries, new Comparator>() { - @Override - public int compare(Entry o1, Entry o2) { - return o1.getValue().compareTo(o2.getValue()); - } - }); + entries.sort(Comparator.comparing(Entry::getValue)); HashMap sortedMap = new LinkedHashMap<>(); for (Map.Entry entry : entries) { sortedMap.put(entry.getKey(), entry.getValue()); @@ -172,12 +133,10 @@ public class JavaSorting { @Test public void givenSet_whenUsingSort_thenSortedSet() { HashSet integersSet = new LinkedHashSet<>(Ints.asList(toSort)); - HashSet descSortedIntegersSet = new LinkedHashSet<>(Arrays.asList(new Integer[] { 255, 200, 123, 89, 88, 66, 7, 5, 1 })); + HashSet descSortedIntegersSet = new LinkedHashSet<>(Arrays.asList(255, 200, 123, 89, 88, 66, 7, 5, 1)); - ArrayList list = new ArrayList(integersSet); - Collections.sort(list, (i1, i2) -> { - return i2 - i1; - }); + ArrayList list = new ArrayList<>(integersSet); + list.sort((i1, i2) -> i2 - i1); integersSet = new LinkedHashSet<>(list); assertTrue(Arrays.equals(integersSet.toArray(), descSortedIntegersSet.toArray())); diff --git a/couchbase-sdk/pom.xml b/couchbase-sdk/pom.xml index fb59389fe3..fd9e1b08f6 100644 --- a/couchbase-sdk/pom.xml +++ b/couchbase-sdk/pom.xml @@ -13,8 +13,8 @@ com.baeldung parent-modules 1.0.0-SNAPSHOT - - + + @@ -33,7 +33,7 @@ commons-logging commons-logging - + org.springframework @@ -47,13 +47,6 @@ - - - org.slf4j - jcl-over-slf4j - ${org.slf4j.version} - - org.springframework diff --git a/deltaspike/pom.xml b/deltaspike/pom.xml index 879330fb09..e81ad49a6d 100644 --- a/deltaspike/pom.xml +++ b/deltaspike/pom.xml @@ -22,11 +22,13 @@ com.baeldung parent-modules 1.0.0-SNAPSHOT - - + + - - + + UTF-8 3.7.4 @@ -35,7 +37,8 @@ 1.0.2.Final - + 8.2.2.Final @@ -46,11 +49,14 @@ - + org.wildfly.bom jboss-javaee-7.0-with-tools @@ -70,37 +76,43 @@ - + - + javax.enterprise cdi-api provided - + org.jboss.spec.javax.annotation jboss-annotations-api_1.2_spec provided - + org.jboss.resteasy jaxrs-api provided - + org.hibernate.javax.persistence hibernate-jpa-2.1-api provided - + org.jboss.spec.javax.ejb jboss-ejb-api_3.2_spec @@ -122,7 +134,8 @@ - + org.jboss.spec.javax.faces jboss-jsf-api_2.2_spec @@ -131,14 +144,16 @@ - + org.hibernate hibernate-jpamodelgen provided - + org.hibernate hibernate-validator-annotation-processor @@ -146,7 +161,8 @@ - + org.jboss.arquillian.junit arquillian-junit-container @@ -195,14 +211,16 @@ - + ${project.artifactId} maven-war-plugin ${war.plugin.version} - + false @@ -234,8 +252,10 @@ - - + + default true @@ -255,8 +275,10 @@ - - + + arq-wildfly-managed diff --git a/deltaspike/src/test/java/baeldung/test/MemberRegistrationTest.java b/deltaspike/src/test/java/baeldung/test/MemberRegistrationIntegrationTest.java similarity index 98% rename from deltaspike/src/test/java/baeldung/test/MemberRegistrationTest.java rename to deltaspike/src/test/java/baeldung/test/MemberRegistrationIntegrationTest.java index 7014d066d2..2b6cfe2b02 100644 --- a/deltaspike/src/test/java/baeldung/test/MemberRegistrationTest.java +++ b/deltaspike/src/test/java/baeldung/test/MemberRegistrationIntegrationTest.java @@ -38,7 +38,7 @@ import org.junit.Test; import org.junit.runner.RunWith; @RunWith(Arquillian.class) -public class MemberRegistrationTest { +public class MemberRegistrationIntegrationTest { @Deployment public static Archive createTestArchive() { File[] files = Maven.resolver().loadPomFromFile("pom.xml").importRuntimeDependencies().resolve().withTransitivity().asFile(); diff --git a/disruptor/pom.xml b/disruptor/pom.xml index 25effbb1c9..33eb7bb50a 100644 --- a/disruptor/pom.xml +++ b/disruptor/pom.xml @@ -12,8 +12,8 @@ com.baeldung parent-modules 1.0.0-SNAPSHOT - - + + @@ -22,43 +22,13 @@ commons-lang3 ${commons-lang3.version} - + com.lmax disruptor ${disruptor.version} - - - - org.slf4j - jcl-over-slf4j - ${org.slf4j.version} - - - - - - org.hamcrest - hamcrest-all - 1.3 - test - - - - org.hamcrest - hamcrest-core - ${org.hamcrest.version} - test - - - org.hamcrest - hamcrest-library - ${org.hamcrest.version} - test - - @@ -138,7 +108,8 @@ true - + org.baeldung.executable.ExecutableMavenJar @@ -201,8 +172,6 @@ 3.3.6 - 1.3 - 1.10.19 6.10 3.6.1 diff --git a/dozer/pom.xml b/dozer/pom.xml index ff0014f5f1..00ac2d5675 100644 --- a/dozer/pom.xml +++ b/dozer/pom.xml @@ -12,16 +12,10 @@ com.baeldung parent-modules 1.0.0-SNAPSHOT - + - - org.slf4j - jcl-over-slf4j - ${org.slf4j.version} - - org.apache.commons commons-lang3 diff --git a/dozer/src/test/java/com/baeldung/dozer/DozerTest.java b/dozer/src/test/java/com/baeldung/dozer/DozerIntegrationTest.java similarity index 99% rename from dozer/src/test/java/com/baeldung/dozer/DozerTest.java rename to dozer/src/test/java/com/baeldung/dozer/DozerIntegrationTest.java index 107aab078d..591189bca9 100644 --- a/dozer/src/test/java/com/baeldung/dozer/DozerTest.java +++ b/dozer/src/test/java/com/baeldung/dozer/DozerIntegrationTest.java @@ -11,7 +11,7 @@ import org.junit.Before; import org.junit.Ignore; import org.junit.Test; -public class DozerTest { +public class DozerIntegrationTest { private final long GMT_DIFFERENCE = 46800000; DozerBeanMapper mapper; diff --git a/drools/pom.xml b/drools/pom.xml new file mode 100644 index 0000000000..b352044fb8 --- /dev/null +++ b/drools/pom.xml @@ -0,0 +1,71 @@ + + + 4.0.0 + + com.baeldung + drools + 1.0.0-SNAPSHOT + + + com.baeldung + parent-modules + 1.0.0-SNAPSHOT + + + + 4.4.6 + 7.0.0.CR1 + 3.13 + + + + + org.apache.httpcomponents + httpcore + ${http-component-version} + + + + org.kie + kie-ci + ${drools-version} + + + org.drools + drools-decisiontables + ${drools-version} + + + + org.drools + drools-core + ${drools-version} + + + org.drools + drools-compiler + ${drools-version} + + + org.apache.poi + poi + ${apache-poi-version} + + + + org.apache.poi + poi-ooxml + ${apache-poi-version} + + + + org.springframework + spring-core + 4.3.6.RELEASE + + + + + \ No newline at end of file diff --git a/drools/src/main/java/com/baeldung/drools/config/DroolsBeanFactory.java b/drools/src/main/java/com/baeldung/drools/config/DroolsBeanFactory.java new file mode 100644 index 0000000000..5f0d619813 --- /dev/null +++ b/drools/src/main/java/com/baeldung/drools/config/DroolsBeanFactory.java @@ -0,0 +1,67 @@ +package com.baeldung.drools.config; + +import org.kie.api.KieServices; +import org.kie.api.builder.*; +import org.kie.api.io.KieResources; +import org.kie.api.runtime.KieContainer; +import org.kie.api.runtime.KieSession; +import org.kie.internal.io.ResourceFactory; +import java.io.IOException; +import java.util.Arrays; +import java.util.List; + +public class DroolsBeanFactory { + + private static final String RULES_PATH = "com/baeldung/drools/rules/"; + private KieServices kieServices=KieServices.Factory.get(); + + private KieFileSystem getKieFileSystem() throws IOException{ + KieFileSystem kieFileSystem = kieServices.newKieFileSystem(); + List rules=Arrays.asList("SuggestApplicant.drl","Product_rules.xls"); + for(String rule:rules){ + kieFileSystem.write(ResourceFactory.newClassPathResource(rule)); + } + return kieFileSystem; + + } + + public KieContainer getKieContainer() throws IOException { + getKieRepository(); + + KieBuilder kb = kieServices.newKieBuilder(getKieFileSystem()); + kb.buildAll(); + + KieModule kieModule = kb.getKieModule(); + KieContainer kContainer = kieServices.newKieContainer(kieModule.getReleaseId()); + + return kContainer; + + } + + private void getKieRepository() { + final KieRepository kieRepository = kieServices.getRepository(); + kieRepository.addKieModule(new KieModule() { + public ReleaseId getReleaseId() { + return kieRepository.getDefaultReleaseId(); + } + }); + } + + public KieSession getKieSession(){ + getKieRepository(); + KieFileSystem kieFileSystem = kieServices.newKieFileSystem(); + + kieFileSystem.write(ResourceFactory.newClassPathResource("com/baeldung/drools/rules/SuggestApplicant.drl")); + kieFileSystem.write(ResourceFactory.newClassPathResource("com/baeldung/drools/rules/Product_rules.xls")); + + KieBuilder kb = kieServices.newKieBuilder(kieFileSystem); + kb.buildAll(); + KieModule kieModule = kb.getKieModule(); + + KieContainer kContainer = kieServices.newKieContainer(kieModule.getReleaseId()); + + return kContainer.newKieSession(); + + } + +} \ No newline at end of file diff --git a/drools/src/main/java/com/baeldung/drools/model/Applicant.java b/drools/src/main/java/com/baeldung/drools/model/Applicant.java new file mode 100644 index 0000000000..706a55d53c --- /dev/null +++ b/drools/src/main/java/com/baeldung/drools/model/Applicant.java @@ -0,0 +1,48 @@ +package com.baeldung.drools.model; + +public class Applicant { + + private String name; + private int age; + private double currentSalary; + private int experienceInYears; + + public Applicant(String name, int age, Double currentSalary, int experienceInYears) { + this.name = name; + this.age = age; + this.currentSalary = currentSalary; + this.experienceInYears = experienceInYears; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public int getAge() { + return age; + } + + public void setAge(int age) { + this.age = age; + } + + public Double getCurrentSalary() { + return currentSalary; + } + + public void setCurrentSalary(Double currentSalary) { + this.currentSalary = currentSalary; + } + + public int getExperienceInYears() { + return experienceInYears; + } + + public void setExperienceInYears(int experienceInYears) { + this.experienceInYears = experienceInYears; + } +} diff --git a/drools/src/main/java/com/baeldung/drools/model/Product.java b/drools/src/main/java/com/baeldung/drools/model/Product.java new file mode 100644 index 0000000000..3d49ca4ec3 --- /dev/null +++ b/drools/src/main/java/com/baeldung/drools/model/Product.java @@ -0,0 +1,38 @@ +package com.baeldung.drools.model; + +public class Product { + private String name; + private String type; + + private String label; + + public Product(String name, String type) { + this.name = name; + this.type = type; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public String getLabel() { + return label; + } + + public void setLabel(String label) { + this.label = label; + } + +} diff --git a/drools/src/main/java/com/baeldung/drools/model/SuggestedRole.java b/drools/src/main/java/com/baeldung/drools/model/SuggestedRole.java new file mode 100644 index 0000000000..3e9763aef2 --- /dev/null +++ b/drools/src/main/java/com/baeldung/drools/model/SuggestedRole.java @@ -0,0 +1,14 @@ +package com.baeldung.drools.model; + +public class SuggestedRole { + + private String role; + + public String getRole() { + return role; + } + + public void setRole(String role) { + this.role = role; + } +} diff --git a/drools/src/main/java/com/baeldung/drools/service/ApplicantService.java b/drools/src/main/java/com/baeldung/drools/service/ApplicantService.java new file mode 100644 index 0000000000..f74298ef05 --- /dev/null +++ b/drools/src/main/java/com/baeldung/drools/service/ApplicantService.java @@ -0,0 +1,23 @@ +package com.baeldung.drools.service; + +import com.baeldung.drools.config.DroolsBeanFactory; +import com.baeldung.drools.model.Applicant; +import com.baeldung.drools.model.SuggestedRole; +import org.kie.api.runtime.KieContainer; +import org.kie.api.runtime.KieSession; + +import java.io.IOException; + +public class ApplicantService { + + KieSession kieSession=new DroolsBeanFactory().getKieSession(); + + public SuggestedRole suggestARoleForApplicant(Applicant applicant,SuggestedRole suggestedRole) throws IOException { + kieSession.insert(applicant); + kieSession.setGlobal("suggestedRole",suggestedRole); + kieSession.fireAllRules(); + System.out.println(suggestedRole.getRole()); + return suggestedRole; + + } +} diff --git a/drools/src/main/java/com/baeldung/drools/service/ProductService.java b/drools/src/main/java/com/baeldung/drools/service/ProductService.java new file mode 100644 index 0000000000..be5e43ed7b --- /dev/null +++ b/drools/src/main/java/com/baeldung/drools/service/ProductService.java @@ -0,0 +1,20 @@ +package com.baeldung.drools.service; + +import com.baeldung.drools.config.DroolsBeanFactory; +import com.baeldung.drools.model.Product; +import org.kie.api.runtime.KieContainer; +import org.kie.api.runtime.KieSession; + +public class ProductService { + + private KieSession kieSession=new DroolsBeanFactory().getKieSession(); + + public Product applyLabelToProduct(Product product){ + kieSession.insert(product); + kieSession.fireAllRules(); + System.out.println(product.getLabel()); + return product; + + } + +} diff --git a/drools/src/main/resources/com/baeldung/drools/rules/Product_rules.xls b/drools/src/main/resources/com/baeldung/drools/rules/Product_rules.xls new file mode 100644 index 0000000000..4cb18c7420 Binary files /dev/null and b/drools/src/main/resources/com/baeldung/drools/rules/Product_rules.xls differ diff --git a/drools/src/main/resources/com/baeldung/drools/rules/SuggestApplicant.drl b/drools/src/main/resources/com/baeldung/drools/rules/SuggestApplicant.drl new file mode 100644 index 0000000000..3deb037571 --- /dev/null +++ b/drools/src/main/resources/com/baeldung/drools/rules/SuggestApplicant.drl @@ -0,0 +1,31 @@ +package com.baeldung.drools.rules; + +import com.baeldung.drools.model.Applicant; + +global com.baeldung.drools.model.SuggestedRole suggestedRole; + +dialect "mvel" + +rule "Suggest Manager Role" + when + Applicant(experienceInYears > 10) + Applicant(currentSalary > 1000000 && currentSalary <= 2500000) + then + suggestedRole.setRole("Manager"); +end + +rule "Suggest Senior developer Role" + when + Applicant(experienceInYears > 5 && experienceInYears <= 10) + Applicant(currentSalary > 500000 && currentSalary <= 1500000) + then + suggestedRole.setRole("Senior developer"); +end + +rule "Suggest Developer Role" + when + Applicant(experienceInYears > 0 && experienceInYears <= 5) + Applicant(currentSalary > 200000 && currentSalary <= 1000000) + then + suggestedRole.setRole("Developer"); +end diff --git a/drools/src/test/java/com/baeldung/drools/service/ApplicantServiceIntegrationTest.java b/drools/src/test/java/com/baeldung/drools/service/ApplicantServiceIntegrationTest.java new file mode 100644 index 0000000000..71f33f2db4 --- /dev/null +++ b/drools/src/test/java/com/baeldung/drools/service/ApplicantServiceIntegrationTest.java @@ -0,0 +1,53 @@ +package com.baeldung.drools.service; + +import com.baeldung.drools.model.Applicant; +import com.baeldung.drools.model.SuggestedRole; +import org.junit.Before; +import org.junit.Test; + +import java.io.IOException; + +import static junit.framework.Assert.assertNull; +import static junit.framework.TestCase.assertEquals; + + +public class ApplicantServiceIntegrationTest { + + + private ApplicantService applicantService; + + @Before + public void setup(){ + applicantService = new ApplicantService(); + } + + @Test + public void whenCriteriaMatching_ThenSuggestManagerRole() throws IOException { + Applicant applicant=new Applicant("Davis",37,1600000.0,11); + SuggestedRole suggestedRole=new SuggestedRole(); + applicantService.suggestARoleForApplicant(applicant,suggestedRole); + assertEquals("Manager",suggestedRole.getRole()); + } + + @Test + public void whenCriteriaMatching_ThenSuggestSeniorDeveloperRole() throws IOException { + Applicant applicant=new Applicant("John",37,1200000.0,8); + SuggestedRole suggestedRole=new SuggestedRole(); + applicantService.suggestARoleForApplicant(applicant,suggestedRole); + assertEquals("Senior developer",suggestedRole.getRole()); + } + @Test + public void whenCriteriaMatching_ThenSuggestDeveloperRole() throws IOException { + Applicant applicant=new Applicant("Davis",37,800000.0,3); + SuggestedRole suggestedRole=new SuggestedRole(); + applicantService.suggestARoleForApplicant(applicant,suggestedRole); + assertEquals("Developer",suggestedRole.getRole()); + } + @Test + public void whenCriteriaNotMatching_ThenNoRole() throws IOException { + Applicant applicant=new Applicant("John",37,1200000.0,5); + SuggestedRole suggestedRole=new SuggestedRole(); + applicantService.suggestARoleForApplicant(applicant,suggestedRole); + assertNull(suggestedRole.getRole()); + } +} diff --git a/drools/src/test/java/com/baeldung/drools/service/ProductServiceIntegrationTest.java b/drools/src/test/java/com/baeldung/drools/service/ProductServiceIntegrationTest.java new file mode 100644 index 0000000000..08c3fceb7d --- /dev/null +++ b/drools/src/test/java/com/baeldung/drools/service/ProductServiceIntegrationTest.java @@ -0,0 +1,32 @@ +package com.baeldung.drools.service; + +import com.baeldung.drools.model.Product; +import org.junit.Before; +import org.junit.Test; +import static junit.framework.TestCase.assertEquals; + + +public class ProductServiceIntegrationTest { + + private ProductService productService; + + @Before + public void setup(){ + productService=new ProductService(); + } + + + @Test + public void whenProductTypeElectronic_ThenLabelBarcode(){ + Product product=new Product("Microwave","Electronic"); + product=productService.applyLabelToProduct(product); + assertEquals("BarCode",product.getLabel()); + } + + @Test + public void whenProductTypeBook_ThenLabelIsbn(){ + Product product=new Product("AutoBiography","Book"); + product=productService.applyLabelToProduct(product); + assertEquals("ISBN",product.getLabel()); + } +} diff --git a/ejb/ejb-client/pom.xml b/ejb/ejb-client/pom.xml index ba5763a3e7..ca8ec55f12 100755 --- a/ejb/ejb-client/pom.xml +++ b/ejb/ejb-client/pom.xml @@ -1,20 +1,17 @@ - 4.0.0 - - com.baeldung.ejb - ejb - 1.0-SNAPSHOT - - ejb-client - EJB3 Client Maven - EJB3 Client Maven + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + 4.0.0 - - 4.12 - 2.19 - + + com.baeldung.ejb + ejb + 1.0-SNAPSHOT + + + ejb-client + EJB3 Client Maven + EJB3 Client Maven @@ -29,13 +26,8 @@ ejb - - junit - junit - ${junit.version} - test - + @@ -50,4 +42,5 @@ + \ No newline at end of file diff --git a/ejb/ejb-client/src/test/java/com/baeldung/ejb/setup/test/EJBSetupTest.java b/ejb/ejb-client/src/test/java/com/baeldung/ejb/setup/test/EJBSetupIntegrationTest.java similarity index 91% rename from ejb/ejb-client/src/test/java/com/baeldung/ejb/setup/test/EJBSetupTest.java rename to ejb/ejb-client/src/test/java/com/baeldung/ejb/setup/test/EJBSetupIntegrationTest.java index fa92873a73..c04a649d26 100755 --- a/ejb/ejb-client/src/test/java/com/baeldung/ejb/setup/test/EJBSetupTest.java +++ b/ejb/ejb-client/src/test/java/com/baeldung/ejb/setup/test/EJBSetupIntegrationTest.java @@ -6,7 +6,7 @@ import org.junit.Test; import static org.junit.Assert.assertEquals; -public class EJBSetupTest { +public class EJBSetupIntegrationTest { @Test public void EJBClientTest() { diff --git a/ejb/pom.xml b/ejb/pom.xml index bfcc972417..9495020266 100755 --- a/ejb/pom.xml +++ b/ejb/pom.xml @@ -9,6 +9,12 @@ ejb EJB Tutorial + + com.baeldung + parent-modules + 1.0.0-SNAPSHOT + + jboss-public-repository-group @@ -55,15 +61,6 @@ - - maven-compiler-plugin - 3.1 - - 1.8 - 1.8 - - - maven-ejb-plugin 2.4 diff --git a/feign/pom.xml b/feign/pom.xml index 63c6a23139..9c3868c82f 100644 --- a/feign/pom.xml +++ b/feign/pom.xml @@ -1,5 +1,6 @@ - 4.0.0 @@ -58,18 +59,6 @@ spring-boot-maven-plugin ${spring-boot-maven-plugin.version} - - org.apache.maven.plugins - maven-surefire-plugin - ${maven-surefire-plugin.version} - - true - - **/*IntegrationTest.java - **/*LiveTest.java - - - diff --git a/flyway/pom.xml b/flyway/pom.xml index 900987fc65..2774602654 100644 --- a/flyway/pom.xml +++ b/flyway/pom.xml @@ -11,7 +11,7 @@ com.baeldung parent-modules 1.0.0-SNAPSHOT - + diff --git a/groovy-spock/pom.xml b/groovy-spock/pom.xml index b908a46704..d9b51c5e1a 100644 --- a/groovy-spock/pom.xml +++ b/groovy-spock/pom.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 org.spockframework groovy-spock @@ -17,8 +17,8 @@ com.baeldung parent-modules 1.0.0-SNAPSHOT - - + + diff --git a/gson/pom.xml b/gson/pom.xml index 7d81dfe65b..24162bb72b 100644 --- a/gson/pom.xml +++ b/gson/pom.xml @@ -1,4 +1,5 @@ - + 4.0.0 com.baeldung gson @@ -10,8 +11,8 @@ com.baeldung parent-modules 1.0.0-SNAPSHOT - - + + @@ -53,28 +54,6 @@ ${gson.version} - - - - org.hamcrest - hamcrest-core - ${org.hamcrest.version} - test - - - org.hamcrest - hamcrest-library - ${org.hamcrest.version} - test - - - - org.mockito - mockito-core - ${mockito.version} - test - - @@ -98,10 +77,6 @@ 2.5 2.9.6 - - 1.3 - 1.10.19 - \ No newline at end of file diff --git a/gson/src/test/java/org/baeldung/gson/deserialization/GsonDeserializeTest.java b/gson/src/test/java/org/baeldung/gson/deserialization/GsonDeserializeUnitTest.java similarity index 98% rename from gson/src/test/java/org/baeldung/gson/deserialization/GsonDeserializeTest.java rename to gson/src/test/java/org/baeldung/gson/deserialization/GsonDeserializeUnitTest.java index 3844c55cd8..40e8524744 100644 --- a/gson/src/test/java/org/baeldung/gson/deserialization/GsonDeserializeTest.java +++ b/gson/src/test/java/org/baeldung/gson/deserialization/GsonDeserializeUnitTest.java @@ -11,7 +11,7 @@ import org.junit.Test; import com.google.gson.Gson; import com.google.gson.GsonBuilder; -public class GsonDeserializeTest { +public class GsonDeserializeUnitTest { @Test public void whenSimpleDeserialize_thenCorrect() throws ParseException { diff --git a/gson/src/test/java/org/baeldung/gson/deserialization/test/GsonDeserializationTest.java b/gson/src/test/java/org/baeldung/gson/deserialization/test/GsonDeserializationUnitTest.java similarity index 99% rename from gson/src/test/java/org/baeldung/gson/deserialization/test/GsonDeserializationTest.java rename to gson/src/test/java/org/baeldung/gson/deserialization/test/GsonDeserializationUnitTest.java index 072a25e749..784bb45a6a 100644 --- a/gson/src/test/java/org/baeldung/gson/deserialization/test/GsonDeserializationTest.java +++ b/gson/src/test/java/org/baeldung/gson/deserialization/test/GsonDeserializationUnitTest.java @@ -25,7 +25,7 @@ import com.google.gson.JsonObject; import com.google.gson.JsonParser; import com.google.gson.reflect.TypeToken; -public class GsonDeserializationTest { +public class GsonDeserializationUnitTest { // tests - single element diff --git a/gson/src/test/java/org/baeldung/gson/serialization/GsonSerializeTest.java b/gson/src/test/java/org/baeldung/gson/serialization/GsonSerializeUnitTest.java similarity index 98% rename from gson/src/test/java/org/baeldung/gson/serialization/GsonSerializeTest.java rename to gson/src/test/java/org/baeldung/gson/serialization/GsonSerializeUnitTest.java index 7d5502b72f..4392ea1631 100644 --- a/gson/src/test/java/org/baeldung/gson/serialization/GsonSerializeTest.java +++ b/gson/src/test/java/org/baeldung/gson/serialization/GsonSerializeUnitTest.java @@ -13,7 +13,7 @@ import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Arrays; -public class GsonSerializeTest { +public class GsonSerializeUnitTest { @Test public void whenSimpleSerialize_thenCorrect() throws ParseException { diff --git a/gson/src/test/java/org/baeldung/gson/serialization/test/GsonSerializationTest.java b/gson/src/test/java/org/baeldung/gson/serialization/test/GsonSerializationUnitTest.java similarity index 98% rename from gson/src/test/java/org/baeldung/gson/serialization/test/GsonSerializationTest.java rename to gson/src/test/java/org/baeldung/gson/serialization/test/GsonSerializationUnitTest.java index 84e550f0bd..6806c470b9 100644 --- a/gson/src/test/java/org/baeldung/gson/serialization/test/GsonSerializationTest.java +++ b/gson/src/test/java/org/baeldung/gson/serialization/test/GsonSerializationUnitTest.java @@ -21,7 +21,7 @@ import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.reflect.TypeToken; -public class GsonSerializationTest { +public class GsonSerializationUnitTest { @Test public void givenArrayOfObjects_whenSerializing_thenCorrect() { diff --git a/guava/pom.xml b/guava/pom.xml index a44a0556d2..4afb4da301 100644 --- a/guava/pom.xml +++ b/guava/pom.xml @@ -1,4 +1,5 @@ - + 4.0.0 com.baeldung guava @@ -10,8 +11,8 @@ com.baeldung parent-modules 1.0.0-SNAPSHOT - - + + @@ -36,36 +37,6 @@ - - org.hamcrest - hamcrest-core - ${org.hamcrest.version} - test - - - org.hamcrest - hamcrest-library - ${org.hamcrest.version} - test - - - - org.mockito - mockito-core - ${mockito.version} - test - - - - - - org.slf4j - jcl-over-slf4j - ${org.slf4j.version} - - - - org.assertj assertj-core @@ -91,8 +62,6 @@ 4.1 - 1.3 - 1.10.19 3.6.1 diff --git a/guava/src/test/java/org/baeldung/guava/ClassToInstanceMapTests.java b/guava/src/test/java/org/baeldung/guava/ClassToInstanceMapUnitTest.java similarity index 98% rename from guava/src/test/java/org/baeldung/guava/ClassToInstanceMapTests.java rename to guava/src/test/java/org/baeldung/guava/ClassToInstanceMapUnitTest.java index aef70aa72e..295672d7ad 100644 --- a/guava/src/test/java/org/baeldung/guava/ClassToInstanceMapTests.java +++ b/guava/src/test/java/org/baeldung/guava/ClassToInstanceMapUnitTest.java @@ -6,7 +6,7 @@ import org.junit.Test; import static org.junit.Assert.*; -public class ClassToInstanceMapTests { +public class ClassToInstanceMapUnitTest { @Test public void whenOfCalled_thenCreateEmptyImmutableMap() { ClassToInstanceMap map = ImmutableClassToInstanceMap.of(); diff --git a/guava/src/test/java/org/baeldung/guava/EvictingQueueTest.java b/guava/src/test/java/org/baeldung/guava/EvictingQueueUnitTest.java similarity index 95% rename from guava/src/test/java/org/baeldung/guava/EvictingQueueTest.java rename to guava/src/test/java/org/baeldung/guava/EvictingQueueUnitTest.java index 7758dcd975..e4d29d2e92 100644 --- a/guava/src/test/java/org/baeldung/guava/EvictingQueueTest.java +++ b/guava/src/test/java/org/baeldung/guava/EvictingQueueUnitTest.java @@ -9,7 +9,7 @@ import java.util.stream.IntStream; import static org.assertj.core.api.Java6Assertions.assertThat; -public class EvictingQueueTest { +public class EvictingQueueUnitTest { @Test public void givenEvictingQueue_whenAddElementToFull_thenShouldEvictOldestItem() { diff --git a/guava/src/test/java/org/baeldung/guava/GuavaBigIntegerMathTest.java b/guava/src/test/java/org/baeldung/guava/GuavaBigIntegerMathUnitTest.java similarity index 99% rename from guava/src/test/java/org/baeldung/guava/GuavaBigIntegerMathTest.java rename to guava/src/test/java/org/baeldung/guava/GuavaBigIntegerMathUnitTest.java index 4dd36fa58d..f5afe20fc2 100644 --- a/guava/src/test/java/org/baeldung/guava/GuavaBigIntegerMathTest.java +++ b/guava/src/test/java/org/baeldung/guava/GuavaBigIntegerMathUnitTest.java @@ -10,7 +10,7 @@ import org.junit.Test; import com.google.common.math.BigIntegerMath; -public class GuavaBigIntegerMathTest { +public class GuavaBigIntegerMathUnitTest { @Test public void whenPerformBinomialOnTwoIntValues_shouldReturnResult() { diff --git a/guava/src/test/java/org/baeldung/guava/GuavaCacheLoaderTest.java b/guava/src/test/java/org/baeldung/guava/GuavaCacheLoaderUnitTest.java similarity index 98% rename from guava/src/test/java/org/baeldung/guava/GuavaCacheLoaderTest.java rename to guava/src/test/java/org/baeldung/guava/GuavaCacheLoaderUnitTest.java index 2aa2e6140b..e27171bb84 100644 --- a/guava/src/test/java/org/baeldung/guava/GuavaCacheLoaderTest.java +++ b/guava/src/test/java/org/baeldung/guava/GuavaCacheLoaderUnitTest.java @@ -15,7 +15,7 @@ import static com.google.common.collect.Iterables.cycle; import static com.google.common.collect.Maps.newHashMap; import static org.assertj.core.api.Assertions.assertThat; -public class GuavaCacheLoaderTest { +public class GuavaCacheLoaderUnitTest { int callCount = 0; @Test diff --git a/guava/src/test/java/org/baeldung/guava/GuavaCacheTest.java b/guava/src/test/java/org/baeldung/guava/GuavaCacheUnitTest.java similarity index 99% rename from guava/src/test/java/org/baeldung/guava/GuavaCacheTest.java rename to guava/src/test/java/org/baeldung/guava/GuavaCacheUnitTest.java index 3c3b976903..eb67d8af44 100644 --- a/guava/src/test/java/org/baeldung/guava/GuavaCacheTest.java +++ b/guava/src/test/java/org/baeldung/guava/GuavaCacheUnitTest.java @@ -19,7 +19,7 @@ import com.google.common.cache.RemovalListener; import com.google.common.cache.RemovalNotification; import com.google.common.cache.Weigher; -public class GuavaCacheTest { +public class GuavaCacheUnitTest { @Test public void whenCacheMiss_thenAutoLoad() { diff --git a/guava/src/test/java/org/baeldung/guava/GuavaCollectionTypesTest.java b/guava/src/test/java/org/baeldung/guava/GuavaCollectionTypesUnitTest.java similarity index 99% rename from guava/src/test/java/org/baeldung/guava/GuavaCollectionTypesTest.java rename to guava/src/test/java/org/baeldung/guava/GuavaCollectionTypesUnitTest.java index 9c38afbcc2..cb6ec7ef96 100644 --- a/guava/src/test/java/org/baeldung/guava/GuavaCollectionTypesTest.java +++ b/guava/src/test/java/org/baeldung/guava/GuavaCollectionTypesUnitTest.java @@ -42,7 +42,7 @@ import com.google.common.collect.Table; import com.google.common.collect.Tables; import com.google.common.collect.TreeRangeSet; -public class GuavaCollectionTypesTest { +public class GuavaCollectionTypesUnitTest { @Test public void whenCreateList_thenCreated() { diff --git a/guava/src/test/java/org/baeldung/guava/GuavaCollectionsExamplesTest.java b/guava/src/test/java/org/baeldung/guava/GuavaCollectionsExamplesUnitTest.java similarity index 99% rename from guava/src/test/java/org/baeldung/guava/GuavaCollectionsExamplesTest.java rename to guava/src/test/java/org/baeldung/guava/GuavaCollectionsExamplesUnitTest.java index 2c137e6c80..7b5cef6055 100644 --- a/guava/src/test/java/org/baeldung/guava/GuavaCollectionsExamplesTest.java +++ b/guava/src/test/java/org/baeldung/guava/GuavaCollectionsExamplesUnitTest.java @@ -24,7 +24,7 @@ import com.google.common.collect.Maps; import com.google.common.collect.Sets; @SuppressWarnings("unused") -public class GuavaCollectionsExamplesTest { +public class GuavaCollectionsExamplesUnitTest { // tests diff --git a/guava/src/test/java/org/baeldung/guava/GuavaDoubleMathTest.java b/guava/src/test/java/org/baeldung/guava/GuavaDoubleMathUnitTest.java similarity index 98% rename from guava/src/test/java/org/baeldung/guava/GuavaDoubleMathTest.java rename to guava/src/test/java/org/baeldung/guava/GuavaDoubleMathUnitTest.java index ad06b37e36..b39770e2e7 100644 --- a/guava/src/test/java/org/baeldung/guava/GuavaDoubleMathTest.java +++ b/guava/src/test/java/org/baeldung/guava/GuavaDoubleMathUnitTest.java @@ -9,7 +9,7 @@ import org.junit.Test; import com.google.common.math.DoubleMath; import com.google.common.math.IntMath; -public class GuavaDoubleMathTest { +public class GuavaDoubleMathUnitTest { @Test public void whenFactorailDouble_shouldFactorialThemAndReturnTheResultIfInDoubleRange() { diff --git a/guava/src/test/java/org/baeldung/guava/GuavaEventBusTest.java b/guava/src/test/java/org/baeldung/guava/GuavaEventBusUnitTest.java similarity index 97% rename from guava/src/test/java/org/baeldung/guava/GuavaEventBusTest.java rename to guava/src/test/java/org/baeldung/guava/GuavaEventBusUnitTest.java index 0ff25c6df2..1bc62af300 100644 --- a/guava/src/test/java/org/baeldung/guava/GuavaEventBusTest.java +++ b/guava/src/test/java/org/baeldung/guava/GuavaEventBusUnitTest.java @@ -7,7 +7,7 @@ import org.junit.Test; import static org.junit.Assert.*; -public class GuavaEventBusTest { +public class GuavaEventBusUnitTest { private EventListener listener; private EventBus eventBus; diff --git a/guava/src/test/java/org/baeldung/guava/GuavaFilterTransformCollectionsTest.java b/guava/src/test/java/org/baeldung/guava/GuavaFilterTransformCollectionsUnitTest.java similarity index 99% rename from guava/src/test/java/org/baeldung/guava/GuavaFilterTransformCollectionsTest.java rename to guava/src/test/java/org/baeldung/guava/GuavaFilterTransformCollectionsUnitTest.java index 1ecf8fdb0a..8562193665 100644 --- a/guava/src/test/java/org/baeldung/guava/GuavaFilterTransformCollectionsTest.java +++ b/guava/src/test/java/org/baeldung/guava/GuavaFilterTransformCollectionsUnitTest.java @@ -21,7 +21,7 @@ import com.google.common.collect.FluentIterable; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; -public class GuavaFilterTransformCollectionsTest { +public class GuavaFilterTransformCollectionsUnitTest { @Test public void whenFilterWithIterables_thenFiltered() { diff --git a/guava/src/test/java/org/baeldung/guava/GuavaFunctionalExamplesTest.java b/guava/src/test/java/org/baeldung/guava/GuavaFunctionalExamplesUnitTest.java similarity index 99% rename from guava/src/test/java/org/baeldung/guava/GuavaFunctionalExamplesTest.java rename to guava/src/test/java/org/baeldung/guava/GuavaFunctionalExamplesUnitTest.java index 08091639f1..c09ae696b3 100644 --- a/guava/src/test/java/org/baeldung/guava/GuavaFunctionalExamplesTest.java +++ b/guava/src/test/java/org/baeldung/guava/GuavaFunctionalExamplesUnitTest.java @@ -26,7 +26,7 @@ import com.google.common.collect.Maps; import com.google.common.collect.Ordering; import com.google.common.collect.Sets; -public class GuavaFunctionalExamplesTest { +public class GuavaFunctionalExamplesUnitTest { // tests diff --git a/guava/src/test/java/org/baeldung/guava/GuavaIOTest.java b/guava/src/test/java/org/baeldung/guava/GuavaIOUnitTest.java similarity index 99% rename from guava/src/test/java/org/baeldung/guava/GuavaIOTest.java rename to guava/src/test/java/org/baeldung/guava/GuavaIOUnitTest.java index 47fee206dc..4a827dfbc0 100644 --- a/guava/src/test/java/org/baeldung/guava/GuavaIOTest.java +++ b/guava/src/test/java/org/baeldung/guava/GuavaIOUnitTest.java @@ -29,7 +29,7 @@ import com.google.common.io.LittleEndianDataInputStream; import com.google.common.io.LittleEndianDataOutputStream; import com.google.common.io.Resources; -public class GuavaIOTest { +public class GuavaIOUnitTest { @Test public void whenWriteUsingFiles_thenWritten() throws IOException { diff --git a/guava/src/test/java/org/baeldung/guava/GuavaIntMathTest.java b/guava/src/test/java/org/baeldung/guava/GuavaIntMathUnitTest.java similarity index 99% rename from guava/src/test/java/org/baeldung/guava/GuavaIntMathTest.java rename to guava/src/test/java/org/baeldung/guava/GuavaIntMathUnitTest.java index 9c8f3923d3..9270212929 100644 --- a/guava/src/test/java/org/baeldung/guava/GuavaIntMathTest.java +++ b/guava/src/test/java/org/baeldung/guava/GuavaIntMathUnitTest.java @@ -7,7 +7,7 @@ import java.math.RoundingMode; import com.google.common.math.IntMath; import org.junit.Test; -public class GuavaIntMathTest { +public class GuavaIntMathUnitTest { @Test public void whenPerformBinomialOnTwoIntegerValues_shouldReturnResultIfUnderInt() { diff --git a/guava/src/test/java/org/baeldung/guava/GuavaLongMathTest.java b/guava/src/test/java/org/baeldung/guava/GuavaLongMathUnitTest.java similarity index 99% rename from guava/src/test/java/org/baeldung/guava/GuavaLongMathTest.java rename to guava/src/test/java/org/baeldung/guava/GuavaLongMathUnitTest.java index 5d6d06c571..680f405149 100644 --- a/guava/src/test/java/org/baeldung/guava/GuavaLongMathTest.java +++ b/guava/src/test/java/org/baeldung/guava/GuavaLongMathUnitTest.java @@ -7,7 +7,7 @@ import java.math.RoundingMode; import com.google.common.math.LongMath; import org.junit.Test; -public class GuavaLongMathTest { +public class GuavaLongMathUnitTest { @Test public void whenPerformBinomialOnTwoLongValues_shouldReturnResultIfUnderLong() { diff --git a/guava/src/test/java/org/baeldung/guava/GuavaMapFromSetTests.java b/guava/src/test/java/org/baeldung/guava/GuavaMapFromSetUnitTest.java similarity index 98% rename from guava/src/test/java/org/baeldung/guava/GuavaMapFromSetTests.java rename to guava/src/test/java/org/baeldung/guava/GuavaMapFromSetUnitTest.java index 7dc4550c09..d80f047f5c 100644 --- a/guava/src/test/java/org/baeldung/guava/GuavaMapFromSetTests.java +++ b/guava/src/test/java/org/baeldung/guava/GuavaMapFromSetUnitTest.java @@ -11,7 +11,7 @@ import org.junit.Test; import com.google.common.base.Function; -public class GuavaMapFromSetTests { +public class GuavaMapFromSetUnitTest { @Test public void givenStringSet_whenMapsToElementLength_thenCorrect() { diff --git a/guava/src/test/java/org/baeldung/guava/GuavaMathTest.java b/guava/src/test/java/org/baeldung/guava/GuavaMathUnitTest.java similarity index 99% rename from guava/src/test/java/org/baeldung/guava/GuavaMathTest.java rename to guava/src/test/java/org/baeldung/guava/GuavaMathUnitTest.java index b8e13f0650..1e1f806628 100644 --- a/guava/src/test/java/org/baeldung/guava/GuavaMathTest.java +++ b/guava/src/test/java/org/baeldung/guava/GuavaMathUnitTest.java @@ -11,7 +11,7 @@ import org.junit.Test; import com.google.common.math.DoubleMath; import com.google.common.math.IntMath; -public class GuavaMathTest { +public class GuavaMathUnitTest { @Test(expected = ArithmeticException.class) public void whenSumOverflow_thenThrowException() { IntMath.checkedAdd(Integer.MAX_VALUE, 1); diff --git a/guava/src/test/java/org/baeldung/guava/GuavaMultiMapTest.java b/guava/src/test/java/org/baeldung/guava/GuavaMultiMapUnitTest.java similarity index 97% rename from guava/src/test/java/org/baeldung/guava/GuavaMultiMapTest.java rename to guava/src/test/java/org/baeldung/guava/GuavaMultiMapUnitTest.java index 5e80dd2f87..f51dcadefc 100644 --- a/guava/src/test/java/org/baeldung/guava/GuavaMultiMapTest.java +++ b/guava/src/test/java/org/baeldung/guava/GuavaMultiMapUnitTest.java @@ -12,7 +12,7 @@ import java.util.Map; import static org.junit.Assert.assertEquals; -public class GuavaMultiMapTest { +public class GuavaMultiMapUnitTest { @Test public void givenMap_whenAddTwoValuesForSameKey_shouldOverridePreviousKey() { diff --git a/guava/src/test/java/org/baeldung/guava/GuavaOrderingExamplesTest.java b/guava/src/test/java/org/baeldung/guava/GuavaOrderingExamplesUnitTest.java similarity index 99% rename from guava/src/test/java/org/baeldung/guava/GuavaOrderingExamplesTest.java rename to guava/src/test/java/org/baeldung/guava/GuavaOrderingExamplesUnitTest.java index 5821d19ba0..b8be06deb4 100644 --- a/guava/src/test/java/org/baeldung/guava/GuavaOrderingExamplesTest.java +++ b/guava/src/test/java/org/baeldung/guava/GuavaOrderingExamplesUnitTest.java @@ -17,7 +17,7 @@ import com.google.common.collect.Lists; import com.google.common.collect.Ordering; import com.google.common.primitives.Ints; -public class GuavaOrderingExamplesTest { +public class GuavaOrderingExamplesUnitTest { private final class OrderingByLenght extends Ordering { @Override diff --git a/guava/src/test/java/org/baeldung/guava/GuavaOrderingTest.java b/guava/src/test/java/org/baeldung/guava/GuavaOrderingUnitTest.java similarity index 98% rename from guava/src/test/java/org/baeldung/guava/GuavaOrderingTest.java rename to guava/src/test/java/org/baeldung/guava/GuavaOrderingUnitTest.java index 5ecf4f048d..dd250898fd 100644 --- a/guava/src/test/java/org/baeldung/guava/GuavaOrderingTest.java +++ b/guava/src/test/java/org/baeldung/guava/GuavaOrderingUnitTest.java @@ -10,7 +10,7 @@ import java.util.List; import static org.junit.Assert.assertEquals; -public class GuavaOrderingTest { +public class GuavaOrderingUnitTest { @Test public void givenListOfIntegers_whenCreateNaturalOrderOrdering_shouldSortProperly() { //given diff --git a/guava/src/test/java/org/baeldung/guava/GuavaPreConditionsTest.java b/guava/src/test/java/org/baeldung/guava/GuavaPreConditionsUnitTest.java similarity index 99% rename from guava/src/test/java/org/baeldung/guava/GuavaPreConditionsTest.java rename to guava/src/test/java/org/baeldung/guava/GuavaPreConditionsUnitTest.java index 2d98418d48..6bf9e5c7a2 100644 --- a/guava/src/test/java/org/baeldung/guava/GuavaPreConditionsTest.java +++ b/guava/src/test/java/org/baeldung/guava/GuavaPreConditionsUnitTest.java @@ -5,7 +5,7 @@ import java.util.Arrays; import org.junit.Test; import com.google.common.base.*; -public class GuavaPreConditionsTest { +public class GuavaPreConditionsUnitTest { @Test public void whenCheckArgumentEvaluatesFalse_throwsException() { diff --git a/guava/src/test/java/org/baeldung/guava/GuavaRangeMapTest.java b/guava/src/test/java/org/baeldung/guava/GuavaRangeMapUnitTest.java similarity index 99% rename from guava/src/test/java/org/baeldung/guava/GuavaRangeMapTest.java rename to guava/src/test/java/org/baeldung/guava/GuavaRangeMapUnitTest.java index b68dca97c6..81ba72373c 100644 --- a/guava/src/test/java/org/baeldung/guava/GuavaRangeMapTest.java +++ b/guava/src/test/java/org/baeldung/guava/GuavaRangeMapUnitTest.java @@ -9,7 +9,7 @@ import com.google.common.collect.Range; import com.google.common.collect.RangeMap; import com.google.common.collect.TreeRangeMap; -public class GuavaRangeMapTest { +public class GuavaRangeMapUnitTest { @Test public void givenRangeMap_whenQueryWithinRange_returnsSucessfully() { diff --git a/guava/src/test/java/org/baeldung/guava/GuavaRangeSetTest.java b/guava/src/test/java/org/baeldung/guava/GuavaRangeSetUnitTest.java similarity index 99% rename from guava/src/test/java/org/baeldung/guava/GuavaRangeSetTest.java rename to guava/src/test/java/org/baeldung/guava/GuavaRangeSetUnitTest.java index 002e1a61e9..6f3092d845 100644 --- a/guava/src/test/java/org/baeldung/guava/GuavaRangeSetTest.java +++ b/guava/src/test/java/org/baeldung/guava/GuavaRangeSetUnitTest.java @@ -9,7 +9,7 @@ import com.google.common.collect.Range; import com.google.common.collect.RangeSet; import com.google.common.collect.TreeRangeSet; -public class GuavaRangeSetTest { +public class GuavaRangeSetUnitTest { @Test public void givenRangeSet_whenQueryWithinRange_returnsSucessfully() { diff --git a/guava/src/test/java/org/baeldung/guava/GuavaReflectionUtilsTest.java b/guava/src/test/java/org/baeldung/guava/GuavaReflectionUtilsUnitTest.java similarity index 99% rename from guava/src/test/java/org/baeldung/guava/GuavaReflectionUtilsTest.java rename to guava/src/test/java/org/baeldung/guava/GuavaReflectionUtilsUnitTest.java index e59a682e08..f2d1c08ae9 100644 --- a/guava/src/test/java/org/baeldung/guava/GuavaReflectionUtilsTest.java +++ b/guava/src/test/java/org/baeldung/guava/GuavaReflectionUtilsUnitTest.java @@ -18,7 +18,7 @@ import static junit.framework.TestCase.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -public class GuavaReflectionUtilsTest { +public class GuavaReflectionUtilsUnitTest { @Test public void givenTwoGenericList_whenCheckIsAssignableFrom_thenReturnTrueDueToTypeErasure() { diff --git a/guava/src/test/java/org/baeldung/guava/GuavaStringTest.java b/guava/src/test/java/org/baeldung/guava/GuavaStringUnitTest.java similarity index 99% rename from guava/src/test/java/org/baeldung/guava/GuavaStringTest.java rename to guava/src/test/java/org/baeldung/guava/GuavaStringUnitTest.java index cedbe60d91..631ca454c0 100644 --- a/guava/src/test/java/org/baeldung/guava/GuavaStringTest.java +++ b/guava/src/test/java/org/baeldung/guava/GuavaStringUnitTest.java @@ -19,7 +19,7 @@ import com.google.common.base.Joiner; import com.google.common.base.Predicate; import com.google.common.base.Splitter; -public class GuavaStringTest { +public class GuavaStringUnitTest { @Test public void whenConvertListToString_thenConverted() { diff --git a/guava/src/test/java/org/baeldung/guava/GuavaTableTest.java b/guava/src/test/java/org/baeldung/guava/GuavaTableUnitTest.java similarity index 99% rename from guava/src/test/java/org/baeldung/guava/GuavaTableTest.java rename to guava/src/test/java/org/baeldung/guava/GuavaTableUnitTest.java index 6992752cd8..28e132074e 100644 --- a/guava/src/test/java/org/baeldung/guava/GuavaTableTest.java +++ b/guava/src/test/java/org/baeldung/guava/GuavaTableUnitTest.java @@ -12,7 +12,7 @@ import com.google.common.collect.Lists; import com.google.common.collect.Table; import com.google.common.collect.TreeBasedTable; -public class GuavaTableTest { +public class GuavaTableUnitTest { @Test public void givenTable_whenGet_returnsSuccessfully() { diff --git a/guava/src/test/java/org/baeldung/guava/MinMaxPriorityQueueTest.java b/guava/src/test/java/org/baeldung/guava/MinMaxPriorityQueueUnitTest.java similarity index 97% rename from guava/src/test/java/org/baeldung/guava/MinMaxPriorityQueueTest.java rename to guava/src/test/java/org/baeldung/guava/MinMaxPriorityQueueUnitTest.java index f75b5a9bcb..1c4df03c86 100644 --- a/guava/src/test/java/org/baeldung/guava/MinMaxPriorityQueueTest.java +++ b/guava/src/test/java/org/baeldung/guava/MinMaxPriorityQueueUnitTest.java @@ -9,7 +9,7 @@ import java.util.stream.IntStream; import static org.assertj.core.api.Assertions.assertThat; -public class MinMaxPriorityQueueTest { +public class MinMaxPriorityQueueUnitTest { @Test public void givenMinMaxPriorityQueue_whenAddElementToFull_thenShouldEvictGreatestItem() { //given diff --git a/guava/src/test/java/org/baeldung/hamcrest/HamcrestExamplesTest.java b/guava/src/test/java/org/baeldung/hamcrest/HamcrestExamplesUnitTest.java similarity index 98% rename from guava/src/test/java/org/baeldung/hamcrest/HamcrestExamplesTest.java rename to guava/src/test/java/org/baeldung/hamcrest/HamcrestExamplesUnitTest.java index a44ce766f0..6b9cee1992 100644 --- a/guava/src/test/java/org/baeldung/hamcrest/HamcrestExamplesTest.java +++ b/guava/src/test/java/org/baeldung/hamcrest/HamcrestExamplesUnitTest.java @@ -23,7 +23,7 @@ import org.junit.Test; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -public class HamcrestExamplesTest { +public class HamcrestExamplesUnitTest { // tests diff --git a/guava/src/test/java/org/baeldung/hamcrest/HamcrestMatcherTest.java b/guava/src/test/java/org/baeldung/hamcrest/HamcrestMatcherUnitTest.java similarity index 99% rename from guava/src/test/java/org/baeldung/hamcrest/HamcrestMatcherTest.java rename to guava/src/test/java/org/baeldung/hamcrest/HamcrestMatcherUnitTest.java index b3756d609f..cf9fde7114 100644 --- a/guava/src/test/java/org/baeldung/hamcrest/HamcrestMatcherTest.java +++ b/guava/src/test/java/org/baeldung/hamcrest/HamcrestMatcherUnitTest.java @@ -42,7 +42,7 @@ import static org.hamcrest.text.IsEqualIgnoringCase.equalToIgnoringCase; import static org.hamcrest.text.IsEqualIgnoringWhiteSpace.equalToIgnoringWhiteSpace; import static org.hamcrest.text.StringContainsInOrder.stringContainsInOrder; -public class HamcrestMatcherTest { +public class HamcrestMatcherUnitTest { @Test public void given2Strings_whenEqual_thenCorrect() { String a = "foo"; diff --git a/guava18/pom.xml b/guava18/pom.xml index 1a8c08d302..0b96918171 100644 --- a/guava18/pom.xml +++ b/guava18/pom.xml @@ -11,8 +11,8 @@ com.baeldung parent-modules 1.0.0-SNAPSHOT - - + + com.google.guava @@ -20,7 +20,7 @@ ${guava.version} - + 18.0 diff --git a/guava18/src/test/java/com/baeldung/guava/FluentIterableTest.java b/guava18/src/test/java/com/baeldung/guava/FluentIterableUnitTest.java similarity index 98% rename from guava18/src/test/java/com/baeldung/guava/FluentIterableTest.java rename to guava18/src/test/java/com/baeldung/guava/FluentIterableUnitTest.java index 82552fca8f..d70db9193e 100644 --- a/guava18/src/test/java/com/baeldung/guava/FluentIterableTest.java +++ b/guava18/src/test/java/com/baeldung/guava/FluentIterableUnitTest.java @@ -13,7 +13,7 @@ import java.util.List; import static org.hamcrest.CoreMatchers.equalTo; -public class FluentIterableTest { +public class FluentIterableUnitTest { private static final int ADULT_AGE = 18; diff --git a/guava18/src/test/java/com/baeldung/guava/MoreExecutorsTest.java b/guava18/src/test/java/com/baeldung/guava/MoreExecutorsUnitTest.java similarity index 98% rename from guava18/src/test/java/com/baeldung/guava/MoreExecutorsTest.java rename to guava18/src/test/java/com/baeldung/guava/MoreExecutorsUnitTest.java index ec173499f1..c2b38daf6b 100644 --- a/guava18/src/test/java/com/baeldung/guava/MoreExecutorsTest.java +++ b/guava18/src/test/java/com/baeldung/guava/MoreExecutorsUnitTest.java @@ -7,7 +7,7 @@ import org.junit.Test; import java.util.concurrent.*; -public class MoreExecutorsTest { +public class MoreExecutorsUnitTest { @Test public void whenExecutingRunnableInThreadPool_shouldLogAllThreadsExecutions() throws Exception { ConcurrentHashMap threadExecutions = new ConcurrentHashMap<>(); diff --git a/guava18/src/test/java/com/baeldung/guava/MoreObjectsTest.java b/guava18/src/test/java/com/baeldung/guava/MoreObjectsUnitTest.java similarity index 96% rename from guava18/src/test/java/com/baeldung/guava/MoreObjectsTest.java rename to guava18/src/test/java/com/baeldung/guava/MoreObjectsUnitTest.java index 5e46b5aba9..2f5a7b9cca 100644 --- a/guava18/src/test/java/com/baeldung/guava/MoreObjectsTest.java +++ b/guava18/src/test/java/com/baeldung/guava/MoreObjectsUnitTest.java @@ -8,7 +8,7 @@ import org.junit.Test; import static org.hamcrest.CoreMatchers.equalTo; -public class MoreObjectsTest { +public class MoreObjectsUnitTest { @Test public void whenToString_shouldIncludeAllFields() throws Exception { diff --git a/guava19/pom.xml b/guava19/pom.xml index 494d3bc7d6..af9bc51eb9 100644 --- a/guava19/pom.xml +++ b/guava19/pom.xml @@ -11,26 +11,18 @@ com.baeldung parent-modules 1.0.0-SNAPSHOT - - + + com.google.guava guava ${guava.version} - - - org.hamcrest - hamcrest-all - ${hamcrest.version} - test - 19.0 - 1.3 \ No newline at end of file diff --git a/guava19/src/test/java/com/baeldung/guava/CharMatcherTest.java b/guava19/src/test/java/com/baeldung/guava/CharMatcherUnitTest.java similarity index 96% rename from guava19/src/test/java/com/baeldung/guava/CharMatcherTest.java rename to guava19/src/test/java/com/baeldung/guava/CharMatcherUnitTest.java index f890d9abc1..51ecc1ebe6 100644 --- a/guava19/src/test/java/com/baeldung/guava/CharMatcherTest.java +++ b/guava19/src/test/java/com/baeldung/guava/CharMatcherUnitTest.java @@ -6,7 +6,7 @@ import org.junit.Test; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -public class CharMatcherTest { +public class CharMatcherUnitTest { @Test public void whenMatchingLetterOrString_ShouldReturnTrueForCorrectString() throws Exception { String inputString = "someString789"; diff --git a/guava19/src/test/java/com/baeldung/guava/HashingTest.java b/guava19/src/test/java/com/baeldung/guava/HashingUnitTest.java similarity index 97% rename from guava19/src/test/java/com/baeldung/guava/HashingTest.java rename to guava19/src/test/java/com/baeldung/guava/HashingUnitTest.java index 9b4acde9f7..6deac7c84b 100644 --- a/guava19/src/test/java/com/baeldung/guava/HashingTest.java +++ b/guava19/src/test/java/com/baeldung/guava/HashingUnitTest.java @@ -7,7 +7,7 @@ import org.junit.Test; import static org.junit.Assert.assertEquals; -public class HashingTest { +public class HashingUnitTest { @Test public void whenHashingInSha384_hashFunctionShouldBeReturned() throws Exception { int inputData = 15; diff --git a/guava19/src/test/java/com/baeldung/guava/TypeTokenTest.java b/guava19/src/test/java/com/baeldung/guava/TypeTokenUnitTest.java similarity index 97% rename from guava19/src/test/java/com/baeldung/guava/TypeTokenTest.java rename to guava19/src/test/java/com/baeldung/guava/TypeTokenUnitTest.java index 1923451f20..bfdcb152e3 100644 --- a/guava19/src/test/java/com/baeldung/guava/TypeTokenTest.java +++ b/guava19/src/test/java/com/baeldung/guava/TypeTokenUnitTest.java @@ -9,7 +9,7 @@ import java.util.List; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -public class TypeTokenTest { +public class TypeTokenUnitTest { @Test public void whenCheckingIsAssignableFrom_shouldReturnTrueEvenIfGenericIsSpecified() throws Exception { ArrayList stringList = new ArrayList<>(); diff --git a/guava21/src/test/java/AtomicLongMapTests.java b/guava21/src/test/java/AtomicLongMapIntegrationTest.java similarity index 97% rename from guava21/src/test/java/AtomicLongMapTests.java rename to guava21/src/test/java/AtomicLongMapIntegrationTest.java index 6bde997e8d..9024329a56 100644 --- a/guava21/src/test/java/AtomicLongMapTests.java +++ b/guava21/src/test/java/AtomicLongMapIntegrationTest.java @@ -3,7 +3,7 @@ import org.junit.Test; import static org.junit.Assert.assertEquals; -public class AtomicLongMapTests { +public class AtomicLongMapIntegrationTest { private static final String SPRING_COURSE_KEY = "Spring"; private static final String HIBERNATE_COURSE_KEY = "hibernate"; diff --git a/guava21/src/test/java/ComparatorsUnitTests.java b/guava21/src/test/java/ComparatorsUnitTest.java similarity index 98% rename from guava21/src/test/java/ComparatorsUnitTests.java rename to guava21/src/test/java/ComparatorsUnitTest.java index 8aaae1e14e..3d1f2e9e81 100644 --- a/guava21/src/test/java/ComparatorsUnitTests.java +++ b/guava21/src/test/java/ComparatorsUnitTest.java @@ -10,7 +10,7 @@ import java.util.function.ToDoubleFunction; import java.util.function.ToIntFunction; import java.util.function.ToLongFunction; -public class ComparatorsUnitTests { +public class ComparatorsUnitTest { @Test public void isInOrderTest() { diff --git a/guava21/src/test/java/InternBuilderUnitTests.java b/guava21/src/test/java/InternBuilderUnitTest.java similarity index 90% rename from guava21/src/test/java/InternBuilderUnitTests.java rename to guava21/src/test/java/InternBuilderUnitTest.java index b569b59978..183e3eeb43 100644 --- a/guava21/src/test/java/InternBuilderUnitTests.java +++ b/guava21/src/test/java/InternBuilderUnitTest.java @@ -3,7 +3,7 @@ import com.google.common.collect.Interners; import org.junit.Assert; import org.junit.Test; -public class InternBuilderUnitTests { +public class InternBuilderUnitTest { @Test public void interBuilderTest() { diff --git a/guava21/src/test/java/MonitorUnitTests.java b/guava21/src/test/java/MonitorUnitTest.java similarity index 97% rename from guava21/src/test/java/MonitorUnitTests.java rename to guava21/src/test/java/MonitorUnitTest.java index 7b52c48d8f..e29d4a1eeb 100644 --- a/guava21/src/test/java/MonitorUnitTests.java +++ b/guava21/src/test/java/MonitorUnitTest.java @@ -2,7 +2,7 @@ import com.google.common.util.concurrent.Monitor; import org.junit.Assert; import org.junit.Test; -public class MonitorUnitTests { +public class MonitorUnitTest { @Test public void whenGaurdConditionIsTrue_IsSuccessful() { diff --git a/guava21/src/test/java/MoreCollectorsUnitTests.java b/guava21/src/test/java/MoreCollectorsUnitTest.java similarity index 95% rename from guava21/src/test/java/MoreCollectorsUnitTests.java rename to guava21/src/test/java/MoreCollectorsUnitTest.java index a205337450..5950997788 100644 --- a/guava21/src/test/java/MoreCollectorsUnitTests.java +++ b/guava21/src/test/java/MoreCollectorsUnitTest.java @@ -6,7 +6,7 @@ import java.util.Arrays; import java.util.List; import java.util.Optional; -public class MoreCollectorsUnitTests { +public class MoreCollectorsUnitTest { @Test public void toOptionalTest() { diff --git a/guice/pom.xml b/guice/pom.xml index bb9108396c..17b599a379 100644 --- a/guice/pom.xml +++ b/guice/pom.xml @@ -1,5 +1,6 @@ - + 4.0.0 com.baeldung.examples.guice guice @@ -10,8 +11,8 @@ com.baeldung parent-modules 1.0.0-SNAPSHOT - - + + com.google.inject diff --git a/handling-spring-static-resources/pom.xml b/handling-spring-static-resources/pom.xml index 94941aec9b..65a6e120a0 100644 --- a/handling-spring-static-resources/pom.xml +++ b/handling-spring-static-resources/pom.xml @@ -1,5 +1,6 @@ - + 4.0.0 com.baeldung @@ -13,8 +14,8 @@ com.baeldung parent-modules 1.0.0-SNAPSHOT - - + + @@ -121,7 +122,7 @@ jackson-databind ${jackson.version} - + org.hibernate hibernate-validator @@ -142,26 +143,6 @@ ${handlebars.version} - - - - org.slf4j - slf4j-api - ${org.slf4j.version} - - - ch.qos.logback - logback-classic - ${logback.version} - - - - org.slf4j - jcl-over-slf4j - ${org.slf4j.version} - - - @@ -220,7 +201,7 @@ 2.8.5 - + 5.3.3.Final 4.0.6 2.9.6 diff --git a/hazelcast/pom.xml b/hazelcast/pom.xml index bdc0ac9179..5b467af655 100644 --- a/hazelcast/pom.xml +++ b/hazelcast/pom.xml @@ -10,39 +10,20 @@ com.baeldung parent-modules 1.0.0-SNAPSHOT - - + + com.hazelcast hazelcast ${hazelcast.version} - + com.hazelcast hazelcast-client 3.7.2 - - - - org.slf4j - slf4j-api - ${org.slf4j.version} - - - - ch.qos.logback - logback-classic - ${logback.version} - - - - ch.qos.logback - logback-core - ${logback.version} - diff --git a/hbase/pom.xml b/hbase/pom.xml index 0a740c2645..3f5456777e 100644 --- a/hbase/pom.xml +++ b/hbase/pom.xml @@ -1,7 +1,6 @@ - + parent-modules com.baeldung @@ -21,7 +20,7 @@ commons-logging commons-logging - + org.apache.hbase @@ -29,12 +28,6 @@ ${hbase.version} pom - - junit - junit - ${junit.version} - test - diff --git a/httpclient/pom.xml b/httpclient/pom.xml index d2c96dd82c..562b3e9bcd 100644 --- a/httpclient/pom.xml +++ b/httpclient/pom.xml @@ -1,5 +1,5 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 com.baeldung httpclient @@ -11,8 +11,8 @@ com.baeldung parent-modules 1.0.0-SNAPSHOT - - + + @@ -52,7 +52,7 @@ commons-logging commons-logging - + @@ -79,36 +79,6 @@ - - - - org.slf4j - jcl-over-slf4j - ${org.slf4j.version} - - - - - - - org.hamcrest - hamcrest-core - ${org.hamcrest.version} - test - - - org.hamcrest - hamcrest-library - ${org.hamcrest.version} - test - - - - org.mockito - mockito-core - ${mockito.version} - test - com.github.tomakehurst wiremock @@ -174,8 +144,6 @@ 4.1.2 - 1.3 - 1.10.19 2.5.1 4.4.5 diff --git a/httpclient/src/test/java/org/baeldung/httpclient/advancedconfig/HttpClientAdvancedConfiguration.java b/httpclient/src/test/java/org/baeldung/httpclient/advancedconfig/HttpClientAdvancedConfigurationIntegrationTest.java similarity index 98% rename from httpclient/src/test/java/org/baeldung/httpclient/advancedconfig/HttpClientAdvancedConfiguration.java rename to httpclient/src/test/java/org/baeldung/httpclient/advancedconfig/HttpClientAdvancedConfigurationIntegrationTest.java index 9b5cb3f293..b5a76241d1 100644 --- a/httpclient/src/test/java/org/baeldung/httpclient/advancedconfig/HttpClientAdvancedConfiguration.java +++ b/httpclient/src/test/java/org/baeldung/httpclient/advancedconfig/HttpClientAdvancedConfigurationIntegrationTest.java @@ -27,7 +27,7 @@ import java.io.IOException; import static com.github.tomakehurst.wiremock.client.WireMock.*; import static org.junit.Assert.assertEquals; -public class HttpClientAdvancedConfiguration { +public class HttpClientAdvancedConfigurationIntegrationTest { @Rule public WireMockRule serviceMock = new WireMockRule(8089); diff --git a/hystrix/pom.xml b/hystrix/pom.xml index 5ccc66709f..7e9a217dba 100644 --- a/hystrix/pom.xml +++ b/hystrix/pom.xml @@ -1,6 +1,5 @@ - + 4.0.0 com.baeldung @@ -9,33 +8,27 @@ hystrix - org.springframework.boot - spring-boot-starter-parent - 1.4.4.RELEASE + parent-boot-4 + com.baeldung + 0.0.1-SNAPSHOT + ../parent-boot-4 - - 1.8 - 1.5.8 0.20.7 1.3 - 4.12 - 3.6.0 2.6 - 2.19.1 2.7 1.5.8 1.5.8 - 1.4.2.RELEASE @@ -61,18 +54,15 @@ commons-logging commons-logging - + com.netflix.hystrix hystrix-metrics-event-stream ${hystrix-metrics-event-stream.version} - + com.netflix.rxjava rxjava-core @@ -84,54 +74,13 @@ ${hamcrest-all.version} test - - junit - junit - ${junit.version} - test - org.springframework spring-test test - - org.springframework.boot - spring-boot-starter-test - ${spring-boot-starter-test.version} - test - - - - - org.springframework.boot - spring-boot-maven-plugin - - - org.apache.maven.plugins - maven-compiler-plugin - ${maven-compiler-plugin.version} - - 1.8 - 1.8 - - - - org.apache.maven.plugins - maven-surefire-plugin - ${maven-surefire-plugin.version} - - - **/*IntegrationTest.java - **/*LiveTest.java - - - - - - integration @@ -166,7 +115,5 @@ + - - - diff --git a/image-processing/pom.xml b/image-processing/pom.xml index 8abb7dc6b9..ccb3238a7e 100644 --- a/image-processing/pom.xml +++ b/image-processing/pom.xml @@ -16,8 +16,8 @@ com.baeldung parent-modules 1.0.0-SNAPSHOT - - + + net.imagej @@ -28,7 +28,7 @@ commons-logging commons-logging - + org.openimaj @@ -39,8 +39,8 @@ commons-logging commons-logging - + - + \ No newline at end of file diff --git a/immutables/pom.xml b/immutables/pom.xml index bf4d1c6e88..9b623c85e7 100644 --- a/immutables/pom.xml +++ b/immutables/pom.xml @@ -1,7 +1,6 @@ - + 4.0.0 com.baeldung @@ -12,8 +11,8 @@ com.baeldung parent-modules 1.0.0-SNAPSHOT - - + + org.immutables @@ -33,10 +32,10 @@ test - + 2.3.10 3.6.1 - 0.9.6 + 0.9.6 \ No newline at end of file diff --git a/immutables/src/test/java/com/baeldung/immutable/ImmutablePersonTest.java b/immutables/src/test/java/com/baeldung/immutable/ImmutablePersonUnitTest.java similarity index 94% rename from immutables/src/test/java/com/baeldung/immutable/ImmutablePersonTest.java rename to immutables/src/test/java/com/baeldung/immutable/ImmutablePersonUnitTest.java index bf075569db..222cbfd8ef 100644 --- a/immutables/src/test/java/com/baeldung/immutable/ImmutablePersonTest.java +++ b/immutables/src/test/java/com/baeldung/immutable/ImmutablePersonUnitTest.java @@ -5,7 +5,7 @@ import org.junit.Test; import static org.assertj.core.api.Assertions.assertThat; import static org.mutabilitydetector.unittesting.MutabilityAssert.assertImmutable; -public class ImmutablePersonTest { +public class ImmutablePersonUnitTest { @Test public void whenModifying_shouldCreateNewInstance() throws Exception { diff --git a/immutables/src/test/java/com/baeldung/immutable/auxiliary/ImmutablePersonAuxiliaryTest.java b/immutables/src/test/java/com/baeldung/immutable/auxiliary/ImmutablePersonAuxiliaryUnitTest.java similarity index 93% rename from immutables/src/test/java/com/baeldung/immutable/auxiliary/ImmutablePersonAuxiliaryTest.java rename to immutables/src/test/java/com/baeldung/immutable/auxiliary/ImmutablePersonAuxiliaryUnitTest.java index 83f9e51ed5..ee2ff91cfd 100644 --- a/immutables/src/test/java/com/baeldung/immutable/auxiliary/ImmutablePersonAuxiliaryTest.java +++ b/immutables/src/test/java/com/baeldung/immutable/auxiliary/ImmutablePersonAuxiliaryUnitTest.java @@ -4,7 +4,7 @@ import org.junit.Test; import static org.assertj.core.api.Assertions.assertThat; -public class ImmutablePersonAuxiliaryTest { +public class ImmutablePersonAuxiliaryUnitTest { @Test public void whenComparing_shouldIgnore() throws Exception { diff --git a/immutables/src/test/java/com/baeldung/immutable/default_/ImmutablePersonDefaultTest.java b/immutables/src/test/java/com/baeldung/immutable/default_/ImmutablePersonDefaultUnitTest.java similarity index 88% rename from immutables/src/test/java/com/baeldung/immutable/default_/ImmutablePersonDefaultTest.java rename to immutables/src/test/java/com/baeldung/immutable/default_/ImmutablePersonDefaultUnitTest.java index 5cf4ac0cf7..d3bc0cb482 100644 --- a/immutables/src/test/java/com/baeldung/immutable/default_/ImmutablePersonDefaultTest.java +++ b/immutables/src/test/java/com/baeldung/immutable/default_/ImmutablePersonDefaultUnitTest.java @@ -4,7 +4,7 @@ import org.junit.Test; import static org.assertj.core.api.Assertions.assertThat; -public class ImmutablePersonDefaultTest { +public class ImmutablePersonDefaultUnitTest { @Test public void whenInstantiating_shouldUseDefaultValue() throws Exception { diff --git a/jackson/pom.xml b/jackson/pom.xml index 0df53acab8..1a538670c6 100644 --- a/jackson/pom.xml +++ b/jackson/pom.xml @@ -1,5 +1,5 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 com.baeldung jackson @@ -11,8 +11,8 @@ com.baeldung parent-modules 1.0.0-SNAPSHOT - - + + @@ -28,7 +28,7 @@ commons-io ${commons-io.version} - + com.fasterxml.jackson.dataformat jackson-dataformat-xml @@ -114,35 +114,6 @@ test - - org.hamcrest - hamcrest-core - ${org.hamcrest.version} - test - - - org.hamcrest - hamcrest-library - ${org.hamcrest.version} - test - - - - org.mockito - mockito-core - ${mockito.version} - test - - - - - - org.slf4j - jcl-over-slf4j - ${org.slf4j.version} - - - @@ -169,8 +140,6 @@ 4.1 - 1.3 - 1.10.19 3.0.1 3.6.1 diff --git a/jackson/src/test/java/com/baeldung/jackson/annotation/extra/ExtraAnnotationTest.java b/jackson/src/test/java/com/baeldung/jackson/annotation/extra/ExtraAnnotationUnitTest.java similarity index 99% rename from jackson/src/test/java/com/baeldung/jackson/annotation/extra/ExtraAnnotationTest.java rename to jackson/src/test/java/com/baeldung/jackson/annotation/extra/ExtraAnnotationUnitTest.java index 79aae1dd04..c4e0a2ecdb 100644 --- a/jackson/src/test/java/com/baeldung/jackson/annotation/extra/ExtraAnnotationTest.java +++ b/jackson/src/test/java/com/baeldung/jackson/annotation/extra/ExtraAnnotationUnitTest.java @@ -23,7 +23,7 @@ import com.fasterxml.jackson.databind.ObjectWriter; import com.fasterxml.jackson.module.jsonSchema.JsonSchema; import com.fasterxml.jackson.module.jsonSchema.factories.SchemaFactoryWrapper; -public class ExtraAnnotationTest { +public class ExtraAnnotationUnitTest { @Test public void whenNotUsingJsonIdentityReferenceAnnotation_thenCorrect() throws JsonProcessingException { ObjectMapper mapper = new ObjectMapper(); diff --git a/jackson/src/test/java/com/baeldung/jackson/deserialization/JacksonDeserializeTest.java b/jackson/src/test/java/com/baeldung/jackson/deserialization/JacksonDeserializeUnitTest.java similarity index 97% rename from jackson/src/test/java/com/baeldung/jackson/deserialization/JacksonDeserializeTest.java rename to jackson/src/test/java/com/baeldung/jackson/deserialization/JacksonDeserializeUnitTest.java index cb3bccb879..dc055a8f9a 100644 --- a/jackson/src/test/java/com/baeldung/jackson/deserialization/JacksonDeserializeTest.java +++ b/jackson/src/test/java/com/baeldung/jackson/deserialization/JacksonDeserializeUnitTest.java @@ -8,7 +8,7 @@ import org.junit.Test; import com.fasterxml.jackson.databind.ObjectMapper; import static org.junit.Assert.assertEquals; -public class JacksonDeserializeTest { +public class JacksonDeserializeUnitTest { @Test public void whenSimpleDeserialize_thenCorrect() throws IOException { diff --git a/jackson/src/test/java/com/baeldung/jackson/deserialization/JacksonMapDeserializeTest.java b/jackson/src/test/java/com/baeldung/jackson/deserialization/JacksonMapDeserializeUnitTest.java similarity index 97% rename from jackson/src/test/java/com/baeldung/jackson/deserialization/JacksonMapDeserializeTest.java rename to jackson/src/test/java/com/baeldung/jackson/deserialization/JacksonMapDeserializeUnitTest.java index 5021abaac1..4d5db699a0 100644 --- a/jackson/src/test/java/com/baeldung/jackson/deserialization/JacksonMapDeserializeTest.java +++ b/jackson/src/test/java/com/baeldung/jackson/deserialization/JacksonMapDeserializeUnitTest.java @@ -14,7 +14,7 @@ import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.JsonMappingException; import com.fasterxml.jackson.databind.ObjectMapper; -public class JacksonMapDeserializeTest { +public class JacksonMapDeserializeUnitTest { private Map map; private Map cmap; diff --git a/jackson/src/test/java/com/baeldung/jackson/deserialization/jacksoninject/JacksonInjectTest.java b/jackson/src/test/java/com/baeldung/jackson/deserialization/jacksoninject/JacksonInjectUnitTest.java similarity index 96% rename from jackson/src/test/java/com/baeldung/jackson/deserialization/jacksoninject/JacksonInjectTest.java rename to jackson/src/test/java/com/baeldung/jackson/deserialization/jacksoninject/JacksonInjectUnitTest.java index 7742833e6a..81bb14c533 100644 --- a/jackson/src/test/java/com/baeldung/jackson/deserialization/jacksoninject/JacksonInjectTest.java +++ b/jackson/src/test/java/com/baeldung/jackson/deserialization/jacksoninject/JacksonInjectUnitTest.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Alex Theedom www.readlearncode.com * @version 1.0 */ -public class JacksonInjectTest { +public class JacksonInjectUnitTest { @Test public void whenDeserializingUsingJacksonInject_thenCorrect() throws IOException { diff --git a/jackson/src/test/java/com/baeldung/jackson/deserialization/jsonanysetter/JsonAnySetterTest.java b/jackson/src/test/java/com/baeldung/jackson/deserialization/jsonanysetter/JsonAnySetterUnitTest.java similarity index 97% rename from jackson/src/test/java/com/baeldung/jackson/deserialization/jsonanysetter/JsonAnySetterTest.java rename to jackson/src/test/java/com/baeldung/jackson/deserialization/jsonanysetter/JsonAnySetterUnitTest.java index c8e23d3de6..7c338696e7 100644 --- a/jackson/src/test/java/com/baeldung/jackson/deserialization/jsonanysetter/JsonAnySetterTest.java +++ b/jackson/src/test/java/com/baeldung/jackson/deserialization/jsonanysetter/JsonAnySetterUnitTest.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Alex Theedom www.readlearncode.com * @version 1.0 */ -public class JsonAnySetterTest { +public class JsonAnySetterUnitTest { @Test public void whenDeserializingUsingJsonAnySetter_thenCorrect() throws IOException { diff --git a/jackson/src/test/java/com/baeldung/jackson/deserialization/jsoncreator/JsonCreatorTest.java b/jackson/src/test/java/com/baeldung/jackson/deserialization/jsoncreator/JsonCreatorUnitTest.java similarity index 96% rename from jackson/src/test/java/com/baeldung/jackson/deserialization/jsoncreator/JsonCreatorTest.java rename to jackson/src/test/java/com/baeldung/jackson/deserialization/jsoncreator/JsonCreatorUnitTest.java index a616fae16b..cc6b2a28aa 100644 --- a/jackson/src/test/java/com/baeldung/jackson/deserialization/jsoncreator/JsonCreatorTest.java +++ b/jackson/src/test/java/com/baeldung/jackson/deserialization/jsoncreator/JsonCreatorUnitTest.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Alex Theedom www.readlearncode.com * @version 1.0 */ -public class JsonCreatorTest { +public class JsonCreatorUnitTest { @Test public void whenDeserializingUsingJsonCreator_thenCorrect() throws IOException { diff --git a/jackson/src/test/java/com/baeldung/jackson/deserialization/jsondeserialize/JsonDeserializeTest.java b/jackson/src/test/java/com/baeldung/jackson/deserialization/jsondeserialize/JsonDeserializeUnitTest.java similarity index 96% rename from jackson/src/test/java/com/baeldung/jackson/deserialization/jsondeserialize/JsonDeserializeTest.java rename to jackson/src/test/java/com/baeldung/jackson/deserialization/jsondeserialize/JsonDeserializeUnitTest.java index e208c428b3..dca2252431 100644 --- a/jackson/src/test/java/com/baeldung/jackson/deserialization/jsondeserialize/JsonDeserializeTest.java +++ b/jackson/src/test/java/com/baeldung/jackson/deserialization/jsondeserialize/JsonDeserializeUnitTest.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Alex Theedom www.readlearncode.com * @version 1.0 */ -public class JsonDeserializeTest { +public class JsonDeserializeUnitTest { @Test public void whenDeserializingUsingJsonDeserialize_thenCorrect() throws IOException { diff --git a/jackson/src/test/java/com/baeldung/jackson/deserialization/jsonsetter/JsonSetterTest.java b/jackson/src/test/java/com/baeldung/jackson/deserialization/jsonsetter/JsonSetterUnitTest.java similarity index 96% rename from jackson/src/test/java/com/baeldung/jackson/deserialization/jsonsetter/JsonSetterTest.java rename to jackson/src/test/java/com/baeldung/jackson/deserialization/jsonsetter/JsonSetterUnitTest.java index 5886bf5ddc..42e105cd52 100644 --- a/jackson/src/test/java/com/baeldung/jackson/deserialization/jsonsetter/JsonSetterTest.java +++ b/jackson/src/test/java/com/baeldung/jackson/deserialization/jsonsetter/JsonSetterUnitTest.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Alex Theedom www.readlearncode.com * @version 1.0 */ -public class JsonSetterTest { +public class JsonSetterUnitTest { @Test public void whenDeserializingUsingJsonSetter_thenCorrect() throws IOException { diff --git a/jackson/src/test/java/com/baeldung/jackson/enums/JacksonEnumSerializationTest.java b/jackson/src/test/java/com/baeldung/jackson/enums/JacksonEnumSerializationUnitTest.java similarity index 92% rename from jackson/src/test/java/com/baeldung/jackson/enums/JacksonEnumSerializationTest.java rename to jackson/src/test/java/com/baeldung/jackson/enums/JacksonEnumSerializationUnitTest.java index af61e55bb4..45c0ba1382 100644 --- a/jackson/src/test/java/com/baeldung/jackson/enums/JacksonEnumSerializationTest.java +++ b/jackson/src/test/java/com/baeldung/jackson/enums/JacksonEnumSerializationUnitTest.java @@ -10,7 +10,7 @@ import org.junit.Test; import com.fasterxml.jackson.core.JsonParseException; import com.fasterxml.jackson.databind.ObjectMapper; -public class JacksonEnumSerializationTest { +public class JacksonEnumSerializationUnitTest { @Test public final void givenEnum_whenSerializingJson_thenCorrectRepresentation() throws JsonParseException, IOException { diff --git a/jackson/src/test/java/com/baeldung/jackson/format/JsonFormatTest.java b/jackson/src/test/java/com/baeldung/jackson/format/JsonFormatUnitTest.java similarity index 96% rename from jackson/src/test/java/com/baeldung/jackson/format/JsonFormatTest.java rename to jackson/src/test/java/com/baeldung/jackson/format/JsonFormatUnitTest.java index fbbc090eac..7ce03ff625 100755 --- a/jackson/src/test/java/com/baeldung/jackson/format/JsonFormatTest.java +++ b/jackson/src/test/java/com/baeldung/jackson/format/JsonFormatUnitTest.java @@ -17,7 +17,7 @@ import static org.assertj.core.data.Percentage.withPercentage; * @author Jay Sridhar * @version 1.0 */ -public class JsonFormatTest { +public class JsonFormatUnitTest { @Test public void whenSerializedDateFormat_thenCorrect() throws JsonProcessingException { diff --git a/jackson/src/test/java/com/baeldung/jackson/general/jsonfilter/JsonFilterTest.java b/jackson/src/test/java/com/baeldung/jackson/general/jsonfilter/JsonFilterUnitTest.java similarity index 97% rename from jackson/src/test/java/com/baeldung/jackson/general/jsonfilter/JsonFilterTest.java rename to jackson/src/test/java/com/baeldung/jackson/general/jsonfilter/JsonFilterUnitTest.java index f550dfb5b0..3eeec8dcee 100644 --- a/jackson/src/test/java/com/baeldung/jackson/general/jsonfilter/JsonFilterTest.java +++ b/jackson/src/test/java/com/baeldung/jackson/general/jsonfilter/JsonFilterUnitTest.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Alex Theedom www.readlearncode.com * @version 1.0 */ -public class JsonFilterTest { +public class JsonFilterUnitTest { @Test public void whenSerializingUsingJsonFilter_thenCorrect() throws JsonProcessingException { diff --git a/jackson/src/test/java/com/baeldung/jackson/general/jsonformat/JsonFormatTest.java b/jackson/src/test/java/com/baeldung/jackson/general/jsonformat/JsonFormatUnitTest.java similarity index 98% rename from jackson/src/test/java/com/baeldung/jackson/general/jsonformat/JsonFormatTest.java rename to jackson/src/test/java/com/baeldung/jackson/general/jsonformat/JsonFormatUnitTest.java index ab0f1871b2..0fcfe94cf8 100644 --- a/jackson/src/test/java/com/baeldung/jackson/general/jsonformat/JsonFormatTest.java +++ b/jackson/src/test/java/com/baeldung/jackson/general/jsonformat/JsonFormatUnitTest.java @@ -19,7 +19,7 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Alex Theedom www.readlearncode.com * @version 1.0 */ -public class JsonFormatTest { +public class JsonFormatUnitTest { @Test public void whenSerializingUsingJsonFormat_thenCorrect() throws JsonProcessingException, ParseException { diff --git a/jackson/src/test/java/com/baeldung/jackson/general/jsonidentityinfo/JsonIdentityInfoTest.java b/jackson/src/test/java/com/baeldung/jackson/general/jsonidentityinfo/JsonIdentityInfoUnitTest.java similarity index 97% rename from jackson/src/test/java/com/baeldung/jackson/general/jsonidentityinfo/JsonIdentityInfoTest.java rename to jackson/src/test/java/com/baeldung/jackson/general/jsonidentityinfo/JsonIdentityInfoUnitTest.java index ed53ab4d8f..014f1a8f69 100644 --- a/jackson/src/test/java/com/baeldung/jackson/general/jsonidentityinfo/JsonIdentityInfoTest.java +++ b/jackson/src/test/java/com/baeldung/jackson/general/jsonidentityinfo/JsonIdentityInfoUnitTest.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Alex Theedom www.readlearncode.com * @version 1.0 */ -public class JsonIdentityInfoTest { +public class JsonIdentityInfoUnitTest { @Test public void whenSerializingUsingJsonIdentityInfo_thenCorrect() throws JsonProcessingException { diff --git a/jackson/src/test/java/com/baeldung/jackson/general/jsonproperty/JsonPropertyTest.java b/jackson/src/test/java/com/baeldung/jackson/general/jsonproperty/JsonPropertyUnitTest.java similarity index 98% rename from jackson/src/test/java/com/baeldung/jackson/general/jsonproperty/JsonPropertyTest.java rename to jackson/src/test/java/com/baeldung/jackson/general/jsonproperty/JsonPropertyUnitTest.java index 2ec8429884..94046f8a56 100644 --- a/jackson/src/test/java/com/baeldung/jackson/general/jsonproperty/JsonPropertyTest.java +++ b/jackson/src/test/java/com/baeldung/jackson/general/jsonproperty/JsonPropertyUnitTest.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Alex Theedom www.readlearncode.com * @version 1.0 */ -public class JsonPropertyTest { +public class JsonPropertyUnitTest { @Test public void whenSerializingUsingJsonProperty_thenCorrect() throws JsonProcessingException { diff --git a/jackson/src/test/java/com/baeldung/jackson/general/jsonunwrapped/JsonUnwrappedTest.java b/jackson/src/test/java/com/baeldung/jackson/general/jsonunwrapped/JsonUnwrappedUnitTest.java similarity index 96% rename from jackson/src/test/java/com/baeldung/jackson/general/jsonunwrapped/JsonUnwrappedTest.java rename to jackson/src/test/java/com/baeldung/jackson/general/jsonunwrapped/JsonUnwrappedUnitTest.java index 5ce0340960..491f706db4 100644 --- a/jackson/src/test/java/com/baeldung/jackson/general/jsonunwrapped/JsonUnwrappedTest.java +++ b/jackson/src/test/java/com/baeldung/jackson/general/jsonunwrapped/JsonUnwrappedUnitTest.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Alex Theedom www.readlearncode.com * @version 1.0 */ -public class JsonUnwrappedTest { +public class JsonUnwrappedUnitTest { @Test public void whenSerializingUsingJsonUnwrapped_thenCorrect() throws JsonProcessingException { diff --git a/jackson/src/test/java/com/baeldung/jackson/general/jsonview/JsonViewTest.java b/jackson/src/test/java/com/baeldung/jackson/general/jsonview/JsonViewUnitTest.java similarity index 98% rename from jackson/src/test/java/com/baeldung/jackson/general/jsonview/JsonViewTest.java rename to jackson/src/test/java/com/baeldung/jackson/general/jsonview/JsonViewUnitTest.java index aa207e3e35..8ac10cac8b 100644 --- a/jackson/src/test/java/com/baeldung/jackson/general/jsonview/JsonViewTest.java +++ b/jackson/src/test/java/com/baeldung/jackson/general/jsonview/JsonViewUnitTest.java @@ -13,7 +13,7 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Alex Theedom www.readlearncode.com * @version 1.0 */ -public class JsonViewTest { +public class JsonViewUnitTest { @Test public void whenSerializingUsingJsonView_andInternalView_thenCorrect() throws JsonProcessingException { diff --git a/jackson/src/test/java/com/baeldung/jackson/general/reference/ReferenceTest.java b/jackson/src/test/java/com/baeldung/jackson/general/reference/ReferenceUnitTest.java similarity index 97% rename from jackson/src/test/java/com/baeldung/jackson/general/reference/ReferenceTest.java rename to jackson/src/test/java/com/baeldung/jackson/general/reference/ReferenceUnitTest.java index f53873724e..c0aece9636 100644 --- a/jackson/src/test/java/com/baeldung/jackson/general/reference/ReferenceTest.java +++ b/jackson/src/test/java/com/baeldung/jackson/general/reference/ReferenceUnitTest.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Alex Theedom www.readlearncode.com * @version 1.0 */ -public class ReferenceTest { +public class ReferenceUnitTest { @Test public void whenSerializingUsingReference_thenCorrect() throws JsonProcessingException { diff --git a/jackson/src/test/java/com/baeldung/jackson/inclusion/jsonautodetect/JsonAutoDetectTest.java b/jackson/src/test/java/com/baeldung/jackson/inclusion/jsonautodetect/JsonAutoDetectUnitTest.java similarity index 97% rename from jackson/src/test/java/com/baeldung/jackson/inclusion/jsonautodetect/JsonAutoDetectTest.java rename to jackson/src/test/java/com/baeldung/jackson/inclusion/jsonautodetect/JsonAutoDetectUnitTest.java index 17502b288c..ef9d6e0e29 100644 --- a/jackson/src/test/java/com/baeldung/jackson/inclusion/jsonautodetect/JsonAutoDetectTest.java +++ b/jackson/src/test/java/com/baeldung/jackson/inclusion/jsonautodetect/JsonAutoDetectUnitTest.java @@ -13,7 +13,7 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Alex Theedom www.readlearncode.com * @version 1.0 */ -public class JsonAutoDetectTest { +public class JsonAutoDetectUnitTest { @Test public void whenSerializingUsingJsonAutoDetect_thenCorrect() throws JsonProcessingException { diff --git a/jackson/src/test/java/com/baeldung/jackson/inclusion/jsonignore/JsonIgnoreTest.java b/jackson/src/test/java/com/baeldung/jackson/inclusion/jsonignore/JsonIgnoreUnitTest.java similarity index 96% rename from jackson/src/test/java/com/baeldung/jackson/inclusion/jsonignore/JsonIgnoreTest.java rename to jackson/src/test/java/com/baeldung/jackson/inclusion/jsonignore/JsonIgnoreUnitTest.java index 4008834bf9..89e3c15f04 100644 --- a/jackson/src/test/java/com/baeldung/jackson/inclusion/jsonignore/JsonIgnoreTest.java +++ b/jackson/src/test/java/com/baeldung/jackson/inclusion/jsonignore/JsonIgnoreUnitTest.java @@ -13,7 +13,7 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Alex Theedom www.readlearncode.com * @version 1.0 */ -public class JsonIgnoreTest { +public class JsonIgnoreUnitTest { @Test public void whenSerializingUsingJsonIgnore_thenCorrect() throws JsonProcessingException { diff --git a/jackson/src/test/java/com/baeldung/jackson/inclusion/jsonignoreproperties/JsonIgnorePropertiesTest.java b/jackson/src/test/java/com/baeldung/jackson/inclusion/jsonignoreproperties/JsonIgnorePropertiesUnitTest.java similarity index 96% rename from jackson/src/test/java/com/baeldung/jackson/inclusion/jsonignoreproperties/JsonIgnorePropertiesTest.java rename to jackson/src/test/java/com/baeldung/jackson/inclusion/jsonignoreproperties/JsonIgnorePropertiesUnitTest.java index 92eba57a07..be20d242c9 100644 --- a/jackson/src/test/java/com/baeldung/jackson/inclusion/jsonignoreproperties/JsonIgnorePropertiesTest.java +++ b/jackson/src/test/java/com/baeldung/jackson/inclusion/jsonignoreproperties/JsonIgnorePropertiesUnitTest.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Alex Theedom www.readlearncode.com * @version 1.0 */ -public class JsonIgnorePropertiesTest { +public class JsonIgnorePropertiesUnitTest { @Test public void whenSerializingUsingJsonIgnoreProperties_thenCorrect() throws JsonProcessingException { diff --git a/jackson/src/test/java/com/baeldung/jackson/inclusion/jsonignoretype/JsonIgnoreTypeTest.java b/jackson/src/test/java/com/baeldung/jackson/inclusion/jsonignoretype/JsonIgnoreTypeUnitTest.java similarity index 96% rename from jackson/src/test/java/com/baeldung/jackson/inclusion/jsonignoretype/JsonIgnoreTypeTest.java rename to jackson/src/test/java/com/baeldung/jackson/inclusion/jsonignoretype/JsonIgnoreTypeUnitTest.java index 3875ec6b9b..e8917ff526 100644 --- a/jackson/src/test/java/com/baeldung/jackson/inclusion/jsonignoretype/JsonIgnoreTypeTest.java +++ b/jackson/src/test/java/com/baeldung/jackson/inclusion/jsonignoretype/JsonIgnoreTypeUnitTest.java @@ -13,7 +13,7 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Alex Theedom www.readlearncode.com * @version 1.0 */ -public class JsonIgnoreTypeTest { +public class JsonIgnoreTypeUnitTest { @Test public void whenSerializingUsingJsonIgnoreType_thenCorrect() throws JsonProcessingException { diff --git a/jackson/src/test/java/com/baeldung/jackson/inclusion/jsoninclude/JsonIncludeTest.java b/jackson/src/test/java/com/baeldung/jackson/inclusion/jsoninclude/JsonIncludeUnitTest.java similarity index 96% rename from jackson/src/test/java/com/baeldung/jackson/inclusion/jsoninclude/JsonIncludeTest.java rename to jackson/src/test/java/com/baeldung/jackson/inclusion/jsoninclude/JsonIncludeUnitTest.java index b88dfd1f3b..f85dd66764 100644 --- a/jackson/src/test/java/com/baeldung/jackson/inclusion/jsoninclude/JsonIncludeTest.java +++ b/jackson/src/test/java/com/baeldung/jackson/inclusion/jsoninclude/JsonIncludeUnitTest.java @@ -13,7 +13,7 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Alex Theedom www.readlearncode.com * @version 1.0 */ -public class JsonIncludeTest { +public class JsonIncludeUnitTest { @Test public void whenSerializingUsingJsonInclude_thenCorrect() throws JsonProcessingException { diff --git a/jackson/src/test/java/com/baeldung/jackson/inheritance/IgnoranceTest.java b/jackson/src/test/java/com/baeldung/jackson/inheritance/IgnoranceUnitTest.java similarity index 99% rename from jackson/src/test/java/com/baeldung/jackson/inheritance/IgnoranceTest.java rename to jackson/src/test/java/com/baeldung/jackson/inheritance/IgnoranceUnitTest.java index 8d22f471a6..e365b560e2 100644 --- a/jackson/src/test/java/com/baeldung/jackson/inheritance/IgnoranceTest.java +++ b/jackson/src/test/java/com/baeldung/jackson/inheritance/IgnoranceUnitTest.java @@ -15,7 +15,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.introspect.AnnotatedMember; import com.fasterxml.jackson.databind.introspect.JacksonAnnotationIntrospector; -public class IgnoranceTest { +public class IgnoranceUnitTest { private static abstract class CarMixIn { @JsonIgnore public String make; diff --git a/jackson/src/test/java/com/baeldung/jackson/inheritance/ItemIdRemovedFromUserTest.java b/jackson/src/test/java/com/baeldung/jackson/inheritance/ItemIdRemovedFromUserUnitTest.java similarity index 96% rename from jackson/src/test/java/com/baeldung/jackson/inheritance/ItemIdRemovedFromUserTest.java rename to jackson/src/test/java/com/baeldung/jackson/inheritance/ItemIdRemovedFromUserUnitTest.java index 5aee03555e..a0ba23fb71 100644 --- a/jackson/src/test/java/com/baeldung/jackson/inheritance/ItemIdRemovedFromUserTest.java +++ b/jackson/src/test/java/com/baeldung/jackson/inheritance/ItemIdRemovedFromUserUnitTest.java @@ -9,7 +9,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -public class ItemIdRemovedFromUserTest { +public class ItemIdRemovedFromUserUnitTest { @Test public void givenRemoveItemJson_whenDeserialize_shouldHaveProperClassType() throws IOException { //given diff --git a/jackson/src/test/java/com/baeldung/jackson/inheritance/SubTypeHandlingTest.java b/jackson/src/test/java/com/baeldung/jackson/inheritance/SubTypeHandlingUnitTest.java similarity index 97% rename from jackson/src/test/java/com/baeldung/jackson/inheritance/SubTypeHandlingTest.java rename to jackson/src/test/java/com/baeldung/jackson/inheritance/SubTypeHandlingUnitTest.java index 2d4c8fe698..a8c1e94e9b 100644 --- a/jackson/src/test/java/com/baeldung/jackson/inheritance/SubTypeHandlingTest.java +++ b/jackson/src/test/java/com/baeldung/jackson/inheritance/SubTypeHandlingUnitTest.java @@ -10,7 +10,7 @@ import java.io.IOException; import com.fasterxml.jackson.databind.ObjectMapper; -public class SubTypeHandlingTest { +public class SubTypeHandlingUnitTest { @Test public void givenSubTypes_whenConvertingObjects_thenDataValuesArePreserved() { ObjectMapper mapper = new ObjectMapper(); diff --git a/jackson/src/test/java/com/baeldung/jackson/inheritance/TypeInfoInclusionTest.java b/jackson/src/test/java/com/baeldung/jackson/inheritance/TypeInfoInclusionUnitTest.java similarity index 98% rename from jackson/src/test/java/com/baeldung/jackson/inheritance/TypeInfoInclusionTest.java rename to jackson/src/test/java/com/baeldung/jackson/inheritance/TypeInfoInclusionUnitTest.java index aefbc172d0..b436eda6e0 100644 --- a/jackson/src/test/java/com/baeldung/jackson/inheritance/TypeInfoInclusionTest.java +++ b/jackson/src/test/java/com/baeldung/jackson/inheritance/TypeInfoInclusionUnitTest.java @@ -11,7 +11,7 @@ import java.io.IOException; import com.fasterxml.jackson.databind.ObjectMapper; -public class TypeInfoInclusionTest { +public class TypeInfoInclusionUnitTest { @Test public void givenTypeInfo_whenAnnotatingGlobally_thenTypesAreCorrectlyRecovered() throws IOException { ObjectMapper mapper = new ObjectMapper(); diff --git a/jackson/src/test/java/com/baeldung/jackson/miscellaneous/custom/CustomTest.java b/jackson/src/test/java/com/baeldung/jackson/miscellaneous/custom/CustomUnitTest.java similarity index 97% rename from jackson/src/test/java/com/baeldung/jackson/miscellaneous/custom/CustomTest.java rename to jackson/src/test/java/com/baeldung/jackson/miscellaneous/custom/CustomUnitTest.java index 568fe20501..8f90c02875 100644 --- a/jackson/src/test/java/com/baeldung/jackson/miscellaneous/custom/CustomTest.java +++ b/jackson/src/test/java/com/baeldung/jackson/miscellaneous/custom/CustomUnitTest.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Alex Theedom www.readlearncode.com * @version 1.0 */ -public class CustomTest { +public class CustomUnitTest { @Test public void whenSerializingUsingCustom_thenCorrect() throws JsonProcessingException { diff --git a/jackson/src/test/java/com/baeldung/jackson/miscellaneous/disable/DisableTest.java b/jackson/src/test/java/com/baeldung/jackson/miscellaneous/disable/DisableUnitTest.java similarity index 97% rename from jackson/src/test/java/com/baeldung/jackson/miscellaneous/disable/DisableTest.java rename to jackson/src/test/java/com/baeldung/jackson/miscellaneous/disable/DisableUnitTest.java index bd865d94ed..f9bc14291e 100644 --- a/jackson/src/test/java/com/baeldung/jackson/miscellaneous/disable/DisableTest.java +++ b/jackson/src/test/java/com/baeldung/jackson/miscellaneous/disable/DisableUnitTest.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Alex Theedom www.readlearncode.com * @version 1.0 */ -public class DisableTest { +public class DisableUnitTest { @Test public void whenSerializingUsingDisable_thenCorrect() throws JsonProcessingException { diff --git a/jackson/src/test/java/com/baeldung/jackson/miscellaneous/mixin/MixInTest.java b/jackson/src/test/java/com/baeldung/jackson/miscellaneous/mixin/MixInUnitTest.java similarity index 97% rename from jackson/src/test/java/com/baeldung/jackson/miscellaneous/mixin/MixInTest.java rename to jackson/src/test/java/com/baeldung/jackson/miscellaneous/mixin/MixInUnitTest.java index 1eb7ff220d..732cda58d0 100644 --- a/jackson/src/test/java/com/baeldung/jackson/miscellaneous/mixin/MixInTest.java +++ b/jackson/src/test/java/com/baeldung/jackson/miscellaneous/mixin/MixInUnitTest.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Alex Theedom www.readlearncode.com * @version 1.0 */ -public class MixInTest { +public class MixInUnitTest { @Test public void whenSerializingUsingMixIn_thenCorrect() throws JsonProcessingException { diff --git a/jackson/src/test/java/com/baeldung/jackson/miscellaneous/mixin/OptionalTypeTest.java b/jackson/src/test/java/com/baeldung/jackson/miscellaneous/mixin/OptionalTypeUnitTest.java similarity index 98% rename from jackson/src/test/java/com/baeldung/jackson/miscellaneous/mixin/OptionalTypeTest.java rename to jackson/src/test/java/com/baeldung/jackson/miscellaneous/mixin/OptionalTypeUnitTest.java index c6d51cd57f..dc807a84b8 100644 --- a/jackson/src/test/java/com/baeldung/jackson/miscellaneous/mixin/OptionalTypeTest.java +++ b/jackson/src/test/java/com/baeldung/jackson/miscellaneous/mixin/OptionalTypeUnitTest.java @@ -9,7 +9,7 @@ import java.util.Optional; import static org.assertj.core.api.Assertions.assertThat; import org.junit.Test; -public class OptionalTypeTest { +public class OptionalTypeUnitTest { ObjectMapper mapper = new ObjectMapper().registerModule(new Jdk8Module()); diff --git a/jackson/src/test/java/com/baeldung/jackson/node/NodeOperationTest.java b/jackson/src/test/java/com/baeldung/jackson/node/NodeOperationUnitTest.java similarity index 99% rename from jackson/src/test/java/com/baeldung/jackson/node/NodeOperationTest.java rename to jackson/src/test/java/com/baeldung/jackson/node/NodeOperationUnitTest.java index 2fcb828613..3539f388f9 100644 --- a/jackson/src/test/java/com/baeldung/jackson/node/NodeOperationTest.java +++ b/jackson/src/test/java/com/baeldung/jackson/node/NodeOperationUnitTest.java @@ -19,7 +19,7 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; -public class NodeOperationTest { +public class NodeOperationUnitTest { private static ObjectMapper mapper = new ObjectMapper(); @Test diff --git a/jackson/src/test/java/com/baeldung/jackson/objectmapper/TestJavaReadWriteJsonExample.java b/jackson/src/test/java/com/baeldung/jackson/objectmapper/JavaReadWriteJsonExampleUnitTest.java similarity index 98% rename from jackson/src/test/java/com/baeldung/jackson/objectmapper/TestJavaReadWriteJsonExample.java rename to jackson/src/test/java/com/baeldung/jackson/objectmapper/JavaReadWriteJsonExampleUnitTest.java index 54ddf469c8..e6da19f440 100644 --- a/jackson/src/test/java/com/baeldung/jackson/objectmapper/TestJavaReadWriteJsonExample.java +++ b/jackson/src/test/java/com/baeldung/jackson/objectmapper/JavaReadWriteJsonExampleUnitTest.java @@ -14,7 +14,7 @@ import static org.hamcrest.Matchers.equalTo; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertThat; -public class TestJavaReadWriteJsonExample { +public class JavaReadWriteJsonExampleUnitTest { final String EXAMPLE_JSON = "{ \"color\" : \"Black\", \"type\" : \"BMW\" }"; final String LOCAL_JSON = "[{ \"color\" : \"Black\", \"type\" : \"BMW\" }, { \"color\" : \"Red\", \"type\" : \"BMW\" }]"; diff --git a/jackson/src/test/java/com/baeldung/jackson/objectmapper/TestSerializationDeserializationFeature.java b/jackson/src/test/java/com/baeldung/jackson/objectmapper/SerializationDeserializationFeatureUnitTest.java similarity index 98% rename from jackson/src/test/java/com/baeldung/jackson/objectmapper/TestSerializationDeserializationFeature.java rename to jackson/src/test/java/com/baeldung/jackson/objectmapper/SerializationDeserializationFeatureUnitTest.java index 96918f4c28..4ffec72a61 100644 --- a/jackson/src/test/java/com/baeldung/jackson/objectmapper/TestSerializationDeserializationFeature.java +++ b/jackson/src/test/java/com/baeldung/jackson/objectmapper/SerializationDeserializationFeatureUnitTest.java @@ -18,7 +18,7 @@ import static org.hamcrest.Matchers.equalTo; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertThat; -public class TestSerializationDeserializationFeature { +public class SerializationDeserializationFeatureUnitTest { final String EXAMPLE_JSON = "{ \"color\" : \"Black\", \"type\" : \"BMW\" }"; final String JSON_CAR = "{ \"color\" : \"Black\", \"type\" : \"Fiat\", \"year\" : \"1970\" }"; final String JSON_ARRAY = "[{ \"color\" : \"Black\", \"type\" : \"BMW\" }, { \"color\" : \"Red\", \"type\" : \"BMW\" }]"; diff --git a/jackson/src/test/java/com/baeldung/jackson/polymorphism/PolymorphismTest.java b/jackson/src/test/java/com/baeldung/jackson/polymorphism/PolymorphismUnitTest.java similarity index 98% rename from jackson/src/test/java/com/baeldung/jackson/polymorphism/PolymorphismTest.java rename to jackson/src/test/java/com/baeldung/jackson/polymorphism/PolymorphismUnitTest.java index b99648bda4..5d2ba69767 100644 --- a/jackson/src/test/java/com/baeldung/jackson/polymorphism/PolymorphismTest.java +++ b/jackson/src/test/java/com/baeldung/jackson/polymorphism/PolymorphismUnitTest.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Alex Theedom www.readlearncode.com * @version 1.0 */ -public class PolymorphismTest { +public class PolymorphismUnitTest { @Test public void whenSerializingUsingPolymorphism_thenCorrect() throws JsonProcessingException { diff --git a/jackson/src/test/java/com/baeldung/jackson/sandbox/SandboxTest.java b/jackson/src/test/java/com/baeldung/jackson/sandbox/SandboxUnitTest.java similarity index 96% rename from jackson/src/test/java/com/baeldung/jackson/sandbox/SandboxTest.java rename to jackson/src/test/java/com/baeldung/jackson/sandbox/SandboxUnitTest.java index 958a7eec98..a600577cb0 100644 --- a/jackson/src/test/java/com/baeldung/jackson/sandbox/SandboxTest.java +++ b/jackson/src/test/java/com/baeldung/jackson/sandbox/SandboxUnitTest.java @@ -9,7 +9,7 @@ import com.fasterxml.jackson.core.JsonParseException; import com.fasterxml.jackson.databind.JsonMappingException; import com.fasterxml.jackson.databind.ObjectMapper; -public class SandboxTest { +public class SandboxUnitTest { @Test public final void whenDeserializing_thenCorrect() throws JsonParseException, JsonMappingException, IOException { diff --git a/jackson/src/test/java/com/baeldung/jackson/serialization/JacksonMapSerializeTest.java b/jackson/src/test/java/com/baeldung/jackson/serialization/JacksonMapSerializeUnitTest.java similarity index 97% rename from jackson/src/test/java/com/baeldung/jackson/serialization/JacksonMapSerializeTest.java rename to jackson/src/test/java/com/baeldung/jackson/serialization/JacksonMapSerializeUnitTest.java index a5ee76f3b8..4935d35791 100644 --- a/jackson/src/test/java/com/baeldung/jackson/serialization/JacksonMapSerializeTest.java +++ b/jackson/src/test/java/com/baeldung/jackson/serialization/JacksonMapSerializeUnitTest.java @@ -12,7 +12,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.MapSerializer; -public class JacksonMapSerializeTest { +public class JacksonMapSerializeUnitTest { @JsonSerialize(keyUsing = MyPairSerializer.class) private Map map; diff --git a/jackson/src/test/java/com/baeldung/jackson/serialization/JacksonSerializeTest.java b/jackson/src/test/java/com/baeldung/jackson/serialization/JacksonSerializeUnitTest.java similarity index 98% rename from jackson/src/test/java/com/baeldung/jackson/serialization/JacksonSerializeTest.java rename to jackson/src/test/java/com/baeldung/jackson/serialization/JacksonSerializeUnitTest.java index b6b80ab103..fa6364ff92 100644 --- a/jackson/src/test/java/com/baeldung/jackson/serialization/JacksonSerializeTest.java +++ b/jackson/src/test/java/com/baeldung/jackson/serialization/JacksonSerializeUnitTest.java @@ -18,7 +18,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.SerializationFeature; import com.fasterxml.jackson.databind.module.SimpleModule; -public class JacksonSerializeTest { +public class JacksonSerializeUnitTest { @Test public void whenSimpleSerialize_thenCorrect() throws JsonProcessingException, ParseException { diff --git a/jackson/src/test/java/com/baeldung/jackson/serialization/jsonanygetter/JsonAnyGetterTest.java b/jackson/src/test/java/com/baeldung/jackson/serialization/jsonanygetter/JsonAnyGetterUnitTest.java similarity index 97% rename from jackson/src/test/java/com/baeldung/jackson/serialization/jsonanygetter/JsonAnyGetterTest.java rename to jackson/src/test/java/com/baeldung/jackson/serialization/jsonanygetter/JsonAnyGetterUnitTest.java index b13dbf6f10..7a786e0bd6 100644 --- a/jackson/src/test/java/com/baeldung/jackson/serialization/jsonanygetter/JsonAnyGetterTest.java +++ b/jackson/src/test/java/com/baeldung/jackson/serialization/jsonanygetter/JsonAnyGetterUnitTest.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Alex Theedom www.readlearncode.com * @version 1.0 */ -public class JsonAnyGetterTest { +public class JsonAnyGetterUnitTest { @Test public void whenSerializingUsingJsonAnyGetter_thenCorrect() throws JsonProcessingException { diff --git a/jackson/src/test/java/com/baeldung/jackson/serialization/jsongetter/JsonGetterTest.java b/jackson/src/test/java/com/baeldung/jackson/serialization/jsongetter/JsonGetterUnitTest.java similarity index 96% rename from jackson/src/test/java/com/baeldung/jackson/serialization/jsongetter/JsonGetterTest.java rename to jackson/src/test/java/com/baeldung/jackson/serialization/jsongetter/JsonGetterUnitTest.java index a4ffff6283..4bc9c51e83 100644 --- a/jackson/src/test/java/com/baeldung/jackson/serialization/jsongetter/JsonGetterTest.java +++ b/jackson/src/test/java/com/baeldung/jackson/serialization/jsongetter/JsonGetterUnitTest.java @@ -13,7 +13,7 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Alex Theedom www.readlearncode.com * @version 1.0 */ -public class JsonGetterTest { +public class JsonGetterUnitTest { @Test public void whenSerializingUsingJsonGetter_thenCorrect() throws JsonProcessingException { diff --git a/jackson/src/test/java/com/baeldung/jackson/serialization/jsonpropertyorder/JsonPropertyOrderTest.java b/jackson/src/test/java/com/baeldung/jackson/serialization/jsonpropertyorder/JsonPropertyOrderUnitTest.java similarity index 96% rename from jackson/src/test/java/com/baeldung/jackson/serialization/jsonpropertyorder/JsonPropertyOrderTest.java rename to jackson/src/test/java/com/baeldung/jackson/serialization/jsonpropertyorder/JsonPropertyOrderUnitTest.java index d8e4a494fd..77ef85ed73 100644 --- a/jackson/src/test/java/com/baeldung/jackson/serialization/jsonpropertyorder/JsonPropertyOrderTest.java +++ b/jackson/src/test/java/com/baeldung/jackson/serialization/jsonpropertyorder/JsonPropertyOrderUnitTest.java @@ -13,7 +13,7 @@ import static org.hamcrest.MatcherAssert.assertThat; * @author Alex Theedom www.readlearncode.com * @version 1.0 */ -public class JsonPropertyOrderTest { +public class JsonPropertyOrderUnitTest { @Test public void whenSerializingUsingJsonPropertyOrder_thenCorrect() throws JsonProcessingException { diff --git a/jackson/src/test/java/com/baeldung/jackson/serialization/jsonrawvalue/JsonRawValueTest.java b/jackson/src/test/java/com/baeldung/jackson/serialization/jsonrawvalue/JsonRawValueUnitTest.java similarity index 96% rename from jackson/src/test/java/com/baeldung/jackson/serialization/jsonrawvalue/JsonRawValueTest.java rename to jackson/src/test/java/com/baeldung/jackson/serialization/jsonrawvalue/JsonRawValueUnitTest.java index 8b1110d885..0671441d9a 100644 --- a/jackson/src/test/java/com/baeldung/jackson/serialization/jsonrawvalue/JsonRawValueTest.java +++ b/jackson/src/test/java/com/baeldung/jackson/serialization/jsonrawvalue/JsonRawValueUnitTest.java @@ -12,7 +12,7 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Alex Theedom www.readlearncode.com * @version 1.0 */ -public class JsonRawValueTest { +public class JsonRawValueUnitTest { @Test public void whenSerializingUsingJsonRawValue_thenCorrect() throws JsonProcessingException { diff --git a/jackson/src/test/java/com/baeldung/jackson/serialization/jsonrootname/JsonRootNameTest.java b/jackson/src/test/java/com/baeldung/jackson/serialization/jsonrootname/JsonRootNameUnitTest.java similarity index 97% rename from jackson/src/test/java/com/baeldung/jackson/serialization/jsonrootname/JsonRootNameTest.java rename to jackson/src/test/java/com/baeldung/jackson/serialization/jsonrootname/JsonRootNameUnitTest.java index 813970671f..cb54e63079 100644 --- a/jackson/src/test/java/com/baeldung/jackson/serialization/jsonrootname/JsonRootNameTest.java +++ b/jackson/src/test/java/com/baeldung/jackson/serialization/jsonrootname/JsonRootNameUnitTest.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Alex Theedom www.readlearncode.com * @version 1.0 */ -public class JsonRootNameTest { +public class JsonRootNameUnitTest { @Test public void whenSerializingUsingJsonRootName_thenCorrect() throws JsonProcessingException { diff --git a/jackson/src/test/java/com/baeldung/jackson/serialization/jsonserialize/JsonSerializeTest.java b/jackson/src/test/java/com/baeldung/jackson/serialization/jsonserialize/JsonSerializeUnitTest.java similarity index 97% rename from jackson/src/test/java/com/baeldung/jackson/serialization/jsonserialize/JsonSerializeTest.java rename to jackson/src/test/java/com/baeldung/jackson/serialization/jsonserialize/JsonSerializeUnitTest.java index ce1fcd8bea..cca018e78d 100644 --- a/jackson/src/test/java/com/baeldung/jackson/serialization/jsonserialize/JsonSerializeTest.java +++ b/jackson/src/test/java/com/baeldung/jackson/serialization/jsonserialize/JsonSerializeUnitTest.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Alex Theedom www.readlearncode.com * @version 1.0 */ -public class JsonSerializeTest { +public class JsonSerializeUnitTest { @Test public void whenSerializingUsingJsonSerialize_thenCorrect() throws JsonProcessingException, ParseException { diff --git a/jackson/src/test/java/com/baeldung/jackson/serialization/jsonvalue/JsonValueTest.java b/jackson/src/test/java/com/baeldung/jackson/serialization/jsonvalue/JsonValueUnitTest.java similarity index 95% rename from jackson/src/test/java/com/baeldung/jackson/serialization/jsonvalue/JsonValueTest.java rename to jackson/src/test/java/com/baeldung/jackson/serialization/jsonvalue/JsonValueUnitTest.java index fd508480ee..465daf13f5 100644 --- a/jackson/src/test/java/com/baeldung/jackson/serialization/jsonvalue/JsonValueTest.java +++ b/jackson/src/test/java/com/baeldung/jackson/serialization/jsonvalue/JsonValueUnitTest.java @@ -12,7 +12,7 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Alex Theedom www.readlearncode.com * @version 1.0 */ -public class JsonValueTest { +public class JsonValueUnitTest { @Test public void whenSerializingUsingJsonValue_thenCorrect() throws JsonProcessingException { diff --git a/jackson/src/test/java/com/baeldung/jackson/streaming/JacksonStreamingAPITest.java b/jackson/src/test/java/com/baeldung/jackson/streaming/JacksonStreamingAPIUnitTest.java similarity index 98% rename from jackson/src/test/java/com/baeldung/jackson/streaming/JacksonStreamingAPITest.java rename to jackson/src/test/java/com/baeldung/jackson/streaming/JacksonStreamingAPIUnitTest.java index 6f61793315..2f8cf52afb 100644 --- a/jackson/src/test/java/com/baeldung/jackson/streaming/JacksonStreamingAPITest.java +++ b/jackson/src/test/java/com/baeldung/jackson/streaming/JacksonStreamingAPIUnitTest.java @@ -14,7 +14,7 @@ import static junit.framework.Assert.assertNull; import static junit.framework.Assert.assertTrue; import static junit.framework.TestCase.assertEquals; -public class JacksonStreamingAPITest { +public class JacksonStreamingAPIUnitTest { @Test public void givenJsonGenerator_whenAppendJsonToIt_thenGenerateJson() throws IOException { diff --git a/jackson/src/test/java/com/baeldung/jackson/test/JacksonAnnotationTest.java b/jackson/src/test/java/com/baeldung/jackson/test/JacksonAnnotationUnitTest.java similarity index 99% rename from jackson/src/test/java/com/baeldung/jackson/test/JacksonAnnotationTest.java rename to jackson/src/test/java/com/baeldung/jackson/test/JacksonAnnotationUnitTest.java index 9351b929d3..e544ab670a 100644 --- a/jackson/src/test/java/com/baeldung/jackson/test/JacksonAnnotationTest.java +++ b/jackson/src/test/java/com/baeldung/jackson/test/JacksonAnnotationUnitTest.java @@ -47,7 +47,7 @@ import com.fasterxml.jackson.databind.ser.FilterProvider; import com.fasterxml.jackson.databind.ser.impl.SimpleBeanPropertyFilter; import com.fasterxml.jackson.databind.ser.impl.SimpleFilterProvider; -public class JacksonAnnotationTest { +public class JacksonAnnotationUnitTest { @Test public void whenSerializingUsingJsonAnyGetter_thenCorrect() throws JsonProcessingException { diff --git a/jackson/src/test/java/com/baeldung/jackson/test/JacksonBidirectionRelationTest.java b/jackson/src/test/java/com/baeldung/jackson/test/JacksonBidirectionRelationUnitTest.java similarity index 99% rename from jackson/src/test/java/com/baeldung/jackson/test/JacksonBidirectionRelationTest.java rename to jackson/src/test/java/com/baeldung/jackson/test/JacksonBidirectionRelationUnitTest.java index db8507a4b0..523b42a96c 100644 --- a/jackson/src/test/java/com/baeldung/jackson/test/JacksonBidirectionRelationTest.java +++ b/jackson/src/test/java/com/baeldung/jackson/test/JacksonBidirectionRelationUnitTest.java @@ -26,7 +26,7 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonMappingException; import com.fasterxml.jackson.databind.ObjectMapper; -public class JacksonBidirectionRelationTest { +public class JacksonBidirectionRelationUnitTest { @Test(expected = JsonMappingException.class) public void givenBidirectionRelation_whenSerializing_thenException() throws JsonProcessingException { diff --git a/jackson/src/test/java/com/baeldung/jackson/test/JacksonDateTest.java b/jackson/src/test/java/com/baeldung/jackson/test/JacksonDateUnitTest.java similarity index 99% rename from jackson/src/test/java/com/baeldung/jackson/test/JacksonDateTest.java rename to jackson/src/test/java/com/baeldung/jackson/test/JacksonDateUnitTest.java index b6472d889e..f713494ac8 100644 --- a/jackson/src/test/java/com/baeldung/jackson/test/JacksonDateTest.java +++ b/jackson/src/test/java/com/baeldung/jackson/test/JacksonDateUnitTest.java @@ -27,7 +27,7 @@ import com.fasterxml.jackson.databind.SerializationFeature; import com.fasterxml.jackson.datatype.joda.JodaModule; import com.fasterxml.jackson.datatype.jsr310.JSR310Module; -public class JacksonDateTest { +public class JacksonDateUnitTest { @Test public void whenSerializingDateWithJackson_thenSerializedToNumber() throws JsonProcessingException, ParseException { diff --git a/jackson/src/test/java/com/baeldung/jackson/test/JacksonDynamicIgnoreTest.java b/jackson/src/test/java/com/baeldung/jackson/test/JacksonDynamicIgnoreUnitTest.java similarity index 98% rename from jackson/src/test/java/com/baeldung/jackson/test/JacksonDynamicIgnoreTest.java rename to jackson/src/test/java/com/baeldung/jackson/test/JacksonDynamicIgnoreUnitTest.java index 16a55f442a..2f0f45828b 100644 --- a/jackson/src/test/java/com/baeldung/jackson/test/JacksonDynamicIgnoreTest.java +++ b/jackson/src/test/java/com/baeldung/jackson/test/JacksonDynamicIgnoreUnitTest.java @@ -21,7 +21,7 @@ import com.fasterxml.jackson.databind.SerializationConfig; import com.fasterxml.jackson.databind.module.SimpleModule; import com.fasterxml.jackson.databind.ser.BeanSerializerModifier; -public class JacksonDynamicIgnoreTest { +public class JacksonDynamicIgnoreUnitTest { private ObjectMapper mapper = new ObjectMapper(); diff --git a/jackson/src/test/java/com/baeldung/jackson/test/JacksonExceptionsTest.java b/jackson/src/test/java/com/baeldung/jackson/test/JacksonExceptionsUnitTest.java similarity index 99% rename from jackson/src/test/java/com/baeldung/jackson/test/JacksonExceptionsTest.java rename to jackson/src/test/java/com/baeldung/jackson/test/JacksonExceptionsUnitTest.java index d9b8d1cc18..4549a752eb 100644 --- a/jackson/src/test/java/com/baeldung/jackson/test/JacksonExceptionsTest.java +++ b/jackson/src/test/java/com/baeldung/jackson/test/JacksonExceptionsUnitTest.java @@ -26,7 +26,7 @@ import com.fasterxml.jackson.databind.JsonMappingException; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.exc.UnrecognizedPropertyException; -public class JacksonExceptionsTest { +public class JacksonExceptionsUnitTest { // JsonMappingException: Can not construct instance of @Test(expected = JsonMappingException.class) diff --git a/jackson/src/test/java/com/baeldung/jackson/test/JacksonJsonViewTest.java b/jackson/src/test/java/com/baeldung/jackson/test/JacksonJsonViewUnitTest.java similarity index 98% rename from jackson/src/test/java/com/baeldung/jackson/test/JacksonJsonViewTest.java rename to jackson/src/test/java/com/baeldung/jackson/test/JacksonJsonViewUnitTest.java index 477b0132e2..dd2690876c 100644 --- a/jackson/src/test/java/com/baeldung/jackson/test/JacksonJsonViewTest.java +++ b/jackson/src/test/java/com/baeldung/jackson/test/JacksonJsonViewUnitTest.java @@ -19,7 +19,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ser.BeanSerializerFactory; import com.fasterxml.jackson.databind.ser.SerializerFactory; -public class JacksonJsonViewTest { +public class JacksonJsonViewUnitTest { @Test public void whenUseJsonViewToSerialize_thenCorrect() throws JsonProcessingException { diff --git a/jackson/src/test/java/com/baeldung/jackson/test/UnitTestSuite.java b/jackson/src/test/java/com/baeldung/jackson/test/UnitTestSuite.java index d47b6e217a..6be2f29baa 100644 --- a/jackson/src/test/java/com/baeldung/jackson/test/UnitTestSuite.java +++ b/jackson/src/test/java/com/baeldung/jackson/test/UnitTestSuite.java @@ -1,7 +1,7 @@ package com.baeldung.jackson.test; import com.baeldung.jackson.sandbox.JacksonPrettyPrintUnitTest; -import com.baeldung.jackson.sandbox.SandboxTest; +import com.baeldung.jackson.sandbox.SandboxUnitTest; import org.junit.runner.RunWith; import org.junit.runners.Suite; @@ -14,7 +14,7 @@ import org.junit.runners.Suite; ,JacksonPrettyPrintUnitTest.class ,JacksonSerializationIgnoreUnitTest.class ,JacksonSerializationUnitTest.class - ,SandboxTest.class + ,SandboxUnitTest.class ,JacksonFieldUnitTest.class }) // @formatter:on public class UnitTestSuite { diff --git a/jackson/src/test/java/com/baeldung/jackson/xml/TestXMLSerializeDeserialize.java b/jackson/src/test/java/com/baeldung/jackson/xml/XMLSerializeDeserializeUnitTest.java similarity index 98% rename from jackson/src/test/java/com/baeldung/jackson/xml/TestXMLSerializeDeserialize.java rename to jackson/src/test/java/com/baeldung/jackson/xml/XMLSerializeDeserializeUnitTest.java index 92d0bd13d4..b5e3449c68 100644 --- a/jackson/src/test/java/com/baeldung/jackson/xml/TestXMLSerializeDeserialize.java +++ b/jackson/src/test/java/com/baeldung/jackson/xml/XMLSerializeDeserializeUnitTest.java @@ -15,7 +15,7 @@ import org.junit.Test; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.dataformat.xml.XmlMapper; -public class TestXMLSerializeDeserialize { +public class XMLSerializeDeserializeUnitTest { @Test public void whenJavaSerializedToXmlStr_thenCorrect() throws JsonProcessingException { diff --git a/java-cassandra/pom.xml b/java-cassandra/pom.xml index 49f4d43701..12df920e7d 100644 --- a/java-cassandra/pom.xml +++ b/java-cassandra/pom.xml @@ -36,13 +36,6 @@ ${guava.version} - - - org.slf4j - jcl-over-slf4j - ${org.slf4j.version} - - diff --git a/javaslang/pom.xml b/javaslang/pom.xml index c0228233cf..68969ef6c9 100644 --- a/javaslang/pom.xml +++ b/javaslang/pom.xml @@ -1,5 +1,5 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 com.baeldung javaslang @@ -10,14 +10,9 @@ com.baeldung parent-modules 1.0.0-SNAPSHOT - - + + - - org.hamcrest - hamcrest-all - 1.3 - io.javaslang javaslang diff --git a/javaslang/src/test/java/com/baeldung/javaslang/JavaSlangTest.java b/javaslang/src/test/java/com/baeldung/javaslang/JavaSlangUnitTest.java similarity index 95% rename from javaslang/src/test/java/com/baeldung/javaslang/JavaSlangTest.java rename to javaslang/src/test/java/com/baeldung/javaslang/JavaSlangUnitTest.java index ecba894723..8263dc111c 100644 --- a/javaslang/src/test/java/com/baeldung/javaslang/JavaSlangTest.java +++ b/javaslang/src/test/java/com/baeldung/javaslang/JavaSlangUnitTest.java @@ -1,12 +1,16 @@ package com.baeldung.javaslang; -import static javaslang.API.$; -import static javaslang.API.Case; -import static javaslang.API.Match; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import javaslang.Function0; +import javaslang.Function1; +import javaslang.Function2; +import javaslang.Function5; +import javaslang.Lazy; +import javaslang.*; +import javaslang.collection.List; +import javaslang.control.Option; +import javaslang.control.Try; +import javaslang.control.Validation; +import org.junit.Test; import java.util.Arrays; import java.util.Collections; @@ -14,22 +18,10 @@ import java.util.function.BiFunction; import java.util.function.Function; import java.util.stream.IntStream; -import org.junit.Test; +import static javaslang.API.*; +import static org.junit.Assert.*; -import javaslang.Function0; -import javaslang.Function1; -import javaslang.Function2; -import javaslang.Function5; -import javaslang.Lazy; -import javaslang.Tuple; -import javaslang.Tuple2; -import javaslang.Tuple3; -import javaslang.collection.List; -import javaslang.control.Option; -import javaslang.control.Try; -import javaslang.control.Validation; - -public class JavaSlangTest { +public class JavaSlangUnitTest { @Test public void givenList_whenSorts_thenCorrect() { List sortedList = List.of(3, 2, 1).sorted(); @@ -127,7 +119,7 @@ public class JavaSlangTest { public void whenCreatesFunction_thenCorrect0() { Function0 getClazzName = () -> this.getClass().getName(); String clazzName = getClazzName.apply(); - assertEquals("com.baeldung.javaslang.JavaSlangTest", clazzName); + assertEquals("com.baeldung.javaslang.JavaSlangUnitTest", clazzName); } @Test diff --git a/javaslang/src/test/java/com/baeldung/javaslang/PatternMatchingTest.java b/javaslang/src/test/java/com/baeldung/javaslang/PatternMatchingUnitTest.java similarity index 98% rename from javaslang/src/test/java/com/baeldung/javaslang/PatternMatchingTest.java rename to javaslang/src/test/java/com/baeldung/javaslang/PatternMatchingUnitTest.java index 7ae7683a58..b9317bcb16 100644 --- a/javaslang/src/test/java/com/baeldung/javaslang/PatternMatchingTest.java +++ b/javaslang/src/test/java/com/baeldung/javaslang/PatternMatchingUnitTest.java @@ -15,7 +15,7 @@ import org.junit.Test; import javaslang.MatchError; import javaslang.control.Option; -public class PatternMatchingTest { +public class PatternMatchingUnitTest { @Test public void whenMatchesDefault_thenCorrect() { int input = 5; diff --git a/javaslang/src/test/java/com/baeldung/javaslang/exception/handling/JavaslangTryTest.java b/javaslang/src/test/java/com/baeldung/javaslang/exception/handling/JavaslangTryUnitTest.java similarity index 99% rename from javaslang/src/test/java/com/baeldung/javaslang/exception/handling/JavaslangTryTest.java rename to javaslang/src/test/java/com/baeldung/javaslang/exception/handling/JavaslangTryUnitTest.java index ddf697444e..e4ff91ea9e 100644 --- a/javaslang/src/test/java/com/baeldung/javaslang/exception/handling/JavaslangTryTest.java +++ b/javaslang/src/test/java/com/baeldung/javaslang/exception/handling/JavaslangTryUnitTest.java @@ -16,7 +16,7 @@ import static javaslang.API.Match; import static javaslang.Predicates.instanceOf; import static org.junit.Assert.*; -public class JavaslangTryTest { +public class JavaslangTryUnitTest { @Test public void givenHttpClient_whenMakeACall_shouldReturnSuccess() { diff --git a/javax-servlets/pom.xml b/javax-servlets/pom.xml index 27ddf4d2f5..1934102c68 100644 --- a/javax-servlets/pom.xml +++ b/javax-servlets/pom.xml @@ -1,7 +1,6 @@ - + 4.0.0 com.baeldung @@ -12,8 +11,8 @@ com.baeldung parent-modules 1.0.0-SNAPSHOT - - + + @@ -33,7 +32,7 @@ commons-logging commons-logging - + diff --git a/javaxval/bin/pom.xml b/javaxval/bin/pom.xml index 7606f0d072..68e65e4d02 100644 --- a/javaxval/bin/pom.xml +++ b/javaxval/bin/pom.xml @@ -1,51 +1,44 @@ - 4.0.0 - com.baeldung - javaxval - 0.1-SNAPSHOT + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + com.baeldung + javaxval + 0.1-SNAPSHOT - + + + + javax.validation + validation-api + 1.1.0.Final + + + org.hibernate + hibernate-validator + 5.2.1.Final + - - junit - junit - 4.12 - + + org.hibernate + hibernate-validator-annotation-processor + 5.2.1.Final + - - javax.validation - validation-api - 1.1.0.Final - + + javax.el + javax.el-api + 2.2.4 + - - org.hibernate - hibernate-validator - 5.2.1.Final - + + org.glassfish.web + javax.el + 2.2.4 + - - org.hibernate - hibernate-validator-annotation-processor - 5.2.1.Final - - - - javax.el - javax.el-api - 2.2.4 - - - - org.glassfish.web - javax.el - 2.2.4 - - - + \ No newline at end of file diff --git a/javaxval/pom.xml b/javaxval/pom.xml index 8415252dea..4d27b3e0c9 100644 --- a/javaxval/pom.xml +++ b/javaxval/pom.xml @@ -1,4 +1,5 @@ - + 4.0.0 com.baeldung javaxval @@ -10,14 +11,14 @@ 3.0.0 2.2.6 - + com.baeldung parent-modules 1.0.0-SNAPSHOT - - + + diff --git a/javaxval/src/test/java/org/baeldung/ValidationTest.java b/javaxval/src/test/java/org/baeldung/ValidationIntegrationTest.java similarity index 98% rename from javaxval/src/test/java/org/baeldung/ValidationTest.java rename to javaxval/src/test/java/org/baeldung/ValidationIntegrationTest.java index 727630e703..63c08f64d8 100644 --- a/javaxval/src/test/java/org/baeldung/ValidationTest.java +++ b/javaxval/src/test/java/org/baeldung/ValidationIntegrationTest.java @@ -11,7 +11,7 @@ import javax.validation.ValidatorFactory; import org.junit.Assert; import org.junit.Test; -public class ValidationTest { +public class ValidationIntegrationTest { @Test public void ifNameIsNull_nameValidationFails() { diff --git a/jaxb/pom.xml b/jaxb/pom.xml index 433825ab43..8c9a430929 100644 --- a/jaxb/pom.xml +++ b/jaxb/pom.xml @@ -1,138 +1,138 @@ - 4.0.0 - com.baeldung - jaxb - 0.0.1-SNAPSHOT - jaxb + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + com.baeldung + jaxb + 0.0.1-SNAPSHOT + jaxb com.baeldung parent-modules 1.0.0-SNAPSHOT - - - - - org.glassfish.jaxb - jaxb-runtime - ${jaxb.version} - + - - org.glassfish.jaxb - jaxb-core - ${jaxb.version} - + + + org.glassfish.jaxb + jaxb-runtime + ${jaxb.version} + - - - com.sun.istack - istack-commons-runtime - 3.0.2 - + + org.glassfish.jaxb + jaxb-core + ${jaxb.version} + - - commons-io - commons-io - 2.5 - + + + com.sun.istack + istack-commons-runtime + 3.0.2 + - - org.apache.commons - commons-lang3 - 3.5 - - + + commons-io + commons-io + 2.5 + - - jaxb - - - src/main/resources - true - - + + org.apache.commons + commons-lang3 + 3.5 + + - - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - org.codehaus.mojo - jaxb2-maven-plugin - [${jaxb2-maven-plugin.version},) - - schemagen - xjc - - - - - - - - - - - - + + jaxb + + + src/main/resources + true + + - + + + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + org.codehaus.mojo + jaxb2-maven-plugin + [${jaxb2-maven-plugin.version},) + + schemagen + xjc + + + + + + + + + + + + - - - org.codehaus.mojo - jaxb2-maven-plugin - ${jaxb2-maven-plugin.version} - - - xjc - - xjc - - - - - - src/main/resources/global.xjb - - - src/main/resources/user.xsd - - ${basedir}/src/main/java - false - true - true - false - - + - - - - + + + org.codehaus.mojo + jaxb2-maven-plugin + ${jaxb2-maven-plugin.version} + + + xjc + + xjc + + + + + + src/main/resources/global.xjb + + + src/main/resources/user.xsd + + ${basedir}/src/main/java + false + true + true + false + + - - - 2.2.11 + + + + - - 2.3 - + + + 2.2.11 + + + 2.3 + \ No newline at end of file diff --git a/jaxb/src/test/java/com/baeldung/jaxb/test/JaxbTest.java b/jaxb/src/test/java/com/baeldung/jaxb/test/JaxbIntegrationTest.java similarity index 98% rename from jaxb/src/test/java/com/baeldung/jaxb/test/JaxbTest.java rename to jaxb/src/test/java/com/baeldung/jaxb/test/JaxbIntegrationTest.java index 7721490de8..b2dde85c0f 100644 --- a/jaxb/src/test/java/com/baeldung/jaxb/test/JaxbTest.java +++ b/jaxb/src/test/java/com/baeldung/jaxb/test/JaxbIntegrationTest.java @@ -21,7 +21,7 @@ import org.junit.runners.MethodSorters; import com.baeldung.jaxb.Book; @FixMethodOrder(MethodSorters.NAME_ASCENDING) -public class JaxbTest { +public class JaxbIntegrationTest { private Book book; private JAXBContext context; diff --git a/jee7/src/test/java/com/baeldung/convListVal/ConvListValTest.java b/jee7/src/test/java/com/baeldung/convListVal/ConvListValIntegrationTest.java similarity index 98% rename from jee7/src/test/java/com/baeldung/convListVal/ConvListValTest.java rename to jee7/src/test/java/com/baeldung/convListVal/ConvListValIntegrationTest.java index 4450a26f43..caeba95e45 100644 --- a/jee7/src/test/java/com/baeldung/convListVal/ConvListValTest.java +++ b/jee7/src/test/java/com/baeldung/convListVal/ConvListValIntegrationTest.java @@ -22,7 +22,7 @@ import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; @RunWith(Arquillian.class) -public class ConvListValTest { +public class ConvListValIntegrationTest { @ArquillianResource private URL deploymentUrl; diff --git a/jhipster/jhipster-microservice/car-app/pom.xml b/jhipster/jhipster-microservice/car-app/pom.xml index bf26818f66..23da8767cb 100644 --- a/jhipster/jhipster-microservice/car-app/pom.xml +++ b/jhipster/jhipster-microservice/car-app/pom.xml @@ -3,10 +3,10 @@ 4.0.0 - spring-boot-starter-parent - org.springframework.boot - 1.5.2.RELEASE - + parent-boot-5 + com.baeldung + 0.0.1-SNAPSHOT + ../../../parent-boot-5 com.car.app @@ -40,12 +40,9 @@ 4.8 jdt_apt 1.1.0.Final - 3.6.0 1.4.1 3.0.1 yyyyMMddHHmmss - ${java.version} - ${java.version} 3.0.0 3.1.3 v6.10.0 diff --git a/jhipster/jhipster-microservice/car-app/src/test/java/com/car/app/web/rest/CarResourceIntTest.java b/jhipster/jhipster-microservice/car-app/src/test/java/com/car/app/web/rest/CarResourceIntegrationTest.java similarity index 99% rename from jhipster/jhipster-microservice/car-app/src/test/java/com/car/app/web/rest/CarResourceIntTest.java rename to jhipster/jhipster-microservice/car-app/src/test/java/com/car/app/web/rest/CarResourceIntegrationTest.java index b18e5950d3..446df399da 100644 --- a/jhipster/jhipster-microservice/car-app/src/test/java/com/car/app/web/rest/CarResourceIntTest.java +++ b/jhipster/jhipster-microservice/car-app/src/test/java/com/car/app/web/rest/CarResourceIntegrationTest.java @@ -35,7 +35,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. */ @RunWith(SpringRunner.class) @SpringBootTest(classes = CarappApp.class) -public class CarResourceIntTest { +public class CarResourceIntegrationTest { private static final String DEFAULT_MAKE = "AAAAAAAAAA"; private static final String UPDATED_MAKE = "BBBBBBBBBB"; diff --git a/jhipster/jhipster-microservice/dealer-app/pom.xml b/jhipster/jhipster-microservice/dealer-app/pom.xml index 199d383e39..359783ef81 100644 --- a/jhipster/jhipster-microservice/dealer-app/pom.xml +++ b/jhipster/jhipster-microservice/dealer-app/pom.xml @@ -3,10 +3,10 @@ 4.0.0 - spring-boot-starter-parent - org.springframework.boot - 1.5.2.RELEASE - + parent-boot-5 + com.baeldung + 0.0.1-SNAPSHOT + ../../../parent-boot-5 com.dealer.app @@ -40,12 +40,9 @@ 4.8 jdt_apt 1.1.0.Final - 3.6.0 1.4.1 3.0.1 yyyyMMddHHmmss - ${java.version} - ${java.version} 3.0.0 3.1.3 v6.10.0 @@ -326,11 +323,6 @@ org.springframework.boot spring-boot-starter-security - - org.springframework.boot - spring-boot-starter-test - test - org.springframework.security spring-security-test diff --git a/jhipster/jhipster-microservice/dealer-app/src/test/java/com/dealer/app/web/rest/DealerResourceIntTest.java b/jhipster/jhipster-microservice/dealer-app/src/test/java/com/dealer/app/web/rest/DealerResourceIntegrationTest.java similarity index 99% rename from jhipster/jhipster-microservice/dealer-app/src/test/java/com/dealer/app/web/rest/DealerResourceIntTest.java rename to jhipster/jhipster-microservice/dealer-app/src/test/java/com/dealer/app/web/rest/DealerResourceIntegrationTest.java index 7778a2783e..38197c418c 100644 --- a/jhipster/jhipster-microservice/dealer-app/src/test/java/com/dealer/app/web/rest/DealerResourceIntTest.java +++ b/jhipster/jhipster-microservice/dealer-app/src/test/java/com/dealer/app/web/rest/DealerResourceIntegrationTest.java @@ -35,7 +35,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. */ @RunWith(SpringRunner.class) @SpringBootTest(classes = DealerappApp.class) -public class DealerResourceIntTest { +public class DealerResourceIntegrationTest { private static final String DEFAULT_NAME = "AAAAAAAAAA"; private static final String UPDATED_NAME = "BBBBBBBBBB"; diff --git a/jhipster/jhipster-microservice/gateway-app/pom.xml b/jhipster/jhipster-microservice/gateway-app/pom.xml index dc9168d824..32aa432279 100644 --- a/jhipster/jhipster-microservice/gateway-app/pom.xml +++ b/jhipster/jhipster-microservice/gateway-app/pom.xml @@ -3,10 +3,10 @@ 4.0.0 - spring-boot-starter-parent - org.springframework.boot - 1.5.2.RELEASE - + parent-boot-5 + com.baeldung + 0.0.1-SNAPSHOT + ../../../parent-boot-5 com.gateway @@ -32,7 +32,6 @@ 5.2.8.Final 2.6.0 0.7.9 - 1.8 3.21.0-GA 1.0.0 1.1.0 @@ -43,12 +42,9 @@ 1.3.0 jdt_apt 1.1.0.Final - 3.6.0 1.4.1 3.0.1 yyyyMMddHHmmss - ${java.version} - ${java.version} 3.0.0 3.1.3 v6.10.0 diff --git a/jhipster/jhipster-microservice/gateway-app/src/test/java/com/gateway/gateway/responserewriting/SwaggerBasePathRewritingFilterTest.java b/jhipster/jhipster-microservice/gateway-app/src/test/java/com/gateway/gateway/responserewriting/SwaggerBasePathRewritingFilterIntegrationTest.java similarity index 97% rename from jhipster/jhipster-microservice/gateway-app/src/test/java/com/gateway/gateway/responserewriting/SwaggerBasePathRewritingFilterTest.java rename to jhipster/jhipster-microservice/gateway-app/src/test/java/com/gateway/gateway/responserewriting/SwaggerBasePathRewritingFilterIntegrationTest.java index d857f9a75d..fdbef8e8a1 100644 --- a/jhipster/jhipster-microservice/gateway-app/src/test/java/com/gateway/gateway/responserewriting/SwaggerBasePathRewritingFilterTest.java +++ b/jhipster/jhipster-microservice/gateway-app/src/test/java/com/gateway/gateway/responserewriting/SwaggerBasePathRewritingFilterIntegrationTest.java @@ -15,7 +15,7 @@ import static springfox.documentation.swagger2.web.Swagger2Controller.DEFAULT_UR /** * Tests SwaggerBasePathRewritingFilter class. */ -public class SwaggerBasePathRewritingFilterTest { +public class SwaggerBasePathRewritingFilterIntegrationTest { private SwaggerBasePathRewritingFilter filter = new SwaggerBasePathRewritingFilter(); diff --git a/jhipster/jhipster-microservice/gateway-app/src/test/java/com/gateway/security/jwt/TokenProviderTest.java b/jhipster/jhipster-microservice/gateway-app/src/test/java/com/gateway/security/jwt/TokenProviderIntegrationTest.java similarity index 98% rename from jhipster/jhipster-microservice/gateway-app/src/test/java/com/gateway/security/jwt/TokenProviderTest.java rename to jhipster/jhipster-microservice/gateway-app/src/test/java/com/gateway/security/jwt/TokenProviderIntegrationTest.java index 81d9103721..04365b8143 100644 --- a/jhipster/jhipster-microservice/gateway-app/src/test/java/com/gateway/security/jwt/TokenProviderTest.java +++ b/jhipster/jhipster-microservice/gateway-app/src/test/java/com/gateway/security/jwt/TokenProviderIntegrationTest.java @@ -19,7 +19,7 @@ import java.util.Date; import static org.assertj.core.api.Assertions.assertThat; -public class TokenProviderTest { +public class TokenProviderIntegrationTest { private final String secretKey = "e5c9ee274ae87bc031adda32e27fa98b9290da83"; private final long ONE_MINUTE = 60000; diff --git a/jhipster/jhipster-microservice/gateway-app/src/test/java/com/gateway/service/UserServiceIntTest.java b/jhipster/jhipster-microservice/gateway-app/src/test/java/com/gateway/service/UserServiceIntIntegrationTest.java similarity index 99% rename from jhipster/jhipster-microservice/gateway-app/src/test/java/com/gateway/service/UserServiceIntTest.java rename to jhipster/jhipster-microservice/gateway-app/src/test/java/com/gateway/service/UserServiceIntIntegrationTest.java index dff1c70056..202ae8f3e1 100644 --- a/jhipster/jhipster-microservice/gateway-app/src/test/java/com/gateway/service/UserServiceIntTest.java +++ b/jhipster/jhipster-microservice/gateway-app/src/test/java/com/gateway/service/UserServiceIntIntegrationTest.java @@ -29,7 +29,7 @@ import static org.assertj.core.api.Assertions.*; @RunWith(SpringRunner.class) @SpringBootTest(classes = GatewayApp.class) @Transactional -public class UserServiceIntTest { +public class UserServiceIntegrationTest { @Autowired private UserRepository userRepository; diff --git a/jhipster/jhipster-microservice/gateway-app/src/test/java/com/gateway/web/rest/AccountResourceIntTest.java b/jhipster/jhipster-microservice/gateway-app/src/test/java/com/gateway/web/rest/AccountResourceIntegrationTest.java similarity index 99% rename from jhipster/jhipster-microservice/gateway-app/src/test/java/com/gateway/web/rest/AccountResourceIntTest.java rename to jhipster/jhipster-microservice/gateway-app/src/test/java/com/gateway/web/rest/AccountResourceIntegrationTest.java index 62d02bff13..607c69ebd1 100644 --- a/jhipster/jhipster-microservice/gateway-app/src/test/java/com/gateway/web/rest/AccountResourceIntTest.java +++ b/jhipster/jhipster-microservice/gateway-app/src/test/java/com/gateway/web/rest/AccountResourceIntegrationTest.java @@ -40,7 +40,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. */ @RunWith(SpringRunner.class) @SpringBootTest(classes = GatewayApp.class) -public class AccountResourceIntTest { +public class AccountResourceIntegrationTest { @Autowired private UserRepository userRepository; diff --git a/jhipster/jhipster-microservice/gateway-app/src/test/java/com/gateway/web/rest/AuditResourceIntTest.java b/jhipster/jhipster-microservice/gateway-app/src/test/java/com/gateway/web/rest/AuditResourceIntegrationTest.java similarity index 99% rename from jhipster/jhipster-microservice/gateway-app/src/test/java/com/gateway/web/rest/AuditResourceIntTest.java rename to jhipster/jhipster-microservice/gateway-app/src/test/java/com/gateway/web/rest/AuditResourceIntegrationTest.java index d73eea2928..7a635a3dc1 100644 --- a/jhipster/jhipster-microservice/gateway-app/src/test/java/com/gateway/web/rest/AuditResourceIntTest.java +++ b/jhipster/jhipster-microservice/gateway-app/src/test/java/com/gateway/web/rest/AuditResourceIntegrationTest.java @@ -35,7 +35,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. @RunWith(SpringRunner.class) @SpringBootTest(classes = GatewayApp.class) @Transactional -public class AuditResourceIntTest { +public class AuditResourceIntegrationTest { private static final String SAMPLE_PRINCIPAL = "SAMPLE_PRINCIPAL"; private static final String SAMPLE_TYPE = "SAMPLE_TYPE"; diff --git a/jhipster/jhipster-microservice/gateway-app/src/test/java/com/gateway/web/rest/LogsResourceIntTest.java b/jhipster/jhipster-microservice/gateway-app/src/test/java/com/gateway/web/rest/LogsResourceIntegrationTest.java similarity index 97% rename from jhipster/jhipster-microservice/gateway-app/src/test/java/com/gateway/web/rest/LogsResourceIntTest.java rename to jhipster/jhipster-microservice/gateway-app/src/test/java/com/gateway/web/rest/LogsResourceIntegrationTest.java index 6c9dc38525..3b4511b534 100644 --- a/jhipster/jhipster-microservice/gateway-app/src/test/java/com/gateway/web/rest/LogsResourceIntTest.java +++ b/jhipster/jhipster-microservice/gateway-app/src/test/java/com/gateway/web/rest/LogsResourceIntegrationTest.java @@ -24,7 +24,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. */ @RunWith(SpringRunner.class) @SpringBootTest(classes = GatewayApp.class) -public class LogsResourceIntTest { +public class LogsResourceIntegrationTest { private MockMvc restLogsMockMvc; diff --git a/jhipster/jhipster-microservice/gateway-app/src/test/java/com/gateway/web/rest/UserResourceIntTest.java b/jhipster/jhipster-microservice/gateway-app/src/test/java/com/gateway/web/rest/UserResourceIntIntegrationTest.java similarity index 99% rename from jhipster/jhipster-microservice/gateway-app/src/test/java/com/gateway/web/rest/UserResourceIntTest.java rename to jhipster/jhipster-microservice/gateway-app/src/test/java/com/gateway/web/rest/UserResourceIntIntegrationTest.java index b27b71a2c9..5070d4881c 100644 --- a/jhipster/jhipster-microservice/gateway-app/src/test/java/com/gateway/web/rest/UserResourceIntTest.java +++ b/jhipster/jhipster-microservice/gateway-app/src/test/java/com/gateway/web/rest/UserResourceIntIntegrationTest.java @@ -39,7 +39,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. */ @RunWith(SpringRunner.class) @SpringBootTest(classes = GatewayApp.class) -public class UserResourceIntTest { +public class UserResourceIntegrationTest { private static final String DEFAULT_LOGIN = "johndoe"; private static final String UPDATED_LOGIN = "jhipster"; diff --git a/jhipster/jhipster-monolithic/pom.xml b/jhipster/jhipster-monolithic/pom.xml index 80c51734e7..eb4c2ca2d3 100644 --- a/jhipster/jhipster-monolithic/pom.xml +++ b/jhipster/jhipster-monolithic/pom.xml @@ -3,10 +3,10 @@ 4.0.0 - spring-boot-starter-parent - org.springframework.boot - 1.5.2.RELEASE - + parent-boot-5 + com.baeldung + 0.0.1-SNAPSHOT + ../../parent-boot-5 com.baeldung @@ -43,12 +43,9 @@ 4.8 jdt_apt 1.1.0.Final - 3.6.0 1.4.1 3.0.1 yyyyMMddHHmmss - ${java.version} - ${java.version} 3.0.0 3.1.3 v6.10.0 @@ -360,11 +357,6 @@ org.springframework.boot spring-boot-starter-security - - org.springframework.boot - spring-boot-starter-test - test - org.springframework.boot spring-boot-starter-thymeleaf diff --git a/jhipster/jhipster-monolithic/src/test/java/com/baeldung/security/jwt/TokenProviderTest.java b/jhipster/jhipster-monolithic/src/test/java/com/baeldung/security/jwt/TokenProviderIntegrationTest.java similarity index 98% rename from jhipster/jhipster-monolithic/src/test/java/com/baeldung/security/jwt/TokenProviderTest.java rename to jhipster/jhipster-monolithic/src/test/java/com/baeldung/security/jwt/TokenProviderIntegrationTest.java index 3fec4bfb88..8e111f0acd 100644 --- a/jhipster/jhipster-monolithic/src/test/java/com/baeldung/security/jwt/TokenProviderTest.java +++ b/jhipster/jhipster-monolithic/src/test/java/com/baeldung/security/jwt/TokenProviderIntegrationTest.java @@ -19,7 +19,7 @@ import java.util.Date; import static org.assertj.core.api.Assertions.assertThat; -public class TokenProviderTest { +public class TokenProviderIntegrationTest { private final String secretKey = "e5c9ee274ae87bc031adda32e27fa98b9290da83"; private final long ONE_MINUTE = 60000; diff --git a/jhipster/jhipster-monolithic/src/test/java/com/baeldung/service/UserServiceIntTest.java b/jhipster/jhipster-monolithic/src/test/java/com/baeldung/service/UserServiceIntIntegrationTest.java similarity index 99% rename from jhipster/jhipster-monolithic/src/test/java/com/baeldung/service/UserServiceIntTest.java rename to jhipster/jhipster-monolithic/src/test/java/com/baeldung/service/UserServiceIntIntegrationTest.java index 968f0a7f08..8b4825453e 100644 --- a/jhipster/jhipster-monolithic/src/test/java/com/baeldung/service/UserServiceIntTest.java +++ b/jhipster/jhipster-monolithic/src/test/java/com/baeldung/service/UserServiceIntIntegrationTest.java @@ -29,7 +29,7 @@ import static org.assertj.core.api.Assertions.*; @RunWith(SpringRunner.class) @SpringBootTest(classes = BaeldungApp.class) @Transactional -public class UserServiceIntTest { +public class UserServiceIntegrationTest { @Autowired private UserRepository userRepository; diff --git a/jhipster/jhipster-monolithic/src/test/java/com/baeldung/web/rest/AccountResourceIntTest.java b/jhipster/jhipster-monolithic/src/test/java/com/baeldung/web/rest/AccountResourceIntegrationTest.java similarity index 99% rename from jhipster/jhipster-monolithic/src/test/java/com/baeldung/web/rest/AccountResourceIntTest.java rename to jhipster/jhipster-monolithic/src/test/java/com/baeldung/web/rest/AccountResourceIntegrationTest.java index e42ce1c6d4..9644ae488c 100644 --- a/jhipster/jhipster-monolithic/src/test/java/com/baeldung/web/rest/AccountResourceIntTest.java +++ b/jhipster/jhipster-monolithic/src/test/java/com/baeldung/web/rest/AccountResourceIntegrationTest.java @@ -40,7 +40,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. */ @RunWith(SpringRunner.class) @SpringBootTest(classes = BaeldungApp.class) -public class AccountResourceIntTest { +public class AccountResourceIntegrationTest { @Autowired private UserRepository userRepository; diff --git a/jhipster/jhipster-monolithic/src/test/java/com/baeldung/web/rest/AuditResourceIntTest.java b/jhipster/jhipster-monolithic/src/test/java/com/baeldung/web/rest/AuditResourceIntegrationTest.java similarity index 99% rename from jhipster/jhipster-monolithic/src/test/java/com/baeldung/web/rest/AuditResourceIntTest.java rename to jhipster/jhipster-monolithic/src/test/java/com/baeldung/web/rest/AuditResourceIntegrationTest.java index 127cb36f07..def6bb2e48 100644 --- a/jhipster/jhipster-monolithic/src/test/java/com/baeldung/web/rest/AuditResourceIntTest.java +++ b/jhipster/jhipster-monolithic/src/test/java/com/baeldung/web/rest/AuditResourceIntegrationTest.java @@ -35,7 +35,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. @RunWith(SpringRunner.class) @SpringBootTest(classes = BaeldungApp.class) @Transactional -public class AuditResourceIntTest { +public class AuditResourceIntegrationTest { private static final String SAMPLE_PRINCIPAL = "SAMPLE_PRINCIPAL"; private static final String SAMPLE_TYPE = "SAMPLE_TYPE"; diff --git a/jhipster/jhipster-monolithic/src/test/java/com/baeldung/web/rest/CommentResourceIntTest.java b/jhipster/jhipster-monolithic/src/test/java/com/baeldung/web/rest/CommentResourceIntegrationTest.java similarity index 99% rename from jhipster/jhipster-monolithic/src/test/java/com/baeldung/web/rest/CommentResourceIntTest.java rename to jhipster/jhipster-monolithic/src/test/java/com/baeldung/web/rest/CommentResourceIntegrationTest.java index 04b16b25f8..4f544d9eeb 100644 --- a/jhipster/jhipster-monolithic/src/test/java/com/baeldung/web/rest/CommentResourceIntTest.java +++ b/jhipster/jhipster-monolithic/src/test/java/com/baeldung/web/rest/CommentResourceIntegrationTest.java @@ -38,7 +38,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. */ @RunWith(SpringRunner.class) @SpringBootTest(classes = BaeldungApp.class) -public class CommentResourceIntTest { +public class CommentResourceIntegrationTest { private static final String DEFAULT_TEXT = "AAAAAAAAAA"; private static final String UPDATED_TEXT = "BBBBBBBBBB"; diff --git a/jhipster/jhipster-monolithic/src/test/java/com/baeldung/web/rest/LogsResourceIntTest.java b/jhipster/jhipster-monolithic/src/test/java/com/baeldung/web/rest/LogsResourceIntegrationTest.java similarity index 97% rename from jhipster/jhipster-monolithic/src/test/java/com/baeldung/web/rest/LogsResourceIntTest.java rename to jhipster/jhipster-monolithic/src/test/java/com/baeldung/web/rest/LogsResourceIntegrationTest.java index 92bb976205..2f852f9fd8 100644 --- a/jhipster/jhipster-monolithic/src/test/java/com/baeldung/web/rest/LogsResourceIntTest.java +++ b/jhipster/jhipster-monolithic/src/test/java/com/baeldung/web/rest/LogsResourceIntegrationTest.java @@ -24,7 +24,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. */ @RunWith(SpringRunner.class) @SpringBootTest(classes = BaeldungApp.class) -public class LogsResourceIntTest { +public class LogsResourceIntegrationTest { private MockMvc restLogsMockMvc; diff --git a/jhipster/jhipster-monolithic/src/test/java/com/baeldung/web/rest/PostResourceIntTest.java b/jhipster/jhipster-monolithic/src/test/java/com/baeldung/web/rest/PostResourceIntegrationTest.java similarity index 99% rename from jhipster/jhipster-monolithic/src/test/java/com/baeldung/web/rest/PostResourceIntTest.java rename to jhipster/jhipster-monolithic/src/test/java/com/baeldung/web/rest/PostResourceIntegrationTest.java index 2a23452711..a9a4bc74b9 100644 --- a/jhipster/jhipster-monolithic/src/test/java/com/baeldung/web/rest/PostResourceIntTest.java +++ b/jhipster/jhipster-monolithic/src/test/java/com/baeldung/web/rest/PostResourceIntegrationTest.java @@ -38,7 +38,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. */ @RunWith(SpringRunner.class) @SpringBootTest(classes = BaeldungApp.class) -public class PostResourceIntTest { +public class PostResourceIntegrationTest { private static final String DEFAULT_TITLE = "AAAAAAAAAA"; private static final String UPDATED_TITLE = "BBBBBBBBBB"; diff --git a/jhipster/jhipster-monolithic/src/test/java/com/baeldung/web/rest/UserResourceIntTest.java b/jhipster/jhipster-monolithic/src/test/java/com/baeldung/web/rest/UserResourceIntIntegrationTest.java similarity index 99% rename from jhipster/jhipster-monolithic/src/test/java/com/baeldung/web/rest/UserResourceIntTest.java rename to jhipster/jhipster-monolithic/src/test/java/com/baeldung/web/rest/UserResourceIntIntegrationTest.java index 74df23283a..2c578ff54b 100644 --- a/jhipster/jhipster-monolithic/src/test/java/com/baeldung/web/rest/UserResourceIntTest.java +++ b/jhipster/jhipster-monolithic/src/test/java/com/baeldung/web/rest/UserResourceIntIntegrationTest.java @@ -39,7 +39,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. */ @RunWith(SpringRunner.class) @SpringBootTest(classes = BaeldungApp.class) -public class UserResourceIntTest { +public class UserResourceIntegrationTest { private static final String DEFAULT_LOGIN = "johndoe"; private static final String UPDATED_LOGIN = "jhipster"; diff --git a/jjwt/pom.xml b/jjwt/pom.xml index 982b24987b..83a1131211 100644 --- a/jjwt/pom.xml +++ b/jjwt/pom.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 io.jsonwebtoken @@ -12,15 +12,13 @@ Exercising the JJWT - org.springframework.boot - spring-boot-starter-parent - 1.4.4.RELEASE - + parent-boot-4 + com.baeldung + 0.0.1-SNAPSHOT + ../parent-boot-4 - UTF-8 - 1.8 0.7.0 @@ -40,12 +38,6 @@ spring-boot-starter-security - - org.springframework.boot - spring-boot-starter-test - test - - io.jsonwebtoken jjwt @@ -53,25 +45,6 @@ - - - - org.springframework.boot - spring-boot-maven-plugin - - - org.apache.maven.plugins - maven-surefire-plugin - - - **/*IntegrationTest.java - **/*LiveTest.java - - - - - - integration @@ -106,4 +79,5 @@ + diff --git a/jooq/pom.xml b/jooq/pom.xml index c42d66e538..667640d085 100644 --- a/jooq/pom.xml +++ b/jooq/pom.xml @@ -1,7 +1,6 @@ - + parent-modules com.baeldung diff --git a/jooq/src/test/java/com/baeldung/JOOLTest.java b/jooq/src/test/java/com/baeldung/JOOLUnitTest.java similarity index 99% rename from jooq/src/test/java/com/baeldung/JOOLTest.java rename to jooq/src/test/java/com/baeldung/JOOLUnitTest.java index a0d5f4037f..17873db50a 100644 --- a/jooq/src/test/java/com/baeldung/JOOLTest.java +++ b/jooq/src/test/java/com/baeldung/JOOLUnitTest.java @@ -20,7 +20,7 @@ import static junit.framework.Assert.assertTrue; import static junit.framework.TestCase.assertEquals; import static org.jooq.lambda.tuple.Tuple.tuple; -public class JOOLTest { +public class JOOLUnitTest { @Test public void givenSeq_whenCheckContains_shouldReturnTrue() { List concat = Seq.of(1, 2, 3).concat(Seq.of(4, 5, 6)).toList(); diff --git a/jpa-storedprocedure/pom.xml b/jpa-storedprocedure/pom.xml index dcfaeec222..cbda37a7b3 100644 --- a/jpa-storedprocedure/pom.xml +++ b/jpa-storedprocedure/pom.xml @@ -1,5 +1,6 @@ - + 4.0.0 com.baeldung @@ -11,15 +12,14 @@ com.baeldung parent-modules 1.0.0-SNAPSHOT - + 7.0 5.2.5.Final 6.0.5 - 4.12 2.5 - 2.19.1 + 2.19.1 @@ -29,12 +29,13 @@ maven-assembly-plugin ${project.basedir} - + jar-with-dependencies - + diff --git a/jsf/pom.xml b/jsf/pom.xml index e556f79215..5f4e2c69c1 100644 --- a/jsf/pom.xml +++ b/jsf/pom.xml @@ -1,7 +1,6 @@ - + parent-modules com.baeldung @@ -70,7 +69,7 @@ commons-logging commons-logging - + javax.servlet @@ -78,14 +77,6 @@ provided ${javax.servlet.version} - - - - org.slf4j - jcl-over-slf4j - ${org.slf4j.version} - - @@ -108,9 +99,9 @@ 2.2.14 3.0.0 - + 3.1.0 - + 1.2 diff --git a/json-path/pom.xml b/json-path/pom.xml index 6757ad050e..e81bc1dcf9 100644 --- a/json-path/pom.xml +++ b/json-path/pom.xml @@ -1,28 +1,28 @@ - 4.0.0 - com.baeldung - json-path - 0.0.1-SNAPSHOT - json-path + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + com.baeldung + json-path + 0.0.1-SNAPSHOT + json-path com.baeldung parent-modules 1.0.0-SNAPSHOT - - - - - - com.jayway.jsonpath - json-path - ${json-path.version} - - + - - - 2.2.0 - + + + + com.jayway.jsonpath + json-path + ${json-path.version} + + + + + + 2.2.0 + \ No newline at end of file diff --git a/json-path/src/test/java/com/baeldung/jsonpath/introduction/OperationTest.java b/json-path/src/test/java/com/baeldung/jsonpath/introduction/OperationIntegrationTest.java similarity index 98% rename from json-path/src/test/java/com/baeldung/jsonpath/introduction/OperationTest.java rename to json-path/src/test/java/com/baeldung/jsonpath/introduction/OperationIntegrationTest.java index d90fafb7cb..cb5c695cd8 100644 --- a/json-path/src/test/java/com/baeldung/jsonpath/introduction/OperationTest.java +++ b/json-path/src/test/java/com/baeldung/jsonpath/introduction/OperationIntegrationTest.java @@ -18,7 +18,7 @@ import com.jayway.jsonpath.Filter; import com.jayway.jsonpath.JsonPath; import com.jayway.jsonpath.Predicate; -public class OperationTest { +public class OperationIntegrationTest { InputStream jsonInputStream = this.getClass().getClassLoader().getResourceAsStream("intro_api.json"); String jsonDataSourceString = new Scanner(jsonInputStream, "UTF-8").useDelimiter("\\Z").next(); diff --git a/json/pom.xml b/json/pom.xml index 1e65e70a59..958dd32f53 100644 --- a/json/pom.xml +++ b/json/pom.xml @@ -9,8 +9,8 @@ com.baeldung parent-modules 1.0.0-SNAPSHOT - - + + @@ -22,7 +22,7 @@ commons-logging commons-logging - + diff --git a/json/src/test/java/com/baeldung/json/schema/JSONSchemaTest.java b/json/src/test/java/com/baeldung/json/schema/JSONSchemaUnitTest.java similarity index 74% rename from json/src/test/java/com/baeldung/json/schema/JSONSchemaTest.java rename to json/src/test/java/com/baeldung/json/schema/JSONSchemaUnitTest.java index bd4aaee682..393e052b95 100644 --- a/json/src/test/java/com/baeldung/json/schema/JSONSchemaTest.java +++ b/json/src/test/java/com/baeldung/json/schema/JSONSchemaUnitTest.java @@ -8,13 +8,13 @@ import org.json.JSONObject; import org.json.JSONTokener; import org.junit.Test; -public class JSONSchemaTest { +public class JSONSchemaUnitTest { @Test(expected = ValidationException.class) public void givenInvalidInput_whenValidating_thenInvalid() { - JSONObject jsonSchema = new JSONObject(new JSONTokener(JSONSchemaTest.class.getResourceAsStream("/schema.json"))); - JSONObject jsonSubject = new JSONObject(new JSONTokener(JSONSchemaTest.class.getResourceAsStream("/product_invalid.json"))); + JSONObject jsonSchema = new JSONObject(new JSONTokener(JSONSchemaUnitTest.class.getResourceAsStream("/schema.json"))); + JSONObject jsonSubject = new JSONObject(new JSONTokener(JSONSchemaUnitTest.class.getResourceAsStream("/product_invalid.json"))); Schema schema = SchemaLoader.load(jsonSchema); schema.validate(jsonSubject); @@ -23,8 +23,8 @@ public class JSONSchemaTest { @Test public void givenValidInput_whenValidating_thenValid() { - JSONObject jsonSchema = new JSONObject(new JSONTokener(JSONSchemaTest.class.getResourceAsStream("/schema.json"))); - JSONObject jsonSubject = new JSONObject(new JSONTokener(JSONSchemaTest.class.getResourceAsStream("/product_valid.json"))); + JSONObject jsonSchema = new JSONObject(new JSONTokener(JSONSchemaUnitTest.class.getResourceAsStream("/schema.json"))); + JSONObject jsonSubject = new JSONObject(new JSONTokener(JSONSchemaUnitTest.class.getResourceAsStream("/product_valid.json"))); Schema schema = SchemaLoader.load(jsonSchema); schema.validate(jsonSubject); diff --git a/json/src/test/java/fast_json/FastJsonTests.java b/json/src/test/java/fast_json/FastJsonUnitTest.java similarity index 99% rename from json/src/test/java/fast_json/FastJsonTests.java rename to json/src/test/java/fast_json/FastJsonUnitTest.java index 7b7e3c0434..e37f443387 100644 --- a/json/src/test/java/fast_json/FastJsonTests.java +++ b/json/src/test/java/fast_json/FastJsonUnitTest.java @@ -17,7 +17,7 @@ import java.util.List; import static org.junit.Assert.assertEquals; -public class FastJsonTests { +public class FastJsonUnitTest { private List listOfPersons; @Before diff --git a/jsoup/pom.xml b/jsoup/pom.xml index 5bef63012e..8bbb4a46dc 100644 --- a/jsoup/pom.xml +++ b/jsoup/pom.xml @@ -1,5 +1,6 @@ - + 4.0.0 com.baeldung diff --git a/junit5/pom.xml b/junit5/pom.xml index 7a426abacc..9f06ebe6a5 100644 --- a/junit5/pom.xml +++ b/junit5/pom.xml @@ -1,61 +1,61 @@ - 4.0.0 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 - com.baeldung - junit5 - 1.0-SNAPSHOT + com.baeldung + junit5 + 1.0-SNAPSHOT + + junit5 + Intro to JUnit 5 - junit5 - Intro to JUnit 5 - com.baeldung parent-modules 1.0.0-SNAPSHOT - + - - UTF-8 - 1.8 - 5.0.0-M4 - 1.0.0-M4 + + UTF-8 + 1.8 + 5.0.0-M4 + 1.0.0-M4 - 3.6.0 - 2.19.1 - + 3.6.0 + 2.19.1 + - - - - maven-compiler-plugin - ${maven-compiler-plugin.version} - - ${java.version} - ${java.version} - - - - maven-surefire-plugin - ${maven-surefire-plugin.version} - - - org.junit.platform - junit-platform-surefire-provider - ${junit.platform.version} - - - - - + + + + maven-compiler-plugin + ${maven-compiler-plugin.version} + + ${java.version} + ${java.version} + + + + maven-surefire-plugin + ${maven-surefire-plugin.version} + + + org.junit.platform + junit-platform-surefire-provider + ${junit.platform.version} + + + + + - - - org.junit.jupiter - junit-jupiter-engine - ${junit.jupiter.version} - test - - + + + org.junit.jupiter + junit-jupiter-engine + ${junit.jupiter.version} + test + + \ No newline at end of file diff --git a/junit5/src/test/java/com/baeldung/AssertionTest.java b/junit5/src/test/java/com/baeldung/AssertionUnitTest.java similarity index 93% rename from junit5/src/test/java/com/baeldung/AssertionTest.java rename to junit5/src/test/java/com/baeldung/AssertionUnitTest.java index 1bb543556b..504931b3d7 100644 --- a/junit5/src/test/java/com/baeldung/AssertionTest.java +++ b/junit5/src/test/java/com/baeldung/AssertionUnitTest.java @@ -4,7 +4,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import org.junit.jupiter.api.Test; -public class AssertionTest { +public class AssertionUnitTest { @Test public void testConvertToDoubleThrowException() { diff --git a/junit5/src/test/java/com/baeldung/AssumptionTest.java b/junit5/src/test/java/com/baeldung/AssumptionUnitTest.java similarity index 95% rename from junit5/src/test/java/com/baeldung/AssumptionTest.java rename to junit5/src/test/java/com/baeldung/AssumptionUnitTest.java index f6f288e8a7..afeee642eb 100644 --- a/junit5/src/test/java/com/baeldung/AssumptionTest.java +++ b/junit5/src/test/java/com/baeldung/AssumptionUnitTest.java @@ -7,7 +7,7 @@ import static org.junit.jupiter.api.Assumptions.assumingThat; import org.junit.jupiter.api.Test; -public class AssumptionTest { +public class AssumptionUnitTest { @Test void trueAssumption() { diff --git a/junit5/src/test/java/com/baeldung/ExceptionTest.java b/junit5/src/test/java/com/baeldung/ExceptionUnitTest.java similarity index 94% rename from junit5/src/test/java/com/baeldung/ExceptionTest.java rename to junit5/src/test/java/com/baeldung/ExceptionUnitTest.java index f4567c6c15..6ec1a4b7bd 100644 --- a/junit5/src/test/java/com/baeldung/ExceptionTest.java +++ b/junit5/src/test/java/com/baeldung/ExceptionUnitTest.java @@ -5,7 +5,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import org.junit.jupiter.api.Test; -public class ExceptionTest { +public class ExceptionUnitTest { @Test void shouldThrowException() { diff --git a/junit5/src/test/java/com/baeldung/FirstTest.java b/junit5/src/test/java/com/baeldung/FirstUnitTest.java similarity index 97% rename from junit5/src/test/java/com/baeldung/FirstTest.java rename to junit5/src/test/java/com/baeldung/FirstUnitTest.java index 817d8b36de..78c563cf82 100644 --- a/junit5/src/test/java/com/baeldung/FirstTest.java +++ b/junit5/src/test/java/com/baeldung/FirstUnitTest.java @@ -8,7 +8,7 @@ import java.util.List; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; -class FirstTest { +class FirstUnitTest { @Test void lambdaExpressions() { diff --git a/junit5/src/test/java/com/baeldung/JUnit5NewFeaturesTest.java b/junit5/src/test/java/com/baeldung/JUnit5NewFeaturesUnitTest.java similarity index 93% rename from junit5/src/test/java/com/baeldung/JUnit5NewFeaturesTest.java rename to junit5/src/test/java/com/baeldung/JUnit5NewFeaturesUnitTest.java index 6c790a7c8e..a4dfd610a1 100644 --- a/junit5/src/test/java/com/baeldung/JUnit5NewFeaturesTest.java +++ b/junit5/src/test/java/com/baeldung/JUnit5NewFeaturesUnitTest.java @@ -11,9 +11,9 @@ import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; //@RunWith(JUnitPlatform.class) -public class JUnit5NewFeaturesTest { +public class JUnit5NewFeaturesUnitTest { - private static final Logger log = Logger.getLogger(JUnit5NewFeaturesTest.class.getName()); + private static final Logger log = Logger.getLogger(JUnit5NewFeaturesUnitTest.class.getName()); @BeforeAll static void setup() { diff --git a/junit5/src/test/java/com/baeldung/NestedTest.java b/junit5/src/test/java/com/baeldung/NestedUnitTest.java similarity index 98% rename from junit5/src/test/java/com/baeldung/NestedTest.java rename to junit5/src/test/java/com/baeldung/NestedUnitTest.java index 963d75c5b7..7586a2f51a 100644 --- a/junit5/src/test/java/com/baeldung/NestedTest.java +++ b/junit5/src/test/java/com/baeldung/NestedUnitTest.java @@ -9,7 +9,7 @@ import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; -public class NestedTest { +public class NestedUnitTest { Stack stack; boolean isRun = false; diff --git a/junit5/src/test/java/com/baeldung/TaggedTest.java b/junit5/src/test/java/com/baeldung/TaggedUnitTest.java similarity index 89% rename from junit5/src/test/java/com/baeldung/TaggedTest.java rename to junit5/src/test/java/com/baeldung/TaggedUnitTest.java index fa3a500240..8deeeb8abd 100644 --- a/junit5/src/test/java/com/baeldung/TaggedTest.java +++ b/junit5/src/test/java/com/baeldung/TaggedUnitTest.java @@ -6,7 +6,7 @@ import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; @Tag("Test case") -public class TaggedTest { +public class TaggedUnitTest { @Test @Tag("Method") diff --git a/jws/pom.xml b/jws/pom.xml index 40c8131a8c..6b15e2dc14 100644 --- a/jws/pom.xml +++ b/jws/pom.xml @@ -8,18 +8,18 @@ 0.0.1-SNAPSHOT jws-example - + com.baeldung parent-modules 1.0.0-SNAPSHOT - + 3.0.2 - 3.0.0 - 7.0 - 7.0 + 3.0.0 + 7.0 + 7.0 @@ -63,7 +63,7 @@ - + org.apache.maven.plugins maven-war-plugin @@ -88,5 +88,5 @@ ${project.artifactId} - + diff --git a/kotlin/pom.xml b/kotlin/pom.xml index dfe95b76b7..7b45e9809b 100644 --- a/kotlin/pom.xml +++ b/kotlin/pom.xml @@ -1,7 +1,6 @@ - + 4.0.0 com.baeldung @@ -12,8 +11,8 @@ com.baeldung parent-modules 1.0.0-SNAPSHOT - - + + org.jetbrains.kotlin @@ -44,7 +43,9 @@ compile - compile + + compile + ${project.basedir}/src/main/kotlin @@ -54,7 +55,9 @@ test-compile - test-compile + + test-compile + ${project.basedir}/src/test/kotlin @@ -69,12 +72,14 @@ maven-compiler-plugin 3.5.1 - + default-compile none - + default-testCompile none @@ -82,12 +87,16 @@ java-compile compile - compile + + compile + java-test-compile test-compile - testCompile + + testCompile + diff --git a/kotlin/src/main/kotlin/com/baeldung/kotlin/User.kt b/kotlin/src/main/kotlin/com/baeldung/kotlin/User.kt new file mode 100644 index 0000000000..759627b56e --- /dev/null +++ b/kotlin/src/main/kotlin/com/baeldung/kotlin/User.kt @@ -0,0 +1,3 @@ +package com.baeldung.kotlin + +data class User(val name: String, val age: Int, val hobbies: List) diff --git a/kotlin/src/test/java/com/baeldung/kotlin/JavaCallToKotlinTest.java b/kotlin/src/test/java/com/baeldung/kotlin/JavaCallToKotlinUnitTest.java similarity index 88% rename from kotlin/src/test/java/com/baeldung/kotlin/JavaCallToKotlinTest.java rename to kotlin/src/test/java/com/baeldung/kotlin/JavaCallToKotlinUnitTest.java index cfad7cefd4..370f24785a 100644 --- a/kotlin/src/test/java/com/baeldung/kotlin/JavaCallToKotlinTest.java +++ b/kotlin/src/test/java/com/baeldung/kotlin/JavaCallToKotlinUnitTest.java @@ -4,7 +4,7 @@ import org.junit.Test; import static org.junit.Assert.assertEquals; -public class JavaCallToKotlinTest { +public class JavaCallToKotlinUnitTest { @Test public void givenKotlinClass_whenCallFromJava_shouldProduceResults() { //when diff --git a/kotlin/src/test/kotlin/com/baeldung/kotlin/EqualityTest.kt b/kotlin/src/test/kotlin/com/baeldung/kotlin/EqualityTest.kt index 7cf2faaf42..6fb6d0a288 100644 --- a/kotlin/src/test/kotlin/com/baeldung/kotlin/EqualityTest.kt +++ b/kotlin/src/test/kotlin/com/baeldung/kotlin/EqualityTest.kt @@ -23,4 +23,36 @@ class EqualityTest { assertTrue(a == b) } + + @Test + fun givenUser_whenCheckReference_thenEqualReference() { + val user = User("John", 30, listOf("Hiking, Chess")) + val user2 = User("Sarah", 28, listOf("Shopping, Gymnastics")) + + assertFalse(user === user2) + } + + @Test + fun givenUser_whenCheckValue_thenStructurallyEqual() { + val user = User("John", 30, listOf("Hiking, Chess")) + val user2 = User("John", 30, listOf("Hiking, Chess")) + + assertTrue(user == user2) + } + + @Test + fun givenArray_whenCheckReference_thenEqualReference() { + val hobbies = arrayOf("Riding motorcycle, Video games") + val hobbies2 = arrayOf("Riding motorcycle, Video games") + + assertFalse(hobbies === hobbies2) + } + + @Test + fun givenArray_whenCheckContent_thenStructurallyEqual() { + val hobbies = arrayOf("Hiking, Chess") + val hobbies2 = arrayOf("Hiking, Chess") + + assertTrue(hobbies contentEquals hobbies2) + } } \ No newline at end of file diff --git a/libraries/pom.xml b/libraries/pom.xml index 1fc3cdd815..bf50e699b8 100644 --- a/libraries/pom.xml +++ b/libraries/pom.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> parent-modules com.baeldung @@ -41,18 +41,18 @@ - + org.datanucleus - datanucleus-maven-plugin - 5.0.2 + datanucleus-maven-plugin + 5.0.2 JDO ${basedir}/datanucleus.properties ${basedir}/log4j.properties true - - + + process-classes enhance @@ -125,7 +125,7 @@ commons-logging commons-logging - + commons-io @@ -141,7 +141,7 @@ commons-logging commons-logging - + org.apache.flink @@ -152,7 +152,7 @@ commons-logging commons-logging - + org.apache.flink @@ -169,68 +169,103 @@ net.serenity-bdd serenity-core ${serenity.version} + test net.serenity-bdd serenity-junit ${serenity.version} + test net.serenity-bdd serenity-jbehave ${serenity.jbehave.version} + test net.serenity-bdd serenity-rest-assured ${serenity.version} + test net.serenity-bdd serenity-jira-requirements-provider ${serenity.jira.version} + test com.fasterxml.jackson.core jackson-databind ${jackson.version} - - - org.datanucleus - javax.jdo - 3.2.0-m6 - - - org.datanucleus - datanucleus-core - 5.1.0-m1 - - - org.datanucleus - datanucleus-api-jdo - 5.1.0-m1 - - - org.datanucleus - datanucleus-rdbms - 5.1.0-m1 - - - org.datanucleus - datanucleus-maven-plugin - 5.0.2 - - - com.h2database - h2 - 1.4.194 - - - org.datanucleus - datanucleus-xml - 5.0.0-release - + + + org.datanucleus + javax.jdo + 3.2.0-m6 + + + org.datanucleus + datanucleus-core + 5.1.0-m1 + + + org.datanucleus + datanucleus-api-jdo + 5.1.0-m1 + + + org.datanucleus + datanucleus-rdbms + 5.1.0-m1 + + + org.datanucleus + datanucleus-maven-plugin + 5.0.2 + + + com.h2database + h2 + 1.4.194 + + + org.datanucleus + datanucleus-xml + 5.0.0-release + + + + org.springframework + spring-web + 4.3.8.RELEASE + + + net.serenity-bdd + serenity-spring + ${serenity.version} + test + + + io.rest-assured + spring-mock-mvc + 3.0.3 + test + + + com.zaxxer + HikariCP + 2.6.1 + compile + + + org.postgresql + postgresql + 42.0.0 + + @@ -250,10 +285,10 @@ 2.5 1.2.0 2.8.5 - 1.2.5-rc.11 + 1.4.0 1.24.0 1.1.3-rc.5 - 1.2.5-rc.6 + 1.4.0 diff --git a/libraries/src/main/java/com/baeldung/hikaricp/DataSource.java b/libraries/src/main/java/com/baeldung/hikaricp/DataSource.java new file mode 100644 index 0000000000..d3809dcedd --- /dev/null +++ b/libraries/src/main/java/com/baeldung/hikaricp/DataSource.java @@ -0,0 +1,47 @@ +package com.baeldung.hikaricp; + +import com.zaxxer.hikari.HikariConfig; +import com.zaxxer.hikari.HikariDataSource; + +import java.sql.Connection; +import java.sql.SQLException; + +public class DataSource { + + private static HikariConfig config = new HikariConfig(); + private static HikariDataSource ds; + + static { + /* config = new HikariConfig("datasource.properties"); + + Properties props = new Properties(); + props.setProperty("dataSourceClassName", "org.postgresql.ds.PGSimpleDataSource"); + props.setProperty("dataSource.user", "postgres"); + props.setProperty("dataSource.password", "postgres"); + props.setProperty("dataSource.databaseName", "postgres"); + props.setProperty("dataSource.portNumber", "5432"); + props.setProperty("dataSource.serverName", "localhost"); + props.put("dataSource.logWriter", new PrintWriter(System.out)); + config = new HikariConfig(props);*/ + + config.setJdbcUrl("jdbc:postgresql://localhost:5432/postgres"); + config.setUsername("postgres"); + config.setPassword("postgres"); + config.addDataSourceProperty("cachePrepStmts", "true"); + config.addDataSourceProperty("prepStmtCacheSize", "250"); + config.addDataSourceProperty("prepStmtCacheSqlLimit", "2048"); + ds = new HikariDataSource(config); + + /* ds.setJdbcUrl("jdbc:postgresql://localhost:5432/postgres"); + ds.setUsername("postgres"); + ds.setPassword("postgres");*/ + } + + private DataSource() { + } + + public static Connection getConnection() throws SQLException { + return ds.getConnection(); + } + +} diff --git a/libraries/src/main/java/com/baeldung/hikaricp/Employee.java b/libraries/src/main/java/com/baeldung/hikaricp/Employee.java new file mode 100644 index 0000000000..1ea3c13a48 --- /dev/null +++ b/libraries/src/main/java/com/baeldung/hikaricp/Employee.java @@ -0,0 +1,85 @@ +package com.baeldung.hikaricp; + +import java.sql.Date; + +public class Employee { + + private int empNo; + private String ename; + private String job; + private int mgr; + private Date hiredate; + private int sal; + private int comm; + private int deptno; + + public int getEmpNo() { + return empNo; + } + + public void setEmpNo(int empNo) { + this.empNo = empNo; + } + + public String getEname() { + return ename; + } + + public void setEname(String ename) { + this.ename = ename; + } + + public String getJob() { + return job; + } + + public void setJob(String job) { + this.job = job; + } + + public int getMgr() { + return mgr; + } + + public void setMgr(int mgr) { + this.mgr = mgr; + } + + public Date getHiredate() { + return hiredate; + } + + public void setHiredate(Date hiredate) { + this.hiredate = hiredate; + } + + public int getSal() { + return sal; + } + + public void setSal(int sal) { + this.sal = sal; + } + + public int getComm() { + return comm; + } + + public void setComm(int comm) { + this.comm = comm; + } + + public int getDeptno() { + return deptno; + } + + public void setDeptno(int deptno) { + this.deptno = deptno; + } + + @Override + public String toString() { + return String.format("Employee [empNo=%d, ename=%s, job=%s, mgr=%d, hiredate=%s, sal=%d, comm=%d, deptno=%d]", empNo, ename, job, mgr, hiredate, sal, comm, deptno); + } + +} diff --git a/libraries/src/main/java/com/baeldung/hikaricp/HikariCPDemo.java b/libraries/src/main/java/com/baeldung/hikaricp/HikariCPDemo.java new file mode 100644 index 0000000000..014202ac10 --- /dev/null +++ b/libraries/src/main/java/com/baeldung/hikaricp/HikariCPDemo.java @@ -0,0 +1,34 @@ +package com.baeldung.hikaricp; + +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.util.ArrayList; +import java.util.List; + +public class HikariCPDemo { + + public static List fetchData() throws SQLException { + final String SQL_QUERY = "select * from emp"; + List employees; + try (Connection con = DataSource.getConnection(); PreparedStatement pst = con.prepareStatement(SQL_QUERY); ResultSet rs = pst.executeQuery()) { + employees = new ArrayList<>(); + Employee employee; + while (rs.next()) { + employee = new Employee(); + employee.setEmpNo(rs.getInt("empno")); + employee.setEname(rs.getString("ename")); + employee.setJob(rs.getString("job")); + employee.setMgr(rs.getInt("mgr")); + employee.setHiredate(rs.getDate("hiredate")); + employee.setSal(rs.getInt("sal")); + employee.setComm(rs.getInt("comm")); + employee.setDeptno(rs.getInt("deptno")); + employees.add(employee); + } + } + return employees; + } + +} diff --git a/libraries/src/main/java/com/baeldung/hikaricp/db.sql b/libraries/src/main/java/com/baeldung/hikaricp/db.sql new file mode 100644 index 0000000000..1dac59307b --- /dev/null +++ b/libraries/src/main/java/com/baeldung/hikaricp/db.sql @@ -0,0 +1,47 @@ +create table dept( + deptno numeric, + dname varchar(14), + loc varchar(13), + constraint pk_dept primary key (deptno) +); + +create table emp( + empno numeric, + ename varchar(10), + job varchar(9), + mgr numeric, + hiredate date, + sal numeric, + comm numeric, + deptno numeric, + constraint pk_emp primary key (empno), + constraint fk_deptno foreign key (deptno) references dept (deptno) +); + +insert into dept values(10, 'ACCOUNTING', 'NEW YORK'); +insert into dept values(20, 'RESEARCH', 'DALLAS'); +insert into dept values(30, 'SALES', 'CHICAGO'); +insert into dept values(40, 'OPERATIONS', 'BOSTON'); + +insert into emp values( + 7839, 'KING', 'PRESIDENT', null, + to_date('17-11-1981','dd-mm-yyyy'), + 7698, null, 10 +); +insert into emp values( + 7698, 'BLAKE', 'MANAGER', 7839, + to_date('1-5-1981','dd-mm-yyyy'), + 7782, null, 20 +); +insert into emp values( + 7782, 'CLARK', 'MANAGER', 7839, + to_date('9-6-1981','dd-mm-yyyy'), + 7566, null, 30 +); +insert into emp values( + 7566, 'JONES', 'MANAGER', 7839, + to_date('2-4-1981','dd-mm-yyyy'), + 7839, null, 40 +); + +commit; \ No newline at end of file diff --git a/libraries/src/main/java/com/baeldung/serenity/spring/KonamiCodeController.java b/libraries/src/main/java/com/baeldung/serenity/spring/KonamiCodeController.java new file mode 100644 index 0000000000..f8ae66c229 --- /dev/null +++ b/libraries/src/main/java/com/baeldung/serenity/spring/KonamiCodeController.java @@ -0,0 +1,28 @@ +package com.baeldung.serenity.spring; + +import org.springframework.http.MediaType; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +/** + * @author aiet + */ +@RequestMapping(value = "/konamicode", produces = MediaType.APPLICATION_JSON_UTF8_VALUE) +@RestController +public class KonamiCodeController { + + private final String classicCode = "↑↑↓↓←→←→BA"; + + @GetMapping("/classic") + public String classicCode() { + return classicCode; + } + + @GetMapping("/cheatable") + public boolean cheatCheck(@RequestParam String cheatcode){ + return classicCode.equals(cheatcode); + } + +} diff --git a/libraries/src/main/java/com/baeldung/serenity/spring/KonamiCodeService.java b/libraries/src/main/java/com/baeldung/serenity/spring/KonamiCodeService.java new file mode 100644 index 0000000000..2aa1804ba5 --- /dev/null +++ b/libraries/src/main/java/com/baeldung/serenity/spring/KonamiCodeService.java @@ -0,0 +1,39 @@ +package com.baeldung.serenity.spring; + +import org.springframework.stereotype.Service; + +/** + * refer to Konami Code + */ +@Service +public class KonamiCodeService { + + private String classicCode = "↑↑↓↓←→←→BA"; + + public String getClassicCode() { + return classicCode; + } + + public void alterClassicCode(String newCode) { + classicCode = newCode; + } + + public boolean cheatWith(String cheatcode) { + if ("↑↑↓↓←→←→BA".equals(cheatcode)) { + stageLeft++; + return true; + } + return false; + } + + private int stageLeft = 1; + + public void clearStage() { + stageLeft = 0; + } + + public int stageLeft() { + return stageLeft; + } + +} diff --git a/libraries/src/main/java/com/baeldung/serenity/spring/KonamiCodeServiceInjectionController.java b/libraries/src/main/java/com/baeldung/serenity/spring/KonamiCodeServiceInjectionController.java new file mode 100644 index 0000000000..bb80963aa3 --- /dev/null +++ b/libraries/src/main/java/com/baeldung/serenity/spring/KonamiCodeServiceInjectionController.java @@ -0,0 +1,41 @@ +package com.baeldung.serenity.spring; + +import org.springframework.http.MediaType; +import org.springframework.web.bind.annotation.*; + +/** + * @author aiet + */ +@RequestMapping(value = "/konamicode", produces = MediaType.APPLICATION_JSON_UTF8_VALUE) +@RestController +public class KonamiCodeServiceInjectionController { + + private KonamiCodeService konamiCodeService; + + public KonamiCodeServiceInjectionController(KonamiCodeService konamiCodeService) { + this.konamiCodeService = konamiCodeService; + } + + @PutMapping("/stages") + public void clearStage(@RequestParam String action) { + if ("clear".equals(action)) { + konamiCodeService.clearStage(); + } + } + + @GetMapping("/classic") + public String classicCode() { + return konamiCodeService.getClassicCode(); + } + + @GetMapping("/cheatable") + public boolean cheatCheck(@RequestParam String cheatcode) { + return konamiCodeService.cheatWith(cheatcode); + } + + @GetMapping("/stages") + public int stageLeft() { + return konamiCodeService.stageLeft(); + } + +} diff --git a/libraries/src/test/java/com/baeldung/cglib/proxy/BeanGeneratorTest.java b/libraries/src/test/java/com/baeldung/cglib/proxy/BeanGeneratorIntegrationTest.java similarity index 95% rename from libraries/src/test/java/com/baeldung/cglib/proxy/BeanGeneratorTest.java rename to libraries/src/test/java/com/baeldung/cglib/proxy/BeanGeneratorIntegrationTest.java index 1e49536065..033cc47c74 100644 --- a/libraries/src/test/java/com/baeldung/cglib/proxy/BeanGeneratorTest.java +++ b/libraries/src/test/java/com/baeldung/cglib/proxy/BeanGeneratorIntegrationTest.java @@ -8,7 +8,7 @@ import java.lang.reflect.Method; import static junit.framework.TestCase.assertEquals; -public class BeanGeneratorTest { +public class BeanGeneratorIntegrationTest { @Test public void givenBeanCreator_whenAddProperty_thenClassShouldHaveFieldValue() throws Exception { diff --git a/libraries/src/test/java/com/baeldung/cglib/proxy/MixinTest.java b/libraries/src/test/java/com/baeldung/cglib/proxy/MixinUnitTest.java similarity index 96% rename from libraries/src/test/java/com/baeldung/cglib/proxy/MixinTest.java rename to libraries/src/test/java/com/baeldung/cglib/proxy/MixinUnitTest.java index db8453e6c1..a89d9fe2c3 100644 --- a/libraries/src/test/java/com/baeldung/cglib/proxy/MixinTest.java +++ b/libraries/src/test/java/com/baeldung/cglib/proxy/MixinUnitTest.java @@ -6,7 +6,7 @@ import org.junit.Test; import static junit.framework.TestCase.assertEquals; -public class MixinTest { +public class MixinUnitTest { @Test public void givenTwoClasses_whenMixedIntoOne_thenMixinShouldHaveMethodsFromBothClasses() throws Exception { diff --git a/libraries/src/test/java/com/baeldung/commons/lang3/ArrayUtilsTest.java b/libraries/src/test/java/com/baeldung/commons/lang3/ArrayUtilsUnitTest.java similarity index 99% rename from libraries/src/test/java/com/baeldung/commons/lang3/ArrayUtilsTest.java rename to libraries/src/test/java/com/baeldung/commons/lang3/ArrayUtilsUnitTest.java index b579458730..39f9907316 100644 --- a/libraries/src/test/java/com/baeldung/commons/lang3/ArrayUtilsTest.java +++ b/libraries/src/test/java/com/baeldung/commons/lang3/ArrayUtilsUnitTest.java @@ -5,7 +5,7 @@ import org.junit.Test; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertArrayEquals; -public class ArrayUtilsTest { +public class ArrayUtilsUnitTest { @Test public void givenArray_whenAddingElementAtSpecifiedPosition_thenCorrect() { int[] oldArray = { 2, 3, 4, 5 }; diff --git a/libraries/src/test/java/com/baeldung/commons/lang3/StringUtilsTest.java b/libraries/src/test/java/com/baeldung/commons/lang3/StringUtilsUnitTest.java similarity index 99% rename from libraries/src/test/java/com/baeldung/commons/lang3/StringUtilsTest.java rename to libraries/src/test/java/com/baeldung/commons/lang3/StringUtilsUnitTest.java index a17a8ea60d..15620455aa 100644 --- a/libraries/src/test/java/com/baeldung/commons/lang3/StringUtilsTest.java +++ b/libraries/src/test/java/com/baeldung/commons/lang3/StringUtilsUnitTest.java @@ -6,7 +6,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertFalse; -public class StringUtilsTest { +public class StringUtilsUnitTest { @Test public void givenString_whenCheckingContainsAny_thenCorrect() { String string = "baeldung.com"; diff --git a/libraries/src/test/java/com/baeldung/commons/math/ComplexTests.java b/libraries/src/test/java/com/baeldung/commons/math/ComplexUnitTest.java similarity index 94% rename from libraries/src/test/java/com/baeldung/commons/math/ComplexTests.java rename to libraries/src/test/java/com/baeldung/commons/math/ComplexUnitTest.java index 2e5074453e..b10086eabe 100644 --- a/libraries/src/test/java/com/baeldung/commons/math/ComplexTests.java +++ b/libraries/src/test/java/com/baeldung/commons/math/ComplexUnitTest.java @@ -4,7 +4,7 @@ import org.apache.commons.math3.complex.Complex; import org.junit.Assert; import org.junit.Test; -public class ComplexTests { +public class ComplexUnitTest { @Test public void whenComplexPow_thenCorrect() { diff --git a/libraries/src/test/java/com/baeldung/commons/math/FractionTests.java b/libraries/src/test/java/com/baeldung/commons/math/FractionUnitTest.java similarity index 93% rename from libraries/src/test/java/com/baeldung/commons/math/FractionTests.java rename to libraries/src/test/java/com/baeldung/commons/math/FractionUnitTest.java index 6828c8490c..cb433abdb0 100644 --- a/libraries/src/test/java/com/baeldung/commons/math/FractionTests.java +++ b/libraries/src/test/java/com/baeldung/commons/math/FractionUnitTest.java @@ -4,7 +4,7 @@ import org.apache.commons.math3.fraction.Fraction; import org.junit.Assert; import org.junit.Test; -public class FractionTests { +public class FractionUnitTest { @Test public void whenFractionAdd_thenCorrect() { diff --git a/libraries/src/test/java/com/baeldung/commons/math/GeometryTests.java b/libraries/src/test/java/com/baeldung/commons/math/GeometryUnitTest.java similarity index 94% rename from libraries/src/test/java/com/baeldung/commons/math/GeometryTests.java rename to libraries/src/test/java/com/baeldung/commons/math/GeometryUnitTest.java index 17cbb607d6..58fc75aa3e 100644 --- a/libraries/src/test/java/com/baeldung/commons/math/GeometryTests.java +++ b/libraries/src/test/java/com/baeldung/commons/math/GeometryUnitTest.java @@ -5,7 +5,7 @@ import org.apache.commons.math3.geometry.euclidean.twod.Vector2D; import org.junit.Assert; import org.junit.Test; -public class GeometryTests { +public class GeometryUnitTest { @Test public void whenLineIntersection_thenCorrect() { diff --git a/libraries/src/test/java/com/baeldung/commons/math/IntegrationTests.java b/libraries/src/test/java/com/baeldung/commons/math/IntegrationTest.java similarity index 95% rename from libraries/src/test/java/com/baeldung/commons/math/IntegrationTests.java rename to libraries/src/test/java/com/baeldung/commons/math/IntegrationTest.java index 62ae898fa8..65c1a0db8e 100644 --- a/libraries/src/test/java/com/baeldung/commons/math/IntegrationTests.java +++ b/libraries/src/test/java/com/baeldung/commons/math/IntegrationTest.java @@ -6,7 +6,7 @@ import org.apache.commons.math3.analysis.integration.UnivariateIntegrator; import org.junit.Assert; import org.junit.Test; -public class IntegrationTests { +public class IntegrationTest { @Test public void whenUnivariateIntegratorIntegrate_thenCorrect() { diff --git a/libraries/src/test/java/com/baeldung/commons/math/LinearAlgebraTests.java b/libraries/src/test/java/com/baeldung/commons/math/LinearAlgebraUnitTest.java similarity index 95% rename from libraries/src/test/java/com/baeldung/commons/math/LinearAlgebraTests.java rename to libraries/src/test/java/com/baeldung/commons/math/LinearAlgebraUnitTest.java index 981f839280..278f54a67f 100644 --- a/libraries/src/test/java/com/baeldung/commons/math/LinearAlgebraTests.java +++ b/libraries/src/test/java/com/baeldung/commons/math/LinearAlgebraUnitTest.java @@ -4,7 +4,7 @@ import org.apache.commons.math3.linear.*; import org.junit.Assert; import org.junit.Test; -public class LinearAlgebraTests { +public class LinearAlgebraUnitTest { @Test public void whenDecompositionSolverSolve_thenCorrect() { diff --git a/libraries/src/test/java/com/baeldung/commons/math/ProbabilitiesTests.java b/libraries/src/test/java/com/baeldung/commons/math/ProbabilitiesUnitTest.java similarity index 90% rename from libraries/src/test/java/com/baeldung/commons/math/ProbabilitiesTests.java rename to libraries/src/test/java/com/baeldung/commons/math/ProbabilitiesUnitTest.java index 41ccb16c5a..f31bc424c6 100644 --- a/libraries/src/test/java/com/baeldung/commons/math/ProbabilitiesTests.java +++ b/libraries/src/test/java/com/baeldung/commons/math/ProbabilitiesUnitTest.java @@ -3,7 +3,7 @@ package com.baeldung.commons.math; import org.apache.commons.math3.distribution.NormalDistribution; import org.junit.Test; -public class ProbabilitiesTests { +public class ProbabilitiesUnitTest { @Test public void whenNormalDistributionSample_thenSuccess() { diff --git a/libraries/src/test/java/com/baeldung/commons/math/StatisticsTests.java b/libraries/src/test/java/com/baeldung/commons/math/StatisticsUnitTest.java similarity index 96% rename from libraries/src/test/java/com/baeldung/commons/math/StatisticsTests.java rename to libraries/src/test/java/com/baeldung/commons/math/StatisticsUnitTest.java index c1b0619b11..025880fc12 100644 --- a/libraries/src/test/java/com/baeldung/commons/math/StatisticsTests.java +++ b/libraries/src/test/java/com/baeldung/commons/math/StatisticsUnitTest.java @@ -5,7 +5,7 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; -public class StatisticsTests { +public class StatisticsUnitTest { private double[] values; private DescriptiveStatistics descriptiveStatistics; diff --git a/libraries/src/test/java/com/baeldung/hikaricp/HikariCPTest.java b/libraries/src/test/java/com/baeldung/hikaricp/HikariCPTest.java new file mode 100644 index 0000000000..c4c563ca83 --- /dev/null +++ b/libraries/src/test/java/com/baeldung/hikaricp/HikariCPTest.java @@ -0,0 +1,20 @@ +package com.baeldung.hikaricp; + +import java.util.List; + +import org.junit.Ignore; +import org.junit.Test; +import java.sql.SQLException; + +import static org.junit.Assert.assertEquals; + +public class HikariCPTest { + + @Test + @Ignore + public void givenConnection_thenFetchDbData() throws SQLException { + List employees = HikariCPDemo.fetchData(); + assertEquals(4, employees.size()); + } + +} diff --git a/libraries/src/test/java/com/baeldung/jasypt/JasyptTest.java b/libraries/src/test/java/com/baeldung/jasypt/JasyptUnitTest.java similarity index 99% rename from libraries/src/test/java/com/baeldung/jasypt/JasyptTest.java rename to libraries/src/test/java/com/baeldung/jasypt/JasyptUnitTest.java index fbfa7f823d..39d54085e2 100644 --- a/libraries/src/test/java/com/baeldung/jasypt/JasyptTest.java +++ b/libraries/src/test/java/com/baeldung/jasypt/JasyptUnitTest.java @@ -11,7 +11,7 @@ import org.junit.Test; import static junit.framework.Assert.*; import static junit.framework.TestCase.assertEquals; -public class JasyptTest { +public class JasyptUnitTest { @Test public void givenTextPrivateData_whenDecrypt_thenCompareToEncrypted() { diff --git a/libraries/src/test/java/com/baeldung/javassist/JavasisstTest.java b/libraries/src/test/java/com/baeldung/javassist/JavasisstUnitTest.java similarity index 99% rename from libraries/src/test/java/com/baeldung/javassist/JavasisstTest.java rename to libraries/src/test/java/com/baeldung/javassist/JavasisstUnitTest.java index da5ae02c56..dd1d1dbcf3 100644 --- a/libraries/src/test/java/com/baeldung/javassist/JavasisstTest.java +++ b/libraries/src/test/java/com/baeldung/javassist/JavasisstUnitTest.java @@ -22,7 +22,7 @@ import java.util.stream.Stream; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -public class JavasisstTest { +public class JavasisstUnitTest { @Test public void givenJavasisstAPI_whenConstructClass_thenGenerateAClassFile() throws CannotCompileException, IOException, ClassNotFoundException, IllegalAccessException, InstantiationException { //given diff --git a/libraries/src/test/java/com/baeldung/javatuples/JavaTuplesTest.java b/libraries/src/test/java/com/baeldung/javatuples/JavaTuplesUnitTest.java similarity index 99% rename from libraries/src/test/java/com/baeldung/javatuples/JavaTuplesTest.java rename to libraries/src/test/java/com/baeldung/javatuples/JavaTuplesUnitTest.java index af4308e188..c99b4d28a2 100644 --- a/libraries/src/test/java/com/baeldung/javatuples/JavaTuplesTest.java +++ b/libraries/src/test/java/com/baeldung/javatuples/JavaTuplesUnitTest.java @@ -13,7 +13,7 @@ import org.javatuples.Triplet; import org.javatuples.Unit; import org.junit.Test; -public class JavaTuplesTest { +public class JavaTuplesUnitTest { @SuppressWarnings("unused") @Test diff --git a/libraries/src/test/java/com/baeldung/javers/JaversTest.java b/libraries/src/test/java/com/baeldung/javers/JaversUnitTest.java similarity index 99% rename from libraries/src/test/java/com/baeldung/javers/JaversTest.java rename to libraries/src/test/java/com/baeldung/javers/JaversUnitTest.java index e8e3e62e08..f261174062 100644 --- a/libraries/src/test/java/com/baeldung/javers/JaversTest.java +++ b/libraries/src/test/java/com/baeldung/javers/JaversUnitTest.java @@ -17,7 +17,7 @@ import java.util.List; import static org.assertj.core.api.Assertions.assertThat; -public class JaversTest { +public class JaversUnitTest { @Test public void givenPersonObject_whenApplyModificationOnIt_thenShouldDetectChange() { diff --git a/libraries/src/test/java/com/baeldung/jsonassert/JsonAssertTest.java b/libraries/src/test/java/com/baeldung/jsonassert/JsonAssertUnitTest.java similarity index 99% rename from libraries/src/test/java/com/baeldung/jsonassert/JsonAssertTest.java rename to libraries/src/test/java/com/baeldung/jsonassert/JsonAssertUnitTest.java index b70703cc08..38595e49d9 100644 --- a/libraries/src/test/java/com/baeldung/jsonassert/JsonAssertTest.java +++ b/libraries/src/test/java/com/baeldung/jsonassert/JsonAssertUnitTest.java @@ -13,7 +13,7 @@ import org.skyscreamer.jsonassert.RegularExpressionValueMatcher; import org.skyscreamer.jsonassert.comparator.ArraySizeComparator; import org.skyscreamer.jsonassert.comparator.CustomComparator; -public class JsonAssertTest { +public class JsonAssertUnitTest { @Test public void givenLenientode_whenAssertEqualsSameJsonString_thenPass() throws JSONException { diff --git a/libraries/src/test/java/com/baeldung/serenity/spring/KonamCheatClassDirtiesContextTest.java b/libraries/src/test/java/com/baeldung/serenity/spring/KonamCheatClassDirtiesContextTest.java new file mode 100644 index 0000000000..6331b548eb --- /dev/null +++ b/libraries/src/test/java/com/baeldung/serenity/spring/KonamCheatClassDirtiesContextTest.java @@ -0,0 +1,74 @@ +package com.baeldung.serenity.spring; + +import com.baeldung.serenity.spring.steps.KonamiCodeServiceInjectionSteps; +import net.serenitybdd.junit.runners.SerenityRunner; +import net.serenitybdd.junit.spring.integration.SpringIntegrationClassRule; +import net.thucydides.core.annotations.Steps; +import net.thucydides.core.annotations.Title; +import org.junit.ClassRule; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.Suite; +import org.springframework.test.annotation.DirtiesContext; +import org.springframework.test.context.ContextConfiguration; + +import static org.springframework.test.annotation.DirtiesContext.ClassMode.AFTER_CLASS; + +/** + * @author aiet + */ + +@RunWith(Suite.class) +@Suite.SuiteClasses({ + KonamCheatClassDirtiesContextTest.DirtiesContextTest.class, KonamCheatClassDirtiesContextTest.AnotherDirtiesContextTest.class + }) +public class KonamCheatClassDirtiesContextTest { + + @RunWith(SerenityRunner.class) + @ContextConfiguration(classes = KonamiCodeService.class) + public static abstract class Base { + + @Steps KonamiCodeServiceInjectionSteps cheatSteps; + + @ClassRule public static SpringIntegrationClassRule springIntegrationClassRule = new SpringIntegrationClassRule(); + + void hiddenStageShouldBeUnlockedAfterCheating() { + fetchAndCheat(); + cheatSteps.aStageRemains(); + + cheatSteps.letsHack(); + + fetchAndCheat(); + cheatSteps.noStageRemains(); + } + + private void fetchAndCheat() { + cheatSteps.gameStageCleared(); + cheatSteps.fetchLatestCheatcode(); + cheatSteps.cheatWithLatestcode(); + } + + } + + @DirtiesContext(classMode = AFTER_CLASS) + public static class AnotherDirtiesContextTest extends Base { + + @Test + @Title("altering the cheatcode after unlocking would stop others from cheating, not affected by other tests (another)") + public void givenGameStageCleared_whenCheat_thenHiddenStageUnlocked() { + super.hiddenStageShouldBeUnlockedAfterCheating(); + } + } + + @DirtiesContext(classMode = AFTER_CLASS) + public static class DirtiesContextTest extends Base { + + @Test + @Title("altering the cheatcode after unlocking would stop others from cheating, not affected by other tests") + public void givenGameStageCleared_whenCheat_thenHiddenStageUnlocked() { + super.hiddenStageShouldBeUnlockedAfterCheating(); + } + } + + +} diff --git a/libraries/src/test/java/com/baeldung/serenity/spring/KonamCheatWithDirtyActionTest.java b/libraries/src/test/java/com/baeldung/serenity/spring/KonamCheatWithDirtyActionTest.java new file mode 100644 index 0000000000..213e54d557 --- /dev/null +++ b/libraries/src/test/java/com/baeldung/serenity/spring/KonamCheatWithDirtyActionTest.java @@ -0,0 +1,62 @@ +package com.baeldung.serenity.spring; + +import com.baeldung.serenity.spring.steps.KonamiCodeConstructorDependencySteps; +import net.serenitybdd.junit.runners.SerenityRunner; +import net.serenitybdd.junit.spring.integration.SpringIntegrationMethodRule; +import net.thucydides.core.annotations.Title; +import org.junit.Before; +import org.junit.FixMethodOrder; +import org.junit.Rule; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.MethodSorters; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.test.annotation.DirtiesContext; +import org.springframework.test.context.ContextConfiguration; + +/** + * @author aiet + */ +@RunWith(SerenityRunner.class) +@FixMethodOrder(MethodSorters.NAME_ASCENDING) +@ContextConfiguration(classes = KonamiCodeService.class) +public class KonamCheatWithDirtyActionTest { + + private KonamiCodeConstructorDependencySteps cheatSteps; + + @Autowired private KonamiCodeService codeService; + + @Before + public void init() { + cheatSteps = new KonamiCodeConstructorDependencySteps(codeService); + } + + @Test + @Title("hidden stage should be unlocked after cheating (run in service with dirty action)") + public void givenGameStageCleared_whenCheat_thenHiddenStageUnlocked() { + fetchCodeAndCheat(); + cheatSteps.aStageRemains(); + } + + @Rule public SpringIntegrationMethodRule springIntegration = new SpringIntegrationMethodRule(); + + @DirtiesContext + @Test + @Title("altering the cheatcode after unlocking would stop others from cheating") + public void givenGameStageCleared_whenCheatAndHack_thenAnotherCheatFail() { + fetchCodeAndCheat(); + cheatSteps.aStageRemains(); + + cheatSteps.letsHack(); + + fetchCodeAndCheat(); + cheatSteps.noStageRemains(); + } + + private void fetchCodeAndCheat() { + cheatSteps.gameStageCleared(); + cheatSteps.fetchLatestCheatcode(); + cheatSteps.cheatWithLatestcode(); + } + +} diff --git a/libraries/src/test/java/com/baeldung/serenity/spring/KonamCheatWithDirtyActionWithImplicitInjectionTest.java b/libraries/src/test/java/com/baeldung/serenity/spring/KonamCheatWithDirtyActionWithImplicitInjectionTest.java new file mode 100644 index 0000000000..76143156bf --- /dev/null +++ b/libraries/src/test/java/com/baeldung/serenity/spring/KonamCheatWithDirtyActionWithImplicitInjectionTest.java @@ -0,0 +1,54 @@ +package com.baeldung.serenity.spring; + +import com.baeldung.serenity.spring.steps.KonamiCodeServiceInjectionSteps; +import net.serenitybdd.junit.runners.SerenityRunner; +import net.serenitybdd.junit.spring.integration.SpringIntegrationMethodRule; +import net.thucydides.core.annotations.Steps; +import net.thucydides.core.annotations.Title; +import org.junit.FixMethodOrder; +import org.junit.Rule; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.MethodSorters; +import org.springframework.test.annotation.DirtiesContext; +import org.springframework.test.context.ContextConfiguration; + +/** + * @author aiet + */ +@RunWith(SerenityRunner.class) +@FixMethodOrder(MethodSorters.NAME_ASCENDING) +@ContextConfiguration(classes = KonamiCodeService.class) +public class KonamCheatWithDirtyActionWithImplicitInjectionTest { + + @Steps private KonamiCodeServiceInjectionSteps cheatSteps; + + @Test + @Title("hidden stage is not unlocked after cheating (cheatcode hacked)") + public void givenGameStageCleared_whenCheat_thenCheatFail() { + fetchCodeAndCheat(); + cheatSteps.noStageRemains(); + } + + private void fetchCodeAndCheat() { + cheatSteps.gameStageCleared(); + cheatSteps.fetchLatestCheatcode(); + cheatSteps.cheatWithLatestcode(); + } + + @Rule public SpringIntegrationMethodRule springIntegration = new SpringIntegrationMethodRule(); + + @DirtiesContext + @Test + @Title("altering the cheatcode after unlocking would stop others from cheating") + public void givenGameStageCleared_whenCheatAndHack_thenAnotherCheatFail() { + fetchCodeAndCheat(); + cheatSteps.aStageRemains(); + + cheatSteps.letsHack(); + + fetchCodeAndCheat(); + cheatSteps.noStageRemains(); + } + +} diff --git a/libraries/src/test/java/com/baeldung/serenity/spring/KonamCheatWithServiceTest.java b/libraries/src/test/java/com/baeldung/serenity/spring/KonamCheatWithServiceTest.java new file mode 100644 index 0000000000..ea59931324 --- /dev/null +++ b/libraries/src/test/java/com/baeldung/serenity/spring/KonamCheatWithServiceTest.java @@ -0,0 +1,27 @@ +package com.baeldung.serenity.spring; + +import com.baeldung.serenity.spring.steps.KonamiCodeServiceInjectionSteps; +import net.serenitybdd.junit.runners.SerenityRunner; +import net.thucydides.core.annotations.Steps; +import net.thucydides.core.annotations.Title; +import org.junit.Test; +import org.junit.runner.RunWith; + +/** + * @author aiet + */ +@RunWith(SerenityRunner.class) +public class KonamCheatWithServiceTest { + + @Steps private KonamiCodeServiceInjectionSteps cheatSteps; + + @Test + @Title("hidden stage should be unlocked after cheating (mockmvc)") + public void givenGameStageCleared_whenCheat_thenHiddenStageUnlocked() { + cheatSteps.gameStageCleared(); + cheatSteps.fetchLatestCheatcode(); + cheatSteps.cheatWithLatestcode(); + cheatSteps.aStageRemains(); + } + +} diff --git a/libraries/src/test/java/com/baeldung/serenity/spring/KonamiCheatWithIntegrationMethodRulesTest.java b/libraries/src/test/java/com/baeldung/serenity/spring/KonamiCheatWithIntegrationMethodRulesTest.java new file mode 100644 index 0000000000..9d19cefba9 --- /dev/null +++ b/libraries/src/test/java/com/baeldung/serenity/spring/KonamiCheatWithIntegrationMethodRulesTest.java @@ -0,0 +1,61 @@ +package com.baeldung.serenity.spring; + +import com.baeldung.serenity.spring.steps.KonamiCheatSteps; +import net.serenitybdd.junit.runners.SerenityRunner; +import net.serenitybdd.junit.spring.integration.SpringIntegrationMethodRule; +import net.thucydides.core.annotations.Steps; +import net.thucydides.core.annotations.Title; +import org.junit.*; +import org.junit.runner.RunWith; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.test.context.ContextConfiguration; + +/** + * Unit test for simple App. + */ +@RunWith(SerenityRunner.class) +@ContextConfiguration(locations = "classpath:konami-cheat-beans.xml") +public class KonamiCheatWithIntegrationMethodRulesTest { + + private static Logger LOG = LoggerFactory.getLogger(KonamiCheatWithIntegrationMethodRulesTest.class); + + @BeforeClass + public static void initClass() { + LOG.info("static chaincode before test class: {}", staticCheatCode); + } + + @AfterClass + public static void destroyClass() { + LOG.info("static chaincode after test class: {}", staticCheatCode); + } + + @Before + public void init() { + staticCheatCode = cheatCode; + LOG.info("cheatcode before test: {}", cheatCode); + } + + @After + public void destroy() { + LOG.info("cheatcode after test: {}", cheatCode); + } + + @Rule public SpringIntegrationMethodRule springMethodIntegration = new SpringIntegrationMethodRule(); + + @Steps private KonamiCheatSteps konamiCheatSteps; + + @Value("#{konami_props['code']}") private String cheatCode; + + private static String staticCheatCode; + + @Test + @Title("hidden stage should be unlocked after cheating (rule integration)") + public void givenGameStageCleared_whenCheat_thenHiddenStageUnlocked() { + konamiCheatSteps.gameStageCleared(); + konamiCheatSteps.cheatWith(cheatCode); + konamiCheatSteps.aStageRemains(); + } + +} diff --git a/libraries/src/test/java/com/baeldung/serenity/spring/KonamiCheatWithIntegrationRunnerTest.java b/libraries/src/test/java/com/baeldung/serenity/spring/KonamiCheatWithIntegrationRunnerTest.java new file mode 100644 index 0000000000..9aa70ddb12 --- /dev/null +++ b/libraries/src/test/java/com/baeldung/serenity/spring/KonamiCheatWithIntegrationRunnerTest.java @@ -0,0 +1,58 @@ +package com.baeldung.serenity.spring; + +import com.baeldung.serenity.spring.steps.KonamiCheatSteps; +import net.serenitybdd.junit.spring.integration.SpringIntegrationSerenityRunner; +import net.thucydides.core.annotations.Steps; +import net.thucydides.core.annotations.Title; +import org.junit.*; +import org.junit.runner.RunWith; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.test.context.ContextConfiguration; + +/** + * Unit test for simple App. + */ +@RunWith(SpringIntegrationSerenityRunner.class) +@ContextConfiguration(locations = "classpath:konami-cheat-beans.xml") +public class KonamiCheatWithIntegrationRunnerTest { + + private static Logger LOG = LoggerFactory.getLogger(KonamiCheatWithIntegrationRunnerTest.class); + + @BeforeClass + public static void initClass() { + LOG.info("static chaincode before test class: {}", staticCheatCode); + } + + @AfterClass + public static void destroyClass() { + LOG.info("static chaincode after test class: {}", staticCheatCode); + } + + @Before + public void init() { + staticCheatCode = cheatCode; + LOG.info("cheatcode before test: {}", cheatCode); + } + + @After + public void destroy() { + LOG.info("cheatcode after test: {}", cheatCode); + } + + @Steps private KonamiCheatSteps konamiCheatSteps; + + @Value("#{konami_props['code']}") private String cheatCode; + + private static String staticCheatCode; + + @Test + @Title("hidden stage should be unlocked after cheating (with integration runner)") + public void givenGameStageCleared_whenCheat_thenHiddenStageUnlocked() { + konamiCheatSteps.gameStageCleared(); + konamiCheatSteps.cheatWith(cheatCode); + konamiCheatSteps.aStageRemains(); + } + +} diff --git a/libraries/src/test/java/com/baeldung/serenity/spring/KonamiCodeMockMvcTest.java b/libraries/src/test/java/com/baeldung/serenity/spring/KonamiCodeMockMvcTest.java new file mode 100644 index 0000000000..2ae6cdcd84 --- /dev/null +++ b/libraries/src/test/java/com/baeldung/serenity/spring/KonamiCodeMockMvcTest.java @@ -0,0 +1,31 @@ +package com.baeldung.serenity.spring; + +import com.baeldung.serenity.spring.steps.KonamiCodeRestSteps; +import io.restassured.module.mockmvc.RestAssuredMockMvc; +import net.serenitybdd.junit.runners.SerenityRunner; +import net.thucydides.core.annotations.Steps; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; + +/** + * @author aiet + */ +@RunWith(SerenityRunner.class) +public class KonamiCodeMockMvcTest { + + @Before + public void init() { + RestAssuredMockMvc.standaloneSetup(new KonamiCodeController()); + } + + @Steps KonamiCodeRestSteps steps; + + @Test + public void givenOfficialClassicCheatcode_whenCheat_ThenTheCodeShouldDoTheTrick() throws Exception { + steps.givenClassicCheatCode(); + steps.whenCheat(); + steps.thenClassicCodeCanDoTheTrick(); + } + +} diff --git a/libraries/src/test/java/com/baeldung/serenity/spring/KonamiCodeTest.java b/libraries/src/test/java/com/baeldung/serenity/spring/KonamiCodeTest.java new file mode 100644 index 0000000000..d2e5fd30f6 --- /dev/null +++ b/libraries/src/test/java/com/baeldung/serenity/spring/KonamiCodeTest.java @@ -0,0 +1,22 @@ +package com.baeldung.serenity.spring; + +import io.restassured.module.mockmvc.RestAssuredMockMvc; +import net.serenitybdd.jbehave.SerenityStory; +import org.jbehave.core.annotations.BeforeStory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.test.context.ContextConfiguration; + +/** + * @author aiet + */ +@ContextConfiguration(classes = { KonamiCodeServiceInjectionController.class, KonamiCodeService.class }) +public class KonamiCodeTest extends SerenityStory { + + @Autowired private KonamiCodeService konamiCodeService; + + @BeforeStory + public void init() { + RestAssuredMockMvc.standaloneSetup(new KonamiCodeServiceInjectionController(konamiCodeService)); + } + +} diff --git a/libraries/src/test/java/com/baeldung/serenity/spring/steps/KonamiCheatSteps.java b/libraries/src/test/java/com/baeldung/serenity/spring/steps/KonamiCheatSteps.java new file mode 100644 index 0000000000..0bb408bda0 --- /dev/null +++ b/libraries/src/test/java/com/baeldung/serenity/spring/steps/KonamiCheatSteps.java @@ -0,0 +1,25 @@ +package com.baeldung.serenity.spring.steps; + +import net.thucydides.core.annotations.Step; + +import static org.junit.Assert.assertEquals; + +/** + * @author aiet + */ +public class KonamiCheatSteps { + + @Step("all stages of the game are cleared") + public void gameStageCleared() { + } + + @Step("input the classic 'Konami Code': {0} ") + public void cheatWith(String cheatcode) { + assertEquals("cheatcode wrong", "↑↑↓↓←→←→BA", cheatcode); + } + + @Step("there is still a stage left") + public void aStageRemains() { + } + +} diff --git a/libraries/src/test/java/com/baeldung/serenity/spring/steps/KonamiCodeConstructorDependencySteps.java b/libraries/src/test/java/com/baeldung/serenity/spring/steps/KonamiCodeConstructorDependencySteps.java new file mode 100644 index 0000000000..2bec25b58f --- /dev/null +++ b/libraries/src/test/java/com/baeldung/serenity/spring/steps/KonamiCodeConstructorDependencySteps.java @@ -0,0 +1,58 @@ +package com.baeldung.serenity.spring.steps; + +import com.baeldung.serenity.spring.KonamiCodeService; +import net.thucydides.core.annotations.Step; +import org.apache.commons.lang3.RandomStringUtils; + +import static org.hamcrest.core.IsEqual.equalTo; +import static org.junit.Assert.*; + +/** + * @author aiet + */ +public class KonamiCodeConstructorDependencySteps { + + private String latestCheatcode; + private boolean cheatSuccess; + + private KonamiCodeService konamiCodeService; + + public KonamiCodeConstructorDependencySteps(KonamiCodeService konamiCodeService) { + this.konamiCodeService = konamiCodeService; + } + + @Step("fetch latest cheat code") + public void fetchLatestCheatcode() { + latestCheatcode = konamiCodeService.getClassicCode(); + } + + @Step("cheat with latest code") + public void cheatWithLatestcode() { + cheatSuccess = konamiCodeService.cheatWith(latestCheatcode); + } + + @Step("all stages of the game are cleared") + public void gameStageCleared() { + konamiCodeService.clearStage(); + } + + @Step("there is still a stage left") + public void aStageRemains() { + assertTrue("cheatcode wrong", cheatSuccess); + assertThat(konamiCodeService.stageLeft(), equalTo(1)); + } + + // @Rule public SpringIntegrationMethodRule methodRule = new SpringIntegrationMethodRule(); + + // @DirtiesContext + @Step + public void letsHack() { + konamiCodeService.alterClassicCode(RandomStringUtils.random(4)); + } + + @Step("there is no stage left") + public void noStageRemains() { + assertFalse(cheatSuccess); + assertThat(konamiCodeService.stageLeft(), equalTo(0)); + } +} diff --git a/libraries/src/test/java/com/baeldung/serenity/spring/steps/KonamiCodeRestSteps.java b/libraries/src/test/java/com/baeldung/serenity/spring/steps/KonamiCodeRestSteps.java new file mode 100644 index 0000000000..3f06d42414 --- /dev/null +++ b/libraries/src/test/java/com/baeldung/serenity/spring/steps/KonamiCodeRestSteps.java @@ -0,0 +1,68 @@ +package com.baeldung.serenity.spring.steps; + +import io.restassured.module.mockmvc.response.MockMvcResponse; +import net.thucydides.core.annotations.Step; + +import java.io.UnsupportedEncodingException; + +import static io.restassured.module.mockmvc.RestAssuredMockMvc.given; +import static org.hamcrest.core.IsEqual.equalTo; + +/** + * @author aiet + */ +public class KonamiCodeRestSteps { + + MockMvcResponse mockMvcResponse; + String cheatcode; + + @Step("get the classic cheat code") + public void givenClassicCheatCode() throws UnsupportedEncodingException { + cheatcode = given() + .when() + .get("/konamicode/classic") + .mvcResult() + .getResponse() + .getContentAsString(); + } + + @Step("check if the cheat code works") + public void whenCheat() { + mockMvcResponse = given() + .queryParam("cheatcode", cheatcode) + .when() + .get("/konamicode/cheatable"); + } + + @Step("classic cheat code matches") + public void thenClassicCodeCanDoTheTrick() { + mockMvcResponse + .then() + .statusCode(200) + .body(equalTo("true")); + } + + @Step("all stage cleared") + public void stageCleared() { + given() + .queryParam("action", "clear") + .when() + .put("/konamicode/stages"); + given() + .when() + .get("/konamicode/stages") + .then() + .body(equalTo("0")); + } + + @Step("one more stage to play") + public void thenMoreStages() { + given() + .when() + .get("/konamicode/stages") + .then() + .body(equalTo("1")); + } + +} + diff --git a/libraries/src/test/java/com/baeldung/serenity/spring/steps/KonamiCodeServiceInjectionSteps.java b/libraries/src/test/java/com/baeldung/serenity/spring/steps/KonamiCodeServiceInjectionSteps.java new file mode 100644 index 0000000000..b57186ba14 --- /dev/null +++ b/libraries/src/test/java/com/baeldung/serenity/spring/steps/KonamiCodeServiceInjectionSteps.java @@ -0,0 +1,55 @@ +package com.baeldung.serenity.spring.steps; + +import com.baeldung.serenity.spring.KonamiCodeService; +import net.thucydides.core.annotations.Step; +import org.apache.commons.lang3.RandomStringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.test.context.ContextConfiguration; + +import static org.hamcrest.core.IsEqual.equalTo; +import static org.junit.Assert.*; + +/** + * @author aiet + */ +@ContextConfiguration(classes = KonamiCodeService.class) +public class KonamiCodeServiceInjectionSteps { + + private String latestCheatcode; + private boolean cheatSuccess; + + @Autowired private KonamiCodeService konamiCodeService; + + @Step("fetch latest cheat code") + public void fetchLatestCheatcode() { + latestCheatcode = konamiCodeService.getClassicCode(); + } + + @Step("cheat with latest code") + public void cheatWithLatestcode() { + cheatSuccess = konamiCodeService.cheatWith(latestCheatcode); + } + + @Step("all stages of the game are cleared") + public void gameStageCleared() { + konamiCodeService.clearStage(); + } + + @Step("there is still a stage left") + public void aStageRemains() { + assertTrue("cheatcode wrong", cheatSuccess); + assertThat(konamiCodeService.stageLeft(), equalTo(1)); + } + + @Step("altering default cheat code") + public void letsHack() { + konamiCodeService.alterClassicCode(RandomStringUtils.random(4)); + } + + @Step("there is no stage left") + public void noStageRemains() { + assertFalse(cheatSuccess); + assertThat(konamiCodeService.stageLeft(), equalTo(0)); + } + +} diff --git a/libraries/src/test/java/com/baeldung/serenity/spring/stories/KonamiCodeStory.java b/libraries/src/test/java/com/baeldung/serenity/spring/stories/KonamiCodeStory.java new file mode 100644 index 0000000000..090eb63215 --- /dev/null +++ b/libraries/src/test/java/com/baeldung/serenity/spring/stories/KonamiCodeStory.java @@ -0,0 +1,37 @@ +package com.baeldung.serenity.spring.stories; + +import com.baeldung.serenity.spring.steps.KonamiCodeRestSteps; +import net.thucydides.core.annotations.Steps; +import org.jbehave.core.annotations.Given; +import org.jbehave.core.annotations.Then; +import org.jbehave.core.annotations.When; + +/** + * @author aiet + */ +public class KonamiCodeStory { + + @Steps KonamiCodeRestSteps restSteps; + + @Given("game stage cleared") + public void givenStageCleared(){ + restSteps.stageCleared(); + } + + @Given("KONAMI cheat code") + public void givenKONAMICheatCode() throws Exception{ + restSteps.givenClassicCheatCode(); + } + + @When("I input the cheat code") + public void whenIInputTheCheatCode() { + restSteps.whenCheat(); + } + + @Then("a hidden stage will be unlocked") + public void thenAHiddenStageWillBeUnlocked() { + restSteps.thenClassicCodeCanDoTheTrick(); + restSteps.thenMoreStages(); + } + +} diff --git a/libraries/src/test/resources/konami-cheat-beans.xml b/libraries/src/test/resources/konami-cheat-beans.xml new file mode 100644 index 0000000000..221d058337 --- /dev/null +++ b/libraries/src/test/resources/konami-cheat-beans.xml @@ -0,0 +1,13 @@ + + + + + + ↑↑↓↓←→←→BA + + + + + diff --git a/libraries/src/test/resources/stories/spring/konami_code_test.story b/libraries/src/test/resources/stories/spring/konami_code_test.story new file mode 100644 index 0000000000..bba8ad7ade --- /dev/null +++ b/libraries/src/test/resources/stories/spring/konami_code_test.story @@ -0,0 +1,12 @@ +Meta: + +Narrative: +As a KONAMI player +I want to cheat +So that I can unlock hidden stages of the game + +Scenario: A KONAMI player can use the cheatcode to unlock hidden stages +Given game stage cleared +And KONAMI cheat code +When I input the cheat code +Then a hidden stage will be unlocked \ No newline at end of file diff --git a/log-mdc/pom.xml b/log-mdc/pom.xml index 7028bb4032..e91d4e231e 100644 --- a/log-mdc/pom.xml +++ b/log-mdc/pom.xml @@ -1,25 +1,25 @@ - 4.0.0 - com.baeldung - log-mdc - 0.0.1-SNAPSHOT - log-mdc + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + com.baeldung + log-mdc + 0.0.1-SNAPSHOT + log-mdc war - tutorial on logging with MDC and NDC + tutorial on logging with MDC and NDC com.baeldung parent-modules 1.0.0-SNAPSHOT - - - + + + org.springframework spring-core - ${springframework.version} + ${springframework.version} org.springframework @@ -43,38 +43,31 @@ ${jackson.library} - - - log4j - log4j - ${log4j.version} - + + + log4j + log4j + ${log4j.version} + - - - org.apache.logging.log4j - log4j-api - ${log4j2.version} - - - org.apache.logging.log4j - log4j-core - ${log4j2.version} - + + + org.apache.logging.log4j + log4j-api + ${log4j2.version} + + + org.apache.logging.log4j + log4j-core + ${log4j2.version} + - - - com.lmax - disruptor - ${disruptor.version} - - - - - ch.qos.logback - logback-classic - ${logback.version} - + + + com.lmax + disruptor + ${disruptor.version} + @@ -88,8 +81,8 @@ ${springframework.version} test - - + + 4.3.4.RELEASE diff --git a/log-mdc/src/test/java/com/baeldung/mdc/log4j/Demo.java b/log-mdc/src/test/java/com/baeldung/mdc/log4j/DemoIntegrationTest.java similarity index 95% rename from log-mdc/src/test/java/com/baeldung/mdc/log4j/Demo.java rename to log-mdc/src/test/java/com/baeldung/mdc/log4j/DemoIntegrationTest.java index 665168452a..530965a077 100644 --- a/log-mdc/src/test/java/com/baeldung/mdc/log4j/Demo.java +++ b/log-mdc/src/test/java/com/baeldung/mdc/log4j/DemoIntegrationTest.java @@ -9,7 +9,7 @@ import org.junit.Test; import com.baeldung.mdc.TransactionFactory; import com.baeldung.mdc.Transfer; -public class Demo { +public class DemoIntegrationTest { @Test public void main() throws InterruptedException { diff --git a/log-mdc/src/test/java/com/baeldung/mdc/log4j2/Demo.java b/log-mdc/src/test/java/com/baeldung/mdc/log4j2/DemoIntegrationTest.java similarity index 96% rename from log-mdc/src/test/java/com/baeldung/mdc/log4j2/Demo.java rename to log-mdc/src/test/java/com/baeldung/mdc/log4j2/DemoIntegrationTest.java index 78c48c2a83..e36f353d87 100644 --- a/log-mdc/src/test/java/com/baeldung/mdc/log4j2/Demo.java +++ b/log-mdc/src/test/java/com/baeldung/mdc/log4j2/DemoIntegrationTest.java @@ -13,7 +13,7 @@ import com.baeldung.mdc.log4j.Log4JRunnable; import com.baeldung.mdc.log4j2.Log4J2Runnable; import com.baeldung.mdc.slf4j.Slf4jRunnable; -public class Demo { +public class DemoIntegrationTest { @Test public void main() throws InterruptedException { diff --git a/log-mdc/src/test/java/com/baeldung/mdc/slf4j/Demo.java b/log-mdc/src/test/java/com/baeldung/mdc/slf4j/DemoIntegrationTest.java similarity index 96% rename from log-mdc/src/test/java/com/baeldung/mdc/slf4j/Demo.java rename to log-mdc/src/test/java/com/baeldung/mdc/slf4j/DemoIntegrationTest.java index de890f9f5d..e715886cc0 100644 --- a/log-mdc/src/test/java/com/baeldung/mdc/slf4j/Demo.java +++ b/log-mdc/src/test/java/com/baeldung/mdc/slf4j/DemoIntegrationTest.java @@ -13,7 +13,7 @@ import com.baeldung.mdc.log4j.Log4JRunnable; import com.baeldung.mdc.log4j2.Log4J2Runnable; import com.baeldung.mdc.slf4j.Slf4jRunnable; -public class Demo { +public class DemoIntegrationTest { @Test public void main() throws InterruptedException { diff --git a/log-mdc/src/test/java/com/baeldung/ndc/NDCLogTest.java b/log-mdc/src/test/java/com/baeldung/ndc/NDCLogIntegrationTest.java similarity index 98% rename from log-mdc/src/test/java/com/baeldung/ndc/NDCLogTest.java rename to log-mdc/src/test/java/com/baeldung/ndc/NDCLogIntegrationTest.java index 8cba176f7e..a69620f226 100644 --- a/log-mdc/src/test/java/com/baeldung/ndc/NDCLogTest.java +++ b/log-mdc/src/test/java/com/baeldung/ndc/NDCLogIntegrationTest.java @@ -21,7 +21,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = AppConfiguration.class) @WebAppConfiguration -public class NDCLogTest { +public class NDCLogIntegrationTest { private MockMvc mockMvc; diff --git a/log4j/pom.xml b/log4j/pom.xml index 9aa8e58f0c..2e73baac49 100644 --- a/log4j/pom.xml +++ b/log4j/pom.xml @@ -1,7 +1,6 @@ - + 4.0.0 com.baeldung @@ -12,28 +11,28 @@ com.baeldung parent-modules 1.0.0-SNAPSHOT - - - - - - log4j - log4j - ${log4j.version} - - - log4j - apache-log4j-extras - ${log4j.version} - + - - log4j - apache-log4j-extras - ${log4j.version} - + + + + log4j + log4j + ${log4j.version} + + + log4j + apache-log4j-extras + ${log4j.version} + - + + log4j + apache-log4j-extras + ${log4j.version} + + + org.apache.logging.log4j log4j-api @@ -44,7 +43,7 @@ log4j-core ${log4j-core.version} - + com.lmax disruptor diff --git a/log4j2/pom.xml b/log4j2/pom.xml index b77f300d59..ea398af845 100644 --- a/log4j2/pom.xml +++ b/log4j2/pom.xml @@ -1,68 +1,68 @@ - 4.0.0 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 - log4j2 + log4j2 - - com.baeldung - parent-modules - 1.0.0-SNAPSHOT - .. - + + com.baeldung + parent-modules + 1.0.0-SNAPSHOT + .. + - - - - org.apache.logging.log4j - log4j-core - ${log4j-core.version} - + + + + org.apache.logging.log4j + log4j-core + ${log4j-core.version} + - - - com.fasterxml.jackson.core - jackson-databind - ${jackson.version} - + + + com.fasterxml.jackson.core + jackson-databind + ${jackson.version} + - - - com.fasterxml.jackson.dataformat - jackson-dataformat-xml - ${jackson.version} - + + + com.fasterxml.jackson.dataformat + jackson-dataformat-xml + ${jackson.version} + - - - com.h2database - h2 - ${h2.version} - - - org.apache.commons - commons-dbcp2 - ${commons-dbcp2.version} - + + + com.h2database + h2 + ${h2.version} + + + org.apache.commons + commons-dbcp2 + ${commons-dbcp2.version} + - - - org.apache.logging.log4j - log4j-core - ${log4j-core.version} - test-jar - test - - + + + org.apache.logging.log4j + log4j-core + ${log4j-core.version} + test-jar + test + + - - 2.8.5 - 1.4.193 - 2.1.1 - 2.7 - + + 2.8.5 + 1.4.193 + 2.1.1 + 2.7 + diff --git a/log4j2/src/test/java/com/baeldung/logging/log4j2/tests/CustomLoggingTest.java b/log4j2/src/test/java/com/baeldung/logging/log4j2/tests/CustomLoggingIntegrationTest.java similarity index 99% rename from log4j2/src/test/java/com/baeldung/logging/log4j2/tests/CustomLoggingTest.java rename to log4j2/src/test/java/com/baeldung/logging/log4j2/tests/CustomLoggingIntegrationTest.java index 333b4f5e78..c15bd8a514 100644 --- a/log4j2/src/test/java/com/baeldung/logging/log4j2/tests/CustomLoggingTest.java +++ b/log4j2/src/test/java/com/baeldung/logging/log4j2/tests/CustomLoggingIntegrationTest.java @@ -20,7 +20,7 @@ import org.junit.runners.JUnit4; import com.baeldung.logging.log4j2.tests.jdbc.ConnectionFactory; @RunWith(JUnit4.class) -public class CustomLoggingTest { +public class CustomLoggingIntegrationTest { @BeforeClass public static void setup() throws Exception { diff --git a/lombok/pom.xml b/lombok/pom.xml index 280a8b2db4..472516de4d 100644 --- a/lombok/pom.xml +++ b/lombok/pom.xml @@ -1,7 +1,6 @@ - 4.0.0 @@ -16,15 +15,14 @@ com.baeldung parent-modules 1.0.0-SNAPSHOT - - + + org.projectlombok lombok - + ${lombok.version} provided @@ -69,18 +67,10 @@ false - + diff --git a/lombok/src/test/java/com/baeldung/lombok/intro/ApiClientConfigurationTest.java b/lombok/src/test/java/com/baeldung/lombok/intro/ApiClientConfigurationIntegrationTest.java similarity index 96% rename from lombok/src/test/java/com/baeldung/lombok/intro/ApiClientConfigurationTest.java rename to lombok/src/test/java/com/baeldung/lombok/intro/ApiClientConfigurationIntegrationTest.java index 8283fc655e..e1eca0c285 100644 --- a/lombok/src/test/java/com/baeldung/lombok/intro/ApiClientConfigurationTest.java +++ b/lombok/src/test/java/com/baeldung/lombok/intro/ApiClientConfigurationIntegrationTest.java @@ -7,7 +7,7 @@ import com.baeldung.lombok.intro.ApiClientConfiguration.ApiClientConfigurationBu import org.junit.Assert; import org.junit.Test; -public class ApiClientConfigurationTest { +public class ApiClientConfigurationIntegrationTest { @Test public void givenAnnotatedConfiguration_thenCanBeBuiltViaBuilder() { diff --git a/lombok/src/test/java/com/baeldung/lombok/intro/LoginResultTest.java b/lombok/src/test/java/com/baeldung/lombok/intro/LoginResultLiveTest.java similarity index 98% rename from lombok/src/test/java/com/baeldung/lombok/intro/LoginResultTest.java rename to lombok/src/test/java/com/baeldung/lombok/intro/LoginResultLiveTest.java index 56878e4a03..0ac1fb048c 100644 --- a/lombok/src/test/java/com/baeldung/lombok/intro/LoginResultTest.java +++ b/lombok/src/test/java/com/baeldung/lombok/intro/LoginResultLiveTest.java @@ -8,7 +8,7 @@ import java.time.Instant; import org.junit.Assert; import org.junit.Test; -public class LoginResultTest { +public class LoginResultLiveTest { @Test public void givenAnnotatedLoginResult_thenHasConstructorForAllFinalFields() diff --git a/lombok/src/test/java/com/baeldung/lombok/intro/UserTest.java b/lombok/src/test/java/com/baeldung/lombok/intro/UserIntegrationTest.java similarity index 98% rename from lombok/src/test/java/com/baeldung/lombok/intro/UserTest.java rename to lombok/src/test/java/com/baeldung/lombok/intro/UserIntegrationTest.java index b3bf21478f..c449042666 100644 --- a/lombok/src/test/java/com/baeldung/lombok/intro/UserTest.java +++ b/lombok/src/test/java/com/baeldung/lombok/intro/UserIntegrationTest.java @@ -8,7 +8,7 @@ import java.util.List; import org.junit.Assert; import org.junit.Test; -public class UserTest { +public class UserIntegrationTest { @Test public void givenAnnotatedUser_thenHasEmptyConstructor() { diff --git a/mapstruct/pom.xml b/mapstruct/pom.xml index 67dbd8a2b2..17cf882d2b 100644 --- a/mapstruct/pom.xml +++ b/mapstruct/pom.xml @@ -1,64 +1,64 @@ - 4.0.0 - mapstruct - mapstruct - com.baeldung - 1.0 - jar - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" + xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + 4.0.0 + mapstruct + mapstruct + com.baeldung + 1.0 + jar + com.baeldung parent-modules 1.0.0-SNAPSHOT - + - - 1.1.0.Final - 4.3.4.RELEASE - - - - org.mapstruct - mapstruct-jdk8 - ${org.mapstruct.version} - - - org.springframework - spring-context - ${springframework.version} - - - org.springframework - spring-test - ${springframework.version} - test - - - - mapstruct - - - org.apache.maven.plugins - maven-compiler-plugin - ${maven-compiler-plugin.version} - - 1.8 - 1.8 - - - org.mapstruct - mapstruct-processor - ${org.mapstruct.version} - - - - + + 1.1.0.Final + 4.3.4.RELEASE + + + + org.mapstruct + mapstruct-jdk8 + ${org.mapstruct.version} + + + org.springframework + spring-context + ${springframework.version} + + + org.springframework + spring-test + ${springframework.version} + test + + + + mapstruct + + + org.apache.maven.plugins + maven-compiler-plugin + ${maven-compiler-plugin.version} + + 1.8 + 1.8 + + + org.mapstruct + mapstruct-processor + ${org.mapstruct.version} + + + + - - + + integration @@ -93,5 +93,5 @@ - + diff --git a/mapstruct/src/test/java/com/baeldung/mapper/EmployeeMapperTest.java b/mapstruct/src/test/java/com/baeldung/mapper/EmployeeMapperUnitTest.java similarity index 99% rename from mapstruct/src/test/java/com/baeldung/mapper/EmployeeMapperTest.java rename to mapstruct/src/test/java/com/baeldung/mapper/EmployeeMapperUnitTest.java index 7da6c41dc1..330c12eb13 100644 --- a/mapstruct/src/test/java/com/baeldung/mapper/EmployeeMapperTest.java +++ b/mapstruct/src/test/java/com/baeldung/mapper/EmployeeMapperUnitTest.java @@ -15,7 +15,7 @@ import java.util.List; import static org.junit.Assert.assertEquals; -public class EmployeeMapperTest { +public class EmployeeMapperUnitTest { EmployeeMapper mapper = Mappers.getMapper(EmployeeMapper.class); diff --git a/mesos-marathon/pom.xml b/mesos-marathon/pom.xml index 92b56e721b..b0060a260e 100644 --- a/mesos-marathon/pom.xml +++ b/mesos-marathon/pom.xml @@ -1,7 +1,6 @@ - + 4.0.0 com.baeldung @@ -9,9 +8,10 @@ 0.0.1-SNAPSHOT - org.springframework.boot - spring-boot-starter-parent - 1.5.1.RELEASE + parent-boot-5 + com.baeldung + 0.0.1-SNAPSHOT + ../parent-boot-5 @@ -19,11 +19,6 @@ org.springframework.boot spring-boot-starter-web - - org.springframework.boot - spring-boot-starter-test - test - @@ -40,16 +35,6 @@ - - org.apache.maven.plugins - maven-surefire-plugin - - - **/*IntegrationTest.java - **/*LiveTest.java - - - diff --git a/metrics/pom.xml b/metrics/pom.xml index 32f8b31e0b..1053c66ff5 100644 --- a/metrics/pom.xml +++ b/metrics/pom.xml @@ -1,7 +1,6 @@ - + 4.0.0 diff --git a/metrics/src/test/java/com/baeldung/metrics/healthchecks/HealthCheckTest.java b/metrics/src/test/java/com/baeldung/metrics/healthchecks/HealthCheckIntegrationTest.java similarity index 96% rename from metrics/src/test/java/com/baeldung/metrics/healthchecks/HealthCheckTest.java rename to metrics/src/test/java/com/baeldung/metrics/healthchecks/HealthCheckIntegrationTest.java index b1b2cc2ff9..0f1e7c97c9 100644 --- a/metrics/src/test/java/com/baeldung/metrics/healthchecks/HealthCheckTest.java +++ b/metrics/src/test/java/com/baeldung/metrics/healthchecks/HealthCheckIntegrationTest.java @@ -11,7 +11,7 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; -public class HealthCheckTest { +public class HealthCheckIntegrationTest { @Test public void whenUseHealthCheck_thenHealthChecked() { diff --git a/mockito/pom.xml b/mockito/pom.xml index b8520170f2..c77d42f97d 100644 --- a/mockito/pom.xml +++ b/mockito/pom.xml @@ -1,94 +1,72 @@ - 4.0.0 - org.baeldung - mockito - 0.1-SNAPSHOT + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + org.baeldung + mockito + 0.1-SNAPSHOT - mockito + mockito com.baeldung parent-modules 1.0.0-SNAPSHOT - - - + - + - - com.google.guava - guava - ${guava.version} - + - - org.apache.commons - commons-lang3 - ${commons-lang3.version} - + + com.google.guava + guava + ${guava.version} + - + + org.apache.commons + commons-lang3 + ${commons-lang3.version} + - + - - org.hamcrest - hamcrest-core - ${org.hamcrest.version} - test - - - org.hamcrest - hamcrest-library - ${org.hamcrest.version} - test - + - - org.mockito - mockito-core - ${mockito.version} - test - + + org.powermock + powermock-module-junit4 + ${powermock.version} + test + + + org.powermock + powermock-api-mockito + ${powermock.version} + test + - - org.powermock - powermock-module-junit4 - ${powermock.version} - test - - - org.powermock - powermock-api-mockito - ${powermock.version} - test - + - + + mockito + + + src/main/resources + true + + - - mockito - - - src/main/resources - true - - + - + + + 19.0 + 3.5 - - - 19.0 - 3.5 + + 1.6.6 - - 1.3 - 1.10.19 - 1.6.6 - - + \ No newline at end of file diff --git a/mockito/src/test/java/com/baeldung/powermockito/introduction/PowerMockitoTest.java b/mockito/src/test/java/com/baeldung/powermockito/introduction/PowerMockitoIntegrationTest.java similarity index 98% rename from mockito/src/test/java/com/baeldung/powermockito/introduction/PowerMockitoTest.java rename to mockito/src/test/java/com/baeldung/powermockito/introduction/PowerMockitoIntegrationTest.java index 6f12f3e459..4a98bbcb87 100644 --- a/mockito/src/test/java/com/baeldung/powermockito/introduction/PowerMockitoTest.java +++ b/mockito/src/test/java/com/baeldung/powermockito/introduction/PowerMockitoIntegrationTest.java @@ -11,7 +11,7 @@ import static org.powermock.api.mockito.PowerMockito.*; @RunWith(PowerMockRunner.class) @PrepareForTest(fullyQualifiedNames = "com.baeldung.powermockito.introduction.*") -public class PowerMockitoTest { +public class PowerMockitoIntegrationTest { @Test public void givenFinalMethods_whenUsingPowerMockito_thenCorrect() throws Exception { diff --git a/mockito/src/test/java/org/baeldung/mockito/MockitoAnnotationTest.java b/mockito/src/test/java/org/baeldung/mockito/MockitoAnnotationIntegrationTest.java similarity index 98% rename from mockito/src/test/java/org/baeldung/mockito/MockitoAnnotationTest.java rename to mockito/src/test/java/org/baeldung/mockito/MockitoAnnotationIntegrationTest.java index ec68c38f70..4e090e6652 100644 --- a/mockito/src/test/java/org/baeldung/mockito/MockitoAnnotationTest.java +++ b/mockito/src/test/java/org/baeldung/mockito/MockitoAnnotationIntegrationTest.java @@ -11,7 +11,7 @@ import java.util.Map; import static org.junit.Assert.assertEquals; //@RunWith(MockitoJUnitRunner.class) -public class MockitoAnnotationTest { +public class MockitoAnnotationIntegrationTest { @Mock private List mockedList; diff --git a/mockito/src/test/java/org/baeldung/mockito/MockitoConfigExamplesTest.java b/mockito/src/test/java/org/baeldung/mockito/MockitoConfigExamplesIntegrationTest.java similarity index 98% rename from mockito/src/test/java/org/baeldung/mockito/MockitoConfigExamplesTest.java rename to mockito/src/test/java/org/baeldung/mockito/MockitoConfigExamplesIntegrationTest.java index 5050a2d6bc..5da86dfb9a 100644 --- a/mockito/src/test/java/org/baeldung/mockito/MockitoConfigExamplesTest.java +++ b/mockito/src/test/java/org/baeldung/mockito/MockitoConfigExamplesIntegrationTest.java @@ -11,7 +11,7 @@ import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.*; -public class MockitoConfigExamplesTest { +public class MockitoConfigExamplesIntegrationTest { // tests diff --git a/mockito/src/test/java/org/baeldung/mockito/MockitoMockTest.java b/mockito/src/test/java/org/baeldung/mockito/MockitoMockIntegrationTest.java similarity index 98% rename from mockito/src/test/java/org/baeldung/mockito/MockitoMockTest.java rename to mockito/src/test/java/org/baeldung/mockito/MockitoMockIntegrationTest.java index 5a1996fa97..6ec3b34db5 100644 --- a/mockito/src/test/java/org/baeldung/mockito/MockitoMockTest.java +++ b/mockito/src/test/java/org/baeldung/mockito/MockitoMockIntegrationTest.java @@ -14,7 +14,7 @@ import org.mockito.exceptions.verification.TooLittleActualInvocations; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; -public class MockitoMockTest { +public class MockitoMockIntegrationTest { private static class CustomAnswer implements Answer { @Override diff --git a/mockito/src/test/java/org/baeldung/mockito/MockitoSpyTest.java b/mockito/src/test/java/org/baeldung/mockito/MockitoSpyIntegrationTest.java similarity index 97% rename from mockito/src/test/java/org/baeldung/mockito/MockitoSpyTest.java rename to mockito/src/test/java/org/baeldung/mockito/MockitoSpyIntegrationTest.java index 8682e16e5d..206e0f4daf 100644 --- a/mockito/src/test/java/org/baeldung/mockito/MockitoSpyTest.java +++ b/mockito/src/test/java/org/baeldung/mockito/MockitoSpyIntegrationTest.java @@ -12,7 +12,7 @@ import java.util.List; import static org.junit.Assert.assertEquals; @RunWith(MockitoJUnitRunner.class) -public class MockitoSpyTest { +public class MockitoSpyIntegrationTest { @Spy private List aSpyList = new ArrayList(); diff --git a/mockito/src/test/java/org/baeldung/mockito/MockitoVerifyExamplesTest.java b/mockito/src/test/java/org/baeldung/mockito/MockitoVerifyExamplesIntegrationTest.java similarity index 98% rename from mockito/src/test/java/org/baeldung/mockito/MockitoVerifyExamplesTest.java rename to mockito/src/test/java/org/baeldung/mockito/MockitoVerifyExamplesIntegrationTest.java index 6beae34138..418e9693b8 100644 --- a/mockito/src/test/java/org/baeldung/mockito/MockitoVerifyExamplesTest.java +++ b/mockito/src/test/java/org/baeldung/mockito/MockitoVerifyExamplesIntegrationTest.java @@ -14,7 +14,7 @@ import static org.junit.Assert.assertThat; import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.*; -public class MockitoVerifyExamplesTest { +public class MockitoVerifyExamplesIntegrationTest { // tests diff --git a/mockito2/pom.xml b/mockito2/pom.xml index 76c00ad862..523cfa816d 100644 --- a/mockito2/pom.xml +++ b/mockito2/pom.xml @@ -12,18 +12,7 @@ com.baeldung parent-modules 1.0.0-SNAPSHOT - - - - - - - org.mockito - mockito-core - ${mockito.version} - test - - + @@ -60,10 +49,10 @@ - - UTF-8 + + UTF-8 - - 2.7.5 - + + 2.7.5 + diff --git a/mocks/jmockit/pom.xml b/mocks/jmockit/pom.xml index 44e886ec24..173a981e09 100644 --- a/mocks/jmockit/pom.xml +++ b/mocks/jmockit/pom.xml @@ -1,68 +1,38 @@ - 4.0.0 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 - + com.baeldung mocks 1.0.0-SNAPSHOT ../pom.xml - jmockit - jmockit + jmockit + jmockit - - 4.12 - 1.24 - - - 3.6.0 - 2.19.1 - - - - - junit - junit - ${junit.version} - test - + + 1.24 + + org.jmockit jmockit ${jmockit.version} test - + - - jmockit - - - src/main/resources - true - - - - - - org.apache.maven.plugins - maven-compiler-plugin - ${maven-compiler-plugin.version} - - 1.8 - 1.8 - - - - - org.apache.maven.plugins - maven-surefire-plugin - ${maven-surefire-plugin.version} - - - + + jmockit + + + src/main/resources + true + + + \ No newline at end of file diff --git a/mocks/jmockit/src/test/java/org/baeldung/mocks/jmockit/AdvancedCollaboratorTest.java b/mocks/jmockit/src/test/java/org/baeldung/mocks/jmockit/AdvancedCollaboratorIntegrationTest.java similarity index 96% rename from mocks/jmockit/src/test/java/org/baeldung/mocks/jmockit/AdvancedCollaboratorTest.java rename to mocks/jmockit/src/test/java/org/baeldung/mocks/jmockit/AdvancedCollaboratorIntegrationTest.java index aaabe44f66..5cde912277 100644 --- a/mocks/jmockit/src/test/java/org/baeldung/mocks/jmockit/AdvancedCollaboratorTest.java +++ b/mocks/jmockit/src/test/java/org/baeldung/mocks/jmockit/AdvancedCollaboratorIntegrationTest.java @@ -20,7 +20,7 @@ import mockit.Tested; import mockit.integration.junit4.JMockit; @RunWith(JMockit.class) -public class AdvancedCollaboratorTest & Comparable>> { +public class AdvancedCollaboratorIntegrationTest & Comparable>> { @Tested private AdvancedCollaborator mock; diff --git a/mocks/jmockit/src/test/java/org/baeldung/mocks/jmockit/ExpectationsTest.java b/mocks/jmockit/src/test/java/org/baeldung/mocks/jmockit/ExpectationsIntegrationTest.java similarity index 99% rename from mocks/jmockit/src/test/java/org/baeldung/mocks/jmockit/ExpectationsTest.java rename to mocks/jmockit/src/test/java/org/baeldung/mocks/jmockit/ExpectationsIntegrationTest.java index 1c72647133..c176cdc182 100644 --- a/mocks/jmockit/src/test/java/org/baeldung/mocks/jmockit/ExpectationsTest.java +++ b/mocks/jmockit/src/test/java/org/baeldung/mocks/jmockit/ExpectationsIntegrationTest.java @@ -18,7 +18,7 @@ import static org.junit.Assert.assertEquals; @RunWith(JMockit.class) @SuppressWarnings("unchecked") -public class ExpectationsTest { +public class ExpectationsIntegrationTest { @Test public void testForAny(@Mocked ExpectationsCollaborator mock) throws Exception { diff --git a/mocks/jmockit/src/test/java/org/baeldung/mocks/jmockit/PerformerTest.java b/mocks/jmockit/src/test/java/org/baeldung/mocks/jmockit/PerformerIntegrationTest.java similarity index 93% rename from mocks/jmockit/src/test/java/org/baeldung/mocks/jmockit/PerformerTest.java rename to mocks/jmockit/src/test/java/org/baeldung/mocks/jmockit/PerformerIntegrationTest.java index 2b1b3be0f7..7c79a5979e 100644 --- a/mocks/jmockit/src/test/java/org/baeldung/mocks/jmockit/PerformerTest.java +++ b/mocks/jmockit/src/test/java/org/baeldung/mocks/jmockit/PerformerIntegrationTest.java @@ -7,7 +7,7 @@ import mockit.*; import mockit.integration.junit4.JMockit; @RunWith(JMockit.class) -public class PerformerTest { +public class PerformerIntegrationTest { @Injectable private Collaborator collaborator; diff --git a/mocks/jmockit/src/test/java/org/baeldung/mocks/jmockit/ReusingTest.java b/mocks/jmockit/src/test/java/org/baeldung/mocks/jmockit/ReusingIntegrationTest.java similarity index 97% rename from mocks/jmockit/src/test/java/org/baeldung/mocks/jmockit/ReusingTest.java rename to mocks/jmockit/src/test/java/org/baeldung/mocks/jmockit/ReusingIntegrationTest.java index 729cb30cd2..73bc712143 100644 --- a/mocks/jmockit/src/test/java/org/baeldung/mocks/jmockit/ReusingTest.java +++ b/mocks/jmockit/src/test/java/org/baeldung/mocks/jmockit/ReusingIntegrationTest.java @@ -12,7 +12,7 @@ import mockit.Verifications; import mockit.integration.junit4.JMockit; @RunWith(JMockit.class) -public class ReusingTest { +public class ReusingIntegrationTest { @Injectable private Collaborator collaborator; diff --git a/mocks/mock-comparisons/pom.xml b/mocks/mock-comparisons/pom.xml index aa143dac66..2ab35651f1 100644 --- a/mocks/mock-comparisons/pom.xml +++ b/mocks/mock-comparisons/pom.xml @@ -1,37 +1,26 @@ - 4.0.0 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 - + com.baeldung mocks 1.0.0-SNAPSHOT ../pom.xml - mock-comparisons - mock-comparisons + mock-comparisons + mock-comparisons + + + 1.10.19 + 3.4 + 1.29 - - 4.12 - 1.10.19 - 3.4 - 1.29 - UTF-8 + - - 3.6.0 - 2.19.1 - - - - - junit - junit - ${junit.version} - test - + org.mockito @@ -54,38 +43,16 @@ test - - - - mock-comparisons - - - src/main/resources - true - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - ${maven-compiler-plugin.version} - - 1.8 - 1.8 - - - - - org.apache.maven.plugins - maven-surefire-plugin - ${maven-surefire-plugin.version} - - - - - + + + mock-comparisons + + + src/main/resources + true + + + \ No newline at end of file diff --git a/mocks/mock-comparisons/src/test/java/org/baeldung/mocks/easymock/LoginControllerTest.java b/mocks/mock-comparisons/src/test/java/org/baeldung/mocks/easymock/LoginControllerIntegrationTest.java similarity index 98% rename from mocks/mock-comparisons/src/test/java/org/baeldung/mocks/easymock/LoginControllerTest.java rename to mocks/mock-comparisons/src/test/java/org/baeldung/mocks/easymock/LoginControllerIntegrationTest.java index 25d2b91ede..4cf2a23ee8 100644 --- a/mocks/mock-comparisons/src/test/java/org/baeldung/mocks/easymock/LoginControllerTest.java +++ b/mocks/mock-comparisons/src/test/java/org/baeldung/mocks/easymock/LoginControllerIntegrationTest.java @@ -10,7 +10,7 @@ import org.junit.Test; import org.junit.runner.RunWith; @RunWith(EasyMockRunner.class) -public class LoginControllerTest { +public class LoginControllerIntegrationTest { @Mock private LoginDao loginDao; diff --git a/mocks/mock-comparisons/src/test/java/org/baeldung/mocks/jmockit/LoginControllerTest.java b/mocks/mock-comparisons/src/test/java/org/baeldung/mocks/jmockit/LoginControllerIntegrationTest.java similarity index 98% rename from mocks/mock-comparisons/src/test/java/org/baeldung/mocks/jmockit/LoginControllerTest.java rename to mocks/mock-comparisons/src/test/java/org/baeldung/mocks/jmockit/LoginControllerIntegrationTest.java index 621342fed2..ecad7df5b5 100644 --- a/mocks/mock-comparisons/src/test/java/org/baeldung/mocks/jmockit/LoginControllerTest.java +++ b/mocks/mock-comparisons/src/test/java/org/baeldung/mocks/jmockit/LoginControllerIntegrationTest.java @@ -13,7 +13,7 @@ import org.junit.Test; import org.junit.runner.RunWith; @RunWith(JMockit.class) -public class LoginControllerTest { +public class LoginControllerIntegrationTest { @Injectable private LoginDao loginDao; diff --git a/mocks/mock-comparisons/src/test/java/org/baeldung/mocks/mockito/LoginControllerTest.java b/mocks/mock-comparisons/src/test/java/org/baeldung/mocks/mockito/LoginControllerIntegrationTest.java similarity index 98% rename from mocks/mock-comparisons/src/test/java/org/baeldung/mocks/mockito/LoginControllerTest.java rename to mocks/mock-comparisons/src/test/java/org/baeldung/mocks/mockito/LoginControllerIntegrationTest.java index 59b28a2cb4..18bc2ae189 100644 --- a/mocks/mock-comparisons/src/test/java/org/baeldung/mocks/mockito/LoginControllerTest.java +++ b/mocks/mock-comparisons/src/test/java/org/baeldung/mocks/mockito/LoginControllerIntegrationTest.java @@ -9,7 +9,7 @@ import org.junit.Before; import org.junit.Test; import org.mockito.*; -public class LoginControllerTest { +public class LoginControllerIntegrationTest { @Mock private LoginDao loginDao; diff --git a/mocks/pom.xml b/mocks/pom.xml index ec02c255ef..84243a25d2 100644 --- a/mocks/pom.xml +++ b/mocks/pom.xml @@ -1,4 +1,5 @@ - + 4.0.0 diff --git a/mybatis/pom.xml b/mybatis/pom.xml index 0be07d0599..32039b01e6 100644 --- a/mybatis/pom.xml +++ b/mybatis/pom.xml @@ -1,7 +1,6 @@ - + 4.0.0 com.baeldung @@ -12,8 +11,8 @@ com.baeldung parent-modules 1.0.0-SNAPSHOT - - + + 10.13.1.1 3.2.2 diff --git a/orika/pom.xml b/orika/pom.xml index 24da693587..d1f38a6016 100644 --- a/orika/pom.xml +++ b/orika/pom.xml @@ -1,5 +1,5 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 com.baeldung orika @@ -9,22 +9,16 @@ com.baeldung parent-modules 1.0.0-SNAPSHOT - - + + - 1.5.0 + 1.5.0 orika - - org.slf4j - jcl-over-slf4j - ${org.slf4j.version} - - ma.glasnost.orika orika-core diff --git a/orika/src/test/java/com/baeldung/orika/OrikaTest.java b/orika/src/test/java/com/baeldung/orika/OrikaUnitTest.java similarity index 99% rename from orika/src/test/java/com/baeldung/orika/OrikaTest.java rename to orika/src/test/java/com/baeldung/orika/OrikaUnitTest.java index f7f14a5f2d..deeed135cc 100644 --- a/orika/src/test/java/com/baeldung/orika/OrikaTest.java +++ b/orika/src/test/java/com/baeldung/orika/OrikaUnitTest.java @@ -18,7 +18,7 @@ import ma.glasnost.orika.MapperFacade; import ma.glasnost.orika.MapperFactory; import ma.glasnost.orika.impl.DefaultMapperFactory; -public class OrikaTest { +public class OrikaUnitTest { MapperFactory mapperFactory; diff --git a/parent-boot-4/pom.xml b/parent-boot-4/pom.xml new file mode 100644 index 0000000000..2af36e9365 --- /dev/null +++ b/parent-boot-4/pom.xml @@ -0,0 +1,81 @@ + + 4.0.0 + com.baeldung + parent-boot-4 + 0.0.1-SNAPSHOT + pom + Parent Boot 4 + Parent for all spring boot 1.4 modules + + + UTF-8 + UTF-8 + 1.8 + 3.0.1 + + 2.19.1 + 3.6.0 + + + + spring-boot-starter-parent + org.springframework.boot + 1.4.4.RELEASE + + + + + + junit + junit + test + + + io.rest-assured + rest-assured + ${rest-assured.version} + + + org.springframework.boot + spring-boot-starter-test + test + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + org.apache.maven.plugins + maven-surefire-plugin + ${maven-surefire-plugin.version} + + 3 + true + + **/*IntegrationTest.java + **/*LongRunningUnitTest.java + **/*ManualTest.java + **/JdbcTest.java + **/*LiveTest.java + + true + + + + org.apache.maven.plugins + maven-compiler-plugin + ${maven-compiler-plugin.version} + + 1.8 + 1.8 + + + + + + \ No newline at end of file diff --git a/parent-boot-5/pom.xml b/parent-boot-5/pom.xml new file mode 100644 index 0000000000..57e9ed3c67 --- /dev/null +++ b/parent-boot-5/pom.xml @@ -0,0 +1,83 @@ + + 4.0.0 + com.baeldung + parent-boot-5 + 0.0.1-SNAPSHOT + pom + Parent Boot 5 + Parent for all spring boot 1.5 modules + + + UTF-8 + UTF-8 + 1.8 + 3.0.1 + + 2.19.1 + 3.6.0 + + + + spring-boot-starter-parent + org.springframework.boot + 1.5.3.RELEASE + + + + + + junit + junit + test + + + io.rest-assured + rest-assured + ${rest-assured.version} + + + org.springframework.boot + spring-boot-starter-test + test + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + org.apache.maven.plugins + maven-surefire-plugin + ${maven-surefire-plugin.version} + + 3 + true + + **/*IntegrationTest.java + **/*LongRunningUnitTest.java + **/*ManualTest.java + **/JdbcTest.java + **/AutoconfigurationTest.java + **/*EntryPointsTest.java + **/*LiveTest.java + + true + + + + org.apache.maven.plugins + maven-compiler-plugin + ${maven-compiler-plugin.version} + + 1.8 + 1.8 + + + + + + \ No newline at end of file diff --git a/patterns/front-controller/pom.xml b/patterns/front-controller/pom.xml index 2dabf484e1..7887af5430 100644 --- a/patterns/front-controller/pom.xml +++ b/patterns/front-controller/pom.xml @@ -1,45 +1,44 @@ - - 4.0.0 + + 4.0.0 - front-controller - war + front-controller + war - - patterns-parent - com.baeldung.patterns - 1.0.0-SNAPSHOT - .. - + + patterns-parent + com.baeldung.patterns + 1.0.0-SNAPSHOT + .. + - - - javax.servlet - javax.servlet-api - - + + + javax.servlet + javax.servlet-api + + - - - - org.apache.maven.plugins - maven-compiler-plugin - - - org.apache.maven.plugins - maven-war-plugin - - - org.eclipse.jetty - jetty-maven-plugin - - - /front-controller - - - - - + + + + org.apache.maven.plugins + maven-compiler-plugin + + + org.apache.maven.plugins + maven-war-plugin + + + org.eclipse.jetty + jetty-maven-plugin + + + /front-controller + + + + + diff --git a/patterns/intercepting-filter/pom.xml b/patterns/intercepting-filter/pom.xml index c497307869..550409b643 100644 --- a/patterns/intercepting-filter/pom.xml +++ b/patterns/intercepting-filter/pom.xml @@ -1,58 +1,57 @@ - - 4.0.0 + + 4.0.0 - intercepting-filter - war + intercepting-filter + war - - com.baeldung.patterns - patterns-parent - 1.0.0-SNAPSHOT - .. - + + com.baeldung.patterns + patterns-parent + 1.0.0-SNAPSHOT + .. + - - - javax.servlet - javax.servlet-api - - - org.slf4j - slf4j-api - ${slf4j.version} - provided - - + + + javax.servlet + javax.servlet-api + + + org.slf4j + slf4j-api + ${slf4j.version} + provided + + - - - - org.apache.maven.plugins - maven-compiler-plugin - - - org.apache.maven.plugins - maven-war-plugin - - false - - - - org.eclipse.jetty - jetty-maven-plugin - - - / - - - - - - - - 1.7.21 - + + + + org.apache.maven.plugins + maven-compiler-plugin + + + org.apache.maven.plugins + maven-war-plugin + + false + + + + org.eclipse.jetty + jetty-maven-plugin + + + / + + + + + + + + 1.7.21 + diff --git a/patterns/pom.xml b/patterns/pom.xml index 3df9fc4520..c40d7c58b7 100644 --- a/patterns/pom.xml +++ b/patterns/pom.xml @@ -1,7 +1,6 @@ - + 4.0.0 com.baeldung.patterns @@ -46,9 +45,9 @@ - + - 3.1.0 + 3.1.0 3.0.0 9.4.0.v20161208 diff --git a/pdf/pom.xml b/pdf/pom.xml index e1e16624ab..bd4d35fcbf 100644 --- a/pdf/pom.xml +++ b/pdf/pom.xml @@ -1,85 +1,85 @@ - 4.0.0 - - com.baeldung - parent-modules - 1.0.0-SNAPSHOT - - pdf - pdf - http://maven.apache.org + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" + xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + 4.0.0 + + com.baeldung + parent-modules + 1.0.0-SNAPSHOT + + pdf + pdf + http://maven.apache.org - - UTF-8 - 2.0.3 - 1.6 - 5.5.10 - 5.5.10 - 3.15 - 1.8 - 3.15 - + + UTF-8 + 2.0.3 + 1.6 + 5.5.10 + 5.5.10 + 3.15 + 1.8 + 3.15 + - - - org.apache.pdfbox - pdfbox-tools - ${pdfbox-tools.version} - - - commons-logging - commons-logging - - - - - net.sf.cssbox - pdf2dom - ${pdf2dom.version} - - - commons-logging - commons-logging - - - - - com.itextpdf - itextpdf - ${itextpdf.version} - - - com.itextpdf.tool - xmlworker - ${xmlworker.version} - - - org.apache.poi - poi-scratchpad - ${poi-scratchpad.version} - - - org.apache.xmlgraphics - batik-transcoder - ${batik-transcoder.version} - - - org.apache.poi - poi-ooxml - ${poi-ooxml.version} - - + + + org.apache.pdfbox + pdfbox-tools + ${pdfbox-tools.version} + + + commons-logging + commons-logging + + + + + net.sf.cssbox + pdf2dom + ${pdf2dom.version} + + + commons-logging + commons-logging + + + + + com.itextpdf + itextpdf + ${itextpdf.version} + + + com.itextpdf.tool + xmlworker + ${xmlworker.version} + + + org.apache.poi + poi-scratchpad + ${poi-scratchpad.version} + + + org.apache.xmlgraphics + batik-transcoder + ${batik-transcoder.version} + + + org.apache.poi + poi-ooxml + ${poi-ooxml.version} + + - - pdf - - - src/main/resources - true - - - + + pdf + + + src/main/resources + true + + + diff --git a/play-framework/introduction/test/ApplicationTest.java b/play-framework/introduction/test/ApplicationLiveTest.java similarity index 99% rename from play-framework/introduction/test/ApplicationTest.java rename to play-framework/introduction/test/ApplicationLiveTest.java index 1133978e9a..beeef1a602 100644 --- a/play-framework/introduction/test/ApplicationTest.java +++ b/play-framework/introduction/test/ApplicationLiveTest.java @@ -21,7 +21,7 @@ import model.Student; import play.test.*; import static play.test.Helpers.*; -public class ApplicationTest{ +public class ApplicationLiveTest{ private static final String BASE_URL = "http://localhost:9000"; @Test diff --git a/play-framework/routing-in-play/test/ApplicationTest.java b/play-framework/routing-in-play/test/ApplicationUnitTest.java similarity index 96% rename from play-framework/routing-in-play/test/ApplicationTest.java rename to play-framework/routing-in-play/test/ApplicationUnitTest.java index 3d7c4875aa..572ce282bc 100644 --- a/play-framework/routing-in-play/test/ApplicationTest.java +++ b/play-framework/routing-in-play/test/ApplicationUnitTest.java @@ -26,7 +26,7 @@ import static org.junit.Assert.*; * If you are interested in mocking a whole application, see the wiki for more details. * */ -public class ApplicationTest { +public class ApplicationUnitTest { @Test public void simpleCheck() { diff --git a/play-framework/student-api/test/ApplicationTest.java b/play-framework/student-api/test/ApplicationLiveTest.java similarity index 99% rename from play-framework/student-api/test/ApplicationTest.java rename to play-framework/student-api/test/ApplicationLiveTest.java index 1133978e9a..beeef1a602 100644 --- a/play-framework/student-api/test/ApplicationTest.java +++ b/play-framework/student-api/test/ApplicationLiveTest.java @@ -21,7 +21,7 @@ import model.Student; import play.test.*; import static play.test.Helpers.*; -public class ApplicationTest{ +public class ApplicationLiveTest{ private static final String BASE_URL = "http://localhost:9000"; @Test diff --git a/pom.xml b/pom.xml index d04ff99c6a..18f161efb7 100644 --- a/pom.xml +++ b/pom.xml @@ -13,6 +13,8 @@ refs/heads/master 4.12 + 1.3 + 1.10.19 1.7.21 1.1.7 @@ -219,6 +221,7 @@ spring-data-gemfire mybatis spring-drools + drools @@ -238,7 +241,12 @@ logback-core ${logback.version} - + + org.slf4j + jcl-over-slf4j + ${org.slf4j.version} + + junit @@ -246,6 +254,30 @@ ${junit.version} test + + org.hamcrest + hamcrest-core + ${org.hamcrest.version} + test + + + org.hamcrest + hamcrest-library + ${org.hamcrest.version} + test + + + org.hamcrest + hamcrest-all + ${org.hamcrest.version} + test + + + org.mockito + mockito-core + ${mockito.version} + test + diff --git a/protobuffer/pom.xml b/protobuffer/pom.xml index 5c9175072d..52838f5de9 100644 --- a/protobuffer/pom.xml +++ b/protobuffer/pom.xml @@ -1,7 +1,6 @@ - + parent-modules com.baeldung diff --git a/querydsl/pom.xml b/querydsl/pom.xml index 756160e5ba..6c968f01e4 100644 --- a/querydsl/pom.xml +++ b/querydsl/pom.xml @@ -1,7 +1,6 @@ - + 4.0.0 com.baeldung @@ -16,8 +15,8 @@ com.baeldung parent-modules 1.0.0-SNAPSHOT - - + + UTF-8 1.8 @@ -28,7 +27,7 @@ 2.3.4 1.6 1.4 - + 1.1.3 @@ -96,7 +95,7 @@ commons-logging commons-logging - + @@ -126,14 +125,6 @@ jar test - - - - org.slf4j - jcl-over-slf4j - ${org.slf4j.version} - runtime - @@ -171,7 +162,7 @@ - + integration @@ -206,5 +197,5 @@ - + \ No newline at end of file diff --git a/rabbitmq/pom.xml b/rabbitmq/pom.xml index 41470d50d0..151f214a91 100644 --- a/rabbitmq/pom.xml +++ b/rabbitmq/pom.xml @@ -1,6 +1,7 @@ - + 4.0.0 com.baeldung @@ -14,8 +15,8 @@ com.baeldung parent-modules 1.0.0-SNAPSHOT - - + + com.rabbitmq diff --git a/ratpack/src/test/java/com/baeldung/ApplicationTest.java b/ratpack/src/test/java/com/baeldung/ApplicationIntegrationTest.java similarity index 97% rename from ratpack/src/test/java/com/baeldung/ApplicationTest.java rename to ratpack/src/test/java/com/baeldung/ApplicationIntegrationTest.java index 047575ca6e..5614f6617c 100644 --- a/ratpack/src/test/java/com/baeldung/ApplicationTest.java +++ b/ratpack/src/test/java/com/baeldung/ApplicationIntegrationTest.java @@ -16,7 +16,7 @@ import java.util.ArrayList; import java.util.List; @RunWith(JUnit4.class) -public class ApplicationTest { +public class ApplicationIntegrationTest { MainClassApplicationUnderTest appUnderTest = new MainClassApplicationUnderTest(Application.class); diff --git a/reactor-core/pom.xml b/reactor-core/pom.xml index 6efa2ea533..12f481c96f 100644 --- a/reactor-core/pom.xml +++ b/reactor-core/pom.xml @@ -10,7 +10,7 @@ com.baeldung parent-modules 1.0.0-SNAPSHOT - + diff --git a/redis/pom.xml b/redis/pom.xml index 3e46ca6ff1..db454188a7 100644 --- a/redis/pom.xml +++ b/redis/pom.xml @@ -1,6 +1,7 @@ - + 4.0.0 com.baeldung @@ -14,8 +15,8 @@ com.baeldung parent-modules 1.0.0-SNAPSHOT - - + + redis.clients diff --git a/rest-assured/pom.xml b/rest-assured/pom.xml index 518f7b07f2..3fca54c80f 100644 --- a/rest-assured/pom.xml +++ b/rest-assured/pom.xml @@ -10,8 +10,8 @@ com.baeldung parent-modules 1.0.0-SNAPSHOT - - + + javax.servlet @@ -132,7 +132,7 @@ org.apache.httpcomponents httpclient - ${httpclient.version} + ${httpclient.version} @@ -165,13 +165,7 @@ com.github.fge json-schema-core - ${json-schema-core.version} - - - - org.hamcrest - hamcrest-all - ${hamcrest.version} + ${json-schema-core.version} commons-collections @@ -217,24 +211,24 @@ - + 2.8.5 1.8 19.0 - + 3.1.0 2.5 - 1.4.7 + 1.4.7 9.4.0.v20161208 - - 3.5 + + 3.5 3.2.2 - + 4.4.5 4.5.2 - + 0.9 8.0.0 2.9.6 @@ -245,10 +239,9 @@ 2.2.6 1.2.5 - - 1.3 + 3.0.1 - 3.0.1 + 3.0.1 diff --git a/rest-testing/pom.xml b/rest-testing/pom.xml index 4e155173d8..b99dfac571 100644 --- a/rest-testing/pom.xml +++ b/rest-testing/pom.xml @@ -1,5 +1,5 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 com.baeldung rest-testing @@ -11,8 +11,8 @@ com.baeldung parent-modules 1.0.0-SNAPSHOT - - + + @@ -46,7 +46,7 @@ commons-logging commons-logging - + org.apache.httpcomponents @@ -62,35 +62,7 @@ ${jackson.version} - - - org.slf4j - jcl-over-slf4j - ${org.slf4j.version} - runtime - - - - - org.hamcrest - hamcrest-core - ${org.hamcrest.version} - test - - - org.hamcrest - hamcrest-library - ${org.hamcrest.version} - test - - - - org.mockito - mockito-core - ${mockito.version} - test - com.github.tomakehurst wiremock @@ -175,9 +147,6 @@ 2.5 - 1.3 - 4.12 - 1.10.19 2.9.0 1.2.5 2.4.1 diff --git a/rest-testing/src/test/java/com/baeldung/rest/wiremock/introduction/JUnitManaged.java b/rest-testing/src/test/java/com/baeldung/rest/wiremock/introduction/JUnitManagedIntegrationTest.java similarity index 99% rename from rest-testing/src/test/java/com/baeldung/rest/wiremock/introduction/JUnitManaged.java rename to rest-testing/src/test/java/com/baeldung/rest/wiremock/introduction/JUnitManagedIntegrationTest.java index 664c3fac78..aa0c6696a4 100644 --- a/rest-testing/src/test/java/com/baeldung/rest/wiremock/introduction/JUnitManaged.java +++ b/rest-testing/src/test/java/com/baeldung/rest/wiremock/introduction/JUnitManagedIntegrationTest.java @@ -29,7 +29,7 @@ import static com.github.tomakehurst.wiremock.client.WireMock.urlPathMatching; import static com.github.tomakehurst.wiremock.client.WireMock.verify; import static org.junit.Assert.assertEquals; -public class JUnitManaged { +public class JUnitManagedIntegrationTest { private static final String BAELDUNG_WIREMOCK_PATH = "/baeldung/wiremock"; private static final String APPLICATION_JSON = "application/json"; diff --git a/resteasy/bin/pom.xml b/resteasy/bin/pom.xml index 1116c0f01a..2e1f839a55 100644 --- a/resteasy/bin/pom.xml +++ b/resteasy/bin/pom.xml @@ -1,46 +1,22 @@ - 4.0.0 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 - com.baeldung - resteasy-tutorial - 1.0 - war + com.baeldung + resteasy-tutorial + 1.0 + war - - 3.0.19.Final - 4.12 - 2.5 - 2.19.1 - 1.6.1 - - - - RestEasyTutorial - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.8 - 1.8 - - - - org.apache.maven.plugins - maven-surefire-plugin - ${maven-surefire-plugin.version} - - 3 - true - - **/*IntegrationTest.java - **/*LiveTest.java - - - + + 3.0.19.Final + 2.5 + 1.6.1 + + + RestEasyTutorial + org.codehaus.cargo cargo-maven2-plugin @@ -57,64 +33,54 @@ - - - + + + - + - + - - org.jboss.resteasy - resteasy-servlet-initializer - ${resteasy.version} - + + org.jboss.resteasy + resteasy-servlet-initializer + ${resteasy.version} + - - org.jboss.resteasy - resteasy-client - ${resteasy.version} - + + org.jboss.resteasy + resteasy-client + ${resteasy.version} + - + - - org.jboss.resteasy - resteasy-jaxb-provider - ${resteasy.version} - + + org.jboss.resteasy + resteasy-jaxb-provider + ${resteasy.version} + - - org.jboss.resteasy - resteasy-jackson-provider - ${resteasy.version} - + + org.jboss.resteasy + resteasy-jackson-provider + ${resteasy.version} + - + + commons-io + commons-io + ${commons-io.version} + - - junit - junit - ${junit.version} - - - - commons-io - commons-io - ${commons-io.version} - - - + live - - org.apache.maven.plugins maven-surefire-plugin @@ -143,7 +109,7 @@ org.codehaus.cargo cargo-maven2-plugin - ${cargo-maven2-plugin.version} + ${cargo-maven2-plugin.version} false @@ -165,9 +131,8 @@ - - + \ No newline at end of file diff --git a/resteasy/pom.xml b/resteasy/pom.xml index a492c69f15..94be91243a 100644 --- a/resteasy/pom.xml +++ b/resteasy/pom.xml @@ -1,28 +1,28 @@ - 4.0.0 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 - com.baeldung - resteasy-tutorial - 1.0 - war + com.baeldung + resteasy-tutorial + 1.0 + war com.baeldung parent-modules 1.0.0-SNAPSHOT - - - - 3.0.19.Final - 2.5 - 1.6.1 - + - - RestEasyTutorial - + + 3.0.19.Final + 2.5 + 1.6.1 + + + + RestEasyTutorial + org.codehaus.cargo cargo-maven2-plugin @@ -39,55 +39,55 @@ - - - + + + - + - + - - org.jboss.resteasy - resteasy-servlet-initializer - ${resteasy.version} - - - commons-logging - commons-logging - - - + + org.jboss.resteasy + resteasy-servlet-initializer + ${resteasy.version} + + + commons-logging + commons-logging + + + - - org.jboss.resteasy - resteasy-client - ${resteasy.version} - + + org.jboss.resteasy + resteasy-client + ${resteasy.version} + - + - - org.jboss.resteasy - resteasy-jaxb-provider - ${resteasy.version} - + + org.jboss.resteasy + resteasy-jaxb-provider + ${resteasy.version} + - - org.jboss.resteasy - resteasy-jackson-provider - ${resteasy.version} - + + org.jboss.resteasy + resteasy-jackson-provider + ${resteasy.version} + - - commons-io - commons-io - ${commons-io.version} - + + commons-io + commons-io + ${commons-io.version} + - + @@ -124,7 +124,7 @@ org.codehaus.cargo cargo-maven2-plugin - ${cargo-maven2-plugin.version} + ${cargo-maven2-plugin.version} false @@ -150,5 +150,5 @@ - + \ No newline at end of file diff --git a/rxjava/pom.xml b/rxjava/pom.xml index 716033e600..578eda3fcf 100644 --- a/rxjava/pom.xml +++ b/rxjava/pom.xml @@ -1,18 +1,17 @@ - + 4.0.0 com.baeldung rxjava 1.0-SNAPSHOT - + com.baeldung parent-modules 1.0.0-SNAPSHOT - + @@ -20,17 +19,10 @@ rxjava ${rx.java.version} - - org.hamcrest - hamcrest-all - ${hamcrest.version} - test - 1.2.5 - 1.3 diff --git a/selenium-junit-testng/pom.xml b/selenium-junit-testng/pom.xml index d5e3c18ef2..5c77e0c9ff 100644 --- a/selenium-junit-testng/pom.xml +++ b/selenium-junit-testng/pom.xml @@ -9,8 +9,8 @@ com.baeldung parent-modules 1.0.0-SNAPSHOT - - + + src @@ -45,7 +45,7 @@ commons-logging commons-logging - + org.testng @@ -56,9 +56,9 @@ junit junit ${junit.version} - + - + 6.10 3.0.1 diff --git a/solr/pom.xml b/solr/pom.xml index 7d46f1e1fa..1b26a21edc 100644 --- a/solr/pom.xml +++ b/solr/pom.xml @@ -12,8 +12,8 @@ com.baeldung parent-modules 1.0.0-SNAPSHOT - - + + UTF-8 @@ -24,13 +24,6 @@ solr-solrj 6.4.1 - - junit - junit - 4.12 - test - - \ No newline at end of file diff --git a/spark-java/pom.xml b/spark-java/pom.xml index 6ed72a3784..67f4765f38 100644 --- a/spark-java/pom.xml +++ b/spark-java/pom.xml @@ -1,36 +1,36 @@ - 4.0.0 - com.baeldung - spark-java - 0.1.0-SNAPSHOT - spark-java - http://maven.apache.org - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" + xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + 4.0.0 + com.baeldung + spark-java + 0.1.0-SNAPSHOT + spark-java + http://maven.apache.org + com.baeldung parent-modules 1.0.0-SNAPSHOT - + - - UTF-8 - 1.8 - 1.8 - - - - com.sparkjava - spark-core - 2.5.4 - - - - com.google.code.gson - gson - 2.8.0 - - + + UTF-8 + 1.8 + 1.8 + + + + com.sparkjava + spark-core + 2.5.4 + + + + com.google.code.gson + gson + 2.8.0 + + diff --git a/spring-5/pom.xml b/spring-5/pom.xml index 466318a31a..63014d6e51 100644 --- a/spring-5/pom.xml +++ b/spring-5/pom.xml @@ -1,182 +1,182 @@ - 4.0.0 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 - com.baeldung - spring-5 - 0.0.1-SNAPSHOT - jar + com.baeldung + spring-5 + 0.0.1-SNAPSHOT + jar - spring-5 - spring 5 sample project about new features + spring-5 + spring 5 sample project about new features - - org.springframework.boot - spring-boot-starter-parent - 2.0.0.BUILD-SNAPSHOT - - + + org.springframework.boot + spring-boot-starter-parent + 2.0.0.BUILD-SNAPSHOT + + - - - org.springframework.boot - spring-boot-starter-data-jpa - - - org.springframework.boot - spring-boot-starter-security - - - org.springframework.boot - spring-boot-starter-validation - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-webflux - + + + org.springframework.boot + spring-boot-starter-data-jpa + + + org.springframework.boot + spring-boot-starter-security + + + org.springframework.boot + spring-boot-starter-validation + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-webflux + - - - org.apache.commons - commons-lang3 - + + + org.apache.commons + commons-lang3 + - + - - org.springframework.boot - spring-boot-devtools - runtime - - - com.h2database - h2 - runtime - - - - org.springframework - spring-test - - - org.springframework.boot - spring-boot-starter-test - test - - - - org.junit.jupiter - junit-jupiter-api - ${junit.jupiter.version} - - - org.junit.jupiter - junit-jupiter-engine - ${junit.jupiter.version} - test - - - org.junit.platform - junit-platform-surefire-provider - ${junit.platform.version} - test - - - org.junit.platform - junit-platform-runner - ${junit.platform.version} - test - - - + + org.springframework.boot + spring-boot-devtools + runtime + + + com.h2database + h2 + runtime + - - - - org.springframework.boot - spring-boot-maven-plugin - - com.baeldung.Spring5Application - JAR - - + + org.springframework + spring-test + + + org.springframework.boot + spring-boot-starter-test + test + - - org.apache.maven.plugins - maven-surefire-plugin - ${maven-surefire-plugin.version} - - 3 - true - - **/*IntegrationTest.java - **/*LiveTest.java - - - + + org.junit.jupiter + junit-jupiter-api + ${junit.jupiter.version} + + + org.junit.jupiter + junit-jupiter-engine + ${junit.jupiter.version} + test + + + org.junit.platform + junit-platform-surefire-provider + ${junit.platform.version} + test + + + org.junit.platform + junit-platform-runner + ${junit.platform.version} + test + - - org.apache.maven.plugins - maven-surefire-plugin - ${maven-surefire-plugin.version} - - methods - true - - + - - + + + + org.springframework.boot + spring-boot-maven-plugin + + com.baeldung.Spring5Application + JAR + + - - - spring-snapshots - Spring Snapshots - https://repo.spring.io/snapshot - - true - - - - spring-milestones - Spring Milestones - https://repo.spring.io/milestone - - false - - - - - - spring-snapshots - Spring Snapshots - https://repo.spring.io/snapshot - - true - - - - spring-milestones - Spring Milestones - https://repo.spring.io/milestone - - false - - - + + org.apache.maven.plugins + maven-surefire-plugin + ${maven-surefire-plugin.version} + + 3 + true + + **/*IntegrationTest.java + **/*LiveTest.java + + + - - UTF-8 - UTF-8 - 1.8 - 1.0.0-M4 - 5.0.0-M4 - 2.20 - + + org.apache.maven.plugins + maven-surefire-plugin + ${maven-surefire-plugin.version} + + methods + true + + + + + + + + + spring-snapshots + Spring Snapshots + https://repo.spring.io/snapshot + + true + + + + spring-milestones + Spring Milestones + https://repo.spring.io/milestone + + false + + + + + + spring-snapshots + Spring Snapshots + https://repo.spring.io/snapshot + + true + + + + spring-milestones + Spring Milestones + https://repo.spring.io/milestone + + false + + + + + + UTF-8 + UTF-8 + 1.8 + 1.0.0-M4 + 5.0.0-M4 + 2.20 + diff --git a/spring-5/src/test/java/com/baeldung/jupiter/Spring5JUnit5ComposedAnnotationTests.java b/spring-5/src/test/java/com/baeldung/jupiter/Spring5JUnit5ComposedAnnotationIntegrationTest.java similarity index 95% rename from spring-5/src/test/java/com/baeldung/jupiter/Spring5JUnit5ComposedAnnotationTests.java rename to spring-5/src/test/java/com/baeldung/jupiter/Spring5JUnit5ComposedAnnotationIntegrationTest.java index d15857e0a5..b90012edf6 100644 --- a/spring-5/src/test/java/com/baeldung/jupiter/Spring5JUnit5ComposedAnnotationTests.java +++ b/spring-5/src/test/java/com/baeldung/jupiter/Spring5JUnit5ComposedAnnotationIntegrationTest.java @@ -13,7 +13,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; @SpringJUnit5Config(TestConfig.class) @DisplayName("@SpringJUnit5Config Tests") -class Spring5JUnit5ComposedAnnotationTests { +class Spring5JUnit5ComposedAnnotationIntegrationTest { @Autowired Task task; diff --git a/spring-5/src/test/java/com/baeldung/jupiter/Spring5JUnit5Tests.java b/spring-5/src/test/java/com/baeldung/jupiter/Spring5JUnit5IntegrationTest.java similarity index 96% rename from spring-5/src/test/java/com/baeldung/jupiter/Spring5JUnit5Tests.java rename to spring-5/src/test/java/com/baeldung/jupiter/Spring5JUnit5IntegrationTest.java index c4c3148b1e..f0cc55fc80 100644 --- a/spring-5/src/test/java/com/baeldung/jupiter/Spring5JUnit5Tests.java +++ b/spring-5/src/test/java/com/baeldung/jupiter/Spring5JUnit5IntegrationTest.java @@ -14,7 +14,7 @@ import org.junit.jupiter.api.Test; @ExtendWith(SpringExtension.class) @ContextConfiguration(classes = TestConfig.class) -class Spring5JUnit5Tests { +class Spring5JUnit5IntegrationTest { @Autowired Task task; diff --git a/spring-5/src/test/java/com/baeldung/jupiter/Spring5JUnit5ParallelTest.java b/spring-5/src/test/java/com/baeldung/jupiter/Spring5JUnit5ParallelIntegrationTest.java similarity index 94% rename from spring-5/src/test/java/com/baeldung/jupiter/Spring5JUnit5ParallelTest.java rename to spring-5/src/test/java/com/baeldung/jupiter/Spring5JUnit5ParallelIntegrationTest.java index 92d69b2d91..1794da45f5 100644 --- a/spring-5/src/test/java/com/baeldung/jupiter/Spring5JUnit5ParallelTest.java +++ b/spring-5/src/test/java/com/baeldung/jupiter/Spring5JUnit5ParallelIntegrationTest.java @@ -7,7 +7,7 @@ import org.junit.jupiter.api.Test; import org.junit.runner.Computer; import org.junit.runner.JUnitCore; -public class Spring5JUnit5ParallelTest { +public class Spring5JUnit5ParallelIntegrationTest { @Test public void givenTwoTestClasses_whenJUnitRunParallel_thenTheTestsExecutingParallel() { diff --git a/spring-5/src/test/java/com/baeldung/jupiter/Spring5Java8NewFeaturesTest.java b/spring-5/src/test/java/com/baeldung/jupiter/Spring5Java8NewFeaturesIntegrationTest.java similarity index 94% rename from spring-5/src/test/java/com/baeldung/jupiter/Spring5Java8NewFeaturesTest.java rename to spring-5/src/test/java/com/baeldung/jupiter/Spring5Java8NewFeaturesIntegrationTest.java index 36adf1f7ff..97efa19255 100644 --- a/spring-5/src/test/java/com/baeldung/jupiter/Spring5Java8NewFeaturesTest.java +++ b/spring-5/src/test/java/com/baeldung/jupiter/Spring5Java8NewFeaturesIntegrationTest.java @@ -6,7 +6,7 @@ import java.util.regex.Pattern; import java.util.stream.Collectors; import static org.junit.jupiter.api.Assertions.assertEquals; -public class Spring5Java8NewFeaturesTest { +public class Spring5Java8NewFeaturesIntegrationTest { @FunctionalInterface public interface FunctionalInterfaceExample { diff --git a/spring-5/src/test/java/com/baeldung/jupiter/Spring5ReactiveServerClientTest.java b/spring-5/src/test/java/com/baeldung/jupiter/Spring5ReactiveServerClientIntegrationTest.java similarity index 98% rename from spring-5/src/test/java/com/baeldung/jupiter/Spring5ReactiveServerClientTest.java rename to spring-5/src/test/java/com/baeldung/jupiter/Spring5ReactiveServerClientIntegrationTest.java index d3e194d10d..c44728c856 100644 --- a/spring-5/src/test/java/com/baeldung/jupiter/Spring5ReactiveServerClientTest.java +++ b/spring-5/src/test/java/com/baeldung/jupiter/Spring5ReactiveServerClientIntegrationTest.java @@ -28,7 +28,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.springframework.web.reactive.function.server.RequestPredicates.GET; import static org.springframework.web.reactive.function.server.RequestPredicates.POST; -public class Spring5ReactiveServerClientTest { +public class Spring5ReactiveServerClientIntegrationTest { private static NettyContext nettyContext; diff --git a/spring-akka/pom.xml b/spring-akka/pom.xml index 21f1b65ef1..5efd111c35 100644 --- a/spring-akka/pom.xml +++ b/spring-akka/pom.xml @@ -1,5 +1,6 @@ - + 4.0.0 com.baeldung spring-akka @@ -11,13 +12,13 @@ com.baeldung parent-modules 1.0.0-SNAPSHOT - - + + org.springframework - spring-context + spring-context @@ -49,7 +50,7 @@ - + integration diff --git a/spring-all/pom.xml b/spring-all/pom.xml index 7fbb6acced..1ecb824c40 100644 --- a/spring-all/pom.xml +++ b/spring-all/pom.xml @@ -1,264 +1,227 @@ - 4.0.0 - com.baeldung - spring-all - 0.1-SNAPSHOT + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + com.baeldung + spring-all + 0.1-SNAPSHOT - spring-all - war + spring-all + war - - org.springframework.boot - spring-boot-starter-parent - 1.4.4.RELEASE - + + parent-boot-4 + com.baeldung + 0.0.1-SNAPSHOT + ../parent-boot-4 + - - - com.fasterxml.jackson.core - jackson-databind - + + + com.fasterxml.jackson.core + jackson-databind + - + - - org.springframework - spring-web - - - commons-logging - commons-logging - - - - - org.springframework - spring-webmvc - - - org.springframework - spring-orm - - - org.springframework - spring-context - - - org.springframework.retry - spring-retry - ${springretry.version} - - - org.springframework.shell - spring-shell - ${org.springframework.shell.version} - + + org.springframework + spring-web + + + org.springframework + spring-webmvc + + + org.springframework + spring-orm + + + org.springframework + spring-context + + + org.springframework.retry + spring-retry + ${springretry.version} + + + org.springframework.shell + spring-shell + ${org.springframework.shell.version} + - + - - org.springframework - spring-aspects - + + org.springframework + spring-aspects + - + - - org.hibernate - hibernate-core - ${hibernate.version} - - - org.javassist - javassist - - - mysql - mysql-connector-java - runtime - - - org.hsqldb - hsqldb - + + org.hibernate + hibernate-core + ${hibernate.version} + + + org.javassist + javassist + + + mysql + mysql-connector-java + runtime + + + org.hsqldb + hsqldb + - + - - org.hibernate - hibernate-validator - + + org.hibernate + hibernate-validator + - + - - javax.servlet - javax.servlet-api - provided - + + javax.servlet + javax.servlet-api + provided + - - javax.servlet - jstl - runtime - + + javax.servlet + jstl + runtime + - + - - com.google.guava - guava - ${guava.version} - - - - net.sf.jasperreports - jasperreports - ${jasperreports.version} - - - commons-logging - commons-logging - - - + + com.google.guava + guava + ${guava.version} + - + + net.sf.jasperreports + jasperreports + ${jasperreports.version} + + + commons-logging + commons-logging + + + - - org.slf4j - slf4j-api - - - ch.qos.logback - logback-classic - - - - org.slf4j - jcl-over-slf4j - - + - + + org.springframework + spring-test + test + - - org.springframework - spring-test - test - - - junit - junit - test - + + org.assertj + assertj-core + ${assertj.version} + test + - - org.assertj - assertj-core - ${assertj.version} - test - + + org.hamcrest + hamcrest-core + test + + + org.hamcrest + hamcrest-library + test + - - org.hamcrest - hamcrest-core - test - - - org.hamcrest - hamcrest-library - test - + + org.mockito + mockito-core + test + - - org.mockito - mockito-core - test - + + org.easymock + easymock + ${easymock.version} + test + + + org.ehcache + ehcache + ${ehcache.version} + - - org.easymock - easymock - ${easymock.version} - test - - - org.ehcache - ehcache - ${ehcache.version} - - + + org.apache.logging.log4j + log4j-api + ${log4j.version} + + + org.apache.logging.log4j + log4j-core + ${log4j.version} + - + - + - - org.springframework - spring-framework-bom - ${org.springframework.version} - pom - import - + - - org.springframework - spring-core - ${org.springframework.version} - + + org.springframework + spring-framework-bom + ${org.springframework.version} + pom + import + - + + org.springframework + spring-core + ${org.springframework.version} + - + - - spring-all - - - src/main/resources - true - - + - + + spring-all + + + src/main/resources + true + + - - org.apache.maven.plugins - maven-compiler-plugin - - 1.8 - 1.8 - - + - - org.apache.maven.plugins - maven-war-plugin - - false - - + + org.apache.maven.plugins + maven-war-plugin + + false + + - - org.apache.maven.plugins - maven-surefire-plugin - - - **/*IntegrationTest.java - - - - - - + - - - + @@ -293,25 +256,28 @@ - - - - - 4.3.4.RELEASE - 4.2.0.RELEASE - 1.1.5.RELEASE - 1.2.0.RELEASE + - - 5.2.5.Final + + org.baeldung.sample.App + + 4.3.4.RELEASE + 4.2.0.RELEASE + 1.1.5.RELEASE + 1.2.0.RELEASE - - 19.0 - 3.1.3 - 3.4 - 3.6.1 + + 5.2.5.Final + + + 19.0 + 3.1.3 + 3.4 + 3.6.1 6.4.0 - + 2.8.2 + + \ No newline at end of file diff --git a/spring-all/src/main/java/org/baeldung/bean/injection/Helm.java b/spring-all/src/main/java/org/baeldung/bean/injection/Helm.java index 6d6ea85482..86f71ce795 100644 --- a/spring-all/src/main/java/org/baeldung/bean/injection/Helm.java +++ b/spring-all/src/main/java/org/baeldung/bean/injection/Helm.java @@ -1,7 +1,7 @@ package org.baeldung.bean.injection; public class Helm { - + private String brandOfHelm = "HelmBrand"; public String getBrandOfHelm() { diff --git a/spring-all/src/main/java/org/baeldung/customscope/TenantBean.java b/spring-all/src/main/java/org/baeldung/customscope/TenantBean.java index 2d3049ebb9..874fcda9f2 100644 --- a/spring-all/src/main/java/org/baeldung/customscope/TenantBean.java +++ b/spring-all/src/main/java/org/baeldung/customscope/TenantBean.java @@ -1,16 +1,14 @@ package org.baeldung.customscope; public class TenantBean { - + private final String name; - + public TenantBean(String name) { this.name = name; } public void sayHello() { - System.out.println(String.format("Hello from %s of type %s", - this.name, - this.getClass().getName())); + System.out.println(String.format("Hello from %s of type %s", this.name, this.getClass().getName())); } } diff --git a/spring-all/src/main/java/org/baeldung/customscope/TenantBeansConfig.java b/spring-all/src/main/java/org/baeldung/customscope/TenantBeansConfig.java index 0e21ad9344..be3ac001fb 100644 --- a/spring-all/src/main/java/org/baeldung/customscope/TenantBeansConfig.java +++ b/spring-all/src/main/java/org/baeldung/customscope/TenantBeansConfig.java @@ -12,7 +12,7 @@ public class TenantBeansConfig { public TenantBean foo() { return new TenantBean("foo"); } - + @Scope(scopeName = "tenant") @Bean public TenantBean bar() { diff --git a/spring-all/src/main/java/org/baeldung/customscope/TenantScope.java b/spring-all/src/main/java/org/baeldung/customscope/TenantScope.java index 062d7ee890..144d092be6 100644 --- a/spring-all/src/main/java/org/baeldung/customscope/TenantScope.java +++ b/spring-all/src/main/java/org/baeldung/customscope/TenantScope.java @@ -8,13 +8,13 @@ import org.springframework.beans.factory.ObjectFactory; import org.springframework.beans.factory.config.Scope; public class TenantScope implements Scope { - + private Map scopedObjects = Collections.synchronizedMap(new HashMap()); private Map destructionCallbacks = Collections.synchronizedMap(new HashMap()); @Override public Object get(String name, ObjectFactory objectFactory) { - if(!scopedObjects.containsKey(name)) { + if (!scopedObjects.containsKey(name)) { scopedObjects.put(name, objectFactory.getObject()); } return scopedObjects.get(name); diff --git a/spring-all/src/main/java/org/baeldung/jasperreports/SimpleReportExporter.java b/spring-all/src/main/java/org/baeldung/jasperreports/SimpleReportExporter.java index 1252dcda4d..103bb37eb4 100644 --- a/spring-all/src/main/java/org/baeldung/jasperreports/SimpleReportExporter.java +++ b/spring-all/src/main/java/org/baeldung/jasperreports/SimpleReportExporter.java @@ -19,13 +19,13 @@ import org.springframework.stereotype.Component; @Component public class SimpleReportExporter { - + private JasperPrint jasperPrint; public SimpleReportExporter() { } - - public SimpleReportExporter (JasperPrint jasperPrint){ + + public SimpleReportExporter(JasperPrint jasperPrint) { this.jasperPrint = jasperPrint; } @@ -36,9 +36,7 @@ public class SimpleReportExporter { public void setJasperPrint(JasperPrint jasperPrint) { this.jasperPrint = jasperPrint; } - - - + public void exportToPdf(String fileName, String author) { // print report to file @@ -61,27 +59,25 @@ public class SimpleReportExporter { try { exporter.exportReport(); } catch (JRException ex) { - Logger.getLogger(SimpleReportFiller.class.getName()) - .log(Level.SEVERE, null, ex); + Logger.getLogger(SimpleReportFiller.class.getName()).log(Level.SEVERE, null, ex); } } - public void exportToXlsx(String fileName,String sheetName) { + public void exportToXlsx(String fileName, String sheetName) { JRXlsxExporter exporter = new JRXlsxExporter(); exporter.setExporterInput(new SimpleExporterInput(jasperPrint)); exporter.setExporterOutput(new SimpleOutputStreamExporterOutput(fileName)); SimpleXlsxReportConfiguration reportConfig = new SimpleXlsxReportConfiguration(); - reportConfig.setSheetNames(new String[]{sheetName}); + reportConfig.setSheetNames(new String[] { sheetName }); exporter.setConfiguration(reportConfig); try { exporter.exportReport(); } catch (JRException ex) { - Logger.getLogger(SimpleReportFiller.class.getName()) - .log(Level.SEVERE, null, ex); + Logger.getLogger(SimpleReportFiller.class.getName()).log(Level.SEVERE, null, ex); } } @@ -94,8 +90,7 @@ public class SimpleReportExporter { try { exporter.exportReport(); } catch (JRException ex) { - Logger.getLogger(SimpleReportFiller.class.getName()) - .log(Level.SEVERE, null, ex); + Logger.getLogger(SimpleReportFiller.class.getName()).log(Level.SEVERE, null, ex); } } @@ -108,8 +103,7 @@ public class SimpleReportExporter { try { exporter.exportReport(); } catch (JRException ex) { - Logger.getLogger(SimpleReportFiller.class.getName()) - .log(Level.SEVERE, null, ex); + Logger.getLogger(SimpleReportFiller.class.getName()).log(Level.SEVERE, null, ex); } } } diff --git a/spring-all/src/main/java/org/baeldung/jasperreports/SimpleReportFiller.java b/spring-all/src/main/java/org/baeldung/jasperreports/SimpleReportFiller.java index ae675dd280..08891d940a 100644 --- a/spring-all/src/main/java/org/baeldung/jasperreports/SimpleReportFiller.java +++ b/spring-all/src/main/java/org/baeldung/jasperreports/SimpleReportFiller.java @@ -45,8 +45,7 @@ public class SimpleReportFiller { jasperReport = JasperCompileManager.compileReport(reportStream); JRSaver.saveObject(jasperReport, reportFileName.replace(".jrxml", ".jasper")); } catch (JRException ex) { - Logger.getLogger(SimpleReportFiller.class.getName()) - .log(Level.SEVERE, null, ex); + Logger.getLogger(SimpleReportFiller.class.getName()).log(Level.SEVERE, null, ex); } } @@ -54,8 +53,7 @@ public class SimpleReportFiller { try { jasperPrint = JasperFillManager.fillReport(jasperReport, parameters, dataSource.getConnection()); } catch (JRException | SQLException ex) { - Logger.getLogger(SimpleReportFiller.class.getName()) - .log(Level.SEVERE, null, ex); + Logger.getLogger(SimpleReportFiller.class.getName()).log(Level.SEVERE, null, ex); } } diff --git a/spring-all/src/main/java/org/baeldung/jasperreports/config/JasperRerportsSimpleConfig.java b/spring-all/src/main/java/org/baeldung/jasperreports/config/JasperRerportsSimpleConfig.java index 90fc96cdbb..5cc2d894c9 100644 --- a/spring-all/src/main/java/org/baeldung/jasperreports/config/JasperRerportsSimpleConfig.java +++ b/spring-all/src/main/java/org/baeldung/jasperreports/config/JasperRerportsSimpleConfig.java @@ -13,10 +13,7 @@ public class JasperRerportsSimpleConfig { @Bean public DataSource dataSource() { - return new EmbeddedDatabaseBuilder() - .setType(EmbeddedDatabaseType.HSQL) - .addScript("classpath:employee-schema.sql") - .build(); + return new EmbeddedDatabaseBuilder().setType(EmbeddedDatabaseType.HSQL).addScript("classpath:employee-schema.sql").build(); } @Bean diff --git a/spring-all/src/main/java/org/baeldung/shell/simple/SimpleCLI.java b/spring-all/src/main/java/org/baeldung/shell/simple/SimpleCLI.java index 0bbc62cf2c..f73d9bda00 100644 --- a/spring-all/src/main/java/org/baeldung/shell/simple/SimpleCLI.java +++ b/spring-all/src/main/java/org/baeldung/shell/simple/SimpleCLI.java @@ -33,36 +33,25 @@ public class SimpleCLI implements CommandMarker { return sb.toString(); } - @CliCommand( - value = {"web-get", "wg"}, - help = "Displays the contents of a URL." - ) - public String webGet( - @CliOption( - key = {"", "url"}, - help = "URL whose contents will be displayed." - ) URL url) { + @CliCommand(value = { "web-get", "wg" }, help = "Displays the contents of a URL.") + public String webGet(@CliOption(key = { "", "url" }, help = "URL whose contents will be displayed.") URL url) { return getContentsOfUrlAsString(url); } - @CliCommand( - value = {"web-save", "ws"}, - help = "Saves the contents of a URL.") - public String webSave( - @CliOption(key = {"", "url"}, help = "URL whose contents will be saved.") URL url, - @CliOption(key = {"out", "file"}, mandatory = true, help = "The name of the file.") String file) { + @CliCommand(value = { "web-save", "ws" }, help = "Saves the contents of a URL.") + public String webSave(@CliOption(key = { "", "url" }, help = "URL whose contents will be saved.") URL url, @CliOption(key = { "out", "file" }, mandatory = true, help = "The name of the file.") String file) { String contents = getContentsOfUrlAsString(url); try (PrintWriter out = new PrintWriter(file)) { out.write(contents); } catch (FileNotFoundException ex) { - //Ignore + // Ignore } return "Done."; } private boolean adminEnableExecuted = false; - @CliAvailabilityIndicator(value = {"web-save"}) + @CliAvailabilityIndicator(value = { "web-save" }) public boolean isAdminEnabled() { return adminEnableExecuted; } @@ -72,7 +61,7 @@ public class SimpleCLI implements CommandMarker { adminEnableExecuted = true; return "Admin commands enabled."; } - + @CliCommand(value = "admin-disable") public String adminDisable() { adminEnableExecuted = false; diff --git a/spring-all/src/main/java/org/baeldung/shell/simple/SimpleURLConverter.java b/spring-all/src/main/java/org/baeldung/shell/simple/SimpleURLConverter.java index 66bab5c488..4824cfbf05 100644 --- a/spring-all/src/main/java/org/baeldung/shell/simple/SimpleURLConverter.java +++ b/spring-all/src/main/java/org/baeldung/shell/simple/SimpleURLConverter.java @@ -16,14 +16,13 @@ public class SimpleURLConverter implements Converter { try { return new URL(value); } catch (MalformedURLException ex) { - //Ignore + // Ignore } return null; } @Override - public boolean getAllPossibleValues(List completions, Class requiredType, - String existingData, String optionContext, MethodTarget target) { + public boolean getAllPossibleValues(List completions, Class requiredType, String existingData, String optionContext, MethodTarget target) { return false; } diff --git a/spring-all/src/main/java/org/baeldung/spring43/composedmapping/AppointmentsController.java b/spring-all/src/main/java/org/baeldung/spring43/composedmapping/AppointmentsController.java index 9f3c8729d8..e83a33eb89 100644 --- a/spring-all/src/main/java/org/baeldung/spring43/composedmapping/AppointmentsController.java +++ b/spring-all/src/main/java/org/baeldung/spring43/composedmapping/AppointmentsController.java @@ -6,12 +6,16 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; +import org.apache.logging.log4j.Logger; @Controller @RequestMapping("/appointments") public class AppointmentsController { - private final AppointmentService appointmentService; + private AppointmentService appointmentService; + + @Autowired + private Logger logger; @Autowired public AppointmentsController(AppointmentService appointmentService) { @@ -20,6 +24,7 @@ public class AppointmentsController { @GetMapping public Map get() { + logger.info("Getting appointments..."); return appointmentService.getAppointmentsForToday(); } diff --git a/spring-all/src/main/java/org/baeldung/springretry/AppConfig.java b/spring-all/src/main/java/org/baeldung/springretry/AppConfig.java index 63bb2a53f1..d9b081578c 100644 --- a/spring-all/src/main/java/org/baeldung/springretry/AppConfig.java +++ b/spring-all/src/main/java/org/baeldung/springretry/AppConfig.java @@ -11,9 +11,9 @@ import org.springframework.retry.support.RetryTemplate; @Configuration @ComponentScan(basePackages = "org.baeldung.springretry") @EnableRetry -//Uncomment this two lines if we need XML configuration -//@EnableAspectJAutoProxy -//@ImportResource("classpath:/retryadvice.xml") +// Uncomment this two lines if we need XML configuration +// @EnableAspectJAutoProxy +// @ImportResource("classpath:/retryadvice.xml") public class AppConfig { @Bean diff --git a/spring-all/src/main/java/org/baeldung/springretry/MyService.java b/spring-all/src/main/java/org/baeldung/springretry/MyService.java index 2b8cc16eb3..6306ff3c26 100644 --- a/spring-all/src/main/java/org/baeldung/springretry/MyService.java +++ b/spring-all/src/main/java/org/baeldung/springretry/MyService.java @@ -7,7 +7,7 @@ import org.springframework.retry.annotation.Recover; import org.springframework.retry.annotation.Retryable; public interface MyService { - + @Retryable void retryService(); diff --git a/spring-all/src/main/java/org/baeldung/taskscheduler/ThreadPoolTaskSchedulerExamples.java b/spring-all/src/main/java/org/baeldung/taskscheduler/ThreadPoolTaskSchedulerExamples.java index 7505b85516..5d72ed148a 100644 --- a/spring-all/src/main/java/org/baeldung/taskscheduler/ThreadPoolTaskSchedulerExamples.java +++ b/spring-all/src/main/java/org/baeldung/taskscheduler/ThreadPoolTaskSchedulerExamples.java @@ -14,34 +14,35 @@ import org.springframework.stereotype.Component; public class ThreadPoolTaskSchedulerExamples { @Autowired private ThreadPoolTaskScheduler taskScheduler; - + @Autowired private CronTrigger cronTrigger; - + @Autowired private PeriodicTrigger periodicTrigger; - + @PostConstruct - public void scheduleRunnableWithCronTrigger(){ + public void scheduleRunnableWithCronTrigger() { taskScheduler.schedule(new RunnableTask("Current Date"), new Date()); taskScheduler.scheduleWithFixedDelay(new RunnableTask("Fixed 1 second Delay"), 1000); - taskScheduler.scheduleWithFixedDelay(new RunnableTask("Current Date Fixed 1 second Delay"),new Date() , 1000); - taskScheduler.scheduleAtFixedRate(new RunnableTask("Fixed Rate of 2 seconds"),new Date(), 2000); + taskScheduler.scheduleWithFixedDelay(new RunnableTask("Current Date Fixed 1 second Delay"), new Date(), 1000); + taskScheduler.scheduleAtFixedRate(new RunnableTask("Fixed Rate of 2 seconds"), new Date(), 2000); taskScheduler.scheduleAtFixedRate(new RunnableTask("Fixed Rate of 2 seconds"), 2000); taskScheduler.schedule(new RunnableTask("Cron Trigger"), cronTrigger); taskScheduler.schedule(new RunnableTask("Periodic Trigger"), periodicTrigger); } - - class RunnableTask implements Runnable{ + + class RunnableTask implements Runnable { private String message; - - public RunnableTask(String message){ + + public RunnableTask(String message) { this.message = message; } + @Override public void run() { - System.out.println("Runnable Task with "+message+" on thread "+Thread.currentThread().getName()); + System.out.println("Runnable Task with " + message + " on thread " + Thread.currentThread().getName()); } } } \ No newline at end of file diff --git a/spring-all/src/main/resources/log4j2.properties b/spring-all/src/main/resources/log4j2.properties new file mode 100644 index 0000000000..ed45bfa7a4 --- /dev/null +++ b/spring-all/src/main/resources/log4j2.properties @@ -0,0 +1,11 @@ +rootLogger.level=info +rootLogger.appenderRefs = stdout +rootLogger.appenderRef.stdout.ref = STDOUT + +appenders=console + +appender.console.type = Console +appender.console.name = STDOUT +appender.console.layout.type = PatternLayout +appender.console.layout.pattern = %p %d{yyyy-MM-dd} [%t] %c{1} - %msg%n + \ No newline at end of file diff --git a/spring-all/src/test/java/org/baeldung/bean/injection/ConstructorBasedBeanInjectionWithJavaConfigTest.java b/spring-all/src/test/java/org/baeldung/bean/injection/ConstructorBasedBeanInjectionWithJavaConfigIntegrationTest.java similarity index 80% rename from spring-all/src/test/java/org/baeldung/bean/injection/ConstructorBasedBeanInjectionWithJavaConfigTest.java rename to spring-all/src/test/java/org/baeldung/bean/injection/ConstructorBasedBeanInjectionWithJavaConfigIntegrationTest.java index 68f8fc13d9..447a09d69e 100644 --- a/spring-all/src/test/java/org/baeldung/bean/injection/ConstructorBasedBeanInjectionWithJavaConfigTest.java +++ b/spring-all/src/test/java/org/baeldung/bean/injection/ConstructorBasedBeanInjectionWithJavaConfigIntegrationTest.java @@ -5,19 +5,17 @@ import org.junit.Assert; import org.junit.Test; import org.springframework.context.annotation.AnnotationConfigApplicationContext; -public class ConstructorBasedBeanInjectionWithJavaConfigTest { +public class ConstructorBasedBeanInjectionWithJavaConfigIntegrationTest { private static final String HELM_NAME = "HelmBrand"; @Test public void givenJavaConfigFile_whenUsingConstructorBasedBeanInjection_thenCorrectHelmName() { - AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(); ctx.register(ConstructorBasedShipConfig.class); ctx.refresh(); Ship ship = ctx.getBean(Ship.class); - Assert.assertEquals(HELM_NAME, ship.getHelm() - .getBrandOfHelm()); + Assert.assertEquals(HELM_NAME, ship.getHelm().getBrandOfHelm()); } } diff --git a/spring-all/src/test/java/org/baeldung/bean/injection/ConstructorBasedBeanInjectionWithXMLConfigTest.java b/spring-all/src/test/java/org/baeldung/bean/injection/ConstructorBasedBeanInjectionWithXMLConfigIntegrationTest.java similarity index 87% rename from spring-all/src/test/java/org/baeldung/bean/injection/ConstructorBasedBeanInjectionWithXMLConfigTest.java rename to spring-all/src/test/java/org/baeldung/bean/injection/ConstructorBasedBeanInjectionWithXMLConfigIntegrationTest.java index e69de124b2..9f6011d851 100644 --- a/spring-all/src/test/java/org/baeldung/bean/injection/ConstructorBasedBeanInjectionWithXMLConfigTest.java +++ b/spring-all/src/test/java/org/baeldung/bean/injection/ConstructorBasedBeanInjectionWithXMLConfigIntegrationTest.java @@ -5,7 +5,7 @@ import org.junit.Test; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -public class ConstructorBasedBeanInjectionWithXMLConfigTest { +public class ConstructorBasedBeanInjectionWithXMLConfigIntegrationTest { private static final String HELM_NAME = "HelmBrand"; @@ -14,7 +14,6 @@ public class ConstructorBasedBeanInjectionWithXMLConfigTest { final ApplicationContext applicationContext = new ClassPathXmlApplicationContext("beanInjection-constructor.xml"); final Ship shipConstructorBean = (Ship) applicationContext.getBean("ship"); - Assert.assertEquals(HELM_NAME, shipConstructorBean.getHelm() - .getBrandOfHelm()); + Assert.assertEquals(HELM_NAME, shipConstructorBean.getHelm().getBrandOfHelm()); } } diff --git a/spring-all/src/test/java/org/baeldung/bean/injection/SetterBasedBeanInjectionWithJavaConfigTest.java b/spring-all/src/test/java/org/baeldung/bean/injection/SetterBasedBeanInjectionWithJavaConfigIntegrationTest.java similarity index 80% rename from spring-all/src/test/java/org/baeldung/bean/injection/SetterBasedBeanInjectionWithJavaConfigTest.java rename to spring-all/src/test/java/org/baeldung/bean/injection/SetterBasedBeanInjectionWithJavaConfigIntegrationTest.java index 8705995acd..1c15775093 100644 --- a/spring-all/src/test/java/org/baeldung/bean/injection/SetterBasedBeanInjectionWithJavaConfigTest.java +++ b/spring-all/src/test/java/org/baeldung/bean/injection/SetterBasedBeanInjectionWithJavaConfigIntegrationTest.java @@ -5,7 +5,7 @@ import org.junit.Assert; import org.junit.Test; import org.springframework.context.annotation.AnnotationConfigApplicationContext; -public class SetterBasedBeanInjectionWithJavaConfigTest { +public class SetterBasedBeanInjectionWithJavaConfigIntegrationTest { private static final String HELM_NAME = "HelmBrand"; @@ -18,7 +18,6 @@ public class SetterBasedBeanInjectionWithJavaConfigTest { Ship ship = ctx.getBean(Ship.class); - Assert.assertEquals(HELM_NAME, ship.getHelm() - .getBrandOfHelm()); + Assert.assertEquals(HELM_NAME, ship.getHelm().getBrandOfHelm()); } } diff --git a/spring-all/src/test/java/org/baeldung/bean/injection/SetterBasedBeanInjectionWithXMLConfigTest.java b/spring-all/src/test/java/org/baeldung/bean/injection/SetterBasedBeanInjectionWithXMLConfigIntegrationTest.java similarity index 79% rename from spring-all/src/test/java/org/baeldung/bean/injection/SetterBasedBeanInjectionWithXMLConfigTest.java rename to spring-all/src/test/java/org/baeldung/bean/injection/SetterBasedBeanInjectionWithXMLConfigIntegrationTest.java index 1958761d78..bc17a08383 100644 --- a/spring-all/src/test/java/org/baeldung/bean/injection/SetterBasedBeanInjectionWithXMLConfigTest.java +++ b/spring-all/src/test/java/org/baeldung/bean/injection/SetterBasedBeanInjectionWithXMLConfigIntegrationTest.java @@ -5,7 +5,7 @@ import org.junit.Test; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -public class SetterBasedBeanInjectionWithXMLConfigTest { +public class SetterBasedBeanInjectionWithXMLConfigIntegrationTest { private static final String HELM_NAME = "HelmBrand"; @@ -14,7 +14,6 @@ public class SetterBasedBeanInjectionWithXMLConfigTest { final ApplicationContext applicationContext = new ClassPathXmlApplicationContext("beanInjection-setter.xml"); final Ship shipSetterBean = (Ship) applicationContext.getBean("ship"); - Assert.assertEquals(HELM_NAME, shipSetterBean.getHelm() - .getBrandOfHelm()); + Assert.assertEquals(HELM_NAME, shipSetterBean.getHelm().getBrandOfHelm()); } } diff --git a/spring-all/src/test/java/org/baeldung/customscope/TenantScopeTest.java b/spring-all/src/test/java/org/baeldung/customscope/TenantScopeIntegrationTest.java similarity index 92% rename from spring-all/src/test/java/org/baeldung/customscope/TenantScopeTest.java rename to spring-all/src/test/java/org/baeldung/customscope/TenantScopeIntegrationTest.java index 641e57bffd..e873ac5065 100644 --- a/spring-all/src/test/java/org/baeldung/customscope/TenantScopeTest.java +++ b/spring-all/src/test/java/org/baeldung/customscope/TenantScopeIntegrationTest.java @@ -11,22 +11,22 @@ import org.junit.Test; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.context.annotation.AnnotationConfigApplicationContext; -public class TenantScopeTest { +public class TenantScopeIntegrationTest { @Test public final void whenRegisterScopeAndBeans_thenContextContainsFooAndBar() { AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(); - try{ + try { ctx.register(TenantScopeConfig.class); ctx.register(TenantBeansConfig.class); ctx.refresh(); - + TenantBean foo = (TenantBean) ctx.getBean("foo", TenantBean.class); foo.sayHello(); TenantBean bar = (TenantBean) ctx.getBean("bar", TenantBean.class); bar.sayHello(); Map foos = ctx.getBeansOfType(TenantBean.class); - + assertThat(foo, not(equalTo(bar))); assertThat(foos.size(), equalTo(2)); assertTrue(foos.containsValue(foo)); @@ -34,40 +34,38 @@ public class TenantScopeTest { BeanDefinition fooDefinition = ctx.getBeanDefinition("foo"); BeanDefinition barDefinition = ctx.getBeanDefinition("bar"); - + assertThat(fooDefinition.getScope(), equalTo("tenant")); assertThat(barDefinition.getScope(), equalTo("tenant")); - } - finally { + } finally { ctx.close(); } } - + @Test public final void whenComponentScan_thenContextContainsFooAndBar() { AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(); - try{ + try { ctx.scan("org.baeldung.customscope"); ctx.refresh(); - + TenantBean foo = (TenantBean) ctx.getBean("foo", TenantBean.class); foo.sayHello(); TenantBean bar = (TenantBean) ctx.getBean("bar", TenantBean.class); bar.sayHello(); Map foos = ctx.getBeansOfType(TenantBean.class); - + assertThat(foo, not(equalTo(bar))); assertThat(foos.size(), equalTo(2)); assertTrue(foos.containsValue(foo)); assertTrue(foos.containsValue(bar)); - + BeanDefinition fooDefinition = ctx.getBeanDefinition("foo"); BeanDefinition barDefinition = ctx.getBeanDefinition("bar"); - + assertThat(fooDefinition.getScope(), equalTo("tenant")); assertThat(barDefinition.getScope(), equalTo("tenant")); - } - finally { + } finally { ctx.close(); } } diff --git a/spring-all/src/test/java/org/baeldung/ehcache/SquareCalculatorTest.java b/spring-all/src/test/java/org/baeldung/ehcache/SquareCalculatorUnitTest.java similarity index 68% rename from spring-all/src/test/java/org/baeldung/ehcache/SquareCalculatorTest.java rename to spring-all/src/test/java/org/baeldung/ehcache/SquareCalculatorUnitTest.java index ab7aebf7a1..96265c11f5 100644 --- a/spring-all/src/test/java/org/baeldung/ehcache/SquareCalculatorTest.java +++ b/spring-all/src/test/java/org/baeldung/ehcache/SquareCalculatorUnitTest.java @@ -8,7 +8,7 @@ import org.junit.Test; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -public class SquareCalculatorTest { +public class SquareCalculatorUnitTest { private SquaredCalculator squaredCalculator = new SquaredCalculator(); private CacheHelper cacheHelper = new CacheHelper(); @@ -21,8 +21,7 @@ public class SquareCalculatorTest { public void whenCalculatingSquareValueOnce_thenCacheDontHaveValues() { for (int i = 10; i < 15; i++) { assertFalse(cacheHelper.getSquareNumberCache().containsKey(i)); - System.out.println("Square value of " + i + " is: " - + squaredCalculator.getSquareValueOfNumber(i) + "\n"); + System.out.println("Square value of " + i + " is: " + squaredCalculator.getSquareValueOfNumber(i) + "\n"); } } @@ -30,14 +29,12 @@ public class SquareCalculatorTest { public void whenCalculatingSquareValueAgain_thenCacheHasAllValues() { for (int i = 10; i < 15; i++) { assertFalse(cacheHelper.getSquareNumberCache().containsKey(i)); - System.out.println("Square value of " + i + " is: " - + squaredCalculator.getSquareValueOfNumber(i) + "\n"); + System.out.println("Square value of " + i + " is: " + squaredCalculator.getSquareValueOfNumber(i) + "\n"); } for (int i = 10; i < 15; i++) { assertTrue(cacheHelper.getSquareNumberCache().containsKey(i)); - System.out.println("Square value of " + i + " is: " - + squaredCalculator.getSquareValueOfNumber(i) + "\n"); + System.out.println("Square value of " + i + " is: " + squaredCalculator.getSquareValueOfNumber(i) + "\n"); } } } diff --git a/spring-all/src/test/java/org/baeldung/profiles/SpringProfilesWithXMLTest.java b/spring-all/src/test/java/org/baeldung/profiles/SpringProfilesWithXMLIntegrationTest.java similarity index 96% rename from spring-all/src/test/java/org/baeldung/profiles/SpringProfilesWithXMLTest.java rename to spring-all/src/test/java/org/baeldung/profiles/SpringProfilesWithXMLIntegrationTest.java index 15c9265a13..2b46a50588 100644 --- a/spring-all/src/test/java/org/baeldung/profiles/SpringProfilesWithXMLTest.java +++ b/spring-all/src/test/java/org/baeldung/profiles/SpringProfilesWithXMLIntegrationTest.java @@ -5,7 +5,7 @@ import org.junit.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.core.env.ConfigurableEnvironment; -public class SpringProfilesWithXMLTest { +public class SpringProfilesWithXMLIntegrationTest { private ClassPathXmlApplicationContext classPathXmlApplicationContext; diff --git a/spring-all/src/test/java/org/baeldung/spring43/composedmapping/ComposedMappingConfiguration.java b/spring-all/src/test/java/org/baeldung/spring43/composedmapping/ComposedMappingConfiguration.java index 46bf3d8847..eddd56a11b 100644 --- a/spring-all/src/test/java/org/baeldung/spring43/composedmapping/ComposedMappingConfiguration.java +++ b/spring-all/src/test/java/org/baeldung/spring43/composedmapping/ComposedMappingConfiguration.java @@ -9,6 +9,10 @@ import org.springframework.context.annotation.Configuration; import org.springframework.web.servlet.ViewResolver; import org.springframework.web.servlet.config.annotation.EnableWebMvc; import org.springframework.web.servlet.view.InternalResourceViewResolver; +import org.springframework.beans.factory.InjectionPoint; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.springframework.context.annotation.Scope; import static org.easymock.EasyMock.*; @@ -33,4 +37,10 @@ public class ComposedMappingConfiguration { return book; } + @Bean + @Scope("prototype") + public Logger logger(InjectionPoint injectionPoint) { + return LogManager.getLogger(injectionPoint.getField().getDeclaringClass()); + } + } diff --git a/spring-all/src/test/java/org/baeldung/taskscheduler/ThreadPoolTaskSchedulerIntegrationTest.java b/spring-all/src/test/java/org/baeldung/taskscheduler/ThreadPoolTaskSchedulerIntegrationTest.java index d95857d384..94c58cb17e 100644 --- a/spring-all/src/test/java/org/baeldung/taskscheduler/ThreadPoolTaskSchedulerIntegrationTest.java +++ b/spring-all/src/test/java/org/baeldung/taskscheduler/ThreadPoolTaskSchedulerIntegrationTest.java @@ -9,7 +9,7 @@ import org.springframework.test.context.support.AnnotationConfigContextLoader; @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = { ThreadPoolTaskSchedulerConfig.class }, loader = AnnotationConfigContextLoader.class) public class ThreadPoolTaskSchedulerIntegrationTest { - + @Test public void testThreadPoolTaskSchedulerAnnotation() throws InterruptedException { Thread.sleep(2550); diff --git a/spring-amqp-simple/pom.xml b/spring-amqp-simple/pom.xml index 7ff26376e4..0cf4ad0e47 100644 --- a/spring-amqp-simple/pom.xml +++ b/spring-amqp-simple/pom.xml @@ -1,13 +1,13 @@ - + 4.0.0 - org.springframework.boot - spring-boot-starter-parent - 1.5.2.RELEASE + parent-boot-5 + com.baeldung + 0.0.1-SNAPSHOT + ../parent-boot-5 com.baeldung @@ -15,10 +15,6 @@ 1.0.0-SNAPSHOT Spring AMQP Simple App - - 1.8 - - org.springframework.boot @@ -28,29 +24,6 @@ org.springframework.boot spring-boot-starter-web - - org.springframework.boot - spring-boot-starter-test - test - - - - - org.springframework.boot - spring-boot-maven-plugin - - - org.apache.maven.plugins - maven-surefire-plugin - - - **/*IntegrationTest.java - **/*LiveTest.java - - - - - \ No newline at end of file diff --git a/spring-amqp/pom.xml b/spring-amqp/pom.xml index c9305b2ec8..37a1d9e394 100755 --- a/spring-amqp/pom.xml +++ b/spring-amqp/pom.xml @@ -1,40 +1,40 @@ - 4.0.0 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 - com.baeldung - springamqp - 0.1-SNAPSHOT - jar + com.baeldung + springamqp + 0.1-SNAPSHOT + jar - springamqp - Introduction to Spring-AMQP + springamqp + Introduction to Spring-AMQP - - com.baeldung - parent-modules - 1.0.0-SNAPSHOT - - - - UTF-8 - + + com.baeldung + parent-modules + 1.0.0-SNAPSHOT + - - - org.springframework.amqp - spring-rabbit - 1.6.6.RELEASE - - - commons-logging - commons-logging - - - - + + UTF-8 + - - springamqp - + + + org.springframework.amqp + spring-rabbit + 1.6.6.RELEASE + + + commons-logging + commons-logging + + + + + + + springamqp + diff --git a/spring-aop/pom.xml b/spring-aop/pom.xml index 90e892b311..0e8dbe46ce 100644 --- a/spring-aop/pom.xml +++ b/spring-aop/pom.xml @@ -1,5 +1,5 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 com.baeldung spring-aop @@ -8,52 +8,18 @@ spring-aop - org.springframework.boot - spring-boot-starter-parent - 1.5.2.RELEASE + parent-boot-5 + com.baeldung + 0.0.1-SNAPSHOT + ../parent-boot-5 - org.springframework.boot spring-boot-starter-aop - - - org.springframework.boot - spring-boot-starter-test - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.8 - 1.8 - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - **/*IntegrationTest.java - **/*LiveTest.java - - - - - diff --git a/spring-aop/src/test/java/org/baeldung/aspectj/AccountTest.java b/spring-aop/src/test/java/org/baeldung/aspectj/AccountUnitTest.java similarity index 94% rename from spring-aop/src/test/java/org/baeldung/aspectj/AccountTest.java rename to spring-aop/src/test/java/org/baeldung/aspectj/AccountUnitTest.java index f118dad034..3d5384a7f7 100644 --- a/spring-aop/src/test/java/org/baeldung/aspectj/AccountTest.java +++ b/spring-aop/src/test/java/org/baeldung/aspectj/AccountUnitTest.java @@ -6,7 +6,7 @@ import org.junit.Test; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -public class AccountTest { +public class AccountUnitTest { private Account account; @Before diff --git a/spring-apache-camel/pom.xml b/spring-apache-camel/pom.xml index 7934d6af7c..df907a34de 100644 --- a/spring-apache-camel/pom.xml +++ b/spring-apache-camel/pom.xml @@ -1,63 +1,63 @@ - 4.0.0 - org.apache.camel - spring-apache-camel - jar - 1.0-SNAPSHOT - spring-apache-camel - http://maven.apache.org + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + 4.0.0 + org.apache.camel + spring-apache-camel + jar + 1.0-SNAPSHOT + spring-apache-camel + http://maven.apache.org - - com.baeldung - parent-modules - 1.0.0-SNAPSHOT - - - - 2.18.1 - 4.3.4.RELEASE - 1.8 - + + com.baeldung + parent-modules + 1.0.0-SNAPSHOT + - + + 2.18.1 + 4.3.4.RELEASE + 1.8 + - - org.apache.camel - camel-core - ${env.camel.version} - + - - org.apache.camel - camel-spring - ${env.camel.version} - - - commons-logging - commons-logging - - - + + org.apache.camel + camel-core + ${env.camel.version} + - - org.apache.camel - camel-stream - ${env.camel.version} - + + org.apache.camel + camel-spring + ${env.camel.version} + + + commons-logging + commons-logging + + + - - org.springframework - spring-context - ${env.spring.version} - - - org.apache.camel - camel-spring-javaconfig - ${env.camel.version} - + + org.apache.camel + camel-stream + ${env.camel.version} + - + + org.springframework + spring-context + ${env.spring.version} + + + org.apache.camel + camel-spring-javaconfig + ${env.camel.version} + + + diff --git a/spring-batch/pom.xml b/spring-batch/pom.xml index 3a1463b8ee..f372ebd724 100644 --- a/spring-batch/pom.xml +++ b/spring-batch/pom.xml @@ -1,4 +1,5 @@ - + 4.0.0 com.baeldung @@ -13,8 +14,8 @@ com.baeldung parent-modules 1.0.0-SNAPSHOT - - + + UTF-8 4.3.4.RELEASE @@ -38,7 +39,7 @@ commons-logging commons-logging - + org.springframework diff --git a/spring-boot-custom-starter/greeter-spring-boot-sample-app/pom.xml b/spring-boot-custom-starter/greeter-spring-boot-sample-app/pom.xml index bb1d35cfaa..e90e6ca280 100644 --- a/spring-boot-custom-starter/greeter-spring-boot-sample-app/pom.xml +++ b/spring-boot-custom-starter/greeter-spring-boot-sample-app/pom.xml @@ -7,15 +7,13 @@ 0.0.1-SNAPSHOT - org.springframework.boot - spring-boot-starter-parent - 1.5.2.RELEASE - + parent-boot-5 + com.baeldung + 0.0.1-SNAPSHOT + ../../parent-boot-5 - UTF-8 - 1.8 0.0.1-SNAPSHOT @@ -26,12 +24,6 @@ greeter-spring-boot-starter ${greeter-starter.version} - - - org.springframework.boot - spring-boot-starter-test - test - diff --git a/spring-boot-custom-starter/greeter-spring-boot-sample-app/src/test/java/com/baeldung/greeter/sample/GreeterSampleApplicationTest.java b/spring-boot-custom-starter/greeter-spring-boot-sample-app/src/test/java/com/baeldung/greeter/sample/GreeterSampleApplicationIntegrationTest.java similarity index 96% rename from spring-boot-custom-starter/greeter-spring-boot-sample-app/src/test/java/com/baeldung/greeter/sample/GreeterSampleApplicationTest.java rename to spring-boot-custom-starter/greeter-spring-boot-sample-app/src/test/java/com/baeldung/greeter/sample/GreeterSampleApplicationIntegrationTest.java index bdb8fd0112..a4816cf319 100644 --- a/spring-boot-custom-starter/greeter-spring-boot-sample-app/src/test/java/com/baeldung/greeter/sample/GreeterSampleApplicationTest.java +++ b/spring-boot-custom-starter/greeter-spring-boot-sample-app/src/test/java/com/baeldung/greeter/sample/GreeterSampleApplicationIntegrationTest.java @@ -14,7 +14,7 @@ import com.baeldung.greeter.Greeter; @RunWith(SpringJUnit4ClassRunner.class) @SpringBootTest(classes = GreeterSampleApplication.class) -public class GreeterSampleApplicationTest { +public class GreeterSampleApplicationIntegrationTest { @Autowired private Greeter greeter; diff --git a/spring-boot-custom-starter/greeter/pom.xml b/spring-boot-custom-starter/greeter/pom.xml index b0e37a9ed9..e2048bf5c7 100644 --- a/spring-boot-custom-starter/greeter/pom.xml +++ b/spring-boot-custom-starter/greeter/pom.xml @@ -6,33 +6,4 @@ greeter 0.0.1-SNAPSHOT - - UTF-8 - - - - - - junit - junit - 4.12 - test - - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.5.1 - - 1.8 - 1.8 - - - - - \ No newline at end of file diff --git a/spring-boot-custom-starter/greeter/src/test/java/com/baeldung/greeter/GreeterTest.java b/spring-boot-custom-starter/greeter/src/test/java/com/baeldung/greeter/GreeterIntegrationTest.java similarity index 98% rename from spring-boot-custom-starter/greeter/src/test/java/com/baeldung/greeter/GreeterTest.java rename to spring-boot-custom-starter/greeter/src/test/java/com/baeldung/greeter/GreeterIntegrationTest.java index 834f1447bd..787f795480 100644 --- a/spring-boot-custom-starter/greeter/src/test/java/com/baeldung/greeter/GreeterTest.java +++ b/spring-boot-custom-starter/greeter/src/test/java/com/baeldung/greeter/GreeterIntegrationTest.java @@ -8,7 +8,7 @@ import java.time.LocalDateTime; import org.junit.BeforeClass; import org.junit.Test; -public class GreeterTest { +public class GreeterIntegrationTest { private static GreetingConfig greetingConfig; diff --git a/spring-boot/pom.xml b/spring-boot/pom.xml index 1c34dfa7ca..691137e495 100644 --- a/spring-boot/pom.xml +++ b/spring-boot/pom.xml @@ -1,5 +1,5 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 com.baeldung spring-boot @@ -8,12 +8,11 @@ spring-boot This is simple boot application for Spring boot actuator test - - org.springframework.boot - spring-boot-starter-parent - 1.5.2.RELEASE - + parent-boot-5 + com.baeldung + 0.0.1-SNAPSHOT + ../parent-boot-5 @@ -70,12 +69,6 @@ ${h2.version} - - org.springframework.boot - spring-boot-starter-test - test - - org.springframework.boot spring-boot-starter @@ -107,7 +100,7 @@ ${jquery.version} - + com.google.guava guava 18.0 @@ -119,7 +112,7 @@ ${tomee-servlet-api.version} provided - + mysql mysql-connector-java @@ -131,28 +124,28 @@ spring-websocket ${spring.version} - + org.springframework spring-messaging ${spring.version} - - - + + + org.togglz togglz-spring-boot-starter ${togglz.version} - - + + org.togglz togglz-spring-security ${togglz.version} - + - org.apache.activemq - artemis-server + org.apache.activemq + artemis-server @@ -167,20 +160,6 @@ - - org.springframework.boot - spring-boot-maven-plugin - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.8 - 1.8 - - - org.apache.maven.plugins maven-war-plugin @@ -192,18 +171,6 @@ ${git-commit-id-plugin.version} - - org.apache.maven.plugins - maven-surefire-plugin - - - **/*IntegrationTest.java - **/*LiveTest.java - **/AutoconfigurationTest.java - - - - @@ -235,7 +202,7 @@ - json + json @@ -268,7 +235,7 @@ - json + json @@ -281,8 +248,6 @@ org.baeldung.boot.DemoApplication - UTF-8 - 1.8 4.3.4.RELEASE 2.2.1 3.1.1 diff --git a/spring-boot/src/test/java/com/baeldung/autoconfiguration/AutoconfigurationTest.java b/spring-boot/src/test/java/com/baeldung/autoconfiguration/AutoconfigurationIntegrationTest.java similarity index 95% rename from spring-boot/src/test/java/com/baeldung/autoconfiguration/AutoconfigurationTest.java rename to spring-boot/src/test/java/com/baeldung/autoconfiguration/AutoconfigurationIntegrationTest.java index 608d0d10bc..dda9d69edd 100644 --- a/spring-boot/src/test/java/com/baeldung/autoconfiguration/AutoconfigurationTest.java +++ b/spring-boot/src/test/java/com/baeldung/autoconfiguration/AutoconfigurationIntegrationTest.java @@ -14,7 +14,7 @@ import com.baeldung.autoconfiguration.example.MyUserRepository; @RunWith(SpringJUnit4ClassRunner.class) @SpringBootTest(classes = AutoconfigurationApplication.class) @EnableJpaRepositories(basePackages = { "com.baeldung.autoconfiguration.example" }) -public class AutoconfigurationTest { +public class AutoconfigurationIntegrationTest { @Autowired private MyUserRepository userRepository; diff --git a/spring-custom-aop/spring-custom-aop/src/test/java/com/baeldung/utils/UtilsControllerTest.java b/spring-boot/src/test/java/com/baeldung/utils/UtilsControllerIntegrationTest.java similarity index 95% rename from spring-custom-aop/spring-custom-aop/src/test/java/com/baeldung/utils/UtilsControllerTest.java rename to spring-boot/src/test/java/com/baeldung/utils/UtilsControllerIntegrationTest.java index 7aed45dbb0..829c0a6ac4 100644 --- a/spring-custom-aop/spring-custom-aop/src/test/java/com/baeldung/utils/UtilsControllerTest.java +++ b/spring-boot/src/test/java/com/baeldung/utils/UtilsControllerIntegrationTest.java @@ -13,7 +13,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. import com.baeldung.utils.controller.UtilsController; -public class UtilsControllerTest { +public class UtilsControllerIntegrationTest { @InjectMocks private UtilsController utilsController; diff --git a/spring-boot/src/test/java/com/baeldung/websocket/client/MyStompSessionHandlerTest.java b/spring-boot/src/test/java/com/baeldung/websocket/client/MyStompSessionHandlerIntegrationTest.java similarity index 94% rename from spring-boot/src/test/java/com/baeldung/websocket/client/MyStompSessionHandlerTest.java rename to spring-boot/src/test/java/com/baeldung/websocket/client/MyStompSessionHandlerIntegrationTest.java index b61cd6d61d..f30c8ee4e7 100644 --- a/spring-boot/src/test/java/com/baeldung/websocket/client/MyStompSessionHandlerTest.java +++ b/spring-boot/src/test/java/com/baeldung/websocket/client/MyStompSessionHandlerIntegrationTest.java @@ -11,7 +11,7 @@ import org.springframework.messaging.simp.stomp.StompSession; * @author Kalyan * */ -public class MyStompSessionHandlerTest { +public class MyStompSessionHandlerIntegrationTest { @Test public void givenValidSession_whenConnected_SendsMessage() { diff --git a/spring-cloud-data-flow/batch-job/pom.xml b/spring-cloud-data-flow/batch-job/pom.xml index 5e519e9a35..9a40c80e37 100644 --- a/spring-cloud-data-flow/batch-job/pom.xml +++ b/spring-cloud-data-flow/batch-job/pom.xml @@ -1,84 +1,56 @@ - 4.0.0 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 - org.baeldung.spring.cloud - batch-job - 0.0.1-SNAPSHOT - jar + org.baeldung.spring.cloud + batch-job + 0.0.1-SNAPSHOT + jar - batch-job - Demo project for Spring Boot + batch-job + Demo project for Spring Boot - - org.springframework.boot - spring-boot-starter-parent - 1.4.4.RELEASE - - + + parent-boot-4 + com.baeldung + 0.0.1-SNAPSHOT + ../../parent-boot-4 + - - UTF-8 - UTF-8 - 1.8 - 1.0.3.RELEASE - + + 1.0.3.RELEASE + - - - org.springframework.cloud - spring-cloud-task-starter - ${spring-cloud-task-starter.version} - - - - org.springframework.boot - spring-boot-starter-batch - - - - com.h2database - h2 - runtime - - - - org.springframework.boot - spring-boot-starter-test - test - - - - - - org.springframework.cloud - spring-cloud-dependencies - Brixton.SR5 - pom - import - - - + + org.springframework.cloud + spring-cloud-task-starter + ${spring-cloud-task-starter.version} + - - - - org.springframework.boot - spring-boot-maven-plugin - - - org.apache.maven.plugins - maven-surefire-plugin - - - **/*IntegrationTest.java - **/*LiveTest.java - - - - - + + org.springframework.boot + spring-boot-starter-batch + + + + com.h2database + h2 + runtime + + + + + + + org.springframework.cloud + spring-cloud-dependencies + Brixton.SR5 + pom + import + + + diff --git a/spring-cloud-data-flow/data-flow-server/pom.xml b/spring-cloud-data-flow/data-flow-server/pom.xml index bd3b4ab150..ec0057191b 100644 --- a/spring-cloud-data-flow/data-flow-server/pom.xml +++ b/spring-cloud-data-flow/data-flow-server/pom.xml @@ -12,16 +12,13 @@ Demo project for Spring Boot - org.springframework.boot - spring-boot-starter-parent - 1.4.4.RELEASE - + parent-boot-4 + com.baeldung + 0.0.1-SNAPSHOT + ../../parent-boot-4 - UTF-8 - UTF-8 - 1.8 1.1.0.RELEASE Brixton.SR7 @@ -31,12 +28,6 @@ org.springframework.cloud spring-cloud-starter-dataflow-server-local - - - org.springframework.boot - spring-boot-starter-test - test - @@ -58,23 +49,4 @@ - - - - org.springframework.boot - spring-boot-maven-plugin - - - org.apache.maven.plugins - maven-surefire-plugin - - - **/*IntegrationTest.java - **/*LiveTest.java - - - - - - diff --git a/spring-cloud-data-flow/data-flow-shell/pom.xml b/spring-cloud-data-flow/data-flow-shell/pom.xml index 350f199d4b..b34c3cefeb 100644 --- a/spring-cloud-data-flow/data-flow-shell/pom.xml +++ b/spring-cloud-data-flow/data-flow-shell/pom.xml @@ -12,16 +12,13 @@ Demo project for Spring Boot - org.springframework.boot - spring-boot-starter-parent - 1.4.4.RELEASE - + parent-boot-4 + com.baeldung + 0.0.1-SNAPSHOT + ../../parent-boot-4 - UTF-8 - UTF-8 - 1.8 Brixton.SR7 1.1.0.RELEASE @@ -31,12 +28,6 @@ org.springframework.cloud spring-cloud-dataflow-shell - - - org.springframework.boot - spring-boot-starter-test - test - @@ -58,25 +49,4 @@ - - - - org.springframework.boot - spring-boot-maven-plugin - - - org.apache.maven.plugins - maven-surefire-plugin - - 3 - true - - **/*IntegrationTest.java - **/*LiveTest.java - - - - - - diff --git a/spring-cloud-data-flow/log-sink/pom.xml b/spring-cloud-data-flow/log-sink/pom.xml index dc21132b9f..b97a72d9c4 100644 --- a/spring-cloud-data-flow/log-sink/pom.xml +++ b/spring-cloud-data-flow/log-sink/pom.xml @@ -1,106 +1,81 @@ - 4.0.0 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 - org.baeldung.spring.cloud - log-sink - 0.0.1-SNAPSHOT - jar + org.baeldung.spring.cloud + log-sink + 0.0.1-SNAPSHOT + jar - log-sink - Demo project for Spring Boot + log-sink + Demo project for Spring Boot - - org.springframework.boot - spring-boot-starter-parent - 1.4.4.RELEASE - - + + parent-boot-4 + com.baeldung + 0.0.1-SNAPSHOT + ../../parent-boot-4 + - - UTF-8 - UTF-8 - 1.8 - Brixton.SR7 - + + Brixton.SR7 + - - - org.springframework.cloud - spring-cloud-starter-stream-rabbit - + + + org.springframework.cloud + spring-cloud-starter-stream-rabbit + + - - org.springframework.boot - spring-boot-starter-test - test - - - - - - - org.springframework.cloud - spring-cloud-dependencies + + + + org.springframework.cloud + spring-cloud-dependencies ${spring-cloud-dependencies.version} - pom - import - - - + pom + import + + + - - - - org.springframework.boot - spring-boot-maven-plugin - - - org.apache.maven.plugins - maven-surefire-plugin - - - **/*IntegrationTest.java - **/*LiveTest.java - - - - - - - - integration - - - - org.apache.maven.plugins - maven-surefire-plugin - - - integration-test - - test - - - - **/*LiveTest.java - - - **/*IntegrationTest.java - - - - - - - json - - - - - - - + + + + integration + + + + org.apache.maven.plugins + maven-surefire-plugin + + + integration-test + + test + + + + **/*LiveTest.java + + + **/*IntegrationTest.java + + + + + + + json + + + + + + + + diff --git a/spring-cloud-data-flow/pom.xml b/spring-cloud-data-flow/pom.xml index d8112c04b5..5f24aa2cbd 100644 --- a/spring-cloud-data-flow/pom.xml +++ b/spring-cloud-data-flow/pom.xml @@ -10,8 +10,8 @@ com.baeldung parent-modules 1.0.0-SNAPSHOT - - + + data-flow-server diff --git a/spring-cloud-data-flow/time-processor/pom.xml b/spring-cloud-data-flow/time-processor/pom.xml index 51a66014e0..9b190e7250 100644 --- a/spring-cloud-data-flow/time-processor/pom.xml +++ b/spring-cloud-data-flow/time-processor/pom.xml @@ -1,73 +1,45 @@ - 4.0.0 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 - org.baeldung.spring.cloud - time-processor - 0.0.1-SNAPSHOT - jar + org.baeldung.spring.cloud + time-processor + 0.0.1-SNAPSHOT + jar - time-processor - Demo project for Spring Boot + time-processor + Demo project for Spring Boot - - org.springframework.boot - spring-boot-starter-parent - 1.4.4.RELEASE - - + + parent-boot-4 + com.baeldung + 0.0.1-SNAPSHOT + ../../parent-boot-4 + - - UTF-8 - UTF-8 - 1.8 - Brixton.SR7 - + + Brixton.SR7 + - - - org.springframework.cloud - spring-cloud-starter-stream-rabbit - - - - org.springframework.boot - spring-boot-starter-test - test - - - - - - org.springframework.cloud - spring-cloud-dependencies - ${spring-cloud-dependencies.version} - pom - import - + + org.springframework.cloud + spring-cloud-starter-stream-rabbit + - - - - - org.springframework.boot - spring-boot-maven-plugin - - - org.apache.maven.plugins - maven-surefire-plugin - - - **/*IntegrationTest.java - **/*LiveTest.java - - - - - + + + + org.springframework.cloud + spring-cloud-dependencies + ${spring-cloud-dependencies.version} + pom + import + + + @@ -103,4 +75,5 @@ + diff --git a/spring-cloud-data-flow/time-source/pom.xml b/spring-cloud-data-flow/time-source/pom.xml index 57933c2833..3112c7ede8 100644 --- a/spring-cloud-data-flow/time-source/pom.xml +++ b/spring-cloud-data-flow/time-source/pom.xml @@ -1,106 +1,79 @@ - 4.0.0 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 - org.baeldung.spring.cloud - time-source - 0.0.1-SNAPSHOT - jar + org.baeldung.spring.cloud + time-source + 0.0.1-SNAPSHOT + jar - time-source - Demo project for Spring Boot + time-source + Demo project for Spring Boot - - org.springframework.boot - spring-boot-starter-parent - 1.4.4.RELEASE - - + + parent-boot-4 + com.baeldung + 0.0.1-SNAPSHOT + ../../parent-boot-4 + - - UTF-8 - UTF-8 - 1.8 - Brixton.SR7 - + + Brixton.SR7 + - - - org.springframework.cloud - spring-cloud-starter-stream-rabbit - - - - org.springframework.boot - spring-boot-starter-test - test - - - - - - org.springframework.cloud - spring-cloud-dependencies - ${spring-cloud-dependencies.version} - pom - import - + + org.springframework.cloud + spring-cloud-starter-stream-rabbit + - - - - - org.springframework.boot - spring-boot-maven-plugin - - - org.apache.maven.plugins - maven-surefire-plugin - - - **/*IntegrationTest.java - **/*LiveTest.java - - - - - + + + + org.springframework.cloud + spring-cloud-dependencies + ${spring-cloud-dependencies.version} + pom + import + + + - - - integration - - - - org.apache.maven.plugins - maven-surefire-plugin - - - integration-test - - test - - - - **/*LiveTest.java - - - **/*IntegrationTest.java - - - - - - - json - - - - - - - + + + integration + + + + org.apache.maven.plugins + maven-surefire-plugin + + + integration-test + + test + + + + **/*LiveTest.java + + + **/*IntegrationTest.java + + + + + + + json + + + + + + + + diff --git a/spring-cloud/pom.xml b/spring-cloud/pom.xml index 79e89a72b3..e36f5265b2 100644 --- a/spring-cloud/pom.xml +++ b/spring-cloud/pom.xml @@ -1,6 +1,7 @@ - + 4.0.0 com.baeldung.spring.cloud diff --git a/spring-cloud/spring-cloud-bootstrap/config/pom.xml b/spring-cloud/spring-cloud-bootstrap/config/pom.xml index 2c8ad65102..77ceedab39 100644 --- a/spring-cloud/spring-cloud-bootstrap/config/pom.xml +++ b/spring-cloud/spring-cloud-bootstrap/config/pom.xml @@ -1,17 +1,16 @@ - + 4.0.0 config 1.0.0-SNAPSHOT - org.springframework.boot - spring-boot-starter-parent - 1.4.4.RELEASE - + parent-boot-4 + com.baeldung + 0.0.1-SNAPSHOT + ../../../parent-boot-4 @@ -23,11 +22,6 @@ org.springframework.cloud spring-cloud-starter-eureka - - org.springframework.boot - spring-boot-starter-test - test - org.springframework.boot spring-boot-starter-security @@ -46,26 +40,7 @@ - - - - org.springframework.boot - spring-boot-maven-plugin - - - org.apache.maven.plugins - maven-compiler-plugin - ${maven-compiler-plugin.version} - - 1.8 - 1.8 - - - - - Brixton.SR7 - 3.6.0 \ No newline at end of file diff --git a/spring-cloud/spring-cloud-bootstrap/discovery/pom.xml b/spring-cloud/spring-cloud-bootstrap/discovery/pom.xml index 40a186350c..3156e0f3e6 100644 --- a/spring-cloud/spring-cloud-bootstrap/discovery/pom.xml +++ b/spring-cloud/spring-cloud-bootstrap/discovery/pom.xml @@ -1,17 +1,16 @@ - + 4.0.0 discovery 1.0.0-SNAPSHOT - org.springframework.boot - spring-boot-starter-parent - 1.4.4.RELEASE - + parent-boot-4 + com.baeldung + 0.0.1-SNAPSHOT + ../../../parent-boot-4 @@ -23,11 +22,6 @@ org.springframework.cloud spring-cloud-starter-eureka-server - - org.springframework.boot - spring-boot-starter-test - test - org.springframework.boot spring-boot-starter-security @@ -55,26 +49,7 @@ - - - - org.springframework.boot - spring-boot-maven-plugin - - - org.apache.maven.plugins - maven-compiler-plugin - ${maven-compiler-plugin.version} - - 1.8 - 1.8 - - - - - Brixton.SR7 - 3.6.0 \ No newline at end of file diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/pom.xml b/spring-cloud/spring-cloud-bootstrap/gateway/pom.xml index 13ae6b4050..7544a44b7a 100644 --- a/spring-cloud/spring-cloud-bootstrap/gateway/pom.xml +++ b/spring-cloud/spring-cloud-bootstrap/gateway/pom.xml @@ -1,17 +1,16 @@ - + 4.0.0 gateway 1.0.0-SNAPSHOT - org.springframework.boot - spring-boot-starter-parent - 1.4.4.RELEASE - + parent-boot-4 + com.baeldung + 0.0.1-SNAPSHOT + ../../../parent-boot-4 @@ -46,18 +45,6 @@ spring-cloud-starter-zipkin - - org.springframework.boot - spring-boot-starter-test - test - - - - io.rest-assured - rest-assured - test - 3.0.2 - @@ -72,35 +59,7 @@ - - - - org.springframework.boot - spring-boot-maven-plugin - - - org.apache.maven.plugins - maven-compiler-plugin - ${maven-compiler-plugin.version} - - 1.8 - 1.8 - - - - org.apache.maven.plugins - maven-surefire-plugin - - - **/*LiveTest.java - - - - - - Brixton.SR7 - 3.6.0 \ No newline at end of file diff --git a/spring-cloud/spring-cloud-bootstrap/pom.xml b/spring-cloud/spring-cloud-bootstrap/pom.xml index 83879cf7d4..f93c285c9f 100644 --- a/spring-cloud/spring-cloud-bootstrap/pom.xml +++ b/spring-cloud/spring-cloud-bootstrap/pom.xml @@ -1,27 +1,26 @@ - - 4.0.0 + + 4.0.0 - - com.baeldung.spring.cloud - spring-cloud - 1.0.0-SNAPSHOT - + + com.baeldung.spring.cloud + spring-cloud + 1.0.0-SNAPSHOT + - - config - discovery - gateway - svc-book - svc-rating - zipkin - + + config + discovery + gateway + svc-book + svc-rating + zipkin + - spring-cloud-bootstrap - 1.0.0-SNAPSHOT - pom + spring-cloud-bootstrap + 1.0.0-SNAPSHOT + pom \ No newline at end of file diff --git a/spring-cloud/spring-cloud-bootstrap/svc-book/pom.xml b/spring-cloud/spring-cloud-bootstrap/svc-book/pom.xml index cbf7083b83..d35e4f6576 100644 --- a/spring-cloud/spring-cloud-bootstrap/svc-book/pom.xml +++ b/spring-cloud/spring-cloud-bootstrap/svc-book/pom.xml @@ -1,7 +1,6 @@ - + 4.0.0 com.baeldung.spring.cloud @@ -9,10 +8,10 @@ 1.0.0-SNAPSHOT - org.springframework.boot - spring-boot-starter-parent - 1.4.4.RELEASE - + parent-boot-4 + com.baeldung + 0.0.1-SNAPSHOT + ../../../parent-boot-4 @@ -58,11 +57,6 @@ spring-cloud-starter-zipkin - - org.springframework.boot - spring-boot-starter-test - test - @@ -77,25 +71,8 @@ - - - - org.springframework.boot - spring-boot-maven-plugin - - - org.apache.maven.plugins - maven-compiler-plugin - ${maven-compiler-plugin.version} - - 1.8 - 1.8 - - - - Brixton.SR7 - 3.6.0 + \ No newline at end of file diff --git a/spring-cloud/spring-cloud-bootstrap/svc-rating/pom.xml b/spring-cloud/spring-cloud-bootstrap/svc-rating/pom.xml index f02ba88f04..7879031a2a 100644 --- a/spring-cloud/spring-cloud-bootstrap/svc-rating/pom.xml +++ b/spring-cloud/spring-cloud-bootstrap/svc-rating/pom.xml @@ -1,7 +1,6 @@ - + 4.0.0 com.baeldung.spring.cloud @@ -9,10 +8,10 @@ 1.0.0-SNAPSHOT - org.springframework.boot - spring-boot-starter-parent - 1.4.4.RELEASE - + parent-boot-4 + com.baeldung + 0.0.1-SNAPSHOT + ../../../parent-boot-4 @@ -58,11 +57,6 @@ spring-cloud-starter-zipkin - - org.springframework.boot - spring-boot-starter-test - test - @@ -77,25 +71,8 @@ - - - - org.springframework.boot - spring-boot-maven-plugin - - - org.apache.maven.plugins - maven-compiler-plugin - ${maven-compiler-plugin.version} - - 1.8 - 1.8 - - - - Brixton.SR7 - 3.6.0 + \ No newline at end of file diff --git a/spring-cloud/spring-cloud-bootstrap/zipkin/pom.xml b/spring-cloud/spring-cloud-bootstrap/zipkin/pom.xml index c2fd7cd2dc..3b4c984721 100644 --- a/spring-cloud/spring-cloud-bootstrap/zipkin/pom.xml +++ b/spring-cloud/spring-cloud-bootstrap/zipkin/pom.xml @@ -1,17 +1,16 @@ - + 4.0.0 zipkin 1.0.0-SNAPSHOT - org.springframework.boot - spring-boot-starter-parent - 1.4.4.RELEASE - + parent-boot-4 + com.baeldung + 0.0.1-SNAPSHOT + ../../../parent-boot-4 @@ -35,11 +34,6 @@ runtime - - org.springframework.boot - spring-boot-starter-test - test - @@ -54,35 +48,8 @@ - - - - org.springframework.boot - spring-boot-maven-plugin - - - org.apache.maven.plugins - maven-compiler-plugin - ${maven-compiler-plugin.version} - - 1.8 - 1.8 - - - - org.apache.maven.plugins - maven-surefire-plugin - - - **/*LiveTest.java - - - - - - Brixton.SR7 - 3.6.0 + \ No newline at end of file diff --git a/spring-cloud/spring-cloud-config/client/pom.xml b/spring-cloud/spring-cloud-config/client/pom.xml index 24da043515..667040ed3c 100644 --- a/spring-cloud/spring-cloud-config/client/pom.xml +++ b/spring-cloud/spring-cloud-config/client/pom.xml @@ -1,5 +1,6 @@ - 4.0.0 @@ -42,5 +43,5 @@ 1.2.2.RELEASE 1.4.2.RELEASE - + diff --git a/spring-cloud/spring-cloud-config/pom.xml b/spring-cloud/spring-cloud-config/pom.xml index 56ff377956..81693b7e2e 100644 --- a/spring-cloud/spring-cloud-config/pom.xml +++ b/spring-cloud/spring-cloud-config/pom.xml @@ -1,5 +1,6 @@ - 4.0.0 @@ -14,10 +15,10 @@ - org.springframework.boot - spring-boot-starter-parent - 1.4.4.RELEASE - + parent-boot-4 + com.baeldung + 0.0.1-SNAPSHOT + ../../parent-boot-4 @@ -32,28 +33,8 @@ - - - - org.apache.maven.plugins - maven-surefire-plugin - ${maven-surefire-plugin.version} - - - **/*LiveTest.java - - - - - - - - UTF-8 - UTF-8 - 1.8 - 1.4.2.RELEASE - 2.19.1 Brixton.SR7 + diff --git a/spring-cloud/spring-cloud-config/server/pom.xml b/spring-cloud/spring-cloud-config/server/pom.xml index fff6b0f3ee..0157851001 100644 --- a/spring-cloud/spring-cloud-config/server/pom.xml +++ b/spring-cloud/spring-cloud-config/server/pom.xml @@ -1,5 +1,6 @@ - 4.0.0 diff --git a/spring-cloud/spring-cloud-config/server/src/test/java/com/baeldung/spring/cloud/config/server/ConfigServerListTest.java b/spring-cloud/spring-cloud-config/server/src/test/java/com/baeldung/spring/cloud/config/server/ConfigServerListIntegrationTest.java similarity index 91% rename from spring-cloud/spring-cloud-config/server/src/test/java/com/baeldung/spring/cloud/config/server/ConfigServerListTest.java rename to spring-cloud/spring-cloud-config/server/src/test/java/com/baeldung/spring/cloud/config/server/ConfigServerListIntegrationTest.java index 306c120e43..34c08cc815 100644 --- a/spring-cloud/spring-cloud-config/server/src/test/java/com/baeldung/spring/cloud/config/server/ConfigServerListTest.java +++ b/spring-cloud/spring-cloud-config/server/src/test/java/com/baeldung/spring/cloud/config/server/ConfigServerListIntegrationTest.java @@ -11,7 +11,7 @@ import org.springframework.test.context.web.WebAppConfiguration; @SpringApplicationConfiguration(classes = ConfigServer.class) @WebAppConfiguration @Ignore -public class ConfigServerListTest { +public class ConfigServerListIntegrationTest { @Test public void contextLoads() { } diff --git a/spring-cloud/spring-cloud-eureka/pom.xml b/spring-cloud/spring-cloud-eureka/pom.xml index 2c3b4032af..d1d564c9bf 100644 --- a/spring-cloud/spring-cloud-eureka/pom.xml +++ b/spring-cloud/spring-cloud-eureka/pom.xml @@ -1,6 +1,7 @@ - + 4.0.0 com.baeldung.spring.cloud diff --git a/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-client/pom.xml b/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-client/pom.xml index a56c732e40..794a2a72f3 100644 --- a/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-client/pom.xml +++ b/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-client/pom.xml @@ -1,6 +1,7 @@ - + 4.0.0 spring-cloud-eureka-client @@ -59,5 +60,5 @@ Brixton.SR7 1.2.3.RELEASE 1.4.2.RELEASE - + diff --git a/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-feign-client/pom.xml b/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-feign-client/pom.xml index cb3c6fc289..9c43d35b23 100644 --- a/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-feign-client/pom.xml +++ b/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-feign-client/pom.xml @@ -1,6 +1,7 @@ - + 4.0.0 spring-cloud-eureka-feign-client @@ -70,5 +71,5 @@ 1.2.3.RELEASE 1.2.3.RELEASE 1.4.2.RELEASE - + diff --git a/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-server/pom.xml b/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-server/pom.xml index a728712ead..19df5e0e01 100644 --- a/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-server/pom.xml +++ b/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-server/pom.xml @@ -1,6 +1,7 @@ - + 4.0.0 spring-cloud-eureka-server diff --git a/spring-cloud/spring-cloud-hystrix/feign-rest-consumer/pom.xml b/spring-cloud/spring-cloud-hystrix/feign-rest-consumer/pom.xml index 9c8d88ae8e..91ca3ced3f 100644 --- a/spring-cloud/spring-cloud-hystrix/feign-rest-consumer/pom.xml +++ b/spring-cloud/spring-cloud-hystrix/feign-rest-consumer/pom.xml @@ -1,6 +1,7 @@ - + 4.0.0 feign-rest-consumer @@ -83,5 +84,5 @@ 1.2.3.RELEASE 1.2.3.RELEASE 1.4.2.RELEASE - + diff --git a/spring-cloud/spring-cloud-hystrix/pom.xml b/spring-cloud/spring-cloud-hystrix/pom.xml index 67f50e3a91..fe759cd0f1 100644 --- a/spring-cloud/spring-cloud-hystrix/pom.xml +++ b/spring-cloud/spring-cloud-hystrix/pom.xml @@ -1,6 +1,7 @@ - + 4.0.0 com.baeldung.spring.cloud diff --git a/spring-cloud/spring-cloud-hystrix/rest-consumer/pom.xml b/spring-cloud/spring-cloud-hystrix/rest-consumer/pom.xml index 02c009510e..6be3449502 100644 --- a/spring-cloud/spring-cloud-hystrix/rest-consumer/pom.xml +++ b/spring-cloud/spring-cloud-hystrix/rest-consumer/pom.xml @@ -1,6 +1,7 @@ - + 4.0.0 rest-consumer @@ -71,7 +72,7 @@ Brixton.SR7 - 1.2.3.RELEASE + 1.2.3.RELEASE 1.4.2.RELEASE - + diff --git a/spring-cloud/spring-cloud-hystrix/rest-producer/pom.xml b/spring-cloud/spring-cloud-hystrix/rest-producer/pom.xml index 85d5a4a11e..796cb4159b 100644 --- a/spring-cloud/spring-cloud-hystrix/rest-producer/pom.xml +++ b/spring-cloud/spring-cloud-hystrix/rest-producer/pom.xml @@ -1,6 +1,7 @@ - + 4.0.0 rest-producer @@ -37,7 +38,7 @@ - + Brixton.SR7 diff --git a/spring-cloud/spring-cloud-rest/pom.xml b/spring-cloud/spring-cloud-rest/pom.xml index 6c6090b6fd..d0e9999ef6 100644 --- a/spring-cloud/spring-cloud-rest/pom.xml +++ b/spring-cloud/spring-cloud-rest/pom.xml @@ -1,6 +1,7 @@ - + 4.0.0 org.baeldung @@ -16,6 +17,12 @@ spring-cloud-rest + + com.baeldung.spring.cloud + spring-cloud + 1.0.0-SNAPSHOT + + UTF-8 3.6.0 diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-books-api/pom.xml b/spring-cloud/spring-cloud-rest/spring-cloud-rest-books-api/pom.xml index c0555842f4..fb84b33876 100644 --- a/spring-cloud/spring-cloud-rest/spring-cloud-rest-books-api/pom.xml +++ b/spring-cloud/spring-cloud-rest/spring-cloud-rest-books-api/pom.xml @@ -1,111 +1,73 @@ - 4.0.0 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 - org.baeldung - spring-cloud-rest-books-api - 0.0.1-SNAPSHOT - jar + org.baeldung + spring-cloud-rest-books-api + 0.0.1-SNAPSHOT + jar - spring-cloud-rest-books-api - Simple books API + spring-cloud-rest-books-api + Simple books API - - org.springframework.boot - spring-boot-starter-parent - 1.4.3.RELEASE - - + + parent-boot-4 + com.baeldung + 0.0.1-SNAPSHOT + ../../../parent-boot-4 + - - UTF-8 - UTF-8 - 1.8 - 3.0.1 - + + + org.springframework.cloud + spring-cloud-starter-config + + + org.springframework.cloud + spring-cloud-starter-eureka + + + org.springframework.boot + spring-boot-starter-data-jpa + + + com.h2database + h2 + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-data-rest + + + org.springframework.boot + spring-boot-starter-security + + + org.springframework.session + spring-session + + + org.springframework.boot + spring-boot-starter-data-redis + - - - org.springframework.cloud - spring-cloud-starter-config - - - org.springframework.cloud - spring-cloud-starter-eureka - - - org.springframework.boot - spring-boot-starter-data-jpa - - - com.h2database - h2 - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-data-rest - - - org.springframework.boot - spring-boot-starter-security - - - org.springframework.session - spring-session - - - org.springframework.boot - spring-boot-starter-data-redis - - - - org.springframework.boot - spring-boot-starter-test - test - - - io.rest-assured - rest-assured - ${rest-assured.version} - - - - - - - - org.springframework.cloud - spring-cloud-dependencies - Camden.SR4 - pom - import - - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - org.apache.maven.plugins - maven-surefire-plugin - - - **/*IntegrationTest.java - **/*LiveTest.java - - - - - + + + + + org.springframework.cloud + spring-cloud-dependencies + Camden.SR4 + pom + import + + + diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-config-server/pom.xml b/spring-cloud/spring-cloud-rest/spring-cloud-rest-config-server/pom.xml index a1e4af1190..f0a563f16f 100644 --- a/spring-cloud/spring-cloud-rest/spring-cloud-rest-config-server/pom.xml +++ b/spring-cloud/spring-cloud-rest/spring-cloud-rest-config-server/pom.xml @@ -1,81 +1,52 @@ - 4.0.0 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 - org.baeldung - spring-cloud-rest-config-server - 0.0.1-SNAPSHOT - jar + org.baeldung + spring-cloud-rest-config-server + 0.0.1-SNAPSHOT + jar - spring-cloud-rest-config-server - Spring Cloud REST configuration server + spring-cloud-rest-config-server + Spring Cloud REST configuration server - - org.springframework.boot - spring-boot-starter-parent - 1.4.3.RELEASE - - + + parent-boot-4 + com.baeldung + 0.0.1-SNAPSHOT + ../../../parent-boot-4 + - - UTF-8 - UTF-8 - 1.8 - Camden.SR4 - + + Camden.SR4 + - - - org.springframework.cloud - spring-cloud-config-server - - + + + org.springframework.cloud + spring-cloud-config-server + + org.springframework.cloud spring-cloud-starter-eureka - org.springframework.boot - spring-boot-starter-security - - - - org.springframework.boot - spring-boot-starter-test - test - - - - - - - org.springframework.cloud - spring-cloud-dependencies - ${spring-cloud.version} - pom - import - - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - org.apache.maven.plugins - maven-surefire-plugin - - - **/*IntegrationTest.java - **/*LiveTest.java - - - - - + org.springframework.boot + spring-boot-starter-security + + + + + + org.springframework.cloud + spring-cloud-dependencies + ${spring-cloud.version} + pom + import + + + diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-discovery-server/pom.xml b/spring-cloud/spring-cloud-rest/spring-cloud-rest-discovery-server/pom.xml index d9ef26280b..0735808eea 100644 --- a/spring-cloud/spring-cloud-rest/spring-cloud-rest-discovery-server/pom.xml +++ b/spring-cloud/spring-cloud-rest/spring-cloud-rest-discovery-server/pom.xml @@ -1,91 +1,60 @@ - 4.0.0 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 - org.baeldung - spring-cloud-rest-discovery-server - 0.0.1-SNAPSHOT - jar + org.baeldung + spring-cloud-rest-discovery-server + 0.0.1-SNAPSHOT + jar - spring-cloud-rest-discovery-server - Spring Cloud REST server + spring-cloud-rest-discovery-server + Spring Cloud REST server - - org.springframework.boot - spring-boot-starter-parent - 1.4.3.RELEASE - - + + parent-boot-4 + com.baeldung + 0.0.1-SNAPSHOT + ../../../parent-boot-4 + - - UTF-8 - UTF-8 - 1.8 - Camden.SR4 - + + Camden.SR4 + - - - org.springframework.cloud - spring-cloud-starter-config - - - org.springframework.cloud - spring-cloud-starter-eureka-server - - - org.springframework.boot - spring-boot-starter-security - - - org.springframework.session - spring-session - - - org.springframework.boot - spring-boot-starter-data-redis - - - - org.springframework.boot - spring-boot-starter-test - test - - - - - - - org.springframework.cloud - spring-cloud-dependencies - ${spring-cloud.version} - pom - import - - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - org.apache.maven.plugins - maven-surefire-plugin - - 3 - true - - **/*IntegrationTest.java - **/*LiveTest.java - - - - - + + + org.springframework.cloud + spring-cloud-starter-config + + + org.springframework.cloud + spring-cloud-starter-eureka-server + + + org.springframework.boot + spring-boot-starter-security + + + org.springframework.session + spring-session + + + org.springframework.boot + spring-boot-starter-data-redis + + + + + + org.springframework.cloud + spring-cloud-dependencies + ${spring-cloud.version} + pom + import + + + diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-reviews-api/pom.xml b/spring-cloud/spring-cloud-rest/spring-cloud-rest-reviews-api/pom.xml index 47958569c6..2574cae4eb 100644 --- a/spring-cloud/spring-cloud-rest/spring-cloud-rest-reviews-api/pom.xml +++ b/spring-cloud/spring-cloud-rest/spring-cloud-rest-reviews-api/pom.xml @@ -1,111 +1,76 @@ - 4.0.0 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 - org.baeldung - spring-cloud-rest-reviews-api - 0.0.1-SNAPSHOT - jar + org.baeldung + spring-cloud-rest-reviews-api + 0.0.1-SNAPSHOT + jar - spring-cloud-rest-reviews-api - Simple reviews API + spring-cloud-rest-reviews-api + Simple reviews API - - org.springframework.boot - spring-boot-starter-parent - 1.4.3.RELEASE - - + + parent-boot-4 + com.baeldung + 0.0.1-SNAPSHOT + ../../../parent-boot-4 + - - UTF-8 - UTF-8 - 1.8 - 3.0.1 - + + 3.0.1 + - - - org.springframework.cloud - spring-cloud-starter-config - - - org.springframework.cloud - spring-cloud-starter-eureka - - - org.springframework.boot - spring-boot-starter-data-jpa - - - com.h2database - h2 - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-data-rest - - - org.springframework.boot - spring-boot-starter-security - - - org.springframework.session - spring-session - - - org.springframework.boot - spring-boot-starter-data-redis - - - - org.springframework.boot - spring-boot-starter-test - test - - - io.rest-assured - rest-assured - ${rest-assured.version} - - - - - - - - org.springframework.cloud - spring-cloud-dependencies - Camden.SR4 - pom - import - - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - org.apache.maven.plugins - maven-surefire-plugin - - - **/*IntegrationTest.java - **/*LiveTest.java - - - - - + + + org.springframework.cloud + spring-cloud-starter-config + + + org.springframework.cloud + spring-cloud-starter-eureka + + + org.springframework.boot + spring-boot-starter-data-jpa + + + com.h2database + h2 + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-data-rest + + + org.springframework.boot + spring-boot-starter-security + + + org.springframework.session + spring-session + + + org.springframework.boot + spring-boot-starter-data-redis + + + + + + org.springframework.cloud + spring-cloud-dependencies + Camden.SR4 + pom + import + + + diff --git a/spring-cloud/spring-cloud-ribbon-client/pom.xml b/spring-cloud/spring-cloud-ribbon-client/pom.xml index d70de51a58..68f3bd9439 100644 --- a/spring-cloud/spring-cloud-ribbon-client/pom.xml +++ b/spring-cloud/spring-cloud-ribbon-client/pom.xml @@ -9,15 +9,13 @@ Introduction to Spring Cloud Rest Client with Netflix Ribbon - org.springframework.boot - spring-boot-starter-parent - 1.4.4.RELEASE - + parent-boot-4 + com.baeldung + 0.0.1-SNAPSHOT + ../../parent-boot-4 - UTF-8 - 1.8 Brixton.SR7 @@ -30,12 +28,6 @@ org.springframework.boot spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-test - test - @@ -50,25 +42,6 @@ - - - - org.springframework.boot - spring-boot-maven-plugin - - - - org.apache.maven.plugins - maven-surefire-plugin - - - **/*IntegrationTest.java - - - - - - spring-snapshots @@ -124,5 +97,5 @@ - + \ No newline at end of file diff --git a/spring-cloud/spring-cloud-zookeeper/Greeting/pom.xml b/spring-cloud/spring-cloud-zookeeper/Greeting/pom.xml index 78a0e05b77..c178fbf454 100644 --- a/spring-cloud/spring-cloud-zookeeper/Greeting/pom.xml +++ b/spring-cloud/spring-cloud-zookeeper/Greeting/pom.xml @@ -1,79 +1,69 @@ - 4.0.0 - - com.baeldung.spring.cloud - spring-cloud-zookeeper - 1.0.0-SNAPSHOT - - Greeting - jar - - - org.springframework.boot - spring-boot-starter - 1.5.2.RELEASE - - - org.springframework - spring-web - 4.3.7.RELEASE - - - org.springframework.cloud - spring-cloud-starter-zookeeper-discovery - 1.0.3.RELEASE - - - commons-logging - commons-logging - - - - - org.springframework.boot - spring-boot-starter-actuator - 1.5.2.RELEASE - - - org.springframework.cloud - spring-cloud-starter-feign - 1.2.5.RELEASE - - - junit - junit - 4.12 - test - - - org.hamcrest - hamcrest-core - 1.3 - test - - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 - - - - org.springframework.cloud - spring-cloud-dependencies - Brixton.SR7 - pom - import - - - + + com.baeldung.spring.cloud + spring-cloud-zookeeper + 1.0.0-SNAPSHOT + - - - - org.springframework.boot - spring-boot-maven-plugin - - - - Greeting + Greeting + jar + + + + org.springframework.boot + spring-boot-starter + 1.5.2.RELEASE + + + org.springframework + spring-web + 4.3.7.RELEASE + + + org.springframework.cloud + spring-cloud-starter-zookeeper-discovery + 1.0.3.RELEASE + + + commons-logging + commons-logging + + + + + org.springframework.boot + spring-boot-starter-actuator + 1.5.2.RELEASE + + + org.springframework.cloud + spring-cloud-starter-feign + 1.2.5.RELEASE + + + org.hamcrest + hamcrest-core + 1.3 + test + + + + + + + org.springframework.cloud + spring-cloud-dependencies + Brixton.SR7 + pom + import + + + + + Greeting + \ No newline at end of file diff --git a/spring-cloud/spring-cloud-zookeeper/HelloWorld/pom.xml b/spring-cloud/spring-cloud-zookeeper/HelloWorld/pom.xml index 00af49eaa8..a50662cf9c 100644 --- a/spring-cloud/spring-cloud-zookeeper/HelloWorld/pom.xml +++ b/spring-cloud/spring-cloud-zookeeper/HelloWorld/pom.xml @@ -1,57 +1,57 @@ - 4.0.0 - - com.baeldung.spring.cloud - spring-cloud-zookeeper - 1.0.0-SNAPSHOT - - HelloWorld - jar - - - org.springframework.boot - spring-boot-starter - 1.5.2.RELEASE - - - org.springframework - spring-web - 4.3.7.RELEASE - - - org.springframework.cloud - spring-cloud-starter-zookeeper-discovery - 1.0.3.RELEASE - - - commons-logging - commons-logging - - - - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + + com.baeldung.spring.cloud + spring-cloud-zookeeper + 1.0.0-SNAPSHOT + + HelloWorld + jar + + + org.springframework.boot + spring-boot-starter + 1.5.2.RELEASE + + + org.springframework + spring-web + 4.3.7.RELEASE + + + org.springframework.cloud + spring-cloud-starter-zookeeper-discovery + 1.0.3.RELEASE + + + commons-logging + commons-logging + + + + - - - - org.springframework.cloud - spring-cloud-dependencies - Brixton.SR7 - pom - import - - - + + + + org.springframework.cloud + spring-cloud-dependencies + Brixton.SR7 + pom + import + + + - - - - org.springframework.boot - spring-boot-maven-plugin - - - - HelloWorld + + + + org.springframework.boot + spring-boot-maven-plugin + + + + HelloWorld \ No newline at end of file diff --git a/spring-cloud/spring-cloud-zookeeper/pom.xml b/spring-cloud/spring-cloud-zookeeper/pom.xml index 8406813161..fb58a3fce4 100644 --- a/spring-cloud/spring-cloud-zookeeper/pom.xml +++ b/spring-cloud/spring-cloud-zookeeper/pom.xml @@ -1,15 +1,16 @@ - - 4.0.0 - - com.baeldung.spring.cloud - spring-cloud - 1.0.0-SNAPSHOT - - spring-cloud-zookeeper - pom - - Greeting - HelloWorld - + + 4.0.0 + + com.baeldung.spring.cloud + spring-cloud + 1.0.0-SNAPSHOT + + spring-cloud-zookeeper + pom + + Greeting + HelloWorld + \ No newline at end of file diff --git a/spring-core/pom.xml b/spring-core/pom.xml index e4e5620a17..16984a387b 100644 --- a/spring-core/pom.xml +++ b/spring-core/pom.xml @@ -1,4 +1,5 @@ - 4.0.0 @@ -14,8 +15,8 @@ com.baeldung parent-modules 1.0.0-SNAPSHOT - - + + org.mockito @@ -30,7 +31,7 @@ org.springframework spring-core - ${spring.version} + ${spring.version} org.springframework @@ -108,7 +109,7 @@ - + 1.10.19 4.3.4.RELEASE diff --git a/spring-core/src/test/java/com/baeldung/beanfactory/BeanFactoryWithClassPathResourceTest.java b/spring-core/src/test/java/com/baeldung/beanfactory/BeanFactoryWithClassPathResourceIntegrationTest.java similarity index 93% rename from spring-core/src/test/java/com/baeldung/beanfactory/BeanFactoryWithClassPathResourceTest.java rename to spring-core/src/test/java/com/baeldung/beanfactory/BeanFactoryWithClassPathResourceIntegrationTest.java index 80123a1bee..315111b93a 100644 --- a/spring-core/src/test/java/com/baeldung/beanfactory/BeanFactoryWithClassPathResourceTest.java +++ b/spring-core/src/test/java/com/baeldung/beanfactory/BeanFactoryWithClassPathResourceIntegrationTest.java @@ -9,7 +9,7 @@ import org.springframework.core.io.Resource; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -public class BeanFactoryWithClassPathResourceTest { +public class BeanFactoryWithClassPathResourceIntegrationTest { @Test public void createBeanFactoryAndCheckEmployeeBean() { diff --git a/spring-core/src/test/java/com/baeldung/factorybean/AbstractFactoryBeanTest.java b/spring-core/src/test/java/com/baeldung/factorybean/AbstractFactoryBeanIntegrationTest.java similarity index 95% rename from spring-core/src/test/java/com/baeldung/factorybean/AbstractFactoryBeanTest.java rename to spring-core/src/test/java/com/baeldung/factorybean/AbstractFactoryBeanIntegrationTest.java index aa6d7c2cd2..3d75539bf4 100644 --- a/spring-core/src/test/java/com/baeldung/factorybean/AbstractFactoryBeanTest.java +++ b/spring-core/src/test/java/com/baeldung/factorybean/AbstractFactoryBeanIntegrationTest.java @@ -13,7 +13,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(locations = { "classpath:factorybean-abstract-spring-ctx.xml" }) -public class AbstractFactoryBeanTest { +public class AbstractFactoryBeanIntegrationTest { @Resource(name = "singleTool") private Tool tool1; diff --git a/spring-core/src/test/java/com/baeldung/factorybean/FactoryBeanJavaConfigTest.java b/spring-core/src/test/java/com/baeldung/factorybean/FactoryBeanJavaConfigIntegrationTest.java similarity index 93% rename from spring-core/src/test/java/com/baeldung/factorybean/FactoryBeanJavaConfigTest.java rename to spring-core/src/test/java/com/baeldung/factorybean/FactoryBeanJavaConfigIntegrationTest.java index c725f786dc..3b3cbf51d9 100644 --- a/spring-core/src/test/java/com/baeldung/factorybean/FactoryBeanJavaConfigTest.java +++ b/spring-core/src/test/java/com/baeldung/factorybean/FactoryBeanJavaConfigIntegrationTest.java @@ -13,7 +13,7 @@ import static org.junit.Assert.assertThat; @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = FactoryBeanAppConfig.class) -public class FactoryBeanJavaConfigTest { +public class FactoryBeanJavaConfigIntegrationTest { @Autowired private Tool tool; diff --git a/spring-core/src/test/java/com/baeldung/factorybean/FactoryBeanXmlConfigTest.java b/spring-core/src/test/java/com/baeldung/factorybean/FactoryBeanXmlConfigIntegrationTest.java similarity index 93% rename from spring-core/src/test/java/com/baeldung/factorybean/FactoryBeanXmlConfigTest.java rename to spring-core/src/test/java/com/baeldung/factorybean/FactoryBeanXmlConfigIntegrationTest.java index 443515f872..816ff0f119 100644 --- a/spring-core/src/test/java/com/baeldung/factorybean/FactoryBeanXmlConfigTest.java +++ b/spring-core/src/test/java/com/baeldung/factorybean/FactoryBeanXmlConfigIntegrationTest.java @@ -13,7 +13,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(locations = { "classpath:factorybean-spring-ctx.xml" }) -public class FactoryBeanXmlConfigTest { +public class FactoryBeanXmlConfigIntegrationTest { @Autowired private Tool tool; diff --git a/spring-core/src/test/java/com/baeldung/lombok/ApologizeServiceAutowiringTest.java b/spring-core/src/test/java/com/baeldung/lombok/ApologizeServiceAutowiringIntegrationTest.java similarity index 94% rename from spring-core/src/test/java/com/baeldung/lombok/ApologizeServiceAutowiringTest.java rename to spring-core/src/test/java/com/baeldung/lombok/ApologizeServiceAutowiringIntegrationTest.java index 755fc5868b..a49dd84f11 100644 --- a/spring-core/src/test/java/com/baeldung/lombok/ApologizeServiceAutowiringTest.java +++ b/spring-core/src/test/java/com/baeldung/lombok/ApologizeServiceAutowiringIntegrationTest.java @@ -14,7 +14,7 @@ import static org.mockito.Mockito.when; @ContextConfiguration( loader = AnnotationConfigContextLoader.class, classes = TestConfig.class) -public class ApologizeServiceAutowiringTest { +public class ApologizeServiceAutowiringIntegrationTest { private final static String TRANSLATED = "TRANSLATED"; diff --git a/spring-core/src/test/java/com/baeldung/lombok/ApologizeServiceTest.java b/spring-core/src/test/java/com/baeldung/lombok/ApologizeServiceIntegrationTest.java similarity index 93% rename from spring-core/src/test/java/com/baeldung/lombok/ApologizeServiceTest.java rename to spring-core/src/test/java/com/baeldung/lombok/ApologizeServiceIntegrationTest.java index ab545e7adf..77f0c94299 100644 --- a/spring-core/src/test/java/com/baeldung/lombok/ApologizeServiceTest.java +++ b/spring-core/src/test/java/com/baeldung/lombok/ApologizeServiceIntegrationTest.java @@ -6,7 +6,7 @@ import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -public class ApologizeServiceTest { +public class ApologizeServiceIntegrationTest { private final static String MESSAGE = "MESSAGE"; private final static String TRANSLATED = "TRANSLATED"; diff --git a/spring-core/src/test/java/com/baeldung/lombok/FarewellAutowiringTest.java b/spring-core/src/test/java/com/baeldung/lombok/FarewellAutowiringIntegrationTest.java similarity index 95% rename from spring-core/src/test/java/com/baeldung/lombok/FarewellAutowiringTest.java rename to spring-core/src/test/java/com/baeldung/lombok/FarewellAutowiringIntegrationTest.java index 592e309236..ec0793bd2e 100644 --- a/spring-core/src/test/java/com/baeldung/lombok/FarewellAutowiringTest.java +++ b/spring-core/src/test/java/com/baeldung/lombok/FarewellAutowiringIntegrationTest.java @@ -14,7 +14,7 @@ import static org.mockito.Mockito.when; @ContextConfiguration( loader = AnnotationConfigContextLoader.class, classes = TestConfig.class) -public class FarewellAutowiringTest { +public class FarewellAutowiringIntegrationTest { @Autowired private FarewellService farewellService; diff --git a/spring-core/src/test/java/com/baeldung/lombok/FarewellServiceTest.java b/spring-core/src/test/java/com/baeldung/lombok/FarewellServiceIntegrationTest.java similarity index 92% rename from spring-core/src/test/java/com/baeldung/lombok/FarewellServiceTest.java rename to spring-core/src/test/java/com/baeldung/lombok/FarewellServiceIntegrationTest.java index 9ad593a489..38959a511f 100644 --- a/spring-core/src/test/java/com/baeldung/lombok/FarewellServiceTest.java +++ b/spring-core/src/test/java/com/baeldung/lombok/FarewellServiceIntegrationTest.java @@ -6,7 +6,7 @@ import static org.junit.Assert.*; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -public class FarewellServiceTest { +public class FarewellServiceIntegrationTest { private final static String TRANSLATED = "TRANSLATED"; diff --git a/spring-core/src/test/java/com/baeldung/lombok/GreetingServiceTest.java b/spring-core/src/test/java/com/baeldung/lombok/GreetingServiceIntegrationTest.java similarity index 96% rename from spring-core/src/test/java/com/baeldung/lombok/GreetingServiceTest.java rename to spring-core/src/test/java/com/baeldung/lombok/GreetingServiceIntegrationTest.java index d0207d681b..0516b5eb56 100644 --- a/spring-core/src/test/java/com/baeldung/lombok/GreetingServiceTest.java +++ b/spring-core/src/test/java/com/baeldung/lombok/GreetingServiceIntegrationTest.java @@ -14,7 +14,7 @@ import static org.mockito.Mockito.when; @ContextConfiguration( loader = AnnotationConfigContextLoader.class, classes = TestConfig.class) -public class GreetingServiceTest { +public class GreetingServiceIntegrationTest { @Autowired private GreetingService greetingService; diff --git a/spring-core/src/test/java/com/baeldung/lombok/ThankingServiceAutowiringTest.java b/spring-core/src/test/java/com/baeldung/lombok/ThankingServiceAutowiringIntegrationTest.java similarity index 94% rename from spring-core/src/test/java/com/baeldung/lombok/ThankingServiceAutowiringTest.java rename to spring-core/src/test/java/com/baeldung/lombok/ThankingServiceAutowiringIntegrationTest.java index b2a338b18f..fb9abbad46 100644 --- a/spring-core/src/test/java/com/baeldung/lombok/ThankingServiceAutowiringTest.java +++ b/spring-core/src/test/java/com/baeldung/lombok/ThankingServiceAutowiringIntegrationTest.java @@ -14,7 +14,7 @@ import static org.mockito.Mockito.when; @ContextConfiguration( loader = AnnotationConfigContextLoader.class, classes = TestConfig.class) -public class ThankingServiceAutowiringTest { +public class ThankingServiceAutowiringIntegrationTest { @Autowired private ThankingService thankingService; diff --git a/spring-core/src/test/java/com/baeldung/lombok/ThankingServiceTest.java b/spring-core/src/test/java/com/baeldung/lombok/ThankingServiceIntegrationTest.java similarity index 92% rename from spring-core/src/test/java/com/baeldung/lombok/ThankingServiceTest.java rename to spring-core/src/test/java/com/baeldung/lombok/ThankingServiceIntegrationTest.java index 7dc663622b..680f926717 100644 --- a/spring-core/src/test/java/com/baeldung/lombok/ThankingServiceTest.java +++ b/spring-core/src/test/java/com/baeldung/lombok/ThankingServiceIntegrationTest.java @@ -6,7 +6,7 @@ import static org.junit.Assert.*; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -public class ThankingServiceTest { +public class ThankingServiceIntegrationTest { private final static String TRANSLATED = "TRANSLATED"; diff --git a/spring-core/src/test/java/com/baeldung/test/beaninjection/BeanInjectionJavaConfigTest.java b/spring-core/src/test/java/com/baeldung/test/beaninjection/BeanInjectionJavaConfigIntegrationTest.java similarity index 96% rename from spring-core/src/test/java/com/baeldung/test/beaninjection/BeanInjectionJavaConfigTest.java rename to spring-core/src/test/java/com/baeldung/test/beaninjection/BeanInjectionJavaConfigIntegrationTest.java index 4befd884eb..809ce02519 100644 --- a/spring-core/src/test/java/com/baeldung/test/beaninjection/BeanInjectionJavaConfigTest.java +++ b/spring-core/src/test/java/com/baeldung/test/beaninjection/BeanInjectionJavaConfigIntegrationTest.java @@ -18,7 +18,7 @@ import com.baeldung.configuration.ApplicationContextTestBeanInjectionTypes; @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = ApplicationContextTestBeanInjectionTypes.class) -public class BeanInjectionJavaConfigTest implements ApplicationContextAware { +public class BeanInjectionJavaConfigIntegrationTest implements ApplicationContextAware { private ApplicationContext beanInjectedContext; diff --git a/spring-core/src/test/java/com/baeldung/test/beaninjection/BeanInjectionXMLConfigTest.java b/spring-core/src/test/java/com/baeldung/test/beaninjection/BeanInjectionXMLConfigIntegrationTest.java similarity index 96% rename from spring-core/src/test/java/com/baeldung/test/beaninjection/BeanInjectionXMLConfigTest.java rename to spring-core/src/test/java/com/baeldung/test/beaninjection/BeanInjectionXMLConfigIntegrationTest.java index d19a099aad..2f29bb52a8 100644 --- a/spring-core/src/test/java/com/baeldung/test/beaninjection/BeanInjectionXMLConfigTest.java +++ b/spring-core/src/test/java/com/baeldung/test/beaninjection/BeanInjectionXMLConfigIntegrationTest.java @@ -17,7 +17,7 @@ import com.baeldung.beaninjection.ExampleServiceBean; @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(locations = "classpath:beaninjectiontypes-context.xml") -public class BeanInjectionXMLConfigTest implements ApplicationContextAware { +public class BeanInjectionXMLConfigIntegrationTest implements ApplicationContextAware { private ApplicationContext beanInjectedContext; diff --git a/spring-cucumber/pom.xml b/spring-cucumber/pom.xml index 55c0af670a..8270fc3ae2 100644 --- a/spring-cucumber/pom.xml +++ b/spring-cucumber/pom.xml @@ -1,132 +1,104 @@ - 4.0.0 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 - com.baeldung - spring-cucumber - 0.0.1-SNAPSHOT - jar + com.baeldung + spring-cucumber + 0.0.1-SNAPSHOT + jar - spring-cucumber - Demo project for Spring Boot + spring-cucumber + Demo project for Spring Boot - - org.springframework.boot - spring-boot-starter-parent - 1.4.4.RELEASE - - + + parent-boot-4 + com.baeldung + 0.0.1-SNAPSHOT + ../parent-boot-4 + - - UTF-8 - 1.8 - 1.2.5 - 1.3.2 - + + 1.2.5 + 1.3.2 + - - - org.springframework.boot - spring-boot-starter-web - - - - org.springframework.boot - spring-boot-starter-test - test - - - + + + org.springframework.boot + spring-boot-starter-web + + + info.cukes cucumber-core ${cucumber.java.version} test - - - + + + info.cukes cucumber-java ${cucumber.java.version} test - + info.cukes cucumber-junit ${cucumber.java.version} test - + - info.cukes - cucumber-spring - ${cucumber.java.version} - test + info.cukes + cucumber-spring + ${cucumber.java.version} + test - - - - org.apache.commons - commons-io - ${commons-io.version} - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - org.apache.maven.plugins - maven-surefire-plugin - - - **/*IntegrationTest.java - **/*LiveTest.java - - - - - + + + org.apache.commons + commons-io + ${commons-io.version} + + - - - integration - - - - org.apache.maven.plugins - maven-surefire-plugin - - - integration-test - - test - - - - **/*LiveTest.java - - - **/*IntegrationTest.java - - - - - - - json - - - - - - - + + + integration + + + + org.apache.maven.plugins + maven-surefire-plugin + + + integration-test + + test + + + + **/*LiveTest.java + + + **/*IntegrationTest.java + + + + + + + json + + + + + + + diff --git a/spring-custom-aop/spring-custom-aop/pom.xml b/spring-custom-aop/spring-custom-aop/pom.xml index bab6f1f101..7e9da03b54 100644 --- a/spring-custom-aop/spring-custom-aop/pom.xml +++ b/spring-custom-aop/spring-custom-aop/pom.xml @@ -8,12 +8,11 @@ spring-boot This is simple boot application for Spring boot actuator test - - org.springframework.boot - spring-boot-starter-parent - 1.5.2.RELEASE - + parent-boot-5 + com.baeldung + 0.0.1-SNAPSHOT + ../../parent-boot-5 @@ -69,12 +68,6 @@ h2 - - org.springframework.boot - spring-boot-starter-test - test - - org.springframework.boot spring-boot-starter @@ -106,7 +99,7 @@ ${jquery.version} - + com.google.guava guava 18.0 @@ -132,20 +125,6 @@ - - org.springframework.boot - spring-boot-maven-plugin - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.8 - 1.8 - - - org.apache.maven.plugins maven-war-plugin @@ -157,17 +136,6 @@ ${git-commit-id-plugin.version} - - org.apache.maven.plugins - maven-surefire-plugin - - - **/*IntegrationTest.java - **/*LiveTest.java - - - - @@ -211,8 +179,6 @@ org.baeldung.boot.DemoApplication - UTF-8 - 1.8 4.3.4.RELEASE 2.2.1 3.1.1 diff --git a/spring-boot/src/test/java/com/baeldung/utils/UtilsControllerTest.java b/spring-custom-aop/spring-custom-aop/src/test/java/com/baeldung/utils/UtilsControllerIntegrationTest.java similarity index 95% rename from spring-boot/src/test/java/com/baeldung/utils/UtilsControllerTest.java rename to spring-custom-aop/spring-custom-aop/src/test/java/com/baeldung/utils/UtilsControllerIntegrationTest.java index 7aed45dbb0..829c0a6ac4 100644 --- a/spring-boot/src/test/java/com/baeldung/utils/UtilsControllerTest.java +++ b/spring-custom-aop/spring-custom-aop/src/test/java/com/baeldung/utils/UtilsControllerIntegrationTest.java @@ -13,7 +13,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. import com.baeldung.utils.controller.UtilsController; -public class UtilsControllerTest { +public class UtilsControllerIntegrationTest { @InjectMocks private UtilsController utilsController; diff --git a/spring-custom-aop/spring-custom-aop/src/test/java/org/baeldung/boot/FooComponentTests.java b/spring-custom-aop/spring-custom-aop/src/test/java/org/baeldung/boot/FooComponentIntegrationTest.java similarity index 98% rename from spring-custom-aop/spring-custom-aop/src/test/java/org/baeldung/boot/FooComponentTests.java rename to spring-custom-aop/spring-custom-aop/src/test/java/org/baeldung/boot/FooComponentIntegrationTest.java index 72ccc0bfb8..df975df0c1 100644 --- a/spring-custom-aop/spring-custom-aop/src/test/java/org/baeldung/boot/FooComponentTests.java +++ b/spring-custom-aop/spring-custom-aop/src/test/java/org/baeldung/boot/FooComponentIntegrationTest.java @@ -26,7 +26,7 @@ import static org.mockito.Mockito.doReturn; @SpringBootTest( classes = DemoApplication.class, webEnvironment = WebEnvironment.RANDOM_PORT) -public class FooComponentTests { +public class FooComponentIntegrationTest { @Autowired private TestRestTemplate testRestTemplate; diff --git a/spring-custom-aop/spring-custom-aop/src/test/java/org/baeldung/boot/FooJPATest.java b/spring-custom-aop/spring-custom-aop/src/test/java/org/baeldung/boot/FooJPAIntegrationTest.java similarity index 96% rename from spring-custom-aop/spring-custom-aop/src/test/java/org/baeldung/boot/FooJPATest.java rename to spring-custom-aop/spring-custom-aop/src/test/java/org/baeldung/boot/FooJPAIntegrationTest.java index c29aa64e6c..87afe565ee 100644 --- a/spring-custom-aop/spring-custom-aop/src/test/java/org/baeldung/boot/FooJPATest.java +++ b/spring-custom-aop/spring-custom-aop/src/test/java/org/baeldung/boot/FooJPAIntegrationTest.java @@ -14,7 +14,7 @@ import org.springframework.test.context.junit4.SpringRunner; @RunWith(SpringRunner.class) @DataJpaTest -public class FooJPATest { +public class FooJPAIntegrationTest { @Autowired private TestEntityManager entityManager; diff --git a/spring-custom-aop/spring-custom-aop/src/test/java/org/baeldung/boot/FooJsonTest.java b/spring-custom-aop/spring-custom-aop/src/test/java/org/baeldung/boot/FooJsonIntegrationTest.java similarity index 96% rename from spring-custom-aop/spring-custom-aop/src/test/java/org/baeldung/boot/FooJsonTest.java rename to spring-custom-aop/spring-custom-aop/src/test/java/org/baeldung/boot/FooJsonIntegrationTest.java index 2789ed0a8c..c74fd83e89 100644 --- a/spring-custom-aop/spring-custom-aop/src/test/java/org/baeldung/boot/FooJsonTest.java +++ b/spring-custom-aop/spring-custom-aop/src/test/java/org/baeldung/boot/FooJsonIntegrationTest.java @@ -12,7 +12,7 @@ import org.springframework.test.context.junit4.SpringRunner; @RunWith(SpringRunner.class) @JsonTest -public class FooJsonTest { +public class FooJsonIntegrationTest { @Autowired private JacksonTester json; diff --git a/spring-data-cassandra/pom.xml b/spring-data-cassandra/pom.xml index 9b89f98d67..fbc2071134 100644 --- a/spring-data-cassandra/pom.xml +++ b/spring-data-cassandra/pom.xml @@ -1,132 +1,124 @@ - 4.0.0 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 - com.baeldung - spring-data-cassandra - 0.0.1-SNAPSHOT - jar + com.baeldung + spring-data-cassandra + 0.0.1-SNAPSHOT + jar - spring-data-cassandra + spring-data-cassandra - - com.baeldung - parent-modules - 1.0.0-SNAPSHOT - - - - UTF-8 + + com.baeldung + parent-modules + 1.0.0-SNAPSHOT + - 4.3.4.RELEASE - 1.3.2.RELEASE + + UTF-8 - 1.7.21 - 1.1.7 - 2.1.5 - 2.1.9.2 - 2.1.9.2 - 2.0-0 - 19.0 - + 4.3.4.RELEASE + 1.3.2.RELEASE + 2.1.5 + 2.1.9.2 + 2.1.9.2 + 2.0-0 + 19.0 + - - - org.springframework.data - spring-data-cassandra - ${org.springframework.data.version} - - - org.springframework - spring-core - ${org.springframework.version} - - - commons-logging - commons-logging - - - - - org.springframework - spring-test - ${org.springframework.version} - test - - - org.cassandraunit - cassandra-unit-spring - ${cassandra-unit-spring.version} - test - - - org.cassandraunit - cassandra-unit - - - - - org.cassandraunit - cassandra-unit-shaded - ${cassandra-unit-shaded.version} - test - - - org.hectorclient - hector-core - ${hector-core.version} - - - commons-logging - commons-logging - - - - - com.datastax.cassandra - cassandra-driver-core - ${cassandra-driver-core.version} - true - - - org.slf4j - jcl-over-slf4j - ${org.slf4j.version} - - + + + org.springframework.data + spring-data-cassandra + ${org.springframework.data.version} + + + org.springframework + spring-core + ${org.springframework.version} + + + commons-logging + commons-logging + + + + + org.springframework + spring-test + ${org.springframework.version} + test + + + org.cassandraunit + cassandra-unit-spring + ${cassandra-unit-spring.version} + test + + + org.cassandraunit + cassandra-unit + + + + + org.cassandraunit + cassandra-unit-shaded + ${cassandra-unit-shaded.version} + test + + + org.hectorclient + hector-core + ${hector-core.version} + + + commons-logging + commons-logging + + + + + com.datastax.cassandra + cassandra-driver-core + ${cassandra-driver-core.version} + true + + - - - integration - - - - org.apache.maven.plugins - maven-surefire-plugin - - - integration-test - - test - - - - **/*LiveTest.java - - - **/*IntegrationTest.java - - - - - - - json - - - - - - - + + + integration + + + + org.apache.maven.plugins + maven-surefire-plugin + + + integration-test + + test + + + + **/*LiveTest.java + + + **/*IntegrationTest.java + + + + + + + json + + + + + + + diff --git a/spring-data-couchbase-2/pom.xml b/spring-data-couchbase-2/pom.xml index 2efe2e3b14..70fab436dc 100644 --- a/spring-data-couchbase-2/pom.xml +++ b/spring-data-couchbase-2/pom.xml @@ -1,79 +1,72 @@ - 4.0.0 - org.baeldung - spring-data-couchbase-2 - 0.1-SNAPSHOT - spring-data-couchbase-2 - jar + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + org.baeldung + spring-data-couchbase-2 + 0.1-SNAPSHOT + spring-data-couchbase-2 + jar - - com.baeldung - parent-modules - 1.0.0-SNAPSHOT - - - + + com.baeldung + parent-modules + 1.0.0-SNAPSHOT + - - - org.springframework - spring-context - ${spring-framework.version} - - - commons-logging - commons-logging - - - - - org.springframework - spring-context-support - ${spring-framework.version} - - - org.springframework.data - spring-data-couchbase - ${spring-data-couchbase.version} - + - - - org.hibernate - hibernate-validator - ${hibernate-validator.version} - + + + org.springframework + spring-context + ${spring-framework.version} + + + commons-logging + commons-logging + + + + + org.springframework + spring-context-support + ${spring-framework.version} + + + org.springframework.data + spring-data-couchbase + ${spring-data-couchbase.version} + - - joda-time - joda-time - ${joda-time.version} - + + + org.hibernate + hibernate-validator + ${hibernate-validator.version} + - - - org.slf4j - jcl-over-slf4j - ${org.slf4j.version} - + + joda-time + joda-time + ${joda-time.version} + - - - org.springframework - spring-test - ${spring-framework.version} - test - - + + + org.springframework + spring-test + ${spring-framework.version} + test + + - - 1.8 - UTF-8 - 4.3.4.RELEASE - 2.1.5.RELEASE - 5.3.3.Final - 2.9.6 - + + 1.8 + UTF-8 + 4.3.4.RELEASE + 2.1.5.RELEASE + 5.3.3.Final + 2.9.6 + diff --git a/spring-data-dynamodb/pom.xml b/spring-data-dynamodb/pom.xml index 37a70b819b..11bbbdf40f 100644 --- a/spring-data-dynamodb/pom.xml +++ b/spring-data-dynamodb/pom.xml @@ -1,187 +1,165 @@ - 4.0.0 - com.baeldung - spring-boot-dynamodb - 0.0.1-SNAPSHOT - jar - Spring Boot Actuator - This is simple boot application for Spring boot actuator test + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + com.baeldung + spring-boot-dynamodb + 0.0.1-SNAPSHOT + jar + Spring Boot Actuator + This is simple boot application for Spring boot actuator test - spring-boot-starter-parent - org.springframework.boot - 1.5.3.RELEASE - + parent-boot-5 + com.baeldung + 0.0.1-SNAPSHOT + ../parent-boot-5 - - - - com.baeldung.Application - UTF-8 - 1.8 - 4.3.4.RELEASE - 4.5.2 - 4.4.1 - 1.11.64 - 3.3.7-1 - - - - - org.springframework.data - spring-data-releasetrain - Hopper-SR10 - pom - import - - - + + + com.baeldung.Application + 4.3.4.RELEASE + 4.5.2 + 4.4.1 + 1.11.64 + 3.3.7-1 + - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-actuator - + + + + org.springframework.data + spring-data-releasetrain + Hopper-SR10 + pom + import + + + - - org.springframework.boot - spring-boot-starter-security - + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-actuator + - - io.dropwizard.metrics - metrics-core - + + org.springframework.boot + spring-boot-starter-security + - - com.h2database - h2 - + + io.dropwizard.metrics + metrics-core + - - org.springframework.boot - spring-boot-starter-test - test - + + com.h2database + h2 + - - org.springframework.boot - spring-boot-starter - - - com.jayway.jsonpath - json-path - test - - - org.springframework.boot - spring-boot-starter-mail - + + org.springframework.boot + spring-boot-starter + + + com.jayway.jsonpath + json-path + test + + + org.springframework.boot + spring-boot-starter-mail + - - org.webjars - bootstrap - ${bootstrap.version} - + + org.webjars + bootstrap + ${bootstrap.version} + - - com.amazonaws - aws-java-sdk-dynamodb - ${aws-java-sdk-dynamodb.version} - - - commons-logging - commons-logging - - - - - com.github.derjust - spring-data-dynamodb - ${spring-data-dynamodb.version} - - - org.apache.httpcomponents - httpclient - ${httpclient.version} - - + + com.amazonaws + aws-java-sdk-dynamodb + ${aws-java-sdk-dynamodb.version} + + + commons-logging + commons-logging + + + + + com.github.derjust + spring-data-dynamodb + ${spring-data-dynamodb.version} + + + org.apache.httpcomponents + httpclient + ${httpclient.version} + + - - spring-boot - - - src/main/resources - true - - + + spring-boot + + + src/main/resources + true + + - + - - org.springframework.boot - spring-boot-maven-plugin - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.8 - 1.8 - - - - - org.apache.maven.plugins - maven-war-plugin - + + org.apache.maven.plugins + maven-war-plugin + - + - - - spring-snapshots - Spring Snapshots - https://repo.spring.io/snapshot - - true - - - - spring-milestones - Spring Milestones - https://repo.spring.io/milestone - - false - - - - - - spring-snapshots - Spring Snapshots - https://repo.spring.io/snapshot - - true - - - - spring-milestones - Spring Milestones - https://repo.spring.io/milestone - - false - - - + + + spring-snapshots + Spring Snapshots + https://repo.spring.io/snapshot + + true + + + + spring-milestones + Spring Milestones + https://repo.spring.io/milestone + + false + + + + + + spring-snapshots + Spring Snapshots + https://repo.spring.io/snapshot + + true + + + + spring-milestones + Spring Milestones + https://repo.spring.io/milestone + + false + + + diff --git a/spring-data-elasticsearch/README.md b/spring-data-elasticsearch/README.md index a7b090818e..0095d66377 100644 --- a/spring-data-elasticsearch/README.md +++ b/spring-data-elasticsearch/README.md @@ -1,7 +1,8 @@ ## Spring Data Elasticsearch + +### Relevant Articles: - [Introduction to Spring Data Elasticsearch](http://www.baeldung.com/spring-data-elasticsearch-tutorial) -###Relevant Articles: - [Elasticsearch Queries with Spring Data](http://www.baeldung.com/spring-data-elasticsearch-queries) - [Guide to Elasticsearch in Java](http://www.baeldung.com/elasticsearch-java) diff --git a/spring-data-elasticsearch/pom.xml b/spring-data-elasticsearch/pom.xml index 9a231f8486..520707a432 100644 --- a/spring-data-elasticsearch/pom.xml +++ b/spring-data-elasticsearch/pom.xml @@ -1,81 +1,75 @@ - 4.0.0 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 - com.baeldung - spring-data-elasticsearch - 0.0.1-SNAPSHOT - jar + com.baeldung + spring-data-elasticsearch + 0.0.1-SNAPSHOT + jar - spring-data-elasticsearch + spring-data-elasticsearch - - com.baeldung - parent-modules - 1.0.0-SNAPSHOT - - - - UTF-8 - 1.8 - 1.8 - - 4.3.4.RELEASE + + com.baeldung + parent-modules + 1.0.0-SNAPSHOT + + + + UTF-8 + 1.8 + 1.8 + + 4.3.4.RELEASE 2.0.5.RELEASE - 4.2.2 - 2.4.2 - 1.2.21 - + 4.2.2 + 2.4.2 + 1.2.21 + - - - org.springframework - spring-core - ${org.springframework.version} - - - commons-logging - commons-logging - - - - - org.springframework.data - spring-data-elasticsearch - ${spring-data-elasticsearch.version} - - - - org.springframework - spring-test - ${org.springframework.version} - test - - - net.java.dev.jna - jna - ${jna.version} - test - - - - org.slf4j - jcl-over-slf4j - ${org.slf4j.version} - + + + org.springframework + spring-core + ${org.springframework.version} + + + commons-logging + commons-logging + + + + + org.springframework.data + spring-data-elasticsearch + ${spring-data-elasticsearch.version} + + + + org.springframework + spring-test + ${org.springframework.version} + test + + + net.java.dev.jna + jna + ${jna.version} + test + + + + org.elasticsearch + elasticsearch + ${elasticsearch.version} + + + com.alibaba + fastjson + ${fastjson.version} + + - - org.elasticsearch - elasticsearch - ${elasticsearch.version} - - - com.alibaba - fastjson - ${fastjson.version} - - - diff --git a/spring-data-elasticsearch/src/test/java/com/baeldung/elasticsearch/ElasticSearchManualTest.java b/spring-data-elasticsearch/src/test/java/com/baeldung/elasticsearch/ElasticSearchManualTest.java new file mode 100644 index 0000000000..1fb1ae76f7 --- /dev/null +++ b/spring-data-elasticsearch/src/test/java/com/baeldung/elasticsearch/ElasticSearchManualTest.java @@ -0,0 +1,150 @@ +package com.baeldung.elasticsearch; + +import com.alibaba.fastjson.JSON; +import org.elasticsearch.action.delete.DeleteResponse; +import org.elasticsearch.action.index.IndexResponse; +import org.elasticsearch.action.search.SearchResponse; +import org.elasticsearch.action.search.SearchType; +import org.elasticsearch.client.Client; +import org.elasticsearch.common.xcontent.XContentBuilder; +import org.elasticsearch.common.xcontent.XContentFactory; +import org.elasticsearch.index.query.QueryBuilders; +import org.elasticsearch.node.Node; +import org.elasticsearch.search.SearchHit; +import org.junit.Before; +import org.junit.Test; + +import java.io.IOException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Date; +import java.util.List; + +import static org.elasticsearch.node.NodeBuilder.nodeBuilder; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + +public class ElasticSearchManualTest { + private List listOfPersons = new ArrayList<>(); + private Client client = null; + + @Before + public void setUp() { + Person person1 = new Person(10, "John Doe", new Date()); + Person person2 = new Person(25, "Janette Doe", new Date()); + listOfPersons.add(person1); + listOfPersons.add(person2); + Node node = nodeBuilder() + .clusterName("elasticsearch") + .client(true) + .node(); + client = node.client(); + } + + @Test + public void givenJsonString_whenJavaObject_thenIndexDocument() { + String jsonObject = "{\"age\":20,\"dateOfBirth\":1471466076564,\"fullName\":\"John Doe\"}"; + IndexResponse response = client + .prepareIndex("people", "Doe") + .setSource(jsonObject) + .get(); + String index = response.getIndex(); + String type = response.getType(); + assertTrue(response.isCreated()); + assertEquals(index, "people"); + assertEquals(type, "Doe"); + } + + @Test + public void givenDocumentId_whenJavaObject_thenDeleteDocument() { + String jsonObject = "{\"age\":10,\"dateOfBirth\":1471455886564,\"fullName\":\"Johan Doe\"}"; + IndexResponse response = client + .prepareIndex("people", "Doe") + .setSource(jsonObject) + .get(); + String id = response.getId(); + DeleteResponse deleteResponse = client + .prepareDelete("people", "Doe", id) + .get(); + assertTrue(deleteResponse.isFound()); + } + + @Test + public void givenSearchRequest_whenMatchAll_thenReturnAllResults() { + SearchResponse response = client + .prepareSearch() + .execute() + .actionGet(); + SearchHit[] searchHits = response + .getHits() + .getHits(); + List results = new ArrayList<>(); + for (SearchHit hit : searchHits) { + String sourceAsString = hit.getSourceAsString(); + Person person = JSON.parseObject(sourceAsString, Person.class); + results.add(person); + } + } + + @Test + public void givenSearchParameters_thenReturnResults() { + SearchResponse response = client + .prepareSearch() + .setTypes() + .setSearchType(SearchType.DFS_QUERY_THEN_FETCH) + .setPostFilter(QueryBuilders + .rangeQuery("age") + .from(5) + .to(15)) + .setFrom(0) + .setSize(60) + .setExplain(true) + .execute() + .actionGet(); + + SearchResponse response2 = client + .prepareSearch() + .setTypes() + .setSearchType(SearchType.DFS_QUERY_THEN_FETCH) + .setPostFilter(QueryBuilders.simpleQueryStringQuery("+John -Doe OR Janette")) + .setFrom(0) + .setSize(60) + .setExplain(true) + .execute() + .actionGet(); + + SearchResponse response3 = client + .prepareSearch() + .setTypes() + .setSearchType(SearchType.DFS_QUERY_THEN_FETCH) + .setPostFilter(QueryBuilders.matchQuery("John", "Name*")) + .setFrom(0) + .setSize(60) + .setExplain(true) + .execute() + .actionGet(); + response2.getHits(); + response3.getHits(); + List searchHits = Arrays.asList(response + .getHits() + .getHits()); + final List results = new ArrayList<>(); + searchHits.forEach(hit -> results.add(JSON.parseObject(hit.getSourceAsString(), Person.class))); + } + + @Test + public void givenContentBuilder_whenHelpers_thanIndexJson() throws IOException { + XContentBuilder builder = XContentFactory + .jsonBuilder() + .startObject() + .field("fullName", "Test") + .field("salary", "11500") + .field("age", "10") + .endObject(); + IndexResponse response = client + .prepareIndex("people", "Doe") + .setSource(builder) + .get(); + assertTrue(response.isCreated()); + } +} diff --git a/spring-data-elasticsearch/src/test/java/com/baeldung/elasticsearch/ElasticSearchUnitTests.java b/spring-data-elasticsearch/src/test/java/com/baeldung/elasticsearch/ElasticSearchUnitTests.java deleted file mode 100644 index 4ab5d40788..0000000000 --- a/spring-data-elasticsearch/src/test/java/com/baeldung/elasticsearch/ElasticSearchUnitTests.java +++ /dev/null @@ -1,101 +0,0 @@ -package com.baeldung.elasticsearch; - -import static org.elasticsearch.node.NodeBuilder.*; -import static org.junit.Assert.*; - -import java.io.IOException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Date; -import java.util.List; - -import org.elasticsearch.action.delete.DeleteResponse; -import org.elasticsearch.action.index.IndexResponse; -import org.elasticsearch.action.search.SearchResponse; -import org.elasticsearch.action.search.SearchType; -import org.elasticsearch.client.Client; -import org.elasticsearch.common.xcontent.XContentBuilder; -import org.elasticsearch.common.xcontent.XContentFactory; -import org.elasticsearch.index.query.QueryBuilders; -import org.elasticsearch.node.Node; -import org.elasticsearch.search.SearchHit; -import org.junit.Before; -import org.junit.Test; - -import com.alibaba.fastjson.JSON; - -public class ElasticSearchUnitTests { - private List listOfPersons = new ArrayList(); - String jsonString = null; - Client client = null; - - @Before - public void setUp() { - Person person1 = new Person(10, "John Doe", new Date()); - Person person2 = new Person(25, "Janette Doe", new Date()); - listOfPersons.add(person1); - listOfPersons.add(person2); - jsonString = JSON.toJSONString(listOfPersons); - Node node = nodeBuilder().clusterName("elasticsearch").client(true).node(); - client = node.client(); - } - - @Test - public void givenJsonString_whenJavaObject_thenIndexDocument() { - String jsonObject = "{\"age\":20,\"dateOfBirth\":1471466076564,\"fullName\":\"John Doe\"}"; - IndexResponse response = client.prepareIndex("people", "Doe").setSource(jsonObject).get(); - String index = response.getIndex(); - String type = response.getType(); - assertTrue(response.isCreated()); - assertEquals(index, "people"); - assertEquals(type, "Doe"); - } - - @Test - public void givenDocumentId_whenJavaObject_thenDeleteDocument() { - String jsonObject = "{\"age\":10,\"dateOfBirth\":1471455886564,\"fullName\":\"Johan Doe\"}"; - IndexResponse response = client.prepareIndex("people", "Doe").setSource(jsonObject).get(); - String id = response.getId(); - DeleteResponse deleteResponse = client.prepareDelete("people", "Doe", id).get(); - assertTrue(deleteResponse.isFound()); - } - - @Test - public void givenSearchRequest_whenMatchAll_thenReturnAllResults() { - SearchResponse response = client.prepareSearch().execute().actionGet(); - SearchHit[] searchHits = response.getHits().getHits(); - List results = new ArrayList(); - for (SearchHit hit : searchHits) { - String sourceAsString = hit.getSourceAsString(); - Person person = JSON.parseObject(sourceAsString, Person.class); - results.add(person); - } - } - - @Test - public void givenSearchParamters_thenReturnResults() { - boolean isExecutedSuccessfully = true; - SearchResponse response = client.prepareSearch().setTypes().setSearchType(SearchType.DFS_QUERY_THEN_FETCH).setPostFilter(QueryBuilders.rangeQuery("age").from(5).to(15)).setFrom(0).setSize(60).setExplain(true).execute().actionGet(); - - SearchResponse response2 = client.prepareSearch().setTypes().setSearchType(SearchType.DFS_QUERY_THEN_FETCH).setPostFilter(QueryBuilders.simpleQueryStringQuery("+John -Doe OR Janette")).setFrom(0).setSize(60).setExplain(true).execute().actionGet(); - - SearchResponse response3 = client.prepareSearch().setTypes().setSearchType(SearchType.DFS_QUERY_THEN_FETCH).setPostFilter(QueryBuilders.matchQuery("John", "Name*")).setFrom(0).setSize(60).setExplain(true).execute().actionGet(); - try { - response2.getHits(); - response3.getHits(); - List searchHits = Arrays.asList(response.getHits().getHits()); - final List results = new ArrayList(); - searchHits.forEach(hit -> results.add(JSON.parseObject(hit.getSourceAsString(), Person.class))); - } catch (Exception e) { - isExecutedSuccessfully = false; - } - assertTrue(isExecutedSuccessfully); - } - - @Test - public void givenContentBuilder_whenHelpers_thanIndexJson() throws IOException { - XContentBuilder builder = XContentFactory.jsonBuilder().startObject().field("fullName", "Test").field("salary", "11500").field("age", "10").endObject(); - IndexResponse response = client.prepareIndex("people", "Doe").setSource(builder).get(); - assertTrue(response.isCreated()); - } -} diff --git a/spring-data-gemfire/pom.xml b/spring-data-gemfire/pom.xml index e9db8aaef3..ae7612d719 100644 --- a/spring-data-gemfire/pom.xml +++ b/spring-data-gemfire/pom.xml @@ -1,7 +1,6 @@ - + 4.0.0 com.baeldung @@ -13,13 +12,12 @@ com.baeldung parent-modules 1.0.0-SNAPSHOT - - + + 1.7.4.RELEASE 7.0.1 1.0 - 1.3 4.3.0.RELEASE 4.3.0.RELEASE @@ -42,13 +40,7 @@ google-collections ${google-collections-version} - - - org.hamcrest - hamcrest-library - ${hamcrest-library-version} - test - + org.springframework spring-context @@ -58,7 +50,7 @@ commons-logging commons-logging - + org.springframework diff --git a/spring-data-javaslang/pom.xml b/spring-data-javaslang/pom.xml index 76fbce1e2e..02d214344e 100644 --- a/spring-data-javaslang/pom.xml +++ b/spring-data-javaslang/pom.xml @@ -1,29 +1,30 @@ - + 4.0.0 spring-data-javaslang spring-data-javaslang 0.0.1-SNAPSHOT - - UTF-8 - 2.19.1 - 3.1 + + 2.9.1-01 2.3.7-01 2.4.8 2.0.5 - 4.12 1.5.1.RELEASE 4.3.6.RELEASE 4.3.6.RELEASE 4.3.6.RELEASE ${basedir}/src/test/java + - org.springframework.boot - spring-boot-starter-parent - 1.5.1.RELEASE + parent-boot-5 + com.baeldung + 0.0.1-SNAPSHOT + ../parent-boot-5 + test-app @@ -48,37 +49,7 @@ - - - - maven-compiler-plugin - 3.5.1 - - 1.8 - 1.8 - - - - org.apache.maven.plugins - maven-surefire-plugin - ${maven-surefire-plugin.version} - - ${project.build.testSourceDirectory} - - - org.apache.maven.plugins - maven-surefire-plugin - ${maven-surefire-plugin.version} - - - **/*IntegrationTest.java - **/*LiveTest.java - - - - - org.springframework.boot @@ -134,11 +105,5 @@ ${spring-core.version} - - junit - junit - ${junit.version} - test - \ No newline at end of file diff --git a/spring-data-mongodb/pom.xml b/spring-data-mongodb/pom.xml index 318264d3d9..84d49a3e35 100644 --- a/spring-data-mongodb/pom.xml +++ b/spring-data-mongodb/pom.xml @@ -12,8 +12,8 @@ com.baeldung parent-modules 1.0.0-SNAPSHOT - - + + @@ -31,21 +31,7 @@ commons-logging commons-logging - - - - - org.hamcrest - hamcrest-core - ${org.hamcrest.version} - test - - - - org.hamcrest - hamcrest-library - ${org.hamcrest.version} - test + @@ -55,12 +41,6 @@ test - - org.slf4j - jcl-over-slf4j - ${org.slf4j.version} - - com.querydsl querydsl-mongodb @@ -137,7 +117,6 @@ 1.9.6.RELEASE - 1.3 2.9.0 4.1.4 1.1.3 diff --git a/spring-data-neo4j/pom.xml b/spring-data-neo4j/pom.xml index 655ef4c802..e01e7d7294 100644 --- a/spring-data-neo4j/pom.xml +++ b/spring-data-neo4j/pom.xml @@ -10,8 +10,8 @@ com.baeldung parent-modules 1.0.0-SNAPSHOT - - + + org.neo4j @@ -46,7 +46,7 @@ commons-logging commons-logging - + @@ -87,7 +87,7 @@ commons-logging commons-logging - + @@ -112,7 +112,7 @@ commons-logging commons-logging - + diff --git a/spring-data-neo4j/src/test/java/com/baeldung/neo4j/Neo4JServerTest.java b/spring-data-neo4j/src/test/java/com/baeldung/neo4j/Neo4JServerLiveTest.java similarity index 98% rename from spring-data-neo4j/src/test/java/com/baeldung/neo4j/Neo4JServerTest.java rename to spring-data-neo4j/src/test/java/com/baeldung/neo4j/Neo4JServerLiveTest.java index e959e0237d..bf187ccb2d 100644 --- a/spring-data-neo4j/src/test/java/com/baeldung/neo4j/Neo4JServerTest.java +++ b/spring-data-neo4j/src/test/java/com/baeldung/neo4j/Neo4JServerLiveTest.java @@ -15,7 +15,7 @@ import org.neo4j.driver.v1.Session; import org.neo4j.driver.v1.StatementResult; @Ignore -public class Neo4JServerTest { +public class Neo4JServerLiveTest { @Test public void standAloneDriver() { diff --git a/spring-data-redis/pom.xml b/spring-data-redis/pom.xml index 48676f7296..d2835595da 100644 --- a/spring-data-redis/pom.xml +++ b/spring-data-redis/pom.xml @@ -1,6 +1,6 @@ - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 com.baeldung spring-data-redis @@ -11,14 +11,14 @@ com.baeldung parent-modules 1.0.0-SNAPSHOT - - + + UTF-8 4.3.7.RELEASE 1.8.1.RELEASE - 3.2.4 - 2.9.0 + 3.2.4 + 2.9.0 0.10.0 @@ -51,7 +51,7 @@ commons-logging commons-logging - + @@ -73,5 +73,5 @@ ${nosqlunit.version} - + diff --git a/spring-data-rest/pom.xml b/spring-data-rest/pom.xml index 91b6d61878..2b621ac3a2 100644 --- a/spring-data-rest/pom.xml +++ b/spring-data-rest/pom.xml @@ -12,17 +12,12 @@ Intro to Spring Data REST - org.springframework.boot - spring-boot-starter-parent - 1.5.2.RELEASE - + parent-boot-5 + com.baeldung + 0.0.1-SNAPSHOT + ../parent-boot-5 - - UTF-8 - 1.8 - - org.springframework.boot @@ -41,53 +36,16 @@ com.h2database h2 - - - - - org.springframework.boot - spring-boot-starter-test - test - + ${project.artifactId} - - - org.springframework.boot - spring-boot-maven-plugin - - - - org.apache.maven.plugins - maven-surefire-plugin - - - **/*IntegrationTest.java - **/*LiveTest.java - - - - diff --git a/spring-data-solr/pom.xml b/spring-data-solr/pom.xml index 9516f0c1d1..48ddaa7085 100644 --- a/spring-data-solr/pom.xml +++ b/spring-data-solr/pom.xml @@ -12,8 +12,8 @@ com.baeldung parent-modules 1.0.0-SNAPSHOT - - + + UTF-8 4.3.4.RELEASE @@ -30,7 +30,7 @@ commons-logging commons-logging - + org.springframework.data diff --git a/spring-dispatcher-servlet/pom.xml b/spring-dispatcher-servlet/pom.xml index f30a13c6e2..79cc1e5cd0 100644 --- a/spring-dispatcher-servlet/pom.xml +++ b/spring-dispatcher-servlet/pom.xml @@ -1,5 +1,7 @@ - + 4.0.0 com.baeldung spring-dispatcher-servlet @@ -11,13 +13,13 @@ com.baeldung parent-modules 1.0.0-SNAPSHOT - - + + 4.3.7.RELEASE - + org.springframework spring-core ${springframework.version} diff --git a/spring-drools/pom.xml b/spring-drools/pom.xml index 6d9b821196..8dba1271d7 100644 --- a/spring-drools/pom.xml +++ b/spring-drools/pom.xml @@ -1,18 +1,17 @@ - + 4.0.0 com.baeldung spring-drools 1.0.0-SNAPSHOT - + com.baeldung parent-modules 1.0.0-SNAPSHOT - + 1.1.1.RELEASE diff --git a/spring-exceptions/pom.xml b/spring-exceptions/pom.xml index e9caa4a11b..97dc76058b 100644 --- a/spring-exceptions/pom.xml +++ b/spring-exceptions/pom.xml @@ -1,4 +1,5 @@ - + 4.0.0 com.baeldung spring-exceptions @@ -11,8 +12,8 @@ com.baeldung parent-modules 1.0.0-SNAPSHOT - - + + @@ -26,7 +27,7 @@ commons-logging commons-logging - + org.springframework @@ -37,7 +38,7 @@ commons-logging commons-logging - + org.springframework @@ -122,50 +123,30 @@ - org.hamcrest - hamcrest-core - ${org.hamcrest.version} - test - - - org.hamcrest - hamcrest-library - ${org.hamcrest.version} - test + javax.el + el-api + ${javax.el.version} - org.mockito - mockito-core - ${mockito.version} - test - - - - javax.el - el-api - ${javax.el.version} - - - - org.apache.derby - derby - ${derby.version} + org.apache.derby + derby + ${derby.version} - org.apache.derby - derbyclient - ${derby.version} + org.apache.derby + derbyclient + ${derby.version} - org.apache.derby - derbynet - ${derby.version} + org.apache.derby + derbynet + ${derby.version} - org.apache.derby - derbytools - ${derby.version} + org.apache.derby + derbytools + ${derby.version} @@ -214,11 +195,7 @@ 19.0 3.5 - - - 1.3 - 1.10.19 - + 4.4.5 4.5.2 diff --git a/spring-freemarker/pom.xml b/spring-freemarker/pom.xml index 92b0ee8b35..ea9222410e 100644 --- a/spring-freemarker/pom.xml +++ b/spring-freemarker/pom.xml @@ -1,69 +1,62 @@ - 4.0.0 - com.freemarker.example - spring4-freemarker-example - war - 1.0-SNAPSHOT - Spring Freemarker Example + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + 4.0.0 + com.freemarker.example + spring4-freemarker-example + war + 1.0-SNAPSHOT + Spring Freemarker Example - - com.baeldung - parent-modules - 1.0.0-SNAPSHOT - - - - 1.8 - 4.3.4.RELEASE - 2.3.23 - 3.1.0 - false - + + com.baeldung + parent-modules + 1.0.0-SNAPSHOT + - + + 1.8 + 4.3.4.RELEASE + 2.3.23 + 3.1.0 + false + - - org.springframework - spring-webmvc - ${spring.version} - - - commons-logging - commons-logging - - - - - - org.springframework - spring-context-support - ${spring.version} - + - - - org.slf4j - jcl-over-slf4j - ${org.slf4j.version} - + + org.springframework + spring-webmvc + ${spring.version} + + + commons-logging + commons-logging + + + - - - - javax.servlet - javax.servlet-api - ${servletapi.version} - provided - - - - - org.freemarker - freemarker - ${freemarker.version} - + + org.springframework + spring-context-support + ${spring.version} + - + + + + javax.servlet + javax.servlet-api + ${servletapi.version} + provided + + + + + org.freemarker + freemarker + ${freemarker.version} + + + \ No newline at end of file diff --git a/spring-hibernate3/pom.xml b/spring-hibernate3/pom.xml index 7370c5be34..d7607cac0a 100644 --- a/spring-hibernate3/pom.xml +++ b/spring-hibernate3/pom.xml @@ -1,4 +1,5 @@ - + 4.0.0 com.baeldung spring-hibernate3 @@ -10,8 +11,8 @@ com.baeldung parent-modules 1.0.0-SNAPSHOT - - + + @@ -19,7 +20,7 @@ org.springframework spring-context - ${org.springframework.version} + ${org.springframework.version} @@ -52,13 +53,13 @@ tomcat-dbcp ${tomcat-dbcp.version} - + com.h2database h2 - ${h2.version} + ${h2.version} - + @@ -83,26 +84,6 @@ test - - org.hamcrest - hamcrest-core - ${org.hamcrest.version} - test - - - org.hamcrest - hamcrest-library - ${org.hamcrest.version} - test - - - - org.mockito - mockito-core - ${mockito.version} - test - - @@ -150,7 +131,7 @@ - + 4.3.4.RELEASE @@ -170,10 +151,6 @@ 19.0 3.5 - - 1.3 - 1.10.19 - 4.4.5 4.5.2 diff --git a/spring-hibernate4/pom.xml b/spring-hibernate4/pom.xml index 3f92eba519..0a89819b81 100644 --- a/spring-hibernate4/pom.xml +++ b/spring-hibernate4/pom.xml @@ -1,4 +1,5 @@ - + 4.0.0 com.baeldung spring-hibernate4 @@ -10,8 +11,8 @@ com.baeldung parent-modules 1.0.0-SNAPSHOT - - + + @@ -25,7 +26,7 @@ commons-logging commons-logging - + org.springframework @@ -121,27 +122,6 @@ test - - org.hamcrest - hamcrest-core - 1.3 - test - - - - org.hamcrest - hamcrest-library - ${org.hamcrest.version} - test - - - - org.mockito - mockito-core - ${mockito.version} - test - - org.hsqldb hsqldb @@ -170,9 +150,9 @@ 4.3.4.RELEASE - 4.2.0.RELEASE - 1.10.5.RELEASE - + 4.2.0.RELEASE + 1.10.5.RELEASE + 4.3.11.Final ${hibernate.version} @@ -180,7 +160,7 @@ 8.5.8 1.1 2.3.4 - + 5.3.3.Final 2.2.5 @@ -189,10 +169,6 @@ 19.0 3.5 - - 1.3 - 1.10.19 - 4.4.1 4.5 diff --git a/spring-hibernate4/src/test/java/com/baeldung/hibernate/oneToMany/main/HibernateOneToManyAnnotationMainTest.java b/spring-hibernate4/src/test/java/com/baeldung/hibernate/oneToMany/main/HibernateOneToManyAnnotationMainIntegrationTest.java similarity index 95% rename from spring-hibernate4/src/test/java/com/baeldung/hibernate/oneToMany/main/HibernateOneToManyAnnotationMainTest.java rename to spring-hibernate4/src/test/java/com/baeldung/hibernate/oneToMany/main/HibernateOneToManyAnnotationMainIntegrationTest.java index e2d2bf9143..b3a091ebf1 100644 --- a/spring-hibernate4/src/test/java/com/baeldung/hibernate/oneToMany/main/HibernateOneToManyAnnotationMainTest.java +++ b/spring-hibernate4/src/test/java/com/baeldung/hibernate/oneToMany/main/HibernateOneToManyAnnotationMainIntegrationTest.java @@ -21,13 +21,13 @@ import org.junit.Test; import com.baeldung.hibernate.oneToMany.model.Cart; import com.baeldung.hibernate.oneToMany.model.Items; -public class HibernateOneToManyAnnotationMainTest { +public class HibernateOneToManyAnnotationMainIntegrationTest { private static SessionFactory sessionFactory; private Session session; - public HibernateOneToManyAnnotationMainTest() { + public HibernateOneToManyAnnotationMainIntegrationTest() { } @BeforeClass diff --git a/spring-hibernate5/pom.xml b/spring-hibernate5/pom.xml index a7f160e808..e3309ff10b 100644 --- a/spring-hibernate5/pom.xml +++ b/spring-hibernate5/pom.xml @@ -1,4 +1,5 @@ - + 4.0.0 com.baeldung spring-hibernate5 @@ -10,8 +11,8 @@ com.baeldung parent-modules 1.0.0-SNAPSHOT - - + + @@ -25,18 +26,13 @@ commons-logging commons-logging - + org.springframework spring-aspects ${org.springframework.version} - - org.springframework.security - spring-security-core - ${org.springframework.security.version} - @@ -55,21 +51,11 @@ hibernate-core ${hibernate.version} - - org.hibernate - hibernate-envers - ${hibernate-envers.version} - javax.transaction jta ${jta.version} - - mysql - mysql-connector-java - ${mysql-connector-java.version} - org.apache.tomcat @@ -79,17 +65,6 @@ - - org.hibernate - hibernate-validator - ${hibernate-validator.version} - - - javax.el - javax.el-api - ${javax.el-api.version} - - @@ -114,17 +89,15 @@ test - - org.springframework.security - spring-security-test - ${org.springframework.security.version} - test - - org.hamcrest hamcrest-core ${org.hamcrest.version} + + + org.springframework.security + spring-security-test + ${org.springframework.security.version} test @@ -142,19 +115,18 @@ test - - org.mockito - mockito-core - ${mockito.version} - test - - org.hsqldb hsqldb ${hsqldb.version} + + com.h2database + h2 + ${h2.version} + + @@ -166,21 +138,54 @@ + + + + org.apache.maven.plugins + maven-compiler-plugin + ${maven-compiler-plugin.version} + + 1.8 + 1.8 + + + + + org.apache.maven.plugins + maven-surefire-plugin + ${maven-surefire-plugin.version} + + + **/*IntegrationTest.java + + + + + + 4.3.5.RELEASE - 4.2.1.RELEASE - 1.10.6.RELEASE - + + 1.10.6.RELEASE + + 4.2.1.RELEASE + 1.10.6.RELEASE + + - 5.2.8.Final - ${hibernate.version} - 6.0.5 - 8.5.11 + 5.2.10.Final + 8.5.15 1.1 2.3.4 + 1.4.195 + + + + 1.7.21 + 1.1.7 5.4.0.Final @@ -190,9 +195,10 @@ 21.0 3.5 + 1.3 - 2.6.8 + 4.12 4.4.1 4.5 diff --git a/spring-hibernate5/src/main/java/com/baeldung/hibernate/criteria/model/Item.java b/spring-hibernate5/src/main/java/com/baeldung/hibernate/criteria/model/Item.java deleted file mode 100644 index 957207b7e6..0000000000 --- a/spring-hibernate5/src/main/java/com/baeldung/hibernate/criteria/model/Item.java +++ /dev/null @@ -1,81 +0,0 @@ -package com.baeldung.hibernate.criteria.model; - -import java.io.Serializable; - -public class Item implements Serializable { - - private static final long serialVersionUID = 1L; - private Integer itemId; - private String itemName; - private String itemDescription; - private Integer itemPrice; - - // constructors - public Item() { - - } - - public Item(final Integer itemId, final String itemName, final String itemDescription) { - super(); - this.itemId = itemId; - this.itemName = itemName; - this.itemDescription = itemDescription; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((itemId == null) ? 0 : itemId.hashCode()); - return result; - } - - @Override - public boolean equals(final Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - final Item other = (Item) obj; - if (itemId == null) { - if (other.itemId != null) - return false; - } else if (!itemId.equals(other.itemId)) - return false; - return true; - } - - public Integer getItemId() { - return itemId; - } - - public void setItemId(final Integer itemId) { - this.itemId = itemId; - } - - public String getItemName() { - return itemName; - } - - public void setItemName(final String itemName) { - this.itemName = itemName; - } - - public String getItemDescription() { - return itemDescription; - } - - public Integer getItemPrice() { - return itemPrice; - } - - public void setItemPrice(final Integer itemPrice) { - this.itemPrice = itemPrice; - } - - public void setItemDescription(final String itemDescription) { - this.itemDescription = itemDescription; - } -} diff --git a/spring-hibernate5/src/main/java/com/baeldung/hibernate/criteria/util/HibernateUtil.java b/spring-hibernate5/src/main/java/com/baeldung/hibernate/criteria/util/HibernateUtil.java deleted file mode 100644 index 9024ba9e4b..0000000000 --- a/spring-hibernate5/src/main/java/com/baeldung/hibernate/criteria/util/HibernateUtil.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.baeldung.hibernate.criteria.util; - -import org.hibernate.Session; -import org.hibernate.SessionFactory; -import org.hibernate.cfg.Configuration; - -public class HibernateUtil { - - public static Session getHibernateSession() { - - final SessionFactory sf = new Configuration().configure("criteria.cfg.xml").buildSessionFactory(); - - final Session session = sf.openSession(); - return session; - } - -} diff --git a/spring-hibernate5/src/main/java/com/baeldung/hibernate/criteria/view/ApplicationView.java b/spring-hibernate5/src/main/java/com/baeldung/hibernate/criteria/view/ApplicationView.java deleted file mode 100644 index 7b53a5f752..0000000000 --- a/spring-hibernate5/src/main/java/com/baeldung/hibernate/criteria/view/ApplicationView.java +++ /dev/null @@ -1,279 +0,0 @@ -/** - * ApplicationViewer is the class that starts the application - * First it creates the session object and then creates the - * criteria query. - * - * @author Sandeep Kumar - * @version 1.0 - * @since 01/13/2017 - */ - -package com.baeldung.hibernate.criteria.view; - -import java.util.ArrayList; -import java.util.List; - -import javax.persistence.Tuple; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Order; -import javax.persistence.criteria.Predicate; -import javax.persistence.criteria.Root; - -import org.hibernate.Session; -import org.hibernate.Transaction; - -import com.baeldung.hibernate.criteria.model.Item; -import com.baeldung.hibernate.criteria.util.HibernateUtil; - -public class ApplicationView { - - @SuppressWarnings("unchecked") - public boolean checkIfCriteriaTimeLower() { - final Session session = HibernateUtil.getHibernateSession(); - CriteriaBuilder builder = session.getCriteriaBuilder(); - CriteriaQuery criteriaItem = builder.createQuery(Item.class); - Root rootItem = criteriaItem.from(Item.class); - Transaction tx = null; - - // calculate the time taken by criteria - final long startTimeCriteria = System.nanoTime(); - criteriaItem.select(rootItem).where(builder.like(rootItem.get("itemName"), "%item One%")); - final List results = session.createQuery(criteriaItem).getResultList(); - final long endTimeCriteria = System.nanoTime(); - final long durationCriteria = (endTimeCriteria - startTimeCriteria) / 1000; - - // calculate the time taken by HQL - final long startTimeHQL = System.nanoTime(); - tx = session.beginTransaction(); - final List items = session.createQuery("FROM Item where itemName like '%item One%'").getResultList(); - final long endTimeHQL = System.nanoTime(); - final long durationHQL = (endTimeHQL - startTimeHQL) / 1000; - - if (durationCriteria > durationHQL) { - return false; - } else { - return true; - } - } - - // To get items having price more than 1000 - public String[] greaterThanCriteria() { - final Session session = HibernateUtil.getHibernateSession(); - CriteriaBuilder builder = session.getCriteriaBuilder(); - CriteriaQuery criteriaItem = builder.createQuery(Item.class); - Root rootItem = criteriaItem.from(Item.class); - criteriaItem.select(rootItem).where(builder.greaterThan(rootItem.get("itemPrice"), 1000)); - final List greaterThanItemsList = session.createQuery(criteriaItem).getResultList(); - final String greaterThanItems[] = new String[greaterThanItemsList.size()]; - for (int i = 0; i < greaterThanItemsList.size(); i++) { - greaterThanItems[i] = greaterThanItemsList.get(i).getItemName(); - } - session.close(); - return greaterThanItems; - } - - // To get items having price less than 1000 - public String[] lessThanCriteria() { - final Session session = HibernateUtil.getHibernateSession(); - CriteriaBuilder builder = session.getCriteriaBuilder(); - CriteriaQuery criteriaItem = builder.createQuery(Item.class); - Root rootItem = criteriaItem.from(Item.class); - criteriaItem.select(rootItem).where(builder.lessThan(rootItem.get("itemPrice"), 1000)); - final List lessThanItemsList = session.createQuery(criteriaItem).getResultList(); - final String lessThanItems[] = new String[lessThanItemsList.size()]; - for (int i = 0; i < lessThanItemsList.size(); i++) { - lessThanItems[i] = lessThanItemsList.get(i).getItemName(); - } - session.close(); - return lessThanItems; - } - - // To get items whose Name start with Chair - public String[] likeCriteria() { - final Session session = HibernateUtil.getHibernateSession(); - - CriteriaBuilder builder = session.getCriteriaBuilder(); - CriteriaQuery criteriaItem = builder.createQuery(Item.class); - Root rootItem = criteriaItem.from(Item.class); - criteriaItem.select(rootItem).where(builder.like(rootItem.get("itemName"), "%chair%")); - final List likeItemsList = session.createQuery(criteriaItem).getResultList(); - final String likeItems[] = new String[likeItemsList.size()]; - for (int i = 0; i < likeItemsList.size(); i++) { - likeItems[i] = likeItemsList.get(i).getItemName(); - } - session.close(); - return likeItems; - } - - // Case sensitive search - public String[] likeCaseCriteria() { - final Session session = HibernateUtil.getHibernateSession(); - CriteriaBuilder builder = session.getCriteriaBuilder(); - CriteriaQuery criteriaItem = builder.createQuery(Item.class); - Root rootItem = criteriaItem.from(Item.class); - criteriaItem.select(rootItem).where(builder.like(rootItem.get("itemName"), "%Chair%")); - final List ilikeItemsList = session.createQuery(criteriaItem).getResultList(); - final String ilikeItems[] = new String[ilikeItemsList.size()]; - for (int i = 0; i < ilikeItemsList.size(); i++) { - ilikeItems[i] = ilikeItemsList.get(i).getItemName(); - } - session.close(); - return ilikeItems; - } - - // To get records having itemPrice in between 100 and 200 - public String[] betweenCriteria() { - final Session session = HibernateUtil.getHibernateSession(); - CriteriaBuilder builder = session.getCriteriaBuilder(); - CriteriaQuery criteriaItem = builder.createQuery(Item.class); - Root rootItem = criteriaItem.from(Item.class); - // To get items having price more than 1000 - criteriaItem.select(rootItem).where(builder.between(rootItem.get("itemPrice"), 100, 200)); - final List betweenItemsList = session.createQuery(criteriaItem).getResultList(); - final String betweenItems[] = new String[betweenItemsList.size()]; - for (int i = 0; i < betweenItemsList.size(); i++) { - betweenItems[i] = betweenItemsList.get(i).getItemName(); - } - session.close(); - return betweenItems; - } - - // To check if the given property is null - public String[] nullCriteria() { - final Session session = HibernateUtil.getHibernateSession(); - CriteriaBuilder builder = session.getCriteriaBuilder(); - CriteriaQuery criteriaItem = builder.createQuery(Item.class); - Root rootItem = criteriaItem.from(Item.class); - criteriaItem.select(rootItem).where(builder.isNull(rootItem.get("itemDescription"))); - final List nullItemsList = session.createQuery(criteriaItem).getResultList(); - final String nullDescItems[] = new String[nullItemsList.size()]; - for (int i = 0; i < nullItemsList.size(); i++) { - nullDescItems[i] = nullItemsList.get(i).getItemName(); - } - session.close(); - return nullDescItems; - } - - // To check if the given property is not null - public String[] notNullCriteria() { - final Session session = HibernateUtil.getHibernateSession(); - CriteriaBuilder builder = session.getCriteriaBuilder(); - CriteriaQuery criteriaItem = builder.createQuery(Item.class); - Root rootItem = criteriaItem.from(Item.class); - criteriaItem.select(rootItem).where(builder.isNotNull(rootItem.get("itemDescription"))); - final List notNullItemsList = session.createQuery(criteriaItem).getResultList(); - final String notNullDescItems[] = new String[notNullItemsList.size()]; - for (int i = 0; i < notNullItemsList.size(); i++) { - notNullDescItems[i] = notNullItemsList.get(i).getItemName(); - } - session.close(); - return notNullDescItems; - } - - // Adding more than one expression in one cr - public String[] twoCriteria() { - final Session session = HibernateUtil.getHibernateSession(); - CriteriaBuilder builder = session.getCriteriaBuilder(); - CriteriaQuery criteriaItem = builder.createQuery(Item.class); - Root rootItem = criteriaItem.from(Item.class); - criteriaItem.select(rootItem).where(builder.isNull(rootItem.get("itemDescription"))).where(builder.like(rootItem.get("itemName"), "chair%")); - final List notNullItemsList = session.createQuery(criteriaItem).getResultList(); - final String notNullDescItems[] = new String[notNullItemsList.size()]; - for (int i = 0; i < notNullItemsList.size(); i++) { - notNullDescItems[i] = notNullItemsList.get(i).getItemName(); - } - session.close(); - return notNullDescItems; - } - - // To get items matching with the above defined conditions joined - // with Logical AND - public String[] andLogicalCriteria() { - List predicates = new ArrayList(); - final Session session = HibernateUtil.getHibernateSession(); - CriteriaBuilder builder = session.getCriteriaBuilder(); - CriteriaQuery criteriaItem = builder.createQuery(Item.class); - Root rootItem = criteriaItem.from(Item.class); - predicates.add(builder.greaterThan(rootItem.get("itemPrice"), 1000)); - predicates.add(builder.like(rootItem.get("itemName"), "Chair%")); - Predicate andPredicate = builder.and(predicates.toArray(new Predicate[] {})); - criteriaItem.select(rootItem).where(andPredicate); - final List andItemsList = session.createQuery(criteriaItem).getResultList(); - final String andItems[] = new String[andItemsList.size()]; - for (int i = 0; i < andItemsList.size(); i++) { - andItems[i] = andItemsList.get(i).getItemName(); - } - session.close(); - return andItems; - } - - // To get items matching with the above defined conditions joined - // with Logical OR - public String[] orLogicalCriteria() { - List predicates = new ArrayList(); - final Session session = HibernateUtil.getHibernateSession(); - CriteriaBuilder builder = session.getCriteriaBuilder(); - CriteriaQuery criteriaItem = builder.createQuery(Item.class); - Root rootItem = criteriaItem.from(Item.class); - predicates.add(builder.greaterThan(rootItem.get("itemPrice"), 1000)); - predicates.add(builder.like(rootItem.get("itemName"), "Chair%")); - Predicate orPredicate = builder.or(predicates.toArray(new Predicate[] {})); - criteriaItem.select(rootItem).where(orPredicate); - final List orItemsList = session.createQuery(criteriaItem).getResultList(); - final String orItems[] = new String[orItemsList.size()]; - for (int i = 0; i < orItemsList.size(); i++) { - orItems[i] = orItemsList.get(i).getItemName(); - } - session.close(); - return orItems; - } - - // Sorting example - public String[] sortingCriteria() { - List listOrders = new ArrayList(); - final Session session = HibernateUtil.getHibernateSession(); - CriteriaBuilder builder = session.getCriteriaBuilder(); - CriteriaQuery criteriaItem = builder.createQuery(Item.class); - Root rootItem = criteriaItem.from(Item.class); - listOrders.add(builder.asc(rootItem.get("itemName"))); - listOrders.add(builder.desc(rootItem.get("itemPrice"))); - criteriaItem.orderBy(listOrders.toArray(new Order[] {})); - final List sortedItemsList = session.createQuery(criteriaItem).getResultList(); - final String sortedItems[] = new String[sortedItemsList.size()]; - for (int i = 0; i < sortedItemsList.size(); i++) { - sortedItems[i] = sortedItemsList.get(i).getItemName(); - } - session.close(); - return sortedItems; - } - - // Set projections Row Count - public Long[] projectionRowCount() { - final Session session = HibernateUtil.getHibernateSession(); - CriteriaBuilder builder = session.getCriteriaBuilder(); - CriteriaQuery criteriaItem = builder.createQuery(Tuple.class); - Root rootItem = criteriaItem.from(Item.class); - criteriaItem.multiselect(builder.count(rootItem)); - final List itemProjected = session.createQuery(criteriaItem).getResultList(); - final Long projectedRowCount[] = new Long[1]; - projectedRowCount[0] = (long) itemProjected.get(0).get(0); - session.close(); - return projectedRowCount; - } - - // Set projections average of itemPrice - public Double[] projectionAverage() { - final Session session = HibernateUtil.getHibernateSession(); - CriteriaBuilder builder = session.getCriteriaBuilder(); - CriteriaQuery criteriaItem = builder.createQuery(Tuple.class); - Root rootItem = criteriaItem.from(Item.class); - criteriaItem.multiselect(builder.avg(rootItem.get("itemPrice"))); - final List itemProjected = session.createQuery(criteriaItem).getResultList(); - Double avgItemPrice[] = new Double[1]; - avgItemPrice[0] = Double.valueOf(itemProjected.get(0).get(0).toString()); - session.close(); - return avgItemPrice; - } - -} diff --git a/spring-hibernate5/src/main/java/com/baeldung/hibernate/fetching/model/OrderDetail.java b/spring-hibernate5/src/main/java/com/baeldung/hibernate/fetching/model/OrderDetail.java deleted file mode 100644 index f4a9b8a678..0000000000 --- a/spring-hibernate5/src/main/java/com/baeldung/hibernate/fetching/model/OrderDetail.java +++ /dev/null @@ -1,58 +0,0 @@ -package com.baeldung.hibernate.fetching.model; - -import javax.persistence.*; -import java.io.Serializable; -import java.sql.Date; - -@Entity -@Table(name = "USER_ORDER") -public class OrderDetail implements Serializable { - - private static final long serialVersionUID = 1L; - - @Id - @GeneratedValue - @Column(name = "ORDER_ID") - private Long orderId; - - public OrderDetail() { - } - - public OrderDetail(Date orderDate, String orderDesc) { - super(); - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((orderId == null) ? 0 : orderId.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - OrderDetail other = (OrderDetail) obj; - if (orderId == null) { - if (other.orderId != null) - return false; - } else if (!orderId.equals(other.orderId)) - return false; - - return true; - } - - public Long getOrderId() { - return orderId; - } - - public void setOrderId(Long orderId) { - this.orderId = orderId; - } -} diff --git a/spring-hibernate5/src/main/java/com/baeldung/hibernate/fetching/model/UserEager.java b/spring-hibernate5/src/main/java/com/baeldung/hibernate/fetching/model/UserEager.java deleted file mode 100644 index a1aa746399..0000000000 --- a/spring-hibernate5/src/main/java/com/baeldung/hibernate/fetching/model/UserEager.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.baeldung.hibernate.fetching.model; - -import javax.persistence.*; -import java.io.Serializable; -import java.util.HashSet; -import java.util.Set; - -@Entity -@Table(name = "USER") -public class UserEager implements Serializable { - - private static final long serialVersionUID = 1L; - - @Id - @GeneratedValue - @Column(name = "USER_ID") - private Long userId; - - @OneToMany(fetch = FetchType.EAGER, mappedBy = "user") - private Set orderDetail = new HashSet(); - - public UserEager() { - } - - public UserEager(final Long userId) { - super(); - this.userId = userId; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((userId == null) ? 0 : userId.hashCode()); - return result; - } - - @Override - public boolean equals(final Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - final UserEager other = (UserEager) obj; - if (userId == null) { - if (other.userId != null) - return false; - } else if (!userId.equals(other.userId)) - return false; - return true; - } - - public Long getUserId() { - return userId; - } - - public void setUserId(final Long userId) { - this.userId = userId; - } - - public Set getOrderDetail() { - return orderDetail; - } - - public void setOrderDetail(Set orderDetail) { - this.orderDetail = orderDetail; - } - -} diff --git a/spring-hibernate5/src/main/java/com/baeldung/hibernate/fetching/model/UserLazy.java b/spring-hibernate5/src/main/java/com/baeldung/hibernate/fetching/model/UserLazy.java deleted file mode 100644 index e1354b5d24..0000000000 --- a/spring-hibernate5/src/main/java/com/baeldung/hibernate/fetching/model/UserLazy.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.baeldung.hibernate.fetching.model; - -import javax.persistence.*; -import java.io.Serializable; -import java.util.HashSet; -import java.util.Set; - -@Entity -@Table(name = "USER") -public class UserLazy implements Serializable { - - private static final long serialVersionUID = 1L; - - @Id - @GeneratedValue - @Column(name = "USER_ID") - private Long userId; - - @OneToMany(fetch = FetchType.LAZY, mappedBy = "user") - private Set orderDetail = new HashSet(); - - public UserLazy() { - } - - public UserLazy(final Long userId) { - super(); - this.userId = userId; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((userId == null) ? 0 : userId.hashCode()); - return result; - } - - @Override - public boolean equals(final Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - final UserLazy other = (UserLazy) obj; - if (userId == null) { - if (other.userId != null) - return false; - } else if (!userId.equals(other.userId)) - return false; - return true; - } - - public Long getUserId() { - return userId; - } - - public void setUserId(final Long userId) { - this.userId = userId; - } - - public Set getOrderDetail() { - return orderDetail; - } - - public void setOrderDetail(Set orderDetail) { - this.orderDetail = orderDetail; - } - -} diff --git a/spring-hibernate5/src/main/java/com/baeldung/hibernate/fetching/util/HibernateUtil.java b/spring-hibernate5/src/main/java/com/baeldung/hibernate/fetching/util/HibernateUtil.java deleted file mode 100644 index 422de2ea93..0000000000 --- a/spring-hibernate5/src/main/java/com/baeldung/hibernate/fetching/util/HibernateUtil.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.baeldung.hibernate.fetching.util; - -import org.hibernate.Session; -import org.hibernate.SessionFactory; -import org.hibernate.cfg.Configuration; - -public class HibernateUtil { - - public static Session getHibernateSession(String fetchMethod) { - // two config files are there - // one with lazy loading enabled - // another lazy = false - SessionFactory sf; - if ("lazy".equals(fetchMethod)) { - sf = new Configuration().configure("fetchingLazy.cfg.xml").buildSessionFactory(); - } else { - sf = new Configuration().configure("fetching.cfg.xml").buildSessionFactory(); - } - - // fetching.cfg.xml is used for this example - return sf.openSession(); - } - - public static Session getHibernateSession() { - return new Configuration().configure("fetching.cfg.xml").buildSessionFactory().openSession(); - } - -} diff --git a/spring-hibernate5/src/main/java/com/baeldung/hibernate/fetching/view/FetchingAppView.java b/spring-hibernate5/src/main/java/com/baeldung/hibernate/fetching/view/FetchingAppView.java deleted file mode 100644 index 7fc543f693..0000000000 --- a/spring-hibernate5/src/main/java/com/baeldung/hibernate/fetching/view/FetchingAppView.java +++ /dev/null @@ -1,68 +0,0 @@ -package com.baeldung.hibernate.fetching.view; - -import com.baeldung.hibernate.fetching.model.OrderDetail; -import com.baeldung.hibernate.fetching.model.UserEager; -import com.baeldung.hibernate.fetching.model.UserLazy; -import com.baeldung.hibernate.fetching.util.HibernateUtil; -import org.hibernate.Session; -import org.hibernate.Transaction; - -import java.util.List; -import java.util.Set; - -public class FetchingAppView { - - public FetchingAppView() { - - } - - // lazily loaded - public Set lazyLoaded() { - final Session sessionLazy = HibernateUtil.getHibernateSession("lazy"); - List users = sessionLazy.createQuery("From UserLazy").getResultList(); - UserLazy userLazyLoaded = users.get(3); - // since data is lazyloaded so data won't be initialized - return (userLazyLoaded.getOrderDetail()); - } - - // eagerly loaded - public Set eagerLoaded() { - final Session sessionEager = HibernateUtil.getHibernateSession(); - // data should be loaded in the following line - // also note the queries generated - List user = sessionEager.createQuery("From UserEager").getResultList(); - UserEager userEagerLoaded = user.get(3); - return userEagerLoaded.getOrderDetail(); - } - - // creates test data - // call this method to create the data in the database - public void createTestData() { - - final Session session = HibernateUtil.getHibernateSession("lazy"); - Transaction tx = session.beginTransaction(); - final UserLazy user1 = new UserLazy(); - final UserLazy user2 = new UserLazy(); - final UserLazy user3 = new UserLazy(); - - session.save(user1); - session.save(user2); - session.save(user3); - - final OrderDetail order1 = new OrderDetail(); - final OrderDetail order2 = new OrderDetail(); - final OrderDetail order3 = new OrderDetail(); - final OrderDetail order4 = new OrderDetail(); - final OrderDetail order5 = new OrderDetail(); - - session.saveOrUpdate(order1); - session.saveOrUpdate(order2); - session.saveOrUpdate(order3); - session.saveOrUpdate(order4); - session.saveOrUpdate(order5); - - tx.commit(); - session.close(); - - } -} diff --git a/spring-hibernate5/src/main/java/com/baeldung/persistence/dao/IBarAuditableDao.java b/spring-hibernate5/src/main/java/com/baeldung/persistence/dao/IBarAuditableDao.java deleted file mode 100644 index 182b493592..0000000000 --- a/spring-hibernate5/src/main/java/com/baeldung/persistence/dao/IBarAuditableDao.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.baeldung.persistence.dao; - -import com.baeldung.persistence.dao.common.IAuditOperations; -import com.baeldung.persistence.model.Bar; - -public interface IBarAuditableDao extends IBarDao, IAuditOperations { - // -} diff --git a/spring-hibernate5/src/main/java/com/baeldung/persistence/dao/IBarCrudRepository.java b/spring-hibernate5/src/main/java/com/baeldung/persistence/dao/IBarCrudRepository.java deleted file mode 100644 index 4d7db64240..0000000000 --- a/spring-hibernate5/src/main/java/com/baeldung/persistence/dao/IBarCrudRepository.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.baeldung.persistence.dao; - -import java.io.Serializable; - -import com.baeldung.persistence.model.Bar; -import org.springframework.data.repository.CrudRepository; - -public interface IBarCrudRepository extends CrudRepository { - // -} diff --git a/spring-hibernate5/src/main/java/com/baeldung/persistence/dao/IBarDao.java b/spring-hibernate5/src/main/java/com/baeldung/persistence/dao/IBarDao.java deleted file mode 100644 index 7896a2a84a..0000000000 --- a/spring-hibernate5/src/main/java/com/baeldung/persistence/dao/IBarDao.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.baeldung.persistence.dao; - -import com.baeldung.persistence.dao.common.IOperations; -import com.baeldung.persistence.model.Bar; - -public interface IBarDao extends IOperations { - // -} diff --git a/spring-hibernate5/src/main/java/com/baeldung/persistence/dao/IChildDao.java b/spring-hibernate5/src/main/java/com/baeldung/persistence/dao/IChildDao.java deleted file mode 100644 index a55a0b0598..0000000000 --- a/spring-hibernate5/src/main/java/com/baeldung/persistence/dao/IChildDao.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.baeldung.persistence.dao; - -import com.baeldung.persistence.model.Child; -import com.baeldung.persistence.dao.common.IOperations; - -public interface IChildDao extends IOperations { - // -} diff --git a/spring-hibernate5/src/main/java/com/baeldung/persistence/dao/IFooAuditableDao.java b/spring-hibernate5/src/main/java/com/baeldung/persistence/dao/IFooAuditableDao.java deleted file mode 100644 index ddbb685988..0000000000 --- a/spring-hibernate5/src/main/java/com/baeldung/persistence/dao/IFooAuditableDao.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.baeldung.persistence.dao; - -import com.baeldung.persistence.dao.common.IAuditOperations; -import com.baeldung.persistence.model.Foo; - -public interface IFooAuditableDao extends IFooDao, IAuditOperations { - // -} \ No newline at end of file diff --git a/spring-hibernate5/src/main/java/com/baeldung/persistence/dao/IParentDao.java b/spring-hibernate5/src/main/java/com/baeldung/persistence/dao/IParentDao.java deleted file mode 100644 index 03680158bb..0000000000 --- a/spring-hibernate5/src/main/java/com/baeldung/persistence/dao/IParentDao.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.baeldung.persistence.dao; - -import com.baeldung.persistence.model.Parent; -import com.baeldung.persistence.dao.common.IOperations; - -public interface IParentDao extends IOperations { - // -} diff --git a/spring-hibernate5/src/main/java/com/baeldung/persistence/dao/common/AbstractHibernateAuditableDao.java b/spring-hibernate5/src/main/java/com/baeldung/persistence/dao/common/AbstractHibernateAuditableDao.java deleted file mode 100644 index 41184669ad..0000000000 --- a/spring-hibernate5/src/main/java/com/baeldung/persistence/dao/common/AbstractHibernateAuditableDao.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.baeldung.persistence.dao.common; - -import java.io.Serializable; -import java.util.List; - -import org.hibernate.envers.AuditReader; -import org.hibernate.envers.AuditReaderFactory; -import org.hibernate.envers.query.AuditQuery; - -@SuppressWarnings("unchecked") -public class AbstractHibernateAuditableDao extends AbstractHibernateDao implements IAuditOperations { - - @Override - public List getEntitiesAtRevision(final Number revision) { - final AuditReader auditReader = AuditReaderFactory.get(getCurrentSession()); - final AuditQuery query = auditReader.createQuery().forEntitiesAtRevision(clazz, revision); - final List resultList = query.getResultList(); - return resultList; - } - - @Override - public List getEntitiesModifiedAtRevision(final Number revision) { - final AuditReader auditReader = AuditReaderFactory.get(getCurrentSession()); - final AuditQuery query = auditReader.createQuery().forEntitiesModifiedAtRevision(clazz, revision); - final List resultList = query.getResultList(); - return resultList; - } - - @Override - public List getRevisions() { - final AuditReader auditReader = AuditReaderFactory.get(getCurrentSession()); - final AuditQuery query = auditReader.createQuery().forRevisionsOfEntity(clazz, true, true); - final List resultList = query.getResultList(); - return resultList; - } - -} diff --git a/spring-hibernate5/src/main/java/com/baeldung/persistence/dao/common/AbstractJpaDao.java b/spring-hibernate5/src/main/java/com/baeldung/persistence/dao/common/AbstractJpaDao.java deleted file mode 100644 index 69f8e58c25..0000000000 --- a/spring-hibernate5/src/main/java/com/baeldung/persistence/dao/common/AbstractJpaDao.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.baeldung.persistence.dao.common; - -import java.io.Serializable; -import java.util.List; - -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; -import javax.persistence.TypedQuery; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Root; - -public class AbstractJpaDao extends AbstractDao implements IOperations { - - @PersistenceContext - private EntityManager em; - - // API - - @Override - public T findOne(final long id) { - return em.find(clazz, Long.valueOf(id).intValue()); - } - - @Override - public List findAll() { - final CriteriaBuilder cb = em.getCriteriaBuilder(); - final CriteriaQuery cq = cb.createQuery(clazz); - final Root rootEntry = cq.from(clazz); - final CriteriaQuery all = cq.select(rootEntry); - final TypedQuery allQuery = em.createQuery(all); - return allQuery.getResultList(); - } - - @Override - public void create(final T entity) { - em.persist(entity); - } - - @Override - public T update(final T entity) { - em.merge(entity); - return entity; - } - - @Override - public void delete(final T entity) { - em.remove(entity); - } - - @Override - public void deleteById(final long entityId) { - delete(findOne(entityId)); - } - -} diff --git a/spring-hibernate5/src/main/java/com/baeldung/persistence/dao/common/GenericHibernateDao.java b/spring-hibernate5/src/main/java/com/baeldung/persistence/dao/common/GenericHibernateDao.java deleted file mode 100644 index 18b16fa033..0000000000 --- a/spring-hibernate5/src/main/java/com/baeldung/persistence/dao/common/GenericHibernateDao.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.baeldung.persistence.dao.common; - -import java.io.Serializable; - -import org.springframework.beans.factory.config.BeanDefinition; -import org.springframework.context.annotation.Scope; -import org.springframework.stereotype.Repository; - -@Repository -@Scope(BeanDefinition.SCOPE_PROTOTYPE) -public class GenericHibernateDao extends AbstractHibernateDao implements IGenericDao { - // -} \ No newline at end of file diff --git a/spring-hibernate5/src/main/java/com/baeldung/persistence/dao/common/IAuditOperations.java b/spring-hibernate5/src/main/java/com/baeldung/persistence/dao/common/IAuditOperations.java deleted file mode 100644 index 169d3fed72..0000000000 --- a/spring-hibernate5/src/main/java/com/baeldung/persistence/dao/common/IAuditOperations.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.baeldung.persistence.dao.common; - -import java.io.Serializable; -import java.util.List; - -public interface IAuditOperations { - - List getEntitiesAtRevision(Number revision); - - List getEntitiesModifiedAtRevision(Number revision); - - List getRevisions(); - -} diff --git a/spring-hibernate5/src/main/java/com/baeldung/persistence/dao/common/IGenericDao.java b/spring-hibernate5/src/main/java/com/baeldung/persistence/dao/common/IGenericDao.java deleted file mode 100644 index 8d8af18394..0000000000 --- a/spring-hibernate5/src/main/java/com/baeldung/persistence/dao/common/IGenericDao.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.baeldung.persistence.dao.common; - -import java.io.Serializable; - -public interface IGenericDao extends IOperations { - // -} diff --git a/spring-hibernate5/src/main/java/com/baeldung/persistence/dao/impl/BarAuditableDao.java b/spring-hibernate5/src/main/java/com/baeldung/persistence/dao/impl/BarAuditableDao.java deleted file mode 100644 index e12b6ae2da..0000000000 --- a/spring-hibernate5/src/main/java/com/baeldung/persistence/dao/impl/BarAuditableDao.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.baeldung.persistence.dao.impl; - -import java.util.List; - -import com.baeldung.persistence.dao.IBarAuditableDao; -import com.baeldung.persistence.dao.common.AbstractHibernateAuditableDao; -import com.baeldung.persistence.model.Bar; - -public class BarAuditableDao extends AbstractHibernateAuditableDao implements IBarAuditableDao { - - public BarAuditableDao() { - super(); - - setClazz(Bar.class); - } - - // API - - @Override - public List getRevisions() { - final List resultList = super.getRevisions(); - for (final Bar bar : resultList) { - bar.getFooSet().size(); // force FooSet initialization - } - return resultList; - } - -} \ No newline at end of file diff --git a/spring-hibernate5/src/main/java/com/baeldung/persistence/dao/impl/BarDao.java b/spring-hibernate5/src/main/java/com/baeldung/persistence/dao/impl/BarDao.java deleted file mode 100644 index 0ead802dc5..0000000000 --- a/spring-hibernate5/src/main/java/com/baeldung/persistence/dao/impl/BarDao.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.baeldung.persistence.dao.impl; - -import com.baeldung.persistence.dao.common.AbstractHibernateDao; -import com.baeldung.persistence.dao.IBarDao; -import com.baeldung.persistence.model.Bar; -import org.springframework.stereotype.Repository; - -@Repository -public class BarDao extends AbstractHibernateDao implements IBarDao { - - public BarDao() { - super(); - - setClazz(Bar.class); - } - - // API - -} diff --git a/spring-hibernate5/src/main/java/com/baeldung/persistence/dao/impl/BarJpaDao.java b/spring-hibernate5/src/main/java/com/baeldung/persistence/dao/impl/BarJpaDao.java deleted file mode 100644 index e0fa382d41..0000000000 --- a/spring-hibernate5/src/main/java/com/baeldung/persistence/dao/impl/BarJpaDao.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.baeldung.persistence.dao.impl; - -import com.baeldung.persistence.dao.IBarDao; -import com.baeldung.persistence.dao.common.AbstractJpaDao; -import com.baeldung.persistence.model.Bar; -import org.springframework.stereotype.Repository; - -@Repository -public class BarJpaDao extends AbstractJpaDao implements IBarDao { - - public BarJpaDao() { - super(); - - setClazz(Bar.class); - } - - // API - -} diff --git a/spring-hibernate5/src/main/java/com/baeldung/persistence/dao/impl/ChildDao.java b/spring-hibernate5/src/main/java/com/baeldung/persistence/dao/impl/ChildDao.java deleted file mode 100644 index b55da6e43a..0000000000 --- a/spring-hibernate5/src/main/java/com/baeldung/persistence/dao/impl/ChildDao.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.baeldung.persistence.dao.impl; - -import com.baeldung.persistence.dao.common.AbstractHibernateDao; -import com.baeldung.persistence.model.Child; -import com.baeldung.persistence.dao.IChildDao; -import org.springframework.stereotype.Repository; - -@Repository -public class ChildDao extends AbstractHibernateDao implements IChildDao { - - public ChildDao() { - super(); - - setClazz(Child.class); - } - - // API - -} diff --git a/spring-hibernate5/src/main/java/com/baeldung/persistence/dao/impl/FooAuditableDao.java b/spring-hibernate5/src/main/java/com/baeldung/persistence/dao/impl/FooAuditableDao.java deleted file mode 100644 index 05064c1478..0000000000 --- a/spring-hibernate5/src/main/java/com/baeldung/persistence/dao/impl/FooAuditableDao.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.baeldung.persistence.dao.impl; - -import com.baeldung.persistence.dao.common.AbstractHibernateAuditableDao; -import com.baeldung.persistence.model.Foo; -import com.baeldung.persistence.dao.IFooAuditableDao; - -public class FooAuditableDao extends AbstractHibernateAuditableDao implements IFooAuditableDao { - - public FooAuditableDao() { - super(); - - setClazz(Foo.class); - } - - // API - -} diff --git a/spring-hibernate5/src/main/java/com/baeldung/persistence/dao/impl/FooDao.java b/spring-hibernate5/src/main/java/com/baeldung/persistence/dao/impl/FooHibernateDao.java similarity index 74% rename from spring-hibernate5/src/main/java/com/baeldung/persistence/dao/impl/FooDao.java rename to spring-hibernate5/src/main/java/com/baeldung/persistence/dao/impl/FooHibernateDao.java index 787c449b1d..5411073360 100644 --- a/spring-hibernate5/src/main/java/com/baeldung/persistence/dao/impl/FooDao.java +++ b/spring-hibernate5/src/main/java/com/baeldung/persistence/dao/impl/FooHibernateDao.java @@ -6,9 +6,9 @@ import com.baeldung.persistence.model.Foo; import org.springframework.stereotype.Repository; @Repository -public class FooDao extends AbstractHibernateDao implements IFooDao { +public class FooHibernateDao extends AbstractHibernateDao implements IFooDao { - public FooDao() { + public FooHibernateDao() { super(); setClazz(Foo.class); diff --git a/spring-hibernate5/src/main/java/com/baeldung/persistence/dao/impl/ParentDao.java b/spring-hibernate5/src/main/java/com/baeldung/persistence/dao/impl/ParentDao.java deleted file mode 100644 index 4602b5f30e..0000000000 --- a/spring-hibernate5/src/main/java/com/baeldung/persistence/dao/impl/ParentDao.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.baeldung.persistence.dao.impl; - -import com.baeldung.persistence.dao.IParentDao; -import com.baeldung.persistence.dao.common.AbstractHibernateDao; -import com.baeldung.persistence.model.Parent; -import org.springframework.stereotype.Repository; - -@Repository -public class ParentDao extends AbstractHibernateDao implements IParentDao { - - public ParentDao() { - super(); - - setClazz(Parent.class); - } - - // API - -} diff --git a/spring-hibernate5/src/main/java/com/baeldung/persistence/model/Bar.java b/spring-hibernate5/src/main/java/com/baeldung/persistence/model/Bar.java deleted file mode 100644 index c7f05254cc..0000000000 --- a/spring-hibernate5/src/main/java/com/baeldung/persistence/model/Bar.java +++ /dev/null @@ -1,242 +0,0 @@ -package com.baeldung.persistence.model; - -import java.io.Serializable; -import java.util.Date; -import java.util.Set; - -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.EntityListeners; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.NamedQuery; -import javax.persistence.OneToMany; -import javax.persistence.PrePersist; -import javax.persistence.PreRemove; -import javax.persistence.PreUpdate; - -import org.hibernate.annotations.OrderBy; -import org.hibernate.envers.Audited; -import org.jboss.logging.Logger; -import org.springframework.data.annotation.CreatedBy; -import org.springframework.data.annotation.CreatedDate; -import org.springframework.data.annotation.LastModifiedBy; -import org.springframework.data.annotation.LastModifiedDate; -import org.springframework.data.jpa.domain.support.AuditingEntityListener; - -import com.google.common.collect.Sets; - -@Entity -@NamedQuery(name = "Bar.findAll", query = "SELECT b FROM Bar b") -@Audited -@EntityListeners(AuditingEntityListener.class) -public class Bar implements Serializable { - - private static Logger logger = Logger.getLogger(Bar.class); - - public enum OPERATION { - INSERT, UPDATE, DELETE; - private String value; - - OPERATION() { - value = toString(); - } - - public String getValue() { - return value; - } - - public static OPERATION parse(final String value) { - OPERATION operation = null; - for (final OPERATION op : OPERATION.values()) { - if (op.getValue().equals(value)) { - operation = op; - break; - } - } - return operation; - } - }; - - @Id - @GeneratedValue(strategy = GenerationType.AUTO) - @Column(name = "id") - private int id; - - @Column(name = "name") - private String name; - - @OneToMany(mappedBy = "bar", cascade = CascadeType.ALL, fetch = FetchType.LAZY) - @OrderBy(clause = "NAME DESC") - // @NotAudited - private Set fooSet = Sets.newHashSet(); - - @Column(name = "operation") - private String operation; - - @Column(name = "timestamp") - private long timestamp; - - @Column(name = "created_date", updatable = false, nullable = false) - @CreatedDate - private long createdDate; - - @Column(name = "modified_date") - @LastModifiedDate - private long modifiedDate; - - @Column(name = "created_by") - @CreatedBy - private String createdBy; - - @Column(name = "modified_by") - @LastModifiedBy - private String modifiedBy; - - public Bar() { - super(); - } - - public Bar(final String name) { - super(); - - this.name = name; - } - - // API - - public Set getFooSet() { - return fooSet; - } - - public void setFooSet(final Set fooSet) { - this.fooSet = fooSet; - } - - public int getId() { - return id; - } - - public void setId(final int id) { - this.id = id; - } - - public String getName() { - return name; - } - - public void setName(final String name) { - this.name = name; - } - - public OPERATION getOperation() { - return OPERATION.parse(operation); - } - - public void setOperation(final OPERATION operation) { - this.operation = operation.getValue(); - } - - public long getTimestamp() { - return timestamp; - } - - public void setTimestamp(final long timestamp) { - this.timestamp = timestamp; - } - - public long getCreatedDate() { - return createdDate; - } - - public void setCreatedDate(final long createdDate) { - this.createdDate = createdDate; - } - - public long getModifiedDate() { - return modifiedDate; - } - - public void setModifiedDate(final long modifiedDate) { - this.modifiedDate = modifiedDate; - } - - public String getCreatedBy() { - return createdBy; - } - - public void setCreatedBy(final String createdBy) { - this.createdBy = createdBy; - } - - public String getModifiedBy() { - return modifiedBy; - } - - public void setModifiedBy(final String modifiedBy) { - this.modifiedBy = modifiedBy; - } - - public void setOperation(final String operation) { - this.operation = operation; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((name == null) ? 0 : name.hashCode()); - return result; - } - - @Override - public boolean equals(final Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - final Bar other = (Bar) obj; - if (name == null) { - if (other.name != null) - return false; - } else if (!name.equals(other.name)) - return false; - return true; - } - - @Override - public String toString() { - final StringBuilder builder = new StringBuilder(); - builder.append("Bar [name=").append(name).append("]"); - return builder.toString(); - } - - @PrePersist - public void onPrePersist() { - logger.info("@PrePersist"); - audit(OPERATION.INSERT); - } - - @PreUpdate - public void onPreUpdate() { - logger.info("@PreUpdate"); - audit(OPERATION.UPDATE); - } - - @PreRemove - public void onPreRemove() { - logger.info("@PreRemove"); - audit(OPERATION.DELETE); - } - - private void audit(final OPERATION operation) { - setOperation(operation); - setTimestamp((new Date()).getTime()); - } - -} diff --git a/spring-hibernate5/src/main/java/com/baeldung/persistence/model/Child.java b/spring-hibernate5/src/main/java/com/baeldung/persistence/model/Child.java deleted file mode 100644 index 19cfb2e237..0000000000 --- a/spring-hibernate5/src/main/java/com/baeldung/persistence/model/Child.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.baeldung.persistence.model; - -import java.io.Serializable; - -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToOne; - -@Entity -public class Child implements Serializable { - - @Id - @GeneratedValue - private long id; - - @OneToOne(mappedBy = "child") - private Parent parent; - - public Child() { - super(); - } - - // API - - public long getId() { - return id; - } - - public void setId(final long id) { - this.id = id; - } - - public Parent getParent() { - return parent; - } - - public void setParent(final Parent parent) { - this.parent = parent; - } - - // - - @Override - public String toString() { - final StringBuilder builder = new StringBuilder(); - builder.append("Child [id=").append(id).append("]"); - return builder.toString(); - } - -} diff --git a/spring-hibernate5/src/main/java/com/baeldung/persistence/model/Foo.java b/spring-hibernate5/src/main/java/com/baeldung/persistence/model/Foo.java index d36a1e58cf..a537797189 100644 --- a/spring-hibernate5/src/main/java/com/baeldung/persistence/model/Foo.java +++ b/spring-hibernate5/src/main/java/com/baeldung/persistence/model/Foo.java @@ -1,25 +1,9 @@ package com.baeldung.persistence.model; +import javax.persistence.*; import java.io.Serializable; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.NamedNativeQueries; -import javax.persistence.NamedNativeQuery; - -import org.hibernate.envers.Audited; - -@NamedNativeQueries({ @NamedNativeQuery(name = "callGetAllFoos", query = "CALL GetAllFoos()", resultClass = Foo.class), @NamedNativeQuery(name = "callGetFoosByName", query = "CALL GetFoosByName(:fooName)", resultClass = Foo.class) }) @Entity -@Audited -// @Proxy(lazy = false) public class Foo implements Serializable { @Id @@ -30,10 +14,6 @@ public class Foo implements Serializable { @Column(name = "name") private String name; - @ManyToOne(targetEntity = Bar.class, cascade = CascadeType.ALL, fetch = FetchType.EAGER) - @JoinColumn(name = "BAR_ID") - private Bar bar = new Bar(); - public Foo() { super(); } @@ -43,16 +23,6 @@ public class Foo implements Serializable { this.name = name; } - // - - public Bar getBar() { - return bar; - } - - public void setBar(final Bar bar) { - this.bar = bar; - } - public long getId() { return id; } @@ -69,8 +39,6 @@ public class Foo implements Serializable { this.name = name; } - // - @Override public int hashCode() { final int prime = 31; diff --git a/spring-hibernate5/src/main/java/com/baeldung/persistence/model/Parent.java b/spring-hibernate5/src/main/java/com/baeldung/persistence/model/Parent.java deleted file mode 100644 index fa6948990b..0000000000 --- a/spring-hibernate5/src/main/java/com/baeldung/persistence/model/Parent.java +++ /dev/null @@ -1,60 +0,0 @@ -package com.baeldung.persistence.model; - -import java.io.Serializable; - -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToOne; - -@Entity -public class Parent implements Serializable { - - @Id - @GeneratedValue - private long id; - - @OneToOne(cascade = { CascadeType.PERSIST, CascadeType.MERGE, CascadeType.REFRESH, CascadeType.DETACH }) - @JoinColumn(name = "child_fk") - private Child child; - - public Parent() { - super(); - } - - public Parent(final Child child) { - super(); - - this.child = child; - } - - // API - - public long getId() { - return id; - } - - public void setId(final long id) { - this.id = id; - } - - public Child getChild() { - return child; - } - - public void setChild(final Child child) { - this.child = child; - } - - // - - @Override - public String toString() { - final StringBuilder builder = new StringBuilder(); - builder.append("Parent [id=").append(id).append("]"); - return builder.toString(); - } - -} diff --git a/spring-hibernate5/src/main/java/com/baeldung/persistence/model/Person.java b/spring-hibernate5/src/main/java/com/baeldung/persistence/model/Person.java deleted file mode 100644 index 6a95a7acf5..0000000000 --- a/spring-hibernate5/src/main/java/com/baeldung/persistence/model/Person.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.baeldung.persistence.model; - -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; - -@Entity -public class Person { - - @Id - @GeneratedValue - private Long id; - - private String name; - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } -} diff --git a/spring-hibernate5/src/main/java/com/baeldung/persistence/service/IBarAuditableService.java b/spring-hibernate5/src/main/java/com/baeldung/persistence/service/IBarAuditableService.java deleted file mode 100644 index 33e5634d12..0000000000 --- a/spring-hibernate5/src/main/java/com/baeldung/persistence/service/IBarAuditableService.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.baeldung.persistence.service; - -import com.baeldung.persistence.dao.common.IAuditOperations; -import com.baeldung.persistence.model.Bar; - -public interface IBarAuditableService extends IBarService, IAuditOperations { - -} diff --git a/spring-hibernate5/src/main/java/com/baeldung/persistence/service/IBarService.java b/spring-hibernate5/src/main/java/com/baeldung/persistence/service/IBarService.java deleted file mode 100644 index 21185b5990..0000000000 --- a/spring-hibernate5/src/main/java/com/baeldung/persistence/service/IBarService.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.baeldung.persistence.service; - -import com.baeldung.persistence.dao.common.IOperations; -import com.baeldung.persistence.model.Bar; - -public interface IBarService extends IOperations { - // -} diff --git a/spring-hibernate5/src/main/java/com/baeldung/persistence/service/IChildService.java b/spring-hibernate5/src/main/java/com/baeldung/persistence/service/IChildService.java deleted file mode 100644 index afe67a70c2..0000000000 --- a/spring-hibernate5/src/main/java/com/baeldung/persistence/service/IChildService.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.baeldung.persistence.service; - -import com.baeldung.persistence.model.Child; -import com.baeldung.persistence.dao.common.IOperations; - -public interface IChildService extends IOperations { - // -} diff --git a/spring-hibernate5/src/main/java/com/baeldung/persistence/service/IFooAuditableService.java b/spring-hibernate5/src/main/java/com/baeldung/persistence/service/IFooAuditableService.java deleted file mode 100644 index b787e7fe91..0000000000 --- a/spring-hibernate5/src/main/java/com/baeldung/persistence/service/IFooAuditableService.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.baeldung.persistence.service; - -import com.baeldung.persistence.dao.common.IAuditOperations; -import com.baeldung.persistence.model.Foo; - -public interface IFooAuditableService extends IFooService, IAuditOperations { - // -} diff --git a/spring-hibernate5/src/main/java/com/baeldung/persistence/service/IFooService.java b/spring-hibernate5/src/main/java/com/baeldung/persistence/service/IFooService.java deleted file mode 100644 index ffdb53964a..0000000000 --- a/spring-hibernate5/src/main/java/com/baeldung/persistence/service/IFooService.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.baeldung.persistence.service; - -import com.baeldung.persistence.model.Foo; -import com.baeldung.persistence.dao.common.IOperations; - -public interface IFooService extends IOperations { - // -} diff --git a/spring-hibernate5/src/main/java/com/baeldung/persistence/service/IParentService.java b/spring-hibernate5/src/main/java/com/baeldung/persistence/service/IParentService.java deleted file mode 100644 index f941416aac..0000000000 --- a/spring-hibernate5/src/main/java/com/baeldung/persistence/service/IParentService.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.baeldung.persistence.service; - -import com.baeldung.persistence.model.Parent; -import com.baeldung.persistence.dao.common.IOperations; - -public interface IParentService extends IOperations { - // -} diff --git a/spring-hibernate5/src/main/java/com/baeldung/persistence/service/common/AbstractHibernateAuditableService.java b/spring-hibernate5/src/main/java/com/baeldung/persistence/service/common/AbstractHibernateAuditableService.java deleted file mode 100644 index 2695d7760a..0000000000 --- a/spring-hibernate5/src/main/java/com/baeldung/persistence/service/common/AbstractHibernateAuditableService.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.baeldung.persistence.service.common; - -import java.io.Serializable; -import java.util.List; - -import com.baeldung.persistence.dao.common.IAuditOperations; -import com.baeldung.persistence.dao.common.IOperations; -import org.springframework.transaction.annotation.Transactional; - -@Transactional(value = "hibernateTransactionManager") -public abstract class AbstractHibernateAuditableService extends AbstractHibernateService implements IOperations, IAuditOperations { - - @Override - public List getEntitiesAtRevision(final Number revision) { - return getAuditableDao().getEntitiesAtRevision(revision); - } - - @Override - public List getEntitiesModifiedAtRevision(final Number revision) { - return getAuditableDao().getEntitiesModifiedAtRevision(revision); - } - - @Override - public List getRevisions() { - return getAuditableDao().getRevisions(); - } - - abstract protected IAuditOperations getAuditableDao(); - -} diff --git a/spring-hibernate5/src/main/java/com/baeldung/persistence/service/common/AbstractHibernateService.java b/spring-hibernate5/src/main/java/com/baeldung/persistence/service/common/AbstractHibernateService.java deleted file mode 100644 index 02b8ccf48b..0000000000 --- a/spring-hibernate5/src/main/java/com/baeldung/persistence/service/common/AbstractHibernateService.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.baeldung.persistence.service.common; - -import java.io.Serializable; -import java.util.List; - -import com.baeldung.persistence.dao.common.IOperations; -import org.springframework.transaction.annotation.Transactional; - -@Transactional(value = "hibernateTransactionManager") -public abstract class AbstractHibernateService extends AbstractService implements IOperations { - - @Override - public T findOne(final long id) { - return super.findOne(id); - } - - @Override - public List findAll() { - return super.findAll(); - } - - @Override - public void create(final T entity) { - super.create(entity); - } - - @Override - public T update(final T entity) { - return super.update(entity); - } - - @Override - public void delete(final T entity) { - super.delete(entity); - } - - @Override - public void deleteById(final long entityId) { - super.deleteById(entityId); - } - -} diff --git a/spring-hibernate5/src/main/java/com/baeldung/persistence/service/common/AbstractJpaService.java b/spring-hibernate5/src/main/java/com/baeldung/persistence/service/common/AbstractJpaService.java deleted file mode 100644 index a1c6fe9edf..0000000000 --- a/spring-hibernate5/src/main/java/com/baeldung/persistence/service/common/AbstractJpaService.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.baeldung.persistence.service.common; - -import java.io.Serializable; -import java.util.List; - -import com.baeldung.persistence.dao.common.IOperations; -import org.springframework.transaction.annotation.Transactional; - -@Transactional(value = "jpaTransactionManager") -public abstract class AbstractJpaService extends AbstractService implements IOperations { - - @Override - public T findOne(final long id) { - return super.findOne(id); - } - - @Override - public List findAll() { - return super.findAll(); - } - - @Override - public void create(final T entity) { - super.create(entity); - } - - @Override - public T update(final T entity) { - return super.update(entity); - } - - @Override - public void delete(final T entity) { - super.delete(entity); - } - - @Override - public void deleteById(final long entityId) { - super.deleteById(entityId); - } - -} diff --git a/spring-hibernate5/src/main/java/com/baeldung/persistence/service/common/AbstractService.java b/spring-hibernate5/src/main/java/com/baeldung/persistence/service/common/AbstractService.java deleted file mode 100644 index 9b001b1fac..0000000000 --- a/spring-hibernate5/src/main/java/com/baeldung/persistence/service/common/AbstractService.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.baeldung.persistence.service.common; - -import java.io.Serializable; -import java.util.List; - -import com.baeldung.persistence.dao.common.IOperations; - -public abstract class AbstractService implements IOperations { - - @Override - public T findOne(final long id) { - return getDao().findOne(id); - } - - @Override - public List findAll() { - return getDao().findAll(); - } - - @Override - public void create(final T entity) { - getDao().create(entity); - } - - @Override - public T update(final T entity) { - return getDao().update(entity); - } - - @Override - public void delete(final T entity) { - getDao().delete(entity); - } - - @Override - public void deleteById(final long entityId) { - getDao().deleteById(entityId); - } - - protected abstract IOperations getDao(); - -} diff --git a/spring-hibernate5/src/main/java/com/baeldung/persistence/service/common/AbstractSpringDataJpaService.java b/spring-hibernate5/src/main/java/com/baeldung/persistence/service/common/AbstractSpringDataJpaService.java deleted file mode 100644 index cef483e6bf..0000000000 --- a/spring-hibernate5/src/main/java/com/baeldung/persistence/service/common/AbstractSpringDataJpaService.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.baeldung.persistence.service.common; - -import java.io.Serializable; -import java.util.List; - -import com.baeldung.persistence.dao.common.IOperations; -import org.springframework.data.repository.CrudRepository; -import org.springframework.transaction.annotation.Transactional; - -import com.google.common.collect.Lists; - -@Transactional(value = "jpaTransactionManager") -public abstract class AbstractSpringDataJpaService implements IOperations { - - @Override - public T findOne(final long id) { - return getDao().findOne(Long.valueOf(id)); - } - - @Override - public List findAll() { - return Lists.newArrayList(getDao().findAll()); - } - - @Override - public void create(final T entity) { - getDao().save(entity); - } - - @Override - public T update(final T entity) { - return getDao().save(entity); - } - - @Override - public void delete(final T entity) { - getDao().delete(entity); - } - - @Override - public void deleteById(final long entityId) { - getDao().delete(Long.valueOf(entityId)); - } - - protected abstract CrudRepository getDao(); -} diff --git a/spring-hibernate5/src/main/java/com/baeldung/persistence/service/impl/BarAuditableService.java b/spring-hibernate5/src/main/java/com/baeldung/persistence/service/impl/BarAuditableService.java deleted file mode 100644 index d84c28caa5..0000000000 --- a/spring-hibernate5/src/main/java/com/baeldung/persistence/service/impl/BarAuditableService.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.baeldung.persistence.service.impl; - -import com.baeldung.persistence.dao.common.IAuditOperations; -import com.baeldung.persistence.service.common.AbstractHibernateAuditableService; -import com.baeldung.persistence.dao.IBarAuditableDao; -import com.baeldung.persistence.dao.IBarDao; -import com.baeldung.persistence.dao.common.IOperations; -import com.baeldung.persistence.model.Bar; -import com.baeldung.persistence.service.IBarAuditableService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Service; - -@Service -public class BarAuditableService extends AbstractHibernateAuditableService implements IBarAuditableService { - - @Autowired - @Qualifier("barHibernateDao") - private IBarDao dao; - - @Autowired - @Qualifier("barHibernateAuditableDao") - private IBarAuditableDao auditDao; - - public BarAuditableService() { - super(); - } - - // API - - @Override - protected IOperations getDao() { - return dao; - } - - @Override - protected IAuditOperations getAuditableDao() { - return auditDao; - } - -} diff --git a/spring-hibernate5/src/main/java/com/baeldung/persistence/service/impl/BarJpaService.java b/spring-hibernate5/src/main/java/com/baeldung/persistence/service/impl/BarJpaService.java deleted file mode 100644 index 1c1b7a2274..0000000000 --- a/spring-hibernate5/src/main/java/com/baeldung/persistence/service/impl/BarJpaService.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.baeldung.persistence.service.impl; - -import com.baeldung.persistence.dao.IBarDao; -import com.baeldung.persistence.dao.common.IOperations; -import com.baeldung.persistence.model.Bar; -import com.baeldung.persistence.service.IBarService; -import com.baeldung.persistence.service.common.AbstractJpaService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Service; - -@Service -public class BarJpaService extends AbstractJpaService implements IBarService { - - @Autowired - @Qualifier("barJpaDao") - private IBarDao dao; - - public BarJpaService() { - super(); - } - - // API - - @Override - protected IOperations getDao() { - return dao; - } - -} \ No newline at end of file diff --git a/spring-hibernate5/src/main/java/com/baeldung/persistence/service/impl/BarService.java b/spring-hibernate5/src/main/java/com/baeldung/persistence/service/impl/BarService.java deleted file mode 100644 index 32d1f919c5..0000000000 --- a/spring-hibernate5/src/main/java/com/baeldung/persistence/service/impl/BarService.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.baeldung.persistence.service.impl; - -import com.baeldung.persistence.dao.IBarDao; -import com.baeldung.persistence.dao.common.IOperations; -import com.baeldung.persistence.model.Bar; -import com.baeldung.persistence.service.IBarService; -import com.baeldung.persistence.service.common.AbstractHibernateService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Service; - -@Service -public class BarService extends AbstractHibernateService implements IBarService { - - @Autowired - @Qualifier("barHibernateDao") - private IBarDao dao; - - public BarService() { - super(); - } - - // API - - @Override - protected IOperations getDao() { - return dao; - } - -} diff --git a/spring-hibernate5/src/main/java/com/baeldung/persistence/service/impl/BarSpringDataJpaService.java b/spring-hibernate5/src/main/java/com/baeldung/persistence/service/impl/BarSpringDataJpaService.java deleted file mode 100644 index 4a55d08a35..0000000000 --- a/spring-hibernate5/src/main/java/com/baeldung/persistence/service/impl/BarSpringDataJpaService.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.baeldung.persistence.service.impl; - -import java.io.Serializable; - -import com.baeldung.persistence.service.common.AbstractSpringDataJpaService; -import com.baeldung.persistence.dao.IBarCrudRepository; -import com.baeldung.persistence.model.Bar; -import com.baeldung.persistence.service.IBarService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.repository.CrudRepository; - -public class BarSpringDataJpaService extends AbstractSpringDataJpaService implements IBarService { - - @Autowired - private IBarCrudRepository dao; - - public BarSpringDataJpaService() { - super(); - } - - @Override - protected CrudRepository getDao() { - return dao; - } - -} diff --git a/spring-hibernate5/src/main/java/com/baeldung/persistence/service/impl/ChildService.java b/spring-hibernate5/src/main/java/com/baeldung/persistence/service/impl/ChildService.java deleted file mode 100644 index 417fe2c49a..0000000000 --- a/spring-hibernate5/src/main/java/com/baeldung/persistence/service/impl/ChildService.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.baeldung.persistence.service.impl; - -import com.baeldung.persistence.model.Child; -import com.baeldung.persistence.service.IChildService; -import com.baeldung.persistence.dao.IChildDao; -import com.baeldung.persistence.dao.common.IOperations; -import com.baeldung.persistence.service.common.AbstractHibernateService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -@Service -public class ChildService extends AbstractHibernateService implements IChildService { - - @Autowired - private IChildDao dao; - - public ChildService() { - super(); - } - - // API - - @Override - protected IOperations getDao() { - return dao; - } - -} diff --git a/spring-hibernate5/src/main/java/com/baeldung/persistence/service/impl/FooAuditableService.java b/spring-hibernate5/src/main/java/com/baeldung/persistence/service/impl/FooAuditableService.java deleted file mode 100644 index 45ad315c42..0000000000 --- a/spring-hibernate5/src/main/java/com/baeldung/persistence/service/impl/FooAuditableService.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.baeldung.persistence.service.impl; - -import com.baeldung.persistence.dao.common.IAuditOperations; -import com.baeldung.persistence.service.IFooAuditableService; -import com.baeldung.persistence.service.common.AbstractHibernateAuditableService; -import com.baeldung.persistence.dao.IFooAuditableDao; -import com.baeldung.persistence.dao.IFooDao; -import com.baeldung.persistence.dao.common.IOperations; -import com.baeldung.persistence.model.Foo; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Service; - -@Service -public class FooAuditableService extends AbstractHibernateAuditableService implements IFooAuditableService { - - @Autowired - @Qualifier("fooHibernateDao") - private IFooDao dao; - - @Autowired - @Qualifier("fooHibernateAuditableDao") - private IFooAuditableDao auditDao; - - public FooAuditableService() { - super(); - } - - // API - - @Override - protected IOperations getDao() { - return dao; - } - - @Override - protected IAuditOperations getAuditableDao() { - return auditDao; - } - -} diff --git a/spring-hibernate5/src/main/java/com/baeldung/persistence/service/impl/FooService.java b/spring-hibernate5/src/main/java/com/baeldung/persistence/service/impl/FooService.java deleted file mode 100644 index 84cf018fee..0000000000 --- a/spring-hibernate5/src/main/java/com/baeldung/persistence/service/impl/FooService.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.baeldung.persistence.service.impl; - -import com.baeldung.persistence.dao.IFooDao; -import com.baeldung.persistence.dao.common.IOperations; -import com.baeldung.persistence.model.Foo; -import com.baeldung.persistence.service.IFooService; -import com.baeldung.persistence.service.common.AbstractHibernateService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Service; - -@Service -public class FooService extends AbstractHibernateService implements IFooService { - - @Autowired - @Qualifier("fooHibernateDao") - private IFooDao dao; - - public FooService() { - super(); - } - - // API - - @Override - protected IOperations getDao() { - return dao; - } - -} diff --git a/spring-hibernate5/src/main/java/com/baeldung/persistence/service/impl/ParentService.java b/spring-hibernate5/src/main/java/com/baeldung/persistence/service/impl/ParentService.java deleted file mode 100644 index 078acfc369..0000000000 --- a/spring-hibernate5/src/main/java/com/baeldung/persistence/service/impl/ParentService.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.baeldung.persistence.service.impl; - -import com.baeldung.persistence.model.Parent; -import com.baeldung.persistence.service.IParentService; -import com.baeldung.persistence.dao.IParentDao; -import com.baeldung.persistence.dao.common.IOperations; -import com.baeldung.persistence.service.common.AbstractHibernateService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -@Service -public class ParentService extends AbstractHibernateService implements IParentService { - - @Autowired - private IParentDao dao; - - public ParentService() { - super(); - } - - // API - - @Override - protected IOperations getDao() { - return dao; - } - -} diff --git a/spring-hibernate5/src/main/java/com/baeldung/spring/PersistenceConfig.java b/spring-hibernate5/src/main/java/com/baeldung/spring/PersistenceConfig.java index 67ab97e516..74ac0a269e 100644 --- a/spring-hibernate5/src/main/java/com/baeldung/spring/PersistenceConfig.java +++ b/spring-hibernate5/src/main/java/com/baeldung/spring/PersistenceConfig.java @@ -1,9 +1,8 @@ package com.baeldung.spring; -import java.util.Properties; - -import javax.sql.DataSource; - +import com.baeldung.persistence.dao.IFooDao; +import com.baeldung.persistence.dao.impl.FooHibernateDao; +import com.google.common.base.Preconditions; import org.apache.tomcat.dbcp.dbcp2.BasicDataSource; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; @@ -12,42 +11,17 @@ import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; import org.springframework.core.env.Environment; import org.springframework.dao.annotation.PersistenceExceptionTranslationPostProcessor; -import org.springframework.data.jpa.repository.config.EnableJpaAuditing; -import org.springframework.data.jpa.repository.config.EnableJpaRepositories; import org.springframework.orm.hibernate5.HibernateTransactionManager; import org.springframework.orm.hibernate5.LocalSessionFactoryBean; -import org.springframework.orm.jpa.JpaTransactionManager; -import org.springframework.orm.jpa.JpaVendorAdapter; -import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean; -import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter; import org.springframework.transaction.PlatformTransactionManager; import org.springframework.transaction.annotation.EnableTransactionManagement; -import com.baeldung.persistence.dao.IBarAuditableDao; -import com.baeldung.persistence.dao.IBarDao; -import com.baeldung.persistence.dao.IFooAuditableDao; -import com.baeldung.persistence.dao.IFooDao; -import com.baeldung.persistence.dao.impl.BarAuditableDao; -import com.baeldung.persistence.dao.impl.BarDao; -import com.baeldung.persistence.dao.impl.BarJpaDao; -import com.baeldung.persistence.dao.impl.FooAuditableDao; -import com.baeldung.persistence.dao.impl.FooDao; -import com.baeldung.persistence.service.IBarAuditableService; -import com.baeldung.persistence.service.IBarService; -import com.baeldung.persistence.service.IFooAuditableService; -import com.baeldung.persistence.service.IFooService; -import com.baeldung.persistence.service.impl.BarAuditableService; -import com.baeldung.persistence.service.impl.BarJpaService; -import com.baeldung.persistence.service.impl.BarSpringDataJpaService; -import com.baeldung.persistence.service.impl.FooAuditableService; -import com.baeldung.persistence.service.impl.FooService; -import com.google.common.base.Preconditions; +import javax.sql.DataSource; +import java.util.Properties; @Configuration @EnableTransactionManagement -@EnableJpaRepositories(basePackages = { "com.baeldung.persistence" }, transactionManagerRef = "jpaTransactionManager") -@EnableJpaAuditing -@PropertySource({ "classpath:persistence-mysql.properties" }) +@PropertySource({ "classpath:persistence-h2.properties" }) @ComponentScan({ "com.baeldung.persistence" }) public class PersistenceConfig { @@ -57,7 +31,7 @@ public class PersistenceConfig { @Bean public LocalSessionFactoryBean sessionFactory() { final LocalSessionFactoryBean sessionFactory = new LocalSessionFactoryBean(); - sessionFactory.setDataSource(restDataSource()); + sessionFactory.setDataSource(dataSource()); sessionFactory.setPackagesToScan(new String[] { "com.baeldung.persistence.model" }); sessionFactory.setHibernateProperties(hibernateProperties()); @@ -65,20 +39,7 @@ public class PersistenceConfig { } @Bean - public LocalContainerEntityManagerFactoryBean entityManagerFactory() { - final LocalContainerEntityManagerFactoryBean emf = new LocalContainerEntityManagerFactoryBean(); - emf.setDataSource(restDataSource()); - emf.setPackagesToScan(new String[] { "com.baeldung.persistence.model" }); - - final JpaVendorAdapter vendorAdapter = new HibernateJpaVendorAdapter(); - emf.setJpaVendorAdapter(vendorAdapter); - emf.setJpaProperties(hibernateProperties()); - - return emf; - } - - @Bean - public DataSource restDataSource() { + public DataSource dataSource() { final BasicDataSource dataSource = new BasicDataSource(); dataSource.setDriverClassName(Preconditions.checkNotNull(env.getProperty("jdbc.driverClassName"))); dataSource.setUrl(Preconditions.checkNotNull(env.getProperty("jdbc.url"))); @@ -95,66 +56,14 @@ public class PersistenceConfig { return transactionManager; } - @Bean - public PlatformTransactionManager jpaTransactionManager() { - final JpaTransactionManager transactionManager = new JpaTransactionManager(); - transactionManager.setEntityManagerFactory(entityManagerFactory().getObject()); - return transactionManager; - } - @Bean public PersistenceExceptionTranslationPostProcessor exceptionTranslation() { return new PersistenceExceptionTranslationPostProcessor(); } - @Bean - public IBarService barJpaService() { - return new BarJpaService(); - } - - @Bean - public IBarService barSpringDataJpaService() { - return new BarSpringDataJpaService(); - } - - @Bean - public IFooService fooHibernateService() { - return new FooService(); - } - - @Bean - public IBarAuditableService barHibernateAuditableService() { - return new BarAuditableService(); - } - - @Bean - public IFooAuditableService fooHibernateAuditableService() { - return new FooAuditableService(); - } - - @Bean - public IBarDao barJpaDao() { - return new BarJpaDao(); - } - - @Bean - public IBarDao barHibernateDao() { - return new BarDao(); - } - - @Bean - public IBarAuditableDao barHibernateAuditableDao() { - return new BarAuditableDao(); - } - @Bean public IFooDao fooHibernateDao() { - return new FooDao(); - } - - @Bean - public IFooAuditableDao fooHibernateAuditableDao() { - return new FooAuditableDao(); + return new FooHibernateDao(); } private final Properties hibernateProperties() { diff --git a/spring-hibernate5/src/main/resources/criteria.cfg.xml b/spring-hibernate5/src/main/resources/criteria.cfg.xml deleted file mode 100644 index 0b865fc4d1..0000000000 --- a/spring-hibernate5/src/main/resources/criteria.cfg.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - com.mysql.jdbc.Driver - jdbc:mysql://localhost:3306/test - root - root - org.hibernate.dialect.MySQLDialect - true - - - \ No newline at end of file diff --git a/spring-hibernate5/src/main/resources/criteria_create_queries.sql b/spring-hibernate5/src/main/resources/criteria_create_queries.sql deleted file mode 100644 index 3a627dd38c..0000000000 --- a/spring-hibernate5/src/main/resources/criteria_create_queries.sql +++ /dev/null @@ -1,7 +0,0 @@ -CREATE TABLE `item` ( - `ITEM_ID` int(11) NOT NULL AUTO_INCREMENT, - `ITEM_DESC` varchar(100) DEFAULT NULL, - `ITEM_PRICE` int(11) NOT NULL, - `ITEM_NAME` varchar(255) NOT NULL, - PRIMARY KEY (`ITEM_ID`) -) ENGINE=InnoDB AUTO_INCREMENT=12 DEFAULT CHARSET=latin1; diff --git a/spring-hibernate5/src/main/resources/fetching.cfg.xml b/spring-hibernate5/src/main/resources/fetching.cfg.xml deleted file mode 100644 index b1ffecafce..0000000000 --- a/spring-hibernate5/src/main/resources/fetching.cfg.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - com.mysql.jdbc.Driver - jdbc:mysql://localhost:3306/test - root - root - org.hibernate.dialect.MySQLDialect - true - validate - - - - - - \ No newline at end of file diff --git a/spring-hibernate5/src/main/resources/fetchingLazy.cfg.xml b/spring-hibernate5/src/main/resources/fetchingLazy.cfg.xml deleted file mode 100644 index a18fdbfa99..0000000000 --- a/spring-hibernate5/src/main/resources/fetchingLazy.cfg.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - com.mysql.jdbc.Driver - jdbc:mysql://localhost:3306/test - root - root - org.hibernate.dialect.MySQLDialect - true - - - - \ No newline at end of file diff --git a/spring-hibernate5/src/main/resources/fetching_create_queries.sql b/spring-hibernate5/src/main/resources/fetching_create_queries.sql deleted file mode 100644 index b36d9828f1..0000000000 --- a/spring-hibernate5/src/main/resources/fetching_create_queries.sql +++ /dev/null @@ -1,14 +0,0 @@ -CREATE TABLE `user` ( - `user_id` int(10) NOT NULL AUTO_INCREMENT, - PRIMARY KEY (`user_id`) -) ENGINE=InnoDB AUTO_INCREMENT=8 DEFAULT CHARSET=latin1 ; - - -CREATE TABLE `user_order` ( - `ORDER_ID` int(10) NOT NULL AUTO_INCREMENT, - `USER_ID` int(10) NOT NULL DEFAULT '0', - PRIMARY KEY (`ORDER_ID`,`USER_ID`), - KEY `USER_ID` (`USER_ID`), - CONSTRAINT `user_order_ibfk_1` FOREIGN KEY (`USER_ID`) REFERENCES `USER` (`user_id`) -) ENGINE=InnoDB AUTO_INCREMENT=7 DEFAULT CHARSET=latin1; - diff --git a/spring-hibernate5/src/main/resources/insert_statements.sql b/spring-hibernate5/src/main/resources/insert_statements.sql deleted file mode 100644 index ae008f29bc..0000000000 --- a/spring-hibernate5/src/main/resources/insert_statements.sql +++ /dev/null @@ -1,31 +0,0 @@ -insert into item (item_id, item_name, item_desc, item_price) -values(1,'item One', 'test 1', 35.12); - -insert into item (item_id, item_name, item_desc, item_price) -values(2,'Pogo stick', 'Pogo stick', 466.12); -insert into item (item_id, item_name, item_desc, item_price) -values(3,'Raft', 'Raft', 345.12); - -insert into item (item_id, item_name, item_desc, item_price) -values(4,'Skate Board', 'Skating', 135.71); - -insert into item (item_id, item_name, item_desc, item_price) -values(5,'Umbrella', 'Umbrella for Rain', 619.25); - -insert into item (item_id, item_name, item_desc, item_price) -values(6,'Glue', 'Glue for home', 432.73); - -insert into item (item_id, item_name, item_desc, item_price) -values(7,'Paint', 'Paint for Room', 1311.40); - -insert into item (item_id, item_name, item_desc, item_price) -values(8,'Red paint', 'Red paint for room', 1135.71); - -insert into item (item_id, item_name, item_desc, item_price) -values(9,'Household Chairs', 'Chairs for house', 25.71); - -insert into item (item_id, item_name, item_desc, item_price) -values(10,'Office Chairs', 'Chairs for office', 395.98); - -insert into item (item_id, item_name, item_desc, item_price) -values(11,'Outdoor Chairs', 'Chairs for outdoor activities', 1234.36); diff --git a/spring-hibernate5/src/main/resources/persistence-h2.properties b/spring-hibernate5/src/main/resources/persistence-h2.properties new file mode 100644 index 0000000000..537626bc2a --- /dev/null +++ b/spring-hibernate5/src/main/resources/persistence-h2.properties @@ -0,0 +1,13 @@ +# jdbc.X +jdbc.driverClassName=org.h2.Driver +jdbc.url=jdbc:h2:mem:db;DB_CLOSE_DELAY=-1 +jdbc.user=sa +jdbc.pass=sa + +# hibernate.X +hibernate.dialect=org.hibernate.dialect.H2Dialect +hibernate.show_sql=false +hibernate.hbm2ddl.auto=create-drop + +# envers.X +envers.audit_table_suffix=_audit_log diff --git a/spring-hibernate5/src/main/resources/stored_procedure.sql b/spring-hibernate5/src/main/resources/stored_procedure.sql deleted file mode 100644 index 9cedb75c37..0000000000 --- a/spring-hibernate5/src/main/resources/stored_procedure.sql +++ /dev/null @@ -1,20 +0,0 @@ -DELIMITER // - CREATE PROCEDURE GetFoosByName(IN fooName VARCHAR(255)) - LANGUAGE SQL - DETERMINISTIC - SQL SECURITY DEFINER - BEGIN - SELECT * FROM foo WHERE name = fooName; - END // -DELIMITER ; - - -DELIMITER // - CREATE PROCEDURE GetAllFoos() - LANGUAGE SQL - DETERMINISTIC - SQL SECURITY DEFINER - BEGIN - SELECT * FROM foo; - END // -DELIMITER ; \ No newline at end of file diff --git a/spring-hibernate5/src/main/resources/webSecurityConfig.xml b/spring-hibernate5/src/main/resources/webSecurityConfig.xml deleted file mode 100644 index e5c19a4ad7..0000000000 --- a/spring-hibernate5/src/main/resources/webSecurityConfig.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/spring-hibernate5/src/test/java/com/baeldung/hibernate/criteria/HibernateCriteriaIntegrationTest.java b/spring-hibernate5/src/test/java/com/baeldung/hibernate/criteria/HibernateCriteriaIntegrationTest.java deleted file mode 100644 index c7d59e3b00..0000000000 --- a/spring-hibernate5/src/test/java/com/baeldung/hibernate/criteria/HibernateCriteriaIntegrationTest.java +++ /dev/null @@ -1,183 +0,0 @@ -package com.baeldung.hibernate.criteria; - -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertTrue; - -import java.util.List; - -import org.hibernate.Session; -import org.junit.Test; - -import com.baeldung.hibernate.criteria.model.Item; -import com.baeldung.hibernate.criteria.util.HibernateUtil; -import com.baeldung.hibernate.criteria.view.ApplicationView; - -public class HibernateCriteriaIntegrationTest { - - final private ApplicationView av = new ApplicationView(); - - @Test - public void testPerformanceOfCriteria() { - assertTrue(av.checkIfCriteriaTimeLower()); - } - - @Test - public void testLikeCriteriaQuery() { - final Session session = HibernateUtil.getHibernateSession(); - final List expectedLikeList = session.createQuery("From Item where itemName like '%chair%'").getResultList(); - final String expectedLikeItems[] = new String[expectedLikeList.size()]; - for (int i = 0; i < expectedLikeList.size(); i++) { - expectedLikeItems[i] = expectedLikeList.get(i).getItemName(); - } - session.close(); - assertArrayEquals(expectedLikeItems, av.likeCriteria()); - } - - @Test - public void testILikeCriteriaQuery() { - final Session session = HibernateUtil.getHibernateSession(); - final List expectedChairCaseList = session.createQuery("From Item where itemName like '%Chair%'").getResultList(); - final String expectedChairCaseItems[] = new String[expectedChairCaseList.size()]; - for (int i = 0; i < expectedChairCaseList.size(); i++) { - expectedChairCaseItems[i] = expectedChairCaseList.get(i).getItemName(); - } - session.close(); - assertArrayEquals(expectedChairCaseItems, av.likeCaseCriteria()); - - } - - @Test - public void testNullCriteriaQuery() { - final Session session = HibernateUtil.getHibernateSession(); - final List expectedIsNullDescItemsList = session.createQuery("From Item where itemDescription is null").getResultList(); - final String expectedIsNullDescItems[] = new String[expectedIsNullDescItemsList.size()]; - for (int i = 0; i < expectedIsNullDescItemsList.size(); i++) { - expectedIsNullDescItems[i] = expectedIsNullDescItemsList.get(i).getItemName(); - } - session.close(); - assertArrayEquals(expectedIsNullDescItems, av.nullCriteria()); - } - - @Test - public void testIsNotNullCriteriaQuery() { - final Session session = HibernateUtil.getHibernateSession(); - final List expectedIsNotNullDescItemsList = session.createQuery("From Item where itemDescription is not null").getResultList(); - final String expectedIsNotNullDescItems[] = new String[expectedIsNotNullDescItemsList.size()]; - for (int i = 0; i < expectedIsNotNullDescItemsList.size(); i++) { - expectedIsNotNullDescItems[i] = expectedIsNotNullDescItemsList.get(i).getItemName(); - } - session.close(); - assertArrayEquals(expectedIsNotNullDescItems, av.notNullCriteria()); - - } - - @Test - public void testAverageProjection() { - final Session session = HibernateUtil.getHibernateSession(); - final List expectedAvgProjItemsList = session.createQuery("Select avg(itemPrice) from Item item").getResultList(); - - final Double expectedAvgProjItems[] = new Double[expectedAvgProjItemsList.size()]; - for (int i = 0; i < expectedAvgProjItemsList.size(); i++) { - expectedAvgProjItems[i] = expectedAvgProjItemsList.get(i); - } - session.close(); - assertArrayEquals(expectedAvgProjItems, av.projectionAverage()); - - } - - @Test - public void testRowCountProjection() { - final Session session = HibernateUtil.getHibernateSession(); - final List expectedCountProjItemsList = session.createQuery("Select count(*) from Item").getResultList(); - final Long expectedCountProjItems[] = new Long[expectedCountProjItemsList.size()]; - for (int i = 0; i < expectedCountProjItemsList.size(); i++) { - expectedCountProjItems[i] = expectedCountProjItemsList.get(i); - } - session.close(); - assertArrayEquals(expectedCountProjItems, av.projectionRowCount()); - } - - @Test - public void testOrCriteriaQuery() { - final Session session = HibernateUtil.getHibernateSession(); - final List expectedOrCritItemsList = session.createQuery("From Item where itemPrice>1000 or itemName like 'Chair%'").getResultList(); - final String expectedOrCritItems[] = new String[expectedOrCritItemsList.size()]; - for (int i = 0; i < expectedOrCritItemsList.size(); i++) { - expectedOrCritItems[i] = expectedOrCritItemsList.get(i).getItemName(); - } - session.close(); - assertArrayEquals(expectedOrCritItems, av.orLogicalCriteria()); - } - - @Test - public void testAndCriteriaQuery() { - final Session session = HibernateUtil.getHibernateSession(); - final List expectedAndCritItemsList = session.createQuery("From Item where itemPrice>1000 and itemName like 'Chair%'").getResultList(); - final String expectedAndCritItems[] = new String[expectedAndCritItemsList.size()]; - for (int i = 0; i < expectedAndCritItemsList.size(); i++) { - expectedAndCritItems[i] = expectedAndCritItemsList.get(i).getItemName(); - } - session.close(); - assertArrayEquals(expectedAndCritItems, av.andLogicalCriteria()); - } - - @Test - public void testMultiCriteriaQuery() { - final Session session = HibernateUtil.getHibernateSession(); - final List expectedMultiCritItemsList = session.createQuery("From Item where itemDescription is null and itemName like'chair%'").getResultList(); - final String expectedMultiCritItems[] = new String[expectedMultiCritItemsList.size()]; - for (int i = 0; i < expectedMultiCritItemsList.size(); i++) { - expectedMultiCritItems[i] = expectedMultiCritItemsList.get(i).getItemName(); - } - session.close(); - assertArrayEquals(expectedMultiCritItems, av.twoCriteria()); - } - - @Test - public void testSortCriteriaQuery() { - final Session session = HibernateUtil.getHibernateSession(); - final List expectedSortCritItemsList = session.createQuery("From Item order by itemName asc, itemPrice desc").getResultList(); - final String expectedSortCritItems[] = new String[expectedSortCritItemsList.size()]; - for (int i = 0; i < expectedSortCritItemsList.size(); i++) { - expectedSortCritItems[i] = expectedSortCritItemsList.get(i).getItemName(); - } - session.close(); - assertArrayEquals(expectedSortCritItems, av.sortingCriteria()); - } - - @Test - public void testGreaterThanCriteriaQuery() { - final Session session = HibernateUtil.getHibernateSession(); - final List expectedGreaterThanList = session.createQuery("From Item where itemPrice>1000").getResultList(); - final String expectedGreaterThanItems[] = new String[expectedGreaterThanList.size()]; - for (int i = 0; i < expectedGreaterThanList.size(); i++) { - expectedGreaterThanItems[i] = expectedGreaterThanList.get(i).getItemName(); - } - session.close(); - assertArrayEquals(expectedGreaterThanItems, av.greaterThanCriteria()); - } - - @Test - public void testLessThanCriteriaQuery() { - final Session session = HibernateUtil.getHibernateSession(); - final List expectedLessList = session.createQuery("From Item where itemPrice<1000").getResultList(); - final String expectedLessThanItems[] = new String[expectedLessList.size()]; - for (int i = 0; i < expectedLessList.size(); i++) { - expectedLessThanItems[i] = expectedLessList.get(i).getItemName(); - } - session.close(); - assertArrayEquals(expectedLessThanItems, av.lessThanCriteria()); - } - - @Test - public void betweenCriteriaQuery() { - final Session session = HibernateUtil.getHibernateSession(); - final List expectedBetweenList = session.createQuery("From Item where itemPrice between 100 and 200").getResultList(); - final String expectedPriceBetweenItems[] = new String[expectedBetweenList.size()]; - for (int i = 0; i < expectedBetweenList.size(); i++) { - expectedPriceBetweenItems[i] = expectedBetweenList.get(i).getItemName(); - } - session.close(); - assertArrayEquals(expectedPriceBetweenItems, av.betweenCriteria()); - } -} diff --git a/spring-hibernate5/src/test/java/com/baeldung/hibernate/fetching/HibernateFetchingIntegrationTest.java b/spring-hibernate5/src/test/java/com/baeldung/hibernate/fetching/HibernateFetchingIntegrationTest.java deleted file mode 100644 index 65bf36f8bf..0000000000 --- a/spring-hibernate5/src/test/java/com/baeldung/hibernate/fetching/HibernateFetchingIntegrationTest.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.baeldung.hibernate.fetching; - -import com.baeldung.hibernate.fetching.model.OrderDetail; -import com.baeldung.hibernate.fetching.view.FetchingAppView; -import org.hibernate.Hibernate; -import org.junit.Before; -import org.junit.Test; - -import java.util.Set; - -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -public class HibernateFetchingIntegrationTest { - - // this loads sample data in the database - @Before - public void addFecthingTestData() { - FetchingAppView fav = new FetchingAppView(); - fav.createTestData(); - } - - // testLazyFetching() tests the lazy loading - // Since it lazily loaded so orderDetalSetLazy won't - // be initialized - @Test - public void testLazyFetching() { - FetchingAppView fav = new FetchingAppView(); - Set orderDetalSetLazy = fav.lazyLoaded(); - assertFalse(Hibernate.isInitialized(orderDetalSetLazy)); - } - - // testEagerFetching() tests the eager loading - // Since it eagerly loaded so orderDetalSetLazy would - // be initialized - @Test - public void testEagerFetching() { - FetchingAppView fav = new FetchingAppView(); - Set orderDetalSetEager = fav.eagerLoaded(); - assertTrue(Hibernate.isInitialized(orderDetalSetEager)); - } -} diff --git a/spring-hibernate5/src/test/java/com/baeldung/persistence/IntegrationTestSuite.java b/spring-hibernate5/src/test/java/com/baeldung/persistence/IntegrationTestSuite.java deleted file mode 100644 index f5c45a5d6f..0000000000 --- a/spring-hibernate5/src/test/java/com/baeldung/persistence/IntegrationTestSuite.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.baeldung.persistence; - -import org.junit.runner.RunWith; -import org.junit.runners.Suite; - -import com.baeldung.persistence.audit.AuditTestSuite; -import com.baeldung.persistence.hibernate.FooPaginationPersistenceIntegrationTest; -import com.baeldung.persistence.hibernate.FooSortingPersistenceIntegrationTest; -import com.baeldung.persistence.service.FooServiceBasicPersistenceIntegrationTest; -import com.baeldung.persistence.service.FooServicePersistenceIntegrationTest; -import com.baeldung.persistence.service.ParentServicePersistenceIntegrationTest; - -@RunWith(Suite.class) -@Suite.SuiteClasses({ // @formatter:off - AuditTestSuite.class - ,FooServiceBasicPersistenceIntegrationTest.class - ,FooPaginationPersistenceIntegrationTest.class - ,FooServicePersistenceIntegrationTest.class - ,ParentServicePersistenceIntegrationTest.class - ,FooSortingPersistenceIntegrationTest.class - -}) // @formatter:on -public class IntegrationTestSuite { - // -} diff --git a/spring-hibernate5/src/test/java/com/baeldung/persistence/audit/AuditTestSuite.java b/spring-hibernate5/src/test/java/com/baeldung/persistence/audit/AuditTestSuite.java deleted file mode 100644 index 34c725d62b..0000000000 --- a/spring-hibernate5/src/test/java/com/baeldung/persistence/audit/AuditTestSuite.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.baeldung.persistence.audit; - -import org.junit.runner.RunWith; -import org.junit.runners.Suite; - -@RunWith(Suite.class) -@Suite.SuiteClasses({ // @formatter:off - EnversFooBarAuditIntegrationTest.class, - JPABarAuditIntegrationTest.class, - SpringDataJPABarAuditIntegrationTest.class -}) // @formatter:on -public class AuditTestSuite { - // -} \ No newline at end of file diff --git a/spring-hibernate5/src/test/java/com/baeldung/persistence/audit/EnversFooBarAuditIntegrationTest.java b/spring-hibernate5/src/test/java/com/baeldung/persistence/audit/EnversFooBarAuditIntegrationTest.java deleted file mode 100644 index ed2e111c8f..0000000000 --- a/spring-hibernate5/src/test/java/com/baeldung/persistence/audit/EnversFooBarAuditIntegrationTest.java +++ /dev/null @@ -1,142 +0,0 @@ -package com.baeldung.persistence.audit; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; - -import java.util.List; - -import com.baeldung.persistence.model.Foo; -import com.baeldung.persistence.service.IBarAuditableService; -import com.baeldung.persistence.service.IFooAuditableService; -import com.baeldung.spring.PersistenceConfig; -import com.baeldung.persistence.model.Bar; -import org.hibernate.Session; -import org.hibernate.SessionFactory; -import org.junit.After; -import org.junit.AfterClass; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import org.springframework.test.context.support.AnnotationConfigContextLoader; - -@RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(classes = { PersistenceConfig.class }, loader = AnnotationConfigContextLoader.class) -public class EnversFooBarAuditIntegrationTest { - - private static Logger logger = LoggerFactory.getLogger(EnversFooBarAuditIntegrationTest.class); - - @BeforeClass - public static void setUpBeforeClass() throws Exception { - logger.info("setUpBeforeClass()"); - } - - @AfterClass - public static void tearDownAfterClass() throws Exception { - logger.info("tearDownAfterClass()"); - } - - @Autowired - @Qualifier("fooHibernateAuditableService") - private IFooAuditableService fooService; - - @Autowired - @Qualifier("barHibernateAuditableService") - private IBarAuditableService barService; - - @Autowired - private SessionFactory sessionFactory; - - private Session session; - - @Before - public void setUp() throws Exception { - logger.info("setUp()"); - makeRevisions(); - session = sessionFactory.openSession(); - } - - @After - public void tearDown() throws Exception { - logger.info("tearDown()"); - session.close(); - } - - private void makeRevisions() { - final Bar bar = rev1(); - rev2(bar); - rev3(bar); - rev4(bar); - } - - // REV #1: insert BAR & FOO1 - private Bar rev1() { - final Bar bar = new Bar("BAR"); - final Foo foo1 = new Foo("FOO1"); - foo1.setBar(bar); - fooService.create(foo1); - return bar; - } - - // REV #2: insert FOO2 & update BAR - private void rev2(final Bar bar) { - final Foo foo2 = new Foo("FOO2"); - foo2.setBar(bar); - fooService.create(foo2); - } - - // REV #3: update BAR - private void rev3(final Bar bar) { - - bar.setName("BAR1"); - barService.update(bar); - } - - // REV #4: insert FOO3 & update BAR - private void rev4(final Bar bar) { - - final Foo foo3 = new Foo("FOO3"); - foo3.setBar(bar); - fooService.create(foo3); - } - - @Test - public final void whenFooBarsModified_thenFooBarsAudited() { - - List barRevisionList; - List fooRevisionList; - - // test Bar revisions - - barRevisionList = barService.getRevisions(); - - assertNotNull(barRevisionList); - assertEquals(4, barRevisionList.size()); - - assertEquals("BAR", barRevisionList.get(0).getName()); - assertEquals("BAR", barRevisionList.get(1).getName()); - assertEquals("BAR1", barRevisionList.get(2).getName()); - assertEquals("BAR1", barRevisionList.get(3).getName()); - - assertEquals(1, barRevisionList.get(0).getFooSet().size()); - assertEquals(2, barRevisionList.get(1).getFooSet().size()); - assertEquals(2, barRevisionList.get(2).getFooSet().size()); - assertEquals(3, barRevisionList.get(3).getFooSet().size()); - - // test Foo revisions - - fooRevisionList = fooService.getRevisions(); - assertNotNull(fooRevisionList); - assertEquals(3, fooRevisionList.size()); - assertEquals("FOO1", fooRevisionList.get(0).getName()); - assertEquals("FOO2", fooRevisionList.get(1).getName()); - assertEquals("FOO3", fooRevisionList.get(2).getName()); - } - -} diff --git a/spring-hibernate5/src/test/java/com/baeldung/persistence/audit/JPABarAuditIntegrationTest.java b/spring-hibernate5/src/test/java/com/baeldung/persistence/audit/JPABarAuditIntegrationTest.java deleted file mode 100644 index b63a4b989b..0000000000 --- a/spring-hibernate5/src/test/java/com/baeldung/persistence/audit/JPABarAuditIntegrationTest.java +++ /dev/null @@ -1,102 +0,0 @@ -package com.baeldung.persistence.audit; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; - -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; - -import com.baeldung.persistence.model.Bar; -import com.baeldung.persistence.model.Bar.OPERATION; -import com.baeldung.persistence.service.IBarService; -import com.baeldung.spring.PersistenceConfig; -import org.junit.After; -import org.junit.AfterClass; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import org.springframework.test.context.support.AnnotationConfigContextLoader; - -@RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(classes = { PersistenceConfig.class }, loader = AnnotationConfigContextLoader.class) -public class JPABarAuditIntegrationTest { - - private static Logger logger = LoggerFactory.getLogger(JPABarAuditIntegrationTest.class); - - @BeforeClass - public static void setUpBeforeClass() throws Exception { - logger.info("setUpBeforeClass()"); - } - - @AfterClass - public static void tearDownAfterClass() throws Exception { - logger.info("tearDownAfterClass()"); - } - - @Autowired - @Qualifier("barJpaService") - private IBarService barService; - - @Autowired - private EntityManagerFactory entityManagerFactory; - - private EntityManager em; - - @Before - public void setUp() throws Exception { - logger.info("setUp()"); - em = entityManagerFactory.createEntityManager(); - } - - @After - public void tearDown() throws Exception { - logger.info("tearDown()"); - em.close(); - } - - @Test - public final void whenBarsModified_thenBarsAudited() { - - // insert BAR1 - Bar bar1 = new Bar("BAR1"); - barService.create(bar1); - - // update BAR1 - bar1.setName("BAR1a"); - barService.update(bar1); - - // insert BAR2 - Bar bar2 = new Bar("BAR2"); - barService.create(bar2); - - // update BAR1 - bar1.setName("BAR1b"); - barService.update(bar1); - - // get BAR1 and BAR2 from the DB and check the audit values - // detach instances from persistence context to make sure we fire db - em.detach(bar1); - em.detach(bar2); - bar1 = barService.findOne(bar1.getId()); - bar2 = barService.findOne(bar2.getId()); - - assertNotNull(bar1); - assertNotNull(bar2); - assertEquals(OPERATION.UPDATE, bar1.getOperation()); - assertEquals(OPERATION.INSERT, bar2.getOperation()); - assertTrue(bar1.getTimestamp() > bar2.getTimestamp()); - - barService.deleteById(bar1.getId()); - barService.deleteById(bar2.getId()); - - } - -} \ No newline at end of file diff --git a/spring-hibernate5/src/test/java/com/baeldung/persistence/audit/SpringDataJPABarAuditIntegrationTest.java b/spring-hibernate5/src/test/java/com/baeldung/persistence/audit/SpringDataJPABarAuditIntegrationTest.java deleted file mode 100644 index e794b282f6..0000000000 --- a/spring-hibernate5/src/test/java/com/baeldung/persistence/audit/SpringDataJPABarAuditIntegrationTest.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.baeldung.persistence.audit; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; - -import com.baeldung.persistence.model.Bar; -import com.baeldung.persistence.service.IBarService; -import com.baeldung.spring.PersistenceConfig; -import org.junit.After; -import org.junit.AfterClass; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.security.test.context.support.WithMockUser; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import org.springframework.test.context.support.AnnotationConfigContextLoader; - -@RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(classes = { PersistenceConfig.class }, loader = AnnotationConfigContextLoader.class) -public class SpringDataJPABarAuditIntegrationTest { - - private static Logger logger = LoggerFactory.getLogger(SpringDataJPABarAuditIntegrationTest.class); - - @BeforeClass - public static void setUpBeforeClass() throws Exception { - logger.info("setUpBeforeClass()"); - } - - @AfterClass - public static void tearDownAfterClass() throws Exception { - logger.info("tearDownAfterClass()"); - } - - @Autowired - @Qualifier("barSpringDataJpaService") - private IBarService barService; - - @Autowired - private EntityManagerFactory entityManagerFactory; - - private EntityManager em; - - @Before - public void setUp() throws Exception { - logger.info("setUp()"); - em = entityManagerFactory.createEntityManager(); - } - - @After - public void tearDown() throws Exception { - logger.info("tearDown()"); - em.close(); - } - - @Test - @WithMockUser(username = "tutorialuser") - public final void whenBarsModified_thenBarsAudited() { - Bar bar = new Bar("BAR1"); - barService.create(bar); - assertEquals(bar.getCreatedDate(), bar.getModifiedDate()); - assertEquals("tutorialuser", bar.getCreatedBy(), bar.getModifiedBy()); - bar.setName("BAR2"); - bar = barService.update(bar); - assertTrue(bar.getCreatedDate() < bar.getModifiedDate()); - assertEquals("tutorialuser", bar.getCreatedBy(), bar.getModifiedBy()); - } -} diff --git a/spring-hibernate5/src/test/java/com/baeldung/persistence/service/FooServiceBasicPersistenceIntegrationTest.java b/spring-hibernate5/src/test/java/com/baeldung/persistence/dao/common/HibernateDaoIntegrationTest.java similarity index 73% rename from spring-hibernate5/src/test/java/com/baeldung/persistence/service/FooServiceBasicPersistenceIntegrationTest.java rename to spring-hibernate5/src/test/java/com/baeldung/persistence/dao/common/HibernateDaoIntegrationTest.java index c77f5dfb95..c60bb0ae30 100644 --- a/spring-hibernate5/src/test/java/com/baeldung/persistence/service/FooServiceBasicPersistenceIntegrationTest.java +++ b/spring-hibernate5/src/test/java/com/baeldung/persistence/dao/common/HibernateDaoIntegrationTest.java @@ -1,9 +1,8 @@ -package com.baeldung.persistence.service; - -import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic; +package com.baeldung.persistence.dao.common; import com.baeldung.persistence.model.Foo; import com.baeldung.spring.PersistenceConfig; +import org.apache.commons.lang3.RandomStringUtils; import org.hibernate.Session; import org.hibernate.SessionFactory; import org.junit.After; @@ -17,18 +16,13 @@ import org.springframework.test.context.support.AnnotationConfigContextLoader; @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = { PersistenceConfig.class }, loader = AnnotationConfigContextLoader.class) -public class FooServiceBasicPersistenceIntegrationTest { +public class HibernateDaoIntegrationTest { @Autowired private SessionFactory sessionFactory; - @Autowired - private IFooService fooService; - private Session session; - // tests - @Before public final void before() { session = sessionFactory.openSession(); @@ -39,16 +33,14 @@ public class FooServiceBasicPersistenceIntegrationTest { session.close(); } - // tests - @Test public final void whenContextIsBootstrapped_thenNoExceptions() { // } @Test - public final void whenEntityIsCreated_thenNoExceptions() { - fooService.create(new Foo(randomAlphabetic(6))); + public final void whenPersistEntity_thenSuccess() { + session.persist(new Foo(RandomStringUtils.randomAlphabetic(5).toUpperCase())); } } diff --git a/spring-hibernate5/src/test/java/com/baeldung/persistence/hibernate/FooFixtures.java b/spring-hibernate5/src/test/java/com/baeldung/persistence/hibernate/FooFixtures.java deleted file mode 100644 index da840dc027..0000000000 --- a/spring-hibernate5/src/test/java/com/baeldung/persistence/hibernate/FooFixtures.java +++ /dev/null @@ -1,101 +0,0 @@ -package com.baeldung.persistence.hibernate; - -import java.util.List; - -import com.baeldung.persistence.model.Foo; -import com.baeldung.persistence.model.Bar; -import org.hibernate.HibernateException; -import org.hibernate.Session; -import org.hibernate.SessionFactory; -import org.hibernate.Transaction; - -import com.google.common.collect.Lists; - -public class FooFixtures { - private SessionFactory sessionFactory; - - public FooFixtures(final SessionFactory sessionFactory) { - super(); - - this.sessionFactory = sessionFactory; - } - - // API - - public void createBars() { - Session session = null; - Transaction tx = null; - session = sessionFactory.openSession(); - tx = session.getTransaction(); - try { - tx.begin(); - for (int i = 156; i < 160; i++) { - final Bar bar = new Bar(); - bar.setName("Bar_" + i); - final Foo foo = new Foo("Foo_" + (i + 120)); - foo.setBar(bar); - session.save(foo); - final Foo foo2 = new Foo(null); - if (i % 2 == 0) - foo2.setName("LuckyFoo" + (i + 120)); - foo2.setBar(bar); - session.save(foo2); - bar.getFooSet().add(foo); - bar.getFooSet().add(foo2); - session.merge(bar); - } - tx.commit(); - session.flush(); - } catch (final HibernateException he) { - if (tx != null) - tx.rollback(); - System.out.println("Not able to open session"); - he.printStackTrace(); - } catch (final Exception e) { - e.printStackTrace(); - } finally { - if (session != null) - session.close(); - } - - } - - public void createFoos() { - Session session = null; - Transaction tx = null; - session = sessionFactory.openSession(); - tx = session.getTransaction(); - final List fooList = Lists.newArrayList(); - for (int i = 35; i < 46; i++) { - - final Foo foo = new Foo(); - foo.setName("Foo_" + (i + 120)); - final Bar bar = new Bar("bar_" + i); - bar.getFooSet().add(foo); - foo.setBar(bar); - fooList.add(foo); - - } - try { - tx.begin(); - for (final Foo foo : fooList) { - - session.save(foo.getBar()); - session.save(foo); - } - tx.commit(); - session.flush(); - } catch (final HibernateException he) { - if (tx != null) - tx.rollback(); - System.out.println("Not able to open session"); - he.printStackTrace(); - } catch (final Exception e) { - e.printStackTrace(); - } finally { - if (session != null) - session.close(); - } - } - -} diff --git a/spring-hibernate5/src/test/java/com/baeldung/persistence/hibernate/FooPaginationPersistenceIntegrationTest.java b/spring-hibernate5/src/test/java/com/baeldung/persistence/hibernate/FooPaginationPersistenceIntegrationTest.java deleted file mode 100644 index e6548ce5e7..0000000000 --- a/spring-hibernate5/src/test/java/com/baeldung/persistence/hibernate/FooPaginationPersistenceIntegrationTest.java +++ /dev/null @@ -1,180 +0,0 @@ -package com.baeldung.persistence.hibernate; - -import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic; -import static org.hamcrest.Matchers.hasSize; -import static org.hamcrest.Matchers.lessThan; -import static org.junit.Assert.assertThat; - -import java.util.List; - -import javax.persistence.Tuple; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Root; - -import org.hibernate.ScrollMode; -import org.hibernate.ScrollableResults; -import org.hibernate.Session; -import org.hibernate.SessionFactory; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import org.springframework.test.context.support.AnnotationConfigContextLoader; - -import com.baeldung.persistence.model.Foo; -import com.baeldung.persistence.service.IFooService; -import com.baeldung.spring.PersistenceConfig; -import com.google.common.collect.Lists; - -@RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(classes = { PersistenceConfig.class }, loader = AnnotationConfigContextLoader.class) -public class FooPaginationPersistenceIntegrationTest { - - @Autowired - private IFooService fooService; - - @Autowired - private SessionFactory sessionFactory; - - private Session session; - - // tests - - @Before - public final void before() { - final int minimalNumberOfEntities = 25; - if (fooService.findAll().size() <= minimalNumberOfEntities) { - for (int i = 0; i < minimalNumberOfEntities; i++) { - fooService.create(new Foo(randomAlphabetic(6))); - } - } - - session = sessionFactory.openSession(); - } - - @After - public final void after() { - session.close(); - } - - // tests - - @Test - public final void whenContextIsBootstrapped_thenNoExceptions() { - // - } - - @SuppressWarnings("unchecked") - @Test - public final void whenRetrievingPaginatedEntities_thenCorrectSize() { - final int pageNumber = 1; - final int pageSize = 10; - final List fooList = session.createQuery("From Foo").setFirstResult((pageNumber - 1) * pageSize).setMaxResults(pageSize).getResultList(); - assertThat(fooList, hasSize(pageSize)); - } - - @SuppressWarnings("unchecked") - @Test - public final void whenRetrievingAllPages_thenCorrect() { - int pageNumber = 1; - final int pageSize = 10; - - final String countQ = "Select count (f.id) from Foo f"; - final Long countResult = (Long) session.createQuery(countQ).uniqueResult(); - - final List fooList = Lists.newArrayList(); - int totalEntities = 0; - while (totalEntities < countResult) { - fooList.addAll(session.createQuery("From Foo").setFirstResult((pageNumber - 1) * pageSize).setMaxResults(pageSize).getResultList()); - totalEntities = fooList.size(); - pageNumber++; - } - } - - @SuppressWarnings("unchecked") - @Test - public final void whenRetrievingLastPage_thenCorrectSize() { - final int pageSize = 10; - - final String countQ = "Select count (f.id) from Foo f"; - final Long countResults = (Long) session.createQuery(countQ).uniqueResult(); - final int lastPageNumber = (int) ((countResults / pageSize) + 1); - - final List lastPage = session.createQuery("From Foo").setFirstResult((lastPageNumber - 1) * pageSize).setMaxResults(pageSize).getResultList(); - - assertThat(lastPage, hasSize(lessThan(pageSize + 1))); - } - - // testing - scrollable - - @Test - public final void givenUsingTheScrollableApi_whenRetrievingPaginatedData_thenCorrect() { - final int pageSize = 10; - final String hql = "FROM Foo f order by f.name"; - - final ScrollableResults resultScroll = session.createQuery(hql).scroll(ScrollMode.FORWARD_ONLY); - - // resultScroll.last(); - // final int totalResults = resultScroll.getRowNumber() + 1; - - resultScroll.first(); - resultScroll.scroll(0); - final List fooPage = Lists.newArrayList(); - int i = 0; - while (pageSize > i++) { - fooPage.add((Foo) resultScroll.get(0)); - if (!resultScroll.next()) { - break; - } - } - - assertThat(fooPage, hasSize(lessThan(10 + 1))); - } - - @SuppressWarnings("unchecked") - @Test - public final void givenUsingTheCriteriaApi_whenRetrievingFirstPage_thenCorrect() { - final int pageSize = 10; - - CriteriaBuilder builder = session.getCriteriaBuilder(); - CriteriaQuery criteriaItem = builder.createQuery(Foo.class); - Root rootItem = criteriaItem.from(Foo.class); - criteriaItem.select(rootItem); - final List firstPage = session.createQuery(criteriaItem).setFirstResult(0).setMaxResults(pageSize).getResultList(); - - assertThat(firstPage, hasSize(pageSize)); - } - - @SuppressWarnings("unchecked") - @Test - public final void givenUsingTheCriteriaApi_whenRetrievingPaginatedData_thenCorrect() { - - CriteriaBuilder builder = session.getCriteriaBuilder(); - CriteriaQuery criteriaItem = builder.createQuery(Tuple.class); - Root rootItem = criteriaItem.from(Foo.class); - criteriaItem.multiselect(builder.count(rootItem)); - final List itemProjected = session.createQuery(criteriaItem).getResultList(); - final Long count = (Long) itemProjected.get(0).get(0); - - int pageNumber = 1; - final int pageSize = 10; - final List fooList = Lists.newArrayList(); - - CriteriaBuilder builderFoo = session.getCriteriaBuilder(); - CriteriaQuery criteriaFoo = builderFoo.createQuery(Foo.class); - Root rootFoo = criteriaFoo.from(Foo.class); - criteriaFoo.select(rootFoo); - - int totalEntities = 0; - while (totalEntities < count.intValue()) { - fooList.addAll(session.createQuery(criteriaFoo).setFirstResult((pageNumber - 1) * pageSize).setMaxResults(pageSize).getResultList()); - totalEntities = fooList.size(); - pageNumber++; - } - } - -} diff --git a/spring-hibernate5/src/test/java/com/baeldung/persistence/hibernate/FooSortingPersistenceIntegrationTest.java b/spring-hibernate5/src/test/java/com/baeldung/persistence/hibernate/FooSortingPersistenceIntegrationTest.java deleted file mode 100644 index 9bd20e745c..0000000000 --- a/spring-hibernate5/src/test/java/com/baeldung/persistence/hibernate/FooSortingPersistenceIntegrationTest.java +++ /dev/null @@ -1,177 +0,0 @@ -package com.baeldung.persistence.hibernate; - -import static org.junit.Assert.assertNull; - -import java.util.ArrayList; -import java.util.List; -import java.util.Set; - -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Order; -import javax.persistence.criteria.Root; - -import org.hibernate.Session; -import org.hibernate.SessionFactory; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import org.springframework.test.context.support.AnnotationConfigContextLoader; - -import com.baeldung.persistence.model.Bar; -import com.baeldung.persistence.model.Foo; -import com.baeldung.spring.PersistenceConfig; - -@RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(classes = { PersistenceConfig.class }, loader = AnnotationConfigContextLoader.class) -@SuppressWarnings("unchecked") -public class FooSortingPersistenceIntegrationTest { - - @Autowired - private SessionFactory sessionFactory; - - private Session session; - - @Before - public void before() { - session = sessionFactory.openSession(); - - session.beginTransaction(); - - final FooFixtures fooData = new FooFixtures(sessionFactory); - fooData.createBars(); - } - - @After - public void after() { - session.getTransaction().commit(); - session.close(); - } - - @Test - public final void whenHQlSortingByOneAttribute_thenPrintSortedResults() { - final String hql = "FROM Foo f ORDER BY f.name"; - final List fooList = session.createQuery(hql).getResultList(); - for (final Foo foo : fooList) { - System.out.println("Name: " + foo.getName() + ", Id: " + foo.getId()); - } - } - - @Test - public final void whenHQlSortingByStringNullLast_thenLastNull() { - final String hql = "FROM Foo f ORDER BY f.name NULLS LAST"; - final List fooList = session.createQuery(hql).getResultList(); - - assertNull(fooList.get(fooList.toArray().length - 1).getName()); - for (final Foo foo : fooList) { - System.out.println("Name: " + foo.getName() + ", Id: " + foo.getId()); - } - } - - @Test - public final void whenSortingByStringNullsFirst_thenReturnNullsFirst() { - final String hql = "FROM Foo f ORDER BY f.name NULLS FIRST"; - final List fooList = session.createQuery(hql).getResultList(); - assertNull(fooList.get(0).getName()); - for (final Foo foo : fooList) { - System.out.println("Name:" + foo.getName()); - - } - } - - @Test - public final void whenHQlSortingByOneAttribute_andOrderDirection_thenPrintSortedResults() { - final String hql = "FROM Foo f ORDER BY f.name ASC"; - final List fooList = session.createQuery(hql).getResultList(); - for (final Foo foo : fooList) { - System.out.println("Name: " + foo.getName() + ", Id: " + foo.getId()); - } - } - - @Test - public final void whenHQlSortingByMultipleAttributes_thenSortedResults() { - final String hql = "FROM Foo f ORDER BY f.name, f.id"; - final List fooList = session.createQuery(hql).getResultList(); - for (final Foo foo : fooList) { - System.out.println("Name: " + foo.getName() + ", Id: " + foo.getId()); - } - } - - @Test - public final void whenHQlSortingByMultipleAttributes_andOrderDirection_thenPrintSortedResults() { - final String hql = "FROM Foo f ORDER BY f.name DESC, f.id ASC"; - final List fooList = session.createQuery(hql).getResultList(); - for (final Foo foo : fooList) { - System.out.println("Name: " + foo.getName() + ", Id: " + foo.getId()); - } - } - - @Test - public final void whenHQLCriteriaSortingByOneAttr_thenPrintSortedResults() { - List listOrders = new ArrayList(); - CriteriaBuilder builder = session.getCriteriaBuilder(); - CriteriaQuery criteriaItem = builder.createQuery(Foo.class); - Root rootItem = criteriaItem.from(Foo.class); - listOrders.add(builder.asc(rootItem.get("id"))); - criteriaItem.orderBy(listOrders.toArray(new Order[] {})); - final List fooList = session.createQuery(criteriaItem).getResultList(); - for (final Foo foo : fooList) { - System.out.println("Id: " + foo.getId() + ", FirstName: " + foo.getName()); - } - } - - @Test - public final void whenHQLCriteriaSortingByMultipAttr_thenSortedResults() { - List listOrders = new ArrayList(); - CriteriaBuilder builder = session.getCriteriaBuilder(); - CriteriaQuery criteriaItem = builder.createQuery(Foo.class); - Root rootItem = criteriaItem.from(Foo.class); - listOrders.add(builder.asc(rootItem.get("name"))); - listOrders.add(builder.asc(rootItem.get("id"))); - criteriaItem.orderBy(listOrders.toArray(new Order[] {})); - final List fooList = session.createQuery(criteriaItem).getResultList(); - for (final Foo foo : fooList) { - System.out.println("Id: " + foo.getId() + ", FirstName: " + foo.getName()); - } - } - - /*@Test - public final void whenCriteriaSortingStringNullsLastAsc_thenNullsLast() { - final Criteria criteria = session.createCriteria(Foo.class, "FOO"); - criteria.addOrder(Order.asc("name").nulls(NullPrecedence.LAST)); - final List fooList = criteria.list(); - assertNull(fooList.get(fooList.toArray().length - 1).getName()); - for (final Foo foo : fooList) { - System.out.println("Id: " + foo.getId() + ", FirstName: " + foo.getName()); - } - } - - @Test - public final void whenCriteriaSortingStringNullsFirstDesc_thenNullsFirst() { - final Criteria criteria = session.createCriteria(Foo.class, "FOO"); - criteria.addOrder(Order.desc("name").nulls(NullPrecedence.FIRST)); - final List fooList = criteria.list(); - assertNull(fooList.get(0).getName()); - for (final Foo foo : fooList) { - System.out.println("Id: " + foo.getId() + ", FirstName: " + foo.getName()); - } - }*/ - - @Test - public final void whenSortingBars_thenBarsWithSortedFoos() { - final String hql = "FROM Bar b ORDER BY b.id"; - final List barList = session.createQuery(hql).getResultList(); - for (final Bar bar : barList) { - final Set fooSet = bar.getFooSet(); - System.out.println("Bar Id:" + bar.getId()); - for (final Foo foo : fooSet) { - System.out.println("FooName:" + foo.getName()); - } - } - } - -} diff --git a/spring-hibernate5/src/test/java/com/baeldung/persistence/save/SaveMethodIntegrationTest.java b/spring-hibernate5/src/test/java/com/baeldung/persistence/save/SaveMethodIntegrationTest.java deleted file mode 100644 index 910cdc597f..0000000000 --- a/spring-hibernate5/src/test/java/com/baeldung/persistence/save/SaveMethodIntegrationTest.java +++ /dev/null @@ -1,270 +0,0 @@ -package com.baeldung.persistence.save; - -import com.baeldung.persistence.model.Person; -import org.hibernate.HibernateException; -import org.hibernate.Session; -import org.hibernate.SessionFactory; -import org.hibernate.TransactionException; -import org.hibernate.boot.registry.StandardServiceRegistryBuilder; -import org.hibernate.cfg.Configuration; -import org.hibernate.dialect.HSQLDialect; -import org.hibernate.service.ServiceRegistry; -import org.junit.*; - -import javax.persistence.PersistenceException; - -import static org.junit.Assert.*; - -/** - * Testing specific implementation details for different methods: persist, save, - * merge, update, saveOrUpdate. - */ -public class SaveMethodIntegrationTest { - - private static SessionFactory sessionFactory; - - private Session session; - - @BeforeClass - public static void beforeTests() { - Configuration configuration = new Configuration().addAnnotatedClass(Person.class).setProperty("hibernate.dialect", HSQLDialect.class.getName()).setProperty("hibernate.connection.driver_class", org.hsqldb.jdbcDriver.class.getName()) - .setProperty("hibernate.connection.url", "jdbc:hsqldb:mem:test").setProperty("hibernate.connection.username", "sa").setProperty("hibernate.connection.password", "").setProperty("hibernate.hbm2ddl.auto", "update"); - ServiceRegistry serviceRegistry = new StandardServiceRegistryBuilder().applySettings(configuration.getProperties()).build(); - sessionFactory = configuration.buildSessionFactory(serviceRegistry); - } - - @Before - public void setUp() { - session = sessionFactory.openSession(); - session.beginTransaction(); - } - - @Test - public void whenPersistTransient_thenSavedToDatabaseOnCommit() { - - Person person = new Person(); - person.setName("John"); - session.persist(person); - - session.getTransaction().commit(); - session.close(); - - session = sessionFactory.openSession(); - session.beginTransaction(); - - assertNotNull(session.get(Person.class, person.getId())); - - } - - @Test - public void whenPersistPersistent_thenNothingHappens() { - - Person person = new Person(); - person.setName("John"); - - session.persist(person); - Long id1 = person.getId(); - - session.persist(person); - Long id2 = person.getId(); - - assertEquals(id1, id2); - } - - @Test(expected = PersistenceException.class) - public void whenPersistDetached_thenThrowsException() { - - Person person = new Person(); - person.setName("John"); - session.persist(person); - session.evict(person); - - session.persist(person); - - } - - @Test - public void whenSaveTransient_thenIdGeneratedImmediately() { - - Person person = new Person(); - person.setName("John"); - - assertNull(person.getId()); - - Long id = (Long) session.save(person); - - assertNotNull(id); - - session.getTransaction().commit(); - session.close(); - - assertEquals(id, person.getId()); - - session = sessionFactory.openSession(); - session.beginTransaction(); - - assertNotNull(session.get(Person.class, person.getId())); - - } - - @Test - public void whenSavePersistent_thenNothingHappens() { - - Person person = new Person(); - person.setName("John"); - Long id1 = (Long) session.save(person); - Long id2 = (Long) session.save(person); - assertEquals(id1, id2); - - } - - @Test - public void whenSaveDetached_thenNewInstancePersisted() { - - Person person = new Person(); - person.setName("John"); - Long id1 = (Long) session.save(person); - session.evict(person); - - Long id2 = (Long) session.save(person); - assertNotEquals(id1, id2); - - } - - @Test - public void whenMergeDetached_thenEntityUpdatedFromDatabase() { - - Person person = new Person(); - person.setName("John"); - session.save(person); - session.flush(); - session.evict(person); - - person.setName("Mary"); - Person mergedPerson = (Person) session.merge(person); - - assertNotSame(person, mergedPerson); - assertEquals("Mary", mergedPerson.getName()); - - } - - @Test - public void whenMergeTransient_thenNewEntitySavedToDatabase() { - - Person person = new Person(); - person.setName("John"); - Person mergedPerson = (Person) session.merge(person); - - session.getTransaction().commit(); - session.beginTransaction(); - - assertNull(person.getId()); - assertNotNull(mergedPerson.getId()); - - } - - @Test - public void whenMergePersistent_thenReturnsSameObject() { - - Person person = new Person(); - person.setName("John"); - session.save(person); - - Person mergedPerson = (Person) session.merge(person); - - assertSame(person, mergedPerson); - - } - - @Test - public void whenUpdateDetached_thenEntityUpdatedFromDatabase() { - - Person person = new Person(); - person.setName("John"); - session.save(person); - session.evict(person); - - person.setName("Mary"); - session.update(person); - assertEquals("Mary", person.getName()); - - } - - @Test(expected = HibernateException.class) - public void whenUpdateTransient_thenThrowsException() { - - Person person = new Person(); - person.setName("John"); - session.update(person); - - } - - @Test - public void whenUpdatePersistent_thenNothingHappens() { - - Person person = new Person(); - person.setName("John"); - session.save(person); - - session.update(person); - - } - - @Test - public void whenSaveOrUpdateDetached_thenEntityUpdatedFromDatabase() { - - Person person = new Person(); - person.setName("John"); - session.save(person); - session.evict(person); - - person.setName("Mary"); - session.saveOrUpdate(person); - assertEquals("Mary", person.getName()); - - } - - @Test - public void whenSaveOrUpdateTransient_thenSavedToDatabaseOnCommit() { - - Person person = new Person(); - person.setName("John"); - session.saveOrUpdate(person); - - session.getTransaction().commit(); - session.close(); - - session = sessionFactory.openSession(); - session.beginTransaction(); - - assertNotNull(session.get(Person.class, person.getId())); - - } - - @Test - public void whenSaveOrUpdatePersistent_thenNothingHappens() { - - Person person = new Person(); - person.setName("John"); - session.save(person); - - session.saveOrUpdate(person); - - } - - @After - public void tearDown() { - try { - session.getTransaction().commit(); - session.close(); - } catch (TransactionException ex) { - ex.printStackTrace(); - } - } - - @AfterClass - public static void afterTests() { - sessionFactory.close(); - } - -} diff --git a/spring-hibernate5/src/test/java/com/baeldung/persistence/service/FooServicePersistenceIntegrationTest.java b/spring-hibernate5/src/test/java/com/baeldung/persistence/service/FooServicePersistenceIntegrationTest.java deleted file mode 100644 index b82d4621ab..0000000000 --- a/spring-hibernate5/src/test/java/com/baeldung/persistence/service/FooServicePersistenceIntegrationTest.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.baeldung.persistence.service; - -import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic; - -import com.baeldung.persistence.model.Foo; -import com.baeldung.spring.PersistenceConfig; -import org.junit.Ignore; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.dao.DataAccessException; -import org.springframework.dao.DataIntegrityViolationException; -import org.springframework.dao.InvalidDataAccessApiUsageException; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import org.springframework.test.context.support.AnnotationConfigContextLoader; - -@RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(classes = { PersistenceConfig.class }, loader = AnnotationConfigContextLoader.class) -public class FooServicePersistenceIntegrationTest { - - @Autowired - @Qualifier("fooHibernateService") - private IFooService service; - - // tests - - @Test - public final void whenContextIsBootstrapped_thenNoExceptions() { - // - } - - @Test - public final void whenEntityIsCreated_thenNoExceptions() { - service.create(new Foo(randomAlphabetic(6))); - } - - @Test(expected = DataIntegrityViolationException.class) - @Ignore("work in progress") - public final void whenInvalidEntityIsCreated_thenDataException() { - service.create(new Foo()); - } - - @Test(expected = DataIntegrityViolationException.class) - public final void whenEntityWithLongNameIsCreated_thenDataException() { - service.create(new Foo(randomAlphabetic(2048))); - } - - @Test(expected = InvalidDataAccessApiUsageException.class) - @Ignore("Right now, persist has saveOrUpdate semantics, so this will no longer fail") - public final void whenSameEntityIsCreatedTwice_thenDataException() { - final Foo entity = new Foo(randomAlphabetic(8)); - service.create(entity); - service.create(entity); - } - - @Test(expected = DataAccessException.class) - public final void temp_whenInvalidEntityIsCreated_thenDataException() { - service.create(new Foo(randomAlphabetic(2048))); - } - -} diff --git a/spring-hibernate5/src/test/java/com/baeldung/persistence/service/FooStoredProceduresIntegrationTest.java b/spring-hibernate5/src/test/java/com/baeldung/persistence/service/FooStoredProceduresIntegrationTest.java deleted file mode 100644 index 8ab1b86809..0000000000 --- a/spring-hibernate5/src/test/java/com/baeldung/persistence/service/FooStoredProceduresIntegrationTest.java +++ /dev/null @@ -1,112 +0,0 @@ -package com.baeldung.persistence.service; - -import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic; -import static org.junit.Assert.assertEquals; - -import java.util.List; - -import org.hibernate.Session; -import org.hibernate.SessionFactory; -import org.hibernate.exception.SQLGrammarException; -import org.junit.After; -import org.junit.Assume; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import org.springframework.test.context.support.AnnotationConfigContextLoader; - -import com.baeldung.persistence.model.Foo; -import com.baeldung.spring.PersistenceConfig; - -@RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(classes = { PersistenceConfig.class }, loader = AnnotationConfigContextLoader.class) -public class FooStoredProceduresIntegrationTest { - - private static final Logger LOGGER = LoggerFactory.getLogger(FooStoredProceduresIntegrationTest.class); - - @Autowired - private SessionFactory sessionFactory; - - @Autowired - private IFooService fooService; - - private Session session; - - @Before - public final void before() { - session = sessionFactory.openSession(); - Assume.assumeTrue(getAllFoosExists()); - Assume.assumeTrue(getFoosByNameExists()); - } - - private boolean getFoosByNameExists() { - try { - session.createQuery("CALL GetAllFoos()", Foo.class).getResultList(); - return true; - } catch (SQLGrammarException e) { - LOGGER.error("WARNING : GetFoosByName() Procedure is may be missing ", e); - return false; - } - } - - private boolean getAllFoosExists() { - try { - session.createQuery("CALL GetAllFoos()", Foo.class).getResultList(); - return true; - } catch (SQLGrammarException e) { - LOGGER.error("WARNING : GetAllFoos() Procedure is may be missing ", e); - return false; - } - } - - @After - public final void after() { - session.close(); - } - - @Test - public final void getAllFoosUsingStoredProcedures() { - - fooService.create(new Foo(randomAlphabetic(6))); - - // Stored procedure getAllFoos using createSQLQuery - List allFoos = session.createQuery("CALL GetAllFoos()", Foo.class).getResultList(); - for (Foo foo : allFoos) { - LOGGER.info("getAllFoos() SQL Query result : {}", foo.getName()); - } - assertEquals(allFoos.size(), fooService.findAll().size()); - - // Stored procedure getAllFoos using a Named Query - @SuppressWarnings("unchecked") - List allFoos2 = session.getNamedQuery("callGetAllFoos").getResultList(); - for (Foo foo : allFoos2) { - LOGGER.info("getAllFoos() NamedQuery result : {}", foo.getName()); - } - assertEquals(allFoos2.size(), fooService.findAll().size()); - } - - @Test - public final void getFoosByNameUsingStoredProcedures() { - - fooService.create(new Foo("NewFooName")); - - // Stored procedure getFoosByName using createSQLQuery() - List allFoosByName = session.createQuery("CALL GetFoosByName(:fooName)", Foo.class).setParameter("fooName", "NewFooName").getResultList(); - for (Foo foo : allFoosByName) { - LOGGER.info("getFoosByName() using SQL Query : found => {}", foo.toString()); - } - - // Stored procedure getFoosByName using getNamedQuery() - @SuppressWarnings("unchecked") - List allFoosByName2 = session.getNamedQuery("callGetFoosByName").setParameter("fooName", "NewFooName").getResultList(); - for (Foo foo : allFoosByName2) { - LOGGER.info("getFoosByName() using Native Query : found => {}", foo.toString()); - } - - } -} diff --git a/spring-hibernate5/src/test/java/com/baeldung/persistence/service/ParentServicePersistenceIntegrationTest.java b/spring-hibernate5/src/test/java/com/baeldung/persistence/service/ParentServicePersistenceIntegrationTest.java deleted file mode 100644 index 9e8c4aba92..0000000000 --- a/spring-hibernate5/src/test/java/com/baeldung/persistence/service/ParentServicePersistenceIntegrationTest.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.baeldung.persistence.service; - -import com.baeldung.persistence.model.Child; -import com.baeldung.persistence.model.Parent; -import com.baeldung.spring.PersistenceConfig; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.dao.DataIntegrityViolationException; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import org.springframework.test.context.support.AnnotationConfigContextLoader; - -@RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(classes = { PersistenceConfig.class }, loader = AnnotationConfigContextLoader.class) -public class ParentServicePersistenceIntegrationTest { - - @Autowired - private IParentService service; - - @Autowired - private IChildService childService; - - // tests - - @Test - public final void whenContextIsBootstrapped_thenNoExceptions() { - // - } - - @Test - public final void whenOneToOneEntitiesAreCreated_thenNoExceptions() { - final Child childEntity = new Child(); - childService.create(childEntity); - - final Parent parentEntity = new Parent(childEntity); - service.create(parentEntity); - - System.out.println("Child = " + childService.findOne(childEntity.getId())); - System.out.println("Child - parent = " + childService.findOne(childEntity.getId()).getParent()); - - System.out.println("Parent = " + service.findOne(parentEntity.getId())); - System.out.println("Parent - child = " + service.findOne(parentEntity.getId()).getChild()); - } - - @Test(expected = DataIntegrityViolationException.class) - public final void whenChildIsDeletedWhileParentStillHasForeignKeyToIt_thenDataException() { - final Child childEntity = new Child(); - childService.create(childEntity); - - final Parent parentEntity = new Parent(childEntity); - service.create(parentEntity); - - childService.delete(childEntity); - } - - @Test - public final void whenChildIsDeletedAfterTheParent_thenNoExceptions() { - final Child childEntity = new Child(); - childService.create(childEntity); - - final Parent parentEntity = new Parent(childEntity); - service.create(parentEntity); - - service.delete(parentEntity); - childService.delete(childEntity); - } - -} diff --git a/spring-hibernate5/src/test/resources/com/baeldung/hibernate/criteria/model/Item.hbm.xml b/spring-hibernate5/src/test/resources/com/baeldung/hibernate/criteria/model/Item.hbm.xml deleted file mode 100644 index 9e0109aae2..0000000000 --- a/spring-hibernate5/src/test/resources/com/baeldung/hibernate/criteria/model/Item.hbm.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/spring-hibernate5/src/test/resources/criteria.cfg.xml b/spring-hibernate5/src/test/resources/criteria.cfg.xml deleted file mode 100644 index 5bc3a32077..0000000000 --- a/spring-hibernate5/src/test/resources/criteria.cfg.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - com.mysql.jdbc.Driver - jdbc:mysql://localhost:3306/test - root - root - org.hibernate.dialect.MySQLDialect - true - - - \ No newline at end of file diff --git a/spring-hibernate5/src/test/resources/fetching.cfg.xml b/spring-hibernate5/src/test/resources/fetching.cfg.xml deleted file mode 100644 index c47b062a2f..0000000000 --- a/spring-hibernate5/src/test/resources/fetching.cfg.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - com.mysql.jdbc.Driver - jdbc:mysql://localhost:3306/test - root - root - org.hibernate.dialect.MySQLDialect - true - - - - - \ No newline at end of file diff --git a/spring-hibernate5/src/test/resources/fetchingLazy.cfg.xml b/spring-hibernate5/src/test/resources/fetchingLazy.cfg.xml deleted file mode 100644 index 2e252e9307..0000000000 --- a/spring-hibernate5/src/test/resources/fetchingLazy.cfg.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - com.mysql.jdbc.Driver - jdbc:mysql://localhost:3306/test - root - root - org.hibernate.dialect.MySQLDialect - true - - - - - \ No newline at end of file diff --git a/spring-integration/pom.xml b/spring-integration/pom.xml index 8ff7bf4e8e..a162f18b9c 100644 --- a/spring-integration/pom.xml +++ b/spring-integration/pom.xml @@ -14,8 +14,8 @@ com.baeldung parent-modules 1.0.0-SNAPSHOT - - + + UTF-8 4.3.5.RELEASE @@ -68,7 +68,7 @@ org.springframework.integration spring-integration-core - ${spring.integration.version} + ${spring.integration.version} javax.activation @@ -142,5 +142,5 @@ - + diff --git a/spring-jersey/pom.xml b/spring-jersey/pom.xml index 4cf09e9991..4cefa83442 100644 --- a/spring-jersey/pom.xml +++ b/spring-jersey/pom.xml @@ -12,8 +12,8 @@ com.baeldung parent-modules 1.0.0-SNAPSHOT - - + + 2.25.1 3.0.0 @@ -95,13 +95,6 @@ - - org.slf4j - jcl-over-slf4j - ${org.slf4j.version} - - - @@ -114,7 +107,7 @@ commons-logging commons-logging - + diff --git a/spring-jms/pom.xml b/spring-jms/pom.xml index df59b03451..7ec5b9bb65 100644 --- a/spring-jms/pom.xml +++ b/spring-jms/pom.xml @@ -1,61 +1,61 @@ - 4.0.0 - com.baeldung - spring-jms - 0.0.1-SNAPSHOT - war - spring-jms - Introduction to Spring JMS + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + com.baeldung + spring-jms + 0.0.1-SNAPSHOT + war + spring-jms + Introduction to Spring JMS - - com.baeldung - parent-modules - 1.0.0-SNAPSHOT - - - - 4.3.4.RELEASE - 5.14.1 - 2.6 - + + com.baeldung + parent-modules + 1.0.0-SNAPSHOT + - - - - org.springframework - spring-jms - ${springframework.version} - - - commons-logging - commons-logging - - - - - - org.apache.activemq - activemq-all - ${activemq.version} - - + + 4.3.4.RELEASE + 5.14.1 + 2.6 + - - - - - org.apache.maven.plugins - maven-war-plugin - ${maven-war-plugin.version} - - src/main/webapp - spring-jms - false - - - - - spring-jms - + + + + org.springframework + spring-jms + ${springframework.version} + + + commons-logging + commons-logging + + + + + + org.apache.activemq + activemq-all + ${activemq.version} + + + + + + + + org.apache.maven.plugins + maven-war-plugin + ${maven-war-plugin.version} + + src/main/webapp + spring-jms + false + + + + + spring-jms + diff --git a/spring-jms/src/test/java/com/baeldung/spring/jms/DefaultTextMessageSenderTest.java b/spring-jms/src/test/java/com/baeldung/spring/jms/DefaultTextMessageSenderIntegrationTest.java similarity index 92% rename from spring-jms/src/test/java/com/baeldung/spring/jms/DefaultTextMessageSenderTest.java rename to spring-jms/src/test/java/com/baeldung/spring/jms/DefaultTextMessageSenderIntegrationTest.java index c0761939ad..f87d26b144 100644 --- a/spring-jms/src/test/java/com/baeldung/spring/jms/DefaultTextMessageSenderTest.java +++ b/spring-jms/src/test/java/com/baeldung/spring/jms/DefaultTextMessageSenderIntegrationTest.java @@ -5,7 +5,7 @@ import org.junit.Test; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -public class DefaultTextMessageSenderTest { +public class DefaultTextMessageSenderIntegrationTest { private static SampleJmsMessageSender messageProducer; diff --git a/spring-jooq/pom.xml b/spring-jooq/pom.xml index 84367151de..e6ae05eb0f 100644 --- a/spring-jooq/pom.xml +++ b/spring-jooq/pom.xml @@ -9,8 +9,8 @@ com.baeldung parent-modules 1.0.0-SNAPSHOT - - + + @@ -46,7 +46,7 @@ commons-logging commons-logging - + org.springframework @@ -152,7 +152,8 @@ - + org.eclipse.m2e lifecycle-mapping diff --git a/spring-jpa/pom.xml b/spring-jpa/pom.xml index 6d72286028..1a1e6b3152 100644 --- a/spring-jpa/pom.xml +++ b/spring-jpa/pom.xml @@ -1,98 +1,99 @@ - - 4.0.0 + + 4.0.0 - com.baeldung - spring-jpa - 0.1-SNAPSHOT - war + com.baeldung + spring-jpa + 0.1-SNAPSHOT + war - spring-jpa + spring-jpa - - com.baeldung - parent-modules - 1.0.0-SNAPSHOT - - - + + com.baeldung + parent-modules + 1.0.0-SNAPSHOT + - + - - org.springframework - spring-orm - ${org.springframework.version} - - - commons-logging - commons-logging - - - - - org.springframework - spring-context - ${org.springframework.version} - - - org.springframework - spring-webmvc - ${org.springframework.version} + + + + org.springframework + spring-orm + ${org.springframework.version} + + + commons-logging + commons-logging + + + + + org.springframework + spring-context + ${org.springframework.version} + + + org.springframework + spring-webmvc + ${org.springframework.version} - + - - org.hibernate - hibernate-entitymanager - ${hibernate.version} - - - org.hibernate - hibernate-ehcache - ${hibernate.version} - - - xml-apis - xml-apis - ${xml-apis.version} - - - org.javassist - javassist - ${javassist.version} - - - mysql - mysql-connector-java - ${mysql-connector-java.version} - runtime - - - org.springframework.data - spring-data-jpa - ${spring-data-jpa.version} - - - com.h2database - h2 - ${h2.version} - + + org.hibernate + hibernate-entitymanager + ${hibernate.version} + + + org.hibernate + hibernate-ehcache + ${hibernate.version} + + + xml-apis + xml-apis + ${xml-apis.version} + + + org.javassist + javassist + ${javassist.version} + + + mysql + mysql-connector-java + ${mysql-connector-java.version} + runtime + + + org.springframework.data + spring-data-jpa + ${spring-data-jpa.version} + + + com.h2database + h2 + ${h2.version} + - + - - org.hibernate - hibernate-validator - ${hibernate-validator.version} - - - javax.el - javax.el-api - ${javax.el-api.version} - - - + + org.hibernate + hibernate-validator + ${hibernate-validator.version} + + + javax.el + javax.el-api + ${javax.el-api.version} + + + javax.servlet jstl @@ -104,115 +105,91 @@ ${javax.servlet.servlet-api.version} - + - - com.google.guava - guava - ${guava.version} - + + com.google.guava + guava + ${guava.version} + - + - - org.apache.commons - commons-lang3 - ${commons-lang3.version} - test - + + org.apache.commons + commons-lang3 + ${commons-lang3.version} + test + - - org.springframework - spring-test - ${org.springframework.version} - test - + + org.springframework + spring-test + ${org.springframework.version} + test + - - org.hamcrest - hamcrest-core - ${org.hamcrest.version} - test - - - org.hamcrest - hamcrest-library - ${org.hamcrest.version} - test - + - - org.mockito - mockito-core - ${mockito.version} - test - + + spring-jpa + + + src/main/resources + true + + - + - - spring-jpa - - - src/main/resources - true - - + + org.apache.maven.plugins + maven-war-plugin + ${maven-war-plugin.version} + + src/main/webapp + false + + - - - - org.apache.maven.plugins - maven-war-plugin - ${maven-war-plugin.version} - - src/main/webapp - false - - + - + - - - - - 4.3.7.RELEASE - 3.21.0-GA + + + 4.3.8.RELEASE + 3.21.0-GA - - 5.2.9.Final - 5.1.40 - 1.11.1.RELEASE - 1.4.194 - - - 1.2 - 2.5 + + 5.2.10.Final + 6.0.6 + 1.11.3.RELEASE + 1.4.195 - - 5.3.3.Final - 1.4.01 - 2.2.5 + + 1.2 + 2.5 - - 19.0 - 3.5 + + 5.4.1.Final + 1.4.01 + 2.2.5 - - 1.3 - 1.10.19 + + 21.0 + 3.5 - 4.4.5 - 4.5.2 + 4.4.5 + 4.5.2 - 2.9.0 + 2.9.0 - - 2.7 - 1.6.1 - 2.6 + + 2.7 + 1.6.1 + 2.6 - + \ No newline at end of file diff --git a/spring-jpa/src/main/resources/persistence-multiple-db.properties b/spring-jpa/src/main/resources/persistence-multiple-db.properties index 1a0d99c704..539535528c 100644 --- a/spring-jpa/src/main/resources/persistence-multiple-db.properties +++ b/spring-jpa/src/main/resources/persistence-multiple-db.properties @@ -1,5 +1,5 @@ # jdbc.X -jdbc.driverClassName=com.mysql.jdbc.Driver +jdbc.driverClassName=com.mysql.cj.jdbc.Driver user.jdbc.url=jdbc:mysql://localhost:3306/spring_jpa_user?createDatabaseIfNotExist=true product.jdbc.url=jdbc:mysql://localhost:3306/spring_jpa_product?createDatabaseIfNotExist=true jdbc.user=tutorialuser diff --git a/spring-jpa/src/main/resources/persistence-mysql.properties b/spring-jpa/src/main/resources/persistence-mysql.properties index 12b4c93d80..ef17910b68 100644 --- a/spring-jpa/src/main/resources/persistence-mysql.properties +++ b/spring-jpa/src/main/resources/persistence-mysql.properties @@ -1,5 +1,5 @@ # jdbc.X -jdbc.driverClassName=com.mysql.jdbc.Driver +jdbc.driverClassName=com.mysql.cj.jdbc.Driver jdbc.url=jdbc:mysql://localhost:3306/spring_jpa_01?createDatabaseIfNotExist=true jdbc.user=tutorialuser jdbc.pass=tutorialmy5ql diff --git a/spring-jpa/src/main/resources/persistence-student.properties b/spring-jpa/src/main/resources/persistence-student.properties index 4e80b836d2..d4c82420de 100644 --- a/spring-jpa/src/main/resources/persistence-student.properties +++ b/spring-jpa/src/main/resources/persistence-student.properties @@ -1,4 +1,4 @@ -jdbc.driverClassName=com.mysql.jdbc.Driver +jdbc.driverClassName=com.mysql.cj.jdbc.Driver jdbc.url=jdbc:mysql://localhost:3306/myDb jdbc.user=tutorialuser jdbc.pass=tutorialpass diff --git a/spring-kafka/pom.xml b/spring-kafka/pom.xml index 11810a17dd..7160f989be 100644 --- a/spring-kafka/pom.xml +++ b/spring-kafka/pom.xml @@ -10,15 +10,15 @@ Intro to Kafka with Spring - 1.8 1.1.3.RELEASE 2.6.7 - org.springframework.boot - spring-boot-starter-parent - 1.5.2.RELEASE + parent-boot-5 + com.baeldung + 0.0.1-SNAPSHOT + ../parent-boot-5 @@ -40,13 +40,4 @@ - - - - org.springframework.boot - spring-boot-maven-plugin - - - - \ No newline at end of file diff --git a/spring-katharsis/pom.xml b/spring-katharsis/pom.xml index 25a1c13f6b..822eac7873 100644 --- a/spring-katharsis/pom.xml +++ b/spring-katharsis/pom.xml @@ -1,14 +1,16 @@ - - 4.0.0 - org.springframework.samples - spring-katharsis - 0.0.1-SNAPSHOT - war - - - org.springframework.boot - spring-boot-starter-parent - 1.4.4.RELEASE + + 4.0.0 + org.springframework.samples + spring-katharsis + 0.0.1-SNAPSHOT + war + + + parent-boot-4 + com.baeldung + 0.0.1-SNAPSHOT + ../parent-boot-4 @@ -16,78 +18,36 @@ org.springframework.boot spring-boot-starter-web - + + + org.springframework.boot + spring-boot-starter-data-jpa + + - org.springframework.boot - spring-boot-starter-data-jpa - - - com.h2database h2 - - - - - io.katharsis - katharsis-servlet - ${katharsis.version} - - - - - - org.springframework.boot - spring-boot-starter-test - test - - - - com.jayway.restassured - rest-assured - ${restassured.version} - test - - - commons-logging - commons-logging - - + + + + + io.katharsis + katharsis-servlet + ${katharsis.version} - + - - + + - 1.8 1.0.1 - 2.9.0 1.6.1 - - org.springframework.boot - spring-boot-maven-plugin - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - **/*LiveTest.java - - - - - - - org.codehaus.cargo cargo-maven2-plugin @@ -108,9 +68,7 @@ - - @@ -138,7 +96,6 @@ - org.apache.maven.plugins maven-surefire-plugin @@ -162,11 +119,10 @@ - - - + + diff --git a/spring-katharsis/src/test/java/org/baeldung/test/JsonApiLiveTest.java b/spring-katharsis/src/test/java/org/baeldung/test/JsonApiLiveTest.java index 26a8c42a25..e512202d96 100644 --- a/spring-katharsis/src/test/java/org/baeldung/test/JsonApiLiveTest.java +++ b/spring-katharsis/src/test/java/org/baeldung/test/JsonApiLiveTest.java @@ -4,8 +4,8 @@ import static org.junit.Assert.assertEquals; import org.junit.Test; -import com.jayway.restassured.RestAssured; -import com.jayway.restassured.response.Response; +import io.restassured.RestAssured; +import io.restassured.response.Response; public class JsonApiLiveTest { diff --git a/spring-ldap/pom.xml b/spring-ldap/pom.xml index db9c2160fa..16d4879f10 100644 --- a/spring-ldap/pom.xml +++ b/spring-ldap/pom.xml @@ -12,14 +12,13 @@ com.baeldung parent-modules 1.0.0-SNAPSHOT - - + + 2.3.1.RELEASE 4.3.6.RELEASE 1.5.5 0.9.15 - 1.3 @@ -40,33 +39,12 @@ - - org.slf4j - jcl-over-slf4j - ${org.slf4j.version} - org.springframework spring-context ${spring-context.version} - - - - - org.hamcrest - hamcrest-core - ${org.hamcrest.version} - test - - - org.hamcrest - hamcrest-library - ${org.hamcrest.version} - test - - org.springframework.ldap @@ -78,7 +56,7 @@ commons-logging commons-logging - + diff --git a/spring-mobile/pom.xml b/spring-mobile/pom.xml index a62234e63f..8b8618aeee 100644 --- a/spring-mobile/pom.xml +++ b/spring-mobile/pom.xml @@ -3,51 +3,34 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 - com.baeldung - spring-mobile - 1.0-SNAPSHOT - spring-mobile - war - http://maven.apache.org + com.baeldung + spring-mobile + 1.0-SNAPSHOT + spring-mobile + war + http://maven.apache.org - - 1.8 - + + parent-boot-4 + com.baeldung + 0.0.1-SNAPSHOT + ../parent-boot-4 + - - org.springframework.boot - spring-boot-starter-parent - 1.4.3.RELEASE - - - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.mobile - spring-mobile-device - - - org.springframework.boot - spring-boot-starter-freemarker - - - - - - - src/main/resources - - - - - org.springframework.boot - spring-boot-maven-plugin - - - + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.mobile + spring-mobile-device + + + org.springframework.boot + spring-boot-starter-freemarker + + diff --git a/spring-mockito/pom.xml b/spring-mockito/pom.xml index 3231faf197..d8bcc5682a 100644 --- a/spring-mockito/pom.xml +++ b/spring-mockito/pom.xml @@ -1,5 +1,6 @@ - + 4.0.0 com.baeldung @@ -11,10 +12,10 @@ Injecting Mockito Mocks into Spring Beans - org.springframework.boot - spring-boot-starter-parent - 1.4.4.RELEASE - + parent-boot-4 + com.baeldung + 0.0.1-SNAPSHOT + ../parent-boot-4 @@ -22,11 +23,6 @@ org.springframework.boot spring-boot-starter - - org.springframework.boot - spring-boot-starter-test - test - org.mockito mockito-all @@ -34,25 +30,6 @@ - - - - org.springframework.boot - spring-boot-maven-plugin - - - org.apache.maven.plugins - maven-surefire-plugin - - - **/*IntegrationTest.java - **/*LiveTest.java - - - - - - integration @@ -87,10 +64,8 @@ - + - UTF-8 - 1.8 1.10.19 diff --git a/spring-mvc-email/pom.xml b/spring-mvc-email/pom.xml index 4a3ef5f83b..c40abdb4bf 100644 --- a/spring-mvc-email/pom.xml +++ b/spring-mvc-email/pom.xml @@ -10,10 +10,10 @@ war - org.springframework.boot - spring-boot-starter-parent - 1.4.4.RELEASE - + parent-boot-4 + com.baeldung + 0.0.1-SNAPSHOT + ../parent-boot-4 @@ -37,17 +37,4 @@ - - 1.8 - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - - diff --git a/spring-mvc-forms/pom.xml b/spring-mvc-forms/pom.xml index 5918d13a90..e82a906112 100644 --- a/spring-mvc-forms/pom.xml +++ b/spring-mvc-forms/pom.xml @@ -1,6 +1,7 @@ - + 4.0.0 com.baeldung @@ -14,8 +15,8 @@ com.baeldung parent-modules 1.0.0-SNAPSHOT - - + + org.springframework @@ -26,7 +27,7 @@ commons-logging commons-logging - + @@ -54,17 +55,17 @@ - commons-fileupload - commons-fileupload - ${fileupload.version} + commons-fileupload + commons-fileupload + ${fileupload.version} - - com.fasterxml.jackson.core - jackson-databind - ${jackson.version} - - + + com.fasterxml.jackson.core + jackson-databind + ${jackson.version} + + @@ -104,8 +105,8 @@ 3.1.0 5.4.0.Final enter-location-of-server - 1.3.2 - 2.8.7 + 1.3.2 + 2.8.7 diff --git a/spring-mvc-java/pom.xml b/spring-mvc-java/pom.xml index 632012b00f..eb8e1455a7 100644 --- a/spring-mvc-java/pom.xml +++ b/spring-mvc-java/pom.xml @@ -11,8 +11,8 @@ com.baeldung parent-modules 1.0.0-SNAPSHOT - - + + @@ -95,7 +95,7 @@ commons-logging commons-logging - + @@ -110,33 +110,6 @@ ${thymeleaf.version} - - - org.slf4j - jcl-over-slf4j - - ${org.slf4j.version} - - - - - org.hamcrest - hamcrest-core - ${org.hamcrest.version} - test - - - org.hamcrest - hamcrest-library - ${org.hamcrest.version} - test - - - org.mockito - mockito-core - ${mockito.version} - test - com.jayway.jsonpath json-path @@ -156,13 +129,13 @@ poi-ooxml ${poi.version} - + javax.validation validation-api 1.1.0.Final - + org.hibernate hibernate-validator @@ -177,7 +150,7 @@ org.glassfish.web javax.el 2.2.4 - + @@ -204,7 +177,7 @@ false - + org.codehaus.cargo cargo-maven2-plugin @@ -343,8 +316,6 @@ 2.2.0 - 1.3 - 1.10.19 4.4.5 4.5.2 2.9.0 @@ -357,7 +328,7 @@ 1.8.9 - + 3.16-beta1 diff --git a/spring-mvc-java/src/main/java/com/baeldung/customvalidator/FieldsValueMatch.java b/spring-mvc-java/src/main/java/com/baeldung/customvalidator/FieldsValueMatch.java new file mode 100644 index 0000000000..51db279f0b --- /dev/null +++ b/spring-mvc-java/src/main/java/com/baeldung/customvalidator/FieldsValueMatch.java @@ -0,0 +1,31 @@ +package com.baeldung.customvalidator; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +import javax.validation.Constraint; +import javax.validation.Payload; + +@Constraint(validatedBy = FieldsValueMatchValidator.class) +@Target({ ElementType.TYPE }) +@Retention(RetentionPolicy.RUNTIME) +public @interface FieldsValueMatch { + + String message() default "Fields values don't match!"; + + Class[] groups() default {}; + + Class[] payload() default {}; + + String field(); + + String fieldMatch(); + + @Target({ ElementType.TYPE }) + @Retention(RetentionPolicy.RUNTIME) + @interface List { + FieldsValueMatch[] value(); + } +} diff --git a/spring-mvc-java/src/main/java/com/baeldung/customvalidator/FieldsValueMatchValidator.java b/spring-mvc-java/src/main/java/com/baeldung/customvalidator/FieldsValueMatchValidator.java new file mode 100644 index 0000000000..c3e8533ec9 --- /dev/null +++ b/spring-mvc-java/src/main/java/com/baeldung/customvalidator/FieldsValueMatchValidator.java @@ -0,0 +1,31 @@ +package com.baeldung.customvalidator; + +import javax.validation.ConstraintValidator; +import javax.validation.ConstraintValidatorContext; + +import org.springframework.beans.BeanWrapperImpl; + +public class FieldsValueMatchValidator implements ConstraintValidator { + + private String field; + private String fieldMatch; + + public void initialize(FieldsValueMatch constraintAnnotation) { + this.field = constraintAnnotation.field(); + this.fieldMatch = constraintAnnotation.fieldMatch(); + } + + public boolean isValid(Object value, ConstraintValidatorContext context) { + + Object fieldValue = new BeanWrapperImpl(value).getPropertyValue(field); + Object fieldMatchValue = new BeanWrapperImpl(value).getPropertyValue(fieldMatch); + + if (fieldValue != null) { + return fieldValue.equals(fieldMatchValue); + } else { + return fieldMatchValue == null; + } + + } + +} diff --git a/spring-mvc-java/src/main/java/com/baeldung/model/NewUserForm.java b/spring-mvc-java/src/main/java/com/baeldung/model/NewUserForm.java new file mode 100644 index 0000000000..12969b6002 --- /dev/null +++ b/spring-mvc-java/src/main/java/com/baeldung/model/NewUserForm.java @@ -0,0 +1,58 @@ +package com.baeldung.model; + +import com.baeldung.customvalidator.FieldsValueMatch; + +@FieldsValueMatch.List({ + @FieldsValueMatch(field = "password", fieldMatch = "verifyPassword", message = "Passwords do not match!"), + @FieldsValueMatch(field = "email", fieldMatch = "verifyEmail", message = "Email addresses do not match!") +}) +public class NewUserForm { + private String email; + private String verifyEmail; + private String password; + private String verifyPassword; + + public NewUserForm() { + } + + public NewUserForm(String email, String verifyEmail, String password, String verifyPassword) { + super(); + this.email = email; + this.verifyEmail = verifyEmail; + this.password = password; + this.verifyPassword = verifyPassword; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + + public String getVerifyEmail() { + return verifyEmail; + } + + public void setVerifyEmail(String verifyEmail) { + this.verifyEmail = verifyEmail; + } + + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } + + public String getVerifyPassword() { + return verifyPassword; + } + + public void setVerifyPassword(String verifyPassword) { + this.verifyPassword = verifyPassword; + } + +} diff --git a/spring-mvc-java/src/main/java/com/baeldung/web/controller/NewUserController.java b/spring-mvc-java/src/main/java/com/baeldung/web/controller/NewUserController.java new file mode 100644 index 0000000000..fddd8baabb --- /dev/null +++ b/spring-mvc-java/src/main/java/com/baeldung/web/controller/NewUserController.java @@ -0,0 +1,31 @@ +package com.baeldung.web.controller; + +import javax.validation.Valid; + +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; + +import com.baeldung.model.NewUserForm; + +@Controller +public class NewUserController { + + @GetMapping("/user") + public String loadFormPage(Model model) { + model.addAttribute("newUserForm", new NewUserForm()); + return "userHome"; + } + + @PostMapping("/user") + public String submitForm(@Valid NewUserForm newUserForm, BindingResult result, Model model) { + if (result.hasErrors()) { + return "userHome"; + } + + model.addAttribute("message", "Valid form"); + return "userHome"; + } +} diff --git a/spring-mvc-java/src/main/java/com/baeldung/web/controller/ValidatedPhoneController.java b/spring-mvc-java/src/main/java/com/baeldung/web/controller/ValidatedPhoneController.java index 8c6cfcd3be..9b3a6b3a4c 100644 --- a/spring-mvc-java/src/main/java/com/baeldung/web/controller/ValidatedPhoneController.java +++ b/spring-mvc-java/src/main/java/com/baeldung/web/controller/ValidatedPhoneController.java @@ -6,12 +6,10 @@ import org.springframework.ui.Model; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.servlet.config.annotation.EnableWebMvc; import javax.validation.Valid; @Controller -@EnableWebMvc public class ValidatedPhoneController { @GetMapping("/validatePhone") diff --git a/spring-mvc-java/src/test/java/com/baeldung/htmlunit/HtmlUnitWebLiveScraping.java b/spring-mvc-java/src/test/java/com/baeldung/htmlunit/HtmlUnitWebScrapingLiveTest.java similarity index 96% rename from spring-mvc-java/src/test/java/com/baeldung/htmlunit/HtmlUnitWebLiveScraping.java rename to spring-mvc-java/src/test/java/com/baeldung/htmlunit/HtmlUnitWebScrapingLiveTest.java index e8869e8232..479b02e77f 100644 --- a/spring-mvc-java/src/test/java/com/baeldung/htmlunit/HtmlUnitWebLiveScraping.java +++ b/spring-mvc-java/src/test/java/com/baeldung/htmlunit/HtmlUnitWebScrapingLiveTest.java @@ -12,7 +12,7 @@ import com.gargoylesoftware.htmlunit.html.HtmlAnchor; import com.gargoylesoftware.htmlunit.html.HtmlHeading1; import com.gargoylesoftware.htmlunit.html.HtmlPage; -public class HtmlUnitWebLiveScraping { +public class HtmlUnitWebScrapingLiveTest { private WebClient webClient; diff --git a/spring-mvc-java/src/test/java/com/baeldung/web/controller/ClassValidationMvcIntegrationTest.java b/spring-mvc-java/src/test/java/com/baeldung/web/controller/ClassValidationMvcIntegrationTest.java new file mode 100644 index 0000000000..a86f71011c --- /dev/null +++ b/spring-mvc-java/src/test/java/com/baeldung/web/controller/ClassValidationMvcIntegrationTest.java @@ -0,0 +1,51 @@ +package com.baeldung.web.controller; + +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.model; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.view; + +import org.junit.Before; +import org.junit.Test; +import org.springframework.http.MediaType; +import org.springframework.test.web.servlet.MockMvc; +import org.springframework.test.web.servlet.request.MockMvcRequestBuilders; +import org.springframework.test.web.servlet.setup.MockMvcBuilders; + +public class ClassValidationMvcIntegrationTest { + private MockMvc mockMvc; + + @Before + public void setup(){ + this.mockMvc = MockMvcBuilders.standaloneSetup(new NewUserController()).build(); + } + + @Test + public void givenMatchingEmailPassword_whenPostNewUserForm_thenOk() throws Exception { + this.mockMvc.perform(MockMvcRequestBuilders.post("/user") + .accept(MediaType.TEXT_HTML) + .param("email", "john@yahoo.com") + .param("verifyEmail", "john@yahoo.com") + .param("password", "pass") + .param("verifyPassword", "pass")) + .andExpect(model().attribute("message", "Valid form")) + .andExpect(view().name("userHome")) + .andExpect(status().isOk()) + .andDo(print()); + } + + @Test + public void givenNotMatchingEmailPassword_whenPostNewUserForm_thenOk() throws Exception { + this.mockMvc.perform(MockMvcRequestBuilders.post("/user") + .accept(MediaType.TEXT_HTML) + .param("email", "john@yahoo.com") + .param("verifyEmail", "john@yahoo.commmm") + .param("password", "pass") + .param("verifyPassword", "passsss")) + .andExpect(model().errorCount(2)) + .andExpect(view().name("userHome")) + .andExpect(status().isOk()) + .andDo(print()); + } +} diff --git a/spring-mvc-java/src/test/java/com/baeldung/web/controller/CustomMVCValidatorTest.java b/spring-mvc-java/src/test/java/com/baeldung/web/controller/CustomMVCValidatorIntegrationTest.java similarity index 94% rename from spring-mvc-java/src/test/java/com/baeldung/web/controller/CustomMVCValidatorTest.java rename to spring-mvc-java/src/test/java/com/baeldung/web/controller/CustomMVCValidatorIntegrationTest.java index 069cc8e141..013cf9c91d 100644 --- a/spring-mvc-java/src/test/java/com/baeldung/web/controller/CustomMVCValidatorTest.java +++ b/spring-mvc-java/src/test/java/com/baeldung/web/controller/CustomMVCValidatorIntegrationTest.java @@ -13,7 +13,7 @@ import org.springframework.test.web.servlet.MockMvc; import org.springframework.test.web.servlet.request.MockMvcRequestBuilders; import org.springframework.test.web.servlet.setup.MockMvcBuilders; -public class CustomMVCValidatorTest { +public class CustomMVCValidatorIntegrationTest { private MockMvc mockMvc; diff --git a/spring-mvc-simple/pom.xml b/spring-mvc-simple/pom.xml index a1353fa6ad..0cfb3e6dee 100644 --- a/spring-mvc-simple/pom.xml +++ b/spring-mvc-simple/pom.xml @@ -1,58 +1,58 @@ - 4.0.0 - com.baeldung - spring-mvc-simple - war - 0.0.1-SNAPSHOT - Spring MVC simple Maven Webapp - http://maven.apache.org + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + 4.0.0 + com.baeldung + spring-mvc-simple + war + 0.0.1-SNAPSHOT + Spring MVC simple Maven Webapp + http://maven.apache.org - - com.baeldung - parent-modules - 1.0.0-SNAPSHOT - - - - 4.3.4.RELEASE - 2.6 - 1.2 + + com.baeldung + parent-modules + 1.0.0-SNAPSHOT + + + + 4.3.4.RELEASE + 2.6 + 1.2 2.3.1 3.1.0 5.3.3.Final enter-location-of-server - 1.3.2 - + 1.3.2 + - - - javax.servlet - javax.servlet-api - 3.1.0 - - - org.springframework - spring-webmvc - ${springframework.version} - - - org.springframework - spring-context - ${springframework.version} - - - org.springframework - spring-core - ${springframework.version} - - - commons-logging - commons-logging - - - - + + + javax.servlet + javax.servlet-api + 3.1.0 + + + org.springframework + spring-webmvc + ${springframework.version} + + + org.springframework + spring-context + ${springframework.version} + + + org.springframework + spring-core + ${springframework.version} + + + commons-logging + commons-logging + + + + javax.servlet.jsp javax.servlet.jsp-api ${javax.servlet.jsp-api.version} @@ -63,8 +63,8 @@ jstl ${jstl.version} - - + + org.hibernate hibernate-validator ${hibernate-validator.version} @@ -74,28 +74,28 @@ spring-webmvc ${springframework.version} - - commons-fileupload - commons-fileupload - ${fileupload.version} + + commons-fileupload + commons-fileupload + ${fileupload.version} - - - - - - org.apache.maven.plugins - maven-war-plugin - ${maven-war-plugin.version} - - src/main/webapp - springMvcSimple - false - ${deploy-path} - - - - - springMvcSimple - + + + + + + org.apache.maven.plugins + maven-war-plugin + ${maven-war-plugin.version} + + src/main/webapp + springMvcSimple + false + ${deploy-path} + + + + + springMvcSimple + diff --git a/spring-mvc-tiles/pom.xml b/spring-mvc-tiles/pom.xml index 2f7bd24eac..b466935c46 100644 --- a/spring-mvc-tiles/pom.xml +++ b/spring-mvc-tiles/pom.xml @@ -1,93 +1,93 @@ - 4.0.0 - com.baeldung - spring-mvc-tiles - 0.0.1-SNAPSHOT - war - spring-mvc-tiles - Integrating Spring MVC with Apache Tiles + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + com.baeldung + spring-mvc-tiles + 0.0.1-SNAPSHOT + war + spring-mvc-tiles + Integrating Spring MVC with Apache Tiles - - com.baeldung - parent-modules - 1.0.0-SNAPSHOT - - - - 4.3.4.RELEASE - 3.0.7 - 3.1.0 - 2.3.1 - 1.2 + + com.baeldung + parent-modules + 1.0.0-SNAPSHOT + - 2.6 - + + 4.3.4.RELEASE + 3.0.7 + 3.1.0 + 2.3.1 + 1.2 - - - - org.springframework - spring-core - ${springframework.version} - - - commons-logging - commons-logging - - - - - org.springframework - spring-web - ${springframework.version} - - - org.springframework - spring-webmvc - ${springframework.version} - - - - org.apache.tiles - tiles-jsp - ${apache-tiles.version} - + 2.6 + - - - javax.servlet - javax.servlet-api - ${javax.servlet-api.version} - - - javax.servlet.jsp - javax.servlet.jsp-api - ${javax.servlet.jsp-api.version} - - - javax.servlet - jstl - ${jstl.version} - + + + + org.springframework + spring-core + ${springframework.version} + + + commons-logging + commons-logging + + + + + org.springframework + spring-web + ${springframework.version} + + + org.springframework + spring-webmvc + ${springframework.version} + + + + org.apache.tiles + tiles-jsp + ${apache-tiles.version} + - + + + javax.servlet + javax.servlet-api + ${javax.servlet-api.version} + + + javax.servlet.jsp + javax.servlet.jsp-api + ${javax.servlet.jsp-api.version} + + + javax.servlet + jstl + ${jstl.version} + - - - - - org.apache.maven.plugins - maven-war-plugin - ${maven-war-plugin.version} - - src/main/webapp - spring-mvc-tiles - false - - - - - spring-mvc-tiles - + + + + + + + org.apache.maven.plugins + maven-war-plugin + ${maven-war-plugin.version} + + src/main/webapp + spring-mvc-tiles + false + + + + + spring-mvc-tiles + diff --git a/spring-mvc-velocity/pom.xml b/spring-mvc-velocity/pom.xml index 3ee658f241..7c517e2006 100644 --- a/spring-mvc-velocity/pom.xml +++ b/spring-mvc-velocity/pom.xml @@ -1,152 +1,131 @@ - 4.0.0 - com.baeldung - 0.1-SNAPSHOT - spring-mvc-velocity + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + com.baeldung + 0.1-SNAPSHOT + spring-mvc-velocity - spring-mvc-velocity - war + spring-mvc-velocity + war - - com.baeldung - parent-modules - 1.0.0-SNAPSHOT - - - + + com.baeldung + parent-modules + 1.0.0-SNAPSHOT + - + - - org.springframework - spring-web - ${org.springframework.version} - - - org.springframework - spring-webmvc - ${org.springframework.version} - - - org.springframework - spring-core - ${org.springframework.version} - - - org.springframework - spring-context-support - ${org.springframework.version} - + - + + org.springframework + spring-web + ${org.springframework.version} + + + org.springframework + spring-webmvc + ${org.springframework.version} + + + org.springframework + spring-core + ${org.springframework.version} + + + org.springframework + spring-context-support + ${org.springframework.version} + - - javax.servlet - javax.servlet-api - ${javax.servlet-api.version} - provided - + - - org.apache.velocity - velocity - ${velocity.version} - - - - org.apache.velocity - velocity-tools - ${velocity-tools.version} - - - commons-logging - commons-logging - - - - - + + javax.servlet + javax.servlet-api + ${javax.servlet-api.version} + provided + - - org.hamcrest - hamcrest-core - ${org.hamcrest.version} - test - - - org.hamcrest - hamcrest-library - ${org.hamcrest.version} - test - + + org.apache.velocity + velocity + ${velocity.version} + - - org.mockito - mockito-core - ${mockito.version} - test - + + org.apache.velocity + velocity-tools + ${velocity-tools.version} + + + commons-logging + commons-logging + + + - - org.powermock - powermock-module-junit4 - ${powermock.version} - test - - - org.powermock - powermock-api-mockito - ${powermock.version} - test - - + + + org.powermock + powermock-module-junit4 + ${powermock.version} + test + + + org.powermock + powermock-api-mockito + ${powermock.version} + test + + org.springframework spring-test ${org.springframework.version} test - + - - spring-mvc-velocity - - - src/main/resources - true - - + + spring-mvc-velocity + + + src/main/resources + true + + - + - - org.apache.maven.plugins - maven-war-plugin - ${maven-war-plugin.version} - - false - - + + org.apache.maven.plugins + maven-war-plugin + ${maven-war-plugin.version} + + false + + - - org.apache.maven.plugins - maven-surefire-plugin - - 3 - true - - **/*IntegrationTest.java - - - - - - + + org.apache.maven.plugins + maven-surefire-plugin + + 3 + true + + **/*IntegrationTest.java + + + + + + - + - + @@ -182,30 +161,28 @@ - - - - 4.3.4.RELEASE - - - 1.3 - 1.10.19 - 1.6.6 + + + 4.3.4.RELEASE - 4.4.5 - 4.5.2 - 3.1.0 - 1.7 - 2.0 - 2.9.0 + + 1.6.6 - - 2.6 - 2.7 - 1.6.1 + 4.4.5 + 4.5.2 - + 3.1.0 + 1.7 + 2.0 + 2.9.0 + + + 2.6 + 2.7 + 1.6.1 + + \ No newline at end of file diff --git a/spring-mvc-web-vs-initializer/pom.xml b/spring-mvc-web-vs-initializer/pom.xml index 1d02039ead..2f7b7ea98e 100644 --- a/spring-mvc-web-vs-initializer/pom.xml +++ b/spring-mvc-web-vs-initializer/pom.xml @@ -1,4 +1,5 @@ - + 4.0.0 com.baeldung spring-mvc-web-vs-initializer @@ -8,9 +9,10 @@ war - org.springframework.boot - spring-boot-starter-parent - 1.4.4.RELEASE + parent-boot-4 + com.baeldung + 0.0.1-SNAPSHOT + ../parent-boot-4 @@ -29,7 +31,7 @@ commons-logging commons-logging - + org.springframework @@ -61,23 +63,6 @@ guava ${guava.version} - - - - - org.slf4j - slf4j-api - - - ch.qos.logback - logback-classic - - - - org.slf4j - jcl-over-slf4j - - @@ -87,12 +72,6 @@ test - - junit - junit - test - - org.assertj assertj-core @@ -147,27 +126,24 @@ - - spring-mvc-web-vs-initializer - - - src/main/resources - true - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - **/*IntegrationTest.java - **/*LiveTest.java - - - - - + + spring-mvc-web-vs-initializer + + + src/main/resources + true + + + + + org.springframework.boot + spring-boot-maven-plugin + + true + + + + @@ -203,7 +179,7 @@ - + 4.3.4.RELEASE diff --git a/spring-mvc-webflow/pom.xml b/spring-mvc-webflow/pom.xml index 315162a01b..a100e5ac6c 100644 --- a/spring-mvc-webflow/pom.xml +++ b/spring-mvc-webflow/pom.xml @@ -1,4 +1,5 @@ - + 4.0.0 com.baeldung 0.1-SNAPSHOT @@ -11,8 +12,8 @@ com.baeldung parent-modules 1.0.0-SNAPSHOT - - + + @@ -27,7 +28,7 @@ ${org.springframework.version} - + org.springframework.webflow spring-webflow @@ -50,40 +51,12 @@ runtime - - org.slf4j - jcl-over-slf4j - ${org.slf4j.version} - - org.slf4j log4j-over-slf4j ${org.slf4j.version} - - - - org.hamcrest - hamcrest-core - ${org.hamcrest.version} - test - - - org.hamcrest - hamcrest-library - ${org.hamcrest.version} - test - - - - org.mockito - mockito-core - ${mockito.version} - test - - @@ -112,13 +85,9 @@ 4.3.4.RELEASE - + 2.4.4.RELEASE - - 1.3 - 1.10.19 - 3.1.0 1.2 diff --git a/spring-mvc-xml/pom.xml b/spring-mvc-xml/pom.xml index 75a9577022..2131609ff6 100644 --- a/spring-mvc-xml/pom.xml +++ b/spring-mvc-xml/pom.xml @@ -12,8 +12,8 @@ com.baeldung parent-modules 1.0.0-SNAPSHOT - - + + @@ -27,7 +27,7 @@ commons-logging commons-logging - + org.springframework @@ -57,38 +57,6 @@ ${hibernate-validator.version} - - - - - org.slf4j - jcl-over-slf4j - ${org.slf4j.version} - - - - - - - org.hamcrest - hamcrest-core - ${org.hamcrest.version} - test - - - org.hamcrest - hamcrest-library - ${org.hamcrest.version} - test - - - - org.mockito - mockito-core - ${mockito.version} - test - - com.fasterxml.jackson.core @@ -115,7 +83,7 @@ commons-logging commons-logging - + @@ -158,7 +126,7 @@ 1.2 3.1.0 2.8.5 - + 19.0 3.5 @@ -166,9 +134,6 @@ 2.8.0 - 1.3 - 1.10.19 - 2.9.0 diff --git a/spring-protobuf/pom.xml b/spring-protobuf/pom.xml index 566d11132c..36310e08f1 100644 --- a/spring-protobuf/pom.xml +++ b/spring-protobuf/pom.xml @@ -1,75 +1,58 @@ - 4.0.0 - com.baeldung - spring-protobuf - 0.1-SNAPSHOT - spring-protobuf - - - org.springframework.boot - spring-boot-starter-parent - 1.4.4.RELEASE - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + com.baeldung + spring-protobuf + 0.1-SNAPSHOT + spring-protobuf - - 3.1.0 - 1.4 - + + parent-boot-4 + com.baeldung + 0.0.1-SNAPSHOT + ../parent-boot-4 + - - - com.google.protobuf - protobuf-java - ${protobuf-java.version} - - - com.googlecode.protobuf-java-format - protobuf-java-format - ${protobuf-java-format.version} - + + 3.1.0 + 1.4 + - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-test - test - + + + com.google.protobuf + protobuf-java + ${protobuf-java.version} + + + com.googlecode.protobuf-java-format + protobuf-java-format + ${protobuf-java-format.version} + - - org.apache.httpcomponents - httpclient - - + + org.springframework.boot + spring-boot-starter-web + - - + + org.apache.httpcomponents + httpclient + + - - org.apache.maven.plugins - maven-compiler-plugin - - 1.8 - 1.8 - - - + + - org.apache.maven.plugins - maven-surefire-plugin - - - **/*IntegrationTest.java - **/*LiveTest.java - - - - - - + org.springframework.boot + spring-boot-maven-plugin + + true + + + + + integration @@ -103,5 +86,6 @@ - + + diff --git a/spring-quartz/pom.xml b/spring-quartz/pom.xml index 85b5734ecc..eb00911543 100644 --- a/spring-quartz/pom.xml +++ b/spring-quartz/pom.xml @@ -1,84 +1,57 @@ - 4.0.0 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 - com.baeldung - spring-quartz - spring-quartz - 0.0.1-SNAPSHOT - jar - Demo project for Scheduling in Spring with Quartz + com.baeldung + spring-quartz + spring-quartz + 0.0.1-SNAPSHOT + jar + Demo project for Scheduling in Spring with Quartz - - org.springframework.boot - spring-boot-starter-parent - 1.4.4.RELEASE - - + + parent-boot-4 + com.baeldung + 0.0.1-SNAPSHOT + ../parent-boot-4 + - - UTF-8 - 1.8 - 2.2.3 - 3.6.0 - + + 2.2.3 + - + - - org.springframework.boot - spring-boot-starter-jdbc - + + org.springframework.boot + spring-boot-starter-jdbc + - - - org.springframework - spring-context-support - + + + org.springframework + spring-context-support + - - - org.quartz-scheduler - quartz - ${quartz.version} - + + + org.quartz-scheduler + quartz + ${quartz.version} + - - - org.springframework.boot - spring-boot-starter-test - test - + - + - - - - - src/main/resources - true - + + + src/main/resources + true + - - - - org.apache.maven.plugins - maven-compiler-plugin - ${maven-compiler-plugin.version} - - 1.8 - 1.8 - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - + + \ No newline at end of file diff --git a/spring-reactor/pom.xml b/spring-reactor/pom.xml index a04955eada..759e9f2b58 100644 --- a/spring-reactor/pom.xml +++ b/spring-reactor/pom.xml @@ -9,9 +9,10 @@ http://maven.apache.org - org.springframework.boot - spring-boot-starter-parent - 1.4.3.RELEASE + parent-boot-4 + com.baeldung + 0.0.1-SNAPSHOT + ../parent-boot-4 @@ -27,36 +28,8 @@ io.projectreactor reactor-bus - - org.springframework.boot - spring-boot-starter-test - - - - - org.springframework.boot - spring-boot-maven-plugin - - - - org.apache.maven.plugins - maven-surefire-plugin - - - **/*IntegrationTest.java - **/*LiveTest.java - - - - - - - - 1.8 - - spring-snapshots @@ -67,6 +40,7 @@ + spring-releases diff --git a/spring-remoting/pom.xml b/spring-remoting/pom.xml index 96e808477f..8acb38bd44 100644 --- a/spring-remoting/pom.xml +++ b/spring-remoting/pom.xml @@ -9,28 +9,23 @@ 1.0-SNAPSHOT spring-remoting Parent for all projects related to Spring Remoting. - - org.springframework.boot - spring-boot-starter-parent - 1.4.3.RELEASE - - - 1.8 - + + parent-boot-4 + com.baeldung + 0.0.1-SNAPSHOT + ../parent-boot-4 + - ${project.groupId} api ${project.version} - - diff --git a/spring-remoting/remoting-amqp/remoting-amqp-server/pom.xml b/spring-remoting/remoting-amqp/remoting-amqp-server/pom.xml index 4d3f4da765..b926fd3d79 100644 --- a/spring-remoting/remoting-amqp/remoting-amqp-server/pom.xml +++ b/spring-remoting/remoting-amqp/remoting-amqp-server/pom.xml @@ -32,11 +32,6 @@ api 1.0-SNAPSHOT - - junit - junit - test - com.baeldung spring-remoting-http-server diff --git a/spring-rest-angular/pom.xml b/spring-rest-angular/pom.xml index b6bc95df81..06741bfd0c 100644 --- a/spring-rest-angular/pom.xml +++ b/spring-rest-angular/pom.xml @@ -1,6 +1,7 @@ - + 4.0.0 spring-rest-angular spring-rest-angular @@ -9,9 +10,10 @@ war - org.springframework.boot - spring-boot-starter-parent - 1.5.1.RELEASE + parent-boot-5 + com.baeldung + 0.0.1-SNAPSHOT + ../parent-boot-5 @@ -52,63 +54,26 @@ guava ${guava.version} - - junit - junit - test - - - io.rest-assured - rest-assured - ${rest-assured.version} - test - io.rest-assured spring-mock-mvc ${rest-assured.version} test - - org.springframework.boot - spring-boot-starter-test - test - - - angular-spring-rest-sample - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.8 - 1.8 - - - - - org.apache.maven.plugins - maven-war-plugin - - false - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - **/*IntegrationTest.java - **/*LiveTest.java - - - - - + + angular-spring-rest-sample + + + org.apache.maven.plugins + maven-war-plugin + + false + + + + @@ -144,11 +109,10 @@ - + 19.0 3.5 - 3.0.1 diff --git a/spring-rest-docs/pom.xml b/spring-rest-docs/pom.xml index 6714617d99..4647577629 100644 --- a/spring-rest-docs/pom.xml +++ b/spring-rest-docs/pom.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 com.example @@ -12,15 +12,13 @@ Demo project for Spring Boot - org.springframework.boot - spring-boot-starter-parent - 1.4.4.RELEASE - + parent-boot-4 + com.baeldung + 0.0.1-SNAPSHOT + ../parent-boot-4 - UTF-8 - 1.8 ${project.build.directory}/generated-snippets 1.1.2.RELEASE 2.2.0 @@ -37,11 +35,6 @@ spring-boot-starter-web - - org.springframework.boot - spring-boot-starter-test - test - org.springframework.restdocs spring-restdocs-mockmvc @@ -53,55 +46,39 @@ - - - - org.springframework.boot - spring-boot-maven-plugin - - - org.apache.maven.plugins - maven-surefire-plugin - - - **/*IntegrationTest.java - **/*LiveTest.java - - - - - org.asciidoctor - asciidoctor-maven-plugin - ${asciidoctor-plugin.version} - - - generate-docs - package - - process-asciidoc - - - html - book - - ${snippetsDirectory} - - src/docs/asciidocs - target/generated-docs - - - - - - + + + + org.asciidoctor + asciidoctor-maven-plugin + ${asciidoctor-plugin.version} + + + generate-docs + package + + process-asciidoc + + + html + book + + ${snippetsDirectory} + + src/docs/asciidocs + target/generated-docs + + + + + + integration - - org.apache.maven.plugins maven-surefire-plugin @@ -128,8 +105,8 @@ - + diff --git a/spring-rest/pom.xml b/spring-rest/pom.xml index bbd4a9a119..c12028149d 100644 --- a/spring-rest/pom.xml +++ b/spring-rest/pom.xml @@ -8,9 +8,10 @@ war - org.springframework.boot - spring-boot-starter-parent - 1.4.6.RELEASE + parent-boot-4 + com.baeldung + 0.0.1-SNAPSHOT + ../parent-boot-4 @@ -106,23 +107,6 @@ ${commons-lang3.version} - - - - org.slf4j - slf4j-api - - - ch.qos.logback - logback-classic - - - - org.slf4j - jcl-over-slf4j - - - @@ -133,12 +117,6 @@ - - junit - junit - test - - org.hamcrest hamcrest-core @@ -161,12 +139,6 @@ spring-test - - com.jayway.restassured - rest-assured - ${rest-assured.version} - - com.google.protobuf @@ -184,12 +156,12 @@ kryo ${kryo.version} - - - com.jayway.jsonpath - json-path - - + + + com.jayway.jsonpath + json-path + + @@ -202,35 +174,18 @@ - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.8 - 1.8 - - - + + org.springframework.boot + spring-boot-maven-plugin + + true + + org.apache.maven.plugins maven-war-plugin - - org.apache.maven.plugins - maven-surefire-plugin - - - **/*IntegrationTest.java - **/*LiveTest.java - - - - - - - org.codehaus.cargo cargo-maven2-plugin @@ -352,7 +307,6 @@ 20.0 - 2.9.0 1.6.0 @@ -360,8 +314,8 @@ 3.4.1 - - 2.2.0 + + 2.2.0 diff --git a/spring-rest/src/test/java/org/baeldung/uribuilder/SpringUriBuilderTest.java b/spring-rest/src/test/java/org/baeldung/uribuilder/SpringUriBuilderIntegrationTest.java similarity index 97% rename from spring-rest/src/test/java/org/baeldung/uribuilder/SpringUriBuilderTest.java rename to spring-rest/src/test/java/org/baeldung/uribuilder/SpringUriBuilderIntegrationTest.java index 84ae1063d9..bdc24f7f34 100644 --- a/spring-rest/src/test/java/org/baeldung/uribuilder/SpringUriBuilderTest.java +++ b/spring-rest/src/test/java/org/baeldung/uribuilder/SpringUriBuilderIntegrationTest.java @@ -8,7 +8,7 @@ import org.junit.Test; import org.springframework.web.util.UriComponents; import org.springframework.web.util.UriComponentsBuilder; -public class SpringUriBuilderTest { +public class SpringUriBuilderIntegrationTest { @Test public void constructUri() { diff --git a/spring-rest/src/test/java/org/baeldung/web/controller/mediatypes/CustomMediaTypeControllerLiveTest.java b/spring-rest/src/test/java/org/baeldung/web/controller/mediatypes/CustomMediaTypeControllerLiveTest.java index e8d5ff9f17..2b57e7049c 100644 --- a/spring-rest/src/test/java/org/baeldung/web/controller/mediatypes/CustomMediaTypeControllerLiveTest.java +++ b/spring-rest/src/test/java/org/baeldung/web/controller/mediatypes/CustomMediaTypeControllerLiveTest.java @@ -1,13 +1,13 @@ package org.baeldung.web.controller.mediatypes; -import com.jayway.restassured.http.ContentType; +import io.restassured.http.ContentType; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.test.context.support.AnnotationConfigContextLoader; -import static com.jayway.restassured.RestAssured.given; +import static io.restassured.RestAssured.given; @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = {TestConfig.class}, loader = AnnotationConfigContextLoader.class) diff --git a/spring-rest/src/test/java/org/baeldung/web/test/RequestMappingLiveTest.java b/spring-rest/src/test/java/org/baeldung/web/test/RequestMappingLiveTest.java index 7828df7304..347b683b2d 100644 --- a/spring-rest/src/test/java/org/baeldung/web/test/RequestMappingLiveTest.java +++ b/spring-rest/src/test/java/org/baeldung/web/test/RequestMappingLiveTest.java @@ -5,7 +5,7 @@ import static org.hamcrest.Matchers.equalTo; import org.junit.Test; -import com.jayway.restassured.RestAssured; +import io.restassured.RestAssured; public class RequestMappingLiveTest { private static String BASE_URI = "http://localhost:8082/spring-rest/ex/"; diff --git a/spring-security-cache-control/pom.xml b/spring-security-cache-control/pom.xml index b24b9db484..e525cd4e8e 100644 --- a/spring-security-cache-control/pom.xml +++ b/spring-security-cache-control/pom.xml @@ -1,7 +1,6 @@ - + 4.0.0 com.baeldung @@ -9,9 +8,10 @@ 1.0-SNAPSHOT - org.springframework.boot - spring-boot-starter-parent - 1.4.3.RELEASE + parent-boot-4 + com.baeldung + 0.0.1-SNAPSHOT + ../parent-boot-4 @@ -35,22 +35,12 @@ org.springframework.security spring-security-web - - org.springframework.boot - spring-boot-starter-test - javax.servlet javax.servlet-api ${javax.servlet-api.version} - - junit - junit - test - - org.hamcrest hamcrest-core @@ -73,35 +63,10 @@ spring-test - - com.jayway.restassured - rest-assured - ${rest-assured.version} - - UTF-8 - 1.8 - 3.1.0 - 2.9.0 - - - - org.apache.maven.plugins - maven-surefire-plugin - - - **/*IntegrationTest.java - **/*LiveTest.java - - - - - - - \ No newline at end of file diff --git a/spring-security-cache-control/src/test/java/com/baeldung/cachecontrol/ResourceEndpointIntegrationTest.java b/spring-security-cache-control/src/test/java/com/baeldung/cachecontrol/ResourceEndpointIntegrationTest.java index 2c48878917..d6a1a97773 100644 --- a/spring-security-cache-control/src/test/java/com/baeldung/cachecontrol/ResourceEndpointIntegrationTest.java +++ b/spring-security-cache-control/src/test/java/com/baeldung/cachecontrol/ResourceEndpointIntegrationTest.java @@ -1,6 +1,6 @@ package com.baeldung.cachecontrol; -import static com.jayway.restassured.RestAssured.given; +import static io.restassured.RestAssured.given; import org.junit.Test; import org.junit.runner.RunWith; @@ -8,7 +8,7 @@ import org.springframework.boot.context.embedded.LocalServerPort; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit4.SpringRunner; -import com.jayway.restassured.http.ContentType; +import io.restassured.http.ContentType; @RunWith(SpringRunner.class) @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = AppRunner.class) diff --git a/spring-security-client/spring-security-jsp-authentication/pom.xml b/spring-security-client/spring-security-jsp-authentication/pom.xml index c021a46c82..6f4095c2d5 100644 --- a/spring-security-client/spring-security-jsp-authentication/pom.xml +++ b/spring-security-client/spring-security-jsp-authentication/pom.xml @@ -1,5 +1,6 @@ - + 4.0.0 com.baeldung @@ -11,9 +12,10 @@ Spring Security JSP Authentication tag sample - org.springframework.boot - spring-boot-starter-parent - 1.4.4.RELEASE + parent-boot-4 + com.baeldung + 0.0.1-SNAPSHOT + ../../parent-boot-4 @@ -31,7 +33,7 @@ spring-boot-starter-tomcat provided - + org.apache.tomcat.embed tomcat-embed-jasper @@ -42,26 +44,12 @@ javax.servlet jstl - + org.springframework.security spring-security-taglibs - + - - - - org.springframework.boot - spring-boot-maven-plugin - - - - - - UTF-8 - 1.8 - - diff --git a/spring-security-client/spring-security-jsp-authorize/pom.xml b/spring-security-client/spring-security-jsp-authorize/pom.xml index e3611aba93..2e1a57a468 100644 --- a/spring-security-client/spring-security-jsp-authorize/pom.xml +++ b/spring-security-client/spring-security-jsp-authorize/pom.xml @@ -1,5 +1,6 @@ - + 4.0.0 com.baeldung @@ -11,9 +12,10 @@ Spring Security JSP Authorize tag sample - org.springframework.boot - spring-boot-starter-parent - 1.4.4.RELEASE + parent-boot-4 + com.baeldung + 0.0.1-SNAPSHOT + ../../parent-boot-4 @@ -31,7 +33,7 @@ spring-boot-starter-tomcat provided - + org.apache.tomcat.embed tomcat-embed-jasper @@ -42,26 +44,12 @@ javax.servlet jstl - + org.springframework.security spring-security-taglibs - + - - - - org.springframework.boot - spring-boot-maven-plugin - - - - - - UTF-8 - 1.8 - - diff --git a/spring-security-client/spring-security-jsp-config/pom.xml b/spring-security-client/spring-security-jsp-config/pom.xml index 94511a2785..4f92e24563 100644 --- a/spring-security-client/spring-security-jsp-config/pom.xml +++ b/spring-security-client/spring-security-jsp-config/pom.xml @@ -1,5 +1,6 @@ - + 4.0.0 com.baeldung @@ -11,9 +12,10 @@ Spring Security JSP configuration - org.springframework.boot - spring-boot-starter-parent - 1.4.4.RELEASE + parent-boot-4 + com.baeldung + 0.0.1-SNAPSHOT + ../../parent-boot-4 @@ -31,7 +33,7 @@ spring-boot-starter-tomcat provided - + org.apache.tomcat.embed tomcat-embed-jasper @@ -42,26 +44,12 @@ javax.servlet jstl - + org.springframework.security spring-security-taglibs - + - - - - org.springframework.boot - spring-boot-maven-plugin - - - - - - UTF-8 - 1.8 - - diff --git a/spring-security-client/spring-security-mvc/pom.xml b/spring-security-client/spring-security-mvc/pom.xml index f91a186897..a642e8719d 100644 --- a/spring-security-client/spring-security-mvc/pom.xml +++ b/spring-security-client/spring-security-mvc/pom.xml @@ -1,5 +1,6 @@ - + 4.0.0 com.baeldung @@ -11,9 +12,10 @@ Spring Security MVC - org.springframework.boot - spring-boot-starter-parent - 1.4.4.RELEASE + parent-boot-4 + com.baeldung + 0.0.1-SNAPSHOT + ../../parent-boot-4 @@ -25,21 +27,7 @@ org.springframework.boot spring-boot-starter-web - + - - - - org.springframework.boot - spring-boot-maven-plugin - - - - - - UTF-8 - 1.8 - - diff --git a/spring-security-client/spring-security-thymeleaf-authentication/pom.xml b/spring-security-client/spring-security-thymeleaf-authentication/pom.xml index 1a5e9e61d4..7573d430d3 100644 --- a/spring-security-client/spring-security-thymeleaf-authentication/pom.xml +++ b/spring-security-client/spring-security-thymeleaf-authentication/pom.xml @@ -1,5 +1,6 @@ - + 4.0.0 com.baeldung @@ -11,9 +12,10 @@ Spring Security thymeleaf authentication tag sample - org.springframework.boot - spring-boot-starter-parent - 1.4.4.RELEASE + parent-boot-4 + com.baeldung + 0.0.1-SNAPSHOT + ../../parent-boot-4 @@ -31,7 +33,7 @@ spring-boot-starter-tomcat provided - + org.springframework.boot spring-boot-starter-thymeleaf @@ -41,22 +43,7 @@ org.thymeleaf.extras thymeleaf-extras-springsecurity4 - - - - - org.springframework.boot - spring-boot-maven-plugin - - - - - - UTF-8 - 1.8 - - diff --git a/spring-security-client/spring-security-thymeleaf-authorize/pom.xml b/spring-security-client/spring-security-thymeleaf-authorize/pom.xml index 964c57b71e..20d141e70c 100644 --- a/spring-security-client/spring-security-thymeleaf-authorize/pom.xml +++ b/spring-security-client/spring-security-thymeleaf-authorize/pom.xml @@ -1,5 +1,6 @@ - + 4.0.0 com.baeldung @@ -11,9 +12,10 @@ Spring Security thymeleaf authorize tag sample - org.springframework.boot - spring-boot-starter-parent - 1.4.4.RELEASE + parent-boot-4 + com.baeldung + 0.0.1-SNAPSHOT + ../../parent-boot-4 @@ -31,7 +33,7 @@ spring-boot-starter-tomcat provided - + org.springframework.boot spring-boot-starter-thymeleaf @@ -41,22 +43,7 @@ org.thymeleaf.extras thymeleaf-extras-springsecurity4 - - - - - org.springframework.boot - spring-boot-maven-plugin - - - - - - UTF-8 - 1.8 - - diff --git a/spring-security-client/spring-security-thymeleaf-config/pom.xml b/spring-security-client/spring-security-thymeleaf-config/pom.xml index 42c6ee4f0f..ad856c7e20 100644 --- a/spring-security-client/spring-security-thymeleaf-config/pom.xml +++ b/spring-security-client/spring-security-thymeleaf-config/pom.xml @@ -1,5 +1,6 @@ - + 4.0.0 com.baeldung @@ -11,9 +12,10 @@ Spring Security thymeleaf configuration sample project - org.springframework.boot - spring-boot-starter-parent - 1.4.4.RELEASE + parent-boot-4 + com.baeldung + 0.0.1-SNAPSHOT + ../../parent-boot-4 @@ -31,7 +33,7 @@ spring-boot-starter-tomcat provided - + org.springframework.boot spring-boot-starter-thymeleaf @@ -41,22 +43,7 @@ org.thymeleaf.extras thymeleaf-extras-springsecurity4 - - - - - org.springframework.boot - spring-boot-maven-plugin - - - - - - UTF-8 - 1.8 - - diff --git a/spring-security-core/pom.xml b/spring-security-core/pom.xml index 971f5a9d0f..7deea5deb0 100644 --- a/spring-security-core/pom.xml +++ b/spring-security-core/pom.xml @@ -9,10 +9,10 @@ war - org.springframework.boot - spring-boot-starter-parent - 1.4.4.RELEASE - + parent-boot-4 + com.baeldung + 0.0.1-SNAPSHOT + ../parent-boot-4 @@ -41,11 +41,6 @@ h2 runtime - - org.springframework.boot - spring-boot-starter-test - test - org.springframework.security spring-security-test @@ -64,36 +59,11 @@ - - org.apache.maven.plugins - maven-compiler-plugin - - 1.8 - 1.8 - true - source - - - org.apache.maven.plugins maven-war-plugin - - org.apache.maven.plugins - maven-surefire-plugin - - - **/*LiveTest.java - **/*ManualTest.java - - - - - - - @@ -132,41 +102,5 @@ - - - 4.3.4.RELEASE - 4.2.0.RELEASE - - 4.4.5 - 4.5.2 - - - 1.7.21 - 1.1.7 - - - 5.3.3.Final - 1.2 - 3.1.0 - 2.8.5 - - - 19.0 - 3.5 - - - 1.3 - 4.12 - 1.10.19 - - 2.9.0 - - - 3.6.0 - 2.6 - 2.19.1 - 1.6.1 - - diff --git a/spring-security-mvc-boot/pom.xml b/spring-security-mvc-boot/pom.xml index 0b113f4cbf..3a8bc1f3aa 100644 --- a/spring-security-mvc-boot/pom.xml +++ b/spring-security-mvc-boot/pom.xml @@ -12,18 +12,19 @@ Spring Security MVC Boot - org.springframework.boot - spring-boot-starter-parent - 1.5.2.RELEASE + parent-boot-5 + com.baeldung + 0.0.1-SNAPSHOT + ../parent-boot-5 - + org.springframework.boot spring-boot-starter-security - + org.springframework.boot spring-boot-starter-web @@ -54,18 +55,6 @@ com.h2database h2 - - - org.springframework.boot - spring-boot-starter-test - test - - - - junit - junit - test - org.hamcrest @@ -79,26 +68,13 @@ test - - com.jayway.restassured - rest-assured - ${rest-assured.version} - test - - - commons-logging - commons-logging - - - - org.springframework spring-test test - - + + org.springframework.security spring-security-test test @@ -134,8 +110,8 @@ spring-security-taglibs ${spring-security-taglibs.version} - - + + org.springframework.security spring-security-core ${spring-security-core.version} @@ -146,32 +122,11 @@ jstl-api ${jstl.version} - + - - org.springframework.boot - spring-boot-maven-plugin - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - **/*IntegrationTest.java - **/*LiveTest.java - **/*EntryPointsTest.java - - - - - - - org.codehaus.cargo cargo-maven2-plugin @@ -192,18 +147,14 @@ - - integration - - org.apache.maven.plugins maven-surefire-plugin @@ -230,7 +181,6 @@ - @@ -258,7 +208,6 @@ - org.apache.maven.plugins maven-surefire-plugin @@ -282,17 +231,14 @@ - - - + + entryPoints - - org.apache.maven.plugins maven-surefire-plugin @@ -320,7 +266,6 @@ - @@ -328,23 +273,23 @@ org.baeldung.Application - - - - - - - - UTF-8 - 1.8 + + + + + + + 10.13.1.1 1.1.2 4.2.2.RELEASE - 4.2.2.RELEASE - 4.2.2.RELEASE - + 4.2.2.RELEASE + 4.2.2.RELEASE + 1.2 - 2.4.0 1.6.1 diff --git a/spring-security-mvc-boot/src/test/java/org/baeldung/web/LiveTest.java b/spring-security-mvc-boot/src/test/java/org/baeldung/web/LiveTest.java index d237ff2ec5..dc5c265ed8 100644 --- a/spring-security-mvc-boot/src/test/java/org/baeldung/web/LiveTest.java +++ b/spring-security-mvc-boot/src/test/java/org/baeldung/web/LiveTest.java @@ -7,10 +7,10 @@ import org.baeldung.persistence.model.Foo; import org.junit.Test; import org.springframework.http.MediaType; -import com.jayway.restassured.RestAssured; -import com.jayway.restassured.authentication.FormAuthConfig; -import com.jayway.restassured.response.Response; -import com.jayway.restassured.specification.RequestSpecification; +import io.restassured.RestAssured; +import io.restassured.authentication.FormAuthConfig; +import io.restassured.response.Response; +import io.restassured.specification.RequestSpecification; public class LiveTest { diff --git a/spring-security-mvc-boot/src/test/java/org/baeldung/web/MultipleEntryPointsTest.java b/spring-security-mvc-boot/src/test/java/org/baeldung/web/MultipleEntryPointsIntegrationTest.java similarity index 98% rename from spring-security-mvc-boot/src/test/java/org/baeldung/web/MultipleEntryPointsTest.java rename to spring-security-mvc-boot/src/test/java/org/baeldung/web/MultipleEntryPointsIntegrationTest.java index 050d2363af..737b716209 100644 --- a/spring-security-mvc-boot/src/test/java/org/baeldung/web/MultipleEntryPointsTest.java +++ b/spring-security-mvc-boot/src/test/java/org/baeldung/web/MultipleEntryPointsIntegrationTest.java @@ -20,7 +20,7 @@ import static org.springframework.security.test.web.servlet.request.SecurityMock @RunWith(SpringRunner.class) @WebAppConfiguration @SpringBootTest(classes = MultipleEntryPointsApplication.class) -public class MultipleEntryPointsTest { +public class MultipleEntryPointsIntegrationTest { @Autowired private WebApplicationContext wac; diff --git a/spring-security-mvc-custom/pom.xml b/spring-security-mvc-custom/pom.xml index 56ac8babc6..4a7e9419cc 100644 --- a/spring-security-mvc-custom/pom.xml +++ b/spring-security-mvc-custom/pom.xml @@ -1,4 +1,5 @@ - + 4.0.0 com.baeldung spring-security-mvc-custom @@ -11,8 +12,8 @@ com.baeldung parent-modules 1.0.0-SNAPSHOT - - + + @@ -112,36 +113,6 @@ - - - org.slf4j - jcl-over-slf4j - ${org.slf4j.version} - - - - - - - org.hamcrest - hamcrest-core - ${org.hamcrest.version} - test - - - org.hamcrest - hamcrest-library - ${org.hamcrest.version} - test - - - - org.mockito - mockito-core - ${mockito.version} - test - - @@ -199,15 +170,11 @@ 5.3.3.Final 3.1.0 1.2 - + 19.0 3.5 - - 1.3 - 1.10.19 - 4.5.2 4.4.5 diff --git a/spring-security-mvc-digest-auth/pom.xml b/spring-security-mvc-digest-auth/pom.xml index 7bd3372ddd..50fd0fa479 100644 --- a/spring-security-mvc-digest-auth/pom.xml +++ b/spring-security-mvc-digest-auth/pom.xml @@ -1,4 +1,5 @@ - + 4.0.0 com.baeldung spring-security-mvc-digest-auth @@ -11,8 +12,8 @@ com.baeldung parent-modules 1.0.0-SNAPSHOT - - + + @@ -107,37 +108,6 @@ ${guava.version} - - - - org.slf4j - jcl-over-slf4j - ${org.slf4j.version} - - - - - - - org.hamcrest - hamcrest-core - ${org.hamcrest.version} - test - - - org.hamcrest - hamcrest-library - ${org.hamcrest.version} - test - - - - org.mockito - mockito-core - ${mockito.version} - test - - @@ -195,15 +165,11 @@ 5.3.3.Final 1.2 3.1.0 - + 19.0 3.5 - - 1.3 - 1.10.19 - 4.4.5 4.5.2 diff --git a/spring-security-mvc-ldap/pom.xml b/spring-security-mvc-ldap/pom.xml index fc7941863e..f2b6b766eb 100644 --- a/spring-security-mvc-ldap/pom.xml +++ b/spring-security-mvc-ldap/pom.xml @@ -1,4 +1,5 @@ - + 4.0.0 com.baeldung spring-security-mvc-ldap @@ -8,9 +9,10 @@ war - org.springframework.boot - spring-boot-starter-parent - 1.4.4.RELEASE + parent-boot-4 + com.baeldung + 0.0.1-SNAPSHOT + ../parent-boot-4 @@ -41,7 +43,7 @@ apacheds-server-jndi ${apacheds.version} - + @@ -52,23 +54,9 @@ true - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.8 - 1.8 - - - - - - + 1.5.7 diff --git a/spring-security-mvc-login/pom.xml b/spring-security-mvc-login/pom.xml index 0a67ec2a55..27e7239ee6 100644 --- a/spring-security-mvc-login/pom.xml +++ b/spring-security-mvc-login/pom.xml @@ -1,4 +1,5 @@ - + 4.0.0 com.baeldung spring-security-mvc-login @@ -11,8 +12,8 @@ com.baeldung parent-modules 1.0.0-SNAPSHOT - - + + @@ -104,36 +105,8 @@ runtime - - - org.slf4j - jcl-over-slf4j - ${org.slf4j.version} - - - - - org.hamcrest - hamcrest-core - ${org.hamcrest.version} - test - - - org.hamcrest - hamcrest-library - ${org.hamcrest.version} - test - - - - org.mockito - mockito-core - ${mockito.version} - test - - org.springframework spring-test @@ -209,10 +182,6 @@ 19.0 3.5 - - 1.3 - 1.10.19 - 4.4.5 4.5.2 diff --git a/spring-security-mvc-persisted-remember-me/pom.xml b/spring-security-mvc-persisted-remember-me/pom.xml index 27b42a9a0b..0bb654d96a 100644 --- a/spring-security-mvc-persisted-remember-me/pom.xml +++ b/spring-security-mvc-persisted-remember-me/pom.xml @@ -1,255 +1,221 @@ - 4.0.0 - com.baeldung - spring-security-mvc-persisted-remember-me - 0.1-SNAPSHOT + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + com.baeldung + spring-security-mvc-persisted-remember-me + 0.1-SNAPSHOT - spring-security-mvc-persisted-remember-me - war + spring-security-mvc-persisted-remember-me + war - - com.baeldung - parent-modules - 1.0.0-SNAPSHOT - - - + + com.baeldung + parent-modules + 1.0.0-SNAPSHOT + - + - - org.springframework.security - spring-security-web - ${org.springframework.security.version} - - - org.springframework.security - spring-security-config - ${org.springframework.security.version} - - - org.springframework.security - spring-security-taglibs - ${org.springframework.security.version} - - - org.springframework - spring-orm - ${org.springframework.version} - + - + + org.springframework.security + spring-security-web + ${org.springframework.security.version} + + + org.springframework.security + spring-security-config + ${org.springframework.security.version} + + + org.springframework.security + spring-security-taglibs + ${org.springframework.security.version} + + + org.springframework + spring-orm + ${org.springframework.version} + - - org.springframework - spring-core - ${org.springframework.version} - - - commons-logging - commons-logging - - - - - org.springframework - spring-context - ${org.springframework.version} - - - org.springframework - spring-jdbc - ${org.springframework.version} - - - org.springframework - spring-beans - ${org.springframework.version} - - - org.springframework - spring-aop - ${org.springframework.version} - - - org.springframework - spring-tx - ${org.springframework.version} - - - org.springframework - spring-expression - ${org.springframework.version} - + - - org.springframework - spring-web - ${org.springframework.version} - - - org.springframework - spring-webmvc - ${org.springframework.version} - + + org.springframework + spring-core + ${org.springframework.version} + + + commons-logging + commons-logging + + + + + org.springframework + spring-context + ${org.springframework.version} + + + org.springframework + spring-jdbc + ${org.springframework.version} + + + org.springframework + spring-beans + ${org.springframework.version} + + + org.springframework + spring-aop + ${org.springframework.version} + + + org.springframework + spring-tx + ${org.springframework.version} + + + org.springframework + spring-expression + ${org.springframework.version} + - + + org.springframework + spring-web + ${org.springframework.version} + + + org.springframework + spring-webmvc + ${org.springframework.version} + - - javax.servlet - javax.servlet-api - ${javax.servlet.version} - provided - + - - javax.servlet - jstl - ${jstl.version} - runtime - - - - - - com.h2database - h2 - ${h2.version} - + + javax.servlet + javax.servlet-api + ${javax.servlet.version} + provided + - - org.postgresql - postgresql - ${postgresql.version} - runtime - - - + + javax.servlet + jstl + ${jstl.version} + runtime + - - com.google.guava - guava - ${guava.version} - - + - + + com.h2database + h2 + ${h2.version} + - - - - - + + org.postgresql + postgresql + ${postgresql.version} + runtime + - - - org.slf4j - jcl-over-slf4j - ${org.slf4j.version} - - - - + - - org.hamcrest - hamcrest-core - ${org.hamcrest.version} - test - - - org.hamcrest - hamcrest-library - ${org.hamcrest.version} - test - + + com.google.guava + guava + ${guava.version} + - - org.mockito - mockito-core - ${mockito.version} - test - - + - - spring-security-mvc-persisted-remember-me - - - src/main/resources - true - - + + + + + - + - - org.apache.maven.plugins - maven-war-plugin - ${maven-war-plugin.version} - + + spring-security-mvc-persisted-remember-me + + + src/main/resources + true + + - - org.codehaus.cargo - cargo-maven2-plugin - ${cargo-maven2-plugin.version} - - true - - jetty8x - embedded - - - - - - - 8082 - - - - + - + + org.apache.maven.plugins + maven-war-plugin + ${maven-war-plugin.version} + - + + org.codehaus.cargo + cargo-maven2-plugin + ${cargo-maven2-plugin.version} + + true + + jetty8x + embedded + + + + + + + 8082 + + + + - - - 4.3.4.RELEASE - 4.2.0.RELEASE + - - 5.2.5.Final - 5.1.40 - 1.4.193 - 9.4.1212 + - - 5.3.3.Final - 3.1.0 - 1.2 + + + 4.3.4.RELEASE + 4.2.0.RELEASE - - 19.0 - 3.4 + + 5.2.5.Final + 5.1.40 + 1.4.193 + 9.4.1212 - - 1.3 - 1.10.19 + + 5.3.3.Final + 3.1.0 + 1.2 - 4.5.2 - 4.4.5 + + 19.0 + 3.4 - 2.9.0 + 4.5.2 + 4.4.5 - - 2.6 - 2.7 - 1.6.1 + 2.9.0 - + + 2.6 + 2.7 + 1.6.1 + + \ No newline at end of file diff --git a/spring-security-mvc-session/pom.xml b/spring-security-mvc-session/pom.xml index 2ba5024149..413a0c67ba 100644 --- a/spring-security-mvc-session/pom.xml +++ b/spring-security-mvc-session/pom.xml @@ -1,4 +1,5 @@ - + 4.0.0 com.baeldung spring-security-mvc-session @@ -11,8 +12,8 @@ com.baeldung parent-modules 1.0.0-SNAPSHOT - - + + @@ -112,37 +113,6 @@ ${codahale.metrics.version} - - - - org.slf4j - jcl-over-slf4j - ${org.slf4j.version} - - - - - - - org.hamcrest - hamcrest-core - ${org.hamcrest.version} - test - - - org.hamcrest - hamcrest-library - ${org.hamcrest.version} - test - - - - org.mockito - mockito-core - ${mockito.version} - test - - @@ -201,15 +171,11 @@ 3.0.2 1.2 3.1.0 - + 19.0 3.5 - - 1.3 - 1.10.19 - 4.5.2 4.4.5 diff --git a/spring-security-openid/pom.xml b/spring-security-openid/pom.xml index 72cc63474b..2149334a5c 100644 --- a/spring-security-openid/pom.xml +++ b/spring-security-openid/pom.xml @@ -1,5 +1,6 @@ - + 4.0.0 com.baeldung @@ -11,9 +12,10 @@ Spring OpenID sample project - org.springframework.boot - spring-boot-starter-parent - 1.5.2.RELEASE + parent-boot-5 + com.baeldung + 0.0.1-SNAPSHOT + ../parent-boot-5 @@ -42,25 +44,6 @@ spring-security-jwt - - org.springframework.boot - spring-boot-starter-test - test - - - - - org.springframework.boot - spring-boot-maven-plugin - - - - - - UTF-8 - 1.8 - - diff --git a/spring-security-rest-basic-auth/pom.xml b/spring-security-rest-basic-auth/pom.xml index 3db1d98b18..3039b10040 100644 --- a/spring-security-rest-basic-auth/pom.xml +++ b/spring-security-rest-basic-auth/pom.xml @@ -1,4 +1,5 @@ - + 4.0.0 com.baeldung spring-security-rest-basic-auth @@ -11,8 +12,8 @@ com.baeldung parent-modules 1.0.0-SNAPSHOT - - + + @@ -159,15 +160,6 @@ ${guava.version} - - - - org.slf4j - jcl-over-slf4j - ${org.slf4j.version} - - - @@ -177,26 +169,6 @@ test - - org.hamcrest - hamcrest-core - ${org.hamcrest.version} - test - - - org.hamcrest - hamcrest-library - ${org.hamcrest.version} - test - - - - org.mockito - mockito-core - ${mockito.version} - test - - @@ -295,7 +267,7 @@ - + 4.3.6.RELEASE @@ -314,15 +286,11 @@ 1.2 3.1.0 2.8.5 - + 19.0 3.5 - - 1.3 - 1.10.19 - 2.9.0 diff --git a/spring-security-rest-custom/pom.xml b/spring-security-rest-custom/pom.xml index 0fe642c2b6..c329bd1cb8 100644 --- a/spring-security-rest-custom/pom.xml +++ b/spring-security-rest-custom/pom.xml @@ -1,4 +1,5 @@ - + 4.0.0 com.baeldung spring-security-rest-custom @@ -8,9 +9,10 @@ war - org.springframework.boot - spring-boot-starter-parent - 1.4.4.RELEASE + parent-boot-4 + com.baeldung + 0.0.1-SNAPSHOT + ../parent-boot-4 @@ -138,12 +140,6 @@ - - junit - junit - test - - org.hamcrest hamcrest-core @@ -161,23 +157,6 @@ test - - - - org.slf4j - slf4j-api - - - ch.qos.logback - logback-classic - - - - org.slf4j - jcl-over-slf4j - - - @@ -190,18 +169,13 @@ - - org.apache.maven.plugins - maven-compiler-plugin - - 1.8 - 1.8 - true - source - - - + org.springframework.boot + spring-boot-maven-plugin + + true + + org.apache.maven.plugins maven-war-plugin @@ -210,19 +184,6 @@ - - org.apache.maven.plugins - maven-surefire-plugin - - - - - - - - - - org.codehaus.cargo cargo-maven2-plugin @@ -256,11 +217,8 @@ 4.4.5 4.5.2 - 2.9.0 - 1.6.1 - \ No newline at end of file diff --git a/spring-security-rest-digest-auth/pom.xml b/spring-security-rest-digest-auth/pom.xml index 4c2d6cadcd..2e1fe1ea35 100644 --- a/spring-security-rest-digest-auth/pom.xml +++ b/spring-security-rest-digest-auth/pom.xml @@ -1,4 +1,5 @@ - + 4.0.0 com.baeldung spring-security-rest-digest-auth @@ -11,8 +12,8 @@ com.baeldung parent-modules 1.0.0-SNAPSHOT - - + + @@ -94,7 +95,7 @@ spring-web ${org.springframework.version} - + @@ -153,15 +154,6 @@ ${guava.version} - - - - org.slf4j - jcl-over-slf4j - ${org.slf4j.version} - - - @@ -171,26 +163,6 @@ test - - org.hamcrest - hamcrest-core - ${org.hamcrest.version} - test - - - org.hamcrest - hamcrest-library - ${org.hamcrest.version} - test - - - - org.mockito - mockito-core - ${mockito.version} - test - - @@ -289,7 +261,7 @@ - + 4.3.4.RELEASE @@ -316,9 +288,6 @@ 3.5 - 1.3 - 1.10.19 - 2.9.0 diff --git a/spring-security-rest-full/pom.xml b/spring-security-rest-full/pom.xml index 290aa48dea..2b559ddefc 100644 --- a/spring-security-rest-full/pom.xml +++ b/spring-security-rest-full/pom.xml @@ -1,4 +1,5 @@ - + 4.0.0 com.baeldung spring-security-rest-full @@ -8,9 +9,10 @@ war - org.springframework.boot - spring-boot-starter-parent - 1.4.4.RELEASE + parent-boot-4 + com.baeldung + 0.0.1-SNAPSHOT + ../parent-boot-4 @@ -174,7 +176,7 @@ com.h2database h2 - + @@ -210,23 +212,6 @@ ${guava.version} - - - - org.slf4j - slf4j-api - - - ch.qos.logback - logback-classic - - - - org.slf4j - jcl-over-slf4j - - - @@ -240,17 +225,11 @@ spring-security-test - - junit - junit - test - - - - - - - + + + + + org.hamcrest hamcrest-library @@ -263,19 +242,6 @@ test - - com.jayway.restassured - rest-assured - ${rest-assured.version} - test - - - commons-logging - commons-logging - - - - @@ -289,34 +255,11 @@ - - org.apache.maven.plugins - maven-compiler-plugin - - 1.8 - 1.8 - - - org.apache.maven.plugins maven-war-plugin - - org.apache.maven.plugins - maven-surefire-plugin - - - **/*IntegrationTest.java - **/*LiveTest.java - - - - - - - org.codehaus.cargo cargo-maven2-plugin @@ -365,9 +308,7 @@ integration - - org.apache.maven.plugins maven-surefire-plugin @@ -394,16 +335,13 @@ - live - - org.apache.maven.plugins maven-surefire-plugin @@ -453,7 +391,6 @@ - @@ -469,10 +406,6 @@ 19.0 3.5 - - 4.12 - 2.9.0 - 1.6.1 1.1.3 diff --git a/spring-security-rest-full/src/main/java/org/baeldung/persistence/service/IFooService.java b/spring-security-rest-full/src/main/java/org/baeldung/persistence/service/IFooService.java index 60d607b9ef..a3d16d9c15 100644 --- a/spring-security-rest-full/src/main/java/org/baeldung/persistence/service/IFooService.java +++ b/spring-security-rest-full/src/main/java/org/baeldung/persistence/service/IFooService.java @@ -2,9 +2,13 @@ package org.baeldung.persistence.service; import org.baeldung.persistence.IOperations; import org.baeldung.persistence.model.Foo; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; public interface IFooService extends IOperations { Foo retrieveByName(String name); + + Page findPaginated(Pageable pageable); } diff --git a/spring-security-rest-full/src/main/java/org/baeldung/persistence/service/impl/FooService.java b/spring-security-rest-full/src/main/java/org/baeldung/persistence/service/impl/FooService.java index 533c0f5082..49f9ec7e97 100644 --- a/spring-security-rest-full/src/main/java/org/baeldung/persistence/service/impl/FooService.java +++ b/spring-security-rest-full/src/main/java/org/baeldung/persistence/service/impl/FooService.java @@ -7,6 +7,8 @@ import org.baeldung.persistence.model.Foo; import org.baeldung.persistence.service.IFooService; import org.baeldung.persistence.service.common.AbstractService; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; import org.springframework.data.repository.PagingAndSortingRepository; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.stereotype.Service; @@ -47,4 +49,9 @@ public class FooService extends AbstractService implements IFooService { return Lists.newArrayList(getDao().findAll()); } + @Override + public Page findPaginated(Pageable pageable) { + return dao.findAll(pageable); + } + } diff --git a/spring-security-rest-full/src/main/java/org/baeldung/web/controller/FooController.java b/spring-security-rest-full/src/main/java/org/baeldung/web/controller/FooController.java index c50e80bec2..484a59f8ef 100644 --- a/spring-security-rest-full/src/main/java/org/baeldung/web/controller/FooController.java +++ b/spring-security-rest-full/src/main/java/org/baeldung/web/controller/FooController.java @@ -14,9 +14,11 @@ import org.baeldung.web.util.RestPreconditions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationEventPublisher; import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -81,6 +83,18 @@ public class FooController { return resultPage.getContent(); } + + @GetMapping("/pageable") + @ResponseBody + public List findPaginatedWithPageable(Pageable pageable, final UriComponentsBuilder uriBuilder, final HttpServletResponse response) { + final Page resultPage = service.findPaginated(pageable); + if (pageable.getPageNumber() > resultPage.getTotalPages()) { + throw new MyResourceNotFoundException(); + } + eventPublisher.publishEvent(new PaginatedResultsRetrievedEvent(Foo.class, uriBuilder, response, pageable.getPageNumber(), resultPage.getTotalPages(), pageable.getPageSize())); + + return resultPage.getContent(); + } // write diff --git a/spring-security-rest-full/src/test/java/org/baeldung/common/web/AbstractBasicLiveTest.java b/spring-security-rest-full/src/test/java/org/baeldung/common/web/AbstractBasicLiveTest.java index a8cd7f4f30..2cc0aa7b28 100644 --- a/spring-security-rest-full/src/test/java/org/baeldung/common/web/AbstractBasicLiveTest.java +++ b/spring-security-rest-full/src/test/java/org/baeldung/common/web/AbstractBasicLiveTest.java @@ -18,7 +18,7 @@ import org.junit.Ignore; import org.junit.Test; import com.google.common.net.HttpHeaders; -import com.jayway.restassured.response.Response; +import io.restassured.response.Response; public abstract class AbstractBasicLiveTest extends AbstractLiveTest { diff --git a/spring-security-rest-full/src/test/java/org/baeldung/common/web/AbstractDiscoverabilityLiveTest.java b/spring-security-rest-full/src/test/java/org/baeldung/common/web/AbstractDiscoverabilityLiveTest.java index ca3f56416d..2d3ad7b13f 100644 --- a/spring-security-rest-full/src/test/java/org/baeldung/common/web/AbstractDiscoverabilityLiveTest.java +++ b/spring-security-rest-full/src/test/java/org/baeldung/common/web/AbstractDiscoverabilityLiveTest.java @@ -15,7 +15,7 @@ import org.junit.Test; import org.springframework.http.MediaType; import com.google.common.net.HttpHeaders; -import com.jayway.restassured.response.Response; +import io.restassured.response.Response; public abstract class AbstractDiscoverabilityLiveTest extends AbstractLiveTest { diff --git a/spring-security-rest-full/src/test/java/org/baeldung/common/web/AbstractLiveTest.java b/spring-security-rest-full/src/test/java/org/baeldung/common/web/AbstractLiveTest.java index a2890d8643..72dbcedc64 100644 --- a/spring-security-rest-full/src/test/java/org/baeldung/common/web/AbstractLiveTest.java +++ b/spring-security-rest-full/src/test/java/org/baeldung/common/web/AbstractLiveTest.java @@ -9,9 +9,9 @@ import org.springframework.beans.factory.annotation.Autowired; import com.google.common.base.Preconditions; import com.google.common.net.HttpHeaders; -import com.jayway.restassured.RestAssured; -import com.jayway.restassured.response.Response; -import com.jayway.restassured.specification.RequestSpecification; +import io.restassured.RestAssured; +import io.restassured.response.Response; +import io.restassured.specification.RequestSpecification; public abstract class AbstractLiveTest { diff --git a/spring-security-rest-full/src/test/java/org/baeldung/persistence/query/JPASpecificationLiveTest.java b/spring-security-rest-full/src/test/java/org/baeldung/persistence/query/JPASpecificationLiveTest.java index 70787266d8..07b47dd8b6 100644 --- a/spring-security-rest-full/src/test/java/org/baeldung/persistence/query/JPASpecificationLiveTest.java +++ b/spring-security-rest-full/src/test/java/org/baeldung/persistence/query/JPASpecificationLiveTest.java @@ -1,8 +1,8 @@ package org.baeldung.persistence.query; -import com.jayway.restassured.RestAssured; -import com.jayway.restassured.response.Response; -import com.jayway.restassured.specification.RequestSpecification; +import io.restassured.RestAssured; +import io.restassured.response.Response; +import io.restassured.specification.RequestSpecification; import org.baeldung.persistence.model.User; import org.junit.Before; import org.junit.Test; diff --git a/spring-security-rest-full/src/test/java/org/baeldung/web/FooPageableLiveTest.java b/spring-security-rest-full/src/test/java/org/baeldung/web/FooPageableLiveTest.java new file mode 100644 index 0000000000..f43ca34bba --- /dev/null +++ b/spring-security-rest-full/src/test/java/org/baeldung/web/FooPageableLiveTest.java @@ -0,0 +1,76 @@ +package org.baeldung.web; + +import static org.baeldung.Consts.APPLICATION_PORT; +import static org.hamcrest.Matchers.is; + +import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic; +import static org.apache.commons.lang3.RandomStringUtils.randomNumeric; + +import java.util.List; + +import org.baeldung.common.web.AbstractBasicLiveTest; +import org.baeldung.persistence.model.Foo; +import org.springframework.test.context.ActiveProfiles; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.baeldung.spring.ConfigTest; +import org.springframework.test.context.support.AnnotationConfigContextLoader; + +import org.junit.runner.RunWith; +import org.junit.Test; +import io.restassured.response.Response; + +import static org.hamcrest.Matchers.is; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertThat; + +@RunWith(SpringJUnit4ClassRunner.class) +@ContextConfiguration(classes = { ConfigTest.class }, loader = AnnotationConfigContextLoader.class) +@ActiveProfiles("test") +public class FooPageableLiveTest extends AbstractBasicLiveTest { + + public FooPageableLiveTest() { + super(Foo.class); + } + + // API + + @Override + public final void create() { + create(new Foo(randomAlphabetic(6))); + } + + @Override + public final String createAsUri() { + return createAsUri(new Foo(randomAlphabetic(6))); + } + + @Test + public void whenResourcesAreRetrievedPaged_then200IsReceived() { + final Response response = givenAuth().get(getPageableURL() + "?page=0&size=10"); + + assertThat(response.getStatusCode(), is(200)); + } + + @Test + public void whenPageOfResourcesAreRetrievedOutOfBounds_then404IsReceived() { + final String url = getPageableURL() + "?page=" + randomNumeric(5) + "&size=10"; + final Response response = givenAuth().get(url); + + assertThat(response.getStatusCode(), is(404)); + } + + @Test + public void givenResourcesExist_whenFirstPageIsRetrieved_thenPageContainsResources() { + create(); + + final Response response = givenAuth().get(getPageableURL() + "?page=0&size=10"); + + assertFalse(response.body().as(List.class).isEmpty()); + } + + protected String getPageableURL() { + return "http://localhost:" + APPLICATION_PORT + "/spring-security-rest-full/auth/foos/pageable"; + } + +} diff --git a/spring-security-rest-full/src/test/java/org/baeldung/web/LiveTestSuite.java b/spring-security-rest-full/src/test/java/org/baeldung/web/LiveTestSuite.java index c3353fac3c..5d3d7fc518 100644 --- a/spring-security-rest-full/src/test/java/org/baeldung/web/LiveTestSuite.java +++ b/spring-security-rest-full/src/test/java/org/baeldung/web/LiveTestSuite.java @@ -10,6 +10,7 @@ import org.junit.runners.Suite; JPASpecificationLiveTest.class ,FooDiscoverabilityLiveTest.class ,FooLiveTest.class + ,FooPageableLiveTest.class ,MyUserLiveTest.class }) // public class LiveTestSuite { diff --git a/spring-security-rest-full/src/test/java/org/baeldung/web/MyUserLiveTest.java b/spring-security-rest-full/src/test/java/org/baeldung/web/MyUserLiveTest.java index 20623eacc6..b598463da0 100644 --- a/spring-security-rest-full/src/test/java/org/baeldung/web/MyUserLiveTest.java +++ b/spring-security-rest-full/src/test/java/org/baeldung/web/MyUserLiveTest.java @@ -6,9 +6,9 @@ import org.baeldung.persistence.model.MyUser; import org.junit.Test; import org.springframework.test.context.ActiveProfiles; -import com.jayway.restassured.RestAssured; -import com.jayway.restassured.response.Response; -import com.jayway.restassured.specification.RequestSpecification; +import io.restassured.RestAssured; +import io.restassured.response.Response; +import io.restassured.specification.RequestSpecification; @ActiveProfiles("test") public class MyUserLiveTest { diff --git a/spring-security-rest/pom.xml b/spring-security-rest/pom.xml index 79b6027bfb..64c0160e1f 100644 --- a/spring-security-rest/pom.xml +++ b/spring-security-rest/pom.xml @@ -1,353 +1,323 @@ - 4.0.0 - com.baeldung - spring-security-rest - 0.1-SNAPSHOT + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + com.baeldung + spring-security-rest + 0.1-SNAPSHOT - spring-security-rest - war + spring-security-rest + war - - com.baeldung - parent-modules - 1.0.0-SNAPSHOT - - - + + com.baeldung + parent-modules + 1.0.0-SNAPSHOT + - + - - org.springframework.security - spring-security-web - ${org.springframework.security.version} - - - org.springframework.security - spring-security-config - ${org.springframework.security.version} - + - + + org.springframework.security + spring-security-web + ${org.springframework.security.version} + + + org.springframework.security + spring-security-config + ${org.springframework.security.version} + - - org.springframework - spring-core - ${org.springframework.version} - - - commons-logging - commons-logging - - - - - org.springframework - spring-context - ${org.springframework.version} - - - org.springframework - spring-jdbc - ${org.springframework.version} - - - org.springframework - spring-beans - ${org.springframework.version} - - - org.springframework - spring-aop - ${org.springframework.version} - - - org.springframework - spring-tx - ${org.springframework.version} - - - org.springframework - spring-expression - ${org.springframework.version} - + - - org.springframework - spring-web - ${org.springframework.version} - - - org.springframework - spring-webmvc - ${org.springframework.version} - + + org.springframework + spring-core + ${org.springframework.version} + + + commons-logging + commons-logging + + + + + org.springframework + spring-context + ${org.springframework.version} + + + org.springframework + spring-jdbc + ${org.springframework.version} + + + org.springframework + spring-beans + ${org.springframework.version} + + + org.springframework + spring-aop + ${org.springframework.version} + + + org.springframework + spring-tx + ${org.springframework.version} + + + org.springframework + spring-expression + ${org.springframework.version} + - - - org.springframework.hateoas - spring-hateoas - ${org.springframework.hateoas.version} - + + org.springframework + spring-web + ${org.springframework.version} + + + org.springframework + spring-webmvc + ${org.springframework.version} + - + + + org.springframework.hateoas + spring-hateoas + ${org.springframework.hateoas.version} + - - javax.servlet - javax.servlet-api - ${javax.servlet-api.version} - provided - + - - javax.servlet - jstl - ${jstl.version} - runtime - + + javax.servlet + javax.servlet-api + ${javax.servlet-api.version} + provided + - - javax.validation - validation-api - ${javax.validation.version} - + + javax.servlet + jstl + ${jstl.version} + runtime + + + + javax.validation + validation-api + ${javax.validation.version} + - - - com.fasterxml.jackson.core - jackson-databind - ${jackson.version} - + + + com.fasterxml.jackson.core + jackson-databind + ${jackson.version} + - - - com.google.guava - guava - ${guava.version} - - - org.apache.commons - commons-lang3 - ${commons-lang3.version} - + + + com.google.guava + guava + ${guava.version} + + + org.apache.commons + commons-lang3 + ${commons-lang3.version} + - - - org.slf4j - jcl-over-slf4j - ${org.slf4j.version} - - + + + org.springframework + spring-test + ${org.springframework.version} + test + - - - org.springframework - spring-test - ${org.springframework.version} - test - - - - org.springframework.security - spring-security-test - ${org.springframework.security.version} - test - + + org.springframework.security + spring-security-test + ${org.springframework.security.version} + test + - - com.jayway.restassured - rest-assured - ${rest-assured.version} - test - - - commons-logging - commons-logging - - - + + com.jayway.restassured + rest-assured + ${rest-assured.version} + test + + + commons-logging + commons-logging + + + - - org.hamcrest - hamcrest-core - ${org.hamcrest.version} - test - - - org.hamcrest - hamcrest-library - ${org.hamcrest.version} - test - + + + io.springfox + springfox-swagger2 + ${springfox-swagger.version} + - - org.mockito - mockito-core - ${mockito.version} - test - + + io.springfox + springfox-swagger-ui + ${springfox-swagger.version} + - - - io.springfox - springfox-swagger2 - ${springfox-swagger.version} - + + + commons-fileupload + commons-fileupload + ${commons-fileupload.version} + - - io.springfox - springfox-swagger-ui - ${springfox-swagger.version} - + - - - commons-fileupload - commons-fileupload - ${commons-fileupload.version} - + + spring-security-rest + + + src/main/resources + true + + - + - - spring-security-rest - - - src/main/resources - true - - + + org.apache.maven.plugins + maven-war-plugin + ${maven-war-plugin.version} + - + + org.codehaus.cargo + cargo-maven2-plugin + ${cargo-maven2-plugin.version} + + + jetty8x + embedded + + + + + + + 8082 + + + + - - org.apache.maven.plugins - maven-war-plugin - ${maven-war-plugin.version} - + - - org.codehaus.cargo - cargo-maven2-plugin - ${cargo-maven2-plugin.version} - - - jetty8x - embedded - - - - - - - 8082 - - - - + - + + + live + + + + org.codehaus.cargo + cargo-maven2-plugin + + + start-server + pre-integration-test + + start + + + + stop-server + post-integration-test + + stop + + + + - + + org.apache.maven.plugins + maven-surefire-plugin + + + integration-test + + test + + + + none + + + **/*LiveTest.java + + + cargo + + + + + - - - live - - - - org.codehaus.cargo - cargo-maven2-plugin - - - start-server - pre-integration-test - - start - - - - stop-server - post-integration-test - - stop - - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - integration-test - - test - - - - none - - - **/*LiveTest.java - - - cargo - - - - - - - - - - + + + + - - - 4.3.4.RELEASE - 4.2.0.RELEASE - 0.21.0.RELEASE + + + 4.3.4.RELEASE + 4.2.0.RELEASE + 0.21.0.RELEASE - - 5.2.5.Final - 5.1.40 + + 5.2.5.Final + 5.1.40 - - 5.3.3.Final - 3.1.0 - 1.1.0.Final - 1.2 - 2.8.5 + + 5.3.3.Final + 3.1.0 + 1.1.0.Final + 1.2 + 2.8.5 - - 19.0 - 3.5 - 1.3.2 + + 19.0 + 3.5 + 1.3.2 - - 1.3 - 1.10.19 - 2.9.0 + + 2.9.0 - - 2.6.1 + + 2.6.1 - 4.4.5 - 4.5.2 + 4.4.5 + 4.5.2 - 2.9.0 + 2.9.0 - - 2.6 - 1.6.1 + + 2.6 + 1.6.1 - + diff --git a/spring-security-stormpath/pom.xml b/spring-security-stormpath/pom.xml index 44c6595e64..982c677bf5 100644 --- a/spring-security-stormpath/pom.xml +++ b/spring-security-stormpath/pom.xml @@ -8,75 +8,68 @@ spring-security-stormpath http://maven.apache.org - - - abhinabkanrar@gmail.com - Abhinab Kanrar - https://github.com/AbhinabKanrar - abhinabkanrar - - + + + abhinabkanrar@gmail.com + Abhinab Kanrar + https://github.com/AbhinabKanrar + abhinabkanrar + + - - UTF-8 - UTF-8 - 1.8 - + + UTF-8 + UTF-8 + 1.8 + - + + parent-boot-4 + com.baeldung + 0.0.1-SNAPSHOT + ../parent-boot-4 + + + + org.springframework.boot - spring-boot-starter-parent - 1.5.1.RELEASE - + spring-boot-starter-web + + + com.stormpath.spring + stormpath-default-spring-boot-starter + 1.5.4 + + - - - org.springframework.boot - spring-boot-starter-web - - - com.stormpath.spring - stormpath-default-spring-boot-starter - 1.5.4 - - + + + spring-releases + Spring Releases + https://repo.spring.io/libs-release + + - - - spring-releases - Spring Releases - https://repo.spring.io/libs-release - - - - - spring-security-stormpath - - - src/main/resources - - - - - org.apache.maven.plugins - maven-compiler-plugin - - ${java.version} - ${java.version} - - + + spring-security-stormpath + + + src/main/resources + + + org.springframework.boot spring-boot-maven-plugin - - true - - - - - repackage - - + + true + + + + + repackage + + diff --git a/spring-security-x509/pom.xml b/spring-security-x509/pom.xml index b76bf4a23f..77830ebe5a 100644 --- a/spring-security-x509/pom.xml +++ b/spring-security-x509/pom.xml @@ -1,5 +1,6 @@ - 4.0.0 @@ -14,18 +15,12 @@ - org.springframework.boot - spring-boot-starter-parent - 1.4.4.RELEASE - + parent-boot-4 + com.baeldung + 0.0.1-SNAPSHOT + ../parent-boot-4 - - UTF-8 - UTF-8 - 1.8 - - org.springframework.boot @@ -39,11 +34,6 @@ org.springframework.boot spring-boot-starter-thymeleaf - - - org.springframework.boot - spring-boot-starter-test - test - + diff --git a/spring-security-x509/spring-security-x509-basic-auth/pom.xml b/spring-security-x509/spring-security-x509-basic-auth/pom.xml index 8f460c83ec..e46629f44d 100644 --- a/spring-security-x509/spring-security-x509-basic-auth/pom.xml +++ b/spring-security-x509/spring-security-x509-basic-auth/pom.xml @@ -1,6 +1,7 @@ - + 4.0.0 basic-secured-server @@ -16,27 +17,27 @@ 0.0.1-SNAPSHOT - - - - org.springframework.boot - spring-boot-maven-plugin - + + + + org.springframework.boot + spring-boot-maven-plugin + - - org.apache.maven.plugins - maven-surefire-plugin - - - **/*IntegrationTest.java - **/*LiveTest.java - - - - - - - + + org.apache.maven.plugins + maven-surefire-plugin + + + **/*IntegrationTest.java + **/*LiveTest.java + + + + + + + integration @@ -70,5 +71,5 @@ - + diff --git a/spring-security-x509/spring-security-x509-basic-auth/src/main/resources/templates/user.html b/spring-security-x509/spring-security-x509-basic-auth/src/main/resources/templates/user.html index 3e36d7b644..900d9783c5 100644 --- a/spring-security-x509/spring-security-x509-basic-auth/src/main/resources/templates/user.html +++ b/spring-security-x509/spring-security-x509-basic-auth/src/main/resources/templates/user.html @@ -1,9 +1,11 @@ - - X.509 Authentication Demo - - -

Hello !

- + +X.509 Authentication Demo + + +

+ Hello ! +

+ diff --git a/spring-security-x509/spring-security-x509-client-auth/pom.xml b/spring-security-x509/spring-security-x509-client-auth/pom.xml index ffddabef40..ac8cd0adca 100644 --- a/spring-security-x509/spring-security-x509-client-auth/pom.xml +++ b/spring-security-x509/spring-security-x509-client-auth/pom.xml @@ -1,5 +1,6 @@ - 4.0.0 @@ -16,26 +17,26 @@ 0.0.1-SNAPSHOT - - - - org.springframework.boot - spring-boot-maven-plugin - + + + + org.springframework.boot + spring-boot-maven-plugin + + + + org.apache.maven.plugins + maven-surefire-plugin + + + **/*IntegrationTest.java + **/*LiveTest.java + + + + + - - org.apache.maven.plugins - maven-surefire-plugin - - - **/*IntegrationTest.java - **/*LiveTest.java - - - - - - integration diff --git a/spring-session/pom.xml b/spring-session/pom.xml index 79095cbfbb..bb644c8b2e 100644 --- a/spring-session/pom.xml +++ b/spring-session/pom.xml @@ -1,7 +1,6 @@ - + 4.0.0 spring-session @@ -9,11 +8,10 @@ jar - org.springframework.boot - spring-boot-starter-parent - 1.4.4.RELEASE - - + parent-boot-4 + com.baeldung + 0.0.1-SNAPSHOT + ../parent-boot-4 @@ -33,36 +31,6 @@ org.springframework.boot spring-boot-starter-web - - org.springframework.boot - spring-boot-starter-test - test - - - - - org.springframework.boot - spring-boot-maven-plugin - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.8 - 1.8 - - - - org.apache.maven.plugins - maven-surefire-plugin - - - **/*IntegrationTest.java - - - - - \ No newline at end of file diff --git a/spring-sleuth/pom.xml b/spring-sleuth/pom.xml index 80415dc00d..dda5e09a26 100644 --- a/spring-sleuth/pom.xml +++ b/spring-sleuth/pom.xml @@ -1,7 +1,6 @@ - + 4.0.0 com.baeldung @@ -10,18 +9,12 @@ jar - org.springframework.boot - spring-boot-starter-parent - 1.4.3.RELEASE - + parent-boot-4 + com.baeldung + 0.0.1-SNAPSHOT + ../parent-boot-4 - - UTF-8 - UTF-8 - 1.8 - - org.springframework.cloud @@ -31,12 +24,6 @@ org.springframework.boot spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-test - test - @@ -51,14 +38,4 @@ - - - - org.springframework.boot - spring-boot-maven-plugin - - - - - \ No newline at end of file diff --git a/spring-social-login/pom.xml b/spring-social-login/pom.xml index 1462611cfc..0ca04ac298 100644 --- a/spring-social-login/pom.xml +++ b/spring-social-login/pom.xml @@ -1,56 +1,55 @@ - 4.0.0 - spring-social-login + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + spring-social-login - spring-social-login - war + spring-social-login + war - - org.springframework.boot - spring-boot-starter-parent - 1.4.4.RELEASE - - + + parent-boot-4 + com.baeldung + 0.0.1-SNAPSHOT + ../parent-boot-4 + - + - - org.springframework.boot - spring-boot-starter-web - + + org.springframework.boot + spring-boot-starter-web + - - org.springframework.boot - spring-boot-starter-thymeleaf - + + org.springframework.boot + spring-boot-starter-thymeleaf + + + + org.springframework.security + spring-security-web + + + + org.springframework.security + spring-security-config + + + + org.springframework.security + spring-security-taglibs + + + + org.thymeleaf.extras + thymeleaf-extras-springsecurity4 + - - org.springframework.security - spring-security-web - - - - org.springframework.security - spring-security-config - - - - org.springframework.security - spring-security-taglibs - - - - org.thymeleaf.extras - thymeleaf-extras-springsecurity4 - - - - - org.springframework.social - spring-social-facebook - + + org.springframework.social + spring-social-facebook + org.springframework.boot @@ -61,109 +60,78 @@ com.h2database h2 - - - - org.springframework.boot - spring-boot-starter-test - - - org.springframework - spring-test - test - + - - junit - junit - test - + + org.springframework + spring-test + test + org.apache.commons commons-lang3 ${commons-lang3.version} - - + + - - spring-social-login - - - src/main/resources - true - - + + spring-social-login + + + src/main/resources + true + + - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.8 - 1.8 - - + + + org.apache.maven.plugins + maven-war-plugin + + + - - org.apache.maven.plugins - maven-war-plugin - + + + integration + + + + org.apache.maven.plugins + maven-surefire-plugin + + + integration-test + + test + + + + **/*LiveTest.java + + + **/*IntegrationTest.java + + + + + + + json + + + + + + + - - org.apache.maven.plugins - maven-surefire-plugin - - - **/*IntegrationTest.java - **/*LiveTest.java - - - - - - - - - integration - - - - org.apache.maven.plugins - maven-surefire-plugin - - - integration-test - - test - - - - **/*LiveTest.java - - - **/*IntegrationTest.java - - - - - - - json - - - - - - - - - - 1.8 - 3.3.2 - + + 3.3.2 + \ No newline at end of file diff --git a/spring-spel/pom.xml b/spring-spel/pom.xml index bc1c6ddfec..4262482617 100644 --- a/spring-spel/pom.xml +++ b/spring-spel/pom.xml @@ -1,7 +1,6 @@ - + 4.0.0 com.baeldung @@ -12,23 +11,17 @@ com.baeldung parent-modules 1.0.0-SNAPSHOT - - + + - 1.3 4.3.4.RELEASE - + - - org.hamcrest - hamcrest-all - ${hamcrest.version} - org.springframework spring-context - ${springframework.version} + ${springframework.version} org.springframework diff --git a/spring-state-machine/pom.xml b/spring-state-machine/pom.xml index 7910b1299a..79d2db8e57 100644 --- a/spring-state-machine/pom.xml +++ b/spring-state-machine/pom.xml @@ -1,7 +1,6 @@ - + parent-modules com.baeldung @@ -20,7 +19,7 @@ org.springframework spring-test - 4.3.7.RELEASE + 4.3.7.RELEASE diff --git a/spring-state-machine/src/test/java/com/baeldung/spring/statemachine/StateMachineBuilderTest.java b/spring-state-machine/src/test/java/com/baeldung/spring/statemachine/StateMachineBuilderIntegrationTest.java similarity index 95% rename from spring-state-machine/src/test/java/com/baeldung/spring/statemachine/StateMachineBuilderTest.java rename to spring-state-machine/src/test/java/com/baeldung/spring/statemachine/StateMachineBuilderIntegrationTest.java index a5e4d07f18..c1de8b8958 100644 --- a/spring-state-machine/src/test/java/com/baeldung/spring/statemachine/StateMachineBuilderTest.java +++ b/spring-state-machine/src/test/java/com/baeldung/spring/statemachine/StateMachineBuilderIntegrationTest.java @@ -6,7 +6,7 @@ import org.junit.Test; import org.springframework.statemachine.StateMachine; import org.springframework.statemachine.config.StateMachineBuilder; -public class StateMachineBuilderTest { +public class StateMachineBuilderIntegrationTest { @Test public void whenUseStateMachineBuilder_thenBuildSuccessAndMachineWorks() throws Exception { diff --git a/spring-thymeleaf/pom.xml b/spring-thymeleaf/pom.xml index ca3bf4acf6..058bd10450 100644 --- a/spring-thymeleaf/pom.xml +++ b/spring-thymeleaf/pom.xml @@ -1,216 +1,210 @@ - 4.0.0 - com.baeldung - spring-thymeleaf - 0.1-SNAPSHOT - war + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + com.baeldung + spring-thymeleaf + 0.1-SNAPSHOT + war - - com.baeldung - parent-modules - 1.0.0-SNAPSHOT - - - - 1.8 - - 4.3.4.RELEASE - 4.2.0.RELEASE - 3.1.0 - - 3.0.3.RELEASE - 3.0.0.RELEASE - 2.1.2 - - 1.1.0.Final - 5.3.3.Final - 5.2.5.Final + + com.baeldung + parent-modules + 1.0.0-SNAPSHOT + - - 2.6 - 1.6.1 - 2.2 - + + 1.8 + + 4.3.4.RELEASE + 4.2.0.RELEASE + 3.1.0 + + 3.0.3.RELEASE + 3.0.0.RELEASE + 2.1.2 + + 1.1.0.Final + 5.3.3.Final + 5.2.5.Final - - - - org.springframework - spring-context - ${org.springframework-version} - - - - commons-logging - commons-logging - - - - - org.springframework - spring-webmvc - ${org.springframework-version} - - - - org.springframework.security - spring-security-web - ${springframework-security.version} - - - org.springframework.security - spring-security-config - ${springframework-security.version} - - - - org.thymeleaf - thymeleaf - ${org.thymeleaf-version} - - - org.thymeleaf - thymeleaf-spring4 - ${org.thymeleaf-version} - - - - nz.net.ultraq.thymeleaf - thymeleaf-layout-dialect - ${thymeleaf-layout-dialect.version} - - - org.thymeleaf.extras - thymeleaf-extras-java8time - ${org.thymeleaf.extras-version} - - - org.slf4j - jcl-over-slf4j - ${org.slf4j.version} - - - - - javax.servlet - javax.servlet-api - ${javax.servlet-version} - provided - - - - javax.validation - validation-api - ${javax.validation-version} - - - org.hibernate - hibernate-validator - ${hibernate-validator.version} - - + + 2.6 + 1.6.1 + 2.2 + - - org.springframework - spring-test - ${org.springframework-version} - test - + + + + org.springframework + spring-context + ${org.springframework-version} + + + + commons-logging + commons-logging + + + + + org.springframework + spring-webmvc + ${org.springframework-version} + + + + org.springframework.security + spring-security-web + ${springframework-security.version} + + + org.springframework.security + spring-security-config + ${springframework-security.version} + + + + org.thymeleaf + thymeleaf + ${org.thymeleaf-version} + + + org.thymeleaf + thymeleaf-spring4 + ${org.thymeleaf-version} + + + + nz.net.ultraq.thymeleaf + thymeleaf-layout-dialect + ${thymeleaf-layout-dialect.version} + + + org.thymeleaf.extras + thymeleaf-extras-java8time + ${org.thymeleaf.extras-version} + + + + javax.servlet + javax.servlet-api + ${javax.servlet-version} + provided + + + + javax.validation + validation-api + ${javax.validation-version} + + + org.hibernate + hibernate-validator + ${hibernate-validator.version} + + - - - org.springframework.security - spring-security-test - ${springframework-security.version} - test - - + + org.springframework + spring-test + ${org.springframework-version} + test + - - - - org.apache.maven.plugins - maven-war-plugin - ${maven-war-plugin.version} - - false - - - - org.codehaus.cargo - cargo-maven2-plugin - ${cargo-maven2-plugin.version} - - true - - jetty8x - embedded - - - - - - 8082 - - - - - - org.apache.tomcat.maven - tomcat7-maven-plugin - ${tomcat7-maven-plugin.version} - - - tomcat-run - - exec-war-only - - package - - / - false - webapp.jar - utf-8 - - - - - - + + + org.springframework.security + spring-security-test + ${springframework-security.version} + test + + - - - integration - - - - org.apache.maven.plugins - maven-surefire-plugin - - - integration-test - - test - - - - **/*LiveTest.java - - - **/*IntegrationTest.java - - - - - - - json - - - - - - - + + + + org.apache.maven.plugins + maven-war-plugin + ${maven-war-plugin.version} + + false + + + + org.codehaus.cargo + cargo-maven2-plugin + ${cargo-maven2-plugin.version} + + true + + jetty8x + embedded + + + + + + 8082 + + + + + + org.apache.tomcat.maven + tomcat7-maven-plugin + ${tomcat7-maven-plugin.version} + + + tomcat-run + + exec-war-only + + package + + / + false + webapp.jar + utf-8 + + + + + + + + + + integration + + + + org.apache.maven.plugins + maven-surefire-plugin + + + integration-test + + test + + + + **/*LiveTest.java + + + **/*IntegrationTest.java + + + + + + + json + + + + + + + \ No newline at end of file diff --git a/spring-userservice/pom.xml b/spring-userservice/pom.xml index a355759c53..72a4f0edac 100644 --- a/spring-userservice/pom.xml +++ b/spring-userservice/pom.xml @@ -1,17 +1,18 @@ - - 4.0.0 - spring-userservice - spring-userservice - 0.0.1-SNAPSHOT - war - + + 4.0.0 + spring-userservice + spring-userservice + 0.0.1-SNAPSHOT + war + com.baeldung parent-modules 1.0.0-SNAPSHOT - - - + + + @@ -102,26 +103,6 @@ test - - org.hamcrest - hamcrest-core - ${org.hamcrest.version} - test - - - org.hamcrest - hamcrest-library - ${org.hamcrest.version} - test - - - - org.mockito - mockito-core - ${mockito.version} - test - - org.springframework spring-core @@ -131,7 +112,7 @@ commons-logging commons-logging - + org.springframework @@ -143,24 +124,24 @@ spring-webmvc ${org.springframework.version} - - + + org.springframework.security spring-security-core ${org.springframework.security.version} - - + + org.springframework.security spring-security-web ${org.springframework.security.version} - - + + org.springframework.security spring-security-config ${org.springframework.security.version} - - - + + + org.apache.derby derby ${derby.version} @@ -196,21 +177,21 @@ ${jstl-api.version} - org.springframework.boot - spring-boot-test - ${spring-boot.version} + org.springframework.boot + spring-boot-test + ${spring-boot.version} - org.springframework.boot - spring-boot - ${spring-boot.version} + org.springframework.boot + spring-boot + ${spring-boot.version} - javax.servlet - javax.servlet-api - ${javax.servlet.version} + javax.servlet + javax.servlet-api + ${javax.servlet.version} - + spring-userservice @@ -223,7 +204,7 @@ - + org.apache.maven.plugins maven-war-plugin ${maven-war-plugin.version} @@ -280,27 +261,23 @@ 1.10.5.RELEASE 1.4.193 10.13.1.1 - + 5.3.3.Final 2.2.5 1.1.2 1.2 3.1.0 - + 19.0 3.5 1.4.01 - - - 1.3 - 1.10.19 2.6 - - + + \ No newline at end of file diff --git a/spring-zuul/pom.xml b/spring-zuul/pom.xml index 02fe589a3a..e1a551bc84 100644 --- a/spring-zuul/pom.xml +++ b/spring-zuul/pom.xml @@ -1,4 +1,5 @@ - + 4.0.0 com.baeldung spring-zuul @@ -8,11 +9,12 @@ pom - org.springframework.boot - spring-boot-starter-parent - 1.4.4.RELEASE + parent-boot-4 + com.baeldung + 0.0.1-SNAPSHOT + ../parent-boot-4 - + spring-zuul-foos-resource spring-zuul-ui @@ -23,16 +25,6 @@ - - org.apache.maven.plugins - maven-compiler-plugin - ${maven-compiler-plugin.version} - - 1.8 - 1.8 - - - org.apache.maven.plugins maven-war-plugin @@ -42,21 +34,6 @@ - - org.apache.maven.plugins - maven-surefire-plugin - - true - - **/*IntegrationTest.java - **/*LiveTest.java - - - - - - - @@ -69,13 +46,8 @@ 3.5 - - 2.9.0 - - 3.6.0 2.6 - 2.19.1 diff --git a/spring-zuul/spring-zuul-foos-resource/pom.xml b/spring-zuul/spring-zuul-foos-resource/pom.xml index 56ca1959ca..68c3df683d 100644 --- a/spring-zuul/spring-zuul-foos-resource/pom.xml +++ b/spring-zuul/spring-zuul-foos-resource/pom.xml @@ -1,29 +1,29 @@ - 4.0.0 - spring-zuul-foos-resource - spring-zuul-foos-resource - war + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + spring-zuul-foos-resource + spring-zuul-foos-resource + war - - com.baeldung - spring-zuul - 1.0.0-SNAPSHOT - + + com.baeldung + spring-zuul + 1.0.0-SNAPSHOT + - - - org.springframework.boot - spring-boot-starter-web - - - - org.apache.commons - commons-lang3 - ${commons-lang3.version} - - - + + + org.springframework.boot + spring-boot-starter-web + + + + org.apache.commons + commons-lang3 + ${commons-lang3.version} + + + spring-zuul-foos-resource diff --git a/spring-zuul/spring-zuul-ui/pom.xml b/spring-zuul/spring-zuul-ui/pom.xml index f337ed32ba..8bd09cf74f 100644 --- a/spring-zuul/spring-zuul-ui/pom.xml +++ b/spring-zuul/spring-zuul-ui/pom.xml @@ -1,4 +1,5 @@ - + 4.0.0 spring-zuul-ui @@ -10,8 +11,8 @@ spring-zuul 1.0.0-SNAPSHOT - - + + @@ -19,14 +20,11 @@ spring-cloud-starter-zuul ${spring-cloud.version} - + - - + + org.springframework.boot spring-boot-starter-web @@ -35,18 +33,12 @@ org.springframework.boot spring-boot-starter-thymeleaf - + org.springframework spring-test test - - - junit - junit - test - org.hamcrest @@ -65,20 +57,8 @@ test - - com.jayway.restassured - rest-assured - ${rest-assured.version} - test - - - commons-logging - commons-logging - - - - + spring-zuul-ui @@ -87,18 +67,5 @@ true - - - org.apache.maven.plugins - maven-surefire-plugin - - - **/*LiveTest.java - - - - - - \ No newline at end of file diff --git a/spring-zuul/spring-zuul-ui/src/test/java/org/baeldung/web/LiveTest.java b/spring-zuul/spring-zuul-ui/src/test/java/org/baeldung/web/LiveTest.java index 7ced527778..38563cdbe8 100644 --- a/spring-zuul/spring-zuul-ui/src/test/java/org/baeldung/web/LiveTest.java +++ b/spring-zuul/spring-zuul-ui/src/test/java/org/baeldung/web/LiveTest.java @@ -4,8 +4,8 @@ import static org.junit.Assert.assertEquals; import org.junit.Test; -import com.jayway.restassured.RestAssured; -import com.jayway.restassured.response.Response; +import io.restassured.RestAssured; +import io.restassured.response.Response; public class LiveTest { diff --git a/stripe/pom.xml b/stripe/pom.xml index 5bb3d4207a..7823a1827f 100644 --- a/stripe/pom.xml +++ b/stripe/pom.xml @@ -12,18 +12,12 @@ Demo project for Stripe API - org.springframework.boot - spring-boot-starter-parent - 1.5.2.RELEASE - + parent-boot-5 + com.baeldung + 0.0.1-SNAPSHOT + ../parent-boot-5 - - UTF-8 - UTF-8 - 1.8 - - org.springframework.boot @@ -47,20 +41,6 @@ stripe-java 4.2.0 - - - org.springframework.boot - spring-boot-starter-test - test - - - - - org.springframework.boot - spring-boot-maven-plugin - - - diff --git a/struts2/pom.xml b/struts2/pom.xml index 45150d15fd..8ccd9529bd 100644 --- a/struts2/pom.xml +++ b/struts2/pom.xml @@ -1,67 +1,67 @@ - 4.0.0 - com.baeldung - struts - 0.0.1-SNAPSHOT - pom - struts + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + com.baeldung + struts + 0.0.1-SNAPSHOT + pom + struts - - com.baeldung - parent-modules - 1.0.0-SNAPSHOT - - - - src/main/java - - - src/main/resources - - - - - - maven-war-plugin - 3.0.0 - - WebContent - - - - - - - org.apache.struts - struts2-core - 2.5.5 - - - org.apache.struts - struts2-junit-plugin - 2.5.5 - - - org.apache.struts - struts2-convention-plugin - 2.5.8 - - - javax.servlet - javax.servlet-api - 3.0.1 - - - org.springframework - spring-core - 4.3.6.RELEASE - - - commons-logging - commons-logging - - - - + + com.baeldung + parent-modules + 1.0.0-SNAPSHOT + + + + src/main/java + + + src/main/resources + + + + + + maven-war-plugin + 3.0.0 + + WebContent + + + + + + + org.apache.struts + struts2-core + 2.5.5 + + + org.apache.struts + struts2-junit-plugin + 2.5.5 + + + org.apache.struts + struts2-convention-plugin + 2.5.8 + + + javax.servlet + javax.servlet-api + 3.0.1 + + + org.springframework + spring-core + 4.3.6.RELEASE + + + commons-logging + commons-logging + + + + \ No newline at end of file diff --git a/testing/pom.xml b/testing/pom.xml index a7c2831872..0bc70bdb96 100644 --- a/testing/pom.xml +++ b/testing/pom.xml @@ -1,5 +1,5 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 com.baeldung testing @@ -10,8 +10,8 @@ com.baeldung parent-modules 1.0.0-SNAPSHOT - - + + com.google.guava @@ -24,12 +24,6 @@ 3.0.0 - - org.hamcrest - hamcrest-library - ${hamcrest.library.version} - test - org.assertj assertj-core @@ -117,7 +111,6 @@ - 1.3 1.2.5 1.1.10 0.7.7.201606060606 diff --git a/testing/src/test/java/com/baeldung/mutation/test/TestPalindrome.java b/testing/src/test/java/com/baeldung/mutation/test/PalindromeUnitTest.java similarity index 96% rename from testing/src/test/java/com/baeldung/mutation/test/TestPalindrome.java rename to testing/src/test/java/com/baeldung/mutation/test/PalindromeUnitTest.java index 11ed966b16..5321735469 100644 --- a/testing/src/test/java/com/baeldung/mutation/test/TestPalindrome.java +++ b/testing/src/test/java/com/baeldung/mutation/test/PalindromeUnitTest.java @@ -7,7 +7,7 @@ import org.junit.Test; import com.baeldung.testing.mutation.Palindrome; -public class TestPalindrome { +public class PalindromeUnitTest { @Test public void whenEmptyString_thanAccept() { Palindrome palindromeTester = new Palindrome(); diff --git a/testing/src/test/java/com/baeldung/testing/assertj/AssertJCoreTest.java b/testing/src/test/java/com/baeldung/testing/assertj/AssertJCoreUnitTest.java similarity index 99% rename from testing/src/test/java/com/baeldung/testing/assertj/AssertJCoreTest.java rename to testing/src/test/java/com/baeldung/testing/assertj/AssertJCoreUnitTest.java index 2e95355df5..6836bb79c5 100644 --- a/testing/src/test/java/com/baeldung/testing/assertj/AssertJCoreTest.java +++ b/testing/src/test/java/com/baeldung/testing/assertj/AssertJCoreUnitTest.java @@ -14,7 +14,7 @@ import java.util.NoSuchElementException; import static org.assertj.core.api.Assertions.*; -public class AssertJCoreTest { +public class AssertJCoreUnitTest { @Test public void whenComparingReferences_thenNotEqual() throws Exception { diff --git a/testing/src/test/java/com/baeldung/testing/assertj/AssertJGuavaTest.java b/testing/src/test/java/com/baeldung/testing/assertj/AssertJGuavaUnitTest.java similarity index 98% rename from testing/src/test/java/com/baeldung/testing/assertj/AssertJGuavaTest.java rename to testing/src/test/java/com/baeldung/testing/assertj/AssertJGuavaUnitTest.java index d226c3fce9..2056d7e61a 100644 --- a/testing/src/test/java/com/baeldung/testing/assertj/AssertJGuavaTest.java +++ b/testing/src/test/java/com/baeldung/testing/assertj/AssertJGuavaUnitTest.java @@ -19,7 +19,7 @@ import java.util.HashSet; import static org.assertj.guava.api.Assertions.assertThat; import static org.assertj.guava.api.Assertions.entry; -public class AssertJGuavaTest { +public class AssertJGuavaUnitTest { @Test public void givenTwoEmptyFiles_whenComparingContent_thenEqual() throws Exception { diff --git a/testing/src/test/java/com/baeldung/testing/assertj/AssertJJava8Test.java b/testing/src/test/java/com/baeldung/testing/assertj/AssertJJava8UnitTest.java similarity index 99% rename from testing/src/test/java/com/baeldung/testing/assertj/AssertJJava8Test.java rename to testing/src/test/java/com/baeldung/testing/assertj/AssertJJava8UnitTest.java index a671a49da1..7ec6d0caa7 100644 --- a/testing/src/test/java/com/baeldung/testing/assertj/AssertJJava8Test.java +++ b/testing/src/test/java/com/baeldung/testing/assertj/AssertJJava8UnitTest.java @@ -14,7 +14,7 @@ import static java.time.LocalDate.ofYearDay; import static java.util.Arrays.asList; import static org.assertj.core.api.Assertions.assertThat; -public class AssertJJava8Test { +public class AssertJJava8UnitTest { @Test public void givenOptional_shouldAssert() throws Exception { diff --git a/testng/pom.xml b/testng/pom.xml index 9add13baca..3defe4ce65 100644 --- a/testng/pom.xml +++ b/testng/pom.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 com.baeldung testng @@ -12,8 +12,8 @@ com.baeldung parent-modules 1.0.0-SNAPSHOT - - + + diff --git a/testng/src/test/java/baeldung/com/DependentTests.java b/testng/src/test/java/baeldung/com/DependentUnitTest.java similarity index 87% rename from testng/src/test/java/baeldung/com/DependentTests.java rename to testng/src/test/java/baeldung/com/DependentUnitTest.java index 8d3bbfc11b..315014f1cf 100644 --- a/testng/src/test/java/baeldung/com/DependentTests.java +++ b/testng/src/test/java/baeldung/com/DependentUnitTest.java @@ -5,9 +5,9 @@ import org.slf4j.LoggerFactory; import org.testng.Assert; import org.testng.annotations.Test; -public class DependentTests { +public class DependentUnitTest { - private static final Logger LOGGER = LoggerFactory.getLogger(DependentTests.class); + private static final Logger LOGGER = LoggerFactory.getLogger(DependentUnitTest.class); private String email = "abc@qwe.com"; diff --git a/testng/src/test/java/baeldung/com/TestGroup.java b/testng/src/test/java/baeldung/com/GroupIntegrationTest.java similarity index 92% rename from testng/src/test/java/baeldung/com/TestGroup.java rename to testng/src/test/java/baeldung/com/GroupIntegrationTest.java index a592000bed..8bb389aeae 100644 --- a/testng/src/test/java/baeldung/com/TestGroup.java +++ b/testng/src/test/java/baeldung/com/GroupIntegrationTest.java @@ -4,7 +4,7 @@ import org.testng.annotations.AfterGroups; import org.testng.annotations.BeforeGroups; import org.testng.annotations.Test; -public class TestGroup { +public class GroupIntegrationTest { @BeforeGroups("database") public void setupDB() { diff --git a/testng/src/test/java/baeldung/com/MultiThreadedTests.java b/testng/src/test/java/baeldung/com/MultiThreadedIntegrationTest.java similarity index 84% rename from testng/src/test/java/baeldung/com/MultiThreadedTests.java rename to testng/src/test/java/baeldung/com/MultiThreadedIntegrationTest.java index 4476eaa7a0..fc6c45ff55 100644 --- a/testng/src/test/java/baeldung/com/MultiThreadedTests.java +++ b/testng/src/test/java/baeldung/com/MultiThreadedIntegrationTest.java @@ -3,7 +3,7 @@ package baeldung.com; import org.testng.Assert; import org.testng.annotations.Test; -public class MultiThreadedTests { +public class MultiThreadedIntegrationTest { @Test(threadPoolSize = 5, invocationCount = 10, timeOut = 1000) public void givenMethod_whenRunInThreads_thenCorrect() { diff --git a/testng/src/test/java/baeldung/com/ParametrizedTests.java b/testng/src/test/java/baeldung/com/ParametrizedUnitTest.java similarity index 93% rename from testng/src/test/java/baeldung/com/ParametrizedTests.java rename to testng/src/test/java/baeldung/com/ParametrizedUnitTest.java index 693a1b5cde..cf12d879de 100644 --- a/testng/src/test/java/baeldung/com/ParametrizedTests.java +++ b/testng/src/test/java/baeldung/com/ParametrizedUnitTest.java @@ -7,9 +7,9 @@ import org.testng.annotations.DataProvider; import org.testng.annotations.Parameters; import org.testng.annotations.Test; -public class ParametrizedTests { +public class ParametrizedUnitTest { - private static final Logger LOGGER = LoggerFactory.getLogger(ParametrizedTests.class); + private static final Logger LOGGER = LoggerFactory.getLogger(ParametrizedUnitTest.class); @Test @Parameters({"value", "isEven"}) diff --git a/testng/src/test/java/baeldung/com/PriorityTest.java b/testng/src/test/java/baeldung/com/PriorityUnitTest.java similarity index 93% rename from testng/src/test/java/baeldung/com/PriorityTest.java rename to testng/src/test/java/baeldung/com/PriorityUnitTest.java index d014d5c920..4985cbaf55 100644 --- a/testng/src/test/java/baeldung/com/PriorityTest.java +++ b/testng/src/test/java/baeldung/com/PriorityUnitTest.java @@ -3,7 +3,7 @@ package baeldung.com; import org.testng.Assert; import org.testng.annotations.Test; -public class PriorityTest { +public class PriorityUnitTest { private String testString = "10"; private int testInt = 23; diff --git a/testng/src/test/java/baeldung/com/RegistrationTest.java b/testng/src/test/java/baeldung/com/RegistrationUnitTest.java similarity index 78% rename from testng/src/test/java/baeldung/com/RegistrationTest.java rename to testng/src/test/java/baeldung/com/RegistrationUnitTest.java index e9d744902b..663bb9c738 100644 --- a/testng/src/test/java/baeldung/com/RegistrationTest.java +++ b/testng/src/test/java/baeldung/com/RegistrationUnitTest.java @@ -4,8 +4,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.Test; -public class RegistrationTest { - private static final Logger LOGGER = LoggerFactory.getLogger(RegistrationTest.class); +public class RegistrationUnitTest { + private static final Logger LOGGER = LoggerFactory.getLogger(RegistrationUnitTest.class); @Test public void whenCalledFromSuite_thanOK() { diff --git a/testng/src/test/java/baeldung/com/SignInTest.java b/testng/src/test/java/baeldung/com/SignInUnitTest.java similarity index 80% rename from testng/src/test/java/baeldung/com/SignInTest.java rename to testng/src/test/java/baeldung/com/SignInUnitTest.java index d5cad78de0..85ccd43095 100644 --- a/testng/src/test/java/baeldung/com/SignInTest.java +++ b/testng/src/test/java/baeldung/com/SignInUnitTest.java @@ -4,8 +4,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.Test; -public class SignInTest { - private static final Logger LOGGER = LoggerFactory.getLogger(SignInTest.class); +public class SignInUnitTest { + private static final Logger LOGGER = LoggerFactory.getLogger(SignInUnitTest.class); @Test public void whenCalledFromSuite_thanOK() { diff --git a/testng/src/test/java/baeldung/com/SimpleTest.java b/testng/src/test/java/baeldung/com/SimpleUnitTest.java similarity index 86% rename from testng/src/test/java/baeldung/com/SimpleTest.java rename to testng/src/test/java/baeldung/com/SimpleUnitTest.java index 24bf3a6f01..a46ee90ce2 100644 --- a/testng/src/test/java/baeldung/com/SimpleTest.java +++ b/testng/src/test/java/baeldung/com/SimpleUnitTest.java @@ -6,7 +6,7 @@ import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; -public class SimpleTest extends TestNG { +public class SimpleUnitTest extends TestNG { private int number; @BeforeClass diff --git a/testng/src/test/java/baeldung/com/SummationServiceTest.java b/testng/src/test/java/baeldung/com/SummationServiceIntegrationTest.java similarity index 92% rename from testng/src/test/java/baeldung/com/SummationServiceTest.java rename to testng/src/test/java/baeldung/com/SummationServiceIntegrationTest.java index ceed53ca42..f8c9bdff43 100644 --- a/testng/src/test/java/baeldung/com/SummationServiceTest.java +++ b/testng/src/test/java/baeldung/com/SummationServiceIntegrationTest.java @@ -9,8 +9,8 @@ import org.testng.annotations.*; import java.util.ArrayList; import java.util.List; -public class SummationServiceTest extends TestNG { - private static final Logger LOGGER = LoggerFactory.getLogger(DependentTests.class); +public class SummationServiceIntegrationTest extends TestNG { + private static final Logger LOGGER = LoggerFactory.getLogger(DependentUnitTest.class); private List numbers; diff --git a/testng/src/test/java/baeldung/com/TimeOutTest.java b/testng/src/test/java/baeldung/com/TimeOutIntegrationTest.java similarity index 79% rename from testng/src/test/java/baeldung/com/TimeOutTest.java rename to testng/src/test/java/baeldung/com/TimeOutIntegrationTest.java index f84367a972..92ea847bcf 100644 --- a/testng/src/test/java/baeldung/com/TimeOutTest.java +++ b/testng/src/test/java/baeldung/com/TimeOutIntegrationTest.java @@ -2,7 +2,7 @@ package baeldung.com; import org.testng.annotations.Test; -public class TimeOutTest { +public class TimeOutIntegrationTest { @Test(timeOut = 1000, enabled = false) public void givenExecution_takeMoreTime_thenFail() { diff --git a/testng/src/test/resources/parametrized_testng.xml b/testng/src/test/resources/parametrized_testng.xml index c8ec7209f8..bd70945457 100644 --- a/testng/src/test/resources/parametrized_testng.xml +++ b/testng/src/test/resources/parametrized_testng.xml @@ -7,7 +7,7 @@ - + \ No newline at end of file diff --git a/testng/src/test/resources/test_group.xml b/testng/src/test/resources/test_group.xml index 77edb85cdc..c656e6145d 100644 --- a/testng/src/test/resources/test_group.xml +++ b/testng/src/test/resources/test_group.xml @@ -7,7 +7,7 @@ - + \ No newline at end of file diff --git a/testng/src/test/resources/test_setup.xml b/testng/src/test/resources/test_setup.xml index 9197f9fd0e..2e466c91cc 100644 --- a/testng/src/test/resources/test_setup.xml +++ b/testng/src/test/resources/test_setup.xml @@ -7,7 +7,7 @@ - + diff --git a/testng/src/test/resources/test_suite.xml b/testng/src/test/resources/test_suite.xml index 4d0b17cbe8..fb92b4f61b 100644 --- a/testng/src/test/resources/test_suite.xml +++ b/testng/src/test/resources/test_suite.xml @@ -5,9 +5,9 @@ - - - + + + \ No newline at end of file diff --git a/vertx/pom.xml b/vertx/pom.xml index 784a6c26b3..0498c6ad60 100644 --- a/vertx/pom.xml +++ b/vertx/pom.xml @@ -1,76 +1,76 @@ - 4.0.0 - - com.baeldung - parent-modules - 1.0.0-SNAPSHOT - - com.baeldung - vertx - 1.0-SNAPSHOT - vertx - http://maven.apache.org - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" + xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + 4.0.0 + + com.baeldung + parent-modules + 1.0.0-SNAPSHOT + + com.baeldung + vertx + 1.0-SNAPSHOT + vertx + http://maven.apache.org + - - io.vertx - vertx-core - 3.0.0 - + + io.vertx + vertx-core + 3.0.0 + - - io.vertx - vertx-web - 3.0.0 - + + io.vertx + vertx-web + 3.0.0 + - - io.vertx - vertx-unit - 3.0.0 - test - - + + io.vertx + vertx-unit + 3.0.0 + test + + - - - - org.apache.maven.plugins - maven-shade-plugin - 2.3 - - - package - - shade - - - - - - io.vertx.core.Starter - com.baeldung.SimpleServerVerticle - - - - - ${project.build.directory}/${project.artifactId}-${project.version}-app.jar - - - - - - - - + + + + org.apache.maven.plugins + maven-shade-plugin + 2.3 + + + package + + shade + + + + + + io.vertx.core.Starter + com.baeldung.SimpleServerVerticle + + + + + ${project.build.directory}/${project.artifactId}-${project.version}-app.jar + + + + + + + + 6.10 - + diff --git a/video-tutorials/jackson-annotations/pom.xml b/video-tutorials/jackson-annotations/pom.xml index c4c66ddb44..853c84a1b8 100644 --- a/video-tutorials/jackson-annotations/pom.xml +++ b/video-tutorials/jackson-annotations/pom.xml @@ -1,17 +1,17 @@ - 4.0.0 - com.baeldung - jackson-annotations - 1.0.0-SNAPSHOT + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + com.baeldung + jackson-annotations + 1.0.0-SNAPSHOT - jacksonannotation + jacksonannotation - - com.baeldung - video-tutorials - 1.0.0-SNAPSHOT - + + com.baeldung + video-tutorials + 1.0.0-SNAPSHOT + @@ -28,7 +28,7 @@ ${commons-io.version} - + com.fasterxml.jackson.dataformat jackson-dataformat-xml @@ -98,7 +98,7 @@ commons-logging commons-logging - + @@ -123,13 +123,6 @@ test - - junit - junit - ${junit.version} - test - - org.assertj assertj-core @@ -137,26 +130,6 @@ test - - - ch.qos.logback - logback-classic - ${logback.version} - - - - - org.slf4j - slf4j-api - ${org.slf4j.version} - - - - org.slf4j - jcl-over-slf4j - ${org.slf4j.version} - - @@ -168,25 +141,6 @@ - - - org.apache.maven.plugins - maven-compiler-plugin - ${maven-compiler-plugin.version} - - ${maven-compiler-plugin.source} - ${maven-compiler-plugin.source} - - - - - org.apache.maven.plugins - maven-surefire-plugin - ${maven-surefire-plugin.version} - - - - @@ -198,10 +152,6 @@ 2.8.5 - - 1.7.21 - 1.1.7 - 5.1.3.Final 2.9.6 @@ -214,8 +164,6 @@ 2.5 - 1.3 - 4.12 2.2.26 4.4.1 @@ -227,16 +175,6 @@ 2.2.6 3.0.1 - - 3.5.1 - 2.6 - 2.19.1 - 2.7 - 1.4.18 - - UTF-8 - 1.8 - diff --git a/video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/deserialization/jacksoninject/JacksonInjectTest.java b/video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/deserialization/jacksoninject/JacksonInjectUnitTest.java similarity index 96% rename from video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/deserialization/jacksoninject/JacksonInjectTest.java rename to video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/deserialization/jacksoninject/JacksonInjectUnitTest.java index e6c12f14a6..2ea90f9c40 100644 --- a/video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/deserialization/jacksoninject/JacksonInjectTest.java +++ b/video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/deserialization/jacksoninject/JacksonInjectUnitTest.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Alex Theedom www.baeldung.com * @version 1.0 */ -public class JacksonInjectTest { +public class JacksonInjectUnitTest { @Test public void whenDeserializingUsingJacksonInject_thenCorrect() throws IOException { diff --git a/video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/deserialization/jsonanysetter/JsonAnySetterTest.java b/video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/deserialization/jsonanysetter/JsonAnySetterUnitTest.java similarity index 97% rename from video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/deserialization/jsonanysetter/JsonAnySetterTest.java rename to video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/deserialization/jsonanysetter/JsonAnySetterUnitTest.java index 3d49d699ac..2610d9caee 100644 --- a/video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/deserialization/jsonanysetter/JsonAnySetterTest.java +++ b/video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/deserialization/jsonanysetter/JsonAnySetterUnitTest.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Alex Theedom www.baeldung.com * @version 1.0 */ -public class JsonAnySetterTest { +public class JsonAnySetterUnitTest { @Test public void whenDeserializingUsingJsonAnySetter_thenCorrect() throws IOException { diff --git a/video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/deserialization/jsoncreator/JsonCreatorTest.java b/video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/deserialization/jsoncreator/JsonCreatorUnitTest.java similarity index 96% rename from video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/deserialization/jsoncreator/JsonCreatorTest.java rename to video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/deserialization/jsoncreator/JsonCreatorUnitTest.java index b40c639042..1b1986417d 100644 --- a/video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/deserialization/jsoncreator/JsonCreatorTest.java +++ b/video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/deserialization/jsoncreator/JsonCreatorUnitTest.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Alex Theedom www.baeldung.com * @version 1.0 */ -public class JsonCreatorTest { +public class JsonCreatorUnitTest { @Test public void whenDeserializingUsingJsonCreator_thenCorrect() throws IOException { diff --git a/video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/deserialization/jsondeserialize/JsonDeserializeTest.java b/video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/deserialization/jsondeserialize/JsonDeserializeUnitTest.java similarity index 96% rename from video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/deserialization/jsondeserialize/JsonDeserializeTest.java rename to video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/deserialization/jsondeserialize/JsonDeserializeUnitTest.java index 77dde1b59b..f7b143c234 100644 --- a/video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/deserialization/jsondeserialize/JsonDeserializeTest.java +++ b/video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/deserialization/jsondeserialize/JsonDeserializeUnitTest.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Alex Theedom www.baeldung.com * @version 1.0 */ -public class JsonDeserializeTest { +public class JsonDeserializeUnitTest { @Test public void whenDeserializingUsingJsonDeserialize_thenCorrect() throws IOException { diff --git a/video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/deserialization/jsonsetter/JsonSetterTest.java b/video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/deserialization/jsonsetter/JsonSetterUnitTest.java similarity index 96% rename from video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/deserialization/jsonsetter/JsonSetterTest.java rename to video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/deserialization/jsonsetter/JsonSetterUnitTest.java index 3a99c972b6..d4630259b9 100644 --- a/video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/deserialization/jsonsetter/JsonSetterTest.java +++ b/video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/deserialization/jsonsetter/JsonSetterUnitTest.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Alex Theedom www.baeldung.com * @version 1.0 */ -public class JsonSetterTest { +public class JsonSetterUnitTest { @Test public void whenDeserializingUsingJsonSetter_thenCorrect() throws IOException { diff --git a/video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/general/jsonfilter/JsonFilterTest.java b/video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/general/jsonfilter/JsonFilterUnitTest.java similarity index 97% rename from video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/general/jsonfilter/JsonFilterTest.java rename to video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/general/jsonfilter/JsonFilterUnitTest.java index cd18eed6fe..133f8b1f21 100644 --- a/video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/general/jsonfilter/JsonFilterTest.java +++ b/video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/general/jsonfilter/JsonFilterUnitTest.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Alex Theedom www.baeldung.com * @version 1.0 */ -public class JsonFilterTest { +public class JsonFilterUnitTest { @Test public void whenSerializingUsingJsonFilter_thenCorrect() throws JsonProcessingException { diff --git a/video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/general/jsonformat/JsonFormatTest.java b/video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/general/jsonformat/JsonFormatUnitTest.java similarity index 98% rename from video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/general/jsonformat/JsonFormatTest.java rename to video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/general/jsonformat/JsonFormatUnitTest.java index 8f35cf0270..373e8d716a 100644 --- a/video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/general/jsonformat/JsonFormatTest.java +++ b/video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/general/jsonformat/JsonFormatUnitTest.java @@ -19,7 +19,7 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Alex Theedom www.baeldung.com * @version 1.0 */ -public class JsonFormatTest { +public class JsonFormatUnitTest { @Test public void whenSerializingUsingJsonFormat_thenCorrect() throws JsonProcessingException, ParseException { diff --git a/video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/general/jsonidentityinfo/JsonIdentityInfoTest.java b/video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/general/jsonidentityinfo/JsonIdentityInfoUnitTest.java similarity index 97% rename from video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/general/jsonidentityinfo/JsonIdentityInfoTest.java rename to video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/general/jsonidentityinfo/JsonIdentityInfoUnitTest.java index e3e53ebdbd..d816984a21 100644 --- a/video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/general/jsonidentityinfo/JsonIdentityInfoTest.java +++ b/video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/general/jsonidentityinfo/JsonIdentityInfoUnitTest.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Alex Theedom www.baeldung.com * @version 1.0 */ -public class JsonIdentityInfoTest { +public class JsonIdentityInfoUnitTest { @Test public void whenSerializingUsingJsonIdentityInfo_thenCorrect() throws JsonProcessingException { diff --git a/video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/general/jsonproperty/JsonPropertyTest.java b/video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/general/jsonproperty/JsonPropertyUnitTest.java similarity index 98% rename from video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/general/jsonproperty/JsonPropertyTest.java rename to video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/general/jsonproperty/JsonPropertyUnitTest.java index a05c3b2294..191330be86 100644 --- a/video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/general/jsonproperty/JsonPropertyTest.java +++ b/video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/general/jsonproperty/JsonPropertyUnitTest.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Alex Theedom www.baeldung.com * @version 1.0 */ -public class JsonPropertyTest { +public class JsonPropertyUnitTest { @Test public void whenSerializingUsingJsonProperty_thenCorrect() throws JsonProcessingException { diff --git a/video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/general/jsonunwrapped/JsonUnwrappedTest.java b/video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/general/jsonunwrapped/JsonUnwrappedUnitTest.java similarity index 96% rename from video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/general/jsonunwrapped/JsonUnwrappedTest.java rename to video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/general/jsonunwrapped/JsonUnwrappedUnitTest.java index 6fff64c64e..528a901d34 100644 --- a/video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/general/jsonunwrapped/JsonUnwrappedTest.java +++ b/video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/general/jsonunwrapped/JsonUnwrappedUnitTest.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Alex Theedom www.baeldung.com * @version 1.0 */ -public class JsonUnwrappedTest { +public class JsonUnwrappedUnitTest { @Test public void whenSerializingUsingJsonUnwrapped_thenCorrect() throws JsonProcessingException { diff --git a/video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/general/jsonview/JsonViewTest.java b/video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/general/jsonview/JsonViewUnitTest.java similarity index 98% rename from video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/general/jsonview/JsonViewTest.java rename to video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/general/jsonview/JsonViewUnitTest.java index 3e06b0f669..c521136b79 100644 --- a/video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/general/jsonview/JsonViewTest.java +++ b/video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/general/jsonview/JsonViewUnitTest.java @@ -13,7 +13,7 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Alex Theedom www.baeldung.com * @version 1.0 */ -public class JsonViewTest { +public class JsonViewUnitTest { @Test public void whenSerializingUsingJsonView_andInternalView_thenCorrect() throws JsonProcessingException { diff --git a/video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/general/reference/ReferenceTest.java b/video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/general/reference/ReferenceUnitTest.java similarity index 97% rename from video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/general/reference/ReferenceTest.java rename to video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/general/reference/ReferenceUnitTest.java index 34b223c98f..39c145f7ed 100644 --- a/video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/general/reference/ReferenceTest.java +++ b/video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/general/reference/ReferenceUnitTest.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Alex Theedom www.baeldung.com * @version 1.0 */ -public class ReferenceTest { +public class ReferenceUnitTest { @Test public void whenSerializingUsingReference_thenCorrect() throws JsonProcessingException { diff --git a/video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/inclusion/jsonautodetect/JsonAutoDetectTest.java b/video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/inclusion/jsonautodetect/JsonAutoDetectUnitTest.java similarity index 97% rename from video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/inclusion/jsonautodetect/JsonAutoDetectTest.java rename to video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/inclusion/jsonautodetect/JsonAutoDetectUnitTest.java index 87d3e7ddbf..286059d55a 100644 --- a/video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/inclusion/jsonautodetect/JsonAutoDetectTest.java +++ b/video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/inclusion/jsonautodetect/JsonAutoDetectUnitTest.java @@ -13,7 +13,7 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Alex Theedom www.baeldung.com * @version 1.0 */ -public class JsonAutoDetectTest { +public class JsonAutoDetectUnitTest { @Test public void whenSerializingUsingJsonAutoDetect_thenCorrect() throws JsonProcessingException { diff --git a/video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/inclusion/jsonignore/JsonIgnoreTest.java b/video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/inclusion/jsonignore/JsonIgnoreUnitTest.java similarity index 96% rename from video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/inclusion/jsonignore/JsonIgnoreTest.java rename to video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/inclusion/jsonignore/JsonIgnoreUnitTest.java index eeff2069b6..39f8613385 100644 --- a/video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/inclusion/jsonignore/JsonIgnoreTest.java +++ b/video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/inclusion/jsonignore/JsonIgnoreUnitTest.java @@ -13,7 +13,7 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Alex Theedom www.baeldung.com * @version 1.0 */ -public class JsonIgnoreTest { +public class JsonIgnoreUnitTest { @Test public void whenSerializingUsingJsonIgnore_thenCorrect() throws JsonProcessingException { diff --git a/video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/inclusion/jsonignoreproperties/JsonIgnorePropertiesTest.java b/video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/inclusion/jsonignoreproperties/JsonIgnorePropertiesUnitTest.java similarity index 97% rename from video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/inclusion/jsonignoreproperties/JsonIgnorePropertiesTest.java rename to video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/inclusion/jsonignoreproperties/JsonIgnorePropertiesUnitTest.java index f0e6f1b684..115bd3358f 100644 --- a/video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/inclusion/jsonignoreproperties/JsonIgnorePropertiesTest.java +++ b/video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/inclusion/jsonignoreproperties/JsonIgnorePropertiesUnitTest.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Alex Theedom www.baeldung.com * @version 1.0 */ -public class JsonIgnorePropertiesTest { +public class JsonIgnorePropertiesUnitTest { @Test public void whenSerializingUsingJsonIgnoreProperties_thenCorrect() throws JsonProcessingException { diff --git a/video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/inclusion/jsonignoretype/JsonIgnoreTypeTest.java b/video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/inclusion/jsonignoretype/JsonIgnoreTypeUnitTest.java similarity index 96% rename from video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/inclusion/jsonignoretype/JsonIgnoreTypeTest.java rename to video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/inclusion/jsonignoretype/JsonIgnoreTypeUnitTest.java index dbb12b46d5..f615fb1726 100644 --- a/video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/inclusion/jsonignoretype/JsonIgnoreTypeTest.java +++ b/video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/inclusion/jsonignoretype/JsonIgnoreTypeUnitTest.java @@ -13,7 +13,7 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Alex Theedom www.baeldung.com * @version 1.0 */ -public class JsonIgnoreTypeTest { +public class JsonIgnoreTypeUnitTest { @Test public void whenSerializingUsingJsonIgnoreType_thenCorrect() throws JsonProcessingException { diff --git a/video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/inclusion/jsoninclude/JsonIncludeTest.java b/video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/inclusion/jsoninclude/JsonIncludeUnitTest.java similarity index 96% rename from video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/inclusion/jsoninclude/JsonIncludeTest.java rename to video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/inclusion/jsoninclude/JsonIncludeUnitTest.java index 7d24d006e8..79ab03d4f3 100644 --- a/video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/inclusion/jsoninclude/JsonIncludeTest.java +++ b/video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/inclusion/jsoninclude/JsonIncludeUnitTest.java @@ -13,7 +13,7 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Alex Theedom www.baeldung.com * @version 1.0 */ -public class JsonIncludeTest { +public class JsonIncludeUnitTest { @Test public void whenSerializingUsingJsonInclude_thenCorrect() throws JsonProcessingException { diff --git a/video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/miscellaneous/custom/CustomTest.java b/video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/miscellaneous/custom/CustomUnitTest.java similarity index 97% rename from video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/miscellaneous/custom/CustomTest.java rename to video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/miscellaneous/custom/CustomUnitTest.java index aa885d6804..4cc2ec891f 100644 --- a/video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/miscellaneous/custom/CustomTest.java +++ b/video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/miscellaneous/custom/CustomUnitTest.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Alex Theedom www.baeldung.com * @version 1.0 */ -public class CustomTest { +public class CustomUnitTest { @Test public void whenSerializingUsingCustom_thenCorrect() throws JsonProcessingException { diff --git a/video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/miscellaneous/disable/DisableTest.java b/video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/miscellaneous/disable/DisableUnitTest.java similarity index 97% rename from video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/miscellaneous/disable/DisableTest.java rename to video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/miscellaneous/disable/DisableUnitTest.java index b66adea8c8..8b4752d707 100644 --- a/video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/miscellaneous/disable/DisableTest.java +++ b/video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/miscellaneous/disable/DisableUnitTest.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Alex Theedom www.baeldung.com * @version 1.0 */ -public class DisableTest { +public class DisableUnitTest { @Test public void whenSerializingUsingDisable_thenCorrect() throws JsonProcessingException { diff --git a/video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/miscellaneous/mixin/MixInTest.java b/video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/miscellaneous/mixin/MixInUnitTest.java similarity index 97% rename from video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/miscellaneous/mixin/MixInTest.java rename to video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/miscellaneous/mixin/MixInUnitTest.java index 7c021e5a4f..a0ce8cb4bf 100644 --- a/video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/miscellaneous/mixin/MixInTest.java +++ b/video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/miscellaneous/mixin/MixInUnitTest.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Alex Theedom www.baeldung.com * @version 1.0 */ -public class MixInTest { +public class MixInUnitTest { @Test public void whenSerializingUsingMixIn_thenCorrect() throws JsonProcessingException { diff --git a/video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/polymorphism/PolymorphismTest.java b/video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/polymorphism/PolymorphismUnitTest.java similarity index 98% rename from video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/polymorphism/PolymorphismTest.java rename to video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/polymorphism/PolymorphismUnitTest.java index 702c39eb11..c3f36e162e 100644 --- a/video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/polymorphism/PolymorphismTest.java +++ b/video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/polymorphism/PolymorphismUnitTest.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Alex Theedom www.baeldung.com * @version 1.0 */ -public class PolymorphismTest { +public class PolymorphismUnitTest { @Test public void whenSerializingUsingPolymorphism_thenCorrect() throws JsonProcessingException { diff --git a/video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/serialization/jsonanygetter/JsonAnyGetterTest.java b/video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/serialization/jsonanygetter/JsonAnyGetterUnitTest.java similarity index 97% rename from video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/serialization/jsonanygetter/JsonAnyGetterTest.java rename to video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/serialization/jsonanygetter/JsonAnyGetterUnitTest.java index efbc271b2a..df3272bc39 100644 --- a/video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/serialization/jsonanygetter/JsonAnyGetterTest.java +++ b/video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/serialization/jsonanygetter/JsonAnyGetterUnitTest.java @@ -15,7 +15,7 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Alex Theedom www.baeldung.com * @version 1.0 */ -public class JsonAnyGetterTest { +public class JsonAnyGetterUnitTest { @Test public void whenSerializingUsingJsonAnyGetter_thenCorrect() throws JsonProcessingException { diff --git a/video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/serialization/jsongetter/JsonGetterTest.java b/video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/serialization/jsongetter/JsonGetterUnitTest.java similarity index 97% rename from video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/serialization/jsongetter/JsonGetterTest.java rename to video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/serialization/jsongetter/JsonGetterUnitTest.java index 4df2e98cab..9151bb9e7c 100644 --- a/video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/serialization/jsongetter/JsonGetterTest.java +++ b/video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/serialization/jsongetter/JsonGetterUnitTest.java @@ -13,7 +13,7 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Alex Theedom www.baeldung.com * @version 1.0 */ -public class JsonGetterTest { +public class JsonGetterUnitTest { @Test public void whenSerializingUsingJsonGetter_andNoPropertyNameSet_thenCorrect() throws JsonProcessingException { diff --git a/video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/serialization/jsonpropertyorder/JsonPropertyOrderTest.java b/video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/serialization/jsonpropertyorder/JsonPropertyOrderUnitTest.java similarity index 96% rename from video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/serialization/jsonpropertyorder/JsonPropertyOrderTest.java rename to video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/serialization/jsonpropertyorder/JsonPropertyOrderUnitTest.java index cfd0f5a28b..42999b5cc6 100644 --- a/video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/serialization/jsonpropertyorder/JsonPropertyOrderTest.java +++ b/video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/serialization/jsonpropertyorder/JsonPropertyOrderUnitTest.java @@ -13,7 +13,7 @@ import static org.hamcrest.MatcherAssert.assertThat; * @author Alex Theedom www.baeldung.com * @version 1.0 */ -public class JsonPropertyOrderTest { +public class JsonPropertyOrderUnitTest { @Test public void whenSerializingUsingJsonPropertyOrder_thenCorrect() throws JsonProcessingException { diff --git a/video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/serialization/jsonrawvalue/JsonRawValueTest.java b/video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/serialization/jsonrawvalue/JsonRawValueUnitTest.java similarity index 97% rename from video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/serialization/jsonrawvalue/JsonRawValueTest.java rename to video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/serialization/jsonrawvalue/JsonRawValueUnitTest.java index 9d15be149a..74990f804f 100644 --- a/video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/serialization/jsonrawvalue/JsonRawValueTest.java +++ b/video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/serialization/jsonrawvalue/JsonRawValueUnitTest.java @@ -12,7 +12,7 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Alex Theedom www.baeldung.com * @version 1.0 */ -public class JsonRawValueTest { +public class JsonRawValueUnitTest { @Test public void whenSerializingUsingJsonRawValue_thenCorrect() throws JsonProcessingException { diff --git a/video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/serialization/jsonrootname/JsonRootNameTest.java b/video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/serialization/jsonrootname/JsonRootNameUnitTest.java similarity index 97% rename from video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/serialization/jsonrootname/JsonRootNameTest.java rename to video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/serialization/jsonrootname/JsonRootNameUnitTest.java index 6d63d28eaf..86762edf55 100644 --- a/video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/serialization/jsonrootname/JsonRootNameTest.java +++ b/video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/serialization/jsonrootname/JsonRootNameUnitTest.java @@ -14,7 +14,7 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Alex Theedom www.baeldung.com * @version 1.0 */ -public class JsonRootNameTest { +public class JsonRootNameUnitTest { @Test public void whenSerializingUsingJsonRootName_thenCorrect() throws JsonProcessingException { diff --git a/video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/serialization/jsonserialize/JsonSerializeTest.java b/video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/serialization/jsonserialize/JsonSerializeUnitTest.java similarity index 97% rename from video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/serialization/jsonserialize/JsonSerializeTest.java rename to video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/serialization/jsonserialize/JsonSerializeUnitTest.java index 4b15f1f459..e6ecfa4df6 100644 --- a/video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/serialization/jsonserialize/JsonSerializeTest.java +++ b/video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/serialization/jsonserialize/JsonSerializeUnitTest.java @@ -16,7 +16,7 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Alex Theedom www.baeldung.com * @version 1.0 */ -public class JsonSerializeTest { +public class JsonSerializeUnitTest { @Test public void whenSerializingUsingJsonSerialize_thenCorrect() throws JsonProcessingException, ParseException { diff --git a/video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/serialization/jsonvalue/JsonValueTest.java b/video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/serialization/jsonvalue/JsonValueUnitTest.java similarity index 97% rename from video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/serialization/jsonvalue/JsonValueTest.java rename to video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/serialization/jsonvalue/JsonValueUnitTest.java index 91541f60f2..e82c6fff13 100644 --- a/video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/serialization/jsonvalue/JsonValueTest.java +++ b/video-tutorials/jackson-annotations/src/test/java/com/baeldung/jacksonannotation/serialization/jsonvalue/JsonValueUnitTest.java @@ -12,7 +12,7 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Alex Theedom www.baeldung.com * @version 1.0 */ -public class JsonValueTest { +public class JsonValueUnitTest { @Test public void whenSerializingUsingJsonValue_thenCorrect() throws JsonProcessingException { diff --git a/video-tutorials/pom.xml b/video-tutorials/pom.xml index 330f303dd6..a1c01cd5f2 100644 --- a/video-tutorials/pom.xml +++ b/video-tutorials/pom.xml @@ -1,22 +1,22 @@ - 4.0.0 - com.baeldung - video-tutorials - 1.0.0-SNAPSHOT + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + com.baeldung + video-tutorials + 1.0.0-SNAPSHOT - pom - video-tutorials - - - com.baeldung - parent-modules - 1.0.0-SNAPSHOT - + pom + video-tutorials - - jackson-annotations - + + com.baeldung + parent-modules + 1.0.0-SNAPSHOT + + + + jackson-annotations + diff --git a/wicket/src/main/test/java/com/baeldung/wicket/examples/TestHomePage.java b/wicket/src/main/test/java/com/baeldung/wicket/examples/HomePageIntegrationTest.java similarity index 93% rename from wicket/src/main/test/java/com/baeldung/wicket/examples/TestHomePage.java rename to wicket/src/main/test/java/com/baeldung/wicket/examples/HomePageIntegrationTest.java index 7015ffd255..491ceefb16 100644 --- a/wicket/src/main/test/java/com/baeldung/wicket/examples/TestHomePage.java +++ b/wicket/src/main/test/java/com/baeldung/wicket/examples/HomePageIntegrationTest.java @@ -4,7 +4,7 @@ import org.apache.wicket.util.tester.WicketTester; import org.junit.Before; import org.junit.Test; -public class TestHomePage { +public class HomePageIntegrationTest { private WicketTester tester; @Before diff --git a/xml/.gitignore b/xml/.gitignore new file mode 100644 index 0000000000..485dee64bc --- /dev/null +++ b/xml/.gitignore @@ -0,0 +1 @@ +.idea diff --git a/xml/pom.xml b/xml/pom.xml index f36f5ca9f2..2249767050 100644 --- a/xml/pom.xml +++ b/xml/pom.xml @@ -1,319 +1,305 @@ - 4.0.0 - com.baeldung - xml - 0.1-SNAPSHOT + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + com.baeldung + xml + 0.1-SNAPSHOT - xml + xml - - com.baeldung - parent-modules - 1.0.0-SNAPSHOT - - - - - jibx.sf.net - JiBX repository - http://jibx.sf.net/maven2 - - never - - - false - - - - - - jibx.sf.net - JiBX repository - http://jibx.sf.net/maven2 - - never - - - false - - - - - - - dom4j - dom4j - ${dom4j.version} - - - jaxen - jaxen - ${jaxen.version} - + + com.baeldung + parent-modules + 1.0.0-SNAPSHOT + + + + + jibx.sf.net + JiBX repository + http://jibx.sf.net/maven2 + + never + + + false + + + + + + jibx.sf.net + JiBX repository + http://jibx.sf.net/maven2 + + never + + + false + + + + + + + dom4j + dom4j + ${dom4j.version} + + + jaxen + jaxen + ${jaxen.version} + - - org.jdom - jdom2 - ${jdom2.version} - + + org.jdom + jdom2 + ${jdom2.version} + - - - commons-io - commons-io - ${commons-io.version} - + + + commons-io + commons-io + ${commons-io.version} + - - org.apache.commons - commons-collections4 - ${commons-collections4.version} - + + org.apache.commons + commons-collections4 + ${commons-collections4.version} + - - org.apache.commons - commons-lang3 - ${commons-lang3.version} - + + org.apache.commons + commons-lang3 + ${commons-lang3.version} + - - org.jibx - jibx-run - ${jibx-version} - - - commons-lang - commons-lang - ${commons-lang.version} - + + org.jibx + jibx-run + ${jibx-version} + + + commons-lang + commons-lang + ${commons-lang.version} + - + - - xml - - - src/main/resources - true - - + + xml + + + src/main/resources + true + + + - + + + schemaGen + + + + org.jibx + maven-jibx-plugin + ${maven-jibx-plugin.version} + + + generate-java-code-from-schema + + schema-codegen + + + src/main/resources + + Order.xsd + + true + + + + compile-binding + + bind + + + target/generated-sources + true + true + + true + + + + generate-test-code-from-schema + generate-test-sources + + test-schema-codegen + + + + compile-test-binding + process-test-classes + + test-bind + + + target/generated-test-sources + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + ${java-version} + ${java-version} + + - - org.apache.maven.plugins - maven-surefire-plugin - ${maven-surefire-plugin.version} - - - CustomerTest.java - - - + + org.apache.maven.plugins + maven-surefire-plugin + ${maven-surefire-plugin.version} + + + CustomerTest.java + + + + - + + - + + bindGen + + + + + org.jibx + maven-jibx-plugin + + + + + + org.jibx + maven-jibx-plugin + ${maven-jibx-plugin.version} + + src/main/resources + + *-binding.xml + + + template-binding.xml + + true + + + + process-classes + + bind + + + + + + org.jibx + maven-jibx-plugin + 1.3.1 + + src/main/resources + + *-binding.xml + + true + + + + process-test-classes + + test-bind + + + + - - - schemaGen - - - - org.jibx - maven-jibx-plugin - ${maven-jibx-plugin.version} - - - generate-java-code-from-schema - - schema-codegen - - - src/main/resources - - Order.xsd - - true - - - - compile-binding - - bind - - - target/generated-sources - true - true - - true - - - - generate-test-code-from-schema - generate-test-sources - - test-schema-codegen - - - - compile-test-binding - process-test-classes - - test-bind - - - target/generated-test-sources - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - ${java-version} - ${java-version} - - - - - org.apache.maven.plugins - maven-surefire-plugin - ${maven-surefire-plugin.version} - - - CustomerTest.java - - - - - - - - - - bindGen - - - - - org.jibx - maven-jibx-plugin - - - - - - org.jibx - maven-jibx-plugin - ${maven-jibx-plugin.version} - - src/main/resources - - *-binding.xml - - - template-binding.xml - - true - - - - process-classes - - bind - - - - - - org.jibx - maven-jibx-plugin - 1.3.1 - - src/main/resources - - *-binding.xml - - true - - - - process-test-classes - - test-bind - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - ${java-version} - ${java-version} - - - - - maven-assembly-plugin - - ${project.basedir} - - - jar-with-dependencies - - - - - - com.baeldung.xml.jibx.JiBXDemoApplication - - - - - - - make-assembly - package - - attached - - - - - - - + + org.apache.maven.plugins + maven-compiler-plugin + + ${java-version} + ${java-version} + + + + + maven-assembly-plugin + + ${project.basedir} + + + jar-with-dependencies + + + + + + com.baeldung.xml.jibx.JiBXDemoApplication + + + + + + + make-assembly + package + + attached + + + + + + + - - - 1.6.1 - 1.1.6 - 2.0.6 - 2.5 - 4.1 - 1.2.4.5 + + + 1.6.1 + 1.1.6 + 2.0.6 + 2.5 + 4.1 + 1.2.4.5 - - 3.5 - 2.4 - 1.8 + + 3.5 + 2.4 + 1.8 - - 1.3.1 + + 1.3.1 - + diff --git a/xml/src/test/java/com/baeldung/xml/jibx/CustomerTest.java b/xml/src/test/java/com/baeldung/xml/jibx/CustomerIntegrationTest.java similarity index 98% rename from xml/src/test/java/com/baeldung/xml/jibx/CustomerTest.java rename to xml/src/test/java/com/baeldung/xml/jibx/CustomerIntegrationTest.java index 8b14277799..be28dfe00a 100644 --- a/xml/src/test/java/com/baeldung/xml/jibx/CustomerTest.java +++ b/xml/src/test/java/com/baeldung/xml/jibx/CustomerIntegrationTest.java @@ -11,7 +11,7 @@ import java.io.InputStream; import static junit.framework.Assert.assertEquals; -public class CustomerTest { +public class CustomerIntegrationTest { @Test public void whenUnmarshalXML_ThenFieldsAreMapped() throws JiBXException, FileNotFoundException { diff --git a/xml/src/test/resources/example_new.xml b/xml/src/test/resources/example_new.xml index 646d938869..020760fdd3 100644 --- a/xml/src/test/resources/example_new.xml +++ b/xml/src/test/resources/example_new.xml @@ -1,9 +1,10 @@ - - - - Jaxb author - 04/02/2015 - XML Binding with Jaxb - XML with Jaxb - - + + + + + XML with Dom4J + XML handling with Dom4J + 14/06/2016 + Dom4J tech writer + + diff --git a/xmlunit2/pom.xml b/xmlunit2/pom.xml index f430b8b7a9..dd9fe9ac27 100644 --- a/xmlunit2/pom.xml +++ b/xmlunit2/pom.xml @@ -1,41 +1,35 @@ - 4.0.0 - com.baeldung - xmlunit2 - 1.0 - XMLUnit-2 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + 4.0.0 + com.baeldung + xmlunit2 + 1.0 + XMLUnit-2 com.baeldung parent-modules 1.0.0-SNAPSHOT - + - - - org.hamcrest - hamcrest-all - ${hamcrest.version} - - - org.xmlunit - xmlunit-matchers - ${xmlunit.version} - + + + org.xmlunit + xmlunit-matchers + ${xmlunit.version} + - - org.xmlunit - xmlunit-core - ${xmlunit.version} - + + org.xmlunit + xmlunit-core + ${xmlunit.version} + - + - + - 1.3 2.3.0 diff --git a/xstream/src/test/java/com/baeldung/pojo/test/ComplexXmlToObjectAnnotationTest.java b/xstream/src/test/java/com/baeldung/pojo/test/ComplexXmlToObjectAnnotationUnitTest.java similarity index 96% rename from xstream/src/test/java/com/baeldung/pojo/test/ComplexXmlToObjectAnnotationTest.java rename to xstream/src/test/java/com/baeldung/pojo/test/ComplexXmlToObjectAnnotationUnitTest.java index ed74086ed6..2b9c03a467 100644 --- a/xstream/src/test/java/com/baeldung/pojo/test/ComplexXmlToObjectAnnotationTest.java +++ b/xstream/src/test/java/com/baeldung/pojo/test/ComplexXmlToObjectAnnotationUnitTest.java @@ -11,7 +11,7 @@ import java.io.FileReader; import static org.junit.Assert.assertNotNull; -public class ComplexXmlToObjectAnnotationTest { +public class ComplexXmlToObjectAnnotationUnitTest { private XStream xstream = null; diff --git a/xstream/src/test/java/com/baeldung/pojo/test/ComplexXmlToObjectCollectionTest.java b/xstream/src/test/java/com/baeldung/pojo/test/ComplexXmlToObjectCollectionUnitTest.java similarity index 95% rename from xstream/src/test/java/com/baeldung/pojo/test/ComplexXmlToObjectCollectionTest.java rename to xstream/src/test/java/com/baeldung/pojo/test/ComplexXmlToObjectCollectionUnitTest.java index 02cdbd734f..ff969c2177 100644 --- a/xstream/src/test/java/com/baeldung/pojo/test/ComplexXmlToObjectCollectionTest.java +++ b/xstream/src/test/java/com/baeldung/pojo/test/ComplexXmlToObjectCollectionUnitTest.java @@ -10,7 +10,7 @@ import org.junit.Test; import java.io.FileNotFoundException; import java.io.FileReader; -public class ComplexXmlToObjectCollectionTest { +public class ComplexXmlToObjectCollectionUnitTest { private XStream xstream = null; diff --git a/xstream/src/test/java/com/baeldung/pojo/test/XmlToObjectAliasTest.java b/xstream/src/test/java/com/baeldung/pojo/test/XmlToObjectAliasIntegrationTest.java similarity index 95% rename from xstream/src/test/java/com/baeldung/pojo/test/XmlToObjectAliasTest.java rename to xstream/src/test/java/com/baeldung/pojo/test/XmlToObjectAliasIntegrationTest.java index b7c6a8b496..0e847ddbfc 100644 --- a/xstream/src/test/java/com/baeldung/pojo/test/XmlToObjectAliasTest.java +++ b/xstream/src/test/java/com/baeldung/pojo/test/XmlToObjectAliasIntegrationTest.java @@ -10,7 +10,7 @@ import org.junit.Test; import java.io.FileNotFoundException; import java.io.FileReader; -public class XmlToObjectAliasTest { +public class XmlToObjectAliasIntegrationTest { private XStream xstream = null; diff --git a/xstream/src/test/java/com/baeldung/pojo/test/XmlToObjectAnnotationTest.java b/xstream/src/test/java/com/baeldung/pojo/test/XmlToObjectAnnotationIntegrationTest.java similarity index 95% rename from xstream/src/test/java/com/baeldung/pojo/test/XmlToObjectAnnotationTest.java rename to xstream/src/test/java/com/baeldung/pojo/test/XmlToObjectAnnotationIntegrationTest.java index c2bb859e70..24f4e38d5e 100644 --- a/xstream/src/test/java/com/baeldung/pojo/test/XmlToObjectAnnotationTest.java +++ b/xstream/src/test/java/com/baeldung/pojo/test/XmlToObjectAnnotationIntegrationTest.java @@ -10,7 +10,7 @@ import org.junit.Test; import java.io.FileNotFoundException; import java.io.FileReader; -public class XmlToObjectAnnotationTest { +public class XmlToObjectAnnotationIntegrationTest { private XStream xstream = null; diff --git a/xstream/src/test/java/com/baeldung/pojo/test/XmlToObjectFieldAliasTest.java b/xstream/src/test/java/com/baeldung/pojo/test/XmlToObjectFieldAliasIntegrationTest.java similarity index 95% rename from xstream/src/test/java/com/baeldung/pojo/test/XmlToObjectFieldAliasTest.java rename to xstream/src/test/java/com/baeldung/pojo/test/XmlToObjectFieldAliasIntegrationTest.java index 71e1cee809..1413372d74 100644 --- a/xstream/src/test/java/com/baeldung/pojo/test/XmlToObjectFieldAliasTest.java +++ b/xstream/src/test/java/com/baeldung/pojo/test/XmlToObjectFieldAliasIntegrationTest.java @@ -10,7 +10,7 @@ import org.junit.Test; import java.io.FileNotFoundException; import java.io.FileReader; -public class XmlToObjectFieldAliasTest { +public class XmlToObjectFieldAliasIntegrationTest { private XStream xstream = null; diff --git a/xstream/src/test/java/com/baeldung/pojo/test/XmlToObjectIgnoreFieldsTest.java b/xstream/src/test/java/com/baeldung/pojo/test/XmlToObjectIgnoreFieldsIntegrationTest.java similarity index 95% rename from xstream/src/test/java/com/baeldung/pojo/test/XmlToObjectIgnoreFieldsTest.java rename to xstream/src/test/java/com/baeldung/pojo/test/XmlToObjectIgnoreFieldsIntegrationTest.java index 7726fef0fc..e0bea07ac3 100644 --- a/xstream/src/test/java/com/baeldung/pojo/test/XmlToObjectIgnoreFieldsTest.java +++ b/xstream/src/test/java/com/baeldung/pojo/test/XmlToObjectIgnoreFieldsIntegrationTest.java @@ -10,7 +10,7 @@ import org.junit.Test; import java.io.FileNotFoundException; import java.io.FileReader; -public class XmlToObjectIgnoreFieldsTest { +public class XmlToObjectIgnoreFieldsIntegrationTest { private XStream xstream = null; diff --git a/xstream/src/test/java/com/baeldung/pojo/test/XmlToObjectTest.java b/xstream/src/test/java/com/baeldung/pojo/test/XmlToObjectIntegrationTest.java similarity index 96% rename from xstream/src/test/java/com/baeldung/pojo/test/XmlToObjectTest.java rename to xstream/src/test/java/com/baeldung/pojo/test/XmlToObjectIntegrationTest.java index b7d8f27e5f..d024b3517d 100644 --- a/xstream/src/test/java/com/baeldung/pojo/test/XmlToObjectTest.java +++ b/xstream/src/test/java/com/baeldung/pojo/test/XmlToObjectIntegrationTest.java @@ -10,7 +10,7 @@ import org.junit.Test; import java.io.FileReader; -public class XmlToObjectTest { +public class XmlToObjectIntegrationTest { private XStream xstream = null; diff --git a/xstream/src/test/java/com/baeldung/test/XStreamJettisonTest.java b/xstream/src/test/java/com/baeldung/test/XStreamJettisonIntegrationTest.java similarity index 96% rename from xstream/src/test/java/com/baeldung/test/XStreamJettisonTest.java rename to xstream/src/test/java/com/baeldung/test/XStreamJettisonIntegrationTest.java index f37605cc98..265de461bf 100644 --- a/xstream/src/test/java/com/baeldung/test/XStreamJettisonTest.java +++ b/xstream/src/test/java/com/baeldung/test/XStreamJettisonIntegrationTest.java @@ -9,7 +9,7 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; -public class XStreamJettisonTest { +public class XStreamJettisonIntegrationTest { private Customer customer = null; diff --git a/xstream/src/test/java/com/baeldung/test/XStreamJsonHierarchicalTest.java b/xstream/src/test/java/com/baeldung/test/XStreamJsonHierarchicalIntegrationTest.java similarity index 96% rename from xstream/src/test/java/com/baeldung/test/XStreamJsonHierarchicalTest.java rename to xstream/src/test/java/com/baeldung/test/XStreamJsonHierarchicalIntegrationTest.java index 1e71cb7066..d714123aaa 100644 --- a/xstream/src/test/java/com/baeldung/test/XStreamJsonHierarchicalTest.java +++ b/xstream/src/test/java/com/baeldung/test/XStreamJsonHierarchicalIntegrationTest.java @@ -9,7 +9,7 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; -public class XStreamJsonHierarchicalTest { +public class XStreamJsonHierarchicalIntegrationTest { private Customer customer = null; private String dataJson = null; diff --git a/xstream/src/test/java/com/baeldung/utility/XStreamSimpleXmlTest.java b/xstream/src/test/java/com/baeldung/utility/XStreamSimpleXmlIntegrationTest.java similarity index 97% rename from xstream/src/test/java/com/baeldung/utility/XStreamSimpleXmlTest.java rename to xstream/src/test/java/com/baeldung/utility/XStreamSimpleXmlIntegrationTest.java index 83a965ce1b..b7eeb129f0 100644 --- a/xstream/src/test/java/com/baeldung/utility/XStreamSimpleXmlTest.java +++ b/xstream/src/test/java/com/baeldung/utility/XStreamSimpleXmlIntegrationTest.java @@ -9,7 +9,7 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; -public class XStreamSimpleXmlTest { +public class XStreamSimpleXmlIntegrationTest { private Customer customer; private String dataXml;