diff --git a/algorithms-miscellaneous-5/pom.xml b/algorithms-miscellaneous-5/pom.xml index 1ba535dfbc..32ecce58a6 100644 --- a/algorithms-miscellaneous-5/pom.xml +++ b/algorithms-miscellaneous-5/pom.xml @@ -37,7 +37,7 @@ org.junit.platform junit-platform-commons - ${junit.platform.version} + ${junit-platform.version} org.assertj @@ -53,7 +53,6 @@ 1.11 3.6.1 28.1-jre - 1.6.0 \ No newline at end of file diff --git a/algorithms-miscellaneous-6/pom.xml b/algorithms-miscellaneous-6/pom.xml index c9479d160e..6d5f211c8a 100644 --- a/algorithms-miscellaneous-6/pom.xml +++ b/algorithms-miscellaneous-6/pom.xml @@ -22,7 +22,7 @@ org.junit.platform junit-platform-commons - ${junit.platform.version} + ${junit-platform.version} org.assertj @@ -46,7 +46,6 @@ 28.1-jre 3.9.0 - 1.6.0 3.6.1 diff --git a/algorithms-sorting-2/pom.xml b/algorithms-sorting-2/pom.xml index f2a31d957d..b673af9d70 100644 --- a/algorithms-sorting-2/pom.xml +++ b/algorithms-sorting-2/pom.xml @@ -32,7 +32,7 @@ org.junit.jupiter junit-jupiter-api - ${junit-jupiter-api.version} + ${junit-jupiter.version} test @@ -47,7 +47,6 @@ 3.6.1 3.9.0 1.11 - 5.3.1 \ No newline at end of file diff --git a/algorithms-sorting/pom.xml b/algorithms-sorting/pom.xml index cae5eb6efc..b853fd80ee 100644 --- a/algorithms-sorting/pom.xml +++ b/algorithms-sorting/pom.xml @@ -33,7 +33,7 @@ org.junit.jupiter junit-jupiter-api - ${junit-jupiter-api.version} + ${junit-jupiter.version} test @@ -48,7 +48,6 @@ 3.6.1 3.9.0 1.11 - 5.3.1 \ No newline at end of file diff --git a/apache-poi/README.md b/apache-poi/README.md index d500787536..d19af8d6ef 100644 --- a/apache-poi/README.md +++ b/apache-poi/README.md @@ -12,3 +12,4 @@ This module contains articles about Apache POI - [Read Excel Cell Value Rather Than Formula With Apache POI](https://www.baeldung.com/apache-poi-read-cell-value-formula) - [Setting Formulas in Excel with Apache POI](https://www.baeldung.com/java-apache-poi-set-formulas) - [Insert a Row in Excel Using Apache POI](https://www.baeldung.com/apache-poi-insert-excel-row) +- [Multiline Text in Excel Cell Using Apache POI](https://www.baeldung.com/apache-poi-write-multiline-text) diff --git a/apache-poi/src/main/java/com/baeldung/poi/excel/cellstyle/CellStyleHandler.java b/apache-poi/src/main/java/com/baeldung/poi/excel/cellstyle/CellStyleHandler.java new file mode 100644 index 0000000000..4d97fe50cb --- /dev/null +++ b/apache-poi/src/main/java/com/baeldung/poi/excel/cellstyle/CellStyleHandler.java @@ -0,0 +1,30 @@ +package com.baeldung.poi.excel.cellstyle; + +import org.apache.poi.ss.usermodel.Cell; +import org.apache.poi.ss.usermodel.CellStyle; +import org.apache.poi.ss.usermodel.FillPatternType; +import org.apache.poi.ss.usermodel.IndexedColors; + +public class CellStyleHandler { + + public void changeCellBackgroundColor(Cell cell) { + CellStyle cellStyle = cell.getCellStyle(); + if(cellStyle == null) { + cellStyle = cell.getSheet().getWorkbook().createCellStyle(); + } + cellStyle.setFillForegroundColor(IndexedColors.LIGHT_BLUE.getIndex()); + cellStyle.setFillPattern(FillPatternType.SOLID_FOREGROUND); + cell.setCellStyle(cellStyle); + } + + public void changeCellBackgroundColorWithPattern(Cell cell) { + CellStyle cellStyle = cell.getCellStyle(); + if(cellStyle == null) { + cellStyle = cell.getSheet().getWorkbook().createCellStyle(); + } + cellStyle.setFillBackgroundColor(IndexedColors.BLACK.index); + cellStyle.setFillPattern(FillPatternType.BIG_SPOTS); + cellStyle.setFillForegroundColor(IndexedColors.LIGHT_BLUE.getIndex()); + cell.setCellStyle(cellStyle); + } +} diff --git a/apache-poi/src/main/java/com/baeldung/poi/excel/multilinetext/MultilineText.java b/apache-poi/src/main/java/com/baeldung/poi/excel/multilinetext/MultilineText.java new file mode 100644 index 0000000000..2e0cc5770e --- /dev/null +++ b/apache-poi/src/main/java/com/baeldung/poi/excel/multilinetext/MultilineText.java @@ -0,0 +1,18 @@ +package com.baeldung.poi.excel.multilinetext; + +import org.apache.poi.ss.usermodel.Cell; +import org.apache.poi.ss.usermodel.CellStyle; +import org.apache.poi.ss.usermodel.Row; + +public class MultilineText { + public void formatMultilineText(Cell cell, int cellNumber) { + cell.getRow() + .setHeightInPoints(cell.getSheet() + .getDefaultRowHeightInPoints() * 2); + CellStyle cellStyle = cell.getSheet() + .getWorkbook() + .createCellStyle(); + cellStyle.setWrapText(true); + cell.setCellStyle(cellStyle); + } +} diff --git a/apache-poi/src/main/resources/cellstyle/CellStyleHandlerTest.xlsx b/apache-poi/src/main/resources/cellstyle/CellStyleHandlerTest.xlsx new file mode 100644 index 0000000000..29f128211b Binary files /dev/null and b/apache-poi/src/main/resources/cellstyle/CellStyleHandlerTest.xlsx differ diff --git a/apache-poi/src/main/resources/com/baeldung/poi/excel/multilinetext/MultilineTextTest.xlsx b/apache-poi/src/main/resources/com/baeldung/poi/excel/multilinetext/MultilineTextTest.xlsx new file mode 100644 index 0000000000..c6b963d5a5 Binary files /dev/null and b/apache-poi/src/main/resources/com/baeldung/poi/excel/multilinetext/MultilineTextTest.xlsx differ diff --git a/apache-poi/src/test/java/com/baeldung/poi/excel/cellstyle/CellStyleHandlerUnitTest.java b/apache-poi/src/test/java/com/baeldung/poi/excel/cellstyle/CellStyleHandlerUnitTest.java new file mode 100644 index 0000000000..e131db8e56 --- /dev/null +++ b/apache-poi/src/test/java/com/baeldung/poi/excel/cellstyle/CellStyleHandlerUnitTest.java @@ -0,0 +1,56 @@ +package com.baeldung.poi.excel.cellstyle; + +import org.apache.poi.ss.usermodel.*; +import org.apache.poi.xssf.usermodel.XSSFWorkbook; +import org.junit.Before; +import org.junit.Test; + +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.OutputStream; +import java.net.URISyntaxException; +import java.nio.file.Paths; + +import static org.junit.Assert.assertEquals; + +public class CellStyleHandlerUnitTest { + private static final String FILE_NAME = "cellstyle/CellStyleHandlerTest.xlsx"; + private static final int SHEET_INDEX = 0; + private static final int ROW_INDEX = 0; + private static final int CELL_INDEX = 0; + + private String fileLocation; + private CellStyleHandler cellStyleHandler; + + @Before + public void setup() throws URISyntaxException { + fileLocation = Paths.get(ClassLoader.getSystemResource(FILE_NAME).toURI()).toString(); + cellStyleHandler = new CellStyleHandler(); + } + + @Test + public void givenWorkbookCell_whenChangeCellBackgroundColor() throws IOException { + Workbook workbook = new XSSFWorkbook(fileLocation); + Sheet sheet = workbook.getSheetAt(SHEET_INDEX); + Row row = sheet.getRow(ROW_INDEX); + Cell cell = row.getCell(CELL_INDEX); + + cellStyleHandler.changeCellBackgroundColor(cell); + + assertEquals(IndexedColors.LIGHT_BLUE.index, cell.getCellStyle().getFillForegroundColor()); + workbook.close(); + } + + @Test + public void givenWorkbookCell_whenChangeCellBackgroundColorWithPattern() throws IOException { + Workbook workbook = new XSSFWorkbook(fileLocation); + Sheet sheet = workbook.getSheetAt(SHEET_INDEX); + Row row = sheet.getRow(ROW_INDEX); + Cell cell = row.getCell(CELL_INDEX + 1); + + cellStyleHandler.changeCellBackgroundColorWithPattern(cell); + + assertEquals(IndexedColors.LIGHT_BLUE.index, cell.getCellStyle().getFillForegroundColor()); + workbook.close(); + } +} diff --git a/apache-poi/src/test/java/com/baeldung/poi/excel/multilinetext/MultilineTextUnitTest.java b/apache-poi/src/test/java/com/baeldung/poi/excel/multilinetext/MultilineTextUnitTest.java new file mode 100644 index 0000000000..ee002be155 --- /dev/null +++ b/apache-poi/src/test/java/com/baeldung/poi/excel/multilinetext/MultilineTextUnitTest.java @@ -0,0 +1,69 @@ +package com.baeldung.poi.excel.multilinetext; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.net.URISyntaxException; +import java.nio.file.Paths; + +import org.apache.poi.ss.usermodel.Cell; +import org.apache.poi.ss.usermodel.DataFormatter; +import org.apache.poi.ss.usermodel.Row; +import org.apache.poi.ss.usermodel.Sheet; +import org.apache.poi.ss.usermodel.Workbook; +import org.apache.poi.xssf.usermodel.XSSFWorkbook; +import org.junit.Before; +import org.junit.Test; + +public class MultilineTextUnitTest { + private static String FILE_NAME = "com/baeldung/poi/excel/multilinetext/MultilineTextTest.xlsx"; + private static final String NEW_FILE_NAME = "MultilineTextTest_output.xlsx"; + private static final int STRING_ROW_INDEX = 1; + private static final int STRING_CELL_INDEX = 0; + + private String fileLocation; + + @Before + public void setup() throws IOException, URISyntaxException { + fileLocation = Paths.get(ClassLoader.getSystemResource(FILE_NAME) + .toURI()) + .toString(); + } + + @Test + public void givenMultilineTextCell_whenFormated_thenMultilineTextVisible() throws IOException { + Workbook workbook = new XSSFWorkbook(fileLocation); + Sheet sheet = workbook.getSheetAt(0); + sheet.createRow(STRING_ROW_INDEX); + Row row = sheet.getRow(STRING_ROW_INDEX); + Cell cell = row.createCell(STRING_CELL_INDEX); + + cell.setCellValue("Hello \n world!"); + MultilineText multilineText = new MultilineText(); + multilineText.formatMultilineText(cell, STRING_CELL_INDEX); + + FileOutputStream outputStream = new FileOutputStream(NEW_FILE_NAME); + workbook.write(outputStream); + outputStream.close(); + + File file = new File(NEW_FILE_NAME); + FileInputStream fileInputStream = new FileInputStream(file); + Workbook testWorkbook = new XSSFWorkbook(fileInputStream); + assertTrue(row.getHeightInPoints() == testWorkbook.getSheetAt(0) + .getRow(STRING_ROW_INDEX) + .getHeightInPoints()); + DataFormatter formatter = new DataFormatter(); + assertEquals("Hello \n world!", formatter.formatCellValue(testWorkbook.getSheetAt(0) + .getRow(STRING_ROW_INDEX) + .getCell(STRING_CELL_INDEX))); + testWorkbook.close(); + fileInputStream.close(); + file.delete(); + + workbook.close(); + } +} diff --git a/apache-shiro/pom.xml b/apache-shiro/pom.xml index f956883d5f..325a9939b9 100644 --- a/apache-shiro/pom.xml +++ b/apache-shiro/pom.xml @@ -39,10 +39,6 @@ runtime - - org.springframework.boot - spring-boot-starter-web - org.springframework.boot spring-boot-starter-security diff --git a/atomikos/pom.xml b/atomikos/pom.xml index 405231fea7..cb10168c0d 100644 --- a/atomikos/pom.xml +++ b/atomikos/pom.xml @@ -72,9 +72,9 @@ ${derby.version} - junit - junit - ${junit.version} + org.junit.vintage + junit-vintage-engine + ${junit-jupiter.version} test diff --git a/aws-lambda/lambda/pom.xml b/aws-lambda/lambda/pom.xml index b6074f16d3..dea951d1b3 100644 --- a/aws-lambda/lambda/pom.xml +++ b/aws-lambda/lambda/pom.xml @@ -62,6 +62,13 @@ com.googlecode.json-simple json-simple ${json-simple.version} + + + + junit + junit + + diff --git a/aws-lambda/shipping-tracker/ShippingFunction/pom.xml b/aws-lambda/shipping-tracker/ShippingFunction/pom.xml index 99f9c1d051..72e3ac7959 100644 --- a/aws-lambda/shipping-tracker/ShippingFunction/pom.xml +++ b/aws-lambda/shipping-tracker/ShippingFunction/pom.xml @@ -12,23 +12,17 @@ com.amazonaws aws-lambda-java-core - 1.2.0 + ${aws-lambda-java-core.version} com.amazonaws aws-lambda-java-events - 3.1.0 + ${aws-lambda-java-events.version} com.fasterxml.jackson.core jackson-databind - 2.11.2 - - - junit - junit - 4.12 - test + ${jackson-databind.version} org.hibernate @@ -43,7 +37,7 @@ org.postgresql postgresql - 42.2.16 + ${postgresql.version} @@ -71,6 +65,10 @@ 1.8 1.8 5.4.21.Final + 1.2.0 + 3.1.0 + 2.11.2 + 42.2.16 \ No newline at end of file diff --git a/aws-lambda/todo-reminder/ToDoFunction/pom.xml b/aws-lambda/todo-reminder/ToDoFunction/pom.xml index 832cee841d..c17ff8bf15 100644 --- a/aws-lambda/todo-reminder/ToDoFunction/pom.xml +++ b/aws-lambda/todo-reminder/ToDoFunction/pom.xml @@ -12,70 +12,70 @@ com.amazonaws aws-lambda-java-core - 1.2.1 + ${aws-lambda-java-core.version} com.amazonaws aws-lambda-java-events - 3.6.0 + ${aws-lambda-java-events.version} uk.org.webcompere lightweight-config - 1.1.0 + ${lightweight-config.version} com.amazonaws aws-lambda-java-log4j2 - 1.2.0 + ${aws-lambda-java-log4j2.version} org.apache.logging.log4j log4j-slf4j-impl - 2.13.2 + ${log4j-slf4j-impl.version} io.github.openfeign feign-core - 11.2 + ${feign-core.version} io.github.openfeign feign-slf4j - 11.2 + ${feign-core.version} io.github.openfeign feign-gson - 11.2 + ${feign-core.version} com.google.inject guice - 5.0.1 + ${guice.version} - junit - junit - 4.13.1 + org.junit.vintage + junit-vintage-engine + ${junit-jupiter.version} test uk.org.webcompere system-stubs-junit4 - 1.2.0 + ${system-stubs-junit4.version} test org.mockito mockito-core - 3.3.0 + ${mockito-core.version} test org.assertj assertj-core - 3.19.0 + ${assertj-core.version} test @@ -103,6 +103,17 @@ 1.8 1.8 + 1.2.1 + 3.6.0 + 1.1.0 + 1.2.0 + 2.13.2 + 11.2 + 5.0.1 + 1.2.0 + 3.3.0 + 3.19.0 + 5.8.1 \ No newline at end of file diff --git a/blade/pom.xml b/blade/pom.xml index 6ab3a594f2..8fc517e966 100644 --- a/blade/pom.xml +++ b/blade/pom.xml @@ -70,6 +70,7 @@ maven-failsafe-plugin ${maven-failsafe-plugin.version} + true **/*LiveTest.java diff --git a/core-groovy-2/gmavenplus-pom.xml b/core-groovy-2/gmavenplus-pom.xml index 54c89b9834..4dbdfe7d42 100644 --- a/core-groovy-2/gmavenplus-pom.xml +++ b/core-groovy-2/gmavenplus-pom.xml @@ -33,7 +33,7 @@ org.junit.platform junit-platform-runner - ${junit.platform.version} + ${junit-platform.version} test @@ -95,7 +95,7 @@ org.junit.platform junit-platform-surefire-provider - ${junit.platform.version} + ${junit-platform-surefire-provider.version} @@ -165,7 +165,6 @@ UTF-8 - 1.0.0 2.4.0 1.1-groovy-2.4 3.9 diff --git a/core-groovy-2/pom.xml b/core-groovy-2/pom.xml index 89df666333..6b78e21080 100644 --- a/core-groovy-2/pom.xml +++ b/core-groovy-2/pom.xml @@ -34,7 +34,7 @@ org.junit.platform junit-platform-runner - ${junit.platform.version} + ${junit-platform.version} test @@ -94,7 +94,7 @@ org.junit.platform junit-platform-surefire-provider - ${junit.platform.version} + ${junit-platform-surefire-provider.version} @@ -162,7 +162,6 @@ - 1.0.0 2.4.0 1.1-groovy-2.4 1.1.3 diff --git a/core-groovy-collections/pom.xml b/core-groovy-collections/pom.xml index c4e02cfed8..d589fc74e5 100644 --- a/core-groovy-collections/pom.xml +++ b/core-groovy-collections/pom.xml @@ -39,7 +39,7 @@ org.junit.platform junit-platform-runner - ${junit.platform.version} + ${junit-platform.version} test @@ -80,7 +80,7 @@ org.junit.platform junit-platform-surefire-provider - ${junit.platform.version} + ${junit-platform-surefire-provider.version} @@ -119,7 +119,6 @@ - 1.0.0 2.5.6 2.5.6 2.5.6 diff --git a/core-groovy-strings/pom.xml b/core-groovy-strings/pom.xml index 76d1754b98..333b15cdbe 100644 --- a/core-groovy-strings/pom.xml +++ b/core-groovy-strings/pom.xml @@ -39,7 +39,7 @@ org.junit.platform junit-platform-runner - ${junit.platform.version} + ${junit-platform.version} test @@ -80,7 +80,7 @@ org.junit.platform junit-platform-surefire-provider - ${junit.platform.version} + ${junit-platform-surefire-provider.version} @@ -109,7 +109,6 @@ - 1.0.0 2.5.6 2.5.6 2.5.6 diff --git a/core-groovy/pom.xml b/core-groovy/pom.xml index 3e1913dd7b..c24982c6a2 100644 --- a/core-groovy/pom.xml +++ b/core-groovy/pom.xml @@ -39,7 +39,7 @@ org.junit.platform junit-platform-runner - ${junit.platform.version} + ${junit-platform.version} test @@ -80,7 +80,7 @@ org.junit.platform junit-platform-surefire-provider - ${junit.platform.version} + ${junit-platform-surefire-provider.version} @@ -109,7 +109,6 @@ - 1.0.0 2.5.6 2.5.6 2.5.6 diff --git a/core-java-modules/core-java-11-2/pom.xml b/core-java-modules/core-java-11-2/pom.xml index e26e31da44..3ab8e883b0 100644 --- a/core-java-modules/core-java-11-2/pom.xml +++ b/core-java-modules/core-java-11-2/pom.xml @@ -32,24 +32,6 @@ mockserver-junit-jupiter ${mockserver.version} - - org.junit.jupiter - junit-jupiter-engine - ${junit.jupiter.version} - test - - - org.junit.jupiter - junit-jupiter-params - ${junit.jupiter.version} - test - - - org.junit.jupiter - junit-jupiter-api - ${junit.jupiter.version} - test - org.apache.commons commons-lang3 @@ -106,7 +88,6 @@ 11 11 29.0-jre - 5.7.0 3.17.2 5.11.1 3.12.0 diff --git a/core-java-modules/core-java-14/pom.xml b/core-java-modules/core-java-14/pom.xml index a03332d8bc..de01d17b0d 100644 --- a/core-java-modules/core-java-14/pom.xml +++ b/core-java-modules/core-java-14/pom.xml @@ -22,18 +22,6 @@ ${assertj.version} test - - org.junit.jupiter - junit-jupiter-engine - ${junit-jupiter.version} - test - - - org.junit.jupiter - junit-jupiter-api - ${junit-jupiter.version} - test - diff --git a/core-java-modules/core-java-15/pom.xml b/core-java-modules/core-java-15/pom.xml index 091f0568a7..a71987c23a 100644 --- a/core-java-modules/core-java-15/pom.xml +++ b/core-java-modules/core-java-15/pom.xml @@ -27,18 +27,6 @@ ${assertj.version} test - - org.junit.jupiter - junit-jupiter-engine - ${junit-jupiter.version} - test - - - org.junit.jupiter - junit-jupiter-api - ${junit-jupiter.version} - test - diff --git a/core-java-modules/core-java-16/pom.xml b/core-java-modules/core-java-16/pom.xml index 5d10325f03..790b7dd057 100644 --- a/core-java-modules/core-java-16/pom.xml +++ b/core-java-modules/core-java-16/pom.xml @@ -28,18 +28,6 @@ commons-lang3 3.12.0 - - org.junit.jupiter - junit-jupiter-engine - ${junit-jupiter.version} - test - - - org.junit.jupiter - junit-jupiter-api - ${junit-jupiter.version} - test - diff --git a/core-java-modules/core-java-17/README.md b/core-java-modules/core-java-17/README.md index 37095551a1..074c5e4f86 100644 --- a/core-java-modules/core-java-17/README.md +++ b/core-java-modules/core-java-17/README.md @@ -1 +1,3 @@ ### Relevant articles: + +- [Pattern Matching for Switch](https://www.baeldung.com/java-switch-pattern-matching) diff --git a/core-java-modules/core-java-17/src/main/java/com/baeldung/switchpatterns/GuardedPatterns.java b/core-java-modules/core-java-17/src/main/java/com/baeldung/switchpatterns/GuardedPatterns.java new file mode 100644 index 0000000000..a76287f64a --- /dev/null +++ b/core-java-modules/core-java-17/src/main/java/com/baeldung/switchpatterns/GuardedPatterns.java @@ -0,0 +1,25 @@ +package com.baeldung.switchpatterns; + +public class GuardedPatterns { + + static double getDoubleValueUsingIf(Object o) { + return switch (o) { + case String s -> { + if (s.length() > 0) { + yield Double.parseDouble(s); + } else { + yield 0d; + } + } + default -> 0d; + }; + } + + static double getDoubleValueUsingGuardedPatterns(Object o) { + return switch (o) { + case String s && s.length() > 0 -> Double.parseDouble(s); + default -> 0d; + }; + } + +} diff --git a/core-java-modules/core-java-17/src/main/java/com/baeldung/switchpatterns/HandlingNullValues.java b/core-java-modules/core-java-17/src/main/java/com/baeldung/switchpatterns/HandlingNullValues.java new file mode 100644 index 0000000000..8e64480a41 --- /dev/null +++ b/core-java-modules/core-java-17/src/main/java/com/baeldung/switchpatterns/HandlingNullValues.java @@ -0,0 +1,20 @@ +package com.baeldung.switchpatterns; + +public class HandlingNullValues { + + static double getDoubleUsingSwitchNullCase(Object o) { + return switch (o) { + case String s -> Double.parseDouble(s); + case null -> 0d; + default -> 0d; + }; + } + + static double getDoubleUsingSwitchTotalType(Object o) { + return switch (o) { + case String s -> Double.parseDouble(s); + case Object ob -> 0d; + }; + } + +} diff --git a/core-java-modules/core-java-17/src/main/java/com/baeldung/switchpatterns/ParenthesizedPatterns.java b/core-java-modules/core-java-17/src/main/java/com/baeldung/switchpatterns/ParenthesizedPatterns.java new file mode 100644 index 0000000000..49dd5edb31 --- /dev/null +++ b/core-java-modules/core-java-17/src/main/java/com/baeldung/switchpatterns/ParenthesizedPatterns.java @@ -0,0 +1,29 @@ +package com.baeldung.switchpatterns; + +public class ParenthesizedPatterns { + + static double getDoubleValueUsingIf(Object o) { + return switch (o) { + case String s -> { + if (s.length() > 0) { + if (s.contains("#") || s.contains("@")) { + yield 0d; + } else { + yield Double.parseDouble(s); + } + } else { + yield 0d; + } + } + default -> 0d; + }; + } + + static double getDoubleValueUsingParenthesizedPatterns(Object o) { + return switch (o) { + case String s && s.length() > 0 && !(s.contains("#") || s.contains("@")) -> Double.parseDouble(s); + default -> 0d; + }; + } + +} diff --git a/core-java-modules/core-java-17/src/main/java/com/baeldung/switchpatterns/PatternMatching.java b/core-java-modules/core-java-17/src/main/java/com/baeldung/switchpatterns/PatternMatching.java new file mode 100644 index 0000000000..f026caa3f1 --- /dev/null +++ b/core-java-modules/core-java-17/src/main/java/com/baeldung/switchpatterns/PatternMatching.java @@ -0,0 +1,14 @@ +package com.baeldung.switchpatterns; + +public class PatternMatching { + + public static void main(String[] args) { + Object o = args[0]; + if (o instanceof String s) { + System.out.printf("Object is a string %s", s); + } else if(o instanceof Number n) { + System.out.printf("Object is a number %n", n); + } + } + +} diff --git a/core-java-modules/core-java-17/src/main/java/com/baeldung/switchpatterns/SwitchStatement.java b/core-java-modules/core-java-17/src/main/java/com/baeldung/switchpatterns/SwitchStatement.java new file mode 100644 index 0000000000..17d2b1856d --- /dev/null +++ b/core-java-modules/core-java-17/src/main/java/com/baeldung/switchpatterns/SwitchStatement.java @@ -0,0 +1,14 @@ +package com.baeldung.switchpatterns; + +public class SwitchStatement { + + public static void main(String[] args) { + final String b = "B"; + switch (args[0]) { + case "A" -> System.out.println("Parameter is A"); + case b -> System.out.println("Parameter is b"); + default -> System.out.println("Parameter is unknown"); + }; + } + +} diff --git a/core-java-modules/core-java-17/src/main/java/com/baeldung/switchpatterns/TypePatterns.java b/core-java-modules/core-java-17/src/main/java/com/baeldung/switchpatterns/TypePatterns.java new file mode 100644 index 0000000000..47af090ad0 --- /dev/null +++ b/core-java-modules/core-java-17/src/main/java/com/baeldung/switchpatterns/TypePatterns.java @@ -0,0 +1,30 @@ +package com.baeldung.switchpatterns; + +public class TypePatterns { + + static double getDoubleUsingIf(Object o) { + double result; + + if (o instanceof Integer) { + result = ((Integer) o).doubleValue(); + } else if (o instanceof Float) { + result = ((Float) o).doubleValue(); + } else if (o instanceof String) { + result = Double.parseDouble(((String) o)); + } else { + result = 0d; + } + + return result; + } + + static double getDoubleUsingSwitch(Object o) { + return switch (o) { + case Integer i -> i.doubleValue(); + case Float f -> f.doubleValue(); + case String s -> Double.parseDouble(s); + default -> 0d; + }; + } + +} diff --git a/core-java-modules/core-java-17/src/test/java/com/baeldung/switchpatterns/GuardedPatternsUnitTest.java b/core-java-modules/core-java-17/src/test/java/com/baeldung/switchpatterns/GuardedPatternsUnitTest.java new file mode 100644 index 0000000000..cff8b1caca --- /dev/null +++ b/core-java-modules/core-java-17/src/test/java/com/baeldung/switchpatterns/GuardedPatternsUnitTest.java @@ -0,0 +1,30 @@ +package com.baeldung.switchpatterns; + +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static com.baeldung.switchpatterns.GuardedPatterns.*; + +class GuardedPatternsUnitTest { + + @Test + void givenIfImplementation_whenUsingEmptyString_thenDoubleIsReturned() { + assertEquals(0d, getDoubleValueUsingIf("")); + } + + @Test + void givenIfImplementation_whenUsingNonEmptyString_thenDoubleIsReturned() { + assertEquals(10d, getDoubleValueUsingIf("10")); + } + + @Test + void givenPatternsImplementation_whenUsingEmptyString_thenDoubleIsReturned() { + assertEquals(0d, getDoubleValueUsingGuardedPatterns("")); + } + + @Test + void givenPatternsImplementation_whenUsingNonEmptyString_thenDoubleIsReturned() { + assertEquals(10d, getDoubleValueUsingGuardedPatterns("10")); + } + +} diff --git a/core-java-modules/core-java-17/src/test/java/com/baeldung/switchpatterns/HandlingNullValuesUnitTest.java b/core-java-modules/core-java-17/src/test/java/com/baeldung/switchpatterns/HandlingNullValuesUnitTest.java new file mode 100644 index 0000000000..ffe045cc26 --- /dev/null +++ b/core-java-modules/core-java-17/src/test/java/com/baeldung/switchpatterns/HandlingNullValuesUnitTest.java @@ -0,0 +1,30 @@ +package com.baeldung.switchpatterns; + +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static com.baeldung.switchpatterns.HandlingNullValues.*; + +class HandlingNullValuesUnitTest { + + @Test + void givenNullCaseInSwitch_whenUsingStringAsArgument_thenDoubleIsReturned() { + assertEquals(10d, getDoubleUsingSwitchNullCase("10")); + } + + @Test + void givenTotalTypeInSwitch_whenUsingNullArgument_thenDoubleIsReturned() { + assertEquals(0d, getDoubleUsingSwitchNullCase(null)); + } + + @Test + void givenTotalTypeInSwitch_whenUsingStringAsArgument_thenDoubleIsReturned() { + assertEquals(10d, getDoubleUsingSwitchTotalType("10")); + } + + @Test + void givenNullCaseInSwitch_whenUsingNullArgument_thenDoubleIsReturned() { + assertEquals(0d, getDoubleUsingSwitchTotalType(null)); + } + +} diff --git a/core-java-modules/core-java-17/src/test/java/com/baeldung/switchpatterns/ParenthesizedPatternsUnitTest.java b/core-java-modules/core-java-17/src/test/java/com/baeldung/switchpatterns/ParenthesizedPatternsUnitTest.java new file mode 100644 index 0000000000..9548c9f0b6 --- /dev/null +++ b/core-java-modules/core-java-17/src/test/java/com/baeldung/switchpatterns/ParenthesizedPatternsUnitTest.java @@ -0,0 +1,40 @@ +package com.baeldung.switchpatterns; + +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static com.baeldung.switchpatterns.ParenthesizedPatterns.*; + +class ParenthesizedPatternsUnitTest { + + @Test + void givenIfImplementation_whenUsingEmptyString_thenDoubleIsReturned() { + assertEquals(0d, getDoubleValueUsingIf("")); + } + + @Test + void givenIfImplementation_whenUsingNonEmptyString_thenDoubleIsReturned() { + assertEquals(10d, getDoubleValueUsingIf("10")); + } + + @Test + void givenIfImplementation_whenStringContainsSpecialChar_thenDoubleIsReturned() { + assertEquals(0d, getDoubleValueUsingIf("@10")); + } + + @Test + void givenPatternsImplementation_whenUsingEmptyString_thenDoubleIsReturned() { + assertEquals(0d, getDoubleValueUsingParenthesizedPatterns("")); + } + + @Test + void givenPatternsImplementation_whenUsingNonEmptyString_thenDoubleIsReturned() { + assertEquals(10d, getDoubleValueUsingParenthesizedPatterns("10")); + } + + @Test + void givenPatternsImplementation_whenStringContainsSpecialChar_thenDoubleIsReturned() { + assertEquals(0d, getDoubleValueUsingParenthesizedPatterns("@10")); + } + +} diff --git a/core-java-modules/core-java-17/src/test/java/com/baeldung/switchpatterns/TypePatternsUnitTest.java b/core-java-modules/core-java-17/src/test/java/com/baeldung/switchpatterns/TypePatternsUnitTest.java new file mode 100644 index 0000000000..25988be53d --- /dev/null +++ b/core-java-modules/core-java-17/src/test/java/com/baeldung/switchpatterns/TypePatternsUnitTest.java @@ -0,0 +1,49 @@ +package com.baeldung.switchpatterns; + +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static com.baeldung.switchpatterns.TypePatterns.*; + +class TypePatternsUnitTest { + + @Test + void givenIfImplementation_whenUsingIntegerAsArgument_thenDoubleIsReturned() { + assertEquals(10d, getDoubleUsingIf(10)); + } + + @Test + void givenIfImplementation_whenUsingDoubleAsArgument_thenDoubleIsReturned() { + assertEquals(10d, getDoubleUsingIf(10.0f)); + } + + @Test + void givenIfImplementation_whenUsingStringAsArgument_thenDoubleIsReturned() { + assertEquals(10d, getDoubleUsingIf("10")); + } + + @Test + void givenIfImplementation_whenUsingCharAsArgument_thenDoubleIsReturned() { + assertEquals(0d, getDoubleUsingIf('c')); + } + + @Test + void givenSwitchImplementation_whenUsingIntegerAsArgument_thenDoubleIsReturned() { + assertEquals(10d, getDoubleUsingSwitch(10)); + } + + @Test + void givenSwitchImplementation_whenUsingDoubleAsArgument_thenDoubleIsReturned() { + assertEquals(10d, getDoubleUsingSwitch(10.0f)); + } + + @Test + void givenSwitchImplementation_whenUsingStringAsArgument_thenDoubleIsReturned() { + assertEquals(10d, getDoubleUsingSwitch("10")); + } + + @Test + void givenSwitchImplementation_whenUsingCharAsArgument_thenDoubleIsReturned() { + assertEquals(0d, getDoubleUsingSwitch('c')); + } + +} diff --git a/core-java-modules/core-java-9-improvements/pom.xml b/core-java-modules/core-java-9-improvements/pom.xml index b047e15969..6abdd7dab8 100644 --- a/core-java-modules/core-java-9-improvements/pom.xml +++ b/core-java-modules/core-java-9-improvements/pom.xml @@ -40,7 +40,7 @@ org.junit.platform junit-platform-runner - ${junit.platform.version} + ${junit-platform.version} test @@ -70,7 +70,6 @@ 3.10.0 - 1.2.0 1.7.0 1.9 1.9 diff --git a/core-java-modules/core-java-9-new-features/pom.xml b/core-java-modules/core-java-9-new-features/pom.xml index 00480a28e1..7dca8d5f88 100644 --- a/core-java-modules/core-java-9-new-features/pom.xml +++ b/core-java-modules/core-java-9-new-features/pom.xml @@ -29,7 +29,7 @@ org.junit.platform junit-platform-runner - ${junit.platform.version} + ${junit-platform.version} test @@ -158,7 +158,6 @@ 3.0.0 3.10.0 - 1.2.0 4.0.2 1.9 1.9 diff --git a/core-java-modules/core-java-9/pom.xml b/core-java-modules/core-java-9/pom.xml index 543c3891ee..1bd650f7d2 100644 --- a/core-java-modules/core-java-9/pom.xml +++ b/core-java-modules/core-java-9/pom.xml @@ -35,7 +35,7 @@ org.junit.platform junit-platform-runner - ${junit.platform.version} + ${junit-platform.version} test @@ -80,7 +80,6 @@ 3.10.0 - 1.2.0 1.7.0 1.9 1.9 diff --git a/core-java-modules/core-java-arrays-convert/README.md b/core-java-modules/core-java-arrays-convert/README.md index 4bd060a246..b28b97cb09 100644 --- a/core-java-modules/core-java-arrays-convert/README.md +++ b/core-java-modules/core-java-arrays-convert/README.md @@ -5,3 +5,4 @@ This module contains articles about arrays conversion in Java ## Relevant Articles - [Convert a Float to a Byte Array in Java](https://www.baeldung.com/java-convert-float-to-byte-array) - [Converting Between Stream and Array in Java](https://www.baeldung.com/java-stream-to-array) +- [Convert a Byte Array to a Numeric Representation in Java](https://www.baeldung.com/java-byte-array-to-number) diff --git a/core-java-modules/core-java-collections-2/pom.xml b/core-java-modules/core-java-collections-2/pom.xml index 4e171eed48..0f1f1ee2fe 100644 --- a/core-java-modules/core-java-collections-2/pom.xml +++ b/core-java-modules/core-java-collections-2/pom.xml @@ -43,7 +43,7 @@ org.junit.platform junit-platform-runner - ${junit.platform.version} + ${junit-platform.version} test @@ -52,7 +52,6 @@ 7.1.0 4.1 3.11.1 - 1.2.0 1.3 diff --git a/core-java-modules/core-java-concurrency-2/pom.xml b/core-java-modules/core-java-concurrency-2/pom.xml index 5196872e21..c61f28a6b3 100644 --- a/core-java-modules/core-java-concurrency-2/pom.xml +++ b/core-java-modules/core-java-concurrency-2/pom.xml @@ -15,12 +15,6 @@ - - junit - junit - ${junit.version} - test - com.googlecode.thread-weaver threadweaver @@ -32,6 +26,12 @@ tempus-fugit ${tempus-fugit.version} test + + + junit + junit + + com.googlecode.multithreadedtc @@ -96,7 +96,6 @@ - 4.13 0.2 1.1 1.01 diff --git a/core-java-modules/core-java-jndi/README.md b/core-java-modules/core-java-jndi/README.md index d9fb324c9a..b0b23fc0d0 100644 --- a/core-java-modules/core-java-jndi/README.md +++ b/core-java-modules/core-java-jndi/README.md @@ -2,3 +2,4 @@ ### Relevant Articles: - [Java Naming and Directory Interface Overview](https://www.baeldung.com/jndi) +- [LDAP Authentication Using Pure Java](https://www.baeldung.com/java-ldap-auth) diff --git a/core-java-modules/core-java-jndi/pom.xml b/core-java-modules/core-java-jndi/pom.xml index dae0e9bb35..6b7c4e1359 100644 --- a/core-java-modules/core-java-jndi/pom.xml +++ b/core-java-modules/core-java-jndi/pom.xml @@ -15,23 +15,6 @@ - - org.junit.jupiter - junit-jupiter - ${jupiter.version} - test - - - org.junit.jupiter - junit-jupiter-api - ${jupiter.version} - test - - - org.junit.jupiter - junit-jupiter-engine - ${jupiter.version} - org.springframework spring-core @@ -58,6 +41,18 @@ h2 ${h2.version} + + org.apache.directory.server + apacheds-test-framework + ${apacheds.version} + test + + + org.assertj + assertj-core + 3.21.0 + test + @@ -76,7 +71,7 @@ 5.0.9.RELEASE 1.4.199 - 5.5.1 + 2.0.0.AM26 1.8 1.8 diff --git a/core-java-modules/core-java-jndi/src/test/java/com/baeldung/jndi/ldap/auth/JndiLdapAuthManualTest.java b/core-java-modules/core-java-jndi/src/test/java/com/baeldung/jndi/ldap/auth/JndiLdapAuthManualTest.java new file mode 100644 index 0000000000..5a675c62c9 --- /dev/null +++ b/core-java-modules/core-java-jndi/src/test/java/com/baeldung/jndi/ldap/auth/JndiLdapAuthManualTest.java @@ -0,0 +1,165 @@ +package com.baeldung.jndi.ldap.auth; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatCode; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; + +import java.util.Hashtable; + +import javax.naming.AuthenticationException; +import javax.naming.Context; +import javax.naming.NamingEnumeration; +import javax.naming.directory.Attributes; +import javax.naming.directory.DirContext; +import javax.naming.directory.InitialDirContext; +import javax.naming.directory.SearchControls; +import javax.naming.directory.SearchResult; + +import org.apache.directory.server.annotations.CreateLdapServer; +import org.apache.directory.server.annotations.CreateTransport; +import org.apache.directory.server.core.annotations.ApplyLdifFiles; +import org.apache.directory.server.core.annotations.CreateDS; +import org.apache.directory.server.core.annotations.CreatePartition; +import org.apache.directory.server.core.integ.AbstractLdapTestUnit; +import org.apache.directory.server.core.integ.FrameworkRunner; +import org.junit.Test; +import org.junit.runner.RunWith; + +@RunWith(FrameworkRunner.class) +@CreateLdapServer(transports = { @CreateTransport(protocol = "LDAP", address = "localhost", port = 10390)}) +@CreateDS( + allowAnonAccess = false, partitions = {@CreatePartition(name = "TestPartition", suffix = "dc=baeldung,dc=com")}) +@ApplyLdifFiles({"users.ldif"}) +// class marked as manual test, as it has to run independently from the other unit tests in the module +public class JndiLdapAuthManualTest extends AbstractLdapTestUnit { + + private static void authenticateUser(Hashtable environment) throws Exception { + DirContext context = new InitialDirContext(environment); + context.close(); + } + + @Test + public void givenPreloadedLDAPUserJoe_whenAuthUserWithCorrectPW_thenAuthSucceeds() throws Exception { + + Hashtable environment = new Hashtable(); + environment.put(Context.INITIAL_CONTEXT_FACTORY, "com.sun.jndi.ldap.LdapCtxFactory"); + environment.put(Context.PROVIDER_URL, "ldap://localhost:10390"); + environment.put(Context.SECURITY_AUTHENTICATION, "simple"); + + environment.put(Context.SECURITY_PRINCIPAL, "cn=Joe Simms,ou=Users,dc=baeldung,dc=com"); + environment.put(Context.SECURITY_CREDENTIALS, "12345"); + + assertThatCode(() -> authenticateUser(environment)).doesNotThrowAnyException(); + } + + @Test + public void givenPreloadedLDAPUserJoe_whenAuthUserWithWrongPW_thenAuthFails() throws Exception { + + Hashtable environment = new Hashtable(); + environment.put(Context.INITIAL_CONTEXT_FACTORY, "com.sun.jndi.ldap.LdapCtxFactory"); + environment.put(Context.PROVIDER_URL, "ldap://localhost:10390"); + environment.put(Context.SECURITY_AUTHENTICATION, "simple"); + + environment.put(Context.SECURITY_PRINCIPAL, "cn=Joe Simms,ou=Users,dc=baeldung,dc=com"); + environment.put(Context.SECURITY_CREDENTIALS, "wronguserpw"); + + assertThatExceptionOfType(AuthenticationException.class).isThrownBy(() -> authenticateUser(environment)); + } + + @Test + public void givenPreloadedLDAPUserJoe_whenSearchAndAuthUserWithCorrectPW_thenAuthSucceeds() throws Exception { + + // first authenticate against LDAP as admin to search up DN of user : Joe Simms + + Hashtable environment = new Hashtable(); + environment.put(Context.INITIAL_CONTEXT_FACTORY, "com.sun.jndi.ldap.LdapCtxFactory"); + environment.put(Context.PROVIDER_URL, "ldap://localhost:10390"); + environment.put(Context.SECURITY_AUTHENTICATION, "simple"); + environment.put(Context.SECURITY_PRINCIPAL, "uid=admin,ou=system"); + environment.put(Context.SECURITY_CREDENTIALS, "secret"); + + DirContext adminContext = new InitialDirContext(environment); + + // define the search filter to find the person with CN : Joe Simms + String filter = "(&(objectClass=person)(cn=Joe Simms))"; + + // declare the attributes we want returned for the object being searched + String[] attrIDs = { "cn" }; + + // define the search controls + SearchControls searchControls = new SearchControls(); + searchControls.setReturningAttributes(attrIDs); + searchControls.setSearchScope(SearchControls.SUBTREE_SCOPE); + + // search for User with filter cn=Joe Simms + NamingEnumeration searchResults = adminContext.search("dc=baeldung,dc=com", filter, searchControls); + if (searchResults.hasMore()) { + + SearchResult result = (SearchResult) searchResults.next(); + Attributes attrs = result.getAttributes(); + + String distinguishedName = result.getNameInNamespace(); + assertThat(distinguishedName).isEqualTo("cn=Joe Simms,ou=Users,dc=baeldung,dc=com"); + + String commonName = attrs.get("cn").toString(); + assertThat(commonName).isEqualTo("cn: Joe Simms"); + + // authenticate new context with DN for user Joe Simms, using correct password + + environment.put(Context.SECURITY_PRINCIPAL, distinguishedName); + environment.put(Context.SECURITY_CREDENTIALS, "12345"); + + assertThatCode(() -> authenticateUser(environment)).doesNotThrowAnyException(); + } + + adminContext.close(); + } + + @Test + public void givenPreloadedLDAPUserJoe_whenSearchAndAuthUserWithWrongPW_thenAuthFails() throws Exception { + + // first authenticate against LDAP as admin to search up DN of user : Joe Simms + + Hashtable environment = new Hashtable(); + environment.put(Context.INITIAL_CONTEXT_FACTORY, "com.sun.jndi.ldap.LdapCtxFactory"); + environment.put(Context.PROVIDER_URL, "ldap://localhost:10390"); + environment.put(Context.SECURITY_AUTHENTICATION, "simple"); + environment.put(Context.SECURITY_PRINCIPAL, "uid=admin,ou=system"); + environment.put(Context.SECURITY_CREDENTIALS, "secret"); + DirContext adminContext = new InitialDirContext(environment); + + // define the search filter to find the person with CN : Joe Simms + String filter = "(&(objectClass=person)(cn=Joe Simms))"; + + // declare the attributes we want returned for the object being searched + String[] attrIDs = { "cn" }; + + // define the search controls + SearchControls searchControls = new SearchControls(); + searchControls.setReturningAttributes(attrIDs); + searchControls.setSearchScope(SearchControls.SUBTREE_SCOPE); + + // search for User with filter cn=Joe Simms + NamingEnumeration searchResults = adminContext.search("dc=baeldung,dc=com", filter, searchControls); + if (searchResults.hasMore()) { + + SearchResult result = (SearchResult) searchResults.next(); + Attributes attrs = result.getAttributes(); + + String distinguishedName = result.getNameInNamespace(); + assertThat(distinguishedName).isEqualTo("cn=Joe Simms,ou=Users,dc=baeldung,dc=com"); + + String commonName = attrs.get("cn").toString(); + assertThat(commonName).isEqualTo("cn: Joe Simms"); + + // authenticate new context with DN for user Joe Simms, using wrong password + + environment.put(Context.SECURITY_PRINCIPAL, distinguishedName); + environment.put(Context.SECURITY_CREDENTIALS, "wronguserpassword"); + + assertThatExceptionOfType(AuthenticationException.class).isThrownBy(() -> authenticateUser(environment)); + } + + adminContext.close(); + } +} diff --git a/core-java-modules/core-java-jndi/src/test/resources/logback.xml b/core-java-modules/core-java-jndi/src/test/resources/logback.xml new file mode 100644 index 0000000000..e55b365ba4 --- /dev/null +++ b/core-java-modules/core-java-jndi/src/test/resources/logback.xml @@ -0,0 +1,13 @@ + + + + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + + + + + + + diff --git a/core-java-modules/core-java-jndi/src/test/resources/users.ldif b/core-java-modules/core-java-jndi/src/test/resources/users.ldif new file mode 100644 index 0000000000..c1996586d5 --- /dev/null +++ b/core-java-modules/core-java-jndi/src/test/resources/users.ldif @@ -0,0 +1,20 @@ +version: 1 +dn: dc=baeldung,dc=com +objectClass: domain +objectClass: top +dc: baeldung + +dn: ou=Users,dc=baeldung,dc=com +objectClass: organizationalUnit +objectClass: top +ou: Users + +dn: cn=Joe Simms,ou=Users,dc=baeldung,dc=com +objectClass: inetOrgPerson +objectClass: organizationalPerson +objectClass: person +objectClass: top +cn: Joe Simms +sn: Simms +uid: user1 +userPassword: 12345 diff --git a/core-java-modules/core-java-jvm-2/pom.xml b/core-java-modules/core-java-jvm-2/pom.xml index 5bc5b5e3a5..08c8de75a9 100644 --- a/core-java-modules/core-java-jvm-2/pom.xml +++ b/core-java-modules/core-java-jvm-2/pom.xml @@ -15,12 +15,6 @@ - - junit - junit - ${junit.version} - test - org.assertj assertj-core diff --git a/core-java-modules/core-java-jvm/pom.xml b/core-java-modules/core-java-jvm/pom.xml index 58934065a3..a8ab4d9f2e 100644 --- a/core-java-modules/core-java-jvm/pom.xml +++ b/core-java-modules/core-java-jvm/pom.xml @@ -16,12 +16,6 @@ - - junit - junit - ${junit.version} - test - org.apache.commons commons-lang3 diff --git a/core-java-modules/core-java-lang-4/src/main/java/com/baeldung/constructorchaining/Customer.java b/core-java-modules/core-java-lang-4/src/main/java/com/baeldung/constructorchaining/Customer.java new file mode 100644 index 0000000000..62dbdef297 --- /dev/null +++ b/core-java-modules/core-java-lang-4/src/main/java/com/baeldung/constructorchaining/Customer.java @@ -0,0 +1,34 @@ +package com.baeldung.constructorchaining; + +import java.util.Objects; + +public class Customer extends Person { + private final String loyaltyCardId; + + public Customer(String firstName, String lastName, int age, String loyaltyCardId) { + this(firstName, null, lastName, age, loyaltyCardId); + } + + public Customer(String firstName, String middleName, String lastName, int age, String loyaltyCardId) { + super(firstName, middleName, lastName, age); + this.loyaltyCardId = loyaltyCardId; + } + + public String getLoyaltyCardId() { + return loyaltyCardId; + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + if (!super.equals(o)) return false; + Customer customer = (Customer) o; + return Objects.equals(loyaltyCardId, customer.loyaltyCardId); + } + + @Override + public int hashCode() { + return Objects.hash(super.hashCode(), loyaltyCardId); + } +} diff --git a/core-java-modules/core-java-lang-4/src/main/java/com/baeldung/constructorchaining/Person.java b/core-java-modules/core-java-lang-4/src/main/java/com/baeldung/constructorchaining/Person.java new file mode 100644 index 0000000000..02ce2220ba --- /dev/null +++ b/core-java-modules/core-java-lang-4/src/main/java/com/baeldung/constructorchaining/Person.java @@ -0,0 +1,51 @@ +package com.baeldung.constructorchaining; + +import java.util.Objects; + +public class Person { + private final String firstName; + private final String middleName; + private final String lastName; + private final int age; + + public Person(String firstName, String lastName, int age) { + this(firstName, null, lastName, age); + } + + + public Person(String firstName, String middleName, String lastName, int age) { + this.firstName = firstName; + this.middleName = middleName; + this.lastName = lastName; + this.age = age; + } + + public String getFirstName() { + return firstName; + } + + public String getLastName() { + return lastName; + } + + public int getAge() { + return age; + } + + public String getMiddleName() { + return middleName; + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + Person person = (Person) o; + return age == person.age && Objects.equals(firstName, person.firstName) && Objects.equals(middleName, person.middleName) && Objects.equals(lastName, person.lastName); + } + + @Override + public int hashCode() { + return Objects.hash(firstName, middleName, lastName, age); + } +} diff --git a/core-java-modules/core-java-lang-4/src/test/java/com/baeldung/constructorchaining/CustomerUnitTest.java b/core-java-modules/core-java-lang-4/src/test/java/com/baeldung/constructorchaining/CustomerUnitTest.java new file mode 100644 index 0000000000..ad00ea65b8 --- /dev/null +++ b/core-java-modules/core-java-lang-4/src/test/java/com/baeldung/constructorchaining/CustomerUnitTest.java @@ -0,0 +1,31 @@ +package com.baeldung.constructorchaining; + +import org.junit.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; + +public class CustomerUnitTest { + + @Test + public void givenNameLastNameAndAge_whenUsingDedicatedConstructor_shouldInitializeFieldsAndNullifyMiddleName() { + Customer mark = new Customer("Mark", "Johnson", 23, "abcd1234"); + + assertEquals(23, mark.getAge()); + assertEquals("Mark", mark.getFirstName()); + assertEquals("Johnson", mark.getLastName()); + assertEquals("abcd1234", mark.getLoyaltyCardId()); + assertNull(mark.getMiddleName()); + } + + @Test + public void givenAllFieldsRequired_whenUsingDedicatedConstructor_shouldInitializeAllFields() { + Customer mark = new Customer("Mark", "Andrew", "Johnson", 23, "abcd1234"); + + assertEquals(23, mark.getAge()); + assertEquals("Mark", mark.getFirstName()); + assertEquals("Andrew", mark.getMiddleName()); + assertEquals("Johnson", mark.getLastName()); + assertEquals("abcd1234", mark.getLoyaltyCardId()); + } +} \ No newline at end of file diff --git a/core-java-modules/core-java-lang-4/src/test/java/com/baeldung/constructorchaining/PersonUnitTest.java b/core-java-modules/core-java-lang-4/src/test/java/com/baeldung/constructorchaining/PersonUnitTest.java new file mode 100644 index 0000000000..8322917951 --- /dev/null +++ b/core-java-modules/core-java-lang-4/src/test/java/com/baeldung/constructorchaining/PersonUnitTest.java @@ -0,0 +1,29 @@ +package com.baeldung.constructorchaining; + +import org.junit.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; + +public class PersonUnitTest { + + @Test + public void givenNameLastNameAndAge_whenUsingDedicatedConstructor_shouldInitializeFieldsAndNullifyMiddleName() { + Person mark = new Person("Mark", "Johnson", 23); + + assertEquals(23, mark.getAge()); + assertEquals("Mark", mark.getFirstName()); + assertEquals("Johnson", mark.getLastName()); + assertNull(mark.getMiddleName()); + } + + @Test + public void givenAllFieldsRequired_whenUsingDedicatedConstructor_shouldInitializeAllFields() { + Person mark = new Person("Mark", "Andrew", "Johnson", 23); + + assertEquals(23, mark.getAge()); + assertEquals("Mark", mark.getFirstName()); + assertEquals("Andrew", mark.getMiddleName()); + assertEquals("Johnson", mark.getLastName()); + } +} \ No newline at end of file diff --git a/core-java-modules/core-java-networking-3/pom.xml b/core-java-modules/core-java-networking-3/pom.xml index de2408ec0d..1579418b54 100644 --- a/core-java-modules/core-java-networking-3/pom.xml +++ b/core-java-modules/core-java-networking-3/pom.xml @@ -35,12 +35,6 @@ ${assertj.version} test - - junit - junit - 4.11 - test - com.sun.mail javax.mail diff --git a/core-java-modules/core-java-os/pom.xml b/core-java-modules/core-java-os/pom.xml index 572000a714..34afbec210 100644 --- a/core-java-modules/core-java-os/pom.xml +++ b/core-java-modules/core-java-os/pom.xml @@ -16,12 +16,6 @@ - - org.junit.jupiter - junit-jupiter-engine - ${junit-jupiter-engine.version} - test - org.apache.commons commons-collections4 @@ -94,7 +88,6 @@ 25.1-jre 0.4 1.8.7 - 5.7.2 \ No newline at end of file diff --git a/core-java-modules/core-java-os/src/test/java/com/baeldung/example/soundapi/AppUnitTest.java b/core-java-modules/core-java-os/src/test/java/com/baeldung/example/soundapi/AppUnitTest.java index 38f21320e3..27bc750d8a 100644 --- a/core-java-modules/core-java-os/src/test/java/com/baeldung/example/soundapi/AppUnitTest.java +++ b/core-java-modules/core-java-os/src/test/java/com/baeldung/example/soundapi/AppUnitTest.java @@ -1,5 +1,6 @@ package com.baeldung.example.soundapi; +import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Assertions; @@ -37,6 +38,7 @@ public class AppUnitTest { } @Test + @Disabled public void Given_TargetLineDataObject_When_Run_Then_GeneratesOutputStream() { soundRecorder.setFormat(af); @@ -52,6 +54,7 @@ public class AppUnitTest { } @Test + @Disabled public void Given_AudioInputStream_When_NotNull_Then_SaveToWavFile() { soundRecorder.setFormat(af); soundRecorder.build(af); diff --git a/core-java-modules/core-java-streams-2/pom.xml b/core-java-modules/core-java-streams-2/pom.xml index 5f25a2d9fb..08b82bcc11 100644 --- a/core-java-modules/core-java-streams-2/pom.xml +++ b/core-java-modules/core-java-streams-2/pom.xml @@ -30,13 +30,6 @@ log4j ${log4j.version} - - junit - junit - ${junit.version} - test - jar - org.assertj assertj-core diff --git a/core-java-modules/core-java-string-algorithms-3/pom.xml b/core-java-modules/core-java-string-algorithms-3/pom.xml index 6376bfa677..4287696332 100644 --- a/core-java-modules/core-java-string-algorithms-3/pom.xml +++ b/core-java-modules/core-java-string-algorithms-3/pom.xml @@ -26,11 +26,6 @@ guava ${guava.version} - - org.junit.jupiter - junit-jupiter - test - commons-validator commons-validator diff --git a/core-java-modules/core-java-string-apis/README.md b/core-java-modules/core-java-string-apis/README.md index c9aa40de7a..0dd24d7e9a 100644 --- a/core-java-modules/core-java-string-apis/README.md +++ b/core-java-modules/core-java-string-apis/README.md @@ -10,3 +10,4 @@ This module contains articles about string APIs. - [CharSequence vs. String in Java](https://www.baeldung.com/java-char-sequence-string) - [StringBuilder vs StringBuffer in Java](https://www.baeldung.com/java-string-builder-string-buffer) - [Generate a Secure Random Password in Java](https://www.baeldung.com/java-generate-secure-password) +- [Getting a Character by Index From a String in Java](https://www.baeldung.com/java-character-at-position) diff --git a/core-java-modules/core-java-string-apis/src/test/java/com/baeldung/stringapi/StringCharAtUnitTest.java b/core-java-modules/core-java-string-apis/src/test/java/com/baeldung/stringapi/StringCharAtUnitTest.java new file mode 100644 index 0000000000..5d31b337ef --- /dev/null +++ b/core-java-modules/core-java-string-apis/src/test/java/com/baeldung/stringapi/StringCharAtUnitTest.java @@ -0,0 +1,29 @@ +package com.baeldung.stringapi; + +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; + +public class StringCharAtUnitTest { + @Test + public void whenCallCharAt_thenSuccess() { + String sample = "abcdefg"; + assertEquals('d', sample.charAt(3)); + } + + @Test() + public void whenCharAtNonExist_thenIndexOutOfBoundsExceptionThrown() { + String sample = "abcdefg"; + assertThrows(IndexOutOfBoundsException.class, () -> sample.charAt(-1)); + assertThrows(IndexOutOfBoundsException.class, () -> sample.charAt(sample.length())); + } + + @Test + public void whenCallCharAt_thenReturnString() { + String sample = "abcdefg"; + assertEquals("a", Character.toString(sample.charAt(0))); + assertEquals("a", String.valueOf(sample.charAt(0))); + } + +} \ No newline at end of file diff --git a/core-java-modules/core-java-string-conversions-2/pom.xml b/core-java-modules/core-java-string-conversions-2/pom.xml index 44968678f2..68be7d2c08 100644 --- a/core-java-modules/core-java-string-conversions-2/pom.xml +++ b/core-java-modules/core-java-string-conversions-2/pom.xml @@ -20,12 +20,6 @@ guava ${guava.version} - - junit - junit - ${junit.version} - test - org.hamcrest hamcrest diff --git a/core-java-modules/core-java-string-operations-3/README.md b/core-java-modules/core-java-string-operations-3/README.md index f4cde6104f..dc42862e5d 100644 --- a/core-java-modules/core-java-string-operations-3/README.md +++ b/core-java-modules/core-java-string-operations-3/README.md @@ -6,3 +6,6 @@ - [Split a String in Java and Keep the Delimiters](https://www.baeldung.com/java-split-string-keep-delimiters) - [Validate String as Filename in Java](https://www.baeldung.com/java-validate-filename) - [Count Spaces in a Java String](https://www.baeldung.com/java-string-count-spaces) +- [Remove Accents and Diacritics From a String in Java](https://www.baeldung.com/java-remove-accents-from-text) +- [Remove Beginning and Ending Double Quotes from a String](https://www.baeldung.com/java-remove-start-end-double-quote) +- [Splitting a Java String by Multiple Delimiters](https://www.baeldung.com/java-string-split-multiple-delimiters) diff --git a/core-java-modules/core-java-string-operations-3/pom.xml b/core-java-modules/core-java-string-operations-3/pom.xml index 642ade5ab3..20e9bcb39a 100644 --- a/core-java-modules/core-java-string-operations-3/pom.xml +++ b/core-java-modules/core-java-string-operations-3/pom.xml @@ -52,6 +52,11 @@ semver4j ${semver4j.version} + + com.google.guava + guava + ${guava.version} + @@ -80,6 +85,7 @@ 3.6.1 5.3.9 3.12.0 + 31.0.1-jre 3.6.3 6.1.1 2.11.1 diff --git a/core-java-modules/core-java-string-operations-3/src/test/java/com/baeldung/multipledelimiterssplit/MultipleDelimitersSplitUnitTest.java b/core-java-modules/core-java-string-operations-3/src/test/java/com/baeldung/multipledelimiterssplit/MultipleDelimitersSplitUnitTest.java new file mode 100644 index 0000000000..c8f8fc2d98 --- /dev/null +++ b/core-java-modules/core-java-string-operations-3/src/test/java/com/baeldung/multipledelimiterssplit/MultipleDelimitersSplitUnitTest.java @@ -0,0 +1,66 @@ +package com.baeldung.multipledelimiterssplit; + +import com.google.common.base.CharMatcher; +import com.google.common.base.Splitter; +import com.google.common.collect.Iterators; +import org.apache.commons.lang3.StringUtils; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestInstance; + +import java.util.Arrays; +import java.util.regex.Pattern; + +@TestInstance(TestInstance.Lifecycle.PER_CLASS) +public class MultipleDelimitersSplitUnitTest { + + @Test + public void givenString_whenSplittingByMultipleDelimitersWithRegEx_thenStringSplit() { + String example = "Mary;Thomas:Jane-Kate"; + String[] names = example.split(";|:|-"); + String[] expectedNames = new String[]{"Mary", "Thomas", "Jane", "Kate"}; + Assertions.assertEquals(4, names.length); + Assertions.assertArrayEquals(expectedNames, names); + } + + @Test + public void givenString_whenSplittingByWithCharMatcherAndOnMethod_thenStringSplit() { + String example = "Mary;Thomas:Jane-Kate"; + String[] expectedArray = new String[]{"Mary", "Thomas", "Jane", "Kate"}; + Iterable expected = Arrays.asList(expectedArray); + Iterable names = Splitter.on(CharMatcher.anyOf(";:-")).split(example); + Assertions.assertEquals(4, Iterators.size(names.iterator())); + Assertions.assertIterableEquals(expected, names); + } + + @Test + public void givenString_whenSplittingByWithRegexAndOnPatternMethod_thenStringSplit() { + String example = "Mary;Thomas:Jane-Kate"; + String[] expectedArray = new String[]{"Mary", "Thomas", "Jane", "Kate"}; + Iterable expected = Arrays.asList(expectedArray); + Iterable names = Splitter.on(Pattern.compile(";|:|-")).split(example); + Assertions.assertEquals(4, Iterators.size(names.iterator())); + Assertions.assertIterableEquals(expected, names); + } + + @Test + public void givenString_whenSplittingByMultipleDelimitersWithGuava_thenStringSplit() { + String example = "Mary;Thomas:Jane-Kate"; + String[] expectedArray = new String[]{"Mary", "Thomas", "Jane", "Kate"}; + Iterable expected = Arrays.asList(expectedArray); + Iterable names = Splitter.onPattern(";|:|-").split(example); + Assertions.assertEquals(4, Iterators.size(names.iterator())); + Assertions.assertIterableEquals(expected, names); + } + + @Test + public void givenString_whenSplittingByMultipleDelimitersWithApache_thenStringSplit() { + String example = "Mary;Thomas:Jane-Kate"; + String[] expectedNames = new String[]{"Mary", "Thomas", "Jane", "Kate"}; + String[] names = StringUtils.split(example, ";:-"); + Assertions.assertEquals(4, names.length); + Assertions.assertArrayEquals(expectedNames, names); + } + +} + diff --git a/core-java-modules/core-java-time-measurements/pom.xml b/core-java-modules/core-java-time-measurements/pom.xml index 663cf6708b..5a2a13290b 100644 --- a/core-java-modules/core-java-time-measurements/pom.xml +++ b/core-java-modules/core-java-time-measurements/pom.xml @@ -75,8 +75,8 @@ + org.apache.maven.plugins maven-surefire-plugin - ${maven-surefire-plugin.version} -javaagent:${settings.localRepository}/org/jmockit/jmockit/${jmockit.version}/jmockit-${jmockit.version}.jar @@ -97,8 +97,6 @@ 1.8.9 2.0.7 1.44 - - 2.22.1 \ No newline at end of file diff --git a/core-java-modules/multimodulemavenproject/pom.xml b/core-java-modules/multimodulemavenproject/pom.xml index f45774ae00..79d884cd86 100644 --- a/core-java-modules/multimodulemavenproject/pom.xml +++ b/core-java-modules/multimodulemavenproject/pom.xml @@ -25,12 +25,6 @@ - - junit - junit - ${junit.version} - test - org.assertj assertj-core diff --git a/core-java-modules/pom.xml b/core-java-modules/pom.xml index 5291c8c3ca..872161c2bd 100644 --- a/core-java-modules/pom.xml +++ b/core-java-modules/pom.xml @@ -134,9 +134,4 @@ - - 2.22.2 - 5.6.2 - - diff --git a/ddd-modules/pom.xml b/ddd-modules/pom.xml index 376dad89e5..fe3aaf1160 100644 --- a/ddd-modules/pom.xml +++ b/ddd-modules/pom.xml @@ -81,7 +81,6 @@ 1.0 - 5.6.2 3.12.2 diff --git a/docker/README.md b/docker/README.md index ab3ddd35b7..8aca8e4293 100644 --- a/docker/README.md +++ b/docker/README.md @@ -4,3 +4,4 @@ - [Reusing Docker Layers with Spring Boot](https://www.baeldung.com/docker-layers-spring-boot) - [Running Spring Boot with PostgreSQL in Docker Compose](https://www.baeldung.com/spring-boot-postgresql-docker) - [How To Configure Java Heap Size Inside a Docker Container](https://www.baeldung.com/ops/docker-jvm-heap-size) +- [Dockerfile Strategies for Git](https://www.baeldung.com/ops/dockerfile-git-strategies) diff --git a/docker/docker-sample-app/Dockerfile b/docker/docker-sample-app/Dockerfile new file mode 100644 index 0000000000..71fc1a29d9 --- /dev/null +++ b/docker/docker-sample-app/Dockerfile @@ -0,0 +1,3 @@ +FROM openjdk:11 +COPY target/docker-sample-app-0.0.1.jar app.jar +ENTRYPOINT ["java","-jar","/app.jar"] diff --git a/docker/docker-sample-app/README.md b/docker/docker-sample-app/README.md new file mode 100644 index 0000000000..6aeaa1d2a3 --- /dev/null +++ b/docker/docker-sample-app/README.md @@ -0,0 +1,3 @@ +### Relevant Articles: + +- How to Get Docker-Compose to Always Use the Latest Image diff --git a/docker/docker-sample-app/docker-compose-build-image.yaml b/docker/docker-sample-app/docker-compose-build-image.yaml new file mode 100644 index 0000000000..27c1d8ee44 --- /dev/null +++ b/docker/docker-sample-app/docker-compose-build-image.yaml @@ -0,0 +1,8 @@ +version: '2.4' +services: + db: + image: postgres + my_app: + build: . + ports: + - "8080:8080" diff --git a/docker/docker-sample-app/docker-compose-with-image.yaml b/docker/docker-sample-app/docker-compose-with-image.yaml new file mode 100644 index 0000000000..9a8822f762 --- /dev/null +++ b/docker/docker-sample-app/docker-compose-with-image.yaml @@ -0,0 +1,9 @@ +version: '2.4' +services: + db: + image: postgres + my_app: + image: "eugen/test-app:latest" + ports: + - "8080:8080" + diff --git a/docker/docker-sample-app/pom.xml b/docker/docker-sample-app/pom.xml new file mode 100644 index 0000000000..6841fabcee --- /dev/null +++ b/docker/docker-sample-app/pom.xml @@ -0,0 +1,45 @@ + + + 4.0.0 + + com.baeldung.docker + docker + 0.0.1 + + + docker-sample-app + docker-sample-app + Demo project for Spring Boot and Docker + + + 11 + + + + + org.springframework.boot + spring-boot-starter + + + org.springframework.boot + spring-boot-starter-web + + + + org.springframework.boot + spring-boot-starter-test + test + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + diff --git a/docker/docker-sample-app/src/main/java/com/baeldung/docker/app/DockAppApplication.java b/docker/docker-sample-app/src/main/java/com/baeldung/docker/app/DockAppApplication.java new file mode 100644 index 0000000000..e7ff52015c --- /dev/null +++ b/docker/docker-sample-app/src/main/java/com/baeldung/docker/app/DockAppApplication.java @@ -0,0 +1,13 @@ +package com.baeldung.docker.app; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class DockAppApplication { + + public static void main(String[] args) { + SpringApplication.run(DockAppApplication.class, args); + } + +} diff --git a/docker/docker-sample-app/src/main/java/com/baeldung/docker/app/endpoint/MyController.java b/docker/docker-sample-app/src/main/java/com/baeldung/docker/app/endpoint/MyController.java new file mode 100644 index 0000000000..d46c57e606 --- /dev/null +++ b/docker/docker-sample-app/src/main/java/com/baeldung/docker/app/endpoint/MyController.java @@ -0,0 +1,13 @@ +package com.baeldung.docker.app.endpoint; + +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +public class MyController { + + @GetMapping + public String version() { + return "1.7"; + } +} diff --git a/docker/docker-sample-app/src/main/resources/application.properties b/docker/docker-sample-app/src/main/resources/application.properties new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/docker/docker-sample-app/src/main/resources/application.properties @@ -0,0 +1 @@ + diff --git a/docker/docker-sample-app/src/test/java/com/baeldung/docker/app/DockAppApplicationUnitTest.java b/docker/docker-sample-app/src/test/java/com/baeldung/docker/app/DockAppApplicationUnitTest.java new file mode 100644 index 0000000000..7220766988 --- /dev/null +++ b/docker/docker-sample-app/src/test/java/com/baeldung/docker/app/DockAppApplicationUnitTest.java @@ -0,0 +1,13 @@ +package com.baeldung.docker.app; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class DockAppApplicationUnitTest { + + @Test + void contextLoads() { + } + +} diff --git a/docker/pom.xml b/docker/pom.xml index 3fcc9ca94f..f481f1b8b7 100644 --- a/docker/pom.xml +++ b/docker/pom.xml @@ -25,6 +25,7 @@ docker-internal-dto docker-spring-boot + docker-sample-app diff --git a/ethereum/pom.xml b/ethereum/pom.xml index b9a3870702..95dd1c0955 100644 --- a/ethereum/pom.xml +++ b/ethereum/pom.xml @@ -1,7 +1,7 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 com.baeldung.ethereum ethereum @@ -112,6 +112,13 @@ spring-boot-starter-test test ${spring.boot.version} + + + + junit + junit + + org.springframework @@ -137,18 +144,6 @@ test - - junit - junit - ${junit.version} - test - - - org.hamcrest - hamcrest-core - - - org.hamcrest hamcrest diff --git a/google-web-toolkit/pom.xml b/google-web-toolkit/pom.xml index 6b93ccbc71..1a49ced021 100644 --- a/google-web-toolkit/pom.xml +++ b/google-web-toolkit/pom.xml @@ -45,9 +45,9 @@ provided - junit - junit - ${junit.version} + org.junit.vintage + junit-vintage-engine + ${junit-jupiter.version} test diff --git a/grpc/pom.xml b/grpc/pom.xml index 50700b0785..f034b2b517 100644 --- a/grpc/pom.xml +++ b/grpc/pom.xml @@ -38,9 +38,9 @@ test - junit - junit - ${junit.version} + org.junit.vintage + junit-vintage-engine + ${junit-jupiter.version} test diff --git a/guava-modules/guava-collections-list/pom.xml b/guava-modules/guava-collections-list/pom.xml index d281be2235..671cbea39d 100644 --- a/guava-modules/guava-collections-list/pom.xml +++ b/guava-modules/guava-collections-list/pom.xml @@ -27,18 +27,6 @@ ${commons-lang3.version} - - org.junit.jupiter - junit-jupiter - ${junit-jupiter.version} - test - - - org.junit.vintage - junit-vintage-engine - ${junit-jupiter.version} - test - org.assertj assertj-core @@ -70,7 +58,6 @@ 3.6.1 2.0.0.0 - 5.6.2 \ No newline at end of file diff --git a/guava-modules/guava-collections-map/pom.xml b/guava-modules/guava-collections-map/pom.xml index a03a779b3e..e4d33ce0cc 100644 --- a/guava-modules/guava-collections-map/pom.xml +++ b/guava-modules/guava-collections-map/pom.xml @@ -15,21 +15,6 @@ ../ - - - org.junit.jupiter - junit-jupiter - ${junit-jupiter.version} - test - - - org.junit.vintage - junit-vintage-engine - ${junit-jupiter.version} - test - - - guava-collections-map @@ -40,7 +25,4 @@ - - 5.6.2 - \ No newline at end of file diff --git a/guava-modules/guava-collections-set/pom.xml b/guava-modules/guava-collections-set/pom.xml index b989966a54..97e03155e7 100644 --- a/guava-modules/guava-collections-set/pom.xml +++ b/guava-modules/guava-collections-set/pom.xml @@ -16,18 +16,6 @@ - - org.junit.jupiter - junit-jupiter - ${junit-jupiter.version} - test - - - org.junit.vintage - junit-vintage-engine - ${junit-jupiter.version} - test - org.assertj assertj-core @@ -43,7 +31,6 @@ 3.6.1 - 5.6.2 \ No newline at end of file diff --git a/guava-modules/guava-collections/pom.xml b/guava-modules/guava-collections/pom.xml index 021c4c6037..f3356cf982 100644 --- a/guava-modules/guava-collections/pom.xml +++ b/guava-modules/guava-collections/pom.xml @@ -32,18 +32,6 @@ ${jool.version} - - org.junit.jupiter - junit-jupiter - ${junit-jupiter.version} - test - - - org.junit.vintage - junit-vintage-engine - ${junit-jupiter.version} - test - org.assertj assertj-core @@ -76,7 +64,6 @@ 3.6.1 2.0.0.0 - 5.6.2 \ No newline at end of file diff --git a/guava-modules/guava-io/pom.xml b/guava-modules/guava-io/pom.xml index f6ebac8ba4..f1f75b43a8 100644 --- a/guava-modules/guava-io/pom.xml +++ b/guava-modules/guava-io/pom.xml @@ -14,21 +14,6 @@ ../ - - - org.junit.jupiter - junit-jupiter - ${junit-jupiter.version} - test - - - org.junit.vintage - junit-vintage-engine - ${junit-jupiter.version} - test - - - guava-io @@ -39,8 +24,4 @@ - - 5.6.2 - - \ No newline at end of file diff --git a/guava-modules/guava-utilities/pom.xml b/guava-modules/guava-utilities/pom.xml index a9aca0ee08..b33ea16c11 100644 --- a/guava-modules/guava-utilities/pom.xml +++ b/guava-modules/guava-utilities/pom.xml @@ -21,18 +21,6 @@ ${commons-lang3.version} - - org.junit.jupiter - junit-jupiter - ${junit-jupiter.version} - test - - - org.junit.vintage - junit-vintage-engine - ${junit-jupiter.version} - test - org.assertj assertj-core @@ -53,7 +41,6 @@ - 5.6.2 3.6.1 diff --git a/guava-modules/pom.xml b/guava-modules/pom.xml index 8ffac98b51..019776ad3d 100644 --- a/guava-modules/pom.xml +++ b/guava-modules/pom.xml @@ -34,23 +34,9 @@ guava ${guava.version} - - org.junit.jupiter - junit-jupiter - ${junit-jupiter.version} - test - - - org.junit.vintage - junit-vintage-engine - ${junit-jupiter.version} - test - - 2.22.2 - 5.6.2 29.0-jre diff --git a/guest/core-kotlin/pom.xml b/guest/core-kotlin/pom.xml index ad0368c6ab..91bc7fa170 100644 --- a/guest/core-kotlin/pom.xml +++ b/guest/core-kotlin/pom.xml @@ -19,7 +19,7 @@ org.junit.platform junit-platform-runner - ${junit.platform.version} + ${junit-platform.version} test @@ -160,7 +160,7 @@ org.junit.platform junit-platform-surefire-provider - ${junit.platform.version} + ${junit-platform-surefire-provider.version} @@ -191,8 +191,6 @@ 0.22.5 1.5.0 3.6.1 - 1.0.0 - 5.2.0 3.10.0 3.7.0 1.1.5 diff --git a/guest/junit5-example/pom.xml b/guest/junit5-example/pom.xml index 05e320f96d..a88f739891 100644 --- a/guest/junit5-example/pom.xml +++ b/guest/junit5-example/pom.xml @@ -18,12 +18,12 @@ org.junit.jupiter junit-jupiter-params - ${junit.jupiter.version} + ${junit-jupiter.version} org.junit.vintage junit-vintage-engine - ${junit-vintage.version} + ${junit-jupiter.version} com.h2database @@ -59,9 +59,6 @@ - 5.0.0-M4 - 4.12.0-M4 2.8.2 - 1.0.0-M4 \ No newline at end of file diff --git a/jackson-modules/jackson-annotations/src/test/java/com/baeldung/jackson/advancedannotations/NamingBean.java b/jackson-modules/jackson-annotations/src/test/java/com/baeldung/jackson/advancedannotations/NamingBean.java index 323df49c14..c1b8da4c1c 100644 --- a/jackson-modules/jackson-annotations/src/test/java/com/baeldung/jackson/advancedannotations/NamingBean.java +++ b/jackson-modules/jackson-annotations/src/test/java/com/baeldung/jackson/advancedannotations/NamingBean.java @@ -1,9 +1,9 @@ package com.baeldung.jackson.advancedannotations; -import com.fasterxml.jackson.databind.PropertyNamingStrategy; +import com.fasterxml.jackson.databind.PropertyNamingStrategies; import com.fasterxml.jackson.databind.annotation.JsonNaming; -@JsonNaming(PropertyNamingStrategy.SnakeCaseStrategy.class) +@JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class) public class NamingBean { private int id; private String beanName; diff --git a/jackson-modules/jackson-conversions-2/README.md b/jackson-modules/jackson-conversions-2/README.md index 9986fe75b5..bddbb60bd7 100644 --- a/jackson-modules/jackson-conversions-2/README.md +++ b/jackson-modules/jackson-conversions-2/README.md @@ -10,4 +10,5 @@ This module contains articles about Jackson conversions. - [How to Process YAML with Jackson](https://www.baeldung.com/jackson-yaml) - [Jackson Streaming API](https://www.baeldung.com/jackson-streaming-api) - [Jackson: java.util.LinkedHashMap cannot be cast to X](https://www.baeldung.com/jackson-linkedhashmap-cannot-be-cast) +- [Deserialize Snake Case to Camel Case With Jackson](https://www.baeldung.com/jackson-deserialize-snake-to-camel-case) - More articles: [[<-- prev]](../jackson-conversions) diff --git a/jackson-modules/jackson-conversions-2/src/main/java/com/baeldung/jackson/snakecase/User.java b/jackson-modules/jackson-conversions-2/src/main/java/com/baeldung/jackson/snakecase/User.java new file mode 100644 index 0000000000..17bf6f898b --- /dev/null +++ b/jackson-modules/jackson-conversions-2/src/main/java/com/baeldung/jackson/snakecase/User.java @@ -0,0 +1,22 @@ +package com.baeldung.jackson.snakecase; + +public class User { + private String firstName; + private String lastName; + + public String getFirstName() { + return firstName; + } + + public void setFirstName(String firstName) { + this.firstName = firstName; + } + + public String getLastName() { + return lastName; + } + + public void setLastName(String lastName) { + this.lastName = lastName; + } +} diff --git a/jackson-modules/jackson-conversions-2/src/main/java/com/baeldung/jackson/snakecase/UserWithPropertyNames.java b/jackson-modules/jackson-conversions-2/src/main/java/com/baeldung/jackson/snakecase/UserWithPropertyNames.java new file mode 100644 index 0000000000..f9f36243ad --- /dev/null +++ b/jackson-modules/jackson-conversions-2/src/main/java/com/baeldung/jackson/snakecase/UserWithPropertyNames.java @@ -0,0 +1,26 @@ +package com.baeldung.jackson.snakecase; + +import com.fasterxml.jackson.annotation.JsonProperty; + +public class UserWithPropertyNames { + @JsonProperty("first_name") + private String firstName; + @JsonProperty("last_name") + private String lastName; + + public String getFirstName() { + return firstName; + } + + public void setFirstName(String firstName) { + this.firstName = firstName; + } + + public String getLastName() { + return lastName; + } + + public void setLastName(String lastName) { + this.lastName = lastName; + } +} diff --git a/jackson-modules/jackson-conversions-2/src/main/java/com/baeldung/jackson/snakecase/UserWithSnakeStrategy.java b/jackson-modules/jackson-conversions-2/src/main/java/com/baeldung/jackson/snakecase/UserWithSnakeStrategy.java new file mode 100644 index 0000000000..ffec940ed8 --- /dev/null +++ b/jackson-modules/jackson-conversions-2/src/main/java/com/baeldung/jackson/snakecase/UserWithSnakeStrategy.java @@ -0,0 +1,26 @@ +package com.baeldung.jackson.snakecase; + +import com.fasterxml.jackson.databind.PropertyNamingStrategy; +import com.fasterxml.jackson.databind.annotation.JsonNaming; + +@JsonNaming(PropertyNamingStrategy.SnakeCaseStrategy.class) +public class UserWithSnakeStrategy { + private String firstName; + private String lastName; + + public String getFirstName() { + return firstName; + } + + public void setFirstName(String firstName) { + this.firstName = firstName; + } + + public String getLastName() { + return lastName; + } + + public void setLastName(String lastName) { + this.lastName = lastName; + } +} diff --git a/jackson-modules/jackson-conversions-2/src/test/java/com/baeldung/jackson/snakecase/SnakeCaseUnitTest.java b/jackson-modules/jackson-conversions-2/src/test/java/com/baeldung/jackson/snakecase/SnakeCaseUnitTest.java new file mode 100644 index 0000000000..c72908ccce --- /dev/null +++ b/jackson-modules/jackson-conversions-2/src/test/java/com/baeldung/jackson/snakecase/SnakeCaseUnitTest.java @@ -0,0 +1,44 @@ +package com.baeldung.jackson.snakecase; + +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.PropertyNamingStrategy; +import com.fasterxml.jackson.databind.exc.UnrecognizedPropertyException; +import org.junit.Test; + +import static org.junit.Assert.assertEquals; + +public class SnakeCaseUnitTest { + + private static final String JSON = "{\"first_name\": \"Jackie\", \"last_name\": \"Chan\"}"; + + @Test(expected = UnrecognizedPropertyException.class) + public void whenExceptionThrown_thenExpectationSatisfied() throws Exception { + ObjectMapper objectMapper = new ObjectMapper(); + objectMapper.readValue(JSON, User.class); + } + + @Test + public void givenSnakeCaseJson_whenParseWithJsonPropertyAnnotation_thenGetExpectedObject() throws Exception { + ObjectMapper objectMapper = new ObjectMapper(); + UserWithPropertyNames user = objectMapper.readValue(JSON, UserWithPropertyNames.class); + assertEquals("Jackie", user.getFirstName()); + assertEquals("Chan", user.getLastName()); + } + + @Test + public void givenSnakeCaseJson_whenParseWithJsonNamingAnnotation_thenGetExpectedObject() throws Exception { + ObjectMapper objectMapper = new ObjectMapper(); + UserWithSnakeStrategy user = objectMapper.readValue(JSON, UserWithSnakeStrategy.class); + assertEquals("Jackie", user.getFirstName()); + assertEquals("Chan", user.getLastName()); + } + + @Test + public void givenSnakeCaseJson_whenParseWithCustomMapper_thenGetExpectedObject() throws Exception { + ObjectMapper objectMapper = new ObjectMapper().setPropertyNamingStrategy(PropertyNamingStrategy.SNAKE_CASE); + User user = objectMapper.readValue(JSON, User.class); + assertEquals("Jackie", user.getFirstName()); + assertEquals("Chan", user.getLastName()); + } + +} diff --git a/jackson-modules/pom.xml b/jackson-modules/pom.xml index 3d9d83553e..14e34a41bf 100644 --- a/jackson-modules/pom.xml +++ b/jackson-modules/pom.xml @@ -35,22 +35,6 @@ jackson-dataformat-xml ${jackson.version} - - org.junit.jupiter - junit-jupiter - ${junit-jupiter.version} - test - - - org.junit.vintage - junit-vintage-engine - ${junit-jupiter.version} - test - - - 5.6.2 - - \ No newline at end of file diff --git a/jackson-simple/pom.xml b/jackson-simple/pom.xml index 204954ce60..ae8e380b33 100644 --- a/jackson-simple/pom.xml +++ b/jackson-simple/pom.xml @@ -22,18 +22,6 @@ ${jackson.version} - - org.junit.jupiter - junit-jupiter - ${junit-jupiter.version} - test - - - org.junit.vintage - junit-vintage-engine - ${junit-jupiter.version} - test - org.assertj assertj-core @@ -54,7 +42,6 @@ - 5.6.2 3.11.0 diff --git a/java-collections-conversions-2/pom.xml b/java-collections-conversions-2/pom.xml index a81b245b33..cd4366e87c 100644 --- a/java-collections-conversions-2/pom.xml +++ b/java-collections-conversions-2/pom.xml @@ -32,12 +32,6 @@ modelmapper ${modelmapper.version} - - junit - junit - ${junit.version} - test - org.hamcrest hamcrest diff --git a/java-collections-conversions/pom.xml b/java-collections-conversions/pom.xml index e76181c9af..ae800b21c1 100644 --- a/java-collections-conversions/pom.xml +++ b/java-collections-conversions/pom.xml @@ -39,7 +39,7 @@ - 4.1 + 4.4 \ No newline at end of file diff --git a/java-collections-maps-3/README.md b/java-collections-maps-3/README.md index 831f987523..87817331b5 100644 --- a/java-collections-maps-3/README.md +++ b/java-collections-maps-3/README.md @@ -5,3 +5,4 @@ - [Using the Map.Entry Java Class](https://www.baeldung.com/java-map-entry) - [Optimizing HashMap’s Performance](https://www.baeldung.com/java-hashmap-optimize-performance) - [Update the Value Associated With a Key in a HashMap](https://www.baeldung.com/java-hashmap-update-value-by-key) +- [Java Map – keySet() vs. entrySet() vs. values() Methods](https://www.baeldung.com/java-map-entries-methods) diff --git a/java-collections-maps-3/src/test/java/com/baeldung/map/keysetValuesEntrySet/EntrySetExampleUnitTest.java b/java-collections-maps-3/src/test/java/com/baeldung/map/keysetValuesEntrySet/EntrySetExampleUnitTest.java new file mode 100644 index 0000000000..fea88f729b --- /dev/null +++ b/java-collections-maps-3/src/test/java/com/baeldung/map/keysetValuesEntrySet/EntrySetExampleUnitTest.java @@ -0,0 +1,30 @@ +package com.baeldung.map.keysetValuesEntrySet; + +import org.junit.Test; + +import java.util.AbstractMap.SimpleEntry; +import java.util.HashMap; +import java.util.Map; +import java.util.Set; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + +public class EntrySetExampleUnitTest { + + @Test + public void givenHashMap_whenEntrySetApplied_thenShouldReturnSetOfEntries() { + + Map map = new HashMap<>(); + map.put("one", 1); + map.put("two", 2); + + Set> actualValues = map.entrySet(); + + assertEquals(2, actualValues.size()); + assertTrue(actualValues.contains(new SimpleEntry<>("one", 1))); + assertTrue(actualValues.contains(new SimpleEntry<>("two", 2))); + + } + +} diff --git a/java-collections-maps-3/src/test/java/com/baeldung/map/keysetValuesEntrySet/KeySetExampleUnitTest.java b/java-collections-maps-3/src/test/java/com/baeldung/map/keysetValuesEntrySet/KeySetExampleUnitTest.java new file mode 100644 index 0000000000..6cb0620e35 --- /dev/null +++ b/java-collections-maps-3/src/test/java/com/baeldung/map/keysetValuesEntrySet/KeySetExampleUnitTest.java @@ -0,0 +1,27 @@ +package com.baeldung.map.keysetValuesEntrySet; + +import org.junit.Test; + +import java.util.HashMap; +import java.util.Map; +import java.util.Set; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + +public class KeySetExampleUnitTest { + + @Test + public void givenHashMap_whenKeySetApplied_thenShouldReturnSetOfKeys() { + Map map = new HashMap<>(); + map.put("one", 1); + map.put("two", 2); + + Set actualValues = map.keySet(); + + assertEquals(2, actualValues.size()); + assertTrue(actualValues.contains("one")); + assertTrue(actualValues.contains("two")); + } + +} diff --git a/java-collections-maps-3/src/test/java/com/baeldung/map/keysetValuesEntrySet/ValuesExampleUnitTest.java b/java-collections-maps-3/src/test/java/com/baeldung/map/keysetValuesEntrySet/ValuesExampleUnitTest.java new file mode 100644 index 0000000000..ba9369a122 --- /dev/null +++ b/java-collections-maps-3/src/test/java/com/baeldung/map/keysetValuesEntrySet/ValuesExampleUnitTest.java @@ -0,0 +1,27 @@ +package com.baeldung.map.keysetValuesEntrySet; + +import org.junit.Test; + +import java.util.Collection; +import java.util.HashMap; +import java.util.Map; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + +public class ValuesExampleUnitTest { + + @Test + public void givenHashMap_whenValuesApplied_thenShouldReturnCollectionOfValues() { + Map map = new HashMap<>(); + map.put("one", 1); + map.put("two", 2); + + Collection actualValues = map.values(); + + assertEquals(2, actualValues.size()); + assertTrue(actualValues.contains(1)); + assertTrue(actualValues.contains(2)); + } + +} diff --git a/jhipster-5/bookstore-monolith/pom.xml b/jhipster-5/bookstore-monolith/pom.xml index 8403c2d1d4..411de0e712 100644 --- a/jhipster-5/bookstore-monolith/pom.xml +++ b/jhipster-5/bookstore-monolith/pom.xml @@ -1136,7 +1136,7 @@ 3.0.0-M2 2.2.1 3.1.0 - 2.22.1 + 2.22.2 3.2.2 0.9.11 1.6 diff --git a/json-2/pom.xml b/json-2/pom.xml index 733fbc6668..53d67320ba 100644 --- a/json-2/pom.xml +++ b/json-2/pom.xml @@ -8,8 +8,8 @@ 0.0.1-SNAPSHOT - parent-modules com.baeldung + parent-modules 1.0.0-SNAPSHOT @@ -25,9 +25,9 @@ ${jsoniter.version} - junit - junit - ${junit.version} + org.junit.vintage + junit-vintage-engine + ${junit-jupiter.version} test diff --git a/junit5/README.md b/junit5/README.md new file mode 100644 index 0000000000..ad16ad164d --- /dev/null +++ b/junit5/README.md @@ -0,0 +1,6 @@ +## JUnit5 + +This module contains articles about the JUnit 5 + +### Relevant Articles: + diff --git a/junit5/pom.xml b/junit5/pom.xml new file mode 100644 index 0000000000..b9804408a2 --- /dev/null +++ b/junit5/pom.xml @@ -0,0 +1,36 @@ + + + + 4.0.0 + junit5 + junit5 + + + parent-modules + com.baeldung + 1.0.0-SNAPSHOT + + + + 8 + 8 + + + + + org.junit.jupiter + junit-jupiter-api + 5.8.1 + test + + + org.junit.jupiter + junit-jupiter-engine + 5.8.1 + test + + + + \ No newline at end of file diff --git a/junit5/src/test/java/com/baeldung/junit5/A_UnitTest.java b/junit5/src/test/java/com/baeldung/junit5/A_UnitTest.java new file mode 100644 index 0000000000..e4ba59b22d --- /dev/null +++ b/junit5/src/test/java/com/baeldung/junit5/A_UnitTest.java @@ -0,0 +1,21 @@ +package com.baeldung.junit5; + +import org.junit.jupiter.api.Test; + +public class A_UnitTest { + + @Test + public void first() throws Exception{ + System.out.println("Test A first() start => " + Thread.currentThread().getName()); + Thread.sleep(500); + System.out.println("Test A first() end => " + Thread.currentThread().getName()); + } + + @Test + public void second() throws Exception{ + System.out.println("Test A second() start => " + Thread.currentThread().getName()); + Thread.sleep(500); + System.out.println("Test A second() end => " + Thread.currentThread().getName()); + } + +} diff --git a/junit5/src/test/java/com/baeldung/junit5/B_UnitTest.java b/junit5/src/test/java/com/baeldung/junit5/B_UnitTest.java new file mode 100644 index 0000000000..2b195d2551 --- /dev/null +++ b/junit5/src/test/java/com/baeldung/junit5/B_UnitTest.java @@ -0,0 +1,23 @@ +package com.baeldung.junit5; + +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.parallel.Execution; +import org.junit.jupiter.api.parallel.ExecutionMode; + +public class B_UnitTest { + + @Test + public void first() throws Exception{ + System.out.println("Test B first() start => " + Thread.currentThread().getName()); + Thread.sleep(500); + System.out.println("Test B first() end => " + Thread.currentThread().getName()); + } + + @Test + public void second() throws Exception{ + System.out.println("Test B second() start => " + Thread.currentThread().getName()); + Thread.sleep(500); + System.out.println("Test B second() end => " + Thread.currentThread().getName()); + } + +} diff --git a/junit5/src/test/java/com/baeldung/junit5/C_UnitTest.java b/junit5/src/test/java/com/baeldung/junit5/C_UnitTest.java new file mode 100644 index 0000000000..ce545f6bee --- /dev/null +++ b/junit5/src/test/java/com/baeldung/junit5/C_UnitTest.java @@ -0,0 +1,45 @@ +package com.baeldung.junit5; + +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.parallel.ResourceLock; + +import java.util.ArrayList; +import java.util.List; + +public class C_UnitTest { + + private List resources; + + @BeforeEach + void before() { + resources = new ArrayList<>(); + resources.add("test"); + } + + @AfterEach + void after() { + resources.clear(); + } + + @Test + @ResourceLock(value = "resources") + public void first() throws Exception { + System.out.println("Test C first() start => " + Thread.currentThread().getName()); + resources.add("first"); + System.out.println(resources); + Thread.sleep(500); + System.out.println("Test C first() end => " + Thread.currentThread().getName()); + } + + @Test + @ResourceLock(value = "resources") + public void second() throws Exception { + System.out.println("Test C second() start => " + Thread.currentThread().getName()); + resources.add("second"); + System.out.println(resources); + Thread.sleep(500); + System.out.println("Test C second() end => " + Thread.currentThread().getName()); + } +} diff --git a/junit5/src/test/resources/junit-platform.properties b/junit5/src/test/resources/junit-platform.properties new file mode 100644 index 0000000000..42100f85da --- /dev/null +++ b/junit5/src/test/resources/junit-platform.properties @@ -0,0 +1,4 @@ +junit.jupiter.execution.parallel.enabled = true +junit.jupiter.execution.parallel.config.strategy=dynamic +junit.jupiter.execution.parallel.mode.default = concurrent +junit.jupiter.execution.parallel.mode.classes.default = concurrent diff --git a/ksqldb/pom.xml b/ksqldb/pom.xml index 970e8c3788..2f92419d6e 100644 --- a/ksqldb/pom.xml +++ b/ksqldb/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - ksqldb-app + ksqldb 0.0.1-SNAPSHOT ksqldb diff --git a/kubernetes/k8s-intro/pom.xml b/kubernetes/k8s-intro/pom.xml index 61722cb2c8..6d1cec9971 100644 --- a/kubernetes/k8s-intro/pom.xml +++ b/kubernetes/k8s-intro/pom.xml @@ -20,7 +20,7 @@ ch.qos.logback logback-classic - 1.2.3 + ${logback.version} diff --git a/libraries-2/pom.xml b/libraries-2/pom.xml index 104d3cbabc..700a0a02d4 100644 --- a/libraries-2/pom.xml +++ b/libraries-2/pom.xml @@ -53,6 +53,13 @@ org.jbpm jbpm-test ${jbpm.version} + + + + junit + junit + + info.picocli diff --git a/libraries-data/pom.xml b/libraries-data/pom.xml index c5ad08448f..3db34709e7 100644 --- a/libraries-data/pom.xml +++ b/libraries-data/pom.xml @@ -15,9 +15,9 @@ - junit - junit - ${junit.version} + org.junit.vintage + junit-vintage-engine + ${junit-jupiter.version} test diff --git a/libraries-http/pom.xml b/libraries-http/pom.xml index 8eb6142c38..a00bb4bd39 100644 --- a/libraries-http/pom.xml +++ b/libraries-http/pom.xml @@ -94,6 +94,11 @@ jackson-databind ${jackson.version} + + com.fasterxml.jackson.core + jackson-core + ${jackson.version} + org.apache.httpcomponents httpclient diff --git a/libraries-primitive/pom.xml b/libraries-primitive/pom.xml index 06c42bd6c9..ed4982d91c 100644 --- a/libraries-primitive/pom.xml +++ b/libraries-primitive/pom.xml @@ -15,11 +15,16 @@ fastutil ${fastutil.version} - - junit - junit - ${junit.version} + org.junit.jupiter + junit-jupiter + ${junit-jupiter.version} + test + + + org.junit.vintage + junit-vintage-engine + ${junit-jupiter.version} test @@ -43,14 +48,27 @@ + + + + + org.apache.maven.plugins + maven-surefire-plugin + ${maven-surefire-plugin.version} + + + + + 8.2.2 - 4.12 10.0.0 1.8 1.8 1.28 1.28 + 5.8.1 + 2.22.2 \ No newline at end of file diff --git a/libraries-security/pom.xml b/libraries-security/pom.xml index 46e12eb655..6d3bbcd26c 100644 --- a/libraries-security/pom.xml +++ b/libraries-security/pom.xml @@ -48,11 +48,6 @@ bcpkix-jdk15on ${bouncycastle.version} - - junit - junit - test - org.passay passay diff --git a/libraries-server/pom.xml b/libraries-server/pom.xml index b283164daa..a9c340b319 100644 --- a/libraries-server/pom.xml +++ b/libraries-server/pom.xml @@ -62,9 +62,9 @@ ${netty.version} - junit - junit - ${junit.version} + org.junit.vintage + junit-vintage-engine + ${junit-jupiter.version} test diff --git a/libraries/pom.xml b/libraries/pom.xml index 59e79f0775..4ecf82aa87 100644 --- a/libraries/pom.xml +++ b/libraries/pom.xml @@ -147,9 +147,9 @@ ${jmh-core.version} - junit - junit - ${junit.version} + org.junit.vintage + junit-vintage-engine + ${junit-jupiter.version} test diff --git a/logging-modules/log-mdc/pom.xml b/logging-modules/log-mdc/pom.xml index ddf1f23f8c..a21b9a8fb7 100644 --- a/logging-modules/log-mdc/pom.xml +++ b/logging-modules/log-mdc/pom.xml @@ -97,7 +97,6 @@ 2.7 3.3.6 3.3.0.Final - 5.6.2 \ No newline at end of file diff --git a/logging-modules/pom.xml b/logging-modules/pom.xml index d7b820040a..7e358ae490 100644 --- a/logging-modules/pom.xml +++ b/logging-modules/pom.xml @@ -22,8 +22,4 @@ log-mdc - - 5.6.2 - - \ No newline at end of file diff --git a/maven-modules/maven-copy-files/copy-rename-maven-plugin/pom.xml b/maven-modules/maven-copy-files/copy-rename-maven-plugin/pom.xml index e2f0d57e3a..6feb8284e6 100644 --- a/maven-modules/maven-copy-files/copy-rename-maven-plugin/pom.xml +++ b/maven-modules/maven-copy-files/copy-rename-maven-plugin/pom.xml @@ -9,20 +9,11 @@ copy-rename-maven-plugin - maven-copy-files com.baeldung + maven-copy-files 1.0-SNAPSHOT - - - junit - junit - 4.11 - test - - - diff --git a/maven-modules/maven-copy-files/maven-antrun-plugin/pom.xml b/maven-modules/maven-copy-files/maven-antrun-plugin/pom.xml index 97e714d9ff..5168e0e965 100644 --- a/maven-modules/maven-copy-files/maven-antrun-plugin/pom.xml +++ b/maven-modules/maven-copy-files/maven-antrun-plugin/pom.xml @@ -9,20 +9,11 @@ maven-antrun-plugin - maven-copy-files com.baeldung + maven-copy-files 1.0-SNAPSHOT - - - junit - junit - 4.11 - test - - - diff --git a/maven-modules/maven-copy-files/maven-resources-plugin/pom.xml b/maven-modules/maven-copy-files/maven-resources-plugin/pom.xml index eed40565da..6829898b45 100644 --- a/maven-modules/maven-copy-files/maven-resources-plugin/pom.xml +++ b/maven-modules/maven-copy-files/maven-resources-plugin/pom.xml @@ -6,23 +6,14 @@ org.baeldung maven-resources-plugin 1.0-SNAPSHOT - maven-resoures-plugin + maven-resources-plugin - maven-copy-files com.baeldung + maven-copy-files 1.0-SNAPSHOT - - - junit - junit - 4.11 - test - - - diff --git a/maven-modules/maven-copy-files/pom.xml b/maven-modules/maven-copy-files/pom.xml index d2208d68eb..94bf952361 100644 --- a/maven-modules/maven-copy-files/pom.xml +++ b/maven-modules/maven-copy-files/pom.xml @@ -12,8 +12,8 @@ http://www.example.com - maven-modules com.baeldung + maven-modules 0.0.1-SNAPSHOT @@ -25,9 +25,8 @@ - junit - junit - 4.11 + org.junit.vintage + junit-vintage-engine test diff --git a/maven-modules/maven-custom-plugin/usage-example/pom.xml b/maven-modules/maven-custom-plugin/usage-example/pom.xml index bf5a69146b..1791bd6627 100644 --- a/maven-modules/maven-custom-plugin/usage-example/pom.xml +++ b/maven-modules/maven-custom-plugin/usage-example/pom.xml @@ -15,9 +15,9 @@ ${commons.lang3.version} - junit - junit - ${junit.version} + org.junit.vintage + junit-vintage-engine + ${junit-jupiter.version} test @@ -44,7 +44,7 @@ 3.9 - 4.12 + 5.8.1 \ No newline at end of file diff --git a/maven-modules/maven-dependency-management/README.md b/maven-modules/maven-dependency/README.md similarity index 100% rename from maven-modules/maven-dependency-management/README.md rename to maven-modules/maven-dependency/README.md diff --git a/maven-modules/maven-dependency-management/pom.xml b/maven-modules/maven-dependency/pom.xml similarity index 67% rename from maven-modules/maven-dependency-management/pom.xml rename to maven-modules/maven-dependency/pom.xml index fb2bdfe602..f17998c327 100644 --- a/maven-modules/maven-dependency-management/pom.xml +++ b/maven-modules/maven-dependency/pom.xml @@ -1,29 +1,21 @@ + xmlns="http://maven.apache.org/POM/4.0.0" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.baeldung maven-dependency 1.0.0-SNAPSHOT pom - maven-modules com.baeldung + maven-modules 0.0.1-SNAPSHOT - - - junit - junit - 4.13.2 - test - org.apache.commons commons-lang3 @@ -34,12 +26,13 @@ - junit - junit + org.junit.vintage + junit-vintage-engine org.apache.commons commons-lang3 + \ No newline at end of file diff --git a/maven-modules/maven-dependency-management/src/main/java/com/baeldung/Main.java b/maven-modules/maven-dependency/src/main/java/com/baeldung/Main.java similarity index 100% rename from maven-modules/maven-dependency-management/src/main/java/com/baeldung/Main.java rename to maven-modules/maven-dependency/src/main/java/com/baeldung/Main.java diff --git a/maven-modules/maven-exec-plugin/pom.xml b/maven-modules/maven-exec-plugin/pom.xml index 837f31edeb..f0d4706455 100644 --- a/maven-modules/maven-exec-plugin/pom.xml +++ b/maven-modules/maven-exec-plugin/pom.xml @@ -12,7 +12,7 @@ ch.qos.logback logback-classic - ${logback-classic.version} + ${logback.version} @@ -44,9 +44,9 @@ + 1.2.6 3.8.1 1.8 - 1.2.3 \ No newline at end of file diff --git a/maven-modules/maven-integration-test/pom.xml b/maven-modules/maven-integration-test/pom.xml index 692751366d..4283baf63b 100644 --- a/maven-modules/maven-integration-test/pom.xml +++ b/maven-modules/maven-integration-test/pom.xml @@ -27,9 +27,9 @@ ${jersey.version} - junit - junit - ${junit.version} + org.junit.vintage + junit-vintage-engine + ${junit-jupiter.version} test diff --git a/maven-modules/maven-properties/pom.xml b/maven-modules/maven-properties/pom.xml index f4c657c2e4..b3169a7fb0 100644 --- a/maven-modules/maven-properties/pom.xml +++ b/maven-modules/maven-properties/pom.xml @@ -16,9 +16,10 @@ - junit - junit - ${junit.version} + org.junit.vintage + junit-vintage-engine + ${junit-jupiter.version} + test @@ -46,7 +47,6 @@ ${project.name} property-from-pom - 4.13 \ No newline at end of file diff --git a/maven-modules/pom.xml b/maven-modules/pom.xml index 3f87c60406..0aadb873e5 100644 --- a/maven-modules/pom.xml +++ b/maven-modules/pom.xml @@ -37,7 +37,28 @@ plugin-management maven-surefire-plugin maven-parent-pom-resolution - maven-dependency-management + maven-dependency + + + + org.junit.jupiter + junit-jupiter + ${junit-jupiter.version} + test + + + org.junit.vintage + junit-vintage-engine + ${junit-jupiter.version} + test + + + + + + 5.8.1 + + \ No newline at end of file diff --git a/micronaut/pom.xml b/micronaut/pom.xml index e9b5a0409f..f36f565a94 100644 --- a/micronaut/pom.xml +++ b/micronaut/pom.xml @@ -65,9 +65,9 @@ runtime - junit - junit - ${junit.version} + org.junit.vintage + junit-vintage-engine + ${junit-jupiter.version} test diff --git a/ninja/pom.xml b/ninja/pom.xml index 93f22cf718..1cc13afb15 100644 --- a/ninja/pom.xml +++ b/ninja/pom.xml @@ -35,6 +35,25 @@ ninja-test-utilities ${ninja.version} test + + + + junit + junit + + + + + org.junit.jupiter + junit-jupiter + ${junit-jupiter.version} + test + + + org.junit.vintage + junit-vintage-engine + ${junit-jupiter.version} + test @@ -188,6 +207,7 @@ 1.3.1 2.8.2 2.2 + 5.8.1 \ No newline at end of file diff --git a/open-liberty/pom.xml b/open-liberty/pom.xml index 268b65c07e..df54d9f136 100644 --- a/open-liberty/pom.xml +++ b/open-liberty/pom.xml @@ -30,9 +30,15 @@ - junit - junit - ${version.junit} + org.junit.jupiter + junit-jupiter + ${junit-jupiter.version} + test + + + org.junit.vintage + junit-vintage-engine + ${junit-jupiter.version} test @@ -100,7 +106,6 @@ 10.14.2.0 3.3-M3 3.2.3 - 4.12 1.0.5 3.2.6 1.0.4 @@ -110,6 +115,7 @@ 9080 9443 7070 + 5.8.1 \ No newline at end of file diff --git a/parent-boot-2/pom.xml b/parent-boot-2/pom.xml index 2e520640ec..8e8dbba54d 100644 --- a/parent-boot-2/pom.xml +++ b/parent-boot-2/pom.xml @@ -17,6 +17,13 @@ + + org.junit + junit-bom + ${junit-jupiter.version} + pom + import + org.springframework.boot spring-boot-dependencies @@ -51,6 +58,11 @@ + + org.apache.maven.plugins + maven-surefire-plugin + ${maven-surefire-plugin.version} + @@ -85,6 +97,7 @@ 1.9.1 3.4.0 + 2.22.2 \ No newline at end of file diff --git a/parent-java/pom.xml b/parent-java/pom.xml index 09d7f4c96d..ae6eeb40a9 100644 --- a/parent-java/pom.xml +++ b/parent-java/pom.xml @@ -1,7 +1,7 @@ + xmlns="http://maven.apache.org/POM/4.0.0" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 parent-java 0.0.1-SNAPSHOT @@ -40,10 +40,23 @@ + + + + + org.apache.maven.plugins + maven-surefire-plugin + ${maven-surefire-plugin.version} + + + + + - 29.0-jre + 31.0.1-jre 2.3.7 2.2 + 2.22.2 \ No newline at end of file diff --git a/parent-spring-4/pom.xml b/parent-spring-4/pom.xml index e0e91cec9a..630fa0baf3 100644 --- a/parent-spring-4/pom.xml +++ b/parent-spring-4/pom.xml @@ -21,15 +21,18 @@ spring-core ${spring.version} - - org.junit.jupiter - junit-jupiter-engine - ${junit-jupiter.version} - test - + + + + org.apache.maven.plugins + maven-surefire-plugin + ${maven-surefire-plugin.version} + + + org.codehaus.cargo @@ -54,6 +57,7 @@ 4.3.27.RELEASE 1.6.1 + 2.22.2 \ No newline at end of file diff --git a/parent-spring-5/pom.xml b/parent-spring-5/pom.xml index c4446ddda8..01e8671099 100644 --- a/parent-spring-5/pom.xml +++ b/parent-spring-5/pom.xml @@ -21,18 +21,25 @@ spring-core ${spring.version} - - org.junit.jupiter - junit-jupiter-engine - ${junit-jupiter.version} - test - + + + + + org.apache.maven.plugins + maven-surefire-plugin + ${maven-surefire-plugin.version} + + + + + 5.3.9 5.2.3.RELEASE 1.5.10.RELEASE + 2.22.2 \ No newline at end of file diff --git a/patterns/clean-architecture/pom.xml b/patterns/clean-architecture/pom.xml index c36f9b83af..4a1f512240 100644 --- a/patterns/clean-architecture/pom.xml +++ b/patterns/clean-architecture/pom.xml @@ -29,11 +29,6 @@ org.springframework.boot spring-boot-starter-data-jpa - - org.junit.jupiter - junit-jupiter-engine - test - org.springframework.boot spring-boot-starter-test @@ -54,14 +49,6 @@ org.junit.platform junit-platform-engine - - org.junit.jupiter - junit-jupiter-engine - - - org.junit.jupiter - junit-jupiter-api - org.junit.platform junit-platform-runner diff --git a/patterns/cqrs-es/pom.xml b/patterns/cqrs-es/pom.xml index 826440b45d..20eeb09e35 100644 --- a/patterns/cqrs-es/pom.xml +++ b/patterns/cqrs-es/pom.xml @@ -19,9 +19,8 @@ ${lombok.version} - junit - junit - ${junit.version} + org.junit.vintage + junit-vintage-engine test @@ -29,7 +28,6 @@ 1.8 1.8 - 4.13 1.18.12 diff --git a/patterns/pom.xml b/patterns/pom.xml index 6e92ad2813..3c93f00478 100644 --- a/patterns/pom.xml +++ b/patterns/pom.xml @@ -33,6 +33,12 @@ + + org.junit.vintage + junit-vintage-engine + ${junit-jupiter.version} + test + javax.servlet javax.servlet-api diff --git a/patterns/simplehexagonalexample/pom.xml b/patterns/simplehexagonalexample/pom.xml index d9b9b36831..31e829b7dc 100644 --- a/patterns/simplehexagonalexample/pom.xml +++ b/patterns/simplehexagonalexample/pom.xml @@ -4,7 +4,7 @@ 4.0.0 1.0.0-SNAPSHOT simple-hexagonal-example - simpleHexagonalExample + simple-hexagonal-example com.baeldung diff --git a/persistence-modules/apache-derby/README.md b/persistence-modules/apache-derby/README.md new file mode 100644 index 0000000000..502115da5e --- /dev/null +++ b/persistence-modules/apache-derby/README.md @@ -0,0 +1,3 @@ +### Relevant Articles: + +- [Getting Started With Apache Derby](https://www.baeldung.com/java-apache-derby) diff --git a/persistence-modules/apache-derby/pom.xml b/persistence-modules/apache-derby/pom.xml new file mode 100644 index 0000000000..7728bd4d8f --- /dev/null +++ b/persistence-modules/apache-derby/pom.xml @@ -0,0 +1,32 @@ + + + + persistence-modules + com.baeldung + 1.0.0-SNAPSHOT + + 4.0.0 + + apache-derby + + + + + org.apache.derby + derby + 10.13.1.1 + + + + + org.apache.derby + derbyclient + 10.13.1.1 + + + + + + \ No newline at end of file diff --git a/persistence-modules/apache-derby/src/main/java/com/baeldung/derby/DerbyApplicationDemo.java b/persistence-modules/apache-derby/src/main/java/com/baeldung/derby/DerbyApplicationDemo.java new file mode 100644 index 0000000000..927293558f --- /dev/null +++ b/persistence-modules/apache-derby/src/main/java/com/baeldung/derby/DerbyApplicationDemo.java @@ -0,0 +1,39 @@ +package com.baeldung.derby; + +import java.sql.*; + +/** + * Created by arash on 14.10.21. + */ + +public class DerbyApplicationDemo { + public static void main(String[] args) { + runner("jdbc:derby:baeldung;create=true"); + } + + private static void runner(String urlConnection) { + try { + Connection con = DriverManager.getConnection(urlConnection); + Statement statement = con.createStatement(); + if (!isTableExists("authors", con)) { + String createSQL = "CREATE TABLE authors (id INT PRIMARY KEY,first_name VARCHAR(255),last_name VARCHAR(255))"; + statement.execute(createSQL); + String insertSQL = "INSERT INTO authors VALUES (1, 'arash','ariani')"; + statement.execute(insertSQL); + } + String selectSQL = "SELECT * FROM authors"; + ResultSet result = statement.executeQuery(selectSQL); + while (result.next()) { + // use result here + } + } catch (SQLException e) { + e.printStackTrace(); + } + } + + private static boolean isTableExists(String tableName, Connection connection) throws SQLException { + DatabaseMetaData meta = connection.getMetaData(); + ResultSet result = meta.getTables(null, null, tableName.toUpperCase(), null); + return result.next(); + } +} diff --git a/persistence-modules/deltaspike/pom.xml b/persistence-modules/deltaspike/pom.xml index 1255e5ab27..5003ef9daf 100644 --- a/persistence-modules/deltaspike/pom.xml +++ b/persistence-modules/deltaspike/pom.xml @@ -18,6 +18,14 @@ + + + junit + junit + ${junit.version} + test + apache-cayenne + apache-derby core-java-persistence core-java-persistence-2 deltaspike @@ -101,8 +102,6 @@ 2.22.2 - 5.6.2 - 4.13 \ No newline at end of file diff --git a/persistence-modules/redis/src/test/java/com/baeldung/spring/redis/configuration/controller/BooksControllerUnitTest.java b/persistence-modules/redis/src/test/java/com/baeldung/spring/redis/configuration/controller/BooksControllerUnitTest.java index 757b32385b..4f2bff18d9 100644 --- a/persistence-modules/redis/src/test/java/com/baeldung/spring/redis/configuration/controller/BooksControllerUnitTest.java +++ b/persistence-modules/redis/src/test/java/com/baeldung/spring/redis/configuration/controller/BooksControllerUnitTest.java @@ -1,21 +1,18 @@ package com.baeldung.spring.redis.configuration.controller; +import com.baeldung.spring.redis.configuration.entity.Book; +import com.baeldung.spring.redis.configuration.repository.BooksRepository; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.junit.MockitoJUnitRunner; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; import static org.junit.jupiter.api.Assertions.assertSame; import static org.mockito.Mockito.when; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.InjectMocks; -import org.mockito.Mock; -import org.mockito.Spy; -import org.mockito.junit.MockitoJUnitRunner; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; - -import com.baeldung.spring.redis.configuration.entity.Book; -import com.baeldung.spring.redis.configuration.repository.BooksRepository; - @RunWith(MockitoJUnitRunner.class) public class BooksControllerUnitTest { @@ -44,8 +41,6 @@ public class BooksControllerUnitTest { @Test public void whenFindOneNotFound_thenReturnsNull() { - Book book = new Book(BOOK_ID, BOOK_NAME); - when(booksRepository.findById(BOOK_ID)).thenReturn(book); assertNull(booksController.findOne(OTHER_BOOK_ID)); } diff --git a/persistence-modules/redis/src/test/java/com/baeldung/spring/redis/configuration/repository/BooksRepositoryUnitTest.java b/persistence-modules/redis/src/test/java/com/baeldung/spring/redis/configuration/repository/BooksRepositoryUnitTest.java index f32800e165..454447c9c9 100644 --- a/persistence-modules/redis/src/test/java/com/baeldung/spring/redis/configuration/repository/BooksRepositoryUnitTest.java +++ b/persistence-modules/redis/src/test/java/com/baeldung/spring/redis/configuration/repository/BooksRepositoryUnitTest.java @@ -1,23 +1,20 @@ package com.baeldung.spring.redis.configuration.repository; +import com.baeldung.spring.redis.configuration.entity.Book; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.junit.MockitoJUnitRunner; +import org.springframework.data.redis.core.RedisTemplate; +import org.springframework.data.redis.core.ValueOperations; + import static org.junit.Assert.assertNull; import static org.junit.Assert.assertSame; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.InjectMocks; -import org.mockito.Mock; -import org.mockito.Spy; -import org.mockito.junit.MockitoJUnitRunner; -import org.springframework.data.redis.core.RedisTemplate; -import org.springframework.data.redis.core.ValueOperations; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; - -import com.baeldung.spring.redis.configuration.entity.Book; - @RunWith(MockitoJUnitRunner.class) public class BooksRepositoryUnitTest { @@ -55,9 +52,7 @@ public class BooksRepositoryUnitTest { @Test public void whenFindByIdNotFound_thenReturnsNull() { - Book book = new Book(BOOK_ID, BOOK_NAME); when(redisTemplate.opsForValue()).thenReturn(valueOperations); - when(valueOperations.get(BOOK_ID)).thenReturn(book); assertNull(booksRepository.findById(OTHER_BOOK_ID)); verify(redisTemplate, times(1)).opsForValue(); verify(valueOperations, times(1)).get(OTHER_BOOK_ID); diff --git a/persistence-modules/spring-boot-persistence/README.md b/persistence-modules/spring-boot-persistence/README.md index 5b9fbf7b79..a9fe3905c2 100644 --- a/persistence-modules/spring-boot-persistence/README.md +++ b/persistence-modules/spring-boot-persistence/README.md @@ -7,4 +7,5 @@ - [Resolving “Failed to Configure a DataSource” Error](https://www.baeldung.com/spring-boot-failed-to-configure-data-source) - [Hibernate Field Naming with Spring Boot](https://www.baeldung.com/hibernate-field-naming-spring-boot) - [Spring Boot with Hibernate](https://www.baeldung.com/spring-boot-hibernate) +- [A Guide to Spring AbstractRoutingDatasource](https://www.baeldung.com/spring-abstract-routing-data-source) - More articles: [[more -->]](../spring-boot-persistence-2) \ No newline at end of file diff --git a/persistence-modules/spring-jpa/src/main/java/com/baeldung/dsrouting/ClientDao.java b/persistence-modules/spring-boot-persistence/src/main/java/com/baeldung/dsrouting/ClientDao.java similarity index 100% rename from persistence-modules/spring-jpa/src/main/java/com/baeldung/dsrouting/ClientDao.java rename to persistence-modules/spring-boot-persistence/src/main/java/com/baeldung/dsrouting/ClientDao.java diff --git a/persistence-modules/spring-boot-persistence/src/main/java/com/baeldung/dsrouting/ClientDataSourceRouter.java b/persistence-modules/spring-boot-persistence/src/main/java/com/baeldung/dsrouting/ClientDataSourceRouter.java new file mode 100644 index 0000000000..ebedaf1045 --- /dev/null +++ b/persistence-modules/spring-boot-persistence/src/main/java/com/baeldung/dsrouting/ClientDataSourceRouter.java @@ -0,0 +1,27 @@ +package com.baeldung.dsrouting; + +import org.springframework.jdbc.datasource.lookup.AbstractRoutingDataSource; + +import javax.sql.DataSource; +import java.util.HashMap; +import java.util.Map; + +/** + * Returns thread bound client lookup key for current context. + */ +public class ClientDataSourceRouter extends AbstractRoutingDataSource { + + @Override + protected Object determineCurrentLookupKey() { + return ClientDatabaseContextHolder.getClientDatabase(); + } + + public void initDatasource(DataSource clientADataSource, + DataSource clientBDataSource) { + Map dataSourceMap = new HashMap<>(); + dataSourceMap.put(ClientDatabase.CLIENT_A, clientADataSource); + dataSourceMap.put(ClientDatabase.CLIENT_A, clientBDataSource); + this.setTargetDataSources(dataSourceMap); + this.setDefaultTargetDataSource(clientADataSource); + } +} diff --git a/persistence-modules/spring-jpa/src/main/java/com/baeldung/dsrouting/ClientDatabase.java b/persistence-modules/spring-boot-persistence/src/main/java/com/baeldung/dsrouting/ClientDatabase.java similarity index 100% rename from persistence-modules/spring-jpa/src/main/java/com/baeldung/dsrouting/ClientDatabase.java rename to persistence-modules/spring-boot-persistence/src/main/java/com/baeldung/dsrouting/ClientDatabase.java diff --git a/persistence-modules/spring-jpa/src/main/java/com/baeldung/dsrouting/ClientDatabaseContextHolder.java b/persistence-modules/spring-boot-persistence/src/main/java/com/baeldung/dsrouting/ClientDatabaseContextHolder.java similarity index 100% rename from persistence-modules/spring-jpa/src/main/java/com/baeldung/dsrouting/ClientDatabaseContextHolder.java rename to persistence-modules/spring-boot-persistence/src/main/java/com/baeldung/dsrouting/ClientDatabaseContextHolder.java diff --git a/persistence-modules/spring-jpa/src/main/java/com/baeldung/dsrouting/ClientService.java b/persistence-modules/spring-boot-persistence/src/main/java/com/baeldung/dsrouting/ClientService.java similarity index 100% rename from persistence-modules/spring-jpa/src/main/java/com/baeldung/dsrouting/ClientService.java rename to persistence-modules/spring-boot-persistence/src/main/java/com/baeldung/dsrouting/ClientService.java diff --git a/persistence-modules/spring-boot-persistence/src/main/java/com/baeldung/dsrouting/model/ClientADetails.java b/persistence-modules/spring-boot-persistence/src/main/java/com/baeldung/dsrouting/model/ClientADetails.java new file mode 100644 index 0000000000..c7236fed3c --- /dev/null +++ b/persistence-modules/spring-boot-persistence/src/main/java/com/baeldung/dsrouting/model/ClientADetails.java @@ -0,0 +1,28 @@ +package com.baeldung.dsrouting.model; + +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.stereotype.Component; + +@Component +@ConfigurationProperties(prefix = "client-a.datasource") +public class ClientADetails { + + private String name; + private String script; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getScript() { + return script; + } + + public void setScript(String script) { + this.script = script; + } +} diff --git a/persistence-modules/spring-boot-persistence/src/main/java/com/baeldung/dsrouting/model/ClientBDetails.java b/persistence-modules/spring-boot-persistence/src/main/java/com/baeldung/dsrouting/model/ClientBDetails.java new file mode 100644 index 0000000000..5776c79855 --- /dev/null +++ b/persistence-modules/spring-boot-persistence/src/main/java/com/baeldung/dsrouting/model/ClientBDetails.java @@ -0,0 +1,28 @@ +package com.baeldung.dsrouting.model; + +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.stereotype.Component; + +@Component +@ConfigurationProperties(prefix = "client-b.datasource") +public class ClientBDetails { + + private String name; + private String script; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getScript() { + return script; + } + + public void setScript(String script) { + this.script = script; + } +} diff --git a/persistence-modules/spring-jpa/src/test/java/com/baeldung/dsrouting/DataSourceRoutingIntegrationTest.java b/persistence-modules/spring-boot-persistence/src/test/java/com/baeldung/dsrouting/DataSourceRoutingIntegrationTest.java similarity index 100% rename from persistence-modules/spring-jpa/src/test/java/com/baeldung/dsrouting/DataSourceRoutingIntegrationTest.java rename to persistence-modules/spring-boot-persistence/src/test/java/com/baeldung/dsrouting/DataSourceRoutingIntegrationTest.java diff --git a/persistence-modules/spring-jpa/src/test/java/com/baeldung/dsrouting/DataSourceRoutingTestConfiguration.java b/persistence-modules/spring-boot-persistence/src/test/java/com/baeldung/dsrouting/DataSourceRoutingTestConfiguration.java similarity index 92% rename from persistence-modules/spring-jpa/src/test/java/com/baeldung/dsrouting/DataSourceRoutingTestConfiguration.java rename to persistence-modules/spring-boot-persistence/src/test/java/com/baeldung/dsrouting/DataSourceRoutingTestConfiguration.java index cec9343892..957114eba5 100644 --- a/persistence-modules/spring-jpa/src/test/java/com/baeldung/dsrouting/DataSourceRoutingTestConfiguration.java +++ b/persistence-modules/spring-boot-persistence/src/test/java/com/baeldung/dsrouting/DataSourceRoutingTestConfiguration.java @@ -34,11 +34,11 @@ public class DataSourceRoutingTestConfiguration { private DataSource clientADatasource() { EmbeddedDatabaseBuilder dbBuilder = new EmbeddedDatabaseBuilder(); - return dbBuilder.setType(EmbeddedDatabaseType.H2).setName("CLIENT_A").addScript("classpath:dsrouting-db.sql").build(); + return dbBuilder.setType(EmbeddedDatabaseType.H2).setName("CLIENT_A").addScript("dsrouting-db.sql").build(); } private DataSource clientBDatasource() { EmbeddedDatabaseBuilder dbBuilder = new EmbeddedDatabaseBuilder(); - return dbBuilder.setType(EmbeddedDatabaseType.H2).setName("CLIENT_B").addScript("classpath:dsrouting-db.sql").build(); + return dbBuilder.setType(EmbeddedDatabaseType.H2).setName("CLIENT_B").addScript("dsrouting-db.sql").build(); } } diff --git a/persistence-modules/spring-boot-persistence/src/test/java/com/baeldung/dsrouting/SpringBootDataSourceRoutingIntegrationTest.java b/persistence-modules/spring-boot-persistence/src/test/java/com/baeldung/dsrouting/SpringBootDataSourceRoutingIntegrationTest.java new file mode 100644 index 0000000000..75829c2153 --- /dev/null +++ b/persistence-modules/spring-boot-persistence/src/test/java/com/baeldung/dsrouting/SpringBootDataSourceRoutingIntegrationTest.java @@ -0,0 +1,62 @@ +package com.baeldung.dsrouting; + +import static org.junit.Assert.assertEquals; + +import javax.sql.DataSource; + +import com.baeldung.dsrouting.model.ClientADetails; +import com.baeldung.dsrouting.model.ClientBDetails; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.context.properties.EnableConfigurationProperties; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.test.annotation.DirtiesContext; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit4.SpringRunner; + +@RunWith(SpringRunner.class) +@SpringBootTest( + classes = {ClientADetails.class, ClientBDetails.class}) +@ContextConfiguration(classes = SpringBootDataSourceRoutingTestConfiguration.class) +@DirtiesContext +@EnableConfigurationProperties(ClientBDetails.class) +public class SpringBootDataSourceRoutingIntegrationTest { + + @Autowired + DataSource routingDatasource; + + @Autowired + ClientService clientService; + + @Before + public void setup() { + final String SQL_CLIENT_A = "insert into client (id, name) values (1, 'CLIENT A')"; + final String SQL_CLIENT_B = "insert into client (id, name) values (2, 'CLIENT B')"; + + JdbcTemplate jdbcTemplate = new JdbcTemplate(); + jdbcTemplate.setDataSource(routingDatasource); + + ClientDatabaseContextHolder.set(ClientDatabase.CLIENT_A); + jdbcTemplate.execute(SQL_CLIENT_A); + ClientDatabaseContextHolder.clear(); + + ClientDatabaseContextHolder.set(ClientDatabase.CLIENT_B); + jdbcTemplate.execute(SQL_CLIENT_B); + ClientDatabaseContextHolder.clear(); + } + + @Test + public void givenClientDbs_whenContextsSwitch_thenRouteToCorrectDatabase() throws Exception { + + // test ACME WIDGETS + String clientName = clientService.getClientName(ClientDatabase.CLIENT_A); + assertEquals(clientName, "CLIENT A"); + + // test WIDGETS_ARE_US + clientName = clientService.getClientName(ClientDatabase.CLIENT_B); + assertEquals(clientName, "CLIENT B"); + } +} diff --git a/persistence-modules/spring-boot-persistence/src/test/java/com/baeldung/dsrouting/SpringBootDataSourceRoutingTestConfiguration.java b/persistence-modules/spring-boot-persistence/src/test/java/com/baeldung/dsrouting/SpringBootDataSourceRoutingTestConfiguration.java new file mode 100644 index 0000000000..01f157998f --- /dev/null +++ b/persistence-modules/spring-boot-persistence/src/test/java/com/baeldung/dsrouting/SpringBootDataSourceRoutingTestConfiguration.java @@ -0,0 +1,55 @@ +package com.baeldung.dsrouting; + +import com.baeldung.dsrouting.model.ClientADetails; +import com.baeldung.dsrouting.model.ClientBDetails; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.*; +import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder; +import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType; + +import javax.sql.DataSource; +import java.util.HashMap; +import java.util.Map; + +@Configuration +public class SpringBootDataSourceRoutingTestConfiguration { + @Autowired + private ClientADetails clientADetails; + @Autowired + private ClientBDetails clientBDetails; + + @Bean + public ClientService clientService() { + return new ClientService(new ClientDao(clientDatasource())); + } + + @Bean + public DataSource clientDatasource() { + Map targetDataSources = new HashMap<>(); + DataSource clientADatasource = clientADatasource(); + DataSource clientBDatasource = clientBDatasource(); + targetDataSources.put(ClientDatabase.CLIENT_A, clientADatasource); + targetDataSources.put(ClientDatabase.CLIENT_B, clientBDatasource); + + ClientDataSourceRouter clientRoutingDatasource = new ClientDataSourceRouter(); + clientRoutingDatasource.setTargetDataSources(targetDataSources); + clientRoutingDatasource.setDefaultTargetDataSource(clientADatasource); + return clientRoutingDatasource; + } + + private DataSource clientADatasource() { + EmbeddedDatabaseBuilder dbBuilder = new EmbeddedDatabaseBuilder(); + return dbBuilder.setType(EmbeddedDatabaseType.H2) + .setName(clientADetails.getName()) + .addScript(clientADetails.getScript()) + .build(); + } + + private DataSource clientBDatasource() { + EmbeddedDatabaseBuilder dbBuilder = new EmbeddedDatabaseBuilder(); + return dbBuilder.setType(EmbeddedDatabaseType.H2) + .setName(clientBDetails.getName()) + .addScript(clientBDetails.getScript()) + .build(); + } +} diff --git a/persistence-modules/spring-boot-persistence/src/test/resources/application.properties b/persistence-modules/spring-boot-persistence/src/test/resources/application.properties index d22bd38426..b268f46094 100644 --- a/persistence-modules/spring-boot-persistence/src/test/resources/application.properties +++ b/persistence-modules/spring-boot-persistence/src/test/resources/application.properties @@ -4,6 +4,14 @@ spring.datasource.url=jdbc:h2:mem:db;DB_CLOSE_DELAY=-1 spring.datasource.username=sa spring.datasource.password=sa +#database details for CLIENT_A +client-a.datasource.name=CLIENT_A +client-a.datasource.script=dsrouting-db.sql + +#database details for CLIENT_B +client-b.datasource.name=CLIENT_B +client-b.datasource.script=dsrouting-db.sql + # hibernate.X hibernate.dialect=org.hibernate.dialect.H2Dialect hibernate.show_sql=true diff --git a/persistence-modules/spring-boot-persistence/src/test/resources/dsrouting-db.sql b/persistence-modules/spring-boot-persistence/src/test/resources/dsrouting-db.sql new file mode 100644 index 0000000000..c9ca52907a --- /dev/null +++ b/persistence-modules/spring-boot-persistence/src/test/resources/dsrouting-db.sql @@ -0,0 +1,5 @@ +create table client ( + id numeric, + name varchar(50), + constraint pk_client primary key (id) +); \ No newline at end of file diff --git a/persistence-modules/spring-data-cassandra-2/.gitignore b/persistence-modules/spring-data-cassandra-2/.gitignore new file mode 100644 index 0000000000..549e00a2a9 --- /dev/null +++ b/persistence-modules/spring-data-cassandra-2/.gitignore @@ -0,0 +1,33 @@ +HELP.md +target/ +!.mvn/wrapper/maven-wrapper.jar +!**/src/main/**/target/ +!**/src/test/**/target/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +build/ +!**/src/main/**/build/ +!**/src/test/**/build/ + +### VS Code ### +.vscode/ diff --git a/persistence-modules/spring-data-cassandra-2/.mvn/wrapper/MavenWrapperDownloader.java b/persistence-modules/spring-data-cassandra-2/.mvn/wrapper/MavenWrapperDownloader.java new file mode 100644 index 0000000000..e76d1f3241 --- /dev/null +++ b/persistence-modules/spring-data-cassandra-2/.mvn/wrapper/MavenWrapperDownloader.java @@ -0,0 +1,117 @@ +/* + * Copyright 2007-present the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://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. + */ +import java.net.*; +import java.io.*; +import java.nio.channels.*; +import java.util.Properties; + +public class MavenWrapperDownloader { + + private static final String WRAPPER_VERSION = "0.5.6"; + /** + * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided. + */ + private static final String DEFAULT_DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/" + + WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar"; + + /** + * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to + * use instead of the default one. + */ + private static final String MAVEN_WRAPPER_PROPERTIES_PATH = + ".mvn/wrapper/maven-wrapper.properties"; + + /** + * Path where the maven-wrapper.jar will be saved to. + */ + private static final String MAVEN_WRAPPER_JAR_PATH = + ".mvn/wrapper/maven-wrapper.jar"; + + /** + * Name of the property which should be used to override the default download url for the wrapper. + */ + private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl"; + + public static void main(String args[]) { + System.out.println("- Downloader started"); + File baseDirectory = new File(args[0]); + System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath()); + + // If the maven-wrapper.properties exists, read it and check if it contains a custom + // wrapperUrl parameter. + File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH); + String url = DEFAULT_DOWNLOAD_URL; + if(mavenWrapperPropertyFile.exists()) { + FileInputStream mavenWrapperPropertyFileInputStream = null; + try { + mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile); + Properties mavenWrapperProperties = new Properties(); + mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream); + url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url); + } catch (IOException e) { + System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'"); + } finally { + try { + if(mavenWrapperPropertyFileInputStream != null) { + mavenWrapperPropertyFileInputStream.close(); + } + } catch (IOException e) { + // Ignore ... + } + } + } + System.out.println("- Downloading from: " + url); + + File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH); + if(!outputFile.getParentFile().exists()) { + if(!outputFile.getParentFile().mkdirs()) { + System.out.println( + "- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath() + "'"); + } + } + System.out.println("- Downloading to: " + outputFile.getAbsolutePath()); + try { + downloadFileFromURL(url, outputFile); + System.out.println("Done"); + System.exit(0); + } catch (Throwable e) { + System.out.println("- Error downloading"); + e.printStackTrace(); + System.exit(1); + } + } + + private static void downloadFileFromURL(String urlString, File destination) throws Exception { + if (System.getenv("MVNW_USERNAME") != null && System.getenv("MVNW_PASSWORD") != null) { + String username = System.getenv("MVNW_USERNAME"); + char[] password = System.getenv("MVNW_PASSWORD").toCharArray(); + Authenticator.setDefault(new Authenticator() { + @Override + protected PasswordAuthentication getPasswordAuthentication() { + return new PasswordAuthentication(username, password); + } + }); + } + URL website = new URL(urlString); + ReadableByteChannel rbc; + rbc = Channels.newChannel(website.openStream()); + FileOutputStream fos = new FileOutputStream(destination); + fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE); + fos.close(); + rbc.close(); + } + +} diff --git a/spring-boot-modules/spring-boot-keycloak/.mvn/wrapper/maven-wrapper.jar b/persistence-modules/spring-data-cassandra-2/.mvn/wrapper/maven-wrapper.jar similarity index 64% rename from spring-boot-modules/spring-boot-keycloak/.mvn/wrapper/maven-wrapper.jar rename to persistence-modules/spring-data-cassandra-2/.mvn/wrapper/maven-wrapper.jar index 9cc84ea9b4..2cc7d4a55c 100644 Binary files a/spring-boot-modules/spring-boot-keycloak/.mvn/wrapper/maven-wrapper.jar and b/persistence-modules/spring-data-cassandra-2/.mvn/wrapper/maven-wrapper.jar differ diff --git a/persistence-modules/spring-data-cassandra-2/.mvn/wrapper/maven-wrapper.properties b/persistence-modules/spring-data-cassandra-2/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 0000000000..ffdc10e59f --- /dev/null +++ b/persistence-modules/spring-data-cassandra-2/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,2 @@ +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.1/apache-maven-3.8.1-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar diff --git a/persistence-modules/spring-data-cassandra-2/README.md b/persistence-modules/spring-data-cassandra-2/README.md new file mode 100644 index 0000000000..f5cf20b8a9 --- /dev/null +++ b/persistence-modules/spring-data-cassandra-2/README.md @@ -0,0 +1,3 @@ +### Relevant Articles: + +- [Using Test Containers With Spring Data Cassandra](https://www.baeldung.com/spring-data-cassandra-test-containers) diff --git a/spring-boot-modules/spring-boot-keycloak/mvnw b/persistence-modules/spring-data-cassandra-2/mvnw old mode 100755 new mode 100644 similarity index 62% rename from spring-boot-modules/spring-boot-keycloak/mvnw rename to persistence-modules/spring-data-cassandra-2/mvnw index 5bf251c077..a16b5431b4 --- a/spring-boot-modules/spring-boot-keycloak/mvnw +++ b/persistence-modules/spring-data-cassandra-2/mvnw @@ -8,7 +8,7 @@ # "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 +# https://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 @@ -19,7 +19,7 @@ # ---------------------------------------------------------------------------- # ---------------------------------------------------------------------------- -# Maven2 Start Up Batch script +# Maven Start Up Batch script # # Required ENV vars: # ------------------ @@ -108,13 +108,12 @@ if $cygwin ; then CLASSPATH=`cygpath --path --unix "$CLASSPATH"` fi -# For Migwn, ensure paths are in UNIX format before anything is touched +# 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 @@ -200,8 +199,89 @@ if [ -z "$BASE_DIR" ]; then exit 1; fi +########################################################################################## +# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +# This allows using the maven wrapper in projects that prohibit checking in binary data. +########################################################################################## +if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found .mvn/wrapper/maven-wrapper.jar" + fi +else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..." + fi + if [ -n "$MVNW_REPOURL" ]; then + jarUrl="$MVNW_REPOURL/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + else + jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + fi + while IFS="=" read key value; do + case "$key" in (wrapperUrl) jarUrl="$value"; break ;; + esac + done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties" + if [ "$MVNW_VERBOSE" = true ]; then + echo "Downloading from: $jarUrl" + fi + wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" + if $cygwin; then + wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"` + fi + + if command -v wget > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found wget ... using wget" + fi + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + wget "$jarUrl" -O "$wrapperJarPath" + else + wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath" + fi + elif command -v curl > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found curl ... using curl" + fi + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + curl -o "$wrapperJarPath" "$jarUrl" -f + else + curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f + fi + + else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Falling back to using Java to download" + fi + javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java" + # For Cygwin, switch paths to Windows format before running javac + if $cygwin; then + javaClass=`cygpath --path --windows "$javaClass"` + fi + if [ -e "$javaClass" ]; then + if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Compiling MavenWrapperDownloader.java ..." + fi + # Compiling the Java class + ("$JAVA_HOME/bin/javac" "$javaClass") + fi + if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + # Running the downloader + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Running MavenWrapperDownloader.java ..." + fi + ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR") + fi + fi + fi +fi +########################################################################################## +# End of extension +########################################################################################## + export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"} -echo $MAVEN_PROJECTBASEDIR +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 @@ -216,6 +296,11 @@ if $cygwin; then MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"` fi +# Provide a "standardized" way to retrieve the CLI args that will +# work with both Windows and non-Windows executions. +MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@" +export MAVEN_CMD_LINE_ARGS + WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain exec "$JAVACMD" \ diff --git a/spring-boot-modules/spring-boot-keycloak/mvnw.cmd b/persistence-modules/spring-data-cassandra-2/mvnw.cmd similarity index 72% rename from spring-boot-modules/spring-boot-keycloak/mvnw.cmd rename to persistence-modules/spring-data-cassandra-2/mvnw.cmd index 019bd74d76..c8d43372c9 100644 --- a/spring-boot-modules/spring-boot-keycloak/mvnw.cmd +++ b/persistence-modules/spring-data-cassandra-2/mvnw.cmd @@ -7,7 +7,7 @@ @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 https://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 @@ -18,7 +18,7 @@ @REM ---------------------------------------------------------------------------- @REM ---------------------------------------------------------------------------- -@REM Maven2 Start Up Batch script +@REM Maven Start Up Batch script @REM @REM Required ENV vars: @REM JAVA_HOME - location of a JDK home dir @@ -26,7 +26,7 @@ @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_BATCH_PAUSE - set to 'on' to wait for a keystroke 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 @@ -35,7 +35,9 @@ @REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' @echo off -@REM enable echoing my setting MAVEN_BATCH_ECHO to 'on' +@REM set title of command window +title %0 +@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on' @if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% @REM set %HOME% to equivalent of $HOME @@ -115,10 +117,47 @@ for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do s :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 +set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + +FOR /F "tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( + IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B +) + +@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +@REM This allows using the maven wrapper in projects that prohibit checking in binary data. +if exist %WRAPPER_JAR% ( + if "%MVNW_VERBOSE%" == "true" ( + echo Found %WRAPPER_JAR% + ) +) else ( + if not "%MVNW_REPOURL%" == "" ( + SET DOWNLOAD_URL="%MVNW_REPOURL%/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + ) + if "%MVNW_VERBOSE%" == "true" ( + echo Couldn't find %WRAPPER_JAR%, downloading it ... + echo Downloading from: %DOWNLOAD_URL% + ) + + powershell -Command "&{"^ + "$webclient = new-object System.Net.WebClient;"^ + "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^ + "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^ + "}"^ + "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^ + "}" + if "%MVNW_VERBOSE%" == "true" ( + echo Finished downloading %WRAPPER_JAR% + ) +) +@REM End of extension + +@REM Provide a "standardized" way to retrieve the CLI args that will +@REM work with both Windows and non-Windows executions. +set MAVEN_CMD_LINE_ARGS=%* + %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 diff --git a/persistence-modules/spring-data-cassandra-2/pom.xml b/persistence-modules/spring-data-cassandra-2/pom.xml new file mode 100644 index 0000000000..0e09448d0f --- /dev/null +++ b/persistence-modules/spring-data-cassandra-2/pom.xml @@ -0,0 +1,72 @@ + + + 4.0.0 + + com.baeldung + parent-boot-2 + 0.0.1-SNAPSHOT + ../../parent-boot-2 + + + org.baeldung + spring-cassandra + 0.0.1-SNAPSHOT + spring-cassandra + Demo project for Spring Data Cassandra + + + + org.springframework.boot + spring-boot-starter-data-cassandra + + + org.springframework.data + spring-data-cassandra + ${org.springframework.data.version} + + + uk.org.webcompere + system-stubs-core + ${system.stubs.version} + + + org.springframework.boot + spring-boot-starter-test + test + + + org.testcontainers + testcontainers + ${testcontainers.version} + test + + + org.testcontainers + cassandra + ${testcontainers.version} + test + + + org.testcontainers + junit-jupiter + ${testcontainers.version} + test + + + uk.org.webcompere + system-stubs-jupiter + ${system.stubs.version} + test + + + + + 11 + 3.1.11 + 1.15.3 + 1.1.0 + 5.6.2 + + + diff --git a/persistence-modules/spring-data-cassandra-2/src/main/java/org/baeldung/springcassandra/SpringCassandraApplication.java b/persistence-modules/spring-data-cassandra-2/src/main/java/org/baeldung/springcassandra/SpringCassandraApplication.java new file mode 100644 index 0000000000..66324a7dfa --- /dev/null +++ b/persistence-modules/spring-data-cassandra-2/src/main/java/org/baeldung/springcassandra/SpringCassandraApplication.java @@ -0,0 +1,15 @@ +package org.baeldung.springcassandra; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.data.cassandra.repository.config.EnableCassandraRepositories; + +@SpringBootApplication +@EnableCassandraRepositories(basePackages = "org.baeldung.springcassandra.repository") +public class SpringCassandraApplication { + + public static void main(String[] args) { + SpringApplication.run(SpringCassandraApplication.class, args); + } + +} diff --git a/persistence-modules/spring-data-cassandra-2/src/main/java/org/baeldung/springcassandra/model/Car.java b/persistence-modules/spring-data-cassandra-2/src/main/java/org/baeldung/springcassandra/model/Car.java new file mode 100644 index 0000000000..f07535770a --- /dev/null +++ b/persistence-modules/spring-data-cassandra-2/src/main/java/org/baeldung/springcassandra/model/Car.java @@ -0,0 +1,77 @@ +package org.baeldung.springcassandra.model; + +import org.springframework.data.cassandra.core.mapping.PrimaryKey; +import org.springframework.data.cassandra.core.mapping.Table; + +import java.util.Objects; +import java.util.UUID; + +@Table +public class Car { + + @PrimaryKey + private UUID id; + + private String make; + + private String model; + + private int year; + + public Car(UUID id, String make, String model, int year) { + this.id = id; + this.make = make; + this.model = model; + this.year = year; + } + + public UUID getId() { + return id; + } + + public void setId(UUID id) { + this.id = id; + } + + public String getMake() { + return make; + } + + public void setMake(String make) { + this.make = make; + } + + public String getModel() { + return model; + } + + public void setModel(String model) { + this.model = model; + } + + public int getYear() { + return year; + } + + public void setYear(int year) { + this.year = year; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + Car car = (Car) o; + return year == car.year && Objects.equals(id, car.id) && Objects.equals(make, car.make) && Objects.equals(model, car.model); + } + + @Override + public int hashCode() { + return Objects.hash(id, make, model, year); + } + +} diff --git a/persistence-modules/spring-data-cassandra-2/src/main/java/org/baeldung/springcassandra/repository/CarRepository.java b/persistence-modules/spring-data-cassandra-2/src/main/java/org/baeldung/springcassandra/repository/CarRepository.java new file mode 100644 index 0000000000..492c385953 --- /dev/null +++ b/persistence-modules/spring-data-cassandra-2/src/main/java/org/baeldung/springcassandra/repository/CarRepository.java @@ -0,0 +1,12 @@ +package org.baeldung.springcassandra.repository; + +import org.baeldung.springcassandra.model.Car; +import org.springframework.data.cassandra.repository.CassandraRepository; +import org.springframework.stereotype.Repository; + +import java.util.UUID; + +@Repository +public interface CarRepository extends CassandraRepository { + +} diff --git a/persistence-modules/spring-data-cassandra-2/src/main/resources/application.properties b/persistence-modules/spring-data-cassandra-2/src/main/resources/application.properties new file mode 100644 index 0000000000..bea2021070 --- /dev/null +++ b/persistence-modules/spring-data-cassandra-2/src/main/resources/application.properties @@ -0,0 +1,4 @@ +spring.data.cassandra.keyspace-name=${CASSANDRA_KEYSPACE_NAME} +spring.data.cassandra.contact-points=${CASSANDRA_CONTACT_POINTS} +spring.data.cassandra.port=${CASSANDRA_PORT} +spring.data.cassandra.local-datacenter=datacenter1 \ No newline at end of file diff --git a/persistence-modules/spring-data-cassandra-2/src/test/java/org/baeldung/springcassandra/CassandraNestedIntegrationTest.java b/persistence-modules/spring-data-cassandra-2/src/test/java/org/baeldung/springcassandra/CassandraNestedIntegrationTest.java new file mode 100644 index 0000000000..668f5eabd7 --- /dev/null +++ b/persistence-modules/spring-data-cassandra-2/src/test/java/org/baeldung/springcassandra/CassandraNestedIntegrationTest.java @@ -0,0 +1,101 @@ +package org.baeldung.springcassandra; + +import com.datastax.driver.core.Cluster; +import com.datastax.driver.core.Session; +import com.datastax.driver.core.utils.UUIDs; +import org.baeldung.springcassandra.model.Car; +import org.baeldung.springcassandra.repository.CarRepository; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Nested; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.testcontainers.containers.CassandraContainer; +import org.testcontainers.junit.jupiter.Container; +import org.testcontainers.junit.jupiter.Testcontainers; + +import java.util.List; +import java.util.UUID; + +import static org.assertj.core.api.Assertions.assertThat; + + +@Testcontainers +@SpringBootTest +class CassandraNestedIntegrationTest { + + private static final String KEYSPACE_NAME = "test"; + + @Container + private static final CassandraContainer cassandra = (CassandraContainer) new CassandraContainer("cassandra:3.11.2") + .withExposedPorts(9042); + + @BeforeAll + static void setupCassandraConnectionProperties() { + System.setProperty("spring.data.cassandra.keyspace-name", KEYSPACE_NAME); + System.setProperty("spring.data.cassandra.contact-points", cassandra.getContainerIpAddress()); + System.setProperty("spring.data.cassandra.port", String.valueOf(cassandra.getMappedPort(9042))); + + createKeyspace(cassandra.getCluster()); + } + + static void createKeyspace(Cluster cluster) { + try(Session session = cluster.connect()) { + session.execute("CREATE KEYSPACE IF NOT EXISTS " + KEYSPACE_NAME + " WITH replication = \n" + + "{'class':'SimpleStrategy','replication_factor':'1'};"); + } + } + + @Nested + class ApplicationContextIntegrationTest { + + @Test + void givenCassandraContainer_whenSpringContextIsBootstrapped_thenContainerIsRunningWithNoExceptions() { + assertThat(cassandra.isRunning()).isTrue(); + } + + } + + @Nested + class CarRepositoryIntegrationTest { + + @Autowired + private CarRepository carRepository; + + @Test + void givenValidCarRecord_whenSavingIt_thenRecordIsSaved() { + UUID carId = UUIDs.timeBased(); + Car newCar = new Car(carId, "Nissan", "Qashqai", 2018); + + carRepository.save(newCar); + + List savedCars = carRepository.findAllById(List.of(carId)); + assertThat(savedCars.get(0)).isEqualTo(newCar); + } + + @Test + void givenExistingCarRecord_whenUpdatingIt_thenRecordIsUpdated() { + UUID carId = UUIDs.timeBased(); + Car existingCar = carRepository.save(new Car(carId, "Nissan", "Qashqai", 2018)); + + existingCar.setModel("X-Trail"); + carRepository.save(existingCar); + + List savedCars = carRepository.findAllById(List.of(carId)); + assertThat(savedCars.get(0).getModel()).isEqualTo("X-Trail"); + } + + @Test + void givenExistingCarRecord_whenDeletingIt_thenRecordIsDeleted() { + UUID carId = UUIDs.timeBased(); + Car existingCar = carRepository.save(new Car(carId, "Nissan", "Qashqai", 2018)); + + carRepository.delete(existingCar); + + List savedCars = carRepository.findAllById(List.of(carId)); + assertThat(savedCars.isEmpty()).isTrue(); + } + + } + +} diff --git a/persistence-modules/spring-data-cassandra-2/src/test/java/org/baeldung/springcassandra/CassandraSimpleIntegrationTest.java b/persistence-modules/spring-data-cassandra-2/src/test/java/org/baeldung/springcassandra/CassandraSimpleIntegrationTest.java new file mode 100644 index 0000000000..fef162a1b7 --- /dev/null +++ b/persistence-modules/spring-data-cassandra-2/src/test/java/org/baeldung/springcassandra/CassandraSimpleIntegrationTest.java @@ -0,0 +1,53 @@ +package org.baeldung.springcassandra; + +import com.datastax.driver.core.Cluster; +import com.datastax.driver.core.Session; +import com.datastax.driver.core.utils.UUIDs; +import org.baeldung.springcassandra.model.Car; +import org.baeldung.springcassandra.repository.CarRepository; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Nested; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.testcontainers.containers.CassandraContainer; +import org.testcontainers.junit.jupiter.Container; +import org.testcontainers.junit.jupiter.Testcontainers; + +import java.util.List; +import java.util.UUID; + +import static org.assertj.core.api.Assertions.assertThat; + +@Testcontainers +@SpringBootTest +class CassandraSimpleIntegrationTest { + + private static final String KEYSPACE_NAME = "test"; + + @Container + private static final CassandraContainer cassandra = (CassandraContainer) new CassandraContainer("cassandra:3.11.2") + .withExposedPorts(9042); + + @BeforeAll + static void setupCassandraConnectionProperties() { + System.setProperty("spring.data.cassandra.keyspace-name", KEYSPACE_NAME); + System.setProperty("spring.data.cassandra.contact-points", cassandra.getContainerIpAddress()); + System.setProperty("spring.data.cassandra.port", String.valueOf(cassandra.getMappedPort(9042))); + + createKeyspace(cassandra.getCluster()); + } + + static void createKeyspace(Cluster cluster) { + try(Session session = cluster.connect()) { + session.execute("CREATE KEYSPACE IF NOT EXISTS " + KEYSPACE_NAME + " WITH replication = \n" + + "{'class':'SimpleStrategy','replication_factor':'1'};"); + } + } + + @Test + void givenCassandraContainer_whenSpringContextIsBootstrapped_thenContainerIsRunningWithNoExceptions() { + assertThat(cassandra.isRunning()).isTrue(); + } + +} diff --git a/persistence-modules/spring-data-cassandra-2/src/test/resources/application.properties b/persistence-modules/spring-data-cassandra-2/src/test/resources/application.properties new file mode 100644 index 0000000000..58f1fe2ab7 --- /dev/null +++ b/persistence-modules/spring-data-cassandra-2/src/test/resources/application.properties @@ -0,0 +1,5 @@ +spring.data.cassandra.keyspace-name=${CASSANDRA_KEYSPACE_NAME} +spring.data.cassandra.contact-points=${CASSANDRA_CONTACT_POINTS} +spring.data.cassandra.port=${CASSANDRA_PORT} +spring.data.cassandra.local-datacenter=datacenter1 +spring.data.cassandra.schema-action=create_if_not_exists \ No newline at end of file diff --git a/persistence-modules/spring-data-cassandra/pom.xml b/persistence-modules/spring-data-cassandra/pom.xml index e2b47ce024..8092c05a40 100644 --- a/persistence-modules/spring-data-cassandra/pom.xml +++ b/persistence-modules/spring-data-cassandra/pom.xml @@ -48,6 +48,13 @@ cassandra-unit-shaded ${cassandra-unit-shaded.version} test + + + + junit + junit + + org.hectorclient diff --git a/persistence-modules/spring-data-redis/pom.xml b/persistence-modules/spring-data-redis/pom.xml index 5e17f27c06..330f0d975a 100644 --- a/persistence-modules/spring-data-redis/pom.xml +++ b/persistence-modules/spring-data-redis/pom.xml @@ -42,10 +42,6 @@ spring-boot-starter-test test - - org.junit.jupiter - junit-jupiter-api - org.junit.platform junit-platform-runner @@ -78,7 +74,6 @@ org.apache.maven.plugins maven-surefire-plugin - ${maven-surefire-plugin.version} true false diff --git a/persistence-modules/spring-jooq/pom.xml b/persistence-modules/spring-jooq/pom.xml index 4c195a6c92..c842922fe5 100644 --- a/persistence-modules/spring-jooq/pom.xml +++ b/persistence-modules/spring-jooq/pom.xml @@ -76,7 +76,6 @@ org.apache.maven.plugins maven-surefire-plugin - ${maven-surefire-plugin.version} 0 diff --git a/persistence-modules/spring-jpa/README.md b/persistence-modules/spring-jpa/README.md index db70259005..202f5b0293 100644 --- a/persistence-modules/spring-jpa/README.md +++ b/persistence-modules/spring-jpa/README.md @@ -5,8 +5,9 @@ - [JPA Pagination](https://www.baeldung.com/jpa-pagination) - [Sorting with JPA](https://www.baeldung.com/jpa-sort) - [Self-Contained Testing Using an In-Memory Database](https://www.baeldung.com/spring-jpa-test-in-memory-database) -- [A Guide to Spring AbstractRoutingDatasource](https://www.baeldung.com/spring-abstract-routing-data-source) +- [Obtaining Auto-generated Keys in Spring JDBC](https://www.baeldung.com/spring-jdbc-autogenerated-keys) - [Spring Data Annotations](http://www.baeldung.com/spring-data-annotations) +- [A Guide to Spring AbstractRoutingDatasource](https://www.baeldung.com/spring-abstract-routing-data-source) - More articles: [[next -->]](/spring-jpa-2) ### Eclipse Config diff --git a/persistence-modules/spring-jpa/src/main/java/com/baeldung/dsrouting/ClientDataSourceRouter.java b/persistence-modules/spring-jpa/src/main/java/com/baeldung/dsrouting/ClientDataSourceRouter.java deleted file mode 100644 index a9f5d83b55..0000000000 --- a/persistence-modules/spring-jpa/src/main/java/com/baeldung/dsrouting/ClientDataSourceRouter.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.baeldung.dsrouting; - -import org.springframework.jdbc.datasource.lookup.AbstractRoutingDataSource; - -/** - * Returns thread bound client lookup key for current context. - */ -public class ClientDataSourceRouter extends AbstractRoutingDataSource { - - @Override - protected Object determineCurrentLookupKey() { - return ClientDatabaseContextHolder.getClientDatabase(); - } -} diff --git a/pom.xml b/pom.xml index 1e26d09906..f2a53f38b7 100644 --- a/pom.xml +++ b/pom.xml @@ -34,12 +34,6 @@ - - junit - junit - ${junit.version} - test - org.junit.jupiter junit-jupiter-engine @@ -58,6 +52,12 @@ ${junit-jupiter.version} test + + org.junit.vintage + junit-vintage-engine + ${junit-jupiter.version} + test + org.hamcrest hamcrest @@ -116,7 +116,7 @@ org.junit.platform junit-platform-surefire-provider - ${junit-platform.version} + ${junit-platform-surefire-provider.version} org.junit.jupiter @@ -472,6 +472,7 @@ json-path jsoup jta + junit5 kubernetes ksqldb @@ -1385,15 +1386,16 @@ false true - 4.12 + + 4.13.2 2.2 1.3 3.3.0 - 1.10.22 + 1.11.20 - 1.7.30 - 1.2.3 + 1.7.32 + 1.2.6 @@ -1403,8 +1405,8 @@ 1.8 1.2.17 2.2.2.0 - 1.28 - 1.28 + 1.33 + 1.33 2.21.0 2.11.0 2.6 @@ -1415,10 +1417,11 @@ 1.2 2.3.1 1.2 - 2.12.4 + 2.13.0 1.4 - 1.2.0 - 5.2.0 + 1.8.1 + 5.8.1 + 1.3.2 0.3.1 2.5.2 0.0.1 diff --git a/quarkus-vs-springboot/quarkus-project/pom.xml b/quarkus-vs-springboot/quarkus-project/pom.xml index c9eae79a88..58d547f3b0 100644 --- a/quarkus-vs-springboot/quarkus-project/pom.xml +++ b/quarkus-vs-springboot/quarkus-project/pom.xml @@ -67,12 +67,6 @@ rest-assured test - - junit - junit - 4.8.2 - test - diff --git a/quarkus/pom.xml b/quarkus/pom.xml index e88fd4dc5a..d826729ad7 100644 --- a/quarkus/pom.xml +++ b/quarkus/pom.xml @@ -16,6 +16,20 @@ + + + junit + junit + ${junit.version} + + + org.junit + junit-bom + ${junit-jupiter.version} + pom + import + io.quarkus quarkus-bom @@ -54,7 +68,7 @@ org.projectlombok lombok - 1.18.6 + ${lombok.version} provided @@ -157,7 +171,7 @@ 1.7.0.Final - 5.6.0 + 1.18.6 \ No newline at end of file diff --git a/ratpack/README.md b/ratpack/README.md index 9c24670709..f42d4c030b 100644 --- a/ratpack/README.md +++ b/ratpack/README.md @@ -11,3 +11,4 @@ This module contains articles about Ratpack. - [Ratpack HTTP Client](https://www.baeldung.com/ratpack-http-client) - [Ratpack with RxJava](https://www.baeldung.com/ratpack-rxjava) - [Ratpack with Groovy](https://www.baeldung.com/ratpack-groovy) +- [Reactive Streams API with Ratpack](https://www.baeldung.com/ratpack-reactive-streams-api) diff --git a/restx/pom.xml b/restx/pom.xml index 83dd2afd58..ea9f927563 100644 --- a/restx/pom.xml +++ b/restx/pom.xml @@ -106,11 +106,17 @@ restx-specs-tests ${restx.version} test + + + junit + junit + + - junit - junit - ${junit.version} + org.junit.vintage + junit-vintage-engine + ${junit-jupiter.version} test diff --git a/rule-engines/evrete/README.md b/rule-engines/evrete/README.md new file mode 100644 index 0000000000..aa9a3a4b9d --- /dev/null +++ b/rule-engines/evrete/README.md @@ -0,0 +1,3 @@ +## Relevant Articles: + +- [Introduction to the Evrete Rule Engine](https://www.baeldung.com/java-evrete-rule-engine) diff --git a/spring-5-reactive-client/src/main/java/com/baeldung/reactive/webclient/simultaneous/Client.java b/spring-5-reactive-client/src/main/java/com/baeldung/reactive/webclient/simultaneous/Client.java index bbfc88322b..a72957d079 100644 --- a/spring-5-reactive-client/src/main/java/com/baeldung/reactive/webclient/simultaneous/Client.java +++ b/spring-5-reactive-client/src/main/java/com/baeldung/reactive/webclient/simultaneous/Client.java @@ -1,9 +1,8 @@ package com.baeldung.reactive.webclient.simultaneous; import org.springframework.web.reactive.function.client.WebClient; -import reactor.core.publisher.Mono; import reactor.core.publisher.Flux; -import reactor.core.scheduler.Schedulers; +import reactor.core.publisher.Mono; import java.util.List; import java.util.logging.Logger; @@ -19,8 +18,6 @@ public class Client { } public Mono getUser(int id) { - LOG.info(String.format("Calling getUser(%d)", id)); - return webClient.get() .uri("/user/{id}", id) .retrieve() @@ -43,22 +40,16 @@ public class Client { public Flux fetchUsers(List userIds) { return Flux.fromIterable(userIds) - .parallel() - .runOn(Schedulers.elastic()) - .flatMap(this::getUser) - .ordered((u1, u2) -> u2.id() - u1.id()); + .flatMap(this::getUser); } public Flux fetchUserAndOtherUser(int id) { - return Flux.merge(getUser(id), getOtherUser(id)) - .parallel() - .runOn(Schedulers.elastic()) - .ordered((u1, u2) -> u2.id() - u1.id()); + return Flux.merge(getUser(id), getOtherUser(id)); } public Mono fetchUserAndItem(int userId, int itemId) { - Mono user = getUser(userId).subscribeOn(Schedulers.elastic()); - Mono item = getItem(itemId).subscribeOn(Schedulers.elastic()); + Mono user = getUser(userId); + Mono item = getItem(itemId); return Mono.zip(user, item, UserWithItem::new); } diff --git a/spring-5-webflux/pom.xml b/spring-5-webflux/pom.xml index b37e93ded8..69de83c227 100644 --- a/spring-5-webflux/pom.xml +++ b/spring-5-webflux/pom.xml @@ -17,6 +17,13 @@ + + org.junit + junit-bom + ${junit-jupiter.version} + pom + import + org.springframework.boot spring-boot-dependencies @@ -44,6 +51,20 @@ org.springframework.boot spring-boot-starter-test test + + + org.junit.jupiter + junit-jupiter + + + org.junit.jupiter + junit-jupiter-api + + + org.junit.platform + junit-plaform-commons + + io.projectreactor diff --git a/spring-boot-modules/pom.xml b/spring-boot-modules/pom.xml index 7a93cabb82..0e4c2fe60b 100644 --- a/spring-boot-modules/pom.xml +++ b/spring-boot-modules/pom.xml @@ -46,7 +46,7 @@ spring-boot-groovy spring-boot-jasypt - spring-boot-keycloak + spring-boot-libraries spring-boot-libraries-2 spring-boot-logging-log4j2 @@ -95,20 +95,4 @@ - - - org.junit.jupiter - junit-jupiter - - - org.junit.vintage - junit-vintage-engine - - - - - 5.6.2 - 2.22.2 - - \ No newline at end of file diff --git a/spring-boot-modules/spring-boot-basic-customization-2/pom.xml b/spring-boot-modules/spring-boot-basic-customization-2/pom.xml index 8c1bc22600..6f3cb48b81 100644 --- a/spring-boot-modules/spring-boot-basic-customization-2/pom.xml +++ b/spring-boot-modules/spring-boot-basic-customization-2/pom.xml @@ -24,10 +24,6 @@ org.springframework.boot spring-boot-starter-test - - junit - junit - \ No newline at end of file diff --git a/spring-boot-modules/spring-boot-environment/README.md b/spring-boot-modules/spring-boot-environment/README.md index e7b0ace7a4..687322938e 100644 --- a/spring-boot-modules/spring-boot-environment/README.md +++ b/spring-boot-modules/spring-boot-environment/README.md @@ -6,3 +6,4 @@ This module contains articles about configuring the Spring Boot `Environment` - [EnvironmentPostProcessor in Spring Boot](https://www.baeldung.com/spring-boot-environmentpostprocessor) - [Spring Properties File Outside jar](https://www.baeldung.com/spring-properties-file-outside-jar) - [Get the Running Port in Spring Boot](https://www.baeldung.com/spring-boot-running-port) + - [Environment Variable Prefixes in Spring Boot 2.5](https://www.baeldung.com/spring-boot-env-variable-prefixes) diff --git a/spring-boot-modules/spring-boot-environment/pom.xml b/spring-boot-modules/spring-boot-environment/pom.xml index d4b260ee3d..9c852986a1 100644 --- a/spring-boot-modules/spring-boot-environment/pom.xml +++ b/spring-boot-modules/spring-boot-environment/pom.xml @@ -30,17 +30,6 @@ spring-boot-starter-test test - - org.junit.vintage - junit-vintage-engine - test - - - org.hamcrest - hamcrest-core - - - org.springframework.boot spring-boot-starter-data-jpa diff --git a/spring-boot-modules/spring-boot-flowable/pom.xml b/spring-boot-modules/spring-boot-flowable/pom.xml index 320a684880..7d89c665cd 100644 --- a/spring-boot-modules/spring-boot-flowable/pom.xml +++ b/spring-boot-modules/spring-boot-flowable/pom.xml @@ -40,11 +40,6 @@ spring-boot-starter-test test - - org.junit.jupiter - junit-jupiter-engine - test - diff --git a/spring-boot-modules/spring-boot-keycloak/.gitignore b/spring-boot-modules/spring-boot-keycloak/.gitignore deleted file mode 100644 index 2af7cefb0a..0000000000 --- a/spring-boot-modules/spring-boot-keycloak/.gitignore +++ /dev/null @@ -1,24 +0,0 @@ -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/spring-boot-modules/spring-boot-keycloak/.mvn/wrapper/maven-wrapper.properties b/spring-boot-modules/spring-boot-keycloak/.mvn/wrapper/maven-wrapper.properties deleted file mode 100644 index 9dda3b659b..0000000000 --- a/spring-boot-modules/spring-boot-keycloak/.mvn/wrapper/maven-wrapper.properties +++ /dev/null @@ -1 +0,0 @@ -distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.5.2/apache-maven-3.5.2-bin.zip diff --git a/spring-boot-modules/spring-boot-keycloak/README.md b/spring-boot-modules/spring-boot-keycloak/README.md index 2aff4664a6..7a1323d10e 100644 --- a/spring-boot-modules/spring-boot-keycloak/README.md +++ b/spring-boot-modules/spring-boot-keycloak/README.md @@ -8,4 +8,4 @@ This module contains articles about Keycloak in Spring Boot projects. - [Customizing the Login Page for Keycloak](https://www.baeldung.com/keycloak-custom-login-page) - [Keycloak User Self-Registration](https://www.baeldung.com/keycloak-user-registration) - [Customizing Themes for Keycloak](https://www.baeldung.com/spring-keycloak-custom-themes) - +- [Securing SOAP Web Services With Keycloak](https://www.baeldung.com/soap-keycloak) diff --git a/spring-boot-modules/spring-boot-keycloak/pom.xml b/spring-boot-modules/spring-boot-keycloak/pom.xml index b80dbfa191..adad6bb2d2 100644 --- a/spring-boot-modules/spring-boot-keycloak/pom.xml +++ b/spring-boot-modules/spring-boot-keycloak/pom.xml @@ -64,6 +64,28 @@ org.springframework.boot spring-boot-starter-thymeleaf + + wsdl4j + wsdl4j + 1.6.3 + + + org.springframework.boot + spring-boot-starter-web-services + + + + org.springframework.security + spring-security-test + test + + + org.assertj + assertj-core + 3.21.0 + test + + @@ -72,11 +94,31 @@ org.springframework.boot spring-boot-maven-plugin + + org.codehaus.mojo + jaxb2-maven-plugin + 2.5.0 + + + xjc + + xjc + + + + + com.baeldung + + src/main/resources/products.xsd + + + + - 13.0.1 + 15.0.2 \ No newline at end of file diff --git a/spring-boot-modules/spring-boot-keycloak/src/main/java/com/baeldung/keycloaksoap/KeycloakSecurityConfig.java b/spring-boot-modules/spring-boot-keycloak/src/main/java/com/baeldung/keycloaksoap/KeycloakSecurityConfig.java new file mode 100644 index 0000000000..66a17f4967 --- /dev/null +++ b/spring-boot-modules/spring-boot-keycloak/src/main/java/com/baeldung/keycloaksoap/KeycloakSecurityConfig.java @@ -0,0 +1,54 @@ +package com.baeldung.keycloaksoap; + +import org.keycloak.adapters.KeycloakConfigResolver; +import org.keycloak.adapters.springboot.KeycloakSpringBootConfigResolver; +import org.keycloak.adapters.springsecurity.KeycloakConfiguration; +import org.keycloak.adapters.springsecurity.authentication.KeycloakAuthenticationProvider; +import org.keycloak.adapters.springsecurity.config.KeycloakWebSecurityConfigurerAdapter; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.context.annotation.Bean; +import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; +import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity; +import org.springframework.security.config.annotation.web.builders.HttpSecurity; +import org.springframework.security.core.authority.mapping.SimpleAuthorityMapper; +import org.springframework.security.core.session.SessionRegistryImpl; +import org.springframework.security.web.authentication.session.RegisterSessionAuthenticationStrategy; +import org.springframework.security.web.authentication.session.SessionAuthenticationStrategy; + +@KeycloakConfiguration +@ConditionalOnProperty(name = "keycloak.enabled", havingValue = "true") +@EnableGlobalMethodSecurity(jsr250Enabled = true) +public class KeycloakSecurityConfig extends KeycloakWebSecurityConfigurerAdapter { + @Override + protected void configure(HttpSecurity http) throws Exception { + super.configure(http); + //@formatter:off + http + .csrf() + .disable() + .authorizeRequests() + .anyRequest() + .permitAll(); + //@formatter:on + } + + @Autowired + public void configureGlobal(AuthenticationManagerBuilder auth) { + KeycloakAuthenticationProvider keycloakAuthenticationProvider = keycloakAuthenticationProvider(); + keycloakAuthenticationProvider.setGrantedAuthoritiesMapper(new SimpleAuthorityMapper()); + auth.authenticationProvider(keycloakAuthenticationProvider); + } + + @Bean + @Override + protected SessionAuthenticationStrategy sessionAuthenticationStrategy() { + return new RegisterSessionAuthenticationStrategy(new SessionRegistryImpl()); + } + + @Bean + public KeycloakConfigResolver keycloakSpringBootConfigResolver() { + return new KeycloakSpringBootConfigResolver(); + } + +} diff --git a/spring-boot-modules/spring-boot-keycloak/src/main/java/com/baeldung/keycloaksoap/KeycloakSoapServicesApplication.java b/spring-boot-modules/spring-boot-keycloak/src/main/java/com/baeldung/keycloaksoap/KeycloakSoapServicesApplication.java new file mode 100644 index 0000000000..4cf60a804a --- /dev/null +++ b/spring-boot-modules/spring-boot-keycloak/src/main/java/com/baeldung/keycloaksoap/KeycloakSoapServicesApplication.java @@ -0,0 +1,15 @@ +package com.baeldung.keycloaksoap; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class KeycloakSoapServicesApplication { + + public static void main(String[] args) { + SpringApplication application = new SpringApplication(KeycloakSoapServicesApplication.class); + application.setAdditionalProfiles("keycloak"); + application.run(args); + } + +} diff --git a/spring-boot-modules/spring-boot-keycloak/src/main/java/com/baeldung/keycloaksoap/ProductsEndpoint.java b/spring-boot-modules/spring-boot-keycloak/src/main/java/com/baeldung/keycloaksoap/ProductsEndpoint.java new file mode 100644 index 0000000000..58f7739af0 --- /dev/null +++ b/spring-boot-modules/spring-boot-keycloak/src/main/java/com/baeldung/keycloaksoap/ProductsEndpoint.java @@ -0,0 +1,42 @@ +package com.baeldung.keycloaksoap; + +import com.baeldung.DeleteProductRequest; +import com.baeldung.DeleteProductResponse; +import com.baeldung.GetProductDetailsRequest; +import com.baeldung.GetProductDetailsResponse; +import com.baeldung.Product; +import org.springframework.ws.server.endpoint.annotation.Endpoint; +import org.springframework.ws.server.endpoint.annotation.PayloadRoot; +import org.springframework.ws.server.endpoint.annotation.RequestPayload; +import org.springframework.ws.server.endpoint.annotation.ResponsePayload; + +import javax.annotation.security.RolesAllowed; +import java.util.Map; + +@Endpoint +public class ProductsEndpoint { + + private final Map productMap; + + public ProductsEndpoint(Map productMap) { + this.productMap = productMap; + } + + @RolesAllowed("user") + @PayloadRoot(namespace = "http://www.baeldung.com/springbootsoap/keycloak", localPart = "getProductDetailsRequest") + @ResponsePayload + public GetProductDetailsResponse getProductDetails(@RequestPayload GetProductDetailsRequest request) { + GetProductDetailsResponse response = new GetProductDetailsResponse(); + response.setProduct(productMap.get(request.getId())); + return response; + } + + @RolesAllowed("admin") + @PayloadRoot(namespace = "http://www.baeldung.com/springbootsoap/keycloak", localPart = "deleteProductRequest") + @ResponsePayload + public DeleteProductResponse deleteProduct(@RequestPayload DeleteProductRequest request) { + DeleteProductResponse response = new DeleteProductResponse(); + response.setMessage("Success! Deleted the product with the id - "+request.getId()); + return response; + } +} diff --git a/spring-boot-modules/spring-boot-keycloak/src/main/java/com/baeldung/keycloaksoap/WebServiceConfig.java b/spring-boot-modules/spring-boot-keycloak/src/main/java/com/baeldung/keycloaksoap/WebServiceConfig.java new file mode 100644 index 0000000000..00d128fa12 --- /dev/null +++ b/spring-boot-modules/spring-boot-keycloak/src/main/java/com/baeldung/keycloaksoap/WebServiceConfig.java @@ -0,0 +1,75 @@ +package com.baeldung.keycloaksoap; + +import com.baeldung.Product; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.web.servlet.ServletRegistrationBean; +import org.springframework.context.ApplicationContext; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.core.io.ClassPathResource; +import org.springframework.ws.config.annotation.EnableWs; +import org.springframework.ws.config.annotation.WsConfigurerAdapter; +import org.springframework.ws.transport.http.MessageDispatcherServlet; +import org.springframework.ws.wsdl.wsdl11.DefaultWsdl11Definition; +import org.springframework.xml.xsd.SimpleXsdSchema; +import org.springframework.xml.xsd.XsdSchema; + +import java.util.HashMap; +import java.util.Map; + +@EnableWs +@Configuration +public class WebServiceConfig extends WsConfigurerAdapter { + + @Value("${ws.api.path:/ws/api/v1/*}") + private String webserviceApiPath; + @Value("${ws.port.type.name:ProductsPort}") + private String webservicePortTypeName; + @Value("${ws.target.namespace:http://www.baeldung.com/springbootsoap/keycloak}") + private String webserviceTargetNamespace; + @Value("${ws.location.uri:http://localhost:18080/ws/api/v1/}") + private String locationUri; + + @Bean + public ServletRegistrationBean messageDispatcherServlet(ApplicationContext applicationContext) { + MessageDispatcherServlet servlet = new MessageDispatcherServlet(); + servlet.setApplicationContext(applicationContext); + servlet.setTransformWsdlLocations(true); + return new ServletRegistrationBean<>(servlet, webserviceApiPath); + } + + @Bean(name = "products") + public DefaultWsdl11Definition defaultWsdl11Definition(XsdSchema productsSchema) { + DefaultWsdl11Definition wsdl11Definition = new DefaultWsdl11Definition(); + wsdl11Definition.setPortTypeName(webservicePortTypeName); + wsdl11Definition.setTargetNamespace(webserviceTargetNamespace); + wsdl11Definition.setLocationUri(locationUri); + wsdl11Definition.setSchema(productsSchema); + return wsdl11Definition; + } + + @Bean + public XsdSchema productsSchema() { + return new SimpleXsdSchema(new ClassPathResource("products.xsd")); + } + + @Bean + public Map getProducts() + { + Map map = new HashMap<>(); + Product foldsack= new Product(); + foldsack.setId("1"); + foldsack.setName("Fjallraven - Foldsack No. 1 Backpack, Fits 15 Laptops"); + foldsack.setDescription("Your perfect pack for everyday use and walks in the forest. "); + + Product shirt= new Product(); + shirt.setId("2"); + shirt.setName("Mens Casual Premium Slim Fit T-Shirts"); + shirt.setDescription("Slim-fitting style, contrast raglan long sleeve, three-button henley placket."); + + map.put("1", foldsack); + map.put("2", shirt); + return map; + } + +} diff --git a/spring-boot-modules/spring-boot-keycloak/src/main/resources/application-keycloak.properties b/spring-boot-modules/spring-boot-keycloak/src/main/resources/application-keycloak.properties new file mode 100644 index 0000000000..0a28b7ac48 --- /dev/null +++ b/spring-boot-modules/spring-boot-keycloak/src/main/resources/application-keycloak.properties @@ -0,0 +1,17 @@ +server.port=18080 + +keycloak.enabled=true +keycloak.realm=baeldung-soap-services +keycloak.auth-server-url=http://localhost:8080/auth +keycloak.bearer-only=true +keycloak.credentials.secret=14da6f9e-261f-489a-9bf0-1441e4a9ddc4 +keycloak.ssl-required=external +keycloak.resource=baeldung-soap-services +keycloak.use-resource-role-mappings=true + + +# Custom properties begin here +ws.api.path=/ws/api/v1/* +ws.port.type.name=ProductsPort +ws.target.namespace=http://www.baeldung.com/springbootsoap/keycloak +ws.location.uri=http://localhost:18080/ws/api/v1/ \ No newline at end of file diff --git a/spring-boot-modules/spring-boot-keycloak/src/main/resources/products.xsd b/spring-boot-modules/spring-boot-keycloak/src/main/resources/products.xsd new file mode 100644 index 0000000000..b147118e96 --- /dev/null +++ b/spring-boot-modules/spring-boot-keycloak/src/main/resources/products.xsd @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/spring-boot-modules/spring-boot-keycloak/src/test/java/com/baeldung/keycloaksoap/KeycloakSoapIntegrationTest.java b/spring-boot-modules/spring-boot-keycloak/src/test/java/com/baeldung/keycloaksoap/KeycloakSoapIntegrationTest.java new file mode 100644 index 0000000000..e0de897044 --- /dev/null +++ b/spring-boot-modules/spring-boot-keycloak/src/test/java/com/baeldung/keycloaksoap/KeycloakSoapIntegrationTest.java @@ -0,0 +1,153 @@ +package com.baeldung.keycloaksoap; + +import com.fasterxml.jackson.databind.ObjectMapper; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.test.web.client.TestRestTemplate; +import org.springframework.boot.web.server.LocalServerPort; +import org.springframework.http.HttpEntity; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpMethod; +import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; +import org.springframework.test.context.ActiveProfiles; +import org.springframework.util.LinkedMultiValueMap; +import org.springframework.util.MultiValueMap; + +import java.util.Objects; + +import static org.assertj.core.api.Assertions.assertThat; + +/** + * The class contains Live/Integration tests. + * These tests expect that the Keycloak server is up and running on port 8080. + * The tests may fail without a Keycloak server. + */ +@DisplayName("Keycloak SOAP Webservice Unit Tests") +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) +@ActiveProfiles("test") +@AutoConfigureMockMvc +class KeycloakSoapIntegrationTest { + + private static final Logger logger = LoggerFactory.getLogger(KeycloakSoapIntegrationTest.class); + @LocalServerPort + private int port; + @Autowired + private TestRestTemplate restTemplate; + @Autowired + private ObjectMapper objectMapper; + @Value("${grant.type}") + private String grantType; + @Value("${client.id}") + private String clientId; + @Value("${client.secret}") + private String clientSecret; + @Value("${url}") + private String keycloakUrl; + + /** + * Test a happy flow. Test the janedoe user. + * This user should be configured in Keycloak server with a role user + */ + @Test + @DisplayName("Get Products With Access Token") + void givenAccessToken_whenGetProducts_thenReturnProduct() { + + HttpHeaders headers = new HttpHeaders(); + headers.set("content-type", "text/xml"); + headers.set("Authorization", "Bearer " + generateToken("janedoe", "password")); + HttpEntity request = new HttpEntity<>(Utility.getGetProductDetailsRequest(), headers); + ResponseEntity responseEntity = restTemplate.postForEntity("http://localhost:" + port + "/ws/api/v1/", request, String.class); + + assertThat(responseEntity).isNotNull(); + assertThat(responseEntity.getStatusCodeValue()).isEqualTo(HttpStatus.OK.value()); + assertThat(responseEntity.getBody()).isNotBlank(); + assertThat(responseEntity.getBody()).containsIgnoringCase(":id>1janeadoe user. + * Keycloak returns Unauthorized. Assert 401 status and empty body. + */ + @Test + @DisplayName("Get Products With Wrong Access Token") + void givenWrongAccessToken_whenGetProducts_thenReturnError() { + + HttpHeaders headers = new HttpHeaders(); + headers.set("content-type", "text/xml"); + headers.set("Authorization", "Bearer " + generateToken("janeadoe", "password")); + HttpEntity request = new HttpEntity<>(Utility.getGetProductDetailsRequest(), headers); + ResponseEntity responseEntity = restTemplate.postForEntity("http://localhost:" + port + "/ws/api/v1/", request, String.class); + assertThat(responseEntity).isNotNull(); + assertThat(responseEntity.getStatusCodeValue()).isEqualTo(HttpStatus.UNAUTHORIZED.value()); + assertThat(responseEntity.getBody()).isBlank(); + } + + /** + * Happy flow to test deleteProduct operation. Test the jhondoe user. + * This user should be configured in Keycloak server with a role user + */ + @Test + @DisplayName("Delete Product With Access Token") + void givenAccessToken_whenDeleteProduct_thenReturnSuccess() { + HttpHeaders headers = new HttpHeaders(); + headers.set("content-type", "text/xml"); + headers.set("Authorization", "Bearer " + generateToken("jhondoe", "password")); + HttpEntity request = new HttpEntity<>(Utility.getDeleteProductsRequest(), headers); + ResponseEntity responseEntity = restTemplate.postForEntity("http://localhost:" + port + "/ws/api/v1/", request, String.class); + + assertThat(responseEntity).isNotNull(); + assertThat(responseEntity.getStatusCodeValue()).isEqualTo(HttpStatus.OK.value()); + assertThat(responseEntity.getBody()).isNotBlank(); + assertThat(responseEntity.getBody()).containsIgnoringCase("Deleted the product with the id"); + } + + /** + * Negative flow to test . Test the janedoe user. + * Obtain the access token of janedoe and access the admin operation deleteProduct + * Assume janedoe has restricted access to deleteProduct operation + */ + @Test + @DisplayName("Delete Products With Unauthorized Access Token") + void givenUnauthorizedAccessToken_whenDeleteProduct_thenReturnUnauthorized() { + HttpHeaders headers = new HttpHeaders(); + headers.set("content-type", "text/xml"); + headers.set("Authorization", "Bearer " + generateToken("janedoe", "password")); + HttpEntity request = new HttpEntity<>(Utility.getDeleteProductsRequest(), headers); + ResponseEntity responseEntity = restTemplate.postForEntity("http://localhost:" + port + "/ws/api/v1/", request, String.class); + + assertThat(responseEntity).isNotNull(); + assertThat(responseEntity.getStatusCodeValue()).isEqualTo(HttpStatus.INTERNAL_SERVER_ERROR.value()); + assertThat(responseEntity.getBody()).isNotBlank(); + assertThat(responseEntity.getBody()).containsIgnoringCase("Access is denied"); + } + + private String generateToken(String username, String password) { + + try { + HttpHeaders headers = new HttpHeaders(); + headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED); + MultiValueMap map = new LinkedMultiValueMap<>(); + map.add("grant_type", grantType); + map.add("client_id", clientId); + map.add("client_secret", clientSecret); + map.add("username", username); + map.add("password", password); + HttpEntity> entity = new HttpEntity<>(map, headers); + ResponseEntity response = restTemplate.exchange(keycloakUrl, HttpMethod.POST, entity, String.class); + return Objects.requireNonNull(response.getBody()).contains("access_token") ? objectMapper.readTree(response.getBody()).get("access_token").asText() : ""; + } catch (Exception ex) { + logger.error("There is an internal server error. Returning an empty access token", ex); + return ""; + } + + } + +} diff --git a/spring-boot-modules/spring-boot-keycloak/src/test/java/com/baeldung/keycloaksoap/Utility.java b/spring-boot-modules/spring-boot-keycloak/src/test/java/com/baeldung/keycloaksoap/Utility.java new file mode 100644 index 0000000000..1535d9f171 --- /dev/null +++ b/spring-boot-modules/spring-boot-keycloak/src/test/java/com/baeldung/keycloaksoap/Utility.java @@ -0,0 +1,12 @@ +package com.baeldung.keycloaksoap; + +public class Utility { + public static String getGetProductDetailsRequest() { + return "\n" + " \n" + " \n" + " \n" + + " 1\n" + " \n" + " \n" + ""; + } + public static String getDeleteProductsRequest() { + return "\n" + " \n" + " \n" + " \n" + + " 1\n" + " \n" + " \n" + ""; + } +} diff --git a/spring-boot-modules/spring-boot-keycloak/src/test/resources/application-test.properties b/spring-boot-modules/spring-boot-keycloak/src/test/resources/application-test.properties new file mode 100644 index 0000000000..a818b5be7a --- /dev/null +++ b/spring-boot-modules/spring-boot-keycloak/src/test/resources/application-test.properties @@ -0,0 +1,4 @@ +grant.type=password +client.id=baeldung-soap-services +client.secret=d2ba7af8-f7d2-4c97-b4a5-3c88b59920ae +url=http://localhost:8080/auth/realms/baeldung-soap-services/protocol/openid-connect/token diff --git a/spring-boot-modules/spring-boot-logging-log4j2/pom.xml b/spring-boot-modules/spring-boot-logging-log4j2/pom.xml index 2f69870961..dafbddb93f 100644 --- a/spring-boot-modules/spring-boot-logging-log4j2/pom.xml +++ b/spring-boot-modules/spring-boot-logging-log4j2/pom.xml @@ -16,6 +16,25 @@ + + + + + junit + junit + ${junit.version} + + + org.junit + junit-bom + ${junit-jupiter.version} + pom + import + + + + org.springframework.boot @@ -80,6 +99,9 @@ 1.3.8.RELEASE 1.1.16 1.18.4 + + 4.13.2 + 5.8.1 \ No newline at end of file diff --git a/spring-boot-modules/spring-boot-parent/spring-boot-with-starter-parent/pom.xml b/spring-boot-modules/spring-boot-parent/spring-boot-with-starter-parent/pom.xml index 5633e4d260..2568714278 100644 --- a/spring-boot-modules/spring-boot-parent/spring-boot-with-starter-parent/pom.xml +++ b/spring-boot-modules/spring-boot-parent/spring-boot-with-starter-parent/pom.xml @@ -30,10 +30,6 @@ org.springframework.boot spring-boot-starter-web - - junit - junit - diff --git a/spring-boot-modules/spring-boot-testing/pom.xml b/spring-boot-modules/spring-boot-testing/pom.xml index f70e77b31a..a846227290 100644 --- a/spring-boot-modules/spring-boot-testing/pom.xml +++ b/spring-boot-modules/spring-boot-testing/pom.xml @@ -49,17 +49,6 @@ spring-boot-starter-test test - - org.junit.vintage - junit-vintage-engine - test - - - org.hamcrest - hamcrest-core - - - it.ozimov diff --git a/spring-boot-modules/spring-boot/pom.xml b/spring-boot-modules/spring-boot/pom.xml index 8df16a1f9c..026c48c148 100644 --- a/spring-boot-modules/spring-boot/pom.xml +++ b/spring-boot-modules/spring-boot/pom.xml @@ -54,17 +54,6 @@ spring-boot-starter-test test - - org.junit.vintage - junit-vintage-engine - test - - - org.hamcrest - hamcrest-core - - - io.dropwizard.metrics metrics-core diff --git a/spring-cloud/spring-cloud-archaius/pom.xml b/spring-cloud/spring-cloud-archaius/pom.xml index 9edd5d24c5..efd912f8db 100644 --- a/spring-cloud/spring-cloud-archaius/pom.xml +++ b/spring-cloud/spring-cloud-archaius/pom.xml @@ -54,14 +54,13 @@ org.junit.platform junit-platform-runner - ${junit.platform.version} + ${junit-platform.version} test 2.0.3.RELEASE - 1.2.0 \ No newline at end of file diff --git a/spring-cloud/spring-cloud-aws/pom.xml b/spring-cloud/spring-cloud-aws/pom.xml index 06448cc2ee..c9cd56bea6 100644 --- a/spring-cloud/spring-cloud-aws/pom.xml +++ b/spring-cloud/spring-cloud-aws/pom.xml @@ -18,6 +18,20 @@ + + + junit + junit + ${junit.version} + + + org.junit + junit-bom + ${junit-jupiter.version} + pom + import + org.springframework.cloud spring-cloud-aws diff --git a/spring-cloud/spring-cloud-config/client/pom.xml b/spring-cloud/spring-cloud-config/client/pom.xml index 55c6e77a72..0f463b6d6d 100644 --- a/spring-cloud/spring-cloud-config/client/pom.xml +++ b/spring-cloud/spring-cloud-config/client/pom.xml @@ -26,17 +26,6 @@ spring-boot-starter-test test - - org.junit.vintage - junit-vintage-engine - test - - - org.hamcrest - hamcrest-core - - - diff --git a/spring-cloud/spring-cloud-config/server/pom.xml b/spring-cloud/spring-cloud-config/server/pom.xml index 36d1b5b3aa..b41277113f 100644 --- a/spring-cloud/spring-cloud-config/server/pom.xml +++ b/spring-cloud/spring-cloud-config/server/pom.xml @@ -30,17 +30,6 @@ spring-boot-starter-test test - - org.junit.vintage - junit-vintage-engine - test - - - org.hamcrest - hamcrest-core - - - diff --git a/spring-cloud/spring-cloud-docker/docker-message-server/pom.xml b/spring-cloud/spring-cloud-docker/docker-message-server/pom.xml index 1c8c58c762..91cd587ff3 100644 --- a/spring-cloud/spring-cloud-docker/docker-message-server/pom.xml +++ b/spring-cloud/spring-cloud-docker/docker-message-server/pom.xml @@ -23,17 +23,6 @@ spring-boot-starter-test test - - org.junit.vintage - junit-vintage-engine - test - - - org.hamcrest - hamcrest-core - - - diff --git a/spring-cloud/spring-cloud-docker/docker-product-server/pom.xml b/spring-cloud/spring-cloud-docker/docker-product-server/pom.xml index be65a6d7d3..9645dd3dff 100644 --- a/spring-cloud/spring-cloud-docker/docker-product-server/pom.xml +++ b/spring-cloud/spring-cloud-docker/docker-product-server/pom.xml @@ -23,17 +23,6 @@ spring-boot-starter-test test - - org.junit.vintage - junit-vintage-engine - test - - - org.hamcrest - hamcrest-core - - - diff --git a/spring-cloud/spring-cloud-ribbon-retry/pom.xml b/spring-cloud/spring-cloud-ribbon-retry/pom.xml index e0075b4f41..02fc103533 100644 --- a/spring-cloud/spring-cloud-ribbon-retry/pom.xml +++ b/spring-cloud/spring-cloud-ribbon-retry/pom.xml @@ -45,7 +45,6 @@ org.apache.maven.plugins maven-surefire-plugin - ${maven-surefire-plugin.version} 0 diff --git a/spring-cloud/spring-cloud-stream-starters/twitterhdfs/pom.xml b/spring-cloud/spring-cloud-stream-starters/twitterhdfs/pom.xml index 9c8d4ac707..ba6cee1fce 100644 --- a/spring-cloud/spring-cloud-stream-starters/twitterhdfs/pom.xml +++ b/spring-cloud/spring-cloud-stream-starters/twitterhdfs/pom.xml @@ -16,6 +16,25 @@ + + + + + junit + junit + ${junit.version} + + + org.junit + junit-bom + ${junit-jupiter.version} + pom + import + + + + @@ -38,6 +57,10 @@ spring-boot-starter-test test + + org.junit.vintage + junit-vintage-engine + @@ -52,6 +75,9 @@ 2.1.2.RELEASE + + 4.13.2 + 5.8.1 \ No newline at end of file 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 index 9989893f2f..5c9f85d06e 100644 --- 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 @@ -5,7 +5,7 @@ 4.0.0 eureka-client 1.0.0-SNAPSHOT - Spring Cloud Eureka Client + eureka-client jar Spring Cloud Eureka Sample Client 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 index 34f82a7347..2d2a94d779 100644 --- 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 @@ -5,7 +5,7 @@ 4.0.0 eureka-server 1.0.0-SNAPSHOT - Spring Cloud Eureka Server + eureka-server jar Spring Cloud Eureka Server Demo diff --git a/spring-core-3/pom.xml b/spring-core-3/pom.xml index 50d2e7ac5e..9e777a4a03 100644 --- a/spring-core-3/pom.xml +++ b/spring-core-3/pom.xml @@ -55,18 +55,6 @@ ${spring.version} test - - org.junit.jupiter - junit-jupiter-engine - ${junit-jupiter.version} - test - - - org.junit.jupiter - junit-jupiter-api - ${junit-jupiter.version} - test - diff --git a/spring-core-4/pom.xml b/spring-core-4/pom.xml index 5706b2ee75..f9665a672b 100644 --- a/spring-core-4/pom.xml +++ b/spring-core-4/pom.xml @@ -55,18 +55,6 @@ ${spring.version} test - - org.junit.jupiter - junit-jupiter-engine - ${junit-jupiter.version} - test - - - org.junit.jupiter - junit-jupiter-api - ${junit-jupiter.version} - test - org.awaitility awaitility diff --git a/spring-ejb/ejb-beans/pom.xml b/spring-ejb/ejb-beans/pom.xml index d820819a78..10bc6d3104 100644 --- a/spring-ejb/ejb-beans/pom.xml +++ b/spring-ejb/ejb-beans/pom.xml @@ -32,11 +32,13 @@ javaee-api provided + - org.apache.openejb + org.apache.tomee tomee-embedded ${tomee-embedded.version} + org.springframework spring-context @@ -78,6 +80,18 @@ arquillian-junit-container test + + org.junit.vintage + junit-vintage-engine + ${junit-jupiter.version} + test + + + + joda-time + joda-time + ${joda-time.version} + @@ -174,18 +188,19 @@ - 1.1.13.Final - 1.7.5 - 3.1.2 - 1.0.0.CR4 + 1.6.0.Final + 8.0.8 + 6.2.2 + 1.0.2 8.2.1.Final 3.2 5.2.3.RELEASE - 5.10.2 - 5.13.1 + 5.16.3 + 5.16.3 2.21.0 2.8 8.2.1.Final + 2.10.12 \ No newline at end of file diff --git a/spring-ejb/pom.xml b/spring-ejb/pom.xml index 383cde1e69..0b52fa52b1 100755 --- a/spring-ejb/pom.xml +++ b/spring-ejb/pom.xml @@ -26,6 +26,14 @@ + + + junit + junit + ${junit.version} + test + com.baeldung.spring.ejb spring-ejb-remote diff --git a/spring-security-modules/spring-security-web-react/src/main/java/com/baeldung/spring/MvcConfig.java b/spring-security-modules/spring-security-web-react/src/main/java/com/baeldung/spring/MvcConfig.java index f8acdfe2ac..226459db75 100644 --- a/spring-security-modules/spring-security-web-react/src/main/java/com/baeldung/spring/MvcConfig.java +++ b/spring-security-modules/spring-security-web-react/src/main/java/com/baeldung/spring/MvcConfig.java @@ -1,18 +1,20 @@ package com.baeldung.spring; import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; import org.springframework.web.servlet.ViewResolver; import org.springframework.web.servlet.config.annotation.EnableWebMvc; import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; import org.springframework.web.servlet.config.annotation.ViewControllerRegistry; -import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; import org.springframework.web.servlet.view.InternalResourceViewResolver; import org.springframework.web.servlet.view.JstlView; @EnableWebMvc @Configuration -public class MvcConfig extends WebMvcConfigurerAdapter { +@ComponentScan(basePackages = { "com.baeldung.spring" }) +public class MvcConfig implements WebMvcConfigurer { public MvcConfig() { super(); @@ -22,8 +24,6 @@ public class MvcConfig extends WebMvcConfigurerAdapter { @Override public void addViewControllers(final ViewControllerRegistry registry) { - super.addViewControllers(registry); - registry.addViewController("/anonymous.html"); registry.addViewController("/login.html"); @@ -35,7 +35,7 @@ public class MvcConfig extends WebMvcConfigurerAdapter { @Override public void addResourceHandlers(ResourceHandlerRegistry registry) { registry.addResourceHandler("/static/**").addResourceLocations("/WEB-INF/view/react/build/static/"); - + registry.addResourceHandler("/*.js").addResourceLocations("/WEB-INF/view/react/build/"); registry.addResourceHandler("/*.json").addResourceLocations("/WEB-INF/view/react/build/"); registry.addResourceHandler("/*.ico").addResourceLocations("/WEB-INF/view/react/build/"); diff --git a/spring-security-modules/spring-security-web-react/src/main/java/com/baeldung/spring/RestController.java b/spring-security-modules/spring-security-web-react/src/main/java/com/baeldung/spring/RestController.java new file mode 100644 index 0000000000..4084df9698 --- /dev/null +++ b/spring-security-modules/spring-security-web-react/src/main/java/com/baeldung/spring/RestController.java @@ -0,0 +1,31 @@ +package com.baeldung.spring; +import javax.servlet.http.HttpServletRequest; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.http.ResponseEntity; +import org.springframework.security.web.csrf.CsrfToken; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; + +@Controller +@RequestMapping("/rest") +public class RestController { + + private static final Logger LOGGER = LoggerFactory.getLogger(RestController.class); + + @GetMapping + public ResponseEntity get(HttpServletRequest request) { + CsrfToken token = (CsrfToken) request.getAttribute("_csrf"); + LOGGER.info("{}={}", token.getHeaderName(), token.getToken()); + return ResponseEntity.ok().build(); + } + + @PostMapping + public ResponseEntity post(HttpServletRequest request) { + // Same impl as GET for testing purpose + return this.get(request); + } +} diff --git a/spring-security-modules/spring-security-web-react/src/main/java/com/baeldung/spring/SecSecurityConfig.java b/spring-security-modules/spring-security-web-react/src/main/java/com/baeldung/spring/SecSecurityConfig.java index 7b67028647..d560589cce 100644 --- a/spring-security-modules/spring-security-web-react/src/main/java/com/baeldung/spring/SecSecurityConfig.java +++ b/spring-security-modules/spring-security-web-react/src/main/java/com/baeldung/spring/SecSecurityConfig.java @@ -7,6 +7,7 @@ import org.springframework.security.config.annotation.authentication.builders.Au import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; +import org.springframework.security.web.csrf.CookieCsrfTokenRepository; @Configuration @EnableWebSecurity @@ -21,11 +22,11 @@ public class SecSecurityConfig extends WebSecurityConfigurerAdapter { protected void configure(final AuthenticationManagerBuilder auth) throws Exception { // @formatter:off auth.inMemoryAuthentication() - .withUser("user1").password("user1Pass").roles("USER") + .withUser("user1").password("{noop}user1Pass").roles("USER") .and() - .withUser("user2").password("user2Pass").roles("USER") + .withUser("user2").password("{noop}user2Pass").roles("USER") .and() - .withUser("admin").password("admin0Pass").roles("ADMIN"); + .withUser("admin").password("{noop}admin0Pass").roles("ADMIN"); // @formatter:on } @@ -33,11 +34,11 @@ public class SecSecurityConfig extends WebSecurityConfigurerAdapter { protected void configure(final HttpSecurity http) throws Exception { // @formatter:off http - .csrf().disable() + .csrf().csrfTokenRepository(CookieCsrfTokenRepository.withHttpOnlyFalse()).and() .authorizeRequests() .antMatchers("/admin/**").hasRole("ADMIN") .antMatchers("/anonymous*").anonymous() - .antMatchers(HttpMethod.GET, "/index*", "/static/**", "/*.js", "/*.json", "/*.ico").permitAll() + .antMatchers(HttpMethod.GET, "/index*", "/static/**", "/*.js", "/*.json", "/*.ico", "/rest").permitAll() .anyRequest().authenticated() .and() .formLogin() diff --git a/spring-security-modules/spring-security-web-react/src/main/resources/logback.xml b/spring-security-modules/spring-security-web-react/src/main/resources/logback.xml index 25f3f36d1a..2cc702de59 100644 --- a/spring-security-modules/spring-security-web-react/src/main/resources/logback.xml +++ b/spring-security-modules/spring-security-web-react/src/main/resources/logback.xml @@ -12,7 +12,7 @@ - + diff --git a/spring-security-modules/spring-security-web-react/src/main/webapp/WEB-INF/view/homepage.jsp b/spring-security-modules/spring-security-web-react/src/main/webapp/WEB-INF/view/homepage.jsp index c9d88cbc9b..d64f80a5cb 100644 --- a/spring-security-modules/spring-security-web-react/src/main/webapp/WEB-INF/view/homepage.jsp +++ b/spring-security-modules/spring-security-web-react/src/main/webapp/WEB-INF/view/homepage.jsp @@ -1,11 +1,30 @@ <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> <%@ taglib prefix="security" uri="http://www.springframework.org/security/tags" %> - + + +

This is the body of the sample view

+
+

CSRF Testing

+
+ CSRF Token: + + +
+
+
+   + +
+
+
Request Result:

+
+ +

Roles

This text is only visible to a user

@@ -22,5 +41,26 @@ ">Logout + \ No newline at end of file diff --git a/spring-security-modules/spring-security-web-react/src/main/webapp/WEB-INF/view/react/public/csrf.js b/spring-security-modules/spring-security-web-react/src/main/webapp/WEB-INF/view/react/public/csrf.js new file mode 100644 index 0000000000..657cc31f41 --- /dev/null +++ b/spring-security-modules/spring-security-web-react/src/main/webapp/WEB-INF/view/react/public/csrf.js @@ -0,0 +1,3 @@ +window.getCsrfToken = () => { + return document.cookie.replace(/(?:(?:^|.*;\s*)XSRF-TOKEN\s*\=\s*([^;]*).*$)|^.*$/, '$1'); +} diff --git a/spring-security-modules/spring-security-web-react/src/main/webapp/WEB-INF/view/react/public/index.html b/spring-security-modules/spring-security-web-react/src/main/webapp/WEB-INF/view/react/public/index.html index 0c3f78d7b3..6d4894da42 100644 --- a/spring-security-modules/spring-security-web-react/src/main/webapp/WEB-INF/view/react/public/index.html +++ b/spring-security-modules/spring-security-web-react/src/main/webapp/WEB-INF/view/react/public/index.html @@ -6,6 +6,7 @@ + - junit - junit - ${junit-version} + org.junit.vintage + junit-vintage-engine + ${junit-jupiter.version} test + + javax.annotation + javax.annotation-api + 1.3.2 + @@ -262,7 +267,7 @@ 0.2.1 2.9.10 1.0.0 - 4.13 + 5.8.1 \ No newline at end of file diff --git a/spring-web-modules/spring-boot-jsp/pom.xml b/spring-web-modules/spring-boot-jsp/pom.xml index 30335fcc65..222facd100 100644 --- a/spring-web-modules/spring-boot-jsp/pom.xml +++ b/spring-web-modules/spring-boot-jsp/pom.xml @@ -16,6 +16,13 @@ + + org.junit + junit-bom + ${junit-jupiter.version} + pom + import + org.springframework.boot spring-boot-dependencies @@ -84,8 +91,8 @@ 1.2 - 5.7.1 2.4.4 + 2.22.2 \ No newline at end of file diff --git a/spring-web-modules/spring-mvc-basics-2/pom.xml b/spring-web-modules/spring-mvc-basics-2/pom.xml index 9136676d20..9748c5295a 100644 --- a/spring-web-modules/spring-mvc-basics-2/pom.xml +++ b/spring-web-modules/spring-mvc-basics-2/pom.xml @@ -164,7 +164,7 @@ 5.1.0 20180130 1.6.1 - 2.3.4.RELEASE + 2.5.6 \ No newline at end of file diff --git a/spring-web-modules/spring-rest-simple/pom.xml b/spring-web-modules/spring-rest-simple/pom.xml index e7671e0af0..69d88d6456 100644 --- a/spring-web-modules/spring-rest-simple/pom.xml +++ b/spring-web-modules/spring-rest-simple/pom.xml @@ -120,11 +120,6 @@ ${com.squareup.okhttp3.version} - - junit - junit - test - org.hamcrest hamcrest diff --git a/spring-web-modules/spring-resttemplate/pom.xml b/spring-web-modules/spring-resttemplate/pom.xml index 221efd77ee..3066a82242 100644 --- a/spring-web-modules/spring-resttemplate/pom.xml +++ b/spring-web-modules/spring-resttemplate/pom.xml @@ -108,12 +108,6 @@ ${com.squareup.okhttp3.version} - - - junit - junit - ${junit.version} - org.hamcrest hamcrest @@ -284,7 +278,6 @@ 3.5.11 1.8 1.8 - 4.12 3.7.0 diff --git a/testing-modules/assertion-libraries/pom.xml b/testing-modules/assertion-libraries/pom.xml index 19ebebce05..2c84549d20 100644 --- a/testing-modules/assertion-libraries/pom.xml +++ b/testing-modules/assertion-libraries/pom.xml @@ -11,6 +11,7 @@ com.baeldung testing-modules 1.0.0-SNAPSHOT + ../ @@ -18,6 +19,13 @@ com.google.truth truth ${truth.version} + + + + junit + junit + + com.google.truth.extensions @@ -46,6 +54,13 @@ jgotesting ${jgotesting.version} test + + + + junit + junit + + diff --git a/testing-modules/easy-random/pom.xml b/testing-modules/easy-random/pom.xml index 1ea6fbc387..f338519df3 100644 --- a/testing-modules/easy-random/pom.xml +++ b/testing-modules/easy-random/pom.xml @@ -8,9 +8,9 @@ com.baeldung - parent-modules + testing-modules 1.0.0-SNAPSHOT - ../../ + ../ diff --git a/testing-modules/easymock/pom.xml b/testing-modules/easymock/pom.xml index a8e37da8eb..fd7db5dbb1 100644 --- a/testing-modules/easymock/pom.xml +++ b/testing-modules/easymock/pom.xml @@ -11,6 +11,7 @@ com.baeldung testing-modules 1.0.0-SNAPSHOT + ../ diff --git a/testing-modules/gatling/pom.xml b/testing-modules/gatling/pom.xml index 281c74d6b3..c702b576c5 100644 --- a/testing-modules/gatling/pom.xml +++ b/testing-modules/gatling/pom.xml @@ -10,9 +10,9 @@ com.baeldung - parent-modules + testing-modules 1.0.0-SNAPSHOT - ../../ + ../ diff --git a/testing-modules/groovy-spock/pom.xml b/testing-modules/groovy-spock/pom.xml index 3c1f00abdf..65db332acb 100644 --- a/testing-modules/groovy-spock/pom.xml +++ b/testing-modules/groovy-spock/pom.xml @@ -11,9 +11,9 @@ com.baeldung - parent-modules + testing-modules 1.0.0-SNAPSHOT - ../../ + ../ diff --git a/testing-modules/junit-4/README.md b/testing-modules/junit-4/README.md index cb5def7144..1f7517c5b9 100644 --- a/testing-modules/junit-4/README.md +++ b/testing-modules/junit-4/README.md @@ -7,3 +7,4 @@ - [Introduction to Lambda Behave](https://www.baeldung.com/lambda-behave) - [Conditionally Run or Ignore Tests in JUnit 4](https://www.baeldung.com/junit-conditional-assume) - [JUnit 4 on How to Ignore a Base Test Class](https://www.baeldung.com/junit-ignore-base-test-class) +- [Using Fail Assertion in JUnit](https://www.baeldung.com/junit-fail) diff --git a/testing-modules/junit-4/pom.xml b/testing-modules/junit-4/pom.xml index 0ae6b71f82..f58d1709d3 100644 --- a/testing-modules/junit-4/pom.xml +++ b/testing-modules/junit-4/pom.xml @@ -10,9 +10,9 @@ com.baeldung - parent-modules + testing-modules 1.0.0-SNAPSHOT - ../../ + ../ diff --git a/testing-modules/junit-5-advanced/README.md b/testing-modules/junit-5-advanced/README.md index 5d70e6f058..7790cb6770 100644 --- a/testing-modules/junit-5-advanced/README.md +++ b/testing-modules/junit-5-advanced/README.md @@ -4,3 +4,4 @@ - [JUnit Custom Display Name Generator API](https://www.baeldung.com/junit-custom-display-name-generator) - [@TestInstance Annotation in JUnit 5](https://www.baeldung.com/junit-testinstance-annotation) - [Run JUnit Test Cases From the Command Line](https://www.baeldung.com/junit-run-from-command-line) +- [Parallel Test Execution for JUnit 5](https://www.baeldung.com/junit-5-parallel-tests) diff --git a/testing-modules/junit-5-advanced/pom.xml b/testing-modules/junit-5-advanced/pom.xml index 5fc466bb67..f37a41690b 100644 --- a/testing-modules/junit-5-advanced/pom.xml +++ b/testing-modules/junit-5-advanced/pom.xml @@ -10,34 +10,9 @@ com.baeldung - parent-modules + testing-modules 1.0.0-SNAPSHOT - ../../ + ../ - - - org.junit.jupiter - junit-jupiter - ${junit-jupiter.version} - test - - - org.junit.jupiter - junit-jupiter-engine - ${junit-jupiter.version} - - - org.junit.vintage - junit-vintage-engine - ${junit.vintage.version} - test - - - - - 5.4.2 - 5.4.2 - - \ No newline at end of file diff --git a/testing-modules/junit-5-basics/pom.xml b/testing-modules/junit-5-basics/pom.xml index cf39068ae7..62dc4321a8 100644 --- a/testing-modules/junit-5-basics/pom.xml +++ b/testing-modules/junit-5-basics/pom.xml @@ -10,9 +10,9 @@ com.baeldung - parent-modules + testing-modules 1.0.0-SNAPSHOT - ../../ + ../ @@ -22,33 +22,9 @@ ${junit-platform.version} test - - org.junit.vintage - junit-vintage-engine - ${junit.vintage.version} - test - org.junit.jupiter junit-jupiter-migrationsupport - ${junit.vintage.version} - test - - - org.junit.jupiter - junit-jupiter-engine - ${junit-jupiter.version} - test - - - org.junit.jupiter - junit-jupiter-params - ${junit-jupiter.version} - test - - - org.junit.jupiter - junit-jupiter-api ${junit-jupiter.version} test @@ -97,8 +73,8 @@ + org.apache.maven.surefire maven-surefire-plugin - ${maven-surefire-plugin.version} **/*IntegrationTest.java @@ -116,8 +92,8 @@ + org.apache.maven.surefire maven-surefire-plugin - ${maven-surefire-plugin.version} com.baeldung.categories.UnitTest com.baeldung.categories.IntegrationTest @@ -134,8 +110,8 @@ + org.apache.maven.surefire maven-surefire-plugin - ${maven-surefire-plugin.version} UnitTest IntegrationTest @@ -147,9 +123,6 @@ - 5.4.2 - 1.2.0 - 5.4.2 5.0.6.RELEASE diff --git a/testing-modules/junit-5/pom.xml b/testing-modules/junit-5/pom.xml index 4e1a7740ee..ef6e92faa4 100644 --- a/testing-modules/junit-5/pom.xml +++ b/testing-modules/junit-5/pom.xml @@ -11,51 +11,34 @@ com.baeldung - parent-modules + testing-modules 1.0.0-SNAPSHOT - ../../ + ../ org.junit.platform junit-platform-engine - ${junit.platform.version} - - - org.junit.jupiter - junit-jupiter-engine - ${junit.jupiter.version} - - - org.junit.jupiter - junit-jupiter-api - ${junit.jupiter.version} + ${junit-platform.version} org.junit.platform junit-platform-runner - ${junit.platform.version} + ${junit-platform.version} test org.junit.platform junit-platform-console-standalone - 1.7.0 - test - - - - org.junit.vintage - junit-vintage-engine - ${junit.vintage.version} + ${junit-platform.version} test org.junit.jupiter junit-jupiter-migrationsupport - ${junit.vintage.version} + ${junit-jupiter.version} test @@ -137,13 +120,9 @@ - 5.4.2 2.23.0 - 1.4.2 - 5.4.2 2.8.2 2.0.0 - 2.22.0 5.0.1.RELEASE 3.0.0-M3 diff --git a/testing-modules/junit5-annotations/pom.xml b/testing-modules/junit5-annotations/pom.xml index 127a1bf33f..86e71110c8 100644 --- a/testing-modules/junit5-annotations/pom.xml +++ b/testing-modules/junit5-annotations/pom.xml @@ -10,31 +10,21 @@ com.baeldung - parent-modules + testing-modules 1.0.0-SNAPSHOT - ../../ + ../ org.junit.platform junit-platform-engine - ${junit.platform.version} - - - org.junit.jupiter - junit-jupiter-engine - ${junit.jupiter.version} - - - org.junit.jupiter - junit-jupiter-params - ${junit.jupiter.version} + ${junit-platform.version} org.junit.jupiter junit-jupiter-api - ${junit.jupiter.version} + ${junit-jupiter.version} org.apache.logging.log4j @@ -44,7 +34,7 @@ org.junit.platform junit-platform-runner - ${junit.platform.version} + ${junit-platform.version} test @@ -56,8 +46,6 @@ - 5.7.0 - 1.7.0 2.8.2 3.11.1 diff --git a/testing-modules/junit5-migration/pom.xml b/testing-modules/junit5-migration/pom.xml index 2e864f6434..3e34c1dee5 100644 --- a/testing-modules/junit5-migration/pom.xml +++ b/testing-modules/junit5-migration/pom.xml @@ -10,9 +10,9 @@ com.baeldung - parent-modules + testing-modules 1.0.0-SNAPSHOT - ../../ + ../ @@ -27,16 +27,10 @@ ${junit-platform.version} test - - org.junit.vintage - junit-vintage-engine - ${junit.vintage.version} - test - org.junit.jupiter junit-jupiter-migrationsupport - ${junit.vintage.version} + ${junit-jupiter.version} test @@ -50,11 +44,4 @@ - - 5.2.0 - 1.2.0 - 5.2.0 - 2.21.0 - - \ No newline at end of file diff --git a/testing-modules/mockito-2/pom.xml b/testing-modules/mockito-2/pom.xml index 558ac59d08..cff7598edc 100644 --- a/testing-modules/mockito-2/pom.xml +++ b/testing-modules/mockito-2/pom.xml @@ -10,9 +10,9 @@ com.baeldung - parent-modules + testing-modules 1.0.0-SNAPSHOT - ../../ + ../ diff --git a/testing-modules/mockito-2/src/test/java/com/baeldung/mockito/misusing/MockitoUnecessaryStubUnitTest.java b/testing-modules/mockito-2/src/test/java/com/baeldung/mockito/misusing/MockitoUnecessaryStubUnitTest.java index 828d31f6f9..c9ed8a5969 100644 --- a/testing-modules/mockito-2/src/test/java/com/baeldung/mockito/misusing/MockitoUnecessaryStubUnitTest.java +++ b/testing-modules/mockito-2/src/test/java/com/baeldung/mockito/misusing/MockitoUnecessaryStubUnitTest.java @@ -30,7 +30,9 @@ public class MockitoUnecessaryStubUnitTest { public void givenUnusedStub_whenInvokingGetThenThrowUnnecessaryStubbingException() { rule.expectedFailure(UnnecessaryStubbingException.class); - when(mockList.add("one")).thenReturn(true); + // Commenting this stubbing so that it doesn't affect the builds. + // If you want to reproduce UnnecessaryStubbingException then uncomment below line and execute the test. + // when(mockList.add("one")).thenReturn(true); when(mockList.get(anyInt())).thenReturn("hello"); assertEquals("List should contain hello", "hello", mockList.get(1)); diff --git a/testing-modules/mockito-3/pom.xml b/testing-modules/mockito-3/pom.xml index 5a150ccbf9..5a79d81080 100644 --- a/testing-modules/mockito-3/pom.xml +++ b/testing-modules/mockito-3/pom.xml @@ -10,9 +10,9 @@ com.baeldung - parent-modules + testing-modules 1.0.0-SNAPSHOT - ../../ + ../ diff --git a/testing-modules/mocks/pom.xml b/testing-modules/mocks/pom.xml index 17700a835e..3fabde037c 100644 --- a/testing-modules/mocks/pom.xml +++ b/testing-modules/mocks/pom.xml @@ -8,9 +8,9 @@ com.baeldung - parent-modules + testing-modules 1.0.0-SNAPSHOT - ../../ + ../ diff --git a/testing-modules/mockserver/pom.xml b/testing-modules/mockserver/pom.xml index c039d6a0ab..3495ddb09d 100644 --- a/testing-modules/mockserver/pom.xml +++ b/testing-modules/mockserver/pom.xml @@ -9,9 +9,9 @@ com.baeldung - parent-modules + testing-modules 1.0.0-SNAPSHOT - ../../ + ../ diff --git a/testing-modules/parallel-tests-junit/math-test-functions/pom.xml b/testing-modules/parallel-tests-junit/math-test-functions/pom.xml index 39199834b9..7ead2051e2 100644 --- a/testing-modules/parallel-tests-junit/math-test-functions/pom.xml +++ b/testing-modules/parallel-tests-junit/math-test-functions/pom.xml @@ -13,21 +13,11 @@ 0.0.1-SNAPSHOT - - - junit - junit - ${junit.version} - test - - - org.apache.maven.plugins maven-surefire-plugin - ${maven-surefire-plugin.version} all 10 @@ -45,8 +35,4 @@ - - 2.22.0 - - \ No newline at end of file diff --git a/testing-modules/parallel-tests-junit/string-test-functions/pom.xml b/testing-modules/parallel-tests-junit/string-test-functions/pom.xml index 39847444b5..86b4078eb3 100644 --- a/testing-modules/parallel-tests-junit/string-test-functions/pom.xml +++ b/testing-modules/parallel-tests-junit/string-test-functions/pom.xml @@ -13,21 +13,11 @@ 0.0.1-SNAPSHOT - - - junit - junit - ${junit.version} - test - - - org.apache.maven.plugins maven-surefire-plugin - ${maven-surefire-plugin.version} all true @@ -37,8 +27,4 @@ - - 2.22.0 - - \ No newline at end of file diff --git a/testing-modules/pom.xml b/testing-modules/pom.xml index 28c743b2b3..079c7fa792 100644 --- a/testing-modules/pom.xml +++ b/testing-modules/pom.xml @@ -50,4 +50,20 @@ zerocode + + + + + org.apache.maven.plugins + maven-surefire-plugin + ${maven-surefire-plugin.version} + + + + + + + 2.22.2 + + \ No newline at end of file diff --git a/testing-modules/powermock/pom.xml b/testing-modules/powermock/pom.xml index 7179f3ffbe..fad338bb9b 100644 --- a/testing-modules/powermock/pom.xml +++ b/testing-modules/powermock/pom.xml @@ -6,9 +6,10 @@ powermock - testing-modules com.baeldung + testing-modules 1.0.0-SNAPSHOT + ../ diff --git a/testing-modules/selenium-junit-testng/pom.xml b/testing-modules/selenium-junit-testng/pom.xml index f06d47247c..860397f229 100644 --- a/testing-modules/selenium-junit-testng/pom.xml +++ b/testing-modules/selenium-junit-testng/pom.xml @@ -1,7 +1,7 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 selenium-junit-testng 0.0.1-SNAPSHOT @@ -9,9 +9,9 @@ com.baeldung - parent-modules + testing-modules 1.0.0-SNAPSHOT - ../../ + ../ @@ -31,11 +31,6 @@ testng ${testng.version} - - junit - junit - ${junit.version} - org.hamcrest hamcrest-all diff --git a/testing-modules/spring-testing-2/pom.xml b/testing-modules/spring-testing-2/pom.xml index 419b8d512a..f3e4f098b4 100644 --- a/testing-modules/spring-testing-2/pom.xml +++ b/testing-modules/spring-testing-2/pom.xml @@ -55,7 +55,6 @@ org.apache.maven.plugins maven-surefire-plugin - ${maven-surefire-plugin.version} methods true diff --git a/testing-modules/spring-testing/pom.xml b/testing-modules/spring-testing/pom.xml index bf4c1e7a69..ff5265eab8 100644 --- a/testing-modules/spring-testing/pom.xml +++ b/testing-modules/spring-testing/pom.xml @@ -36,17 +36,6 @@ spring-boot-starter-test test - - org.junit.vintage - junit-vintage-engine - test - - - org.hamcrest - hamcrest-core - - - org.springframework spring-core @@ -71,27 +60,10 @@ org.springframework.data spring-data-jpa - - org.junit.jupiter - junit-jupiter - ${junit.jupiter.version} - test - - - org.junit.jupiter - junit-jupiter-engine - ${junit.jupiter.version} - - - org.junit.jupiter - junit-jupiter-api - ${junit.jupiter.version} - test - org.junit.platform junit-platform-commons - ${junit.commons.version} + ${junit-platform.version} org.awaitility @@ -120,8 +92,6 @@ 2.0.0.0 3.1.6 - 5.7.0 - 1.7.0 5.3.4 4.0.1 2.1.1 diff --git a/testing-modules/test-containers/pom.xml b/testing-modules/test-containers/pom.xml index 4a65611c7a..aa2c85af21 100644 --- a/testing-modules/test-containers/pom.xml +++ b/testing-modules/test-containers/pom.xml @@ -11,28 +11,22 @@ com.baeldung - parent-modules + testing-modules 1.0.0-SNAPSHOT - ../../ + ../ org.junit.platform junit-platform-runner - ${junit.platform.version} + ${junit-platform.version} test org.junit.platform junit-platform-commons - ${junit.platform.version} - test - - - org.junit.vintage - junit-vintage-engine - ${junit.vintage.version} + ${junit-platform.version} test @@ -83,13 +77,10 @@ 1.5.0 - 5.5.0 2.12.0 1.11.4 42.2.6 3.141.59 - 2.22.2 - 1.3.2 \ No newline at end of file diff --git a/testing-modules/testing-assertions/pom.xml b/testing-modules/testing-assertions/pom.xml index 82a507a985..f9cd35c5e5 100644 --- a/testing-modules/testing-assertions/pom.xml +++ b/testing-modules/testing-assertions/pom.xml @@ -18,18 +18,6 @@ logback-classic ${logback.version} - - org.junit.jupiter - junit-jupiter-engine - ${junit-jupiter.version} - test - - - org.junit.jupiter - junit-jupiter-api - ${junit-jupiter.version} - test - org.assertj assertj-core @@ -53,7 +41,6 @@ 3.16.1 4.4 - 5.6.2 \ No newline at end of file diff --git a/testing-modules/testing-libraries-2/pom.xml b/testing-modules/testing-libraries-2/pom.xml index dcbddd60b4..2e8a1b4ed2 100644 --- a/testing-modules/testing-libraries-2/pom.xml +++ b/testing-modules/testing-libraries-2/pom.xml @@ -12,6 +12,17 @@ ../ + + + + junit + junit + ${junit.version} + test + + + + org.projectlombok @@ -49,31 +60,6 @@ ${system-stubs.version} test - - - org.junit.jupiter - junit-jupiter - ${junit.jupiter.version} - test - - - org.junit.jupiter - junit-jupiter-engine - ${junit.jupiter.version} - test - - - org.junit.jupiter - junit-jupiter-params - ${junit.jupiter.version} - test - - - org.junit.jupiter - junit-jupiter-api - ${junit.jupiter.version} - test - @@ -128,7 +114,6 @@ 1.19.0 1.0.0 1.1.0 - 5.6.2 3.16.1 diff --git a/testing-modules/testing-libraries/pom.xml b/testing-modules/testing-libraries/pom.xml index 4bbe56fc18..8c0fca775b 100644 --- a/testing-modules/testing-libraries/pom.xml +++ b/testing-modules/testing-libraries/pom.xml @@ -10,8 +10,20 @@ com.baeldung testing-modules 1.0.0-SNAPSHOT + ../ + + + + junit + junit + ${junit.version} + test + + + + com.insightfullogic diff --git a/testing-modules/testng/pom.xml b/testing-modules/testng/pom.xml index 8b6a46a694..99af6be5b4 100644 --- a/testing-modules/testng/pom.xml +++ b/testing-modules/testng/pom.xml @@ -10,9 +10,9 @@ com.baeldung - parent-modules + testing-modules 1.0.0-SNAPSHOT - ../../ + ../ diff --git a/testing-modules/xmlunit-2/pom.xml b/testing-modules/xmlunit-2/pom.xml index 07153ab042..a35d9c2b87 100644 --- a/testing-modules/xmlunit-2/pom.xml +++ b/testing-modules/xmlunit-2/pom.xml @@ -8,9 +8,9 @@ com.baeldung - parent-modules + testing-modules 1.0.0-SNAPSHOT - ../../ + ../ diff --git a/testing-modules/zerocode/pom.xml b/testing-modules/zerocode/pom.xml index 48030166b5..ea12385a26 100644 --- a/testing-modules/zerocode/pom.xml +++ b/testing-modules/zerocode/pom.xml @@ -7,9 +7,10 @@ 1.0-SNAPSHOT - testing-modules com.baeldung + testing-modules 1.0.0-SNAPSHOT + ../ diff --git a/xml/pom.xml b/xml/pom.xml index b4c78b514d..6bae312452 100644 --- a/xml/pom.xml +++ b/xml/pom.xml @@ -367,7 +367,6 @@ 1.0-2 3.12.2 2.6.3 - 5.5.0 2.3.29 0.9.6