aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/io/trygvis/esper/testing/web/JerseyApplication.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/io/trygvis/esper/testing/web/JerseyApplication.java')
-rwxr-xr-xsrc/main/java/io/trygvis/esper/testing/web/JerseyApplication.java21
1 files changed, 10 insertions, 11 deletions
diff --git a/src/main/java/io/trygvis/esper/testing/web/JerseyApplication.java b/src/main/java/io/trygvis/esper/testing/web/JerseyApplication.java
index 8f66548..3c86581 100755
--- a/src/main/java/io/trygvis/esper/testing/web/JerseyApplication.java
+++ b/src/main/java/io/trygvis/esper/testing/web/JerseyApplication.java
@@ -8,6 +8,7 @@ import io.trygvis.esper.testing.*;
import io.trygvis.esper.testing.core.badge.*;
import io.trygvis.esper.testing.util.sql.*;
import io.trygvis.esper.testing.web.resource.*;
+import org.codehaus.jackson.map.*;
import javax.ws.rs.*;
import javax.ws.rs.core.*;
@@ -23,18 +24,22 @@ public class JerseyApplication extends Application {
private final HashSet<Object> singletons;
public JerseyApplication() throws Exception {
- DatabaseAccess da = new DatabaseAccess(WebConfig.config.createBoneCp());
+ Config config = WebConfig.config;
- BadgeService badgeService = new BadgeService();
+ DatabaseAccess da = new DatabaseAccess(config.createBoneCp());
+ ObjectMapper objectMapper = config.createObjectMapper();
- singletons = new HashSet<Object>(Arrays.asList(
+ BadgeService badgeService = new BadgeService(objectMapper);
+
+ singletons = new HashSet<>(Arrays.asList(
new CoreResource(da, badgeService),
- new JenkinsResource(da)
+ new JenkinsResource(da),
+ new MyObjectMapper(objectMapper)
));
}
public Set<Class<?>> getClasses() {
- return new HashSet<>(Arrays.<Class<?>>asList(ResourceParamInjector.class, MyObjectMapper.class));
+ return new HashSet<>(Arrays.<Class<?>>asList(ResourceParamInjector.class));
}
public Set<Object> getSingletons() {
@@ -44,12 +49,6 @@ public class JerseyApplication extends Application {
@Provider
public static class ResourceParamInjector implements InjectableProvider<MagicParam, Type> {
- private final ResourceContext rc;
-
- public ResourceParamInjector(@Context ResourceContext rc) {
- this.rc = rc;
- }
-
public ComponentScope getScope() {
return ComponentScope.PerRequest;
}