diff --git a/core-java/README.md b/core-java/README.md index 94d203533e..5f69f12c6f 100644 --- a/core-java/README.md +++ b/core-java/README.md @@ -133,3 +133,4 @@ - [A Guide to Java Initialization](http://www.baeldung.com/java-initialization) - [Implementing a Binary Tree in Java](http://www.baeldung.com/java-binary-tree) - [A Guide to ThreadLocalRandom in Java](http://www.baeldung.com/java-thread-local-random) +- [RegEx for matching Date Pattern in Java](http://www.baeldung.com/java-date-regular-expressions) diff --git a/core-java/src/main/java/com/baeldung/iteratorguide/IteratorGuide.java b/core-java/src/main/java/com/baeldung/iteratorguide/IteratorGuide.java new file mode 100644 index 0000000000..447f588fed --- /dev/null +++ b/core-java/src/main/java/com/baeldung/iteratorguide/IteratorGuide.java @@ -0,0 +1,39 @@ +package com.baeldung.iteratorguide; + +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.ListIterator; + +public class IteratorGuide { + + public static void main(String[] args) { + List items = new ArrayList<>(); + items.add("ONE"); + items.add("TWO"); + items.add("THREE"); + Iterator iter = items.iterator(); + while (iter.hasNext()) { + String next = iter.next(); + System.out.println(next); + iter.remove(); + } + ListIterator listIterator = items.listIterator(); + while(listIterator.hasNext()) { + String nextWithIndex = items.get(listIterator.nextIndex()); + String next = listIterator.next(); + if( "ONE".equals(next)) { + listIterator.set("SWAPPED"); + } + } + listIterator.add("FOUR"); + while(listIterator.hasPrevious()) { + String previousWithIndex = items.get(listIterator.previousIndex()); + String previous = listIterator.previous(); + System.out.println(previous); + } + listIterator.forEachRemaining(e -> { + System.out.println(e); + }); + } +} diff --git a/core-java/src/main/java/com/baeldung/regexp/datepattern/DateMatcher.java b/core-java/src/main/java/com/baeldung/regexp/datepattern/DateMatcher.java new file mode 100644 index 0000000000..3e85bf13bb --- /dev/null +++ b/core-java/src/main/java/com/baeldung/regexp/datepattern/DateMatcher.java @@ -0,0 +1,7 @@ +package com.baeldung.regexp.datepattern; + +public interface DateMatcher { + + boolean matches(String date); + +} diff --git a/core-java/src/main/java/com/baeldung/regexp/datepattern/FormattedDateMatcher.java b/core-java/src/main/java/com/baeldung/regexp/datepattern/FormattedDateMatcher.java new file mode 100644 index 0000000000..1d3a609b55 --- /dev/null +++ b/core-java/src/main/java/com/baeldung/regexp/datepattern/FormattedDateMatcher.java @@ -0,0 +1,14 @@ +package com.baeldung.regexp.datepattern; + +import java.util.regex.Pattern; + +class FormattedDateMatcher implements DateMatcher { + + private static final Pattern DATE_PATTERN = Pattern.compile( + "^\\d{4}-\\d{2}-\\d{2}$"); + + @Override + public boolean matches(String date) { + return DATE_PATTERN.matcher(date).matches(); + } +} diff --git a/core-java/src/main/java/com/baeldung/regexp/datepattern/RangedDateMatcher.java b/core-java/src/main/java/com/baeldung/regexp/datepattern/RangedDateMatcher.java new file mode 100644 index 0000000000..af4e183fef --- /dev/null +++ b/core-java/src/main/java/com/baeldung/regexp/datepattern/RangedDateMatcher.java @@ -0,0 +1,14 @@ +package com.baeldung.regexp.datepattern; + +import java.util.regex.Pattern; + +class RangedDateMatcher implements DateMatcher { + + private static final Pattern DATE_PATTERN = Pattern.compile( + "^((19|2[0-9])[0-9]{2})-(0[1-9]|1[012])-(0[1-9]|[12][0-9]|3[01])$"); + + @Override + public boolean matches(String date) { + return DATE_PATTERN.matcher(date).matches(); + } +} diff --git a/core-java/src/main/java/com/baeldung/regexp/datepattern/gregorian/February29thMatcher.java b/core-java/src/main/java/com/baeldung/regexp/datepattern/gregorian/February29thMatcher.java new file mode 100644 index 0000000000..b0243ae48f --- /dev/null +++ b/core-java/src/main/java/com/baeldung/regexp/datepattern/gregorian/February29thMatcher.java @@ -0,0 +1,16 @@ +package com.baeldung.regexp.datepattern.gregorian; + +import com.baeldung.regexp.datepattern.DateMatcher; + +import java.util.regex.Pattern; + +public class February29thMatcher implements DateMatcher { + + private static final Pattern DATE_PATTERN = Pattern.compile( + "^((2000|2400|2800|(19|2[0-9](0[48]|[2468][048]|[13579][26])))-02-29)$"); + + @Override + public boolean matches(String date) { + return DATE_PATTERN.matcher(date).matches(); + } +} diff --git a/core-java/src/main/java/com/baeldung/regexp/datepattern/gregorian/FebruaryGeneralMatcher.java b/core-java/src/main/java/com/baeldung/regexp/datepattern/gregorian/FebruaryGeneralMatcher.java new file mode 100644 index 0000000000..f294348928 --- /dev/null +++ b/core-java/src/main/java/com/baeldung/regexp/datepattern/gregorian/FebruaryGeneralMatcher.java @@ -0,0 +1,16 @@ +package com.baeldung.regexp.datepattern.gregorian; + +import com.baeldung.regexp.datepattern.DateMatcher; + +import java.util.regex.Pattern; + +public class FebruaryGeneralMatcher implements DateMatcher { + + private static final Pattern DATE_PATTERN = Pattern.compile( + "^(((19|2[0-9])[0-9]{2})-02-(0[1-9]|1[0-9]|2[0-8]))$"); + + @Override + public boolean matches(String date) { + return DATE_PATTERN.matcher(date).matches(); + } +} diff --git a/core-java/src/main/java/com/baeldung/regexp/datepattern/gregorian/GregorianDateMatcher.java b/core-java/src/main/java/com/baeldung/regexp/datepattern/gregorian/GregorianDateMatcher.java new file mode 100644 index 0000000000..fc8abdb201 --- /dev/null +++ b/core-java/src/main/java/com/baeldung/regexp/datepattern/gregorian/GregorianDateMatcher.java @@ -0,0 +1,19 @@ +package com.baeldung.regexp.datepattern.gregorian; + +import com.baeldung.regexp.datepattern.DateMatcher; + +import java.util.regex.Pattern; + +class GregorianDateMatcher implements DateMatcher { + + private static final Pattern DATE_PATTERN = Pattern.compile( + "^((2000|2400|2800|(19|2[0-9](0[48]|[2468][048]|[13579][26])))-02-29)$" + + "|^(((19|2[0-9])[0-9]{2})-02-(0[1-9]|1[0-9]|2[0-8]))$" + + "|^(((19|2[0-9])[0-9]{2})-(0[13578]|10|12)-(0[1-9]|[12][0-9]|3[01]))$" + + "|^(((19|2[0-9])[0-9]{2})-(0[469]|11)-(0[1-9]|[12][0-9]|30))$"); + + @Override + public boolean matches(String date) { + return DATE_PATTERN.matcher(date).matches(); + } +} diff --git a/core-java/src/main/java/com/baeldung/regexp/datepattern/gregorian/MonthsOf30DaysMatcher.java b/core-java/src/main/java/com/baeldung/regexp/datepattern/gregorian/MonthsOf30DaysMatcher.java new file mode 100644 index 0000000000..be202081e8 --- /dev/null +++ b/core-java/src/main/java/com/baeldung/regexp/datepattern/gregorian/MonthsOf30DaysMatcher.java @@ -0,0 +1,17 @@ +package com.baeldung.regexp.datepattern.gregorian; + +import com.baeldung.regexp.datepattern.DateMatcher; + +import java.util.regex.Pattern; + +public class MonthsOf30DaysMatcher implements DateMatcher { + + private static final Pattern DATE_PATTERN = Pattern.compile( + "^(((19|2[0-9])[0-9]{2})-(0[469]|11)-(0[1-9]|[12][0-9]|30))$"); + + @Override + public boolean matches(String date) { + return DATE_PATTERN.matcher(date).matches(); + } + +} diff --git a/core-java/src/main/java/com/baeldung/regexp/datepattern/gregorian/MonthsOf31DaysMatcher.java b/core-java/src/main/java/com/baeldung/regexp/datepattern/gregorian/MonthsOf31DaysMatcher.java new file mode 100644 index 0000000000..7f0943991b --- /dev/null +++ b/core-java/src/main/java/com/baeldung/regexp/datepattern/gregorian/MonthsOf31DaysMatcher.java @@ -0,0 +1,17 @@ +package com.baeldung.regexp.datepattern.gregorian; + +import com.baeldung.regexp.datepattern.DateMatcher; + +import java.util.regex.Pattern; + +public class MonthsOf31DaysMatcher implements DateMatcher { + + private static final Pattern DATE_PATTERN = Pattern.compile( + "^(((19|2[0-9])[0-9]{2})-(0[13578]|10|12)-(0[1-9]|[12][0-9]|3[01]))$"); + + @Override + public boolean matches(String date) { + return DATE_PATTERN.matcher(date).matches(); + } + +} diff --git a/core-java/src/test/java/com/baeldung/regexp/datepattern/FormattedDateMatcherUnitTest.java b/core-java/src/test/java/com/baeldung/regexp/datepattern/FormattedDateMatcherUnitTest.java new file mode 100644 index 0000000000..0a9599c3f9 --- /dev/null +++ b/core-java/src/test/java/com/baeldung/regexp/datepattern/FormattedDateMatcherUnitTest.java @@ -0,0 +1,24 @@ +package com.baeldung.regexp.datepattern; + +import org.junit.Assert; +import org.junit.Test; + +public class FormattedDateMatcherUnitTest { + + private DateMatcher matcher = new FormattedDateMatcher(); + + @Test + public void whenUsingFormattedDateMatcher_thenFormatConstraintsSatisfied() { + Assert.assertTrue(matcher.matches("2017-12-31")); + Assert.assertTrue(matcher.matches("2018-01-01")); + Assert.assertTrue(matcher.matches("0000-00-00")); + Assert.assertTrue(matcher.matches("1029-99-72")); + + Assert.assertFalse(matcher.matches("2018-01")); + Assert.assertFalse(matcher.matches("2018-01-01-01")); + Assert.assertFalse(matcher.matches("2018-01-XX")); + Assert.assertFalse(matcher.matches(" 2018-01-01")); + Assert.assertFalse(matcher.matches("2018-01-01 ")); + Assert.assertFalse(matcher.matches("2018/01/01")); + } +} diff --git a/core-java/src/test/java/com/baeldung/regexp/datepattern/RangedDateMatcherUnitTest.java b/core-java/src/test/java/com/baeldung/regexp/datepattern/RangedDateMatcherUnitTest.java new file mode 100644 index 0000000000..abbff83ec1 --- /dev/null +++ b/core-java/src/test/java/com/baeldung/regexp/datepattern/RangedDateMatcherUnitTest.java @@ -0,0 +1,31 @@ +package com.baeldung.regexp.datepattern; + +import org.junit.Assert; +import org.junit.Test; + +public class RangedDateMatcherUnitTest { + + private DateMatcher matcher = new RangedDateMatcher(); + + @Test + public void whenUsingRangedDateMatcher_thenFormatConstraintsSatisfied() { + Assert.assertFalse(matcher.matches("2018-01")); + Assert.assertFalse(matcher.matches("2018-01-01-01")); + Assert.assertFalse(matcher.matches("2018-01-XX")); + Assert.assertFalse(matcher.matches(" 2018-01-01")); + Assert.assertFalse(matcher.matches("2018-01-01 ")); + Assert.assertFalse(matcher.matches("2018/01/01")); + } + + @Test + public void whenUsingRangedDateMatcher_thenRangeConstraintsSatisfied() { + Assert.assertTrue(matcher.matches("1900-01-01")); + Assert.assertTrue(matcher.matches("2018-02-31")); + Assert.assertTrue(matcher.matches("2999-12-31")); + + Assert.assertFalse(matcher.matches("1899-12-31")); + Assert.assertFalse(matcher.matches("2018-05-35")); + Assert.assertFalse(matcher.matches("2018-13-05")); + Assert.assertFalse(matcher.matches("3000-01-01")); + } +} diff --git a/core-java/src/test/java/com/baeldung/regexp/datepattern/gregorian/February29thMatcherUnitTest.java b/core-java/src/test/java/com/baeldung/regexp/datepattern/gregorian/February29thMatcherUnitTest.java new file mode 100644 index 0000000000..67a4276728 --- /dev/null +++ b/core-java/src/test/java/com/baeldung/regexp/datepattern/gregorian/February29thMatcherUnitTest.java @@ -0,0 +1,17 @@ +package com.baeldung.regexp.datepattern.gregorian; + +import com.baeldung.regexp.datepattern.DateMatcher; +import com.baeldung.regexp.datepattern.gregorian.testhelper.GregorianDateTestHelper; +import org.junit.Test; + +public class February29thMatcherUnitTest { + + private DateMatcher matcher = new February29thMatcher(); + + private GregorianDateTestHelper testHelper = new GregorianDateTestHelper(matcher); + + @Test + public void whenYearIsLeap_thenYearHasFebruary29th() { + testHelper.assertFebruary29th(); + } +} diff --git a/core-java/src/test/java/com/baeldung/regexp/datepattern/gregorian/FebruaryGeneralMatcherUnitTest.java b/core-java/src/test/java/com/baeldung/regexp/datepattern/gregorian/FebruaryGeneralMatcherUnitTest.java new file mode 100644 index 0000000000..48ff140620 --- /dev/null +++ b/core-java/src/test/java/com/baeldung/regexp/datepattern/gregorian/FebruaryGeneralMatcherUnitTest.java @@ -0,0 +1,17 @@ +package com.baeldung.regexp.datepattern.gregorian; + +import com.baeldung.regexp.datepattern.DateMatcher; +import com.baeldung.regexp.datepattern.gregorian.testhelper.GregorianDateTestHelper; +import org.junit.Test; + +public class FebruaryGeneralMatcherUnitTest { + + private DateMatcher matcher = new FebruaryGeneralMatcher(); + + private GregorianDateTestHelper testHelper = new GregorianDateTestHelper(matcher); + + @Test + public void whenMonthIsFebruary_thenMonthContainsUpTo28Days() { + testHelper.assertFebruaryGeneralDates(); + } +} \ No newline at end of file diff --git a/core-java/src/test/java/com/baeldung/regexp/datepattern/gregorian/GregorianDateMatcherUnitTest.java b/core-java/src/test/java/com/baeldung/regexp/datepattern/gregorian/GregorianDateMatcherUnitTest.java new file mode 100644 index 0000000000..e6e896a09c --- /dev/null +++ b/core-java/src/test/java/com/baeldung/regexp/datepattern/gregorian/GregorianDateMatcherUnitTest.java @@ -0,0 +1,42 @@ +package com.baeldung.regexp.datepattern.gregorian; + +import com.baeldung.regexp.datepattern.DateMatcher; +import com.baeldung.regexp.datepattern.gregorian.testhelper.GregorianDateTestHelper; +import org.junit.Test; + +public class GregorianDateMatcherUnitTest { + + private DateMatcher matcher = new GregorianDateMatcher(); + + private GregorianDateTestHelper testHelper = new GregorianDateTestHelper(matcher); + + @Test + public void whenUsingGregorianDateMatcher_thenFormatConstraintsSatisfied() { + testHelper.assertFormat(); + } + + @Test + public void whenUsingGregorianDateMatcher_thenRangeConstraintsSatisfied() { + testHelper.assertRange(); + } + + @Test + public void whenYearIsLeap_thenFebruaryHas29Days() { + testHelper.assertFebruary29th(); + } + + @Test + public void whenMonthIsFebruary_thenMonthContainsUpTo28Days() { + testHelper.assertFebruaryGeneralDates(); + } + + @Test + public void whenMonthIsShort_thenMonthContainsUpTo30Days() { + testHelper.assertMonthsOf30Days(); + } + + @Test + public void whenMonthIsLong_thenMonthContainsUpTo31Days() { + testHelper.assertMonthsOf31Dates(); + } +} diff --git a/core-java/src/test/java/com/baeldung/regexp/datepattern/gregorian/MonthsOf30DaysMatcherUnitTest.java b/core-java/src/test/java/com/baeldung/regexp/datepattern/gregorian/MonthsOf30DaysMatcherUnitTest.java new file mode 100644 index 0000000000..d1ce4a6d57 --- /dev/null +++ b/core-java/src/test/java/com/baeldung/regexp/datepattern/gregorian/MonthsOf30DaysMatcherUnitTest.java @@ -0,0 +1,17 @@ +package com.baeldung.regexp.datepattern.gregorian; + +import com.baeldung.regexp.datepattern.DateMatcher; +import com.baeldung.regexp.datepattern.gregorian.testhelper.GregorianDateTestHelper; +import org.junit.Test; + +public class MonthsOf30DaysMatcherUnitTest { + + private DateMatcher matcher = new MonthsOf30DaysMatcher(); + + private GregorianDateTestHelper testHelper = new GregorianDateTestHelper(matcher); + + @Test + public void whenMonthIsShort_thenMonthContainsUpTo30Days() { + testHelper.assertMonthsOf30Days(); + } +} \ No newline at end of file diff --git a/core-java/src/test/java/com/baeldung/regexp/datepattern/gregorian/MonthsOf31DaysMatcherUnitTest.java b/core-java/src/test/java/com/baeldung/regexp/datepattern/gregorian/MonthsOf31DaysMatcherUnitTest.java new file mode 100644 index 0000000000..338c8de30c --- /dev/null +++ b/core-java/src/test/java/com/baeldung/regexp/datepattern/gregorian/MonthsOf31DaysMatcherUnitTest.java @@ -0,0 +1,17 @@ +package com.baeldung.regexp.datepattern.gregorian; + +import com.baeldung.regexp.datepattern.DateMatcher; +import com.baeldung.regexp.datepattern.gregorian.testhelper.GregorianDateTestHelper; +import org.junit.Test; + +public class MonthsOf31DaysMatcherUnitTest { + + private DateMatcher matcher = new MonthsOf31DaysMatcher(); + + private GregorianDateTestHelper testHelper = new GregorianDateTestHelper(matcher); + + @Test + public void whenMonthIsLong_thenMonthContainsUpTo31Days() { + testHelper.assertMonthsOf31Dates(); + } +} \ No newline at end of file diff --git a/core-java/src/test/java/com/baeldung/regexp/datepattern/gregorian/testhelper/GregorianDateTestHelper.java b/core-java/src/test/java/com/baeldung/regexp/datepattern/gregorian/testhelper/GregorianDateTestHelper.java new file mode 100644 index 0000000000..6429e4fe2d --- /dev/null +++ b/core-java/src/test/java/com/baeldung/regexp/datepattern/gregorian/testhelper/GregorianDateTestHelper.java @@ -0,0 +1,102 @@ +package com.baeldung.regexp.datepattern.gregorian.testhelper; + +import com.baeldung.regexp.datepattern.DateMatcher; +import org.junit.Assert; + +public class GregorianDateTestHelper { + + private final DateMatcher matcher; + + public GregorianDateTestHelper(DateMatcher matcher) { + this.matcher = matcher; + } + + public void assertFormat() { + Assert.assertTrue(matcher.matches("2017-12-31")); + Assert.assertTrue(matcher.matches("2018-01-01")); + + Assert.assertFalse(matcher.matches("2018-02")); + Assert.assertFalse(matcher.matches("2018-02-01-01")); + Assert.assertFalse(matcher.matches("2018-02-XX")); + Assert.assertFalse(matcher.matches(" 2018-02-01")); + Assert.assertFalse(matcher.matches("2018-02-01 ")); + Assert.assertFalse(matcher.matches("2020/02/28")); + Assert.assertFalse(matcher.matches("2020.02.29")); + } + + public void assertRange() { + Assert.assertTrue(matcher.matches("1900-01-01")); + Assert.assertTrue(matcher.matches("2205-05-25")); + Assert.assertTrue(matcher.matches("2999-12-31")); + + Assert.assertFalse(matcher.matches("1899-12-31")); + Assert.assertFalse(matcher.matches("2018-05-35")); + Assert.assertFalse(matcher.matches("2018-13-05")); + Assert.assertFalse(matcher.matches("3000-01-01")); + Assert.assertFalse(matcher.matches("3200-02-29")); + } + + public void assertFebruary29th() { + Assert.assertTrue(matcher.matches("2000-02-29")); + Assert.assertTrue(matcher.matches("2400-02-29")); + Assert.assertTrue(matcher.matches("2800-02-29")); + Assert.assertTrue(matcher.matches("2020-02-29")); + Assert.assertTrue(matcher.matches("2024-02-29")); + Assert.assertTrue(matcher.matches("2028-02-29")); + + Assert.assertFalse(matcher.matches("2017-02-29")); + Assert.assertFalse(matcher.matches("2018-02-29")); + Assert.assertFalse(matcher.matches("2019-02-29")); + Assert.assertFalse(matcher.matches("2100-02-29")); + Assert.assertFalse(matcher.matches("2200-02-29")); + Assert.assertFalse(matcher.matches("2300-02-29")); + } + + public void assertFebruaryGeneralDates() { + Assert.assertTrue(matcher.matches("2018-02-01")); + Assert.assertTrue(matcher.matches("2019-02-13")); + Assert.assertTrue(matcher.matches("2020-02-25")); + + Assert.assertFalse(matcher.matches("2000-02-30")); + Assert.assertFalse(matcher.matches("2400-02-62")); + Assert.assertFalse(matcher.matches("2420-02-94")); + } + + public void assertMonthsOf30Days() { + Assert.assertTrue(matcher.matches("2018-04-30")); + Assert.assertTrue(matcher.matches("2019-06-30")); + Assert.assertTrue(matcher.matches("2020-09-30")); + Assert.assertTrue(matcher.matches("2021-11-30")); + + Assert.assertTrue(matcher.matches("2022-04-02")); + Assert.assertTrue(matcher.matches("2023-06-14")); + Assert.assertTrue(matcher.matches("2024-09-26")); + + Assert.assertFalse(matcher.matches("2018-04-31")); + Assert.assertFalse(matcher.matches("2019-06-31")); + Assert.assertFalse(matcher.matches("2020-09-31")); + Assert.assertFalse(matcher.matches("2021-11-31")); + + Assert.assertFalse(matcher.matches("2022-04-32")); + Assert.assertFalse(matcher.matches("2023-06-64")); + Assert.assertFalse(matcher.matches("2024-09-96")); + } + + public void assertMonthsOf31Dates() { + Assert.assertTrue(matcher.matches("2018-01-31")); + Assert.assertTrue(matcher.matches("2019-03-31")); + Assert.assertTrue(matcher.matches("2020-05-31")); + Assert.assertTrue(matcher.matches("2021-07-31")); + Assert.assertTrue(matcher.matches("2022-08-31")); + Assert.assertTrue(matcher.matches("2023-10-31")); + Assert.assertTrue(matcher.matches("2024-12-31")); + + Assert.assertTrue(matcher.matches("2025-01-03")); + Assert.assertTrue(matcher.matches("2026-03-15")); + Assert.assertTrue(matcher.matches("2027-05-27")); + + Assert.assertFalse(matcher.matches("2018-01-32")); + Assert.assertFalse(matcher.matches("2019-03-64")); + Assert.assertFalse(matcher.matches("2020-05-96")); + } +} diff --git a/java-lite/pom.xml b/java-lite/pom.xml index 554819f6e4..eb18bc40a5 100644 --- a/java-lite/pom.xml +++ b/java-lite/pom.xml @@ -7,6 +7,7 @@ org.baeldung java-lite 1.0-SNAPSHOT + war com.baeldung @@ -15,7 +16,7 @@ - 9.3.4.RC1 + 9.4.8.v20171121 1.4.13 1.15 5.1.45 @@ -85,16 +86,6 @@ ${java.home}/../lib/tools.jar - - org.codehaus.jackson - jackson-core-lgpl - ${jackson.version} - - - org.codehaus.jackson - jackson-mapper-lgpl - ${jackson.version} - junit junit diff --git a/java-lite/src/main/java/app/config/AppControllerConfig.java b/java-lite/src/main/java/app/config/AppControllerConfig.java index 42b7e728ec..da30c08ab2 100644 --- a/java-lite/src/main/java/app/config/AppControllerConfig.java +++ b/java-lite/src/main/java/app/config/AppControllerConfig.java @@ -9,7 +9,7 @@ import org.javalite.activeweb.controller_filters.TimingFilter; public class AppControllerConfig extends AbstractControllerConfig { @Override public void init(AppContext appContext) { - addGlobalFilters(new TimingFilter()); - add(new DBConnectionFilter()).to(ProductsController.class); + addGlobalFilters(new TimingFilter()); + add(new DBConnectionFilter()).to(ProductsController.class); } } diff --git a/java-lite/src/main/java/app/config/DbConfig.java b/java-lite/src/main/java/app/config/DbConfig.java index 25ba378b22..75de248619 100644 --- a/java-lite/src/main/java/app/config/DbConfig.java +++ b/java-lite/src/main/java/app/config/DbConfig.java @@ -6,6 +6,6 @@ import org.javalite.activeweb.AppContext; public class DbConfig extends AbstractDBConfig { @Override public void init(AppContext appContext) { - this.configFile("/database.properties"); + this.configFile("/database.properties"); } } diff --git a/java-lite/src/main/java/app/controllers/ProductsController.java b/java-lite/src/main/java/app/controllers/ProductsController.java index f68dd9a013..746d77e24a 100644 --- a/java-lite/src/main/java/app/controllers/ProductsController.java +++ b/java-lite/src/main/java/app/controllers/ProductsController.java @@ -10,92 +10,94 @@ import java.util.Map; @RESTful public class ProductsController extends AppController { + private ObjectMapper mapper = new ObjectMapper(); + public void index() { - try { - view("products", Product.findAll()); - render().contentType("application/json"); - } catch (Exception e) { - view("message", "There was an error.", "code", 200); - render("message"); - } + try { + view("products", Product.findAll()); + render().contentType("application/json"); + } catch (Exception e) { + view("message", "There was an error.", "code", 200); + render("message"); + } } public void create() { - try { - Map payload = new ObjectMapper().readValue(getRequestString(), Map.class); - Product p = new Product(); - p.fromMap(payload); - p.saveIt(); - view("message", "Successfully saved product id " + p.get("id"), "code", 200); - render("message"); - } catch (Exception e) { - view("message", "There was an error.", "code", 200); - render("message"); - } + try { + Map payload = mapper.readValue(getRequestString(), Map.class); + Product p = new Product(); + p.fromMap(payload); + p.saveIt(); + view("message", "Successfully saved product id " + p.get("id"), "code", 200); + render("message"); + } catch (Exception e) { + view("message", "There was an error.", "code", 200); + render("message"); + } } public void update() { - try { - Map payload = new ObjectMapper().readValue(getRequestString(), Map.class); - String id = getId(); - Product p = Product.findById(id); - if (p == null) { - view("message", "Product id " + id + " not found.", "code", 200); - render("message"); - return; + try { + Map payload = mapper.readValue(getRequestString(), Map.class); + String id = getId(); + Product p = Product.findById(id); + if (p == null) { + view("message", "Product id " + id + " not found.", "code", 200); + render("message"); + return; + } + p.fromMap(payload); + p.saveIt(); + view("message", "Successfully updated product id " + id, "code", 200); + render("message"); + } catch (Exception e) { + view("message", "There was an error.", "code", 200); + render("message"); } - p.fromMap(payload); - p.saveIt(); - view("message", "Successfully updated product id " + id, "code", 200); - render("message"); - } catch (Exception e) { - view("message", "There was an error.", "code", 200); - render("message"); - } } public void show() { - try { - String id = getId(); - Product p = Product.findById(id); - if (p == null) { - view("message", "Product id " + id + " not found.", "code", 200); - render("message"); - return; + try { + String id = getId(); + Product p = Product.findById(id); + if (p == null) { + view("message", "Product id " + id + " not found.", "code", 200); + render("message"); + return; + } + view("product", p); + render("_product"); + } catch (Exception e) { + view("message", "There was an error.", "code", 200); + render("message"); } - view("product", p); - render("_product"); - } catch (Exception e) { - view("message", "There was an error.", "code", 200); - render("message"); - } } public void destroy() { - try { - String id = getId(); - Product p = Product.findById(id); - if (p == null) { - view("message", "Product id " + id + " not found.", "code", 200); - render("message"); - return; + try { + String id = getId(); + Product p = Product.findById(id); + if (p == null) { + view("message", "Product id " + id + " not found.", "code", 200); + render("message"); + return; + } + p.delete(); + view("message", "Successfully deleted product id " + id, "code", 200); + render("message"); + } catch (Exception e) { + view("message", "There was an error.", "code", 200); + render("message"); } - p.delete(); - view("message", "Successfully deleted product id " + id, "code", 200); - render("message"); - } catch (Exception e) { - view("message", "There was an error.", "code", 200); - render("message"); - } } @Override protected String getContentType() { - return "application/json"; + return "application/json"; } @Override protected String getLayout() { - return null; + return null; } } diff --git a/java-lite/src/test/java/app/models/ProductTest.java b/java-lite/src/test/java/app/models/ProductTest.java index f6ee0a3d0a..5e5c6e8845 100644 --- a/java-lite/src/test/java/app/models/ProductTest.java +++ b/java-lite/src/test/java/app/models/ProductTest.java @@ -8,18 +8,18 @@ public class ProductTest { //@Test public void givenSavedProduct_WhenFindFirst_ThenSavedProductIsReturned() { - //Open DB connection - Base.open("com.mysql.jdbc.Driver", "jdbc:mysql://localhost/dbname", "user", "password"); + //Open DB connection + Base.open("com.mysql.jdbc.Driver", "jdbc:mysql://localhost/dbname", "user", "password"); - //Create a product and save it - Product toSaveProduct = new Product(); - toSaveProduct.set("name", "Bread"); - toSaveProduct.saveIt(); + //Create a product and save it + Product toSaveProduct = new Product(); + toSaveProduct.set("name", "Bread"); + toSaveProduct.saveIt(); - //Find product - Product savedProduct = Product.findFirst("name = ?", "Bread"); + //Find product + Product savedProduct = Product.findFirst("name = ?", "Bread"); - Assert.assertEquals(toSaveProduct.get("name"), savedProduct.get("name")); + Assert.assertEquals(toSaveProduct.get("name"), savedProduct.get("name")); } } \ No newline at end of file diff --git a/libraries/pom.xml b/libraries/pom.xml index 712a7df786..09c8cb8335 100644 --- a/libraries/pom.xml +++ b/libraries/pom.xml @@ -107,7 +107,7 @@ maven-compiler-plugin - 3.7.0 + 3.7.0 1.8 1.8 @@ -639,6 +639,33 @@ ${googleclient.version} + + + com.github.docker-java + docker-java + ${docker.version} + + + org.slf4j + slf4j-log4j12 + + + org.slf4j + jcl-over-slf4j + + + ch.qos.logback + logback-classic + + + + + com.sun.jersey + jersey-client + 1.19.4 + + + com.google.api-client @@ -758,5 +785,6 @@ 1.23.0 v4-rev493-1.21.0 1.0.0 + 3.0.14 \ No newline at end of file diff --git a/libraries/src/test/java/com/baeldung/dockerapi/ContainerLiveTest.java b/libraries/src/test/java/com/baeldung/dockerapi/ContainerLiveTest.java new file mode 100644 index 0000000000..531e7e7c5b --- /dev/null +++ b/libraries/src/test/java/com/baeldung/dockerapi/ContainerLiveTest.java @@ -0,0 +1,165 @@ +package com.baeldung.dockerapi; + +import com.github.dockerjava.api.DockerClient; +import com.github.dockerjava.api.command.CreateContainerResponse; +import com.github.dockerjava.api.command.InspectContainerResponse; +import com.github.dockerjava.api.model.Container; +import com.github.dockerjava.api.model.PortBinding; +import com.github.dockerjava.core.DockerClientBuilder; +import org.junit.BeforeClass; +import org.junit.Test; + +import java.util.List; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.not; +import static org.hamcrest.core.Is.is; + +public class ContainerLiveTest { + + private static DockerClient dockerClient; + + @BeforeClass + public static void setup() { + dockerClient = DockerClientBuilder.getInstance().build(); + } + + @Test + public void whenListingRunningContainers_thenReturnNonEmptyList() { + + //when + List containers = dockerClient.listContainersCmd().exec(); + + //then + assertThat(containers.size(), is(not(0))); + } + + @Test + public void whenListingExitedContainers_thenReturnNonEmptyList() { + + //when + List containers = dockerClient.listContainersCmd() + .withShowSize(true) + .withShowAll(true) + .withStatusFilter("exited") + .exec(); + + //then + assertThat(containers.size(), is(not(0))); + } + + @Test + public void whenCreatingContainer_thenMustReturnContainerId() { + + //when + CreateContainerResponse container + = dockerClient.createContainerCmd("mongo:3.6") + .withCmd("--bind_ip_all") + .withName("mongo") + .withHostName("baeldung") + .withEnv("MONGO_LATEST_VERSION=3.6") + .withPortBindings(PortBinding.parse("9999:27017")) + .exec(); + + //then + assertThat(container.getId(), is(not(null))); + } + + + @Test + public void whenHavingContainer_thenRunContainer() throws InterruptedException { + + //when + CreateContainerResponse container + = dockerClient.createContainerCmd("alpine:3.6") + .withCmd("sleep", "10000") + .exec(); + + Thread.sleep(3000); + //then + dockerClient.startContainerCmd(container.getId()) + .exec(); + + dockerClient.stopContainerCmd(container.getId()) + .exec(); + } + + @Test + public void whenRunningContainer_thenStopContainer() throws InterruptedException { + + //when + CreateContainerResponse container + = dockerClient.createContainerCmd("alpine:3.6") + .withCmd("sleep", "10000") + .exec(); + + Thread.sleep(3000); + dockerClient.startContainerCmd(container.getId()) + .exec(); + + //then + dockerClient.stopContainerCmd(container.getId()) + .exec(); + } + + @Test + public void whenRunningContainer_thenKillContainer() throws InterruptedException { + + //when + CreateContainerResponse container + = dockerClient.createContainerCmd("alpine:3.6") + .withCmd("sleep", "10000") + .exec(); + + dockerClient.startContainerCmd(container.getId()) + .exec(); + + Thread.sleep(3000); + dockerClient.stopContainerCmd(container.getId()) + .exec(); + + //then + dockerClient.killContainerCmd(container.getId()) + .exec(); + } + + @Test + public void whenHavingContainer_thenInspectContainer() { + + //when + CreateContainerResponse container + = dockerClient.createContainerCmd("alpine:3.6") + .withCmd("sleep", "10000") + .exec(); + + //then + InspectContainerResponse containerResponse + = dockerClient.inspectContainerCmd(container.getId()) + .exec(); + + assertThat(containerResponse.getId(), is(container.getId())); + } + + + @Test + public void givenContainer_whenCommittingContainer_thenMustReturnImageId() { + + //given + CreateContainerResponse container + = dockerClient.createContainerCmd("alpine:3.6") + .withCmd("sleep", "10000") + .exec(); + + //when + String imageId = dockerClient.commitCmd(container.getId()) + .withEnv("SNAPSHOT_YEAR=2018") + .withMessage("add git support") + .withCmd("sleep", "10000") + .withRepository("alpine") + .withTag("3.6.v2").exec(); + + //then + assertThat(imageId, is(not(null))); + } + +} diff --git a/libraries/src/test/java/com/baeldung/dockerapi/DockerClientLiveTest.java b/libraries/src/test/java/com/baeldung/dockerapi/DockerClientLiveTest.java new file mode 100644 index 0000000000..1023298e25 --- /dev/null +++ b/libraries/src/test/java/com/baeldung/dockerapi/DockerClientLiveTest.java @@ -0,0 +1,83 @@ +package com.baeldung.dockerapi; + +import com.github.dockerjava.api.DockerClient; +import com.github.dockerjava.core.DefaultDockerClientConfig; +import com.github.dockerjava.core.DockerClientBuilder; +import org.junit.Test; + +import java.util.Properties; + +import static org.junit.Assert.assertNotNull; + +public class DockerClientLiveTest { + + @Test + public void whenCreatingDockerClient_thenReturnDefaultInstance() { + + //when + DefaultDockerClientConfig.Builder config + = DefaultDockerClientConfig.createDefaultConfigBuilder(); + DockerClient dockerClient = DockerClientBuilder.getInstance(config).build(); + + //then + assertNotNull(dockerClient); + } + + @Test + public void whenCreatingDockerClientWithDockerHost_thenReturnInstance() { + //when + DockerClient dockerClient + = DockerClientBuilder.getInstance("tcp://docker.bealdung.com:2375") + .build(); + + //then + assertNotNull(dockerClient); + } + + @Test + public void whenCreatingAdvanceDockerClient_thenReturnInstance() { + + //when + DefaultDockerClientConfig config + = DefaultDockerClientConfig.createDefaultConfigBuilder() + .withRegistryEmail("info@bealdung.com") + .withRegistryUrl("register.bealdung.io/v2/") + .withRegistryPassword("strongpassword") + .withRegistryUsername("bealdung") + .withDockerCertPath("/home/bealdung/public/.docker/certs") + .withDockerConfig("/home/bealdung/public/.docker/") + .withDockerTlsVerify("1") + .withDockerHost("tcp://docker.beauldung.com:2376") + .build(); + + DockerClient dockerClient = DockerClientBuilder.getInstance(config).build(); + + //then + assertNotNull(dockerClient); + } + + @Test + public void whenCreatingDockerClientWithProperties_thenReturnInstance() { + + //when + Properties properties = new Properties(); + properties.setProperty("registry.email", "info@bealdung.com"); + properties.setProperty("registry.url", "register.bealdung.io/v2/"); + properties.setProperty("registry.password", "strongpassword"); + properties.setProperty("registry.username", "bealdung"); + properties.setProperty("DOCKER_CERT_PATH", "/home/bealdung/public/.docker/certs"); + properties.setProperty("DOCKER_CONFIG", "/home/bealdung/public/.docker/"); + properties.setProperty("DOCKER_TLS_VERIFY", "1"); + properties.setProperty("DOCKER_HOST", "tcp://docker.bealdung.com:2376"); + + DefaultDockerClientConfig config + = DefaultDockerClientConfig.createDefaultConfigBuilder() + .withProperties(properties) + .build(); + + DockerClient dockerClient = DockerClientBuilder.getInstance(config).build(); + + //then + assertNotNull(dockerClient); + } +} diff --git a/libraries/src/test/java/com/baeldung/dockerapi/ImageLiveTest.java b/libraries/src/test/java/com/baeldung/dockerapi/ImageLiveTest.java new file mode 100644 index 0000000000..ef894b2773 --- /dev/null +++ b/libraries/src/test/java/com/baeldung/dockerapi/ImageLiveTest.java @@ -0,0 +1,155 @@ +package com.baeldung.dockerapi; + +import com.github.dockerjava.api.DockerClient; +import com.github.dockerjava.api.command.InspectImageResponse; +import com.github.dockerjava.api.model.Image; +import com.github.dockerjava.api.model.SearchItem; +import com.github.dockerjava.core.DockerClientBuilder; +import com.github.dockerjava.core.command.BuildImageResultCallback; +import com.github.dockerjava.core.command.PullImageResultCallback; +import com.github.dockerjava.core.command.PushImageResultCallback; +import org.junit.BeforeClass; +import org.junit.Test; + +import java.io.File; +import java.util.List; +import java.util.concurrent.TimeUnit; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.greaterThan; +import static org.hamcrest.Matchers.lessThan; +import static org.hamcrest.Matchers.not; +import static org.hamcrest.core.Is.is; + +public class ImageLiveTest { + + private static DockerClient dockerClient; + + @BeforeClass + public static void setup() { + dockerClient = DockerClientBuilder.getInstance().build(); + } + + @Test + public void whenListingImages_thenReturnNonEmptyList() { + + //when + List images = dockerClient.listImagesCmd().exec(); + + //then + assertThat(images.size(), is(not(0))); + } + + @Test + public void whenListingImagesWithIntermediateImages_thenReturnNonEmptyList() { + + //when + List images = dockerClient.listImagesCmd() + .withShowAll(true).exec(); + + //then + assertThat(images.size(), is(not(0))); + } + + @Test + public void whenListingDanglingImages_thenReturnNonNullList() { + + //when + List images = dockerClient.listImagesCmd() + .withDanglingFilter(true).exec(); + + //then + assertThat(images, is(not(null))); + } + + @Test + public void whenBuildingImage_thenMustReturnImageId() { + + //when + String imageId = dockerClient.buildImageCmd() + .withDockerfile(new File("src/test/resources/dockerapi/Dockerfile")) + .withPull(true) + .withNoCache(true) + .withTag("alpine:git") + .exec(new BuildImageResultCallback()) + .awaitImageId(); + + //then + assertThat(imageId, is(not(null))); + } + + @Test + public void givenListOfImages_whenInspectImage_thenMustReturnObject() { + + //given + List images = dockerClient.listImagesCmd().exec(); + Image image = images.get(0); + + //when + InspectImageResponse imageResponse + = dockerClient.inspectImageCmd(image.getId()).exec(); + + //then + assertThat(imageResponse.getId(), is(image.getId())); + } + + @Test + public void givenListOfImages_whenTagImage_thenListMustIncrement() { + + //given + List images = dockerClient.listImagesCmd().exec(); + Image image = images.get(0); + + //when + dockerClient.tagImageCmd(image.getId(), "baeldung/alpine", "3.6.v2").exec(); + + //then + List imagesNow = dockerClient.listImagesCmd().exec(); + assertThat(imagesNow.size(), is(greaterThan(images.size()))); + } + + public void pushingAnImage() throws InterruptedException { + + dockerClient.pushImageCmd("baeldung/alpine") + .withTag("3.6.v2") + .exec(new PushImageResultCallback()) + .awaitCompletion(90, TimeUnit.SECONDS); + } + + @Test + public void whenPullingImage_thenImageListNotEmpty() throws InterruptedException { + + //when + dockerClient.pullImageCmd("alpine") + .withTag("latest") + .exec(new PullImageResultCallback()) + .awaitCompletion(30, TimeUnit.SECONDS); + + //then + List images = dockerClient.listImagesCmd().exec(); + assertThat(images.size(), is(not(0))); + } + + @Test + public void whenRemovingImage_thenImageListDecrease() { + + //when + List images = dockerClient.listImagesCmd().exec(); + Image image = images.get(0); + dockerClient.removeImageCmd(image.getId()).exec(); + + //then + List imagesNow = dockerClient.listImagesCmd().exec(); + assertThat(imagesNow.size(), is(lessThan(images.size()))); + } + + @Test + public void whenSearchingImage_thenMustReturn25Items() { + + //when + List items = dockerClient.searchImagesCmd("Java").exec(); + + //then + assertThat(items.size(), is(25)); + } +} diff --git a/libraries/src/test/java/com/baeldung/dockerapi/NetworkLiveTest.java b/libraries/src/test/java/com/baeldung/dockerapi/NetworkLiveTest.java new file mode 100644 index 0000000000..2031a3ebb4 --- /dev/null +++ b/libraries/src/test/java/com/baeldung/dockerapi/NetworkLiveTest.java @@ -0,0 +1,91 @@ +package com.baeldung.dockerapi; + +import com.github.dockerjava.api.DockerClient; +import com.github.dockerjava.api.command.CreateNetworkResponse; +import com.github.dockerjava.api.model.Network; +import com.github.dockerjava.api.model.Network.Ipam; +import com.github.dockerjava.core.DockerClientBuilder; +import org.junit.BeforeClass; +import org.junit.Test; + +import java.util.List; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.greaterThan; +import static org.hamcrest.Matchers.not; +import static org.hamcrest.core.Is.is; + +public class NetworkLiveTest { + + private static DockerClient dockerClient; + + @BeforeClass + public static void setup() { + dockerClient = DockerClientBuilder.getInstance().build(); + } + + @Test + public void whenListingNetworks_thenSizeMustBeGreaterThanZero() { + + //when + List networks = dockerClient.listNetworksCmd().exec(); + + //then + assertThat(networks.size(), is(greaterThan(0))); + } + + @Test + public void whenCreatingNetwork_thenRetrieveResponse() { + + //when + CreateNetworkResponse networkResponse + = dockerClient.createNetworkCmd() + .withName("baeldungDefault") + .withDriver("bridge").exec(); + + //then + assertThat(networkResponse, is(not(null))); + } + + @Test + public void whenCreatingAdvanceNetwork_thenRetrieveResponse() { + + //when + CreateNetworkResponse networkResponse = dockerClient.createNetworkCmd() + .withName("baeldungAdvanced") + .withIpam(new Ipam() + .withConfig(new Ipam.Config() + .withSubnet("172.36.0.0/16") + .withIpRange("172.36.5.0/24"))) + .withDriver("bridge").exec(); + + //then + assertThat(networkResponse, is(not(null))); + } + + @Test + public void whenInspectingNetwork_thenSizeMustBeGreaterThanZero() { + + //when + String networkName = "bridge"; + Network network + = dockerClient.inspectNetworkCmd().withNetworkId(networkName).exec(); + + //then + assertThat(network.getName(), is(networkName)); + } + + @Test + public void whenCreatingNetwork_thenRemove() throws InterruptedException { + + //when + CreateNetworkResponse networkResponse + = dockerClient.createNetworkCmd() + .withName("baeldungDefault") + .withDriver("bridge").exec(); + + //then + Thread.sleep(4000); + dockerClient.removeNetworkCmd(networkResponse.getId()).exec(); + } +} diff --git a/libraries/src/test/java/com/baeldung/dockerapi/VolumeLiveTest.java b/libraries/src/test/java/com/baeldung/dockerapi/VolumeLiveTest.java new file mode 100644 index 0000000000..060af0728c --- /dev/null +++ b/libraries/src/test/java/com/baeldung/dockerapi/VolumeLiveTest.java @@ -0,0 +1,86 @@ +package com.baeldung.dockerapi; + +import com.github.dockerjava.api.DockerClient; +import com.github.dockerjava.api.command.CreateVolumeResponse; +import com.github.dockerjava.api.command.InspectVolumeResponse; +import com.github.dockerjava.api.command.ListVolumesResponse; +import com.github.dockerjava.core.DockerClientBuilder; +import org.junit.BeforeClass; +import org.junit.Test; + +import java.util.List; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.greaterThan; +import static org.hamcrest.Matchers.not; +import static org.hamcrest.core.Is.is; + +public class VolumeLiveTest { + + private static DockerClient dockerClient; + + @BeforeClass + public static void setup() { + dockerClient = DockerClientBuilder.getInstance().build(); + } + + @Test + public void whenListingVolumes_thenSizeMustBeGreaterThanZero() { + + //when + ListVolumesResponse volumesResponse = dockerClient.listVolumesCmd().exec(); + + //then + List volumes = volumesResponse.getVolumes(); + assertThat(volumes.size(), is(greaterThan(0))); + } + + @Test + public void givenVolumes_whenInspectingVolume_thenReturnNonNullResponse() { + + //given + ListVolumesResponse volumesResponse = dockerClient.listVolumesCmd().exec(); + List volumes = volumesResponse.getVolumes(); + InspectVolumeResponse volume = volumes.get(0); + + //when + InspectVolumeResponse volumeResponse + = dockerClient.inspectVolumeCmd(volume.getName()).exec(); + + //then + assertThat(volumeResponse, is(not(null))); + } + + @Test + public void whenCreatingUnnamedVolume_thenGetVolumeId() { + + //when + CreateVolumeResponse unnamedVolume = dockerClient.createVolumeCmd().exec(); + + //then + assertThat(unnamedVolume.getName(), is(not(null))); + } + + @Test + public void whenCreatingNamedVolume_thenGetVolumeId() { + + //when + CreateVolumeResponse namedVolume + = dockerClient.createVolumeCmd().withName("myNamedVolume").exec(); + + //then + assertThat(namedVolume.getName(), is(not(null))); + } + + @Test + public void whenGettingNamedVolume_thenRemove() throws InterruptedException { + + //when + CreateVolumeResponse namedVolume + = dockerClient.createVolumeCmd().withName("anotherNamedVolume").exec(); + + //then + Thread.sleep(4000); + dockerClient.removeVolumeCmd(namedVolume.getName()).exec(); + } +} diff --git a/libraries/src/test/resources/dockerapi/Dockerfile b/libraries/src/test/resources/dockerapi/Dockerfile new file mode 100644 index 0000000000..f9ad47f032 --- /dev/null +++ b/libraries/src/test/resources/dockerapi/Dockerfile @@ -0,0 +1,8 @@ +FROM alpine:3.6 + +RUN apk --update add git openssh && \ + rm -rf /var/lib/apt/lists/* && \ + rm /var/cache/apk/* + +ENTRYPOINT ["git"] +CMD ["--help"] \ No newline at end of file diff --git a/mvn-wrapper/.gitignore b/mvn-wrapper/.gitignore new file mode 100644 index 0000000000..2af7cefb0a --- /dev/null +++ b/mvn-wrapper/.gitignore @@ -0,0 +1,24 @@ +target/ +!.mvn/wrapper/maven-wrapper.jar + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr + +### NetBeans ### +nbproject/private/ +build/ +nbbuild/ +dist/ +nbdist/ +.nb-gradle/ \ No newline at end of file diff --git a/mvn-wrapper/.mvn/wrapper/maven-wrapper.jar b/mvn-wrapper/.mvn/wrapper/maven-wrapper.jar new file mode 100755 index 0000000000..f775b1c04c Binary files /dev/null and b/mvn-wrapper/.mvn/wrapper/maven-wrapper.jar differ diff --git a/mvn-wrapper/.mvn/wrapper/maven-wrapper.properties b/mvn-wrapper/.mvn/wrapper/maven-wrapper.properties new file mode 100755 index 0000000000..a447c9fa81 --- /dev/null +++ b/mvn-wrapper/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1 @@ +distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.5.2/apache-maven-3.5.2-bin.zip \ No newline at end of file diff --git a/mvn-wrapper/README.md b/mvn-wrapper/README.md new file mode 100644 index 0000000000..bd299d41ed --- /dev/null +++ b/mvn-wrapper/README.md @@ -0,0 +1,22 @@ +Setting up the Maven Wrapper on an Application +============================================== + +This is the code that shows the configurations of maven wrapper on a SpringBoot project. + +### Requirements + +- Maven +- JDK 7 + +### Running + +To build and start the server simply type + +```bash +$ ./mvn clean install +$ ./mvn spring-boot:run +``` + +Now with default configurations it will be available at: [http://localhost:8080](http://localhost:8080) + +Enjoy it :) \ No newline at end of file diff --git a/mvn-wrapper/mvnw b/mvn-wrapper/mvnw new file mode 100755 index 0000000000..e96ccd5fbb --- /dev/null +++ b/mvn-wrapper/mvnw @@ -0,0 +1,227 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Maven2 Start Up Batch script +# +# Required ENV vars: +# ------------------ +# JAVA_HOME - location of a JDK home dir +# +# Optional ENV vars +# ----------------- +# M2_HOME - location of maven2's installed home dir +# MAVEN_OPTS - parameters passed to the Java VM when running Maven +# e.g. to debug Maven itself, use +# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +# MAVEN_SKIP_RC - flag to disable loading of mavenrc files +# ---------------------------------------------------------------------------- + +if [ -z "$MAVEN_SKIP_RC" ] ; then + + if [ -f /etc/mavenrc ] ; then + . /etc/mavenrc + fi + + if [ -f "$HOME/.mavenrc" ] ; then + . "$HOME/.mavenrc" + fi + +fi + +# OS specific support. $var _must_ be set to either true or false. +cygwin=false; +darwin=false; +mingw=false +case "`uname`" in + CYGWIN*) cygwin=true ;; + MINGW*) mingw=true;; + Darwin*) darwin=true + # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home + # See https://developer.apple.com/library/mac/qa/qa1170/_index.html + if [ -z "$JAVA_HOME" ]; then + if [ -x "/usr/libexec/java_home" ]; then + export JAVA_HOME="`/usr/libexec/java_home`" + else + export JAVA_HOME="/Library/Java/Home" + fi + fi + ;; +esac + +if [ -z "$JAVA_HOME" ] ; then + if [ -r /etc/gentoo-release ] ; then + JAVA_HOME=`java-config --jre-home` + fi +fi + +if [ -z "$M2_HOME" ] ; then + ## resolve links - $0 may be a link to maven's home + PRG="$0" + + # need this for relative symlinks + while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG="`dirname "$PRG"`/$link" + fi + done + + saveddir=`pwd` + + M2_HOME=`dirname "$PRG"`/.. + + # make it fully qualified + M2_HOME=`cd "$M2_HOME" && pwd` + + cd "$saveddir" + # echo Using m2 at $M2_HOME +fi + +# For Cygwin, ensure paths are in UNIX format before anything is touched +if $cygwin ; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --unix "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --unix "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --unix "$CLASSPATH"` +fi + +# For Mingw, ensure paths are in UNIX format before anything is touched +if $mingw ; then + [ -n "$M2_HOME" ] && + M2_HOME="`(cd "$M2_HOME"; pwd)`" + [ -n "$JAVA_HOME" ] && + JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`" + # TODO classpath? +fi + +if [ -z "$JAVA_HOME" ]; then + javaExecutable="`which javac`" + if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then + # readlink(1) is not available as standard on Solaris 10. + readLink=`which readlink` + if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then + if $darwin ; then + javaHome="`dirname \"$javaExecutable\"`" + javaExecutable="`cd \"$javaHome\" && pwd -P`/javac" + else + javaExecutable="`readlink -f \"$javaExecutable\"`" + fi + javaHome="`dirname \"$javaExecutable\"`" + javaHome=`expr "$javaHome" : '\(.*\)/bin'` + JAVA_HOME="$javaHome" + export JAVA_HOME + fi + fi +fi + +if [ -z "$JAVACMD" ] ; then + if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + else + JAVACMD="`which java`" + fi +fi + +if [ ! -x "$JAVACMD" ] ; then + echo "Error: JAVA_HOME is not defined correctly." >&2 + echo " We cannot execute $JAVACMD" >&2 + exit 1 +fi + +if [ -z "$JAVA_HOME" ] ; then + echo "Warning: JAVA_HOME environment variable is not set." +fi + +CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher + +# traverses directory structure from process work directory to filesystem root +# first directory with .mvn subdirectory is considered project base directory +find_maven_basedir() { + + if [ -z "$1" ] + then + echo "Path not specified to find_maven_basedir" + return 1 + fi + + basedir="$1" + wdir="$1" + while [ "$wdir" != '/' ] ; do + if [ -d "$wdir"/.mvn ] ; then + basedir=$wdir + break + fi + # workaround for JBEAP-8937 (on Solaris 10/Sparc) + if [ -d "${wdir}" ]; then + wdir=`cd "$wdir/.."; pwd` + fi + # end of workaround + done + echo "${basedir}" +} + +# concatenates all lines of a file +concat_lines() { + if [ -f "$1" ]; then + echo "$(tr -s '\n' ' ' < "$1")" + fi +} + +BASE_DIR=`find_maven_basedir "$(pwd)"` +if [ -z "$BASE_DIR" ]; then + exit 1; +fi + +export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"} +if [ "$MVNW_VERBOSE" = true ]; then + echo $MAVEN_PROJECTBASEDIR +fi +MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" + +# For Cygwin, switch paths to Windows format before running java +if $cygwin; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --path --windows "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --windows "$CLASSPATH"` + [ -n "$MAVEN_PROJECTBASEDIR" ] && + MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"` +fi + +WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +exec "$JAVACMD" \ + $MAVEN_OPTS \ + -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ + "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ + ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/mvn-wrapper/mvnw.cmd b/mvn-wrapper/mvnw.cmd new file mode 100755 index 0000000000..4f0b068a03 --- /dev/null +++ b/mvn-wrapper/mvnw.cmd @@ -0,0 +1,145 @@ +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM http://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Maven2 Start Up Batch script +@REM +@REM Required ENV vars: +@REM JAVA_HOME - location of a JDK home dir +@REM +@REM Optional ENV vars +@REM M2_HOME - location of maven2's installed home dir +@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands +@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a key stroke before ending +@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven +@REM e.g. to debug Maven itself, use +@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files +@REM ---------------------------------------------------------------------------- + +@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' +@echo off +@REM set title of command window +title %0 +@REM enable echoing my setting MAVEN_BATCH_ECHO to 'on' +@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% + +@REM set %HOME% to equivalent of $HOME +if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") + +@REM Execute a user defined script before this one +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre +@REM check for pre script, once with legacy .bat ending and once with .cmd ending +if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat" +if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd" +:skipRcPre + +@setlocal + +set ERROR_CODE=0 + +@REM To isolate internal variables from possible post scripts, we use another setlocal +@setlocal + +@REM ==== START VALIDATION ==== +if not "%JAVA_HOME%" == "" goto OkJHome + +echo. +echo Error: JAVA_HOME not found in your environment. >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +:OkJHome +if exist "%JAVA_HOME%\bin\java.exe" goto init + +echo. +echo Error: JAVA_HOME is set to an invalid directory. >&2 +echo JAVA_HOME = "%JAVA_HOME%" >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +@REM ==== END VALIDATION ==== + +:init + +@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". +@REM Fallback to current working directory if not found. + +set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% +IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir + +set EXEC_DIR=%CD% +set WDIR=%EXEC_DIR% +:findBaseDir +IF EXIST "%WDIR%"\.mvn goto baseDirFound +cd .. +IF "%WDIR%"=="%CD%" goto baseDirNotFound +set WDIR=%CD% +goto findBaseDir + +:baseDirFound +set MAVEN_PROJECTBASEDIR=%WDIR% +cd "%EXEC_DIR%" +goto endDetectBaseDir + +:baseDirNotFound +set MAVEN_PROJECTBASEDIR=%EXEC_DIR% +cd "%EXEC_DIR%" + +:endDetectBaseDir + +IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig + +@setlocal EnableExtensions EnableDelayedExpansion +for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a +@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% + +:endReadAdditionalConfig + +SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" + +set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" +set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* +if ERRORLEVEL 1 goto error +goto end + +:error +set ERROR_CODE=1 + +:end +@endlocal & set ERROR_CODE=%ERROR_CODE% + +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost +@REM check for post script, once with legacy .bat ending and once with .cmd ending +if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat" +if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd" +:skipRcPost + +@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' +if "%MAVEN_BATCH_PAUSE%" == "on" pause + +if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE% + +exit /B %ERROR_CODE% diff --git a/mvn-wrapper/pom.xml b/mvn-wrapper/pom.xml new file mode 100644 index 0000000000..209c4b9403 --- /dev/null +++ b/mvn-wrapper/pom.xml @@ -0,0 +1,45 @@ + + + 4.0.0 + + mvn-wrapper + 0.0.1-SNAPSHOT + jar + + mvn-wrapper + Setting up the Maven Wrapper + + + parent-boot-5 + com.baeldung + 0.0.1-SNAPSHOT + ../parent-boot-5 + + + + UTF-8 + UTF-8 + 1.8 + + + + + org.springframework.boot + spring-boot-starter + + + org.springframework.boot + spring-boot-starter-web + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + diff --git a/mvn-wrapper/src/main/java/com/baeldung/MvnWrapperApplication.java b/mvn-wrapper/src/main/java/com/baeldung/MvnWrapperApplication.java new file mode 100644 index 0000000000..3007d24ed0 --- /dev/null +++ b/mvn-wrapper/src/main/java/com/baeldung/MvnWrapperApplication.java @@ -0,0 +1,11 @@ +package com.baeldung; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class MvnWrapperApplication { + public static void main(String[] args) { + SpringApplication.run(MvnWrapperApplication.class, args); + } +} diff --git a/spring-boot-actuator/README.MD b/mvn-wrapper/src/main/resources/application.properties similarity index 100% rename from spring-boot-actuator/README.MD rename to mvn-wrapper/src/main/resources/application.properties diff --git a/persistence-modules/java-cockroachdb/README.md b/persistence-modules/java-cockroachdb/README.md index 0f0381212d..3bab6faa29 100644 --- a/persistence-modules/java-cockroachdb/README.md +++ b/persistence-modules/java-cockroachdb/README.md @@ -1,2 +1,2 @@ ### Relevant Articles: -- [Guide to CockroachDB in Java](http://www.baeldung.com/) +- [Guide to CockroachDB in Java](http://www.baeldung.com/cockroachdb-java) diff --git a/pom.xml b/pom.xml index 1050bb8ba2..0d26188082 100644 --- a/pom.xml +++ b/pom.xml @@ -117,6 +117,7 @@ testing-modules/mockito-2 testing-modules/mocks mustache + mvn-wrapper noexception orientdb osgi @@ -160,6 +161,7 @@ spring-cloud spring-core spring-cucumber + spring-ejb spring-aop persistence-modules/spring-data-cassandra spring-data-couchbase-2 diff --git a/spring-boot-actuator/.gitignore b/spring-boot-actuator/.gitignore deleted file mode 100644 index 60be5b80aa..0000000000 --- a/spring-boot-actuator/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -/target/ -.settings/ -.classpath -.project diff --git a/spring-boot-actuator/pom.xml b/spring-boot-actuator/pom.xml deleted file mode 100644 index 299c7e76a5..0000000000 --- a/spring-boot-actuator/pom.xml +++ /dev/null @@ -1,122 +0,0 @@ - - 4.0.0 - com.baeldung - spring-boot-actuator - 0.0.1-SNAPSHOT - jar - spring-boot - This is simple boot application for Spring boot actuator test - - - - org.springframework.boot - spring-boot-starter-parent - 1.5.2.RELEASE - - - - - - org.springframework.boot - spring-boot-starter-web - - - - org.springframework.boot - spring-boot-starter-actuator - - - - org.springframework.boot - spring-boot-starter - - - - org.springframework.boot - spring-boot-starter-test - test - - - - - - spring-boot-actuator - - - src/main/resources - true - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.7.0 - - 1.8 - 1.8 - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - **/*IntegrationTest.java - - - - - - - - - - - integration - - - - org.apache.maven.plugins - maven-surefire-plugin - - - integration-test - - test - - - - **/*IntegrationTest.java - - - - - - - json - - - - - - - - - - - org.baeldung.MainApplication - UTF-8 - 1.8 - - - diff --git a/spring-boot-actuator/src/main/java/org/baeldung/MainApplication.java b/spring-boot-actuator/src/main/java/org/baeldung/MainApplication.java deleted file mode 100644 index 7c9054dbf8..0000000000 --- a/spring-boot-actuator/src/main/java/org/baeldung/MainApplication.java +++ /dev/null @@ -1,13 +0,0 @@ -package org.baeldung; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.baeldung.config.MainConfig; - -@SpringBootApplication -public class MainApplication { - - public static void main(String args[]) { - SpringApplication.run(MainConfig.class, args); - } -} diff --git a/spring-boot-actuator/src/main/java/org/baeldung/config/MainConfig.java b/spring-boot-actuator/src/main/java/org/baeldung/config/MainConfig.java deleted file mode 100644 index 27c97cc006..0000000000 --- a/spring-boot-actuator/src/main/java/org/baeldung/config/MainConfig.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.baeldung.config; - -import java.util.Collections; -import org.springframework.boot.actuate.info.InfoContributor; -import org.springframework.boot.autoconfigure.EnableAutoConfiguration; -import org.springframework.context.annotation.Bean; - -@EnableAutoConfiguration -public class MainConfig { - - public MainConfig() {} - - @Bean - public InfoContributor getInfoContributor() { - return (infoBuilder) -> infoBuilder.withDetail("applicationInfo", Collections.singletonMap("ActiveUserCount", "10")); - } -} diff --git a/spring-boot-actuator/src/main/resources/application.properties b/spring-boot-actuator/src/main/resources/application.properties deleted file mode 100644 index 835c78eda2..0000000000 --- a/spring-boot-actuator/src/main/resources/application.properties +++ /dev/null @@ -1 +0,0 @@ -info.app.name=Sample application \ No newline at end of file diff --git a/spring-boot-actuator/src/test/java/org/baeldung/config/ActuatorInfoIntegrationTest.java b/spring-boot-actuator/src/test/java/org/baeldung/config/ActuatorInfoIntegrationTest.java deleted file mode 100644 index 0b5e3b3eef..0000000000 --- a/spring-boot-actuator/src/test/java/org/baeldung/config/ActuatorInfoIntegrationTest.java +++ /dev/null @@ -1,32 +0,0 @@ -package org.baeldung.config; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.web.client.TestRestTemplate; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.test.context.TestPropertySource; -import org.springframework.test.context.junit4.SpringRunner; -import static org.junit.Assert.*; -import java.io.IOException; -import java.nio.file.Files; -import java.nio.file.Paths; - -@RunWith(SpringRunner.class) -@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = MainConfig.class) -@TestPropertySource(properties = { "security.basic.enabled=false" }) -public class ActuatorInfoIntegrationTest { - - @Autowired - private TestRestTemplate restTemplate; - - @Test - public void whenGetInfo_thenAdditionalInfoReturned() throws IOException { - final String expectedResponse = new String(Files.readAllBytes(Paths.get("src/test/resources/expectedResponse.json"))); - final ResponseEntity responseEntity = this.restTemplate.getForEntity("/info", String.class); - assertEquals(HttpStatus.OK, responseEntity.getStatusCode()); - assertEquals(expectedResponse, responseEntity.getBody()); - } -} \ No newline at end of file diff --git a/spring-boot-actuator/src/test/resources/expectedResponse.json b/spring-boot-actuator/src/test/resources/expectedResponse.json deleted file mode 100644 index caa0bdbbf8..0000000000 --- a/spring-boot-actuator/src/test/resources/expectedResponse.json +++ /dev/null @@ -1 +0,0 @@ -{"app":{"name":"Sample application"},"applicationInfo":{"ActiveUserCount":"10"}} \ No newline at end of file diff --git a/spring-cloud/pom.xml b/spring-cloud/pom.xml index 374f7010c6..d94b334bc8 100644 --- a/spring-cloud/pom.xml +++ b/spring-cloud/pom.xml @@ -20,7 +20,8 @@ spring-cloud-connectors-heroku spring-cloud-aws spring-cloud-consul - + spring-cloud-zuul-eureka-integration + pom spring-cloud @@ -45,6 +46,7 @@ 1.4.2.RELEASE 3.7.0 1.4.2.RELEASE + 1.2.3.RELEASE diff --git a/spring-cloud/spring-cloud-zuul-eureka-integration/bin/eureka-client/pom.xml b/spring-cloud/spring-cloud-zuul-eureka-integration/bin/eureka-client/pom.xml new file mode 100644 index 0000000000..a3185a44d4 --- /dev/null +++ b/spring-cloud/spring-cloud-zuul-eureka-integration/bin/eureka-client/pom.xml @@ -0,0 +1,68 @@ + + + 4.0.0 + + eureka-client + 1.0.0-SNAPSHOT + jar + + Spring Cloud Eureka Client + Spring Cloud Eureka Sample Client + + + com.baeldung.spring.cloud + spring-cloud-zuul-eureka-integration + 1.0.0-SNAPSHOT + + + + + org.springframework.cloud + spring-cloud-starter-eureka + ${spring-cloud-starter-eureka.version} + + + org.springframework.boot + spring-boot-starter-web + ${spring-boot-starter-web.version} + + + + + + + org.springframework.cloud + spring-cloud-starter-parent + ${spring-cloud-dependencies.version} + pom + import + + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.7.0 + + 1.8 + 1.8 + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + + Brixton.SR7 + 1.2.3.RELEASE + 1.4.2.RELEASE + + diff --git a/spring-cloud/spring-cloud-zuul-eureka-integration/bin/eureka-client/src/main/resources/application.yml b/spring-cloud/spring-cloud-zuul-eureka-integration/bin/eureka-client/src/main/resources/application.yml new file mode 100644 index 0000000000..08624aa159 --- /dev/null +++ b/spring-cloud/spring-cloud-zuul-eureka-integration/bin/eureka-client/src/main/resources/application.yml @@ -0,0 +1,13 @@ +spring: + application: + name: spring-cloud-eureka-client + +server: + port: 0 + +eureka: + client: + serviceUrl: + defaultZone: ${EUREKA_URI:http://localhost:8761/eureka} + instance: + preferIpAddress: true \ No newline at end of file diff --git a/spring-cloud/spring-cloud-zuul-eureka-integration/bin/eureka-server/pom.xml b/spring-cloud/spring-cloud-zuul-eureka-integration/bin/eureka-server/pom.xml new file mode 100644 index 0000000000..d86cfa8589 --- /dev/null +++ b/spring-cloud/spring-cloud-zuul-eureka-integration/bin/eureka-server/pom.xml @@ -0,0 +1,68 @@ + + + 4.0.0 + + eureka-server + 1.0.0-SNAPSHOT + jar + + Spring Cloud Eureka Server + Spring Cloud Eureka Server Demo + + + com.baeldung.spring.cloud + spring-cloud-zuul-eureka-integration + 1.0.0-SNAPSHOT + + + + + org.springframework.cloud + spring-cloud-starter-eureka-server + ${spring-cloud-starter-eureka.version} + + + commons-configuration + commons-configuration + ${commons-config.version} + + + + + + + + org.springframework.cloud + spring-cloud-starter-parent + ${spring-cloud-dependencies.version} + pom + import + + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.7.0 + + 1.8 + 1.8 + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + + Brixton.SR7 + 1.2.3.RELEASE + + diff --git a/spring-cloud/spring-cloud-zuul-eureka-integration/bin/eureka-server/src/main/resources/application.yml b/spring-cloud/spring-cloud-zuul-eureka-integration/bin/eureka-server/src/main/resources/application.yml new file mode 100644 index 0000000000..49c3179bb5 --- /dev/null +++ b/spring-cloud/spring-cloud-zuul-eureka-integration/bin/eureka-server/src/main/resources/application.yml @@ -0,0 +1,7 @@ +server: + port: 8761 + +eureka: + client: + registerWithEureka: false + fetchRegistry: false \ No newline at end of file diff --git a/spring-cloud/spring-cloud-zuul-eureka-integration/bin/pom.xml b/spring-cloud/spring-cloud-zuul-eureka-integration/bin/pom.xml new file mode 100644 index 0000000000..fabad77a77 --- /dev/null +++ b/spring-cloud/spring-cloud-zuul-eureka-integration/bin/pom.xml @@ -0,0 +1,55 @@ + + + 4.0.0 + + com.baeldung.spring.cloud + spring-cloud-zuul-eureka-integration + 1.0.0-SNAPSHOT + + pom + + Spring Cloud Zuul and Eureka Integration + Spring Cloud Zuul and Eureka Integration + + + com.baeldung.spring.cloud + spring-cloud + 1.0.0-SNAPSHOT + .. + + + + UTF-8 + 3.7.0 + 1.4.2.RELEASE + 1.10 + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + ${maven-compiler-plugin.version} + + 1.8 + 1.8 + + + + org.springframework.boot + spring-boot-maven-plugin + ${spring-boot-maven-plugin.version} + + + + + + zuul-server + eureka-server + eureka-client + + diff --git a/spring-cloud/spring-cloud-zuul-eureka-integration/bin/zuul-server/pom.xml b/spring-cloud/spring-cloud-zuul-eureka-integration/bin/zuul-server/pom.xml new file mode 100644 index 0000000000..2622a3e36b --- /dev/null +++ b/spring-cloud/spring-cloud-zuul-eureka-integration/bin/zuul-server/pom.xml @@ -0,0 +1,61 @@ + + 4.0.0 + + com.baeldung.spring.cloud + spring-cloud-zuul-eureka-integration + 1.0.0-SNAPSHOT + + zuul-server + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.cloud + spring-cloud-starter-zuul + + + org.springframework.cloud + spring-cloud-starter-eureka + + + commons-configuration + commons-configuration + ${commons-config.version} + + + org.springframework.boot + spring-boot-starter-security + + + + + + org.springframework.cloud + spring-cloud-starter-parent + ${spring-cloud-dependencies.version} + pom + import + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.7.0 + + 1.8 + 1.8 + + + + org.springframework.boot + spring-boot-maven-plugin + + + + \ No newline at end of file diff --git a/spring-cloud/spring-cloud-zuul-eureka-integration/bin/zuul-server/src/main/resources/application.properties b/spring-cloud/spring-cloud-zuul-eureka-integration/bin/zuul-server/src/main/resources/application.properties new file mode 100644 index 0000000000..cb1dca78c2 --- /dev/null +++ b/spring-cloud/spring-cloud-zuul-eureka-integration/bin/zuul-server/src/main/resources/application.properties @@ -0,0 +1,9 @@ +server.port=8762 +spring.application.name=zuul-server +eureka.instance.preferIpAddress=true +eureka.client.registerWithEureka=true +eureka.client.fetchRegistry=true +eureka.serviceurl.defaultzone=http://localhost:8761/eureka/ +management.security.enabled=false +security.basic.enabled=false +hystrix.command.default.execution.timeout.enabled=false diff --git a/spring-cloud/spring-cloud-zuul-eureka-integration/eureka-client/pom.xml b/spring-cloud/spring-cloud-zuul-eureka-integration/eureka-client/pom.xml new file mode 100644 index 0000000000..a3185a44d4 --- /dev/null +++ b/spring-cloud/spring-cloud-zuul-eureka-integration/eureka-client/pom.xml @@ -0,0 +1,68 @@ + + + 4.0.0 + + eureka-client + 1.0.0-SNAPSHOT + jar + + Spring Cloud Eureka Client + Spring Cloud Eureka Sample Client + + + com.baeldung.spring.cloud + spring-cloud-zuul-eureka-integration + 1.0.0-SNAPSHOT + + + + + org.springframework.cloud + spring-cloud-starter-eureka + ${spring-cloud-starter-eureka.version} + + + org.springframework.boot + spring-boot-starter-web + ${spring-boot-starter-web.version} + + + + + + + org.springframework.cloud + spring-cloud-starter-parent + ${spring-cloud-dependencies.version} + pom + import + + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.7.0 + + 1.8 + 1.8 + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + + Brixton.SR7 + 1.2.3.RELEASE + 1.4.2.RELEASE + + diff --git a/spring-cloud/spring-cloud-zuul-eureka-integration/eureka-client/src/main/java/com/baeldung/spring/cloud/eureka/client/EurekaClientApplication.java b/spring-cloud/spring-cloud-zuul-eureka-integration/eureka-client/src/main/java/com/baeldung/spring/cloud/eureka/client/EurekaClientApplication.java new file mode 100644 index 0000000000..906d6e4cfd --- /dev/null +++ b/spring-cloud/spring-cloud-zuul-eureka-integration/eureka-client/src/main/java/com/baeldung/spring/cloud/eureka/client/EurekaClientApplication.java @@ -0,0 +1,32 @@ +package com.baeldung.spring.cloud.eureka.client; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.netflix.eureka.EnableEurekaClient; +import org.springframework.context.annotation.Lazy; +import org.springframework.web.bind.annotation.RestController; + +import com.netflix.discovery.EurekaClient; + +@SpringBootApplication +@EnableEurekaClient +@RestController +public class EurekaClientApplication implements GreetingController { + @Autowired + @Lazy + private EurekaClient eurekaClient; + + @Value("${spring.application.name}") + private String appName; + + public static void main(String[] args) { + SpringApplication.run(EurekaClientApplication.class, args); + } + + @Override + public String greeting() { + return String.format("Hello from '%s'!", eurekaClient.getApplication(appName).getName()); + } +} diff --git a/spring-cloud/spring-cloud-zuul-eureka-integration/eureka-client/src/main/java/com/baeldung/spring/cloud/eureka/client/GreetingController.java b/spring-cloud/spring-cloud-zuul-eureka-integration/eureka-client/src/main/java/com/baeldung/spring/cloud/eureka/client/GreetingController.java new file mode 100644 index 0000000000..33ee2574b7 --- /dev/null +++ b/spring-cloud/spring-cloud-zuul-eureka-integration/eureka-client/src/main/java/com/baeldung/spring/cloud/eureka/client/GreetingController.java @@ -0,0 +1,8 @@ +package com.baeldung.spring.cloud.eureka.client; + +import org.springframework.web.bind.annotation.RequestMapping; + +public interface GreetingController { + @RequestMapping("/greeting") + String greeting(); +} diff --git a/spring-cloud/spring-cloud-zuul-eureka-integration/eureka-client/src/main/resources/application.yml b/spring-cloud/spring-cloud-zuul-eureka-integration/eureka-client/src/main/resources/application.yml new file mode 100644 index 0000000000..08624aa159 --- /dev/null +++ b/spring-cloud/spring-cloud-zuul-eureka-integration/eureka-client/src/main/resources/application.yml @@ -0,0 +1,13 @@ +spring: + application: + name: spring-cloud-eureka-client + +server: + port: 0 + +eureka: + client: + serviceUrl: + defaultZone: ${EUREKA_URI:http://localhost:8761/eureka} + instance: + preferIpAddress: true \ No newline at end of file diff --git a/spring-cloud/spring-cloud-zuul-eureka-integration/eureka-server/pom.xml b/spring-cloud/spring-cloud-zuul-eureka-integration/eureka-server/pom.xml new file mode 100644 index 0000000000..d86cfa8589 --- /dev/null +++ b/spring-cloud/spring-cloud-zuul-eureka-integration/eureka-server/pom.xml @@ -0,0 +1,68 @@ + + + 4.0.0 + + eureka-server + 1.0.0-SNAPSHOT + jar + + Spring Cloud Eureka Server + Spring Cloud Eureka Server Demo + + + com.baeldung.spring.cloud + spring-cloud-zuul-eureka-integration + 1.0.0-SNAPSHOT + + + + + org.springframework.cloud + spring-cloud-starter-eureka-server + ${spring-cloud-starter-eureka.version} + + + commons-configuration + commons-configuration + ${commons-config.version} + + + + + + + + org.springframework.cloud + spring-cloud-starter-parent + ${spring-cloud-dependencies.version} + pom + import + + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.7.0 + + 1.8 + 1.8 + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + + Brixton.SR7 + 1.2.3.RELEASE + + diff --git a/spring-cloud/spring-cloud-zuul-eureka-integration/eureka-server/src/main/java/com/baeldung/spring/cloud/eureka/server/EurekaServerApplication.java b/spring-cloud/spring-cloud-zuul-eureka-integration/eureka-server/src/main/java/com/baeldung/spring/cloud/eureka/server/EurekaServerApplication.java new file mode 100644 index 0000000000..d55145448d --- /dev/null +++ b/spring-cloud/spring-cloud-zuul-eureka-integration/eureka-server/src/main/java/com/baeldung/spring/cloud/eureka/server/EurekaServerApplication.java @@ -0,0 +1,13 @@ +package com.baeldung.spring.cloud.eureka.server; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.netflix.eureka.server.EnableEurekaServer; + +@SpringBootApplication +@EnableEurekaServer +public class EurekaServerApplication { + public static void main(String[] args) { + SpringApplication.run(EurekaServerApplication.class, args); + } +} diff --git a/spring-cloud/spring-cloud-zuul-eureka-integration/eureka-server/src/main/resources/application.yml b/spring-cloud/spring-cloud-zuul-eureka-integration/eureka-server/src/main/resources/application.yml new file mode 100644 index 0000000000..49c3179bb5 --- /dev/null +++ b/spring-cloud/spring-cloud-zuul-eureka-integration/eureka-server/src/main/resources/application.yml @@ -0,0 +1,7 @@ +server: + port: 8761 + +eureka: + client: + registerWithEureka: false + fetchRegistry: false \ No newline at end of file diff --git a/spring-cloud/spring-cloud-zuul-eureka-integration/pom.xml b/spring-cloud/spring-cloud-zuul-eureka-integration/pom.xml new file mode 100644 index 0000000000..b4c7188abe --- /dev/null +++ b/spring-cloud/spring-cloud-zuul-eureka-integration/pom.xml @@ -0,0 +1,56 @@ + + + 4.0.0 + + com.baeldung.spring.cloud + spring-cloud-zuul-eureka-integration + 1.0.0-SNAPSHOT + + pom + + Spring Cloud Zuul and Eureka Integration + Spring Cloud Zuul and Eureka Integration + + + com.baeldung.spring.cloud + spring-cloud + 1.0.0-SNAPSHOT + .. + + + + UTF-8 + 3.7.0 + 1.4.2.RELEASE + 1.10 + 1.2.10 + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + ${maven-compiler-plugin.version} + + 1.8 + 1.8 + + + + org.springframework.boot + spring-boot-maven-plugin + ${spring-boot-maven-plugin.version} + + + + + + zuul-server + eureka-server + eureka-client + + diff --git a/spring-cloud/spring-cloud-zuul-eureka-integration/zuul-server/pom.xml b/spring-cloud/spring-cloud-zuul-eureka-integration/zuul-server/pom.xml new file mode 100644 index 0000000000..b68fd63155 --- /dev/null +++ b/spring-cloud/spring-cloud-zuul-eureka-integration/zuul-server/pom.xml @@ -0,0 +1,66 @@ + + 4.0.0 + + com.baeldung.spring.cloud + spring-cloud-zuul-eureka-integration + 1.0.0-SNAPSHOT + + zuul-server + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.cloud + spring-cloud-starter-zuul + + + org.springframework.cloud + spring-cloud-starter-eureka + + + commons-configuration + commons-configuration + ${commons-config.version} + + + io.reactivex + rxjava + ${rxjava.version} + + + org.springframework.boot + spring-boot-starter-security + + + + + + org.springframework.cloud + spring-cloud-starter-parent + ${spring-cloud-dependencies.version} + pom + import + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.7.0 + + 1.8 + 1.8 + + + + org.springframework.boot + spring-boot-maven-plugin + + + + \ No newline at end of file diff --git a/spring-cloud/spring-cloud-zuul-eureka-integration/zuul-server/src/main/java/com/baeldung/spring/cloud/zuul/config/ZuulConfig.java b/spring-cloud/spring-cloud-zuul-eureka-integration/zuul-server/src/main/java/com/baeldung/spring/cloud/zuul/config/ZuulConfig.java new file mode 100644 index 0000000000..52488cad69 --- /dev/null +++ b/spring-cloud/spring-cloud-zuul-eureka-integration/zuul-server/src/main/java/com/baeldung/spring/cloud/zuul/config/ZuulConfig.java @@ -0,0 +1,15 @@ +package com.baeldung.spring.cloud.zuul.config; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.client.discovery.EnableDiscoveryClient; +import org.springframework.cloud.netflix.zuul.EnableZuulProxy; + +@SpringBootApplication +@EnableZuulProxy +@EnableDiscoveryClient +public class ZuulConfig { + public static void main(String[] args) { + SpringApplication.run(ZuulConfig.class, args); + } +} diff --git a/spring-cloud/spring-cloud-zuul-eureka-integration/zuul-server/src/main/resources/application.properties b/spring-cloud/spring-cloud-zuul-eureka-integration/zuul-server/src/main/resources/application.properties new file mode 100644 index 0000000000..cb1dca78c2 --- /dev/null +++ b/spring-cloud/spring-cloud-zuul-eureka-integration/zuul-server/src/main/resources/application.properties @@ -0,0 +1,9 @@ +server.port=8762 +spring.application.name=zuul-server +eureka.instance.preferIpAddress=true +eureka.client.registerWithEureka=true +eureka.client.fetchRegistry=true +eureka.serviceurl.defaultzone=http://localhost:8761/eureka/ +management.security.enabled=false +security.basic.enabled=false +hystrix.command.default.execution.timeout.enabled=false diff --git a/spring-ejb/ejb-remote-for-spring/pom.xml b/spring-ejb/ejb-remote-for-spring/pom.xml new file mode 100755 index 0000000000..fd1095420c --- /dev/null +++ b/spring-ejb/ejb-remote-for-spring/pom.xml @@ -0,0 +1,76 @@ + + + 4.0.0 + + + com.baeldung.spring.ejb + ejb-for-spring + 1.0.1 + + + ejb-remote-for-spring + ejb + + + + javax + javaee-api + provided + + + org.assertj + assertj-core + 3.9.0 + test + + + + + + + + wildfly-standalone + + false + + + + + org.codehaus.cargo + cargo-maven2-plugin + ${cargo-maven2-plugin.version} + + + + + wildfly10x + + http://download.jboss.org/wildfly/10.1.0.Final/wildfly-10.1.0.Final.zip + + + + + + 127.0.0.1 + standalone-full + 9990 + testUser:admin1234! + + + + + + + + + + + + 7.0 + 1.6.1 + + + + + diff --git a/spring-ejb/ejb-remote-for-spring/src/main/java/com/baeldung/ejb/tutorial/HelloStatefulWorld.java b/spring-ejb/ejb-remote-for-spring/src/main/java/com/baeldung/ejb/tutorial/HelloStatefulWorld.java new file mode 100644 index 0000000000..6d1c26ef4a --- /dev/null +++ b/spring-ejb/ejb-remote-for-spring/src/main/java/com/baeldung/ejb/tutorial/HelloStatefulWorld.java @@ -0,0 +1,11 @@ +package com.baeldung.ejb.tutorial; + +import javax.ejb.Remote; + +@Remote +public interface HelloStatefulWorld { + + int howManyTimes(); + String getHelloWorld(); + +} diff --git a/spring-ejb/ejb-remote-for-spring/src/main/java/com/baeldung/ejb/tutorial/HelloStatefulWorldBean.java b/spring-ejb/ejb-remote-for-spring/src/main/java/com/baeldung/ejb/tutorial/HelloStatefulWorldBean.java new file mode 100644 index 0000000000..0619f5593a --- /dev/null +++ b/spring-ejb/ejb-remote-for-spring/src/main/java/com/baeldung/ejb/tutorial/HelloStatefulWorldBean.java @@ -0,0 +1,19 @@ +package com.baeldung.ejb.tutorial; + +import javax.ejb.Stateful; + +@Stateful(name = "HelloStatefulWorld") +public class HelloStatefulWorldBean implements HelloStatefulWorld { + + private int howManyTimes = 0; + + public int howManyTimes() { + return howManyTimes; + } + + public String getHelloWorld() { + howManyTimes++; + return "Hello Stateful World!"; + } + +} diff --git a/spring-ejb/ejb-remote-for-spring/src/main/java/com/baeldung/ejb/tutorial/HelloStatelessWorld.java b/spring-ejb/ejb-remote-for-spring/src/main/java/com/baeldung/ejb/tutorial/HelloStatelessWorld.java new file mode 100755 index 0000000000..6b4db29e95 --- /dev/null +++ b/spring-ejb/ejb-remote-for-spring/src/main/java/com/baeldung/ejb/tutorial/HelloStatelessWorld.java @@ -0,0 +1,10 @@ +package com.baeldung.ejb.tutorial; + +import javax.ejb.Remote; + +@Remote +public interface HelloStatelessWorld { + + String getHelloWorld(); + +} diff --git a/spring-ejb/ejb-remote-for-spring/src/main/java/com/baeldung/ejb/tutorial/HelloStatelessWorldBean.java b/spring-ejb/ejb-remote-for-spring/src/main/java/com/baeldung/ejb/tutorial/HelloStatelessWorldBean.java new file mode 100755 index 0000000000..7de499c618 --- /dev/null +++ b/spring-ejb/ejb-remote-for-spring/src/main/java/com/baeldung/ejb/tutorial/HelloStatelessWorldBean.java @@ -0,0 +1,12 @@ +package com.baeldung.ejb.tutorial; + +import javax.ejb.Stateless; + +@Stateless(name = "HelloStatelessWorld") +public class HelloStatelessWorldBean implements HelloStatelessWorld { + + public String getHelloWorld() { + return "Hello Stateless World!"; + } + +} diff --git a/spring-ejb/ejb-remote-for-spring/src/main/resources/META-INF/ejb-jar.xml b/spring-ejb/ejb-remote-for-spring/src/main/resources/META-INF/ejb-jar.xml new file mode 100755 index 0000000000..f51523ac14 --- /dev/null +++ b/spring-ejb/ejb-remote-for-spring/src/main/resources/META-INF/ejb-jar.xml @@ -0,0 +1,7 @@ + + + ejb-remote-for-spring + + diff --git a/spring-ejb/ejb-remote-for-spring/src/test/java/com/baeldung/ejb/tutorial/HelloStatefulWorldTestUnitTest.java b/spring-ejb/ejb-remote-for-spring/src/test/java/com/baeldung/ejb/tutorial/HelloStatefulWorldTestUnitTest.java new file mode 100644 index 0000000000..61373079f6 --- /dev/null +++ b/spring-ejb/ejb-remote-for-spring/src/test/java/com/baeldung/ejb/tutorial/HelloStatefulWorldTestUnitTest.java @@ -0,0 +1,32 @@ +package com.baeldung.ejb.tutorial; + +import static org.assertj.core.api.Assertions.assertThat; + +import org.junit.Before; +import org.junit.Test; + +public class HelloStatefulWorldTestUnitTest { + + private HelloStatefulWorldBean statefulBean; + + @Before + public void setup() { + statefulBean = new HelloStatefulWorldBean(); + } + + @Test + public void whenGetHelloWorld_thenHelloStatefulWorldIsReturned() { + String helloWorld = statefulBean.getHelloWorld(); + + assertThat(helloWorld).isEqualTo("Hello Stateful World!"); + } + + @Test + public void whenGetHelloWorldIsCalledTwice_thenCounterIs2() { + statefulBean.getHelloWorld(); + statefulBean.getHelloWorld(); + + assertThat(statefulBean.howManyTimes()).isEqualTo(2); + } + +} diff --git a/spring-ejb/ejb-remote-for-spring/src/test/java/com/baeldung/ejb/tutorial/HelloStatelessWorldTestUnitTest.java b/spring-ejb/ejb-remote-for-spring/src/test/java/com/baeldung/ejb/tutorial/HelloStatelessWorldTestUnitTest.java new file mode 100644 index 0000000000..b95618e4d4 --- /dev/null +++ b/spring-ejb/ejb-remote-for-spring/src/test/java/com/baeldung/ejb/tutorial/HelloStatelessWorldTestUnitTest.java @@ -0,0 +1,24 @@ +package com.baeldung.ejb.tutorial; + +import static org.assertj.core.api.Assertions.assertThat; + +import org.junit.Before; +import org.junit.Test; + +public class HelloStatelessWorldTestUnitTest { + + private HelloStatelessWorldBean statelessBean; + + @Before + public void setup() { + statelessBean = new HelloStatelessWorldBean(); + } + + @Test + public void whenGetHelloWorld_thenHelloStatelessWorldIsReturned() { + String helloWorld = statelessBean.getHelloWorld(); + + assertThat(helloWorld).isEqualTo("Hello Stateless World!"); + } + +} diff --git a/spring-ejb/pom.xml b/spring-ejb/pom.xml new file mode 100755 index 0000000000..0b2a8445c5 --- /dev/null +++ b/spring-ejb/pom.xml @@ -0,0 +1,77 @@ + + + 4.0.0 + com.baeldung.spring.ejb + ejb-for-spring + 1.0.1 + pom + ejb + Spring EJB Tutorial + + + com.baeldung + parent-modules + 1.0.0-SNAPSHOT + + + + + jboss-public-repository-group + JBoss Public Maven Repository Group + http://repository.jboss.org/nexus/content/groups/public/ + default + + true + never + + + true + never + + + + + + + + com.baeldung.spring.ejb + ejb-remote-for-spring + 1.0.1 + ejb + + + javax + javaee-api + 7.0 + provided + + + org.wildfly + wildfly-ejb-client-bom + 10.1.0.Final + pom + import + + + + + + + + + maven-ejb-plugin + 2.4 + + 3.2 + + + + + + + + ejb-remote-for-spring + spring-ejb-client + + diff --git a/spring-ejb/spring-ejb-client/pom.xml b/spring-ejb/spring-ejb-client/pom.xml new file mode 100644 index 0000000000..c77ce09a2d --- /dev/null +++ b/spring-ejb/spring-ejb-client/pom.xml @@ -0,0 +1,100 @@ + + + 4.0.0 + + spring-ejb-client + jar + + spring-ejb-client + Spring EJB Client + + + com.baeldung + parent-boot-5 + 0.0.1-SNAPSHOT + ../../parent-boot-5 + + + + UTF-8 + UTF-8 + 1.8 + + + + + org.springframework.boot + spring-boot-starter-web + + + + org.wildfly + wildfly-ejb-client-bom + 10.1.0.Final + pom + + + + com.baeldung.spring.ejb + ejb-remote-for-spring + 1.0.1 + ejb + + + + org.springframework.boot + spring-boot-starter-test + test + + + + + + + org.springframework.boot + spring-boot-maven-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 + + + + + + diff --git a/spring-ejb/spring-ejb-client/src/main/java/com/baeldung/springejbclient/SpringEjbClientApplication.java b/spring-ejb/spring-ejb-client/src/main/java/com/baeldung/springejbclient/SpringEjbClientApplication.java new file mode 100644 index 0000000000..d3542a2158 --- /dev/null +++ b/spring-ejb/spring-ejb-client/src/main/java/com/baeldung/springejbclient/SpringEjbClientApplication.java @@ -0,0 +1,50 @@ +package com.baeldung.springejbclient; + +import java.util.Properties; + +import javax.naming.Context; +import javax.naming.InitialContext; +import javax.naming.NamingException; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.context.annotation.Bean; + +import com.baeldung.ejb.tutorial.HelloStatefulWorld; +import com.baeldung.ejb.tutorial.HelloStatelessWorld; + +@SpringBootApplication +public class SpringEjbClientApplication { + + @Bean + public Context context() throws NamingException { + Properties jndiProps = new Properties(); + jndiProps.put("java.naming.factory.initial", "org.jboss.naming.remote.client.InitialContextFactory"); + jndiProps.put("jboss.naming.client.ejb.context", true); + jndiProps.put("java.naming.provider.url", "http-remoting://localhost:8080"); + return new InitialContext(jndiProps); + } + + @Bean + public HelloStatelessWorld helloStatelessWorld(Context context) throws NamingException { + return (HelloStatelessWorld) context.lookup(this.getFullName(HelloStatelessWorld.class)); + } + + @Bean + public HelloStatefulWorld helloStatefulWorld(Context context) throws NamingException { + return (HelloStatefulWorld) context.lookup(this.getFullName(HelloStatefulWorld.class)); + } + + @SuppressWarnings("rawtypes") + private String getFullName(Class classType) { + String moduleName = "ejb-remote-for-spring/"; + String beanName = classType.getSimpleName(); + String viewClassName = classType.getName(); + + return moduleName + beanName + "!" + viewClassName; + } + + public static void main(String[] args) { + SpringApplication.run(SpringEjbClientApplication.class, args); + } +} diff --git a/spring-ejb/spring-ejb-client/src/main/java/com/baeldung/springejbclient/endpoint/HomeEndpoint.java b/spring-ejb/spring-ejb-client/src/main/java/com/baeldung/springejbclient/endpoint/HomeEndpoint.java new file mode 100644 index 0000000000..e72e3b310e --- /dev/null +++ b/spring-ejb/spring-ejb-client/src/main/java/com/baeldung/springejbclient/endpoint/HomeEndpoint.java @@ -0,0 +1,30 @@ +package com.baeldung.springejbclient.endpoint; + +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; + +import com.baeldung.ejb.tutorial.HelloStatefulWorld; +import com.baeldung.ejb.tutorial.HelloStatelessWorld; + +@RestController +public class HomeEndpoint { + + private HelloStatelessWorld helloStatelessWorld; + private HelloStatefulWorld helloStatefulWorld; + + public HomeEndpoint(HelloStatelessWorld helloStatelessWorld, HelloStatefulWorld helloStatefulWorld) { + this.helloStatelessWorld = helloStatelessWorld; + this.helloStatefulWorld = helloStatefulWorld; + } + + @GetMapping("/stateless") + public String getStateless() { + return helloStatelessWorld.getHelloWorld(); + } + + @GetMapping("/stateful") + public String getStateful() { + return helloStatefulWorld.getHelloWorld() + " called " + helloStatefulWorld.howManyTimes() + " times"; + } + +} diff --git a/spring-ejb/spring-ejb-client/src/main/resources/application.properties b/spring-ejb/spring-ejb-client/src/main/resources/application.properties new file mode 100644 index 0000000000..d564d40356 --- /dev/null +++ b/spring-ejb/spring-ejb-client/src/main/resources/application.properties @@ -0,0 +1,3 @@ +server.port=8081 + +#logging.level.root=DEBUG \ No newline at end of file diff --git a/spring-ejb/spring-ejb-client/src/test/java/com/baeldung/springejbclient/SpringEjbClientApplicationIntegrationTest.java b/spring-ejb/spring-ejb-client/src/test/java/com/baeldung/springejbclient/SpringEjbClientApplicationIntegrationTest.java new file mode 100644 index 0000000000..89c88fe5a5 --- /dev/null +++ b/spring-ejb/spring-ejb-client/src/test/java/com/baeldung/springejbclient/SpringEjbClientApplicationIntegrationTest.java @@ -0,0 +1,11 @@ +package com.baeldung.springejbclient; + +import org.junit.Test; + +public class SpringEjbClientApplicationIntegrationTest { + + @Test + public void contextLoads() { + } + +} diff --git a/spring-mvc-push/.gitignore b/spring-mvc-push/.gitignore new file mode 100644 index 0000000000..448298d47f --- /dev/null +++ b/spring-mvc-push/.gitignore @@ -0,0 +1 @@ +/.tern-project diff --git a/spring-mvc-push/pom.xml b/spring-mvc-push/pom.xml new file mode 100644 index 0000000000..2eb10381be --- /dev/null +++ b/spring-mvc-push/pom.xml @@ -0,0 +1,91 @@ + + 4.0.0 + com.baeldung + spring-mvc-push + war + 0.0.1-SNAPSHOT + spring-mvc-push + + 1.8 + 1.8 + 2.20 + 3.7.0 + 3.2.0 + UTF-8 + 5.0.2 + 5.0.2.RELEASE + 4.0.0 + 1.2 + 2.3.2-b02 + 5.0.2 + 1.0.2 + + + + org.springframework + spring-webmvc + ${spring.version} + + + javax.servlet + javax.servlet-api + ${servlet.version} + provided + + + javax.servlet + jstl + ${jstl.version} + + + javax.servlet.jsp + javax.servlet.jsp-api + ${jsp-api.version} + + + + org.springframework + spring-test + ${spring.version} + test + + + org.junit.jupiter + junit-jupiter-engine + ${junit.jupiter.version} + test + + + + + + org.apache.maven.plugins + maven-compiler-plugin + ${maven.compiler.version} + + + org.apache.maven.plugins + maven-war-plugin + ${maven-war-plugin.version} + + spring-mvc-push + false + ${deploy-path} + + + + maven-surefire-plugin + ${maven-surefire-plugin.version} + + + org.junit.platform + junit-platform-surefire-provider + ${junit.platform.version} + + + + + spring-mvc-push + + diff --git a/spring-mvc-push/src/main/java/com/baeldung/config/PushConfiguration.java b/spring-mvc-push/src/main/java/com/baeldung/config/PushConfiguration.java new file mode 100644 index 0000000000..e6188da92d --- /dev/null +++ b/spring-mvc-push/src/main/java/com/baeldung/config/PushConfiguration.java @@ -0,0 +1,48 @@ +package com.baeldung.config; + +import javax.servlet.ServletContext; +import javax.servlet.ServletException; +import javax.servlet.ServletRegistration; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.ComponentScan; +import org.springframework.context.annotation.Configuration; +import org.springframework.web.WebApplicationInitializer; +import org.springframework.web.context.ContextLoaderListener; +import org.springframework.web.context.support.AnnotationConfigWebApplicationContext; +import org.springframework.web.servlet.DispatcherServlet; +import org.springframework.web.servlet.config.annotation.EnableWebMvc; +import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; +import org.springframework.web.servlet.view.InternalResourceViewResolver; + +@Configuration +@EnableWebMvc +@ComponentScan(basePackages = "com.baeldung.controller") +public class PushConfiguration implements WebApplicationInitializer, WebMvcConfigurer { + + @Override + public void onStartup(ServletContext container) throws ServletException { + AnnotationConfigWebApplicationContext context = new AnnotationConfigWebApplicationContext(); + context.register(PushConfiguration.class); + container.addListener(new ContextLoaderListener(context)); + ServletRegistration.Dynamic dispatcher = container.addServlet("DispatcherServlet", new DispatcherServlet(context)); + dispatcher.setLoadOnStartup(1); + dispatcher.addMapping("/"); + } + + @Bean + public InternalResourceViewResolver jspViewResolver() { + InternalResourceViewResolver bean = new InternalResourceViewResolver(); + bean.setPrefix("/WEB-INF/views/"); + bean.setSuffix(".jsp"); + return bean; + } + + @Override + public void addResourceHandlers(ResourceHandlerRegistry registry) { + registry.addResourceHandler("/resources/**") + .addResourceLocations("/resources/"); + } + +} diff --git a/spring-mvc-push/src/main/java/com/baeldung/controller/PushController.java b/spring-mvc-push/src/main/java/com/baeldung/controller/PushController.java new file mode 100644 index 0000000000..efee3a840f --- /dev/null +++ b/spring-mvc-push/src/main/java/com/baeldung/controller/PushController.java @@ -0,0 +1,31 @@ +package com.baeldung.controller; + +import javax.servlet.http.PushBuilder; + +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; + +@Controller +public class PushController { + + @RequestMapping(value = "/demoWithPush") + public String demoWithPush(PushBuilder pushBuilder) { + if (null != pushBuilder) { + pushBuilder.path("resources/logo.png") + .addHeader("Content-Type", "image/png") + .push(); + pushBuilder.path("resources/script.js") + .addHeader("Content-Type", "text/javascript") + .push(); + pushBuilder.path("resources/style.css") + .addHeader("Content-Type", "text/css") + .push(); + } + return "demo"; + } + + @RequestMapping(value = "/demoWithoutPush") + public String demoWithoutPush() { + return "demo"; + } +} \ No newline at end of file diff --git a/spring-mvc-push/src/main/webapp/WEB-INF/views/demo.jsp b/spring-mvc-push/src/main/webapp/WEB-INF/views/demo.jsp new file mode 100644 index 0000000000..d77619283a --- /dev/null +++ b/spring-mvc-push/src/main/webapp/WEB-INF/views/demo.jsp @@ -0,0 +1,22 @@ +<%@ page language="java" contentType="text/html; charset=UTF-8" + pageEncoding="UTF-8"%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> + + + +PushBuilder demo +" rel="stylesheet" /> + + + + PushBuilder demo +
+ " alt="Logo" height="126" + width="411"> +
+ +
Go to + index + + \ No newline at end of file diff --git a/spring-mvc-push/src/main/webapp/index.jsp b/spring-mvc-push/src/main/webapp/index.jsp new file mode 100644 index 0000000000..82ecb68003 --- /dev/null +++ b/spring-mvc-push/src/main/webapp/index.jsp @@ -0,0 +1,14 @@ +<%@ page language="java" contentType="text/html; charset=UTF-8" + pageEncoding="UTF-8"%> + + + +PushBuilder demo + + +

+ Go to PushBuilder demo
Go to + Simple demo +

+ + \ No newline at end of file diff --git a/spring-mvc-push/src/main/webapp/resources/logo.png b/spring-mvc-push/src/main/webapp/resources/logo.png new file mode 100644 index 0000000000..edb83efbe3 Binary files /dev/null and b/spring-mvc-push/src/main/webapp/resources/logo.png differ diff --git a/spring-mvc-push/src/main/webapp/resources/script.js b/spring-mvc-push/src/main/webapp/resources/script.js new file mode 100644 index 0000000000..9bc97c006a --- /dev/null +++ b/spring-mvc-push/src/main/webapp/resources/script.js @@ -0,0 +1 @@ +console.log('Script') \ No newline at end of file diff --git a/spring-mvc-push/src/main/webapp/resources/style.css b/spring-mvc-push/src/main/webapp/resources/style.css new file mode 100644 index 0000000000..d5fc158135 --- /dev/null +++ b/spring-mvc-push/src/main/webapp/resources/style.css @@ -0,0 +1,9 @@ +.single-title { + font-size: 30px; + color: #535353; + font-weight: 200; + letter-spacing: -1.5px; + line-height: 64px; + max-width: 750px; + font-family: "Helvetica Neue", Helvetica, Arial, sans-serif +} \ No newline at end of file diff --git a/spring-mvc-push/src/test/java/com/baeldung/controller/PushControllerIntegrationTest.java b/spring-mvc-push/src/test/java/com/baeldung/controller/PushControllerIntegrationTest.java new file mode 100644 index 0000000000..570e05cad6 --- /dev/null +++ b/spring-mvc-push/src/test/java/com/baeldung/controller/PushControllerIntegrationTest.java @@ -0,0 +1,41 @@ +package com.baeldung.controller; + +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.test.context.junit.jupiter.web.SpringJUnitWebConfig; +import org.springframework.test.web.servlet.MockMvc; +import org.springframework.test.web.servlet.setup.MockMvcBuilders; +import org.springframework.web.context.WebApplicationContext; + +import com.baeldung.config.PushConfiguration; + +@Disabled +@SpringJUnitWebConfig(PushConfiguration.class) +public class PushControllerIntegrationTest { + @Autowired + private WebApplicationContext webAppContext; + private MockMvc mockMvc; + + @BeforeEach + public void setup() { + mockMvc = MockMvcBuilders.webAppContextSetup(webAppContext) + .build(); + } + + @Test + public void whenDemoWithPushGETisPerformed_thenRetrievedStatusOk() throws Exception { + mockMvc.perform(get("/demoWithPush")) + .andExpect(status().isOk()); + } + + @Test + public void whenDemoWithoutPushGETisPerformed_thenRetrievedStatusOk() throws Exception { + mockMvc.perform(get("/demoWithoutPush")) + .andExpect(status().isOk()); + } +} \ No newline at end of file