Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
C
CTF
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Grzegorz
CTF
Commits
0f83781a
Commit
0f83781a
authored
Mar 10, 2016
by
Grzegorz Pietrusza
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
do not use datastore in command
parent
9257cc0c
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
6 deletions
+5
-6
RegisterTasksCommand.java
service/src/main/java/commands/RegisterTasksCommand.java
+1
-2
RegisterTeamsCommand.java
service/src/main/java/commands/RegisterTeamsCommand.java
+4
-4
No files found.
service/src/main/java/commands/RegisterTasksCommand.java
View file @
0f83781a
...
@@ -34,7 +34,7 @@ public class RegisterTasksCommand extends ConfiguredCommand<ApplicationConfigura
...
@@ -34,7 +34,7 @@ public class RegisterTasksCommand extends ConfiguredCommand<ApplicationConfigura
private
void
initializeTasks
(
ApplicationConfiguration
applicationConfiguration
,
Injector
injector
)
private
void
initializeTasks
(
ApplicationConfiguration
applicationConfiguration
,
Injector
injector
)
{
{
Datastore
datastore
=
injector
.
getInstance
(
Datastore
.
class
);
Datastore
datastore
=
injector
.
getInstance
(
Datastore
.
class
);
//todo: do not use datastore?
TasksRepository
tasksRepository
=
injector
.
getInstance
(
TasksRepository
.
class
);
TasksRepository
tasksRepository
=
injector
.
getInstance
(
TasksRepository
.
class
);
List
<
TextTaskConfig
>
cryptoTasks
=
applicationConfiguration
.
getTextTasks
();
List
<
TextTaskConfig
>
cryptoTasks
=
applicationConfiguration
.
getTextTasks
();
...
@@ -73,7 +73,6 @@ public class RegisterTasksCommand extends ConfiguredCommand<ApplicationConfigura
...
@@ -73,7 +73,6 @@ public class RegisterTasksCommand extends ConfiguredCommand<ApplicationConfigura
@Override
@Override
protected
void
run
(
Bootstrap
<
ApplicationConfiguration
>
bootstrap
,
Namespace
namespace
,
ApplicationConfiguration
applicationConfiguration
)
throws
Exception
protected
void
run
(
Bootstrap
<
ApplicationConfiguration
>
bootstrap
,
Namespace
namespace
,
ApplicationConfiguration
applicationConfiguration
)
throws
Exception
{
{
//todo: move and merge with app setup
Injector
injector
=
Guice
.
createInjector
(
new
ApplicationModule
(
applicationConfiguration
));
Injector
injector
=
Guice
.
createInjector
(
new
ApplicationModule
(
applicationConfiguration
));
initializeTasks
(
applicationConfiguration
,
injector
);
initializeTasks
(
applicationConfiguration
,
injector
);
}
}
...
...
service/src/main/java/commands/RegisterTeamsCommand.java
View file @
0f83781a
...
@@ -9,6 +9,7 @@ import modules.ApplicationModule;
...
@@ -9,6 +9,7 @@ import modules.ApplicationModule;
import
net.sourceforge.argparse4j.inf.Namespace
;
import
net.sourceforge.argparse4j.inf.Namespace
;
import
org.mongodb.morphia.Datastore
;
import
org.mongodb.morphia.Datastore
;
import
repositories.TeamsRepository
;
import
repositories.TeamsRepository
;
import
repositories.UsersRepository
;
public
class
RegisterTeamsCommand
extends
ConfiguredCommand
<
ApplicationConfiguration
>
public
class
RegisterTeamsCommand
extends
ConfiguredCommand
<
ApplicationConfiguration
>
{
{
...
@@ -22,20 +23,19 @@ public class RegisterTeamsCommand extends ConfiguredCommand<ApplicationConfigura
...
@@ -22,20 +23,19 @@ public class RegisterTeamsCommand extends ConfiguredCommand<ApplicationConfigura
private
void
initializeTasks
(
ApplicationConfiguration
applicationConfiguration
,
Injector
injector
)
private
void
initializeTasks
(
ApplicationConfiguration
applicationConfiguration
,
Injector
injector
)
{
{
Datastore
datastore
=
injector
.
getInstance
(
Datastore
.
class
);
TeamsRepository
teamsRepository
=
injector
.
getInstance
(
TeamsRepository
.
class
);
TeamsRepository
teamsRepository
=
injector
.
getInstance
(
TeamsRepository
.
class
);
UsersRepository
usersRepository
=
injector
.
getInstance
(
UsersRepository
.
class
);
teamsRepository
.
clean
();
teamsRepository
.
clean
();
applicationConfiguration
.
getTeams
().
forEach
(
team
->
{
applicationConfiguration
.
getTeams
().
forEach
(
team
->
{
team
.
getMembers
().
stream
().
forEach
(
datastore:
:
save
);
//todo: use usersrepostiroy to save?
team
.
getMembers
().
stream
().
forEach
(
usersRepository:
:
add
);
datastore
.
save
(
team
);
teamsRepository
.
add
(
team
);
});
});
}
}
@Override
@Override
protected
void
run
(
Bootstrap
<
ApplicationConfiguration
>
bootstrap
,
Namespace
namespace
,
ApplicationConfiguration
applicationConfiguration
)
throws
Exception
protected
void
run
(
Bootstrap
<
ApplicationConfiguration
>
bootstrap
,
Namespace
namespace
,
ApplicationConfiguration
applicationConfiguration
)
throws
Exception
{
{
//todo: move and merge with app setup
Injector
injector
=
Guice
.
createInjector
(
new
ApplicationModule
(
applicationConfiguration
));
Injector
injector
=
Guice
.
createInjector
(
new
ApplicationModule
(
applicationConfiguration
));
initializeTasks
(
applicationConfiguration
,
injector
);
initializeTasks
(
applicationConfiguration
,
injector
);
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment