Skip to content

Commit ff07b66

Browse files
thomaswoehlkethomaswoehlke
committed
work
1 parent 9d7e339 commit ff07b66

File tree

10 files changed

+16
-25
lines changed

10 files changed

+16
-25
lines changed

‎src/main/java/org/woehlke/simpleworklist/common/testdata/TestDataController.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public TestDataController(
2929
@RequestMapping(path = "/createTree", method = RequestMethod.GET)
3030
public String createTestCategoryTree() {
3131
UserAccount user = userAccountLoginSuccessService.retrieveCurrentUser();
32-
testDataService.createTestCategoryTreeForUserAccount(user);
32+
testDataService.createTestData(user);
3333
return "redirect:/home";
3434
}
3535

‎src/main/java/org/woehlke/simpleworklist/common/testdata/TestDataService.java‎

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

55
public interface TestDataService {
66

7-
void createTestCategoryTreeForUserAccount(UserAccount userAccount);
7+
void createTestData(UserAccount userAccount);
88
}

‎src/main/java/org/woehlke/simpleworklist/common/testdata/TestDataServiceImpl.java‎

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public TestDataServiceImpl(ProjectRepository projectRepository, TaskRepository t
3535
}
3636

3737
@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
38-
public void createTestCategoryTreeForUserAccount(UserAccount userAccount) {
38+
public void createTestData(UserAccount userAccount) {
3939
log.info("----------------------------------------------");
4040
log.info("createTestCategoryTreeForUserAccount");
4141
log.info("----------------------------------------------");
@@ -60,8 +60,6 @@ public void createTestCategoryTreeForUserAccount(UserAccount userAccount) {
6060
String name02020303 = "test02020303_" + now;
6161
Project c01 = Project.newRootProjectFactory(contextWork);
6262
Project c02 = Project.newRootProjectFactory(contextWork);
63-
c01.setUuid(UUID.randomUUID().toString());
64-
c02.setUuid(UUID.randomUUID().toString());
6563
c01.setName(name01);
6664
c02.setName(name02);
6765
c01.setDescription("description01 for " + name01 + " " + loremIpsumProject);
@@ -76,10 +74,6 @@ public void createTestCategoryTreeForUserAccount(UserAccount userAccount) {
7674
Project c0102 = Project.newProjectFactoryForParentProject(c01);
7775
Project c0201 = Project.newProjectFactoryForParentProject(c02);
7876
Project c0202 = Project.newProjectFactoryForParentProject(c02);
79-
c0101.setUuid(UUID.randomUUID().toString());
80-
c0102.setUuid(UUID.randomUUID().toString());
81-
c0201.setUuid(UUID.randomUUID().toString());
82-
c0202.setUuid(UUID.randomUUID().toString());
8377
c0101.setName(name0101);
8478
c0102.setName(name0102);
8579
c0201.setName(name0201);
@@ -105,9 +99,6 @@ public void createTestCategoryTreeForUserAccount(UserAccount userAccount) {
10599
Project c020201 = Project.newProjectFactoryForParentProject(c0202);
106100
Project c020202 = Project.newProjectFactoryForParentProject(c0202);
107101
Project c020203 = Project.newProjectFactoryForParentProject(c0202);
108-
c020201.setUuid(UUID.randomUUID().toString());
109-
c020202.setUuid(UUID.randomUUID().toString());
110-
c020203.setUuid(UUID.randomUUID().toString());
111102
c020201.setName(name020201);
112103
c020202.setName(name020202);
113104
c020203.setName(name020203);
@@ -129,9 +120,6 @@ public void createTestCategoryTreeForUserAccount(UserAccount userAccount) {
129120
Project c02020301 = Project.newProjectFactoryForParentProject(c020203);
130121
Project c02020302 = Project.newProjectFactoryForParentProject(c020203);
131122
Project c02020303 = Project.newProjectFactoryForParentProject(c020203);
132-
c02020301.setUuid(UUID.randomUUID().toString());
133-
c02020302.setUuid(UUID.randomUUID().toString());
134-
c02020303.setUuid(UUID.randomUUID().toString());
135123
c02020301.setName(name02020301);
136124
c02020302.setName(name02020302);
137125
c02020303.setName(name02020303);
@@ -154,7 +142,7 @@ public void createTestCategoryTreeForUserAccount(UserAccount userAccount) {
154142
String title = "title_" + i;
155143
String text = "desc_" + i + " "+ loremIpsumTask;
156144
Task task = new Task();
157-
task.setUuid(UUID.randomUUID().toString());
145+
task.setUuid(UUID.randomUUID());
158146
task.setText(text);
159147
task.setTitle(title);
160148
task.setProject(c02020303);
@@ -176,7 +164,7 @@ public void createTestCategoryTreeForUserAccount(UserAccount userAccount) {
176164
String title = "title_" + i;
177165
String text = "desc_" + i + " "+ loremIpsumTask;
178166
Task task = new Task();
179-
task.setUuid(UUID.randomUUID().toString());
167+
task.setUuid(UUID.randomUUID());
180168
task.setText(text);
181169
task.setTitle(title);
182170
task.setProject(null);

‎src/main/java/org/woehlke/simpleworklist/domain/context/Context.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public class Context extends AuditModel implements Serializable, ComparableById<
7777
public Context(String nameDe, String nameEn) {
7878
this.nameDe = nameDe;
7979
this.nameEn = nameEn;
80-
this.uuid = UUID.randomUUID().toString();
80+
this.uuid = UUID.randomUUID();
8181
}
8282

8383
@Transient

‎src/main/java/org/woehlke/simpleworklist/domain/project/Project.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import java.io.Serializable;
44
import java.util.ArrayList;
55
import java.util.List;
6+
import java.util.UUID;
67

78
import javax.persistence.*;
89
import javax.persistence.Index;
@@ -145,6 +146,7 @@ public boolean equalsByUuid(Project otherObject) {
145146

146147
public static Project newProjectFactoryForParentProject(Project parent) {
147148
Project thisProject = new Project();
149+
thisProject.setUuid(UUID.randomUUID());
148150
//thisProject.setName("name");
149151
thisProject.setParent(parent);
150152
thisProject.setContext(parent.getContext());
@@ -153,6 +155,7 @@ public static Project newProjectFactoryForParentProject(Project parent) {
153155

154156
public static Project newRootProjectFactory(Context context) {
155157
Project thisProject = new Project();
158+
thisProject.setUuid(UUID.randomUUID());
156159
thisProject.setParent(null);
157160
thisProject.setContext(context);
158161
return thisProject;

‎src/main/java/org/woehlke/simpleworklist/domain/project/ProjectRootController.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ public final String projectRootAddProjectPost(
100100
model.addAttribute("userSession", userSession);
101101
return "project/root/project/add";
102102
} else {
103-
project.setUuid(UUID.randomUUID().toString());
103+
project.setUuid(UUID.randomUUID());
104104
return projectControllerService.addNewProjectToProjectRootPersist(
105105
userSession,
106106
project,

‎src/main/java/org/woehlke/simpleworklist/domain/project/ProjectServiceImpl.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ public Project findByProjectId(@Min(1L) long projectId) {
7676
@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
7777
public Project add(@NotNull Project entity) {
7878
log.info("saveAndFlush");
79-
entity.setUuid(UUID.randomUUID().toString());
79+
entity.setUuid(UUID.randomUUID());
8080
return projectRepository.saveAndFlush(entity);
8181
}
8282

‎src/main/java/org/woehlke/simpleworklist/domain/task/TaskServiceImpl.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ public Task updatedViaProjectRoot(@NotNull Task task) {
121121
@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
122122
public Task addToInbox(@NotNull Task task) {
123123
log.info("addToInbox");
124-
task.setUuid(UUID.randomUUID().toString());
124+
task.setUuid(UUID.randomUUID());
125125
task.setRootProject();
126126
task.unsetFocus();
127127
task.setTaskState(TaskState.INBOX);
@@ -138,7 +138,7 @@ public Task addToInbox(@NotNull Task task) {
138138
@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
139139
public Task addToProject(@NotNull Task task) {
140140
log.info("addToProject");
141-
task.setUuid(UUID.randomUUID().toString());
141+
task.setUuid(UUID.randomUUID());
142142
task.unsetFocus();
143143
long maxOrderIdProject = this.getMaxOrderIdProject(task.getProject(),task.getContext());
144144
task.setOrderIdProject(++maxOrderIdProject);
@@ -153,7 +153,7 @@ public Task addToProject(@NotNull Task task) {
153153
@Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
154154
public Task addToRootProject(@NotNull Task task) {
155155
log.info("addToRootProject");
156-
task.setUuid(UUID.randomUUID().toString());
156+
task.setUuid(UUID.randomUUID());
157157
task.setRootProject();
158158
task.unsetFocus();
159159
task.moveToInbox();

‎src/main/java/org/woehlke/simpleworklist/user/services/TokenGeneratorServiceImpl.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@ public class TokenGeneratorServiceImpl implements TokenGeneratorService {
1515
public String getToken() {
1616
int base = 130;
1717
int strLength = 30;
18-
return new BigInteger(base, random).toString(strLength) + UUID.randomUUID().toString();
18+
return new BigInteger(base, random).toString(strLength) + UUID.randomUUID();
1919
}
2020
}

‎src/test/java/org/woehlke/simpleworklist/test/testdata/TestDataServiceTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,6 @@ public void createTestCategoryTreeForUserAccountTest(){
5555
userAccountTestDataService.setUp();
5656
UserAccount userAccount = userAccountTestDataService.getFirstUserAccount();
5757
//TODO: #128
58-
testDataService.createTestCategoryTreeForUserAccount(userAccount);
58+
testDataService.createTestData(userAccount);
5959
}
6060
}

0 commit comments

Comments
 (0)