diff options
| author | Bjørn Christian Seime <bjorn.christian@seime.no> | 2016-11-15 09:59:12 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-15 09:59:12 +0100 |
| commit | cf6a185a17988a536aca2d5d5ab2ca590f42153e (patch) | |
| tree | 2aa11d2ccddb4f1a64b35dedda83e36284d4ca88 | |
| parent | 5088175d738ebd6b9515bee122ef91f1274416e6 (diff) | |
| parent | b2d34c53112d8ed6e1b8fc46199787c58acc07bb (diff) | |
Merge pull request #1086 from yahoo/bjorncs/bring-back-objectmapper
Bjorncs/bring back objectmapper
| l--------- | orchestrator-restapi/.#pom.xml | 1 | ||||
| -rw-r--r-- | orchestrator-restapi/pom.xml | 23 | ||||
| -rw-r--r-- | orchestrator/pom.xml | 23 | ||||
| -rw-r--r-- | orchestrator/src/main/java/com/yahoo/vespa/orchestrator/resources/providers/ObjectMapperContextResolver.java | 26 |
4 files changed, 49 insertions, 24 deletions
diff --git a/orchestrator-restapi/.#pom.xml b/orchestrator-restapi/.#pom.xml deleted file mode 120000 index 2cbe7080c4a..00000000000 --- a/orchestrator-restapi/.#pom.xml +++ /dev/null @@ -1 +0,0 @@ -hakon@seemstepcare-ll.trondheim.corp.yahoo.com.21087:1476431678
\ No newline at end of file diff --git a/orchestrator-restapi/pom.xml b/orchestrator-restapi/pom.xml index 055811783b1..b2b581a7fc6 100644 --- a/orchestrator-restapi/pom.xml +++ b/orchestrator-restapi/pom.xml @@ -22,29 +22,6 @@ <scope>provided</scope> </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/pom.xml b/orchestrator/pom.xml index 07ac788e0a5..717eab0d92e 100644 --- a/orchestrator/pom.xml +++ b/orchestrator/pom.xml @@ -97,6 +97,29 @@ </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 new file mode 100644 index 00000000000..23a84d007d4 --- /dev/null +++ b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/resources/providers/ObjectMapperContextResolver.java @@ -0,0 +1,26 @@ +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; + } +} |