Skip to content

Commit 91b2379

Browse files
mikuluckymikulucky
committed
iluwatar#354 Fixed CheckStyle Issues
1 parent 32f9cf3 commit 91b2379

File tree

7 files changed

+100
-89
lines changed

7 files changed

+100
-89
lines changed

‎feature-toggle/pom.xml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22

3-
<project xmlns="http://maven.apache.org/POM/4.0.0"
4-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xmlns="http://maven.apache.org/POM/4.0.0"
55
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
66
<parent>
77
<artifactId>java-design-patterns</artifactId>
@@ -14,11 +14,11 @@
1414

1515

1616
<dependencies>
17-
<dependency>
18-
<groupId>junit</groupId>
19-
<artifactId>junit</artifactId>
20-
<scope>test</scope>
21-
</dependency>
17+
<dependency>
18+
<groupId>junit</groupId>
19+
<artifactId>junit</artifactId>
20+
<scope>test</scope>
21+
</dependency>
2222

23-
</dependencies>
23+
</dependencies>
2424
</project>

‎feature-toggle/src/main/java/com/iluwatar/featuretoggle/pattern/Service.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55

66
public interface Service {
77

8-
String getWelcomeMessage(User user);
8+
String getWelcomeMessage(User user);
99

1010
}

‎feature-toggle/src/main/java/com/iluwatar/featuretoggle/pattern/tieredversion/TieredFeatureToggleVersion.java‎

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

77
public class TieredFeatureToggleVersion implements Service {
88

9-
@Override
10-
public String getWelcomeMessage(User user) {
11-
if(UserGroup.isPaid(user)){
12-
return "You're amazing " + user.getName() + ". Thanks for paying for this awesome software.";
13-
}
14-
15-
return "I suppose you can use this software.";
9+
@Override
10+
public String getWelcomeMessage(User user) {
11+
if (UserGroup.isPaid(user)) {
12+
return "You're amazing " + user.getName() + ". Thanks for paying for this awesome software.";
1613
}
1714

15+
return "I suppose you can use this software.";
16+
}
17+
1818
}

‎feature-toggle/src/main/java/com/iluwatar/featuretoggle/user/User.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22

33
public class User {
44

5-
private String name;
5+
private String name;
66

7-
public User(String name) {
8-
this.name = name;
9-
}
7+
public User(String name) {
8+
this.name = name;
9+
}
1010

11-
public String getName() {
12-
return name;
13-
}
11+
public String getName() {
12+
return name;
13+
}
1414
}

‎feature-toggle/src/main/java/com/iluwatar/featuretoggle/user/UserGroup.java‎

Lines changed: 32 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -3,32 +3,43 @@
33
import java.util.ArrayList;
44
import java.util.List;
55

6+
/**
7+
* Contains the lists of users of different groups paid and free
8+
*/
69
public class UserGroup {
710

8-
private static List<User> freeGroup = new ArrayList<>();
9-
private static List<User> paidGroup = new ArrayList<>();
11+
private static List<User> freeGroup = new ArrayList<>();
12+
private static List<User> paidGroup = new ArrayList<>();
1013

11-
public static void addUserToFreeGroup(final User user){
12-
if(paidGroup.contains(user)){
13-
throw new IllegalArgumentException("User all ready member of paid group.");
14-
}else{
15-
if(!freeGroup.contains(user)){
16-
freeGroup.add(user);
17-
}
18-
}
14+
/**
15+
*
16+
* @param user {@link User} to be added to the free group
17+
*/
18+
public static void addUserToFreeGroup(final User user) {
19+
if (paidGroup.contains(user)) {
20+
throw new IllegalArgumentException("User all ready member of paid group.");
21+
} else {
22+
if (!freeGroup.contains(user)) {
23+
freeGroup.add(user);
24+
}
1925
}
26+
}
2027

21-
public static void addUserToPaidGroup(final User user){
22-
if(freeGroup.contains(user)){
23-
throw new IllegalArgumentException("User all ready member of free group.");
24-
}else{
25-
if(!paidGroup.contains(user)){
26-
paidGroup.add(user);
27-
}
28-
}
28+
/**
29+
*
30+
* @param user {@link User} to be added to the paid group
31+
*/
32+
public static void addUserToPaidGroup(final User user) {
33+
if (freeGroup.contains(user)) {
34+
throw new IllegalArgumentException("User all ready member of free group.");
35+
} else {
36+
if (!paidGroup.contains(user)) {
37+
paidGroup.add(user);
38+
}
2939
}
40+
}
3041

31-
public static boolean isPaid(User user) {
32-
return paidGroup.contains(user);
33-
}
42+
public static boolean isPaid(User user) {
43+
return paidGroup.contains(user);
44+
}
3445
}

‎feature-toggle/src/main/test/com/iluwatar/featuretoggle/pattern/tieredversion/TieredFeatureToggleVersionTest.java‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -6,31 +6,31 @@
66
import org.junit.Before;
77
import org.junit.Test;
88

9-
import static org.junit.Assert.*;
9+
import static org.junit.Assert.assertEquals;
1010

1111
public class TieredFeatureToggleVersionTest {
1212

13-
final User paidUser = new User("Jamie Coder");
14-
final User freeUser = new User("Alan Defect");
15-
final Service service = new TieredFeatureToggleVersion();
13+
final User paidUser = new User("Jamie Coder");
14+
final User freeUser = new User("Alan Defect");
15+
final Service service = new TieredFeatureToggleVersion();
1616

17-
@Before
18-
public void setUp() throws Exception {
19-
UserGroup.addUserToPaidGroup(paidUser);
20-
UserGroup.addUserToFreeGroup(freeUser);
21-
}
17+
@Before
18+
public void setUp() throws Exception {
19+
UserGroup.addUserToPaidGroup(paidUser);
20+
UserGroup.addUserToFreeGroup(freeUser);
21+
}
2222

23-
@Test
24-
public void testGetWelcomeMessageForPaidUser() throws Exception {
25-
final String welcomeMessage = service.getWelcomeMessage(paidUser);
26-
final String expected = "You're amazing Jamie Coder. Thanks for paying for this awesome software.";
27-
assertEquals(expected,welcomeMessage);
28-
}
23+
@Test
24+
public void testGetWelcomeMessageForPaidUser() throws Exception {
25+
final String welcomeMessage = service.getWelcomeMessage(paidUser);
26+
final String expected = "You're amazing Jamie Coder. Thanks for paying for this awesome software.";
27+
assertEquals(expected, welcomeMessage);
28+
}
2929

30-
@Test
31-
public void testGetWelcomeMessageForFreeUser() throws Exception {
32-
final String welcomeMessage = service.getWelcomeMessage(freeUser);
33-
final String expected = "I suppose you can use this software.";
34-
assertEquals(expected,welcomeMessage);
35-
}
30+
@Test
31+
public void testGetWelcomeMessageForFreeUser() throws Exception {
32+
final String welcomeMessage = service.getWelcomeMessage(freeUser);
33+
final String expected = "I suppose you can use this software.";
34+
assertEquals(expected, welcomeMessage);
35+
}
3636
}

‎feature-toggle/src/main/test/com/iluwatar/featuretoggle/user/UserGroupTest.java‎

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

88
public class UserGroupTest {
99

10-
@Test
11-
public void testAddUserToFreeGroup() throws Exception {
12-
User user = new User("Free User");
13-
UserGroup.addUserToFreeGroup(user);
14-
assertFalse(UserGroup.isPaid(user));
15-
}
10+
@Test
11+
public void testAddUserToFreeGroup() throws Exception {
12+
User user = new User("Free User");
13+
UserGroup.addUserToFreeGroup(user);
14+
assertFalse(UserGroup.isPaid(user));
15+
}
1616

17-
@Test
18-
public void testAddUserToPaidGroup() throws Exception {
19-
User user = new User("Paid User");
20-
UserGroup.addUserToPaidGroup(user);
21-
assertTrue(UserGroup.isPaid(user));
22-
}
17+
@Test
18+
public void testAddUserToPaidGroup() throws Exception {
19+
User user = new User("Paid User");
20+
UserGroup.addUserToPaidGroup(user);
21+
assertTrue(UserGroup.isPaid(user));
22+
}
2323

24-
@Test(expected = IllegalArgumentException.class)
25-
public void testAddUserToPaidWhenOnFree() throws Exception {
26-
User user = new User("Paid User");
27-
UserGroup.addUserToFreeGroup(user);
28-
UserGroup.addUserToPaidGroup(user);
29-
}
24+
@Test(expected = IllegalArgumentException.class)
25+
public void testAddUserToPaidWhenOnFree() throws Exception {
26+
User user = new User("Paid User");
27+
UserGroup.addUserToFreeGroup(user);
28+
UserGroup.addUserToPaidGroup(user);
29+
}
3030

31-
@Test(expected = IllegalArgumentException.class)
32-
public void testAddUserToFreeWhenOnPaid() throws Exception {
33-
User user = new User("Free User");
34-
UserGroup.addUserToPaidGroup(user);
35-
UserGroup.addUserToFreeGroup(user);
36-
}
31+
@Test(expected = IllegalArgumentException.class)
32+
public void testAddUserToFreeWhenOnPaid() throws Exception {
33+
User user = new User("Free User");
34+
UserGroup.addUserToPaidGroup(user);
35+
UserGroup.addUserToFreeGroup(user);
36+
}
3737
}

0 commit comments

Comments
 (0)