Skip to content

Commit b292d2b

Browse files
Mateo StjepanovićMateo Stjepanović
Mateo Stjepanović
authored and
Mateo Stjepanović
committed
Reformating and changes for new version of article
1 parent 7b1f3dd commit b292d2b

15 files changed

Lines changed: 143 additions & 142 deletions

‎core-java/versions/src/main/java/com/reflectoring/io/java10/LocalTypeVar.java‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,23 @@
33
import java.util.List;
44

55
public class LocalTypeVar {
6-
public static void main(String[] args) {
76

8-
}
9-
10-
public void explicitTypes(){
7+
public void explicitTypes() {
118
Person Roland = new Person("Roland", "Deschain");
129
Person Susan = new Person("Susan", "Delgado");
1310
Person Eddie = new Person("Eddie", "Dean");
1411
Person Detta = new Person("Detta", "Walker");
1512
Person Jake = new Person("Jake", "Chambers");
1613

17-
List<Person> persons = List.of(Roland, Susan, Eddie, Detta, Jake);
14+
List<Person> persons =
15+
List.of(Roland, Susan, Eddie, Detta, Jake);
1816

19-
for(Person person : persons){
17+
for (Person person : persons) {
2018
System.out.println(person.name + " - " + person.lastname);
2119
}
2220
}
2321

24-
public void varTypes(){
22+
public void varTypes() {
2523
var Roland = new Person("Roland", "Deschain");
2624
var Susan = new Person("Susan", "Delgado");
2725
var Eddie = new Person("Eddie", "Dean");
@@ -30,16 +28,16 @@ public void varTypes(){
3028

3129
var persons = List.of(Roland, Susan, Eddie, Detta, Jake);
3230

33-
for(var person : persons){
31+
for (var person : persons) {
3432
System.out.println(person.name + " - " + person.lastname);
3533
}
3634
}
3735

38-
public class Person{
36+
public class Person {
3937
String name;
4038
String lastname;
4139

42-
public Person(String name, String lastname){
40+
public Person(String name, String lastname) {
4341
this.name = name;
4442
this.lastname = lastname;
4543
}

‎core-java/versions/src/main/java/com/reflectoring/io/java11/LocalTypeVarLambda.java‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,24 +7,27 @@
77

88
public class LocalTypeVarLambda {
99

10-
public void explicitTypes(){
10+
public void explicitTypes() {
1111
var Roland = new Person("Roland", "Deschain");
1212
var Susan = new Person("Susan", "Delgado");
1313
var Eddie = new Person("Eddie", "Dean");
1414
var Detta = new Person("Detta", "Walker");
1515
var Jake = new Person("Jake", "Chambers");
1616

17-
var filteredPersons = List.of(Roland, Susan, Eddie, Detta, Jake)
18-
.stream().filter((var x) -> x.name.contains("a")).collect(Collectors.toList());;
17+
var filteredPersons =
18+
List.of(Roland, Susan, Eddie, Detta, Jake)
19+
.stream()
20+
.filter((var x) -> x.name.contains("a"))
21+
.collect(Collectors.toList());
1922
System.out.println(filteredPersons);
2023
}
2124

2225

23-
public class Person{
26+
public class Person {
2427
String name;
2528
String lastname;
2629

27-
public Person(String name, String lastname){
30+
public Person(String name, String lastname) {
2831
this.name = name;
2932
this.lastname = lastname;
3033
}

‎core-java/versions/src/main/java/com/reflectoring/io/java14/SwitchExpression.java‎

Lines changed: 22 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -6,45 +6,47 @@ public static void main(String[] args) {
66
int days = 0;
77
Month month = Month.APRIL;
88

9-
days = switch (month){
10-
case JANUARY, MARCH,MAY, JULY, AUGUST,OCTOBER,DECEMBER -> 31;
9+
switch (month) {
10+
case JANUARY, MARCH, MAY, JULY, AUGUST, OCTOBER,
11+
DECEMBER:
12+
days = 31;
13+
break;
14+
case FEBRUARY:
15+
days = 28;
16+
break;
17+
case APRIL, JUNE, SEPTEMBER, NOVEMBER:
18+
days = 30;
19+
break;
20+
default:
21+
throw new IllegalStateException();
22+
}
23+
24+
days = switch (month) {
25+
case JANUARY, MARCH, MAY, JULY, AUGUST, OCTOBER, DECEMBER -> 31;
1126
case FEBRUARY -> 28;
12-
case APRIL, JUNE, SEPTEMBER,NOVEMBER -> 30;
27+
case APRIL, JUNE, SEPTEMBER, NOVEMBER -> 30;
1328
default -> throw new IllegalStateException();
1429
};
1530

16-
days = switch (month){
17-
case JANUARY, MARCH,MAY, JULY, AUGUST,OCTOBER,DECEMBER -> {
31+
days = switch (month) {
32+
case JANUARY, MARCH, MAY, JULY, AUGUST, OCTOBER, DECEMBER -> {
1833
System.out.println(month);
1934
yield 31;
2035
}
2136
case FEBRUARY -> {
2237
System.out.println(month);
2338
yield 28;
2439
}
25-
case APRIL, JUNE, SEPTEMBER,NOVEMBER -> {
40+
case APRIL, JUNE, SEPTEMBER, NOVEMBER -> {
2641
System.out.println(month);
2742
yield 30;
2843
}
2944
default -> throw new IllegalStateException();
3045
};
3146

32-
switch (month){
33-
case JANUARY, MARCH,MAY, JULY, AUGUST,OCTOBER,DECEMBER:
34-
days=31;
35-
break;
36-
case FEBRUARY:
37-
days=28;
38-
break;
39-
case APRIL, JUNE, SEPTEMBER,NOVEMBER:
40-
days = 30;
41-
break;
42-
default:
43-
throw new IllegalStateException();
44-
}
4547
}
4648

47-
public enum Month{
49+
public enum Month {
4850
JANUARY,
4951
FEBRUARY,
5052
MARCH,

‎core-java/versions/src/main/java/com/reflectoring/io/java15/TextBlocks.java‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,32 +3,30 @@
33
public class TextBlocks {
44
public static void main(String[] args) {
55
System.out.println(
6-
"<!DOCTYPE html>\n" +
6+
"<!DOCTYPE html>\n" +
77
"<html>\n" +
88
" <head>\n" +
99
" <title>Example</title>\n" +
1010
" </head>\n" +
1111
" <body>\n" +
12-
" <p>This is an example of a simple HTML page with one paragraph.</p>\n" +
12+
" <p>This is an example of a simple HTML " +
13+
"page with one paragraph.</p>\n" +
1314
" </body>\n" +
1415
"</html>\n");
1516

1617
System.out.println(
17-
"""
18+
"""
1819
<!DOCTYPE html>
1920
<html>
2021
<head>
2122
<title>Example</title>
2223
</head>
2324
<body>
24-
<p>This is an example of a simple HTML page with one paragraph.</p>
25+
<p>This is an example of a simple HTML
26+
page with one paragraph.</p>
2527
</body>
2628
</html>
2729
"""
2830
);
29-
// System.out.println(
30-
// """Illegal text block start: missing new line after opening quotes
31-
// """);
32-
3331
}
3432
}

‎core-java/versions/src/main/java/com/reflectoring/io/java16/PatternMatching.java‎

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5,29 +5,33 @@
55
public class PatternMatching {
66
public static void main(String[] args) {
77
Car car = new Car("Kia", "Gas", 10000l, 2021l);
8-
Bicycle bicycle = new Bicycle("Greyp", "Electricity", "Mountain", 21l);
8+
Bicycle bicycle =
9+
new Bicycle("Greyp", "Electricity", "Mountain", 21l);
910

1011
System.out.println("Car:" + price(car));
1112
System.out.println("Bycicle: " + price(bicycle));
1213
}
1314

14-
public static double price(Vehicle v){
15-
if(v instanceof Car c){
16-
return 10000 - c.kilomenters*0.01 - (Calendar.getInstance().get(Calendar.YEAR) - c.year)*100;
17-
}else if(v instanceof Bicycle b){
18-
return 1000 + b.wheelSize*10;
19-
}else throw new IllegalArgumentException();
20-
15+
public static double price(Vehicle v) {
16+
if (v instanceof Car c) {
17+
return 10000 - c.kilomenters * 0.01 -
18+
(Calendar.getInstance().get(Calendar.YEAR) -
19+
c.year) * 100;
20+
} else if (v instanceof Bicycle b) {
21+
return 1000 + b.wheelSize * 10;
22+
} else throw new IllegalArgumentException();
2123
}
2224

23-
public static double priceOld(Vehicle v){
24-
if(v instanceof Car){
25-
Car c = (Car)v;
26-
return 10000 - c.kilomenters*0.01 - (Calendar.getInstance().get(Calendar.YEAR) - c.year)*100;
27-
}else if(v instanceof Bicycle){
28-
Bicycle b = (Bicycle)v;
29-
return 1000 + b.wheelSize*10;
30-
}else throw new IllegalArgumentException();
25+
public static double priceOld(Vehicle v) {
26+
if (v instanceof Car) {
27+
Car c = (Car) v;
28+
return 10000 - c.kilomenters * 0.01 -
29+
(Calendar.getInstance().get(Calendar.YEAR) -
30+
c.year) * 100;
31+
} else if (v instanceof Bicycle) {
32+
Bicycle b = (Bicycle) v;
33+
return 1000 + b.wheelSize * 10;
34+
} else throw new IllegalArgumentException();
3135

3236
}
3337
}

‎core-java/versions/src/main/java/com/reflectoring/io/java16/Vehicle.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ public boolean equals(Object o) {
3232
if (this == o) return true;
3333
if (o == null || getClass() != o.getClass()) return false;
3434
Vehicle vehicle = (Vehicle) o;
35-
return code.equals(vehicle.code) && engineType.equals(vehicle.engineType);
35+
return code.equals(vehicle.code) &&
36+
engineType.equals(vehicle.engineType);
3637
}
3738

3839
@Override

‎core-java/versions/src/main/java/com/reflectoring/io/java17/Vehicle.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ public boolean equals(Object o) {
3232
if (this == o) return true;
3333
if (o == null || getClass() != o.getClass()) return false;
3434
Vehicle vehicle = (Vehicle) o;
35-
return code.equals(vehicle.code) && engineType.equals(vehicle.engineType);
35+
return code.equals(vehicle.code) &&
36+
engineType.equals(vehicle.engineType);
3637
}
3738

3839
@Override

‎core-java/versions/src/main/java/com/reflectoring/io/java8/DefaultMethods.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44

55
public class DefaultMethods {
66

7-
public interface Logging{
7+
public interface Logging {
88
void log(String message);
99

10-
default void log(String message, Date date){
10+
default void log(String message, Date date) {
1111
System.out.println(date.toString() + ": " + message);
1212
}
1313
}
1414

15-
public class LoggingImplementation implements Logging{
15+
public class LoggingImplementation implements Logging {
1616

1717
@Override
1818
public void log(String message) {

‎core-java/versions/src/main/java/com/reflectoring/io/java8/LambdaExpressions.java‎

Lines changed: 11 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -6,45 +6,33 @@
66

77
public class LambdaExpressions {
88

9-
public static void main(String[] args) {
10-
List<Car> cars = new ArrayList<>();
11-
12-
List<Car> oldWay = findCarsOldWay(cars);
13-
System.out.println(oldWay);
14-
15-
List<Car> oldWayModel = findCarsWithModelOldWay(cars);
16-
System.out.println(oldWayModel);
17-
18-
List<Car> filterLambda = findCarsUsingLambda(cars);
19-
System.out.println(filterLambda);
20-
21-
}
22-
23-
public static List<Car> findCarsUsingLambda(List<Car> cars){
24-
return cars.stream().filter(car -> car.kilometers < 50000).collect(Collectors.toList());
9+
public static List<Car> findCarsUsingLambda(List<Car> cars) {
10+
return cars.stream().filter(car -> car.kilometers < 50000)
11+
.collect(Collectors.toList());
2512
}
2613

27-
public static List<Car> findCarsOldWay(List<Car> cars){
14+
public static List<Car> findCarsOldWay(List<Car> cars) {
2815
List<Car> selectedCars = new ArrayList<>();
29-
for (Car car: cars) {
30-
if(car.kilometers < 50000){
16+
for (Car car : cars) {
17+
if (car.kilometers < 50000) {
3118
selectedCars.add(car);
3219
}
3320
}
3421
return selectedCars;
3522
}
3623

37-
public static List<Car> findCarsWithModelOldWay(List<Car> cars){
24+
public static List<Car> findCarsWithModelOldWay(List<Car> cars) {
3825
List<Car> selectedCars = new ArrayList<>();
39-
for(Car car: cars){
40-
if(car.kilometers < 50000 && car.model.equals("Mercedes")){
26+
for (Car car : cars) {
27+
if (car.kilometers < 50000 &&
28+
car.model.equals("Mercedes")) {
4129
selectedCars.add(car);
4230
}
4331
}
4432
return selectedCars;
4533
}
4634

47-
public class Car{
35+
public class Car {
4836
public String model;
4937
public double kilometers;
5038
}

‎core-java/versions/src/main/java/com/reflectoring/io/java8/MethodReference.java‎

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,16 @@
66

77
public class MethodReference {
88

9-
public static void main(String[] args) {
10-
List<Car> cars = new ArrayList<>();
9+
List<Car> cars = new ArrayList<>();
1110

12-
List<String> withoutMethodReference = cars.stream().map(car -> car.toString()).collect(Collectors.toList());
13-
System.out.println(withoutMethodReference);
11+
List<String> withoutMethodReference =
12+
cars.stream().map(car -> car.toString())
13+
.collect(Collectors.toList());
1414

15-
List<String> methodReference = cars.stream().map(Car::toString).collect(Collectors.toList());
16-
System.out.println(methodReference);
15+
List<String> methodReference = cars.stream().map(Car::toString)
16+
.collect(Collectors.toList());
1717

18-
19-
}
20-
21-
public class Car{
18+
public class Car {
2219
public String model;
2320
public double kilometers;
2421

0 commit comments

Comments
 (0)