Skip to content

Commit 04f3117

Browse files
committed
Applying comments after the first commit.
1 parent 3ab011b commit 04f3117

File tree

4 files changed

+43
-16
lines changed

4 files changed

+43
-16
lines changed

jdk_8_maven/em/embedded/rest/ocvn/src/main/java/em/embedded/org/devgateway/ocvn/EmbeddedEvoMasterController.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,8 +147,6 @@ public void resetStateOfSUT() {
147147
@Override
148148
public List<AuthenticationDto> getInfoForAuthentication() {
149149

150-
// Adding a new user called user1 with password "password". User details are stored in the database.
151-
152150
return Arrays.asList(
153151
AuthUtils.getForDefaultSpringFormLogin("ADMIN", "admin", "admin"),
154152
AuthUtils.getForDefaultSpringFormLogin("user1", "user1", "password"));

jdk_8_maven/em/embedded/rest/ocvn/src/main/resources/init_db.sql

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ VALUES
3333
'admin',
3434
NULL
3535
);
36-
36+
-- Adding a new user called user1 with password "password". User details are stored in the database.
3737
INSERT INTO PERSON
3838
(
3939
CHANGE_PASSWORD,
@@ -65,4 +65,5 @@ INSERT INTO PERSON_ROLES(PERSON_ID,ROLES_ID)VALUES(1,2);
6565
INSERT INTO PERSON_ROLES(PERSON_ID,ROLES_ID)VALUES(1,1);
6666
INSERT INTO PERSON_ROLES(PERSON_ID,ROLES_ID)VALUES(1,3);
6767

68+
-- user1 has user privilege only
6869
INSERT INTO PERSON_ROLES(PERSON_ID,ROLES_ID)VALUES(2,1);

jdk_8_maven/em/external/rest/ocvn/src/main/java/em/external/org/devgateway/ocvn/ExternalEvoMasterController.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -240,8 +240,6 @@ public SutInfoDto.OutputFormat getPreferredOutputFormat() {
240240
@Override
241241
public List<AuthenticationDto> getInfoForAuthentication() {
242242

243-
// Adding a new user called user1 with password "password". User details are stored in the database.
244-
245243
return Arrays.asList(
246244
AuthUtils.getForDefaultSpringFormLogin("ADMIN", "admin", "admin"),
247245
AuthUtils.getForDefaultSpringFormLogin("user1", "user1", "password"));

jdk_8_maven/em/external/rest/ocvn/src/main/resources/init_db.sql

Lines changed: 41 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,48 @@ INSERT INTO PERSON
2222
)
2323
VALUES
2424
(
25-
false,
26-
NULL,
27-
NULL,
28-
true,
29-
NULL,
30-
NULL,
31-
'61f3d99fb8ddfa54b714e84a0238e575930fda10e09dbd030b92edf1cf77c4d947e506e26ae9bf33',
32-
NULL,
33-
'admin',
34-
NULL
35-
);
25+
false,
26+
NULL,
27+
NULL,
28+
true,
29+
NULL,
30+
NULL,
31+
'61f3d99fb8ddfa54b714e84a0238e575930fda10e09dbd030b92edf1cf77c4d947e506e26ae9bf33',
32+
NULL,
33+
'admin',
34+
NULL
35+
);
36+
-- Adding a new user called user1 with password "password". User details are stored in the database.
37+
INSERT INTO PERSON
38+
(
39+
CHANGE_PASSWORD,
40+
COUNTRY,
41+
EMAIL,
42+
ENABLED,
43+
FIRST_NAME,
44+
LAST_NAME,
45+
PASSWORD,
46+
TITLE,
47+
USERNAME,
48+
GROUP_ID
49+
)
50+
VALUES
51+
(
52+
false,
53+
NULL,
54+
NULL,
55+
true,
56+
NULL,
57+
NULL,
58+
'b65d4278fb536a6e1ea23c87988f5d79ef743ccb07b2067ad8ebd52f1a0c067e5bc3b7f76eca3abc',
59+
NULL,
60+
'user1',
61+
NULL
62+
);
3663

3764
INSERT INTO PERSON_ROLES(PERSON_ID,ROLES_ID)VALUES(1,2);
3865
INSERT INTO PERSON_ROLES(PERSON_ID,ROLES_ID)VALUES(1,1);
3966
INSERT INTO PERSON_ROLES(PERSON_ID,ROLES_ID)VALUES(1,3);
67+
68+
-- user1 has user privilege only
69+
INSERT INTO PERSON_ROLES(PERSON_ID,ROLES_ID)VALUES(2,1);

0 commit comments

Comments
 (0)