diff options
10 files changed, 8 insertions, 57 deletions
diff --git a/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ApplicationInstanceId.java b/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ApplicationInstanceId.java index 93b16b98d47..17d60690820 100644 --- a/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ApplicationInstanceId.java +++ b/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ApplicationInstanceId.java @@ -9,7 +9,7 @@ import java.util.Objects; */ // TODO: Remove this and use ApplicationName/InstanceName instead (if you need it for the JSON stuff move it to that layer and don't let it leak) public class ApplicationInstanceId { - public final String id; + private final String id; public ApplicationInstanceId(String id) { this.id = id; diff --git a/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ApplicationInstanceReference.java b/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ApplicationInstanceReference.java index bb458ea7999..d8feec5af3b 100644 --- a/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ApplicationInstanceReference.java +++ b/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ApplicationInstanceReference.java @@ -33,7 +33,7 @@ public class ApplicationInstanceReference { @JsonValue @Override public String toString() { - return tenantId.id + ":" + applicationInstanceId.id; + return tenantId.s() + ":" + applicationInstanceId.s(); } @Override diff --git a/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ClusterId.java b/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ClusterId.java index a2c3a4c21cb..b502eaff3fa 100644 --- a/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ClusterId.java +++ b/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ClusterId.java @@ -9,7 +9,7 @@ import java.util.Objects; */ public class ClusterId { - public final String id; + private final String id; public ClusterId(String id) { this.id = id; diff --git a/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ConfigId.java b/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ConfigId.java index 7a292edd00b..63794066352 100644 --- a/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ConfigId.java +++ b/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ConfigId.java @@ -9,7 +9,7 @@ import java.util.Objects; */ public class ConfigId { - public final String id; + private final String id; public ConfigId(String id) { this.id = id; diff --git a/application-model/src/main/java/com/yahoo/vespa/applicationmodel/HostName.java b/application-model/src/main/java/com/yahoo/vespa/applicationmodel/HostName.java index dc334085a4c..e6f8cd81fec 100644 --- a/application-model/src/main/java/com/yahoo/vespa/applicationmodel/HostName.java +++ b/application-model/src/main/java/com/yahoo/vespa/applicationmodel/HostName.java @@ -9,7 +9,7 @@ import java.util.Objects; */ public class HostName { - public final String id; + private final String id; public HostName(String id) { this.id = id; diff --git a/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ServiceClusterKey.java b/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ServiceClusterKey.java index baa443f0612..2c4653245e4 100644 --- a/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ServiceClusterKey.java +++ b/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ServiceClusterKey.java @@ -33,7 +33,7 @@ public class ServiceClusterKey { @JsonValue @Override public String toString() { - return clusterId.id + ":" + serviceType.id; + return clusterId.s() + ":" + serviceType.s(); } @Override diff --git a/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ServiceType.java b/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ServiceType.java index ed274782046..609f5b5c0f7 100644 --- a/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ServiceType.java +++ b/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ServiceType.java @@ -9,7 +9,7 @@ import java.util.Objects; */ public class ServiceType { - public final String id; + private final String id; public ServiceType(String id) { this.id = id; diff --git a/application-model/src/main/java/com/yahoo/vespa/applicationmodel/TenantId.java b/application-model/src/main/java/com/yahoo/vespa/applicationmodel/TenantId.java index a051ee069e5..ab656b55a2d 100644 --- a/application-model/src/main/java/com/yahoo/vespa/applicationmodel/TenantId.java +++ b/application-model/src/main/java/com/yahoo/vespa/applicationmodel/TenantId.java @@ -9,7 +9,7 @@ import java.util.Objects; */ // TODO: Remove this and use TenantName instead (if you need it for the JSON stuff move it to that layer and don't let it leak) public class TenantId { - public final String id; + private final String id; public TenantId(String id) { this.id = id; 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; - } -} |