Merge branch 'master' into fix-5227

algorithms-miscellaneous-3/pom.xml

@@ -37,7 +37,7 @@
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
-            <version>${commons.lang3.version}</version>
+            <version>${commons-lang3.version}</version>
         </dependency>
         <dependency>
             <groupId>pl.pragmatists</groupId>
@@ -63,10 +63,8 @@
     </dependencies>
 
     <properties>
-        <commons-collections4.version>4.3</commons-collections4.version>
         <guava.version>28.0-jre</guava.version>
         <retrofit.version>2.6.0</retrofit.version>
-        <commons.lang3.version>3.8.1</commons.lang3.version>
         <JUnitParams.version>1.1.0</JUnitParams.version>
     </properties>
 

apache-poi-2/.gitignore

@@ -0,0 +1,3 @@
+*.docx
+temp.xls
+temp.xlsx

apache-poi-2/README.md

@@ -0,0 +1,8 @@
+## Apache POI
+
+This module contains articles about Apache POI
+
+### Relevant Articles:
+
+- [Adding a Column to an Excel Sheet Using Apache POI](https://www.baeldung.com/java-excel-add-column)
+- More articles: [[<-- prev]](/apache-poi)

apache-poi-2/pom.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         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">
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>apache-poi</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+    <name>apache-poi</name>
+
+    <parent>
+        <groupId>com.baeldung</groupId>
+        <artifactId>parent-modules</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi-ooxml</artifactId>
+            <version>5.0.0</version>
+        </dependency>
+    </dependencies>
+
+</project>

apache-poi-2/src/main/java/com/baeldung/poi/excel/newcolumn/ExcelColumn.java

@@ -0,0 +1,16 @@
+package com.baeldung.poi.excel.newcolumn;
+import org.apache.poi.ss.usermodel.CellType;
+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;
+
+
+public class ExcelColumn {
+
+    public void addColumn(Sheet sheet, CellType cellType) {
+        for (Row currentRow : sheet) {
+            currentRow.createCell(currentRow.getLastCellNum(), cellType);
+        }
+    }
+}

apache-poi-2/src/test/java/com/baeldung/poi/excel/newcolumn/ExcelColumnUnitTest.java

@@ -0,0 +1,40 @@
+package com.baeldung.poi.excel.newcolumn;
+
+import org.apache.poi.ss.usermodel.CellType;
+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;
+
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.nio.file.Paths;
+
+import static org.junit.Assert.assertEquals;
+
+public class ExcelColumnUnitTest {
+    private static final String FILE_NAME = "newColumnTest.xlsx";
+    private String fileLocation;
+
+    @Before
+    public void setup() throws URISyntaxException {
+        fileLocation = Paths.get(ClassLoader.getSystemResource(FILE_NAME).toURI()).toString();
+    }
+
+    @Test
+    public void givenExistingRows_whenAddNewColumn_thenRowColumnNumberIncreased() throws IOException {
+        Workbook workbook = new XSSFWorkbook(fileLocation);
+        Sheet sheet = workbook.getSheetAt(0);
+        Row row = sheet.getRow(0);
+        assertEquals(5, row.getLastCellNum());
+
+        ExcelColumn excelColumn = new ExcelColumn();
+        excelColumn.addColumn(sheet, CellType.STRING);
+        assertEquals(6, row.getLastCellNum());
+
+        workbook.close();
+    }
+
+}

apache-poi/README.md

@@ -15,3 +15,4 @@ This module contains articles about Apache POI
 - [Multiline Text in Excel Cell Using Apache POI](https://www.baeldung.com/apache-poi-write-multiline-text)
 - [Set Background Color of a Cell with Apache POI](https://www.baeldung.com/apache-poi-background-color)
 - [Add Borders to Excel Cells With Apache POI](https://www.baeldung.com/apache-poi-add-borders)
+- More articles: [[next -->]](/apache-poi-2)

apache-poi/src/main/java/com/baeldung/poi/excel/ExcelUtility.java

@@ -0,0 +1,66 @@
+package com.baeldung.poi.excel;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.CellType;
+import org.apache.poi.ss.usermodel.DateUtil;
+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;
+
+public class ExcelUtility {
+	private static final String ENDLINE = System.getProperty("line.separator");
+
+	public static String readExcel(String filePath) throws IOException {
+		File file = new File(filePath);
+		FileInputStream inputStream = null;
+		StringBuilder toReturn = new StringBuilder();
+		try {
+			inputStream = new FileInputStream(file);
+			Workbook baeuldungWorkBook = new XSSFWorkbook(inputStream);
+			for (Sheet sheet : baeuldungWorkBook) {
+				toReturn.append("--------------------------------------------------------------------").append(ENDLINE);
+				toReturn.append("Worksheet :").append(sheet.getSheetName()).append(ENDLINE);
+				toReturn.append("--------------------------------------------------------------------").append(ENDLINE);
+				int firstRow = sheet.getFirstRowNum();
+				int lastRow = sheet.getLastRowNum();
+				for (int index = firstRow + 1; index <= lastRow; index++) {
+					Row row = sheet.getRow(index);
+					toReturn.append("|| ");
+					for (int cellIndex = row.getFirstCellNum(); cellIndex < row.getLastCellNum(); cellIndex++) {
+						Cell cell = row.getCell(cellIndex, Row.MissingCellPolicy.CREATE_NULL_AS_BLANK);
+						printCellValue(cell, toReturn);
+					}
+					toReturn.append(" ||").append(ENDLINE);
+				}
+			}
+			inputStream.close();
+
+		} catch (IOException e) {
+			throw e;
+		}
+		return toReturn.toString();
+	}
+
+	public static void printCellValue(Cell cell, StringBuilder toReturn) {
+		CellType cellType = cell.getCellType().equals(CellType.FORMULA) ? cell.getCachedFormulaResultType()
+				: cell.getCellType();
+		if (cellType.equals(CellType.STRING)) {
+			toReturn.append(cell.getStringCellValue()).append(" | ");
+		}
+		if (cellType.equals(CellType.NUMERIC)) {
+			if (DateUtil.isCellDateFormatted(cell)) {
+				toReturn.append(cell.getDateCellValue()).append(" | ");
+			} else {
+				toReturn.append(cell.getNumericCellValue()).append(" | ");
+			}
+		}
+		if (cellType.equals(CellType.BOOLEAN)) {
+			toReturn.append(cell.getBooleanCellValue()).append(" | ");
+		}
+	}
+}

apache-poi/src/test/java/com/baeldung/poi/excel/ExcelUtilityUnitTest.java

@@ -0,0 +1,54 @@
+package com.baeldung.poi.excel;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.nio.file.Paths;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+
+import org.junit.Before;
+import org.junit.Test;
+
+public class ExcelUtilityUnitTest {
+	private static final String FILE_NAME = "baeldung.xlsx";
+	private String fileLocation;
+	private static final String ENDLINE = System.getProperty("line.separator");
+	private StringBuilder output;
+
+	@Before
+	public void setupUnitTest() throws IOException, URISyntaxException, ParseException {
+		output = new StringBuilder();
+		output.append("--------------------------------------------------------------------").append(ENDLINE);
+		output.append("Worksheet :Sheet1").append(ENDLINE);
+		output.append("--------------------------------------------------------------------").append(ENDLINE);
+		output.append("|| Name1 | Surname1 | 3.55696564113E11 | ").append(new SimpleDateFormat("dd/MM/yyyy").parse("4/11/2021").toString()).append(" | ‡ |  ||")
+				.append(ENDLINE);
+		output.append("|| Name2 | Surname2 | 5.646513512E9 | ").append(new SimpleDateFormat("dd/MM/yyyy").parse("4/12/2021").toString()).append(" | false |  ||")
+				.append(ENDLINE);
+		output.append("|| Name3 | Surname3 | 3.55696564113E11 | ").append(new SimpleDateFormat("dd/MM/yyyy").parse("4/11/2021").toString()).append(" | 7.17039641738E11 |  ||")
+				.append(ENDLINE);
+		output.append("--------------------------------------------------------------------").append(ENDLINE);
+		output.append("Worksheet :Sheet2").append(ENDLINE);
+		output.append("--------------------------------------------------------------------").append(ENDLINE);
+		output.append("|| Name4 | Surname4 | 3.55675623232E11 | 13/04/2021 |  ||").append(ENDLINE);
+
+		fileLocation = Paths.get(ClassLoader.getSystemResource(FILE_NAME).toURI()).toString();
+	}
+
+	@Test
+	public void givenStringPath_whenReadExcel_thenReturnStringValue() throws IOException {
+		assertEquals(output.toString(), ExcelUtility.readExcel(fileLocation));
+
+	}
+
+	@Test
+	public void givenStringPath_whenReadExcel_thenThrowException() {
+		assertThrows(IOException.class, () -> {
+			ExcelUtility.readExcel("baeldung");
+		});
+	}
+
+}

aws-lambda/lambda/pom.xml

@@ -10,9 +10,8 @@
 
     <parent>
         <groupId>com.baeldung</groupId>
-        <artifactId>parent-modules</artifactId>
+        <artifactId>aws-lambda</artifactId>
         <version>1.0.0-SNAPSHOT</version>
-        <relativePath>../../</relativePath>
     </parent>
 
     <dependencies>

aws-lambda/pom.xml

@@ -11,7 +11,6 @@
         <groupId>com.baeldung</groupId>
         <artifactId>parent-modules</artifactId>
         <version>1.0.0-SNAPSHOT</version>
-        <relativePath>../</relativePath>
     </parent>
 
     <modules>

cloud-foundry-uaa/cf-uaa-oauth2-client/pom.xml

@@ -10,9 +10,8 @@
 
     <parent>
         <groupId>com.baeldung</groupId>
-        <artifactId>parent-boot-2</artifactId>
+        <artifactId>cloud-foundry-uaa</artifactId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../../parent-boot-2</relativePath>
     </parent>
 
     <dependencies>

cloud-foundry-uaa/cf-uaa-oauth2-resource-server/pom.xml

@@ -10,9 +10,8 @@
 
     <parent>
         <groupId>com.baeldung</groupId>
-        <artifactId>parent-boot-2</artifactId>
+        <artifactId>cloud-foundry-uaa</artifactId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../../parent-boot-2</relativePath>
     </parent>
 
     <dependencies>

cloud-foundry-uaa/pom.xml

@@ -4,14 +4,14 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <artifactId>cloud-foundry-uaa</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
     <name>cloud-foundry-uaa</name>
     <packaging>pom</packaging>
 
     <parent>
         <groupId>com.baeldung</groupId>
-        <artifactId>parent-modules</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <artifactId>parent-boot-2</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+        <relativePath>../parent-boot-2</relativePath>
     </parent>
 
     <modules>

core-java-modules/core-java-10/pom.xml

@@ -39,7 +39,6 @@
     <properties>
         <maven.compiler.source.version>10</maven.compiler.source.version>
         <maven.compiler.target.version>10</maven.compiler.target.version>
-        <commons-collections4.version>4.1</commons-collections4.version>
     </properties>
 
 </project>

core-java-modules/core-java-11-2/src/test/java/com/baeldung/version/VersionManualTest.java

@@ -5,7 +5,8 @@ import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
-public class VersionUnitTest {
+// manual test as the runtime JDK version can be different depending on where the test is run
+public class VersionManualTest {
 
     @Test
     public void givenJava_whenUsingRuntime_thenGetVersion() {

core-java-modules/core-java-8/pom.xml

@@ -43,9 +43,4 @@
         </resources>
     </build>
 
-    <properties>
-        <!-- util -->
-        <commons-collections4.version>4.1</commons-collections4.version>
-    </properties>
-
 </project>

core-java-modules/core-java-9-jigsaw/src/test/java/com/baeldung/java9/modules/ModuleAPIUnitTest.java

@@ -16,6 +16,7 @@ import java.util.stream.Collectors;
 
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.Ignore;
 
 public class ModuleAPIUnitTest {
 
@@ -110,6 +111,7 @@ public class ModuleAPIUnitTest {
     }
 
     @Test
+    @Ignore // fixing in http://team.baeldung.com/browse/JAVA-8679
     public void givenModules_whenAccessingModuleDescriptorProvides_thenProvidesAreReturned() {
         Set<Provides> javaBaseProvides = javaBaseModule.getDescriptor().provides();
         Set<Provides> javaSqlProvides = javaSqlModule.getDescriptor().provides();

core-java-modules/core-java-9/pom.xml

@@ -76,7 +76,6 @@
         <maven.compiler.source>1.9</maven.compiler.source>
         <maven.compiler.target>1.9</maven.compiler.target>
         <guava.version>25.1-jre</guava.version>
-        <commons-collections4.version>4.1</commons-collections4.version>
     </properties>
 
 </project>

core-java-modules/core-java-collections-2/pom.xml

@@ -44,7 +44,6 @@
 
     <properties>
         <eclipse.collections.version>7.1.0</eclipse.collections.version>
-        <commons-collections4.version>4.1</commons-collections4.version>
         <commons-exec.version>1.3</commons-exec.version>
     </properties>
 

core-java-modules/core-java-collections-4/src/main/java/com/baeldung/collections/mulipletypesinmap/DynamicTypeValue.java

@@ -0,0 +1,5 @@
+package com.baeldung.collections.mulipletypesinmap;
+
+public interface DynamicTypeValue {
+    String valueDescription();
+}

core-java-modules/core-java-collections-4/src/main/java/com/baeldung/collections/mulipletypesinmap/InstantTypeValue.java

@@ -0,0 +1,24 @@
+package com.baeldung.collections.mulipletypesinmap;
+
+import java.time.Instant;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
+
+public class InstantTypeValue implements DynamicTypeValue {
+    private static DateTimeFormatter FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")
+        .withZone(ZoneId.systemDefault());
+    private Instant value;
+
+    public InstantTypeValue(Instant value) {
+        this.value = value;
+    }
+
+    @Override
+    public String valueDescription() {
+        if (value == null) {
+            return "The value is null.";
+        }
+        return String.format("The value is an instant: %s", FORMATTER.format(value));
+    }
+
+}

core-java-modules/core-java-collections-4/src/main/java/com/baeldung/collections/mulipletypesinmap/IntArrayTypeValue.java

@@ -0,0 +1,20 @@
+package com.baeldung.collections.mulipletypesinmap;
+
+import java.util.Arrays;
+
+public class IntArrayTypeValue implements DynamicTypeValue {
+    private int[] value;
+
+    public IntArrayTypeValue(int[] value) {
+        this.value = value;
+    }
+
+    @Override
+    public String valueDescription() {
+        if (value == null) {
+            return "The value is null.";
+        }
+        return String.format("The value is an array of %d integers: %s", value.length, Arrays.toString(value));
+    }
+
+}

core-java-modules/core-java-collections-4/src/main/java/com/baeldung/collections/mulipletypesinmap/IntegerTypeValue.java

@@ -0,0 +1,17 @@
+package com.baeldung.collections.mulipletypesinmap;
+
+public class IntegerTypeValue implements DynamicTypeValue {
+    private Integer value;
+
+    public IntegerTypeValue(Integer value) {
+        this.value = value;
+    }
+
+    @Override
+    public String valueDescription() {
+        if(value == null){
+            return "The value is null.";
+        }
+        return String.format("The value is a %s integer: %d", value > 0 ? "positive" : "negative", value);
+    }
+}

core-java-modules/core-java-collections-4/src/test/java/com/baeldung/multipletypesinmap/MultipleTypesInMapUnitTest.java

@@ -0,0 +1,75 @@
+package com.baeldung.multipletypesinmap;
+
+import com.baeldung.collections.mulipletypesinmap.DynamicTypeValue;
+import com.baeldung.collections.mulipletypesinmap.InstantTypeValue;
+import com.baeldung.collections.mulipletypesinmap.IntArrayTypeValue;
+import com.baeldung.collections.mulipletypesinmap.IntegerTypeValue;
+import org.junit.jupiter.api.Test;
+
+import java.time.Instant;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class MultipleTypesInMapUnitTest {
+    private static final DateTimeFormatter FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")
+        .withZone(ZoneId.systemDefault());
+
+    private static final Integer intValue = 777;
+    private static final int[] intArray = new int[]{2, 3, 5, 7, 11, 13};
+    private static final Instant instant = Instant.now();
+
+    private static final String KEY_INT = "E1 (Integer)";
+    private static final String KEY_INT_ARRAY = "E2 (IntArray)";
+    private static final String KEY_INSTANT = "E3 (Instant)";
+
+    @Test
+    void givenThreeTypes_whenUsingRawMap_thenPrintDescription() {
+        Map<String, Object> rawMap = new HashMap<>();
+        rawMap.put(KEY_INT, intValue);
+        rawMap.put(KEY_INT_ARRAY, intArray);
+        rawMap.put(KEY_INSTANT, instant);
+
+        rawMap.forEach((k, v) -> {
+            if (v instanceof Integer) {
+                Integer theV = (Integer) v;
+                String desc = String.format("The value is a %s integer: %d", theV > 0 ? "positive" : "negative", theV);
+                System.out.println(k + " -> " + desc);
+                assertThat(k).isEqualTo(KEY_INT);
+                assertThat(desc).isEqualTo("The value is a positive integer: 777");
+            } else if (v instanceof int[]) {
+                int[] theV = (int[]) v;
+                String desc = String.format("The value is an array of %d integers: %s", theV.length, Arrays.toString(theV));
+                System.out.println(k + " -> " + desc);
+                assertThat(k).isEqualTo(KEY_INT_ARRAY);
+                assertThat(desc).isEqualTo("The value is an array of 6 integers: [2, 3, 5, 7, 11, 13]");
+            } else if (v instanceof Instant) {
+                Instant theV = (Instant) v;
+                String desc = String.format("The value is an instant: %s", FORMATTER.format(theV));
+                System.out.println(k + " -> " + desc);
+                assertThat(k).isEqualTo(KEY_INSTANT);
+                assertThat(desc).matches("^The value is an instant: \\d{4}-\\d{2}-\\d{2} \\d{2}:\\d{2}:\\d{2}");
+            } else {
+                throw new IllegalStateException("Unknown Type found.");
+            }
+        });
+    }
+
+    @Test
+    void givenThreeTypes_whenUsingAnInterface_thenPrintDescription() {
+        Map<String, DynamicTypeValue> theMap = new HashMap<>();
+        theMap.put(KEY_INT, new IntegerTypeValue(intValue));
+        theMap.put(KEY_INT_ARRAY, new IntArrayTypeValue(intArray));
+        theMap.put(KEY_INSTANT, new InstantTypeValue(instant));
+
+        theMap.forEach((k, v) -> System.out.println(k + " -> " + v.valueDescription()));
+
+        assertThat(theMap.get(KEY_INT).valueDescription()).isEqualTo("The value is a positive integer: 777");
+        assertThat(theMap.get(KEY_INT_ARRAY).valueDescription()).isEqualTo("The value is an array of 6 integers: [2, 3, 5, 7, 11, 13]");
+        assertThat(theMap.get(KEY_INSTANT).valueDescription()).matches("^The value is an instant: \\d{4}-\\d{2}-\\d{2} \\d{2}:\\d{2}:\\d{2}");
+    }
+}

core-java-modules/core-java-collections-array-list/pom.xml

@@ -22,8 +22,4 @@
         </dependency>
     </dependencies>
 
-    <properties>
-        <commons-collections4.version>4.1</commons-collections4.version>
-    </properties>
-
 </project>

core-java-modules/core-java-collections-list-2/pom.xml

@@ -28,8 +28,4 @@
         </dependency>
     </dependencies>
 
-    <properties>
-        <commons-collections4.version>4.1</commons-collections4.version>
-    </properties>
-
 </project>

core-java-modules/core-java-collections-list-3/pom.xml

@@ -54,7 +54,6 @@
     </dependencies>
 
     <properties>
-        <commons-collections4.version>4.1</commons-collections4.version>
         <trove4j.version>3.0.2</trove4j.version>
         <fastutil.version>8.1.0</fastutil.version>
         <colt.version>1.2.0</colt.version>