@@ -61,7 +61,7 @@ CommandLineRunner veryImportantFileFighterStartScript(Environment environment) {
61
61
System .out .println ();
62
62
System .out .println ("Version v" + version + ", Last updated at: " + date + "" );
63
63
System .out .println ("Environment: " + Arrays .toString (environment .getActiveProfiles ()));
64
- System .out .println ("Started: " + new Date (). toString () );
64
+ System .out .println ("Started: " + new Date ());
65
65
System .out .println ("Running on http://localhost:" + serverPort );
66
66
System .out .println ();
67
67
System .out .println ("Developed by Gimleux, Valentin, Open-Schnick." );
@@ -142,35 +142,8 @@ CommandLineRunner initDataBaseDev(UserRepository userRepository, AccessTokenRepo
142
142
log .info ("Starting with clean accessToken collection." );
143
143
accessTokenRepository .deleteAll ();
144
144
145
- log .info ("Inserting system runtime user. {}" , userRepository .save (UserEntity
146
- .builder ()
147
- .userId (RUNTIME_USER_ID )
148
- .username ("FileFighter" )
149
- .lowercaseUsername ("filefighter" )
150
- .password (null )
151
- .refreshToken (null )
152
- .groupIds (new long []{SYSTEM .getGroupId ()})
153
- .build ()));
154
-
155
- log .info ("Inserting default users: {} {}." ,
156
- userRepository .save (UserEntity
157
- .builder ()
158
- .userId (1 )
159
- .username ("user" )
160
- .lowercaseUsername ("user" )
161
- .password ("1234" )
162
- .refreshToken ("rft1234" )
163
- .groupIds (new long []{ADMIN .getGroupId ()})
164
- .build ()),
165
- userRepository .save (UserEntity
166
- .builder ()
167
- .userId (2 )
168
- .username ("user1" )
169
- .lowercaseUsername ("user1" )
170
- .password ("12345" )
171
- .refreshToken ("rft" )
172
- .groupIds (new long []{FAMILY .getGroupId ()})
173
- .build ()));
145
+ addDevUsers (userRepository );
146
+ addTestingFileSystemItems (fileSystemRepository );
174
147
175
148
log .info ("Inserting default tokens: {} {}" ,
176
149
accessTokenRepository .save (AccessTokenEntity
@@ -186,7 +159,6 @@ CommandLineRunner initDataBaseDev(UserRepository userRepository, AccessTokenRepo
186
159
.validUntil (Instant .now ().getEpochSecond () + AccessTokenBusinessService .ACCESS_TOKEN_DURATION_IN_SECONDS )
187
160
.build ()));
188
161
189
- addTestingFileSystemItems (fileSystemRepository );
190
162
191
163
if (userRepository .findAll ().size () == 3 ) {
192
164
log .info ("Inserting Users " + MESSAGE_ON_SUCCESS );
@@ -216,7 +188,7 @@ CommandLineRunner initDataBaseStage(UserRepository userRepository, FileSystemRep
216
188
accessTokenRepository .deleteAll (); // Cleanup purposes.
217
189
218
190
if (foundUsers .isEmpty () && foundFileSystemEntities .isEmpty ()) {
219
- addDefaultAdminAndRuntimeUser (userRepository );
191
+ addDevUsers (userRepository );
220
192
addTestingFileSystemItems (fileSystemRepository );
221
193
222
194
if (userRepository .findAll ().size () == 2 ) {
@@ -239,6 +211,38 @@ CommandLineRunner initDataBaseStage(UserRepository userRepository, FileSystemRep
239
211
};
240
212
}
241
213
214
+ private void addDevUsers (UserRepository userRepository ) {
215
+ log .info ("Inserting system runtime user. {}" , userRepository .save (UserEntity
216
+ .builder ()
217
+ .userId (RUNTIME_USER_ID )
218
+ .username ("FileFighter" )
219
+ .lowercaseUsername ("filefighter" )
220
+ .password (null )
221
+ .refreshToken (null )
222
+ .groupIds (new long []{SYSTEM .getGroupId ()})
223
+ .build ()));
224
+
225
+ log .info ("Inserting default users: {} {}." ,
226
+ userRepository .save (UserEntity
227
+ .builder ()
228
+ .userId (1 )
229
+ .username ("user" )
230
+ .lowercaseUsername ("user" )
231
+ .password ("1234" )
232
+ .refreshToken ("rft1234" )
233
+ .groupIds (new long []{ADMIN .getGroupId ()})
234
+ .build ()),
235
+ userRepository .save (UserEntity
236
+ .builder ()
237
+ .userId (2 )
238
+ .username ("user1" )
239
+ .lowercaseUsername ("user1" )
240
+ .password ("12345" )
241
+ .refreshToken ("rft" )
242
+ .groupIds (new long []{FAMILY .getGroupId ()})
243
+ .build ()));
244
+ }
245
+
242
246
private void addDefaultAdminAndRuntimeUser (UserRepository userRepository ) {
243
247
log .info ("Database seems to be empty. Creating new default entities..." );
244
248
log .info ("Inserting system runtime user: {}" , userRepository .save (UserEntity
0 commit comments