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
e13e8aa7
Commit
e13e8aa7
authored
Mar 21, 2016
by
Grzegorz Pietrusza
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
implement clean method in repository
parent
d7e0099b
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
39 additions
and
34 deletions
+39
-34
RegisterTasksCommand.java
...honers/krakyournet/ctf/commands/RegisterTasksCommand.java
+1
-1
Repository.java
.../telephoners/krakyournet/ctf/repositories/Repository.java
+25
-7
SolutionsRepository.java
...ers/krakyournet/ctf/repositories/SolutionsRepository.java
+6
-12
TasksRepository.java
...phoners/krakyournet/ctf/repositories/TasksRepository.java
+2
-6
TeamsRepository.java
...phoners/krakyournet/ctf/repositories/TeamsRepository.java
+3
-5
UsersRepository.java
...phoners/krakyournet/ctf/repositories/UsersRepository.java
+2
-3
No files found.
service/src/main/java/com/telephoners/krakyournet/ctf/commands/RegisterTasksCommand.java
View file @
e13e8aa7
...
@@ -23,7 +23,7 @@ public class RegisterTasksCommand extends ConfiguredCommand<ApplicationConfigura
...
@@ -23,7 +23,7 @@ public class RegisterTasksCommand extends ConfiguredCommand<ApplicationConfigura
super
(
COMMAND_NAME
,
COMMAND_DESCRIPTION
);
super
(
COMMAND_NAME
,
COMMAND_DESCRIPTION
);
}
}
private
void
initializeTasks
(
ApplicationConfiguration
applicationConfiguration
,
Injector
injector
)
private
void
initializeTasks
(
ApplicationConfiguration
applicationConfiguration
,
Injector
injector
)
throws
ClassNotFoundException
{
{
TasksRepository
tasksRepository
=
injector
.
getInstance
(
TasksRepository
.
class
);
TasksRepository
tasksRepository
=
injector
.
getInstance
(
TasksRepository
.
class
);
...
...
service/src/main/java/com/telephoners/krakyournet/ctf/repositories/Repository.java
View file @
e13e8aa7
package
com
.
telephoners
.
krakyournet
.
ctf
.
repositories
;
package
com
.
telephoners
.
krakyournet
.
ctf
.
repositories
;
import
org.mongodb.morphia.Datastore
;
import
javax.inject.Inject
;
import
java.lang.reflect.ParameterizedType
;
import
java.lang.reflect.Type
;
import
java.util.List
;
import
java.util.List
;
/**
public
abstract
class
Repository
<
T
>
{
* Created by gpietrus on 20.02.2016.
protected
Datastore
datastore
;
*/
public
interface
Repository
<
T
>
{
@Inject
List
<
T
>
getAll
();
public
Repository
(
Datastore
datastore
)
void
add
(
T
t
);
{
void
clean
();
this
.
datastore
=
datastore
;
}
protected
Repository
()
{
}
abstract
List
<
T
>
getAll
();
abstract
void
add
(
T
t
);
//todo: the same for add
public
void
clean
()
throws
ClassNotFoundException
{
Type
type
=
((
ParameterizedType
)
this
.
getClass
().
getGenericSuperclass
()).
getActualTypeArguments
()[
0
];
datastore
.
getCollection
(
Class
.
forName
(
type
.
getTypeName
())).
drop
();
}
}
}
service/src/main/java/com/telephoners/krakyournet/ctf/repositories/SolutionsRepository.java
View file @
e13e8aa7
...
@@ -5,7 +5,6 @@ import com.telephoners.krakyournet.ctf.beans.Team;
...
@@ -5,7 +5,6 @@ import com.telephoners.krakyournet.ctf.beans.Team;
import
com.telephoners.krakyournet.ctf.beans.tasks.Task
;
import
com.telephoners.krakyournet.ctf.beans.tasks.Task
;
import
org.mongodb.morphia.Datastore
;
import
org.mongodb.morphia.Datastore
;
import
javax.inject.Inject
;
import
javax.inject.Singleton
;
import
javax.inject.Singleton
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Map
;
...
@@ -15,14 +14,15 @@ import java.util.function.Predicate;
...
@@ -15,14 +14,15 @@ import java.util.function.Predicate;
import
java.util.stream.Collectors
;
import
java.util.stream.Collectors
;
@Singleton
@Singleton
public
class
SolutionsRepository
implement
s
Repository
<
Solution
>
public
class
SolutionsRepository
extend
s
Repository
<
Solution
>
{
{
private
Datastore
datastore
;
@Inject
public
SolutionsRepository
(
Datastore
datastore
)
public
SolutionsRepository
(
Datastore
datastore
)
{
{
this
.
datastore
=
datastore
;
super
(
datastore
);
}
public
SolutionsRepository
()
{
}
}
public
List
<
Solution
>
getAll
()
public
List
<
Solution
>
getAll
()
...
@@ -36,12 +36,6 @@ public class SolutionsRepository implements Repository<Solution>
...
@@ -36,12 +36,6 @@ public class SolutionsRepository implements Repository<Solution>
//todo: do not add if already exists
//todo: do not add if already exists
}
}
@Override
public
void
clean
()
{
datastore
.
getCollection
(
Solution
.
class
).
drop
();
//todo: move common functions to repository abstract?
}
public
List
<
Solution
>
getByTeam
(
Team
team
)
public
List
<
Solution
>
getByTeam
(
Team
team
)
{
{
//todo: merge with upper
//todo: merge with upper
...
...
service/src/main/java/com/telephoners/krakyournet/ctf/repositories/TasksRepository.java
View file @
e13e8aa7
...
@@ -21,7 +21,7 @@ import java.util.Optional;
...
@@ -21,7 +21,7 @@ import java.util.Optional;
import
java.util.stream.Collectors
;
import
java.util.stream.Collectors
;
@Singleton
@Singleton
public
class
TasksRepository
implement
s
Repository
<
Task
>
public
class
TasksRepository
extend
s
Repository
<
Task
>
{
{
private
ApplicationConfiguration
applicationConfiguration
;
private
ApplicationConfiguration
applicationConfiguration
;
private
Datastore
datastore
;
private
Datastore
datastore
;
...
@@ -32,6 +32,7 @@ public class TasksRepository implements Repository<Task>
...
@@ -32,6 +32,7 @@ public class TasksRepository implements Repository<Task>
public
TasksRepository
(
ApplicationConfiguration
applicationConfiguration
,
Datastore
datastore
,
public
TasksRepository
(
ApplicationConfiguration
applicationConfiguration
,
Datastore
datastore
,
TeamsRepository
teamsRepository
,
SolutionsRepository
solutionsRepository
)
TeamsRepository
teamsRepository
,
SolutionsRepository
solutionsRepository
)
{
{
super
(
datastore
);
this
.
applicationConfiguration
=
applicationConfiguration
;
this
.
applicationConfiguration
=
applicationConfiguration
;
this
.
datastore
=
datastore
;
this
.
datastore
=
datastore
;
this
.
teamsRepository
=
teamsRepository
;
this
.
teamsRepository
=
teamsRepository
;
...
@@ -131,11 +132,6 @@ public class TasksRepository implements Repository<Task>
...
@@ -131,11 +132,6 @@ public class TasksRepository implements Repository<Task>
return
false
;
return
false
;
}
}
public
void
clean
()
{
datastore
.
getCollection
(
Task
.
class
).
drop
();
}
//todo: should it be here?
//todo: should it be here?
public
List
<
Integer
>
getCompletedTasks
(
Team
team
)
public
List
<
Integer
>
getCompletedTasks
(
Team
team
)
{
{
...
...
service/src/main/java/com/telephoners/krakyournet/ctf/repositories/TeamsRepository.java
View file @
e13e8aa7
package
com
.
telephoners
.
krakyournet
.
ctf
.
repositories
;
package
com
.
telephoners
.
krakyournet
.
ctf
.
repositories
;
import
com.telephoners.krakyournet.ctf.core.ApplicationConfiguration
;
import
com.telephoners.krakyournet.ctf.beans.Team
;
import
com.telephoners.krakyournet.ctf.beans.Team
;
import
com.telephoners.krakyournet.ctf.beans.User
;
import
com.telephoners.krakyournet.ctf.beans.User
;
import
org.mongodb.morphia.Datastore
;
import
org.mongodb.morphia.Datastore
;
...
@@ -12,19 +11,18 @@ import java.util.Optional;
...
@@ -12,19 +11,18 @@ import java.util.Optional;
import
java.util.UUID
;
import
java.util.UUID
;
@Singleton
@Singleton
public
class
TeamsRepository
implement
s
Repository
<
Team
>
public
class
TeamsRepository
extend
s
Repository
<
Team
>
{
{
private
Datastore
datastore
;
private
Datastore
datastore
;
private
ApplicationConfiguration
applicationConfiguration
;
private
UsersRepository
usersRepository
;
private
UsersRepository
usersRepository
;
@Inject
@Inject
public
TeamsRepository
(
Datastore
datastore
,
ApplicationConfiguration
applicationConfiguration
,
public
TeamsRepository
(
Datastore
datastore
,
UsersRepository
usersRepository
)
UsersRepository
usersRepository
)
{
{
super
(
datastore
);
this
.
datastore
=
datastore
;
this
.
datastore
=
datastore
;
this
.
applicationConfiguration
=
applicationConfiguration
;
this
.
usersRepository
=
usersRepository
;
this
.
usersRepository
=
usersRepository
;
}
}
...
...
service/src/main/java/com/telephoners/krakyournet/ctf/repositories/UsersRepository.java
View file @
e13e8aa7
...
@@ -13,15 +13,14 @@ import java.security.NoSuchAlgorithmException;
...
@@ -13,15 +13,14 @@ import java.security.NoSuchAlgorithmException;
import
java.util.List
;
import
java.util.List
;
@Singleton
@Singleton
public
class
UsersRepository
implement
s
Repository
<
User
>
public
class
UsersRepository
extend
s
Repository
<
User
>
{
{
private
Datastore
datastore
;
private
MessageDigest
messageDigest
;
private
MessageDigest
messageDigest
;
@Inject
@Inject
public
UsersRepository
(
Datastore
datastore
)
public
UsersRepository
(
Datastore
datastore
)
{
{
this
.
datastore
=
datastore
;
super
(
datastore
)
;
try
{
try
{
messageDigest
=
MessageDigest
.
getInstance
(
"MD5"
);
//todo
messageDigest
=
MessageDigest
.
getInstance
(
"MD5"
);
//todo
}
catch
(
NoSuchAlgorithmException
e
)
{
}
catch
(
NoSuchAlgorithmException
e
)
{
...
...
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