Skip to content

Commit 706d4c6

Browse files
committed
URL PATH of Actions - Controller Methods Refactoring
1 parent fba69be commit 706d4c6

File tree

3 files changed

+31
-50
lines changed

3 files changed

+31
-50
lines changed

src/main/java/org/woehlke/simpleworklist/breadcrumb/Breadcrumb.java

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
package org.woehlke.simpleworklist.breadcrumb;
22

3+
import lombok.EqualsAndHashCode;
4+
import lombok.Getter;
5+
import lombok.ToString;
36
import org.woehlke.simpleworklist.project.Project;
47
import org.woehlke.simpleworklist.task.Task;
58

@@ -8,12 +11,14 @@
811
import java.util.List;
912
import java.util.Locale;
1013

14+
@Getter
15+
@EqualsAndHashCode
16+
@ToString
1117
public class Breadcrumb implements Serializable {
1218

1319
private static final long serialVersionUID = 7932703111140692689L;
1420

1521
private List<BreadcrumbItem> breadcrumb;
16-
1722
private final Locale locale;
1823

1924
public Breadcrumb(Locale locale) {
@@ -30,14 +35,6 @@ public Breadcrumb(Locale locale) {
3035
this.breadcrumb = breadcrumb;
3136
}
3237

33-
public List<BreadcrumbItem> getBreadcrumb() {
34-
return breadcrumb;
35-
}
36-
37-
public int size(){
38-
return breadcrumb.size();
39-
}
40-
4138
public void addProjectRoot(){
4239
String urlProject = "/project/0";
4340
String name;
Lines changed: 7 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,16 @@
11
package org.woehlke.simpleworklist.breadcrumb;
22

3+
import lombok.*;
4+
35
import javax.validation.constraints.NotNull;
46
import java.io.Serializable;
57
import java.util.Objects;
68

9+
@Getter
10+
@Setter
11+
@NoArgsConstructor
12+
@EqualsAndHashCode
13+
@ToString
714
public class BreadcrumbItem implements Serializable {
815

916
private static final long serialVersionUID = 8276819198016077167L;
@@ -14,49 +21,9 @@ public class BreadcrumbItem implements Serializable {
1421
@NotNull
1522
private String url;
1623

17-
public String getName() {
18-
return name;
19-
}
20-
21-
public void setName(String name) {
22-
this.name = name;
23-
}
24-
25-
public String getUrl() {
26-
return url;
27-
}
28-
29-
public void setUrl(String url) {
30-
this.url = url;
31-
}
32-
33-
@Override
34-
public boolean equals(Object o) {
35-
if (this == o) return true;
36-
if (!(o instanceof BreadcrumbItem)) return false;
37-
BreadcrumbItem that = (BreadcrumbItem) o;
38-
return getName().equals(that.getName()) &&
39-
getUrl().equals(that.getUrl());
40-
}
41-
42-
@Override
43-
public int hashCode() {
44-
return Objects.hash(getName(), getUrl());
45-
}
46-
47-
@Override
48-
public String toString() {
49-
return "BreadcrumbItem{" +
50-
"name='" + name + '\'' +
51-
", url='" + url + '\'' +
52-
'}';
53-
}
54-
5524
public BreadcrumbItem(@NotNull String name, @NotNull String url) {
5625
this.name = name;
5726
this.url = url;
5827
}
5928

60-
public BreadcrumbItem() {
61-
}
6229
}

src/main/java/org/woehlke/simpleworklist/breadcrumb/BreadcrumbServiceImpl.java

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package org.woehlke.simpleworklist.breadcrumb;
22

3+
import lombok.extern.slf4j.Slf4j;
34
import org.springframework.beans.factory.annotation.Autowired;
45
import org.springframework.context.MessageSource;
56
import org.springframework.stereotype.Service;
@@ -13,6 +14,7 @@
1314
import java.util.Locale;
1415
import java.util.Stack;
1516

17+
@Slf4j
1618
@Service
1719
@Transactional(propagation = Propagation.REQUIRED, readOnly = true)
1820
public class BreadcrumbServiceImpl implements BreadcrumbService {
@@ -26,13 +28,15 @@ public BreadcrumbServiceImpl(MessageSource messageSource) {
2628

2729
@Override
2830
public Breadcrumb getBreadcrumbForShowRootProject(Locale locale) {
31+
log.info("getBreadcrumbForShowRootProject");
2932
Breadcrumb breadcrumb = new Breadcrumb(locale);
3033
breadcrumb.addProjectRoot();
3134
return breadcrumb;
3235
}
3336

3437
@Override
3538
public Breadcrumb getBreadcrumbForShowOneProject(Project thisProject, Locale locale) {
39+
log.info("getBreadcrumbForShowOneProject");
3640
Breadcrumb breadcrumb = new Breadcrumb(locale);
3741
breadcrumb.addProjectRoot();
3842
if (thisProject.getId() > 0) {
@@ -51,6 +55,7 @@ public Breadcrumb getBreadcrumbForShowOneProject(Project thisProject, Locale loc
5155

5256
@Override
5357
public Breadcrumb getBreadcrumbForTaskstate(TaskState taskstate, Locale locale) {
58+
log.info("getBreadcrumbForTaskstate");
5459
Breadcrumb breadcrumb = new Breadcrumb(locale);
5560
String code = taskstate.getCode();
5661
String name = messageSource.getMessage(code,null,locale);
@@ -60,6 +65,7 @@ public Breadcrumb getBreadcrumbForTaskstate(TaskState taskstate, Locale locale)
6065

6166
@Override
6267
public Breadcrumb getBreadcrumbForTaskInTaskstate(String taskstate, Task task, Locale locale) {
68+
log.info("getBreadcrumbForTaskInTaskstate");
6369
Breadcrumb breadcrumb = new Breadcrumb(locale);
6470
breadcrumb.addTaskstate(taskstate);
6571
breadcrumb.addTask(task);
@@ -68,6 +74,7 @@ public Breadcrumb getBreadcrumbForTaskInTaskstate(String taskstate, Task task, L
6874

6975
@Override
7076
public Breadcrumb getBreadcrumbForTaskstateAll(Locale locale) {
77+
log.info("getBreadcrumbForTaskstateAll");
7178
Breadcrumb breadcrumb = new Breadcrumb(locale);
7279
String code="layout.page.all";
7380
String name= messageSource.getMessage(code,null,locale);
@@ -78,6 +85,7 @@ public Breadcrumb getBreadcrumbForTaskstateAll(Locale locale) {
7885

7986
@Override
8087
public Breadcrumb getBreadcrumbForTaskInProject(Project thisProject, Task task, Locale locale) {
88+
log.info("getBreadcrumbForTaskInProject");
8189
Breadcrumb breadcrumb = new Breadcrumb(locale);
8290
breadcrumb.addProject(thisProject);
8391
breadcrumb.addTask(task);
@@ -86,6 +94,7 @@ public Breadcrumb getBreadcrumbForTaskInProject(Project thisProject, Task task,
8694

8795
@Override
8896
public Breadcrumb getBreadcrumbForUserProfileAndMenu(Locale locale) {
97+
log.info("getBreadcrumbForUserProfileAndMenu");
8998
Breadcrumb breadcrumb = new Breadcrumb(locale);
9099
String code="pages.user.profile";
91100
String name= messageSource.getMessage(code,null,locale);
@@ -96,6 +105,7 @@ public Breadcrumb getBreadcrumbForUserProfileAndMenu(Locale locale) {
96105

97106
@Override
98107
public Breadcrumb getBreadcrumbForUserChangeName(Locale locale) {
108+
log.info("getBreadcrumbForUserChangeName");
99109
Breadcrumb breadcrumb = new Breadcrumb(locale);
100110
String code="pages.user.profile";
101111
String name= messageSource.getMessage(code,null,locale);
@@ -110,6 +120,7 @@ public Breadcrumb getBreadcrumbForUserChangeName(Locale locale) {
110120

111121
@Override
112122
public Breadcrumb getBreadcrumbForUserChangePassword(Locale locale) {
123+
log.info("getBreadcrumbForUserChangePassword");
113124
Breadcrumb breadcrumb = new Breadcrumb(locale);
114125
String code="pages.user.profile";
115126
String name= messageSource.getMessage(code,null,locale);
@@ -124,6 +135,7 @@ public Breadcrumb getBreadcrumbForUserChangePassword(Locale locale) {
124135

125136
@Override
126137
public Breadcrumb getBreadcrumbForUserContexts(Locale locale) {
138+
log.info("getBreadcrumbForUserContexts");
127139
Breadcrumb breadcrumb = new Breadcrumb(locale);
128140
String code="pages.user.profile";
129141
String name= messageSource.getMessage(code,null,locale);
@@ -138,6 +150,7 @@ public Breadcrumb getBreadcrumbForUserContexts(Locale locale) {
138150

139151
@Override
140152
public Breadcrumb getBreadcrumbForUserContextAdd(Locale locale) {
153+
log.info("getBreadcrumbForUserContextAdd");
141154
Breadcrumb breadcrumb = new Breadcrumb(locale);
142155
String code="pages.user.profile";
143156
String name= messageSource.getMessage(code,null,locale);
@@ -152,6 +165,7 @@ public Breadcrumb getBreadcrumbForUserContextAdd(Locale locale) {
152165

153166
@Override
154167
public Breadcrumb getBreadcrumbForUserContextEdit(Locale locale, Context context) {
168+
log.info("getBreadcrumbForUserContextEdit");
155169
Breadcrumb breadcrumb = new Breadcrumb(locale);
156170
String code="pages.user.profile";
157171
String name= messageSource.getMessage(code,null,locale);
@@ -166,6 +180,7 @@ public Breadcrumb getBreadcrumbForUserContextEdit(Locale locale, Context context
166180

167181
@Override
168182
public Breadcrumb getBreadcrumbForUserContextDelete(Locale locale, Context context) {
183+
log.info("getBreadcrumbForUserContextDelete");
169184
Breadcrumb breadcrumb = new Breadcrumb(locale);
170185
String code="pages.user.profile";
171186
String name= messageSource.getMessage(code,null,locale);
@@ -180,6 +195,7 @@ public Breadcrumb getBreadcrumbForUserContextDelete(Locale locale, Context conte
180195

181196
@Override
182197
public Breadcrumb getBreadcrumbForUserChangeLanguage(Locale locale) {
198+
log.info("getBreadcrumbForUserChangeLanguage");
183199
Breadcrumb breadcrumb = new Breadcrumb(locale);
184200
String code="pages.user.profile";
185201
String name= messageSource.getMessage(code,null,locale);
@@ -194,6 +210,7 @@ public Breadcrumb getBreadcrumbForUserChangeLanguage(Locale locale) {
194210

195211
@Override
196212
public Breadcrumb getBreadcrumbForMessagesBetweenCurrentAndOtherUser(Locale locale) {
213+
log.info("getBreadcrumbForMessagesBetweenCurrentAndOtherUser");
197214
Breadcrumb breadcrumb = new Breadcrumb(locale);
198215
String code="pages.user.profile";
199216
String name= messageSource.getMessage(code,null,locale);
@@ -208,6 +225,7 @@ public Breadcrumb getBreadcrumbForMessagesBetweenCurrentAndOtherUser(Locale loca
208225

209226
@Override
210227
public Breadcrumb getBreadcrumbForSearchResults(Locale locale) {
228+
log.info("getBreadcrumbForSearchResults");
211229
Breadcrumb breadcrumb = new Breadcrumb(locale);
212230
String code="pages.user.profile";
213231
String name= messageSource.getMessage(code,null,locale);
@@ -220,5 +238,4 @@ public Breadcrumb getBreadcrumbForSearchResults(Locale locale) {
220238
return breadcrumb;
221239
}
222240

223-
224241
}

0 commit comments

Comments
 (0)