From 9e74f7cd22fdd88826123e2b3f88010233f8c09d Mon Sep 17 00:00:00 2001
From: Rahul Srivastava <rahusr@gmail.com>
Date: Wed, 10 Oct 2018 02:58:35 +0530
Subject: [PATCH 1/8] Hexagonal Architecture in Java

---
 .../baeldung/hexagonal/architecture/Car.java  | 35 ++++++++++++++
 .../hexagonal/architecture/FordAdapter.java   | 48 +++++++++++++++++++
 .../hexagonal/architecture/HondaAdapter.java  | 48 +++++++++++++++++++
 .../architecture/ManufacturingPort.java       | 14 ++++++
 4 files changed, 145 insertions(+)
 create mode 100644 spring-5-reactive/src/main/java/com/baeldung/hexagonal/architecture/Car.java
 create mode 100644 spring-5-reactive/src/main/java/com/baeldung/hexagonal/architecture/FordAdapter.java
 create mode 100644 spring-5-reactive/src/main/java/com/baeldung/hexagonal/architecture/HondaAdapter.java
 create mode 100644 spring-5-reactive/src/main/java/com/baeldung/hexagonal/architecture/ManufacturingPort.java

diff --git a/spring-5-reactive/src/main/java/com/baeldung/hexagonal/architecture/Car.java b/spring-5-reactive/src/main/java/com/baeldung/hexagonal/architecture/Car.java
new file mode 100644
index 0000000000..79e5ddd061
--- /dev/null
+++ b/spring-5-reactive/src/main/java/com/baeldung/hexagonal/architecture/Car.java
@@ -0,0 +1,35 @@
+package com.baeldung.hexagonal.architecture;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+@AllArgsConstructor
+@Data
+public class Car {
+	String manufacturerName;
+	String fuleType;
+	String modelNo;
+	String yearOfManufacture;
+	String vehicleType;
+	int noOfGears;
+	
+	public void startCar() {
+		//Start the car
+	}
+	
+	public void stopCar() {
+		//Stop the car
+	}
+	
+	public void changeGear(int gearNo){
+		//Change gear
+	}
+	
+	public void openBoot() {
+		//Open boot of the car
+	}
+	
+	public void enableChildLock() {
+		//Enable child lock in the car
+	}
+
+}
diff --git a/spring-5-reactive/src/main/java/com/baeldung/hexagonal/architecture/FordAdapter.java b/spring-5-reactive/src/main/java/com/baeldung/hexagonal/architecture/FordAdapter.java
new file mode 100644
index 0000000000..75e83e5dce
--- /dev/null
+++ b/spring-5-reactive/src/main/java/com/baeldung/hexagonal/architecture/FordAdapter.java
@@ -0,0 +1,48 @@
+package com.baeldung.hexagonal.architecture;
+
+import java.util.List;
+import java.util.Map;
+
+public class FordAdapter implements ManufacturingPort {
+
+	@Override
+	public void manufacturingMethodology(Car car) {
+		// Process for manufacturing ford car
+		
+	}
+
+	@Override
+	public void manufacturingLocation(String location) {
+		// Location at which ford manufacturing will take place
+		
+	}
+
+	@Override
+	public void logoForTheCar(Car car) {
+		// Put ford logo on the car
+		
+	}
+
+	@Override
+	public void timeToMarketForTheCar(Car car) {
+		// Find time to market for a particular ford car model
+		
+	}
+
+	@Override
+	public List<Map<Car, Integer>> totalManufacturingVolume() {
+		// Return car production volume of all ford manufacturing units
+		return null;
+	}
+
+	@Override
+	public List<String> listOfAllFactories() {
+		// Return list of all ford factories
+		return null;
+	}
+	
+	public void fordEngineFuelTest(Car car) {
+		//Do engine test for ford
+	}
+
+}
diff --git a/spring-5-reactive/src/main/java/com/baeldung/hexagonal/architecture/HondaAdapter.java b/spring-5-reactive/src/main/java/com/baeldung/hexagonal/architecture/HondaAdapter.java
new file mode 100644
index 0000000000..7b6bac1aa6
--- /dev/null
+++ b/spring-5-reactive/src/main/java/com/baeldung/hexagonal/architecture/HondaAdapter.java
@@ -0,0 +1,48 @@
+package com.baeldung.hexagonal.architecture;
+
+import java.util.List;
+import java.util.Map;
+
+public class HondaAdapter implements ManufacturingPort {
+
+	@Override
+	public void manufacturingMethodology(Car car) {
+		// Process for manufacturing honda car
+		
+	}
+
+	@Override
+	public void manufacturingLocation(String location) {
+		// Location at which honda manufacturing will take place
+		
+	}
+
+	@Override
+	public void logoForTheCar(Car car) {
+		// Put honda logo on the car
+		
+	}
+
+	@Override
+	public void timeToMarketForTheCar(Car car) {
+		// Find time to market for a particular honda car model
+		
+	}
+
+	@Override
+	public List<Map<Car, Integer>> totalManufacturingVolume() {
+		// Return car production volume of all honda manufacturing units
+		return null;
+	}
+
+	@Override
+	public List<String> listOfAllFactories() {
+		// Return list of all honda factories
+		return null;
+	}
+	
+	public void carCrashAndSafetyTest(Car car) {
+		//Do car crash test got honda car
+	}
+
+}
\ No newline at end of file
diff --git a/spring-5-reactive/src/main/java/com/baeldung/hexagonal/architecture/ManufacturingPort.java b/spring-5-reactive/src/main/java/com/baeldung/hexagonal/architecture/ManufacturingPort.java
new file mode 100644
index 0000000000..666e69ac05
--- /dev/null
+++ b/spring-5-reactive/src/main/java/com/baeldung/hexagonal/architecture/ManufacturingPort.java
@@ -0,0 +1,14 @@
+package com.baeldung.hexagonal.architecture;
+
+import java.util.List;
+import java.util.Map;
+
+public interface ManufacturingPort {
+
+	public void manufacturingMethodology(Car car);
+	public void manufacturingLocation(String location);
+	public void logoForTheCar(Car car);
+	public void timeToMarketForTheCar(Car car);
+	public List<Map<Car,Integer>> totalManufacturingVolume();
+	public List<String> listOfAllFactories();
+}

From 0d91f704c289cd8d5cb8b37aaddcff105eb4d142 Mon Sep 17 00:00:00 2001
From: Rahul Srivastava <rahusr@gmail.com>
Date: Tue, 16 Oct 2018 01:57:52 +0530
Subject: [PATCH 2/8] Giving proper indentation

---
 .../main/java/com/baeldung/hexagonal/architecture/Car.java | 2 +-
 .../com/baeldung/hexagonal/architecture/FordAdapter.java   | 5 -----
 .../com/baeldung/hexagonal/architecture/HondaAdapter.java  | 7 +------
 3 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/spring-5-reactive/src/main/java/com/baeldung/hexagonal/architecture/Car.java b/spring-5-reactive/src/main/java/com/baeldung/hexagonal/architecture/Car.java
index 79e5ddd061..ebc5f78193 100644
--- a/spring-5-reactive/src/main/java/com/baeldung/hexagonal/architecture/Car.java
+++ b/spring-5-reactive/src/main/java/com/baeldung/hexagonal/architecture/Car.java
@@ -5,6 +5,7 @@ import lombok.Data;
 @AllArgsConstructor
 @Data
 public class Car {
+	
 	String manufacturerName;
 	String fuleType;
 	String modelNo;
@@ -31,5 +32,4 @@ public class Car {
 	public void enableChildLock() {
 		//Enable child lock in the car
 	}
-
 }
diff --git a/spring-5-reactive/src/main/java/com/baeldung/hexagonal/architecture/FordAdapter.java b/spring-5-reactive/src/main/java/com/baeldung/hexagonal/architecture/FordAdapter.java
index 75e83e5dce..7f4248c17e 100644
--- a/spring-5-reactive/src/main/java/com/baeldung/hexagonal/architecture/FordAdapter.java
+++ b/spring-5-reactive/src/main/java/com/baeldung/hexagonal/architecture/FordAdapter.java
@@ -8,25 +8,21 @@ public class FordAdapter implements ManufacturingPort {
 	@Override
 	public void manufacturingMethodology(Car car) {
 		// Process for manufacturing ford car
-		
 	}
 
 	@Override
 	public void manufacturingLocation(String location) {
 		// Location at which ford manufacturing will take place
-		
 	}
 
 	@Override
 	public void logoForTheCar(Car car) {
 		// Put ford logo on the car
-		
 	}
 
 	@Override
 	public void timeToMarketForTheCar(Car car) {
 		// Find time to market for a particular ford car model
-		
 	}
 
 	@Override
@@ -44,5 +40,4 @@ public class FordAdapter implements ManufacturingPort {
 	public void fordEngineFuelTest(Car car) {
 		//Do engine test for ford
 	}
-
 }
diff --git a/spring-5-reactive/src/main/java/com/baeldung/hexagonal/architecture/HondaAdapter.java b/spring-5-reactive/src/main/java/com/baeldung/hexagonal/architecture/HondaAdapter.java
index 7b6bac1aa6..d6773d9b6a 100644
--- a/spring-5-reactive/src/main/java/com/baeldung/hexagonal/architecture/HondaAdapter.java
+++ b/spring-5-reactive/src/main/java/com/baeldung/hexagonal/architecture/HondaAdapter.java
@@ -7,26 +7,22 @@ public class HondaAdapter implements ManufacturingPort {
 
 	@Override
 	public void manufacturingMethodology(Car car) {
-		// Process for manufacturing honda car
-		
+		// Process for manufacturing honda car	
 	}
 
 	@Override
 	public void manufacturingLocation(String location) {
 		// Location at which honda manufacturing will take place
-		
 	}
 
 	@Override
 	public void logoForTheCar(Car car) {
 		// Put honda logo on the car
-		
 	}
 
 	@Override
 	public void timeToMarketForTheCar(Car car) {
 		// Find time to market for a particular honda car model
-		
 	}
 
 	@Override
@@ -44,5 +40,4 @@ public class HondaAdapter implements ManufacturingPort {
 	public void carCrashAndSafetyTest(Car car) {
 		//Do car crash test got honda car
 	}
-
 }
\ No newline at end of file

From 754480d447173422a4dd3d0568987648ca0e72f0 Mon Sep 17 00:00:00 2001
From: Rahul Srivastava <rahusr@gmail.com>
Date: Mon, 5 Nov 2018 13:17:39 +0530
Subject: [PATCH 3/8] Revert "Giving proper indentation"

This reverts commit 0d91f704c289cd8d5cb8b37aaddcff105eb4d142.
---
 .../main/java/com/baeldung/hexagonal/architecture/Car.java | 2 +-
 .../com/baeldung/hexagonal/architecture/FordAdapter.java   | 5 +++++
 .../com/baeldung/hexagonal/architecture/HondaAdapter.java  | 7 ++++++-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/spring-5-reactive/src/main/java/com/baeldung/hexagonal/architecture/Car.java b/spring-5-reactive/src/main/java/com/baeldung/hexagonal/architecture/Car.java
index ebc5f78193..79e5ddd061 100644
--- a/spring-5-reactive/src/main/java/com/baeldung/hexagonal/architecture/Car.java
+++ b/spring-5-reactive/src/main/java/com/baeldung/hexagonal/architecture/Car.java
@@ -5,7 +5,6 @@ import lombok.Data;
 @AllArgsConstructor
 @Data
 public class Car {
-	
 	String manufacturerName;
 	String fuleType;
 	String modelNo;
@@ -32,4 +31,5 @@ public class Car {
 	public void enableChildLock() {
 		//Enable child lock in the car
 	}
+
 }
diff --git a/spring-5-reactive/src/main/java/com/baeldung/hexagonal/architecture/FordAdapter.java b/spring-5-reactive/src/main/java/com/baeldung/hexagonal/architecture/FordAdapter.java
index 7f4248c17e..75e83e5dce 100644
--- a/spring-5-reactive/src/main/java/com/baeldung/hexagonal/architecture/FordAdapter.java
+++ b/spring-5-reactive/src/main/java/com/baeldung/hexagonal/architecture/FordAdapter.java
@@ -8,21 +8,25 @@ public class FordAdapter implements ManufacturingPort {
 	@Override
 	public void manufacturingMethodology(Car car) {
 		// Process for manufacturing ford car
+		
 	}
 
 	@Override
 	public void manufacturingLocation(String location) {
 		// Location at which ford manufacturing will take place
+		
 	}
 
 	@Override
 	public void logoForTheCar(Car car) {
 		// Put ford logo on the car
+		
 	}
 
 	@Override
 	public void timeToMarketForTheCar(Car car) {
 		// Find time to market for a particular ford car model
+		
 	}
 
 	@Override
@@ -40,4 +44,5 @@ public class FordAdapter implements ManufacturingPort {
 	public void fordEngineFuelTest(Car car) {
 		//Do engine test for ford
 	}
+
 }
diff --git a/spring-5-reactive/src/main/java/com/baeldung/hexagonal/architecture/HondaAdapter.java b/spring-5-reactive/src/main/java/com/baeldung/hexagonal/architecture/HondaAdapter.java
index d6773d9b6a..7b6bac1aa6 100644
--- a/spring-5-reactive/src/main/java/com/baeldung/hexagonal/architecture/HondaAdapter.java
+++ b/spring-5-reactive/src/main/java/com/baeldung/hexagonal/architecture/HondaAdapter.java
@@ -7,22 +7,26 @@ public class HondaAdapter implements ManufacturingPort {
 
 	@Override
 	public void manufacturingMethodology(Car car) {
-		// Process for manufacturing honda car	
+		// Process for manufacturing honda car
+		
 	}
 
 	@Override
 	public void manufacturingLocation(String location) {
 		// Location at which honda manufacturing will take place
+		
 	}
 
 	@Override
 	public void logoForTheCar(Car car) {
 		// Put honda logo on the car
+		
 	}
 
 	@Override
 	public void timeToMarketForTheCar(Car car) {
 		// Find time to market for a particular honda car model
+		
 	}
 
 	@Override
@@ -40,4 +44,5 @@ public class HondaAdapter implements ManufacturingPort {
 	public void carCrashAndSafetyTest(Car car) {
 		//Do car crash test got honda car
 	}
+
 }
\ No newline at end of file

From 3c4595757cb12526678bf3c4928e977ca9ade043 Mon Sep 17 00:00:00 2001
From: Rahul Srivastava <rahusr@gmail.com>
Date: Mon, 5 Nov 2018 13:18:13 +0530
Subject: [PATCH 4/8] Revert "Hexagonal Architecture in Java"

This reverts commit 9e74f7cd22fdd88826123e2b3f88010233f8c09d.
---
 .../baeldung/hexagonal/architecture/Car.java  | 35 --------------
 .../hexagonal/architecture/FordAdapter.java   | 48 -------------------
 .../hexagonal/architecture/HondaAdapter.java  | 48 -------------------
 .../architecture/ManufacturingPort.java       | 14 ------
 4 files changed, 145 deletions(-)
 delete mode 100644 spring-5-reactive/src/main/java/com/baeldung/hexagonal/architecture/Car.java
 delete mode 100644 spring-5-reactive/src/main/java/com/baeldung/hexagonal/architecture/FordAdapter.java
 delete mode 100644 spring-5-reactive/src/main/java/com/baeldung/hexagonal/architecture/HondaAdapter.java
 delete mode 100644 spring-5-reactive/src/main/java/com/baeldung/hexagonal/architecture/ManufacturingPort.java

diff --git a/spring-5-reactive/src/main/java/com/baeldung/hexagonal/architecture/Car.java b/spring-5-reactive/src/main/java/com/baeldung/hexagonal/architecture/Car.java
deleted file mode 100644
index 79e5ddd061..0000000000
--- a/spring-5-reactive/src/main/java/com/baeldung/hexagonal/architecture/Car.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.baeldung.hexagonal.architecture;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-
-@AllArgsConstructor
-@Data
-public class Car {
-	String manufacturerName;
-	String fuleType;
-	String modelNo;
-	String yearOfManufacture;
-	String vehicleType;
-	int noOfGears;
-	
-	public void startCar() {
-		//Start the car
-	}
-	
-	public void stopCar() {
-		//Stop the car
-	}
-	
-	public void changeGear(int gearNo){
-		//Change gear
-	}
-	
-	public void openBoot() {
-		//Open boot of the car
-	}
-	
-	public void enableChildLock() {
-		//Enable child lock in the car
-	}
-
-}
diff --git a/spring-5-reactive/src/main/java/com/baeldung/hexagonal/architecture/FordAdapter.java b/spring-5-reactive/src/main/java/com/baeldung/hexagonal/architecture/FordAdapter.java
deleted file mode 100644
index 75e83e5dce..0000000000
--- a/spring-5-reactive/src/main/java/com/baeldung/hexagonal/architecture/FordAdapter.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.baeldung.hexagonal.architecture;
-
-import java.util.List;
-import java.util.Map;
-
-public class FordAdapter implements ManufacturingPort {
-
-	@Override
-	public void manufacturingMethodology(Car car) {
-		// Process for manufacturing ford car
-		
-	}
-
-	@Override
-	public void manufacturingLocation(String location) {
-		// Location at which ford manufacturing will take place
-		
-	}
-
-	@Override
-	public void logoForTheCar(Car car) {
-		// Put ford logo on the car
-		
-	}
-
-	@Override
-	public void timeToMarketForTheCar(Car car) {
-		// Find time to market for a particular ford car model
-		
-	}
-
-	@Override
-	public List<Map<Car, Integer>> totalManufacturingVolume() {
-		// Return car production volume of all ford manufacturing units
-		return null;
-	}
-
-	@Override
-	public List<String> listOfAllFactories() {
-		// Return list of all ford factories
-		return null;
-	}
-	
-	public void fordEngineFuelTest(Car car) {
-		//Do engine test for ford
-	}
-
-}
diff --git a/spring-5-reactive/src/main/java/com/baeldung/hexagonal/architecture/HondaAdapter.java b/spring-5-reactive/src/main/java/com/baeldung/hexagonal/architecture/HondaAdapter.java
deleted file mode 100644
index 7b6bac1aa6..0000000000
--- a/spring-5-reactive/src/main/java/com/baeldung/hexagonal/architecture/HondaAdapter.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.baeldung.hexagonal.architecture;
-
-import java.util.List;
-import java.util.Map;
-
-public class HondaAdapter implements ManufacturingPort {
-
-	@Override
-	public void manufacturingMethodology(Car car) {
-		// Process for manufacturing honda car
-		
-	}
-
-	@Override
-	public void manufacturingLocation(String location) {
-		// Location at which honda manufacturing will take place
-		
-	}
-
-	@Override
-	public void logoForTheCar(Car car) {
-		// Put honda logo on the car
-		
-	}
-
-	@Override
-	public void timeToMarketForTheCar(Car car) {
-		// Find time to market for a particular honda car model
-		
-	}
-
-	@Override
-	public List<Map<Car, Integer>> totalManufacturingVolume() {
-		// Return car production volume of all honda manufacturing units
-		return null;
-	}
-
-	@Override
-	public List<String> listOfAllFactories() {
-		// Return list of all honda factories
-		return null;
-	}
-	
-	public void carCrashAndSafetyTest(Car car) {
-		//Do car crash test got honda car
-	}
-
-}
\ No newline at end of file
diff --git a/spring-5-reactive/src/main/java/com/baeldung/hexagonal/architecture/ManufacturingPort.java b/spring-5-reactive/src/main/java/com/baeldung/hexagonal/architecture/ManufacturingPort.java
deleted file mode 100644
index 666e69ac05..0000000000
--- a/spring-5-reactive/src/main/java/com/baeldung/hexagonal/architecture/ManufacturingPort.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.baeldung.hexagonal.architecture;
-
-import java.util.List;
-import java.util.Map;
-
-public interface ManufacturingPort {
-
-	public void manufacturingMethodology(Car car);
-	public void manufacturingLocation(String location);
-	public void logoForTheCar(Car car);
-	public void timeToMarketForTheCar(Car car);
-	public List<Map<Car,Integer>> totalManufacturingVolume();
-	public List<String> listOfAllFactories();
-}

From b9b4cec7ae774e95620856d5675b05b07a18a79e Mon Sep 17 00:00:00 2001
From: Rahul Srivastava <rahusr@gmail.com>
Date: Mon, 5 Nov 2018 13:29:42 +0530
Subject: [PATCH 5/8] Adding new line to a string in Java

---
 .../string/AddingNewLineToString.java         | 55 +++++++++++++++++++
 .../main/java/com/baeldung/string/page.html   | 12 ++++
 2 files changed, 67 insertions(+)
 create mode 100644 core-java/src/main/java/com/baeldung/string/AddingNewLineToString.java
 create mode 100644 core-java/src/main/java/com/baeldung/string/page.html

diff --git a/core-java/src/main/java/com/baeldung/string/AddingNewLineToString.java b/core-java/src/main/java/com/baeldung/string/AddingNewLineToString.java
new file mode 100644
index 0000000000..e828af4cb7
--- /dev/null
+++ b/core-java/src/main/java/com/baeldung/string/AddingNewLineToString.java
@@ -0,0 +1,55 @@
+package com.baeldung.string;
+
+public class AddingNewLineToString {
+	
+	public static void main(String[] args) {
+		String line1 = "Humpty Dumpty sat on a wall.";
+		String line2 = "Humpty Dumpty had a great fall.";
+		String para = "";
+		
+		//1. Using "\n"
+		System.out.println("1. Using \\n");
+		para = line1+"\n"+line2;
+		System.out.println(para);
+		
+		//2. Using "\r\n"
+		System.out.println("2. Using \\r\\n");
+		para = line1+"\r\n"+line2;
+		System.out.println(para);
+		
+		//3. Using "\r"
+		System.out.println("3. Using \\r");
+		para = line1+"\r"+line2;
+		System.out.println(para);
+		
+		//4. Using "\n\r" Note that this is not same as "\r\n"
+		//   Using "\n\r" is equivalent to adding two lines
+		System.out.println("4. Using \\n\\r");
+		para = line1+"\n\r"+line2;
+		System.out.println(para);
+		
+		//5. Using System.lineSeparator()
+		System.out.println("5. Using System.lineSeparator()");
+		para = line1+System.lineSeparator()+line2;
+		System.out.println(para);
+		
+		//6. Using System.getProperty("line.separator")
+		System.out.println("6. Using System.getProperty(\"line.separator\")");
+		para = line1+System.getProperty("line.separator")+line2;
+		System.out.println(para);
+		
+		//Line break for HTML using <br>
+		System.out.println("Line break for HTML using <br>");
+		para = line1+"<br>"+line2;
+		
+		//Line break for HTML when string is in <textarea> tag
+		para = line1+"&#10;"+line2;
+		para = line1+"&#13;"+line2;
+		
+		//Line break for HTML when string is in <pre> tag
+		para = line1+"&#10;"+line2;
+		para = line1+"&#10;&#13;"+line2;
+		para = line1+"<br>"+line2;			
+	}
+
+}
diff --git a/core-java/src/main/java/com/baeldung/string/page.html b/core-java/src/main/java/com/baeldung/string/page.html
new file mode 100644
index 0000000000..a4ad90954b
--- /dev/null
+++ b/core-java/src/main/java/com/baeldung/string/page.html
@@ -0,0 +1,12 @@
+<html>
+<body>
+Humpty Dumpty sat on a wall.<br>Humpty Dumpty had a great fall.
+<br>
+<textarea>Hello&#10;Baeldung</textarea>
+<textarea>Hello&#13;Baeldung</textarea>
+<pre>Humpty Dumpty sat on a wall.&#10;&#13;Humpty Dumpty had a great fall</pre>
+<pre>Humpty Dumpty sat on a wall.&#13;Humpty Dumpty had a great fall</pre>
+<pre>Humpty Dumpty sat on a wall.&#10;Humpty Dumpty had a great fall</pre>
+<p>Humpty Dumpty sat on a wall.<br>Humpty Dumpty had a great fall</p>
+</body>
+</html>

From 6dd09ae35d94275b2515e419c79e10c71d87ad6b Mon Sep 17 00:00:00 2001
From: Rahul Srivastava <rahusr@gmail.com>
Date: Thu, 8 Nov 2018 15:39:06 +0530
Subject: [PATCH 6/8] New line in Java for HTML and Changing HTML file

---
 .../string/AddingNewLineToString.java         | 48 ++++++++++++-------
 .../main/java/com/baeldung/string/page.html   | 29 +++++++++--
 2 files changed, 55 insertions(+), 22 deletions(-)

diff --git a/core-java/src/main/java/com/baeldung/string/AddingNewLineToString.java b/core-java/src/main/java/com/baeldung/string/AddingNewLineToString.java
index e828af4cb7..0b3fd2ca92 100644
--- a/core-java/src/main/java/com/baeldung/string/AddingNewLineToString.java
+++ b/core-java/src/main/java/com/baeldung/string/AddingNewLineToString.java
@@ -7,49 +7,63 @@ public class AddingNewLineToString {
 		String line2 = "Humpty Dumpty had a great fall.";
 		String para = "";
 		
+		System.out.println("***New Line in a String in Java***");
 		//1. Using "\n"
 		System.out.println("1. Using \\n");
-		para = line1+"\n"+line2;
+		para = line1 + "\n" + line2;
 		System.out.println(para);
 		
 		//2. Using "\r\n"
 		System.out.println("2. Using \\r\\n");
-		para = line1+"\r\n"+line2;
+		para = line1 + "\r\n" + line2;
 		System.out.println(para);
 		
 		//3. Using "\r"
 		System.out.println("3. Using \\r");
-		para = line1+"\r"+line2;
+		para = line1 + "\r" + line2;
 		System.out.println(para);
 		
 		//4. Using "\n\r" Note that this is not same as "\r\n"
 		//   Using "\n\r" is equivalent to adding two lines
 		System.out.println("4. Using \\n\\r");
-		para = line1+"\n\r"+line2;
+		para = line1 + "\n\r" + line2;
 		System.out.println(para);
 		
 		//5. Using System.lineSeparator()
 		System.out.println("5. Using System.lineSeparator()");
-		para = line1+System.lineSeparator()+line2;
+		para = line1 + System.lineSeparator() + line2;
 		System.out.println(para);
 		
 		//6. Using System.getProperty("line.separator")
 		System.out.println("6. Using System.getProperty(\"line.separator\")");
-		para = line1+System.getProperty("line.separator")+line2;
+		para = line1 + System.getProperty("line.separator") + line2;
 		System.out.println(para);
 		
-		//Line break for HTML using <br>
-		System.out.println("Line break for HTML using <br>");
-		para = line1+"<br>"+line2;
+		System.out.println("***HTML to rendered in a browser***");
+		//1. Line break for HTML using <br>
+		System.out.println("1. Line break for HTML using <br>");
+		para = line1 + "<br>" + line2;
+		System.out.println(para);
 		
-		//Line break for HTML when string is in <textarea> tag
-		para = line1+"&#10;"+line2;
-		para = line1+"&#13;"+line2;
+		//2. Line break for HTML using “&#10;”
+		System.out.println("2. Line break for HTML using &#10;");
+		para = line1 + "&#10;" + line2;
+		System.out.println(para);
 		
-		//Line break for HTML when string is in <pre> tag
-		para = line1+"&#10;"+line2;
-		para = line1+"&#10;&#13;"+line2;
-		para = line1+"<br>"+line2;			
+		//3. Line break for HTML using “&#13;”
+		System.out.println("3. Line break for HTML using &#13;");
+		para = line1 + "&#13;" + line2;
+		System.out.println(para);
+		
+		//4. Line break for HTML using “&#10&#13;;”
+		System.out.println("4. Line break for HTML using &#10;&#13;");
+		para = line1 + "&#10;&#13;" + line2;
+		System.out.println(para);
+		
+		//5. Line break for HTML using \n”
+		System.out.println("5. Line break for HTML using \\n");
+		para = line1 + "\n" + line2;
+		System.out.println(para);
 	}
 
-}
+}
\ No newline at end of file
diff --git a/core-java/src/main/java/com/baeldung/string/page.html b/core-java/src/main/java/com/baeldung/string/page.html
index a4ad90954b..fc39ee0057 100644
--- a/core-java/src/main/java/com/baeldung/string/page.html
+++ b/core-java/src/main/java/com/baeldung/string/page.html
@@ -1,12 +1,31 @@
 <html>
 <body>
-Humpty Dumpty sat on a wall.<br>Humpty Dumpty had a great fall.
+Humpty Dumpty sat on a wall.<br>Humpty Dumpty had a great fall.<br>
+Humpty Dumpty sat on a wall.&#10;Humpty Dumpty had a great fall.<br>
+Humpty Dumpty sat on a wall.&#13;Humpty Dumpty had a great fall.<br>
+Humpty Dumpty sat on a wall.&#10;&#13;Humpty Dumpty had a great fall.<br>
+Humpty Dumpty sat on a wall.
+Humpty Dumpty had a great fall.
 <br>
+<textarea>Hello<br>Baeldung</textarea>
 <textarea>Hello&#10;Baeldung</textarea>
 <textarea>Hello&#13;Baeldung</textarea>
-<pre>Humpty Dumpty sat on a wall.&#10;&#13;Humpty Dumpty had a great fall</pre>
-<pre>Humpty Dumpty sat on a wall.&#13;Humpty Dumpty had a great fall</pre>
-<pre>Humpty Dumpty sat on a wall.&#10;Humpty Dumpty had a great fall</pre>
+<textarea>Hello&#10;&#13;Baeldung</textarea>
+<textarea>Hello.
+Baeldung</textarea>
+<br>
+<pre>Humpty Dumpty sat on a wall.<br>Humpty Dumpty had a great fall.</pre>
+<pre>Humpty Dumpty sat on a wall.&#10;Humpty Dumpty had a great fall.</pre>
+<pre>Humpty Dumpty sat on a wall.&#13;Humpty Dumpty had a great fall.</pre>
+<pre>Humpty Dumpty sat on a wall.&#10;&#13;Humpty Dumpty had a great fall.</pre>
+<pre>Humpty Dumpty sat on a wall.
+Humpty Dumpty had a great fall</pre>
+<br>
 <p>Humpty Dumpty sat on a wall.<br>Humpty Dumpty had a great fall</p>
+<p>Humpty Dumpty sat on a wall.&#10;Humpty Dumpty had a great fall</p>
+<p>Humpty Dumpty sat on a wall.&#13;Humpty Dumpty had a great fall</p>
+<p>Humpty Dumpty sat on a wall.&#10;&#13;Humpty Dumpty had a great fall</p>
+<p>Humpty Dumpty sat on a wall.
+Humpty Dumpty had a great fall</p>
 </body>
-</html>
+</html>
\ No newline at end of file

From 4590bb37f16f1c10229772431510abf5f6da039b Mon Sep 17 00:00:00 2001
From: Rahul Srivastava <rahusr@gmail.com>
Date: Fri, 9 Nov 2018 11:01:57 +0530
Subject: [PATCH 7/8] Deleting html file

---
 .../main/java/com/baeldung/string/page.html   | 31 -------------------
 1 file changed, 31 deletions(-)
 delete mode 100644 core-java/src/main/java/com/baeldung/string/page.html

diff --git a/core-java/src/main/java/com/baeldung/string/page.html b/core-java/src/main/java/com/baeldung/string/page.html
deleted file mode 100644
index fc39ee0057..0000000000
--- a/core-java/src/main/java/com/baeldung/string/page.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<html>
-<body>
-Humpty Dumpty sat on a wall.<br>Humpty Dumpty had a great fall.<br>
-Humpty Dumpty sat on a wall.&#10;Humpty Dumpty had a great fall.<br>
-Humpty Dumpty sat on a wall.&#13;Humpty Dumpty had a great fall.<br>
-Humpty Dumpty sat on a wall.&#10;&#13;Humpty Dumpty had a great fall.<br>
-Humpty Dumpty sat on a wall.
-Humpty Dumpty had a great fall.
-<br>
-<textarea>Hello<br>Baeldung</textarea>
-<textarea>Hello&#10;Baeldung</textarea>
-<textarea>Hello&#13;Baeldung</textarea>
-<textarea>Hello&#10;&#13;Baeldung</textarea>
-<textarea>Hello.
-Baeldung</textarea>
-<br>
-<pre>Humpty Dumpty sat on a wall.<br>Humpty Dumpty had a great fall.</pre>
-<pre>Humpty Dumpty sat on a wall.&#10;Humpty Dumpty had a great fall.</pre>
-<pre>Humpty Dumpty sat on a wall.&#13;Humpty Dumpty had a great fall.</pre>
-<pre>Humpty Dumpty sat on a wall.&#10;&#13;Humpty Dumpty had a great fall.</pre>
-<pre>Humpty Dumpty sat on a wall.
-Humpty Dumpty had a great fall</pre>
-<br>
-<p>Humpty Dumpty sat on a wall.<br>Humpty Dumpty had a great fall</p>
-<p>Humpty Dumpty sat on a wall.&#10;Humpty Dumpty had a great fall</p>
-<p>Humpty Dumpty sat on a wall.&#13;Humpty Dumpty had a great fall</p>
-<p>Humpty Dumpty sat on a wall.&#10;&#13;Humpty Dumpty had a great fall</p>
-<p>Humpty Dumpty sat on a wall.
-Humpty Dumpty had a great fall</p>
-</body>
-</html>
\ No newline at end of file

From 007aa9b66eee29634b454279b42eda79708d054d Mon Sep 17 00:00:00 2001
From: Rahul Srivastava <rahusr@gmail.com>
Date: Fri, 16 Nov 2018 11:22:18 +0530
Subject: [PATCH 8/8] Changing para to rhyme

---
 .../string/AddingNewLineToString.java         | 46 +++++++++----------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/core-java/src/main/java/com/baeldung/string/AddingNewLineToString.java b/core-java/src/main/java/com/baeldung/string/AddingNewLineToString.java
index 0b3fd2ca92..b522f7337b 100644
--- a/core-java/src/main/java/com/baeldung/string/AddingNewLineToString.java
+++ b/core-java/src/main/java/com/baeldung/string/AddingNewLineToString.java
@@ -5,65 +5,65 @@ public class AddingNewLineToString {
 	public static void main(String[] args) {
 		String line1 = "Humpty Dumpty sat on a wall.";
 		String line2 = "Humpty Dumpty had a great fall.";
-		String para = "";
+		String rhyme = "";
 		
 		System.out.println("***New Line in a String in Java***");
 		//1. Using "\n"
 		System.out.println("1. Using \\n");
-		para = line1 + "\n" + line2;
-		System.out.println(para);
+		rhyme = line1 + "\n" + line2;
+		System.out.println(rhyme);
 		
 		//2. Using "\r\n"
 		System.out.println("2. Using \\r\\n");
-		para = line1 + "\r\n" + line2;
-		System.out.println(para);
+		rhyme = line1 + "\r\n" + line2;
+		System.out.println(rhyme);
 		
 		//3. Using "\r"
 		System.out.println("3. Using \\r");
-		para = line1 + "\r" + line2;
-		System.out.println(para);
+		rhyme = line1 + "\r" + line2;
+		System.out.println(rhyme);
 		
 		//4. Using "\n\r" Note that this is not same as "\r\n"
 		//   Using "\n\r" is equivalent to adding two lines
 		System.out.println("4. Using \\n\\r");
-		para = line1 + "\n\r" + line2;
-		System.out.println(para);
+		rhyme = line1 + "\n\r" + line2;
+		System.out.println(rhyme);
 		
 		//5. Using System.lineSeparator()
 		System.out.println("5. Using System.lineSeparator()");
-		para = line1 + System.lineSeparator() + line2;
-		System.out.println(para);
+		rhyme = line1 + System.lineSeparator() + line2;
+		System.out.println(rhyme);
 		
 		//6. Using System.getProperty("line.separator")
 		System.out.println("6. Using System.getProperty(\"line.separator\")");
-		para = line1 + System.getProperty("line.separator") + line2;
-		System.out.println(para);
+		rhyme = line1 + System.getProperty("line.separator") + line2;
+		System.out.println(rhyme);
 		
 		System.out.println("***HTML to rendered in a browser***");
 		//1. Line break for HTML using <br>
 		System.out.println("1. Line break for HTML using <br>");
-		para = line1 + "<br>" + line2;
-		System.out.println(para);
+		rhyme = line1 + "<br>" + line2;
+		System.out.println(rhyme);
 		
 		//2. Line break for HTML using “&#10;”
 		System.out.println("2. Line break for HTML using &#10;");
-		para = line1 + "&#10;" + line2;
-		System.out.println(para);
+		rhyme = line1 + "&#10;" + line2;
+		System.out.println(rhyme);
 		
 		//3. Line break for HTML using “&#13;”
 		System.out.println("3. Line break for HTML using &#13;");
-		para = line1 + "&#13;" + line2;
-		System.out.println(para);
+		rhyme = line1 + "&#13;" + line2;
+		System.out.println(rhyme);
 		
 		//4. Line break for HTML using “&#10&#13;;”
 		System.out.println("4. Line break for HTML using &#10;&#13;");
-		para = line1 + "&#10;&#13;" + line2;
-		System.out.println(para);
+		rhyme = line1 + "&#10;&#13;" + line2;
+		System.out.println(rhyme);
 		
 		//5. Line break for HTML using \n”
 		System.out.println("5. Line break for HTML using \\n");
-		para = line1 + "\n" + line2;
-		System.out.println(para);
+		rhyme = line1 + "\n" + line2;
+		System.out.println(rhyme);
 	}
 
 }
\ No newline at end of file