summaryrefslogtreecommitdiffstats
path: root/orchestrator
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorncs@yahoo-inc.com>2016-11-16 13:50:47 +0100
committerBjørn Christian Seime <bjorncs@yahoo-inc.com>2016-11-16 20:12:52 +0100
commit52016bbfe9cc8fdf397397f6be706667961c0b07 (patch)
tree359deeccf05804f8c7e3ed13dde863c13687ef90 /orchestrator
parent2a58636f064125d653ab0182ad1a8e68f6c57ce5 (diff)
Remove non-working provider for custom ObjectMapper
Diffstat (limited to 'orchestrator')
-rw-r--r--orchestrator/pom.xml23
-rw-r--r--orchestrator/src/main/java/com/yahoo/vespa/orchestrator/resources/providers/ObjectMapperContextResolver.java26
2 files changed, 0 insertions, 49 deletions
diff --git a/orchestrator/pom.xml b/orchestrator/pom.xml
index 717eab0d92e..07ac788e0a5 100644
--- a/orchestrator/pom.xml
+++ b/orchestrator/pom.xml
@@ -97,29 +97,6 @@
</exclusions>
</dependency>
<dependency>
- <groupId>com.fasterxml.jackson.module</groupId>
- <artifactId>jackson-module-scala_${scala.major-version}</artifactId>
- <version>${jackson2.version}</version>
- <exclusions>
- <exclusion>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-annotations</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>findbugs</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>${jackson2.version}</version>
diff --git a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/resources/providers/ObjectMapperContextResolver.java b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/resources/providers/ObjectMapperContextResolver.java
deleted file mode 100644
index 23a84d007d4..00000000000
--- a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/resources/providers/ObjectMapperContextResolver.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.yahoo.vespa.orchestrator.resources.providers;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.module.scala.DefaultScalaModule$;
-
-import javax.ws.rs.ext.ContextResolver;
-import javax.ws.rs.ext.Provider;
-
-/**
- * Allow Scala case classes to be serialized to JSON
- * @author bjorncs
- */
-@Provider
-public class ObjectMapperContextResolver implements ContextResolver<ObjectMapper> {
- private final ObjectMapper objectMapper;
-
- public ObjectMapperContextResolver() {
- objectMapper = new ObjectMapper();
- objectMapper.registerModule(DefaultScalaModule$.MODULE$);
- }
-
- @Override
- public ObjectMapper getContext(Class<?> type) {
- return objectMapper;
- }
-}