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
03ac9fa1
Commit
03ac9fa1
authored
Mar 09, 2016
by
Grzegorz Pietrusza
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
db object stub
parent
35de28f6
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
27 additions
and
15 deletions
+27
-15
DBObject.java
service/src/main/java/objects/DBObject.java
+24
-0
Task.java
service/src/main/java/objects/tasks/Task.java
+2
-14
TasksRepository.java
service/src/main/java/repositories/TasksRepository.java
+1
-1
No files found.
service/src/main/java/objects/DBObject.java
0 → 100644
View file @
03ac9fa1
package
objects
;
import
helpers.PublicProperty
;
import
objects.tasks.Task
;
import
java.lang.reflect.Field
;
import
java.util.List
;
import
java.util.stream.Collectors
;
import
java.util.stream.Stream
;
public
class
DBObject
{
public
static
String
[]
getPublicFields
(
Class
<
Task
>
taskClass
)
//todo: do not use argument
{
//todo: get upper class
Field
[]
declaredFields
=
taskClass
.
getDeclaredFields
();
//todo: declared or not declared?
List
<
String
>
publicFieldsNames
=
Stream
.
of
(
declaredFields
)
.
filter
(
field
->
field
.
getAnnotation
(
PublicProperty
.
class
)
!=
null
)
.
map
(
Field:
:
getName
)
.
collect
(
Collectors
.
toList
());
return
publicFieldsNames
.
toArray
(
new
String
[
publicFieldsNames
.
size
()]);
}
}
service/src/main/java/objects/tasks/Task.java
View file @
03ac9fa1
...
@@ -3,6 +3,7 @@ package objects.tasks;
...
@@ -3,6 +3,7 @@ package objects.tasks;
import
com.fasterxml.jackson.annotation.JsonInclude
;
import
com.fasterxml.jackson.annotation.JsonInclude
;
import
core.TaskType
;
import
core.TaskType
;
import
helpers.PublicProperty
;
import
helpers.PublicProperty
;
import
objects.DBObject
;
import
objects.Flag
;
import
objects.Flag
;
import
org.bson.types.ObjectId
;
import
org.bson.types.ObjectId
;
import
org.mongodb.morphia.annotations.Entity
;
import
org.mongodb.morphia.annotations.Entity
;
...
@@ -15,7 +16,7 @@ import java.util.stream.Stream;
...
@@ -15,7 +16,7 @@ import java.util.stream.Stream;
@Entity
(
"tasks"
)
@Entity
(
"tasks"
)
@JsonInclude
(
JsonInclude
.
Include
.
NON_NULL
)
@JsonInclude
(
JsonInclude
.
Include
.
NON_NULL
)
public
class
Task
public
class
Task
extends
DBObject
{
{
@Id
@Id
private
ObjectId
id
;
private
ObjectId
id
;
...
@@ -27,19 +28,6 @@ public class Task
...
@@ -27,19 +28,6 @@ public class Task
private
List
<
Flag
>
flags
;
private
List
<
Flag
>
flags
;
private
TaskContent
taskContent
;
private
TaskContent
taskContent
;
public
static
String
[]
getPublicFields
()
{
//todo: move to db object?
//todo: move to task
Field
[]
declaredFields
=
Task
.
class
.
getDeclaredFields
();
List
<
String
>
publicFieldsNames
=
Stream
.
of
(
declaredFields
)
.
filter
(
field
->
field
.
getAnnotation
(
PublicProperty
.
class
)
!=
null
)
.
map
(
Field:
:
getName
)
.
collect
(
Collectors
.
toList
());
return
publicFieldsNames
.
toArray
(
new
String
[
publicFieldsNames
.
size
()]);
}
public
Task
(
String
name
,
int
level
,
TaskType
type
,
List
<
Flag
>
flags
,
TaskContent
taskContent
)
public
Task
(
String
name
,
int
level
,
TaskType
type
,
List
<
Flag
>
flags
,
TaskContent
taskContent
)
{
{
this
.
flags
=
flags
;
this
.
flags
=
flags
;
...
...
service/src/main/java/repositories/TasksRepository.java
View file @
03ac9fa1
...
@@ -67,7 +67,7 @@ public class TasksRepository implements Repository
...
@@ -67,7 +67,7 @@ public class TasksRepository implements Repository
public
List
<
Task
>
getAllPublic
()
public
List
<
Task
>
getAllPublic
()
{
{
return
datastore
.
createQuery
(
Task
.
class
)
return
datastore
.
createQuery
(
Task
.
class
)
.
retrievedFields
(
true
,
Task
.
getPublicFields
())
//todo: refactor
.
retrievedFields
(
true
,
Task
.
getPublicFields
(
Task
.
class
))
//todo: refactor
.
asList
();
.
asList
();
}
}
...
...
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