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
6311fc66
Commit
6311fc66
authored
Feb 20, 2016
by
Grzegorz Pietrusza
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
move mongo config to config file
parent
c7b8c15c
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
57 additions
and
18 deletions
+57
-18
configuration.yml
service/configuration.yml
+3
-0
ApplicationConfiguration.java
service/src/main/java/ApplicationConfiguration.java
+0
-9
CTFApplication.java
service/src/main/java/CTFApplication.java
+5
-3
ApplicationConfiguration.java
service/src/main/java/core/ApplicationConfiguration.java
+37
-0
MongoDBConnector.java
service/src/main/java/database/MongoDBConnector.java
+12
-4
User.java
service/src/main/java/objects/User.java
+0
-1
SolutionsRepository.java
service/src/main/java/repositories/SolutionsRepository.java
+0
-1
No files found.
service/configuration.yml
View file @
6311fc66
dbHost
:
localhost
dbPort
:
27017
dbName
:
db
\ No newline at end of file
service/src/main/java/ApplicationConfiguration.java
deleted
100644 → 0
View file @
c7b8c15c
import
io.dropwizard.Configuration
;
/**
* Created by gpietrus on 16.02.16.
*/
public
class
ApplicationConfiguration
extends
Configuration
{
}
service/src/main/java/CTFApplication.java
View file @
6311fc66
import
core.ApplicationConfiguration
;
import
repositories.SolutionsRepository
;
import
repositories.TasksRepository
;
import
repositories.TeamsRepository
;
...
...
@@ -29,7 +30,7 @@ public class CTFApplication extends Application<ApplicationConfiguration> {
@Override
public
void
run
(
ApplicationConfiguration
applicationConfiguration
,
Environment
environment
)
throws
Exception
{
MongoDBConnector
dbConnector
=
new
MongoDBConnector
();
MongoDBConnector
dbConnector
=
new
MongoDBConnector
(
applicationConfiguration
);
dbConnector
.
connect
();
//CREATE SOLUTION REPOSITORY
...
...
@@ -75,7 +76,7 @@ public class CTFApplication extends Application<ApplicationConfiguration> {
//GENERATE TASKS END
//REGISTER RESOURCES
Injector
injector
=
createInjector
(
dbConnector
);
Injector
injector
=
createInjector
(
applicationConfiguration
,
dbConnector
);
environment
.
jersey
().
register
(
injector
.
getInstance
(
TeamsResource
.
class
));
environment
.
jersey
().
register
(
injector
.
getInstance
(
TasksResource
.
class
));
environment
.
jersey
().
register
(
injector
.
getInstance
(
ProxyResource
.
class
));
...
...
@@ -83,10 +84,11 @@ public class CTFApplication extends Application<ApplicationConfiguration> {
}
//todo: inject dbonnector
private
Injector
createInjector
(
MongoDBConnector
dbConnector
)
{
private
Injector
createInjector
(
ApplicationConfiguration
applicationConfiguration
,
MongoDBConnector
dbConnector
)
{
return
Guice
.
createInjector
(
new
AbstractModule
()
{
@Override
protected
void
configure
()
{
bind
(
ApplicationConfiguration
.
class
).
toInstance
(
applicationConfiguration
);
bind
(
MongoDBConnector
.
class
).
toInstance
(
dbConnector
);
TeamsRepository
teamsRepository
=
new
TeamsRepository
(
dbConnector
);
...
...
service/src/main/java/core/ApplicationConfiguration.java
0 → 100644
View file @
6311fc66
package
core
;
import
io.dropwizard.Configuration
;
/**
* Created by gpietrus on 16.02.16.
*/
public
class
ApplicationConfiguration
extends
Configuration
{
private
String
dbHost
;
private
int
dbPort
;
private
String
dbName
;
public
String
getDbHost
()
{
return
dbHost
;
}
public
void
setDbHost
(
String
dbHost
)
{
this
.
dbHost
=
dbHost
;
}
public
int
getDbPort
()
{
return
dbPort
;
}
public
void
setDbPort
(
int
dbPort
)
{
this
.
dbPort
=
dbPort
;
}
public
String
getDbName
()
{
return
dbName
;
}
public
void
setDbName
(
String
dbName
)
{
this
.
dbName
=
dbName
;
}
}
service/src/main/java/database/MongoDBConnector.java
View file @
6311fc66
...
...
@@ -2,9 +2,9 @@ package database;
import
com.mongodb.MongoClient
;
import
com.mongodb.client.MongoDatabase
;
import
core.ApplicationConfiguration
;
import
org.bson.BsonDocument
;
import
org.bson.Document
;
import
org.bson.conversions.Bson
;
import
java.util.ArrayList
;
import
java.util.Map
;
...
...
@@ -13,15 +13,23 @@ import java.util.Map;
* Created by gpietrus on 20.02.2016.
*/
public
class
MongoDBConnector
implements
DBConnector
{
private
ApplicationConfiguration
applicationConfiguration
;
private
MongoClient
mongoClient
;
private
MongoDatabase
database
;
public
MongoDBConnector
(
ApplicationConfiguration
applicationConfiguration
)
{
this
.
applicationConfiguration
=
applicationConfiguration
;
}
@Override
public
void
connect
()
{
//todo: get from configuration file
mongoClient
=
new
MongoClient
(
"localhost"
,
27017
);
this
.
database
=
mongoClient
.
getDatabase
(
"db"
);
mongoClient
=
new
MongoClient
(
applicationConfiguration
.
getDbHost
(),
applicationConfiguration
.
getDbPort
());
this
.
database
=
mongoClient
.
getDatabase
(
applicationConfiguration
.
getDbName
()
);
}
@Override
...
...
service/src/main/java/objects/User.java
View file @
6311fc66
...
...
@@ -25,7 +25,6 @@ public class User {
this
.
email
=
email
;
}
public
String
getName
()
{
return
name
;
}
...
...
service/src/main/java/repositories/SolutionsRepository.java
View file @
6311fc66
...
...
@@ -10,7 +10,6 @@ import javax.inject.Inject;
* Created by gpietrus on 20.02.2016.
*/
public
class
SolutionsRepository
implements
Repository
{
private
MongoDBConnector
mongoDBConnector
;
@Inject
...
...
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