Skip to content

Commit 12cdd53

Browse files
chrisoberleEugen
chrisoberle
authored and
Eugen
committed
BAEL-1706 move code to guest module (eugenp#4123)
1 parent 9b44056 commit 12cdd53

7 files changed

Lines changed: 191 additions & 184 deletions

File tree

‎guest/core-java/pom.xml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,18 @@
4141
<version>${org.hamcrest.version}</version>
4242
<scope>test</scope>
4343
</dependency>
44+
<dependency>
45+
<groupId>org.assertj</groupId>
46+
<artifactId>assertj-core</artifactId>
47+
<version>${assertj.version}</version>
48+
<scope>test</scope>
49+
</dependency>
4450
</dependencies>
4551

4652
<properties>
4753
<log4j2.version>2.8.2</log4j2.version>
4854
<org.hamcrest.version>1.3</org.hamcrest.version>
55+
<assertj.version>3.6.1</assertj.version>
4956
</properties>
5057

5158
</project>

core-java/src/main/java/com/baeldung/optionalparams/MultiVitamin.java renamed to guest/core-java/src/main/java/com/stackify/optionalparams/MultiVitamin.java

Lines changed: 49 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,50 @@
1-
package com.baeldung.optionalparams;
2-
3-
public class MultiVitamin {
4-
5-
private String name; // required
6-
private int vitaminA; // in mcg
7-
private int vitaminC; // in mg
8-
private int calcium; // in mg
9-
private int iron; // in mg
10-
11-
public MultiVitamin(String name) {
12-
this.name = name;
13-
}
14-
15-
public String getName() {
16-
return name;
17-
}
18-
19-
public int getVitaminA() {
20-
return vitaminA;
21-
}
22-
23-
public void setVitaminA(int vitaminA) {
24-
this.vitaminA = vitaminA;
25-
}
26-
27-
public int getVitaminC() {
28-
return vitaminC;
29-
}
30-
31-
public void setVitaminC(int vitaminC) {
32-
this.vitaminC = vitaminC;
33-
}
34-
35-
public int getCalcium() {
36-
return calcium;
37-
}
38-
39-
public void setCalcium(int calcium) {
40-
this.calcium = calcium;
41-
}
42-
43-
public int getIron() {
44-
return iron;
45-
}
46-
47-
public void setIron(int iron) {
48-
this.iron = iron;
49-
}
1+
package com.stackify.optionalparams;
2+
3+
public class MultiVitamin {
4+
5+
private String name; // required
6+
private int vitaminA; // in mcg
7+
private int vitaminC; // in mg
8+
private int calcium; // in mg
9+
private int iron; // in mg
10+
11+
public MultiVitamin(String name) {
12+
this.name = name;
13+
}
14+
15+
public String getName() {
16+
return name;
17+
}
18+
19+
public int getVitaminA() {
20+
return vitaminA;
21+
}
22+
23+
public void setVitaminA(int vitaminA) {
24+
this.vitaminA = vitaminA;
25+
}
26+
27+
public int getVitaminC() {
28+
return vitaminC;
29+
}
30+
31+
public void setVitaminC(int vitaminC) {
32+
this.vitaminC = vitaminC;
33+
}
34+
35+
public int getCalcium() {
36+
return calcium;
37+
}
38+
39+
public void setCalcium(int calcium) {
40+
this.calcium = calcium;
41+
}
42+
43+
public int getIron() {
44+
return iron;
45+
}
46+
47+
public void setIron(int iron) {
48+
this.iron = iron;
49+
}
5050
}

core-java/src/main/java/com/baeldung/optionalparams/MultiVitaminAllowingNulls.java renamed to guest/core-java/src/main/java/com/stackify/optionalparams/MultiVitaminAllowingNulls.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.baeldung.optionalparams;
1+
package com.stackify.optionalparams;
22

33
public class MultiVitaminAllowingNulls {
44

core-java/src/main/java/com/baeldung/optionalparams/MultiVitaminOverloading.java renamed to guest/core-java/src/main/java/com/stackify/optionalparams/MultiVitaminOverloading.java

Lines changed: 55 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1,56 +1,56 @@
1-
package com.baeldung.optionalparams;
2-
3-
public class MultiVitaminOverloading {
4-
5-
static final int DEFAULT_IRON_AMOUNT = 20;
6-
7-
private final String name; // required
8-
private final int vitaminA; // in mcg
9-
private final int vitaminC; // in mg
10-
private final int calcium; // in mg
11-
private final int iron; // in mg
12-
13-
public MultiVitaminOverloading(String name) {
14-
this(name, 0);
15-
}
16-
17-
public MultiVitaminOverloading(String name, int vitaminA) {
18-
this(name, vitaminA, 0);
19-
}
20-
21-
public MultiVitaminOverloading(String name, int vitaminA, int vitaminC) {
22-
this(name, vitaminA, vitaminC, 0);
23-
}
24-
25-
public MultiVitaminOverloading(String name, int vitaminA, int vitaminC, int calcium) {
26-
this(name, vitaminA, vitaminC, calcium, DEFAULT_IRON_AMOUNT);
27-
}
28-
29-
public MultiVitaminOverloading(String name, int vitaminA, int vitaminC, int calcium, int iron) {
30-
this.name = name;
31-
this.vitaminA = vitaminA;
32-
this.vitaminC = vitaminC;
33-
this.calcium = calcium;
34-
this.iron = iron;
35-
}
36-
37-
public String getName() {
38-
return name;
39-
}
40-
41-
public int getVitaminA() {
42-
return vitaminA;
43-
}
44-
45-
public int getVitaminC() {
46-
return vitaminC;
47-
}
48-
49-
public int getCalcium() {
50-
return calcium;
51-
}
52-
53-
public int getIron() {
54-
return iron;
55-
}
1+
package com.stackify.optionalparams;
2+
3+
public class MultiVitaminOverloading {
4+
5+
static final int DEFAULT_IRON_AMOUNT = 20;
6+
7+
private final String name; // required
8+
private final int vitaminA; // in mcg
9+
private final int vitaminC; // in mg
10+
private final int calcium; // in mg
11+
private final int iron; // in mg
12+
13+
public MultiVitaminOverloading(String name) {
14+
this(name, 0);
15+
}
16+
17+
public MultiVitaminOverloading(String name, int vitaminA) {
18+
this(name, vitaminA, 0);
19+
}
20+
21+
public MultiVitaminOverloading(String name, int vitaminA, int vitaminC) {
22+
this(name, vitaminA, vitaminC, 0);
23+
}
24+
25+
public MultiVitaminOverloading(String name, int vitaminA, int vitaminC, int calcium) {
26+
this(name, vitaminA, vitaminC, calcium, DEFAULT_IRON_AMOUNT);
27+
}
28+
29+
public MultiVitaminOverloading(String name, int vitaminA, int vitaminC, int calcium, int iron) {
30+
this.name = name;
31+
this.vitaminA = vitaminA;
32+
this.vitaminC = vitaminC;
33+
this.calcium = calcium;
34+
this.iron = iron;
35+
}
36+
37+
public String getName() {
38+
return name;
39+
}
40+
41+
public int getVitaminA() {
42+
return vitaminA;
43+
}
44+
45+
public int getVitaminC() {
46+
return vitaminC;
47+
}
48+
49+
public int getCalcium() {
50+
return calcium;
51+
}
52+
53+
public int getIron() {
54+
return iron;
55+
}
5656
}

core-java/src/main/java/com/baeldung/optionalparams/MultiVitaminStaticFactoryMethods.java renamed to guest/core-java/src/main/java/com/stackify/optionalparams/MultiVitaminStaticFactoryMethods.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.baeldung.optionalparams;
1+
package com.stackify.optionalparams;
22

33
public class MultiVitaminStaticFactoryMethods {
44

0 commit comments

Comments
 (0)