Skip to content

Commit 7dd83ab

Browse files
committed
Merge remote-tracking branch 'upstream/master' into JAVA-8794
2 parents 98bbc94 + b4e0ac6 commit 7dd83ab

File tree

81 files changed

+1149
-62
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

81 files changed

+1149
-62
lines changed

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

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,21 @@
22

33
import static org.hamcrest.CoreMatchers.is;
44
import static org.hamcrest.CoreMatchers.nullValue;
5-
import static org.hamcrest.Matchers.*;
5+
6+
import static org.hamcrest.MatcherAssert.assertThat;
7+
import static org.hamcrest.Matchers.hasItem;
8+
import static org.hamcrest.Matchers.hasItems;
69
import static org.hamcrest.collection.IsEmptyCollection.empty;
7-
import static org.junit.Assert.*;
10+
import static org.junit.Assert.assertFalse;
11+
import static org.junit.Assert.assertTrue;
812

913
import java.lang.module.ModuleDescriptor;
10-
import java.lang.module.ModuleDescriptor.*;
14+
15+
import java.lang.module.ModuleDescriptor.Builder;
16+
import java.lang.module.ModuleDescriptor.Exports;
17+
import java.lang.module.ModuleDescriptor.Opens;
18+
import java.lang.module.ModuleDescriptor.Provides;
19+
import java.lang.module.ModuleDescriptor.Requires;
1120
import java.sql.Date;
1221
import java.sql.Driver;
1322
import java.util.HashMap;
@@ -16,7 +25,7 @@
1625

1726
import org.junit.Before;
1827
import org.junit.Test;
19-
import org.junit.Ignore;
28+
2029

2130
public class ModuleAPIUnitTest {
2231

@@ -28,14 +37,9 @@ public class ModuleAPIUnitTest {
2837

2938
@Before
3039
public void setUp() {
31-
Class<HashMap> hashMapClass = HashMap.class;
32-
javaBaseModule = hashMapClass.getModule();
33-
34-
Class<Date> dateClass = Date.class;
35-
javaSqlModule = dateClass.getModule();
36-
37-
Class<Person> personClass = Person.class;
38-
module = personClass.getModule();
40+
javaBaseModule = HashMap.class.getModule();
41+
javaSqlModule = Date.class.getModule();
42+
module = Person.class.getModule();
3943
}
4044

4145
@Test
@@ -111,7 +115,6 @@ public void givenModules_whenAccessingModuleDescriptorRequires_thenRequiresAreRe
111115
}
112116

113117
@Test
114-
@Ignore // fixing in http://team.baeldung.com/browse/JAVA-8679
115118
public void givenModules_whenAccessingModuleDescriptorProvides_thenProvidesAreReturned() {
116119
Set<Provides> javaBaseProvides = javaBaseModule.getDescriptor().provides();
117120
Set<Provides> javaSqlProvides = javaSqlModule.getDescriptor().provides();
@@ -120,7 +123,7 @@ public void givenModules_whenAccessingModuleDescriptorProvides_thenProvidesAreRe
120123
.map(Provides::service)
121124
.collect(Collectors.toSet());
122125

123-
assertThat(javaBaseProvidesService, contains("java.nio.file.spi.FileSystemProvider"));
126+
assertThat(javaBaseProvidesService, hasItem("java.nio.file.spi.FileSystemProvider"));
124127
assertThat(javaSqlProvides, empty());
125128
}
126129

@@ -132,15 +135,14 @@ public void givenModules_whenAccessingModuleDescriptorExports_thenExportsAreRetu
132135
.map(Exports::source)
133136
.collect(Collectors.toSet());
134137

135-
assertThat(javaSqlExportsSource, hasItems("java.sql", "javax.sql"));
138+
assertThat(javaSqlExportsSource, hasItems("java.sql", "javax.sql"));
136139
}
137140

138141
@Test
139142
public void givenModules_whenAccessingModuleDescriptorUses_thenUsesAreReturned() {
140-
Set<String> javaBaseUses = javaBaseModule.getDescriptor().uses();
141143
Set<String> javaSqlUses = javaSqlModule.getDescriptor().uses();
142144

143-
assertThat(javaSqlUses, contains("java.sql.Driver"));
145+
assertThat(javaSqlUses, hasItem("java.sql.Driver"));
144146
}
145147

146148
@Test
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
package com.baeldung.implicitsuperconstructorundefined;
2+
3+
public class Employee extends Person {
4+
5+
private Double salary;
6+
7+
public Employee(String name, Integer age, Double salary) {
8+
// comment this super call to see the error.
9+
super(name, age);
10+
this.salary = salary;
11+
}
12+
13+
public Employee(Double salary) {
14+
super();
15+
this.salary = salary;
16+
}
17+
18+
public Double getSalary() {
19+
return salary;
20+
}
21+
22+
public void setSalary(Double salary) {
23+
this.salary = salary;
24+
}
25+
26+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
package com.baeldung.implicitsuperconstructorundefined;
2+
3+
public class Person {
4+
5+
private String name;
6+
7+
private Integer age;
8+
9+
public Person(String name, Integer age) {
10+
this.name = name;
11+
this.age = age;
12+
}
13+
14+
// comment this constructor to see the error.
15+
public Person() {
16+
}
17+
18+
public String getName() {
19+
return name;
20+
}
21+
22+
public void setName(String name) {
23+
this.name = name;
24+
}
25+
26+
public Integer getAge() {
27+
return age;
28+
}
29+
30+
public void setAge(Integer age) {
31+
this.age = age;
32+
}
33+
34+
35+
}

core-java-modules/core-java-lang-oop-types-2/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ This module contains articles about types in Java
55
### Relevant Articles:
66

77
- [Convert an Array of Primitives to an Array of Objects](https://www.baeldung.com/java-primitive-array-to-object-array)
8-
- [Check if an Enum Value Exists in Java](https://www.baeldung.com/java-find-enum-by-criteria)
8+
- [Check if an Enum Value Exists in Java](https://www.baeldung.com/java-search-enum-values)
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
package com.baeldung.lombok.with;
2+
3+
import lombok.AllArgsConstructor;
4+
import lombok.Getter;
5+
import lombok.With;
6+
7+
@Getter
8+
@AllArgsConstructor
9+
public abstract class Device {
10+
private final String serial;
11+
@With
12+
private final boolean isInspected;
13+
}
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
package com.baeldung.lombok.with;
2+
3+
import lombok.AllArgsConstructor;
4+
import lombok.Getter;
5+
import lombok.With;
6+
7+
@Getter
8+
@AllArgsConstructor
9+
public class Holder {
10+
@With
11+
private String variableA;
12+
@With
13+
private String _variableB;
14+
@With
15+
private String $variableC;
16+
}
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
package com.baeldung.lombok.with;
2+
3+
import lombok.AllArgsConstructor;
4+
import lombok.NonNull;
5+
import lombok.With;
6+
7+
@With
8+
@AllArgsConstructor
9+
public class ImprovedUser {
10+
@NonNull
11+
private final String username;
12+
@NonNull
13+
private final String emailAddress;
14+
}
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
package com.baeldung.lombok.with;
2+
3+
public class KioskDevice extends Device {
4+
5+
public KioskDevice(String serial, boolean isInspected) {
6+
super(serial, isInspected);
7+
}
8+
9+
@Override
10+
public Device withInspected(boolean isInspected) {
11+
return new KioskDevice(getSerial(), isInspected);
12+
}
13+
}
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
package com.baeldung.lombok.with;
2+
3+
import lombok.AllArgsConstructor;
4+
import lombok.Getter;
5+
import lombok.With;
6+
7+
@Getter
8+
@AllArgsConstructor
9+
public class Stock {
10+
@With
11+
private String sku;
12+
private int stockCount;
13+
14+
public Stock withSku(String sku) {
15+
return new Stock("mod-" + sku, stockCount);
16+
}
17+
18+
public Stock withSKU(String... sku) {
19+
return sku == null || sku.length == 0 ?
20+
new Stock("unknown", stockCount) :
21+
new Stock("mod-" + sku[0], stockCount);
22+
}
23+
}
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
package com.baeldung.lombok.with;
2+
3+
import lombok.AllArgsConstructor;
4+
import lombok.Getter;
5+
import lombok.With;
6+
7+
@Getter
8+
@AllArgsConstructor
9+
public class User {
10+
private final String username;
11+
private final String emailAddress;
12+
@With
13+
private final boolean isAuthenticated;
14+
}

0 commit comments

Comments
 (0)