aboutsummaryrefslogtreecommitdiffstats
path: root/application-model
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@yahoo-inc.com>2017-08-30 18:18:04 +0200
committerJon Bratseth <bratseth@yahoo-inc.com>2017-08-30 18:18:04 +0200
commit85afc7537760d00578bf4d528554fd2889995c13 (patch)
tree924d6bbf66f8e06ab67d0830f38135b7cfc78baf /application-model
parent3bd91edd24abc7530f7362ac9ca6b2f703680bae (diff)
Nonfunctional changes
Diffstat (limited to 'application-model')
-rw-r--r--application-model/src/main/java/com/yahoo/vespa/applicationmodel/ApplicationInstance.java2
-rw-r--r--application-model/src/main/java/com/yahoo/vespa/applicationmodel/ApplicationInstanceId.java2
-rw-r--r--application-model/src/main/java/com/yahoo/vespa/applicationmodel/ApplicationInstanceReference.java2
-rw-r--r--application-model/src/main/java/com/yahoo/vespa/applicationmodel/ClusterId.java1
-rw-r--r--application-model/src/main/java/com/yahoo/vespa/applicationmodel/ConfigId.java1
-rw-r--r--application-model/src/main/java/com/yahoo/vespa/applicationmodel/HostName.java1
-rw-r--r--application-model/src/main/java/com/yahoo/vespa/applicationmodel/ServiceCluster.java2
-rw-r--r--application-model/src/main/java/com/yahoo/vespa/applicationmodel/ServiceClusterKey.java1
-rw-r--r--application-model/src/main/java/com/yahoo/vespa/applicationmodel/ServiceInstance.java2
-rw-r--r--application-model/src/main/java/com/yahoo/vespa/applicationmodel/ServiceType.java1
-rw-r--r--application-model/src/main/java/com/yahoo/vespa/applicationmodel/TenantId.java2
11 files changed, 17 insertions, 0 deletions
diff --git a/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ApplicationInstance.java b/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ApplicationInstance.java
index aa8f551d5b8..d2796f600c6 100644
--- a/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ApplicationInstance.java
+++ b/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ApplicationInstance.java
@@ -10,6 +10,7 @@ import java.util.Set;
* @author bjorncs
*/
public class ApplicationInstance<STATUS> {
+
private final TenantId tenantId;
private final ApplicationInstanceId applicationInstanceId;
private final Set<ServiceCluster<STATUS>> serviceClusters;
@@ -63,4 +64,5 @@ public class ApplicationInstance<STATUS> {
", serviceClusters=" + serviceClusters +
'}';
}
+
}
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 b468b3dbd8c..df19f6cf275 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
@@ -10,6 +10,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 {
+
private final String id;
public ApplicationInstanceId(String id) {
@@ -41,4 +42,5 @@ public class ApplicationInstanceId {
public int hashCode() {
return Objects.hash(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 d86bcb66014..e761e14caa4 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
@@ -11,6 +11,7 @@ import java.util.Objects;
*/
// TODO: Remove this and use ApplicationId instead (if you need it for the JSON stuff move it to that layer and don't let it leak)
public class ApplicationInstanceReference {
+
private final TenantId tenantId;
private final ApplicationInstanceId applicationInstanceId;
@@ -54,4 +55,5 @@ public class ApplicationInstanceReference {
public int hashCode() {
return Objects.hash(tenantId, applicationInstanceId);
}
+
}
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 91b326b1787..da5ea7f975d 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
@@ -41,4 +41,5 @@ public class ClusterId {
public int hashCode() {
return Objects.hash(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 c4eb531de73..3a9db7b84c0 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
@@ -40,4 +40,5 @@ public class ConfigId {
public int hashCode() {
return Objects.hash(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 b5cb1518f3a..66e79917ccf 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
@@ -46,4 +46,5 @@ public class HostName implements Comparable<HostName> {
public int compareTo(HostName o) {
return id.compareTo(o.id);
}
+
}
diff --git a/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ServiceCluster.java b/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ServiceCluster.java
index ee9ed11f9a4..84d1b44bbf2 100644
--- a/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ServiceCluster.java
+++ b/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ServiceCluster.java
@@ -12,6 +12,7 @@ import java.util.Set;
* @author bjorncs
*/
public class ServiceCluster<STATUS> {
+
private final ClusterId clusterId;
private final ServiceType serviceType;
private final Set<ServiceInstance<STATUS>> serviceInstances;
@@ -60,4 +61,5 @@ public class ServiceCluster<STATUS> {
public int hashCode() {
return Objects.hash(clusterId, serviceType, serviceInstances);
}
+
}
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 09208fab82c..843cbdd775b 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
@@ -50,4 +50,5 @@ public class ServiceClusterKey {
public int hashCode() {
return Objects.hash(clusterId, serviceType);
}
+
}
diff --git a/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ServiceInstance.java b/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ServiceInstance.java
index 73e09476abc..cb3e6f5e077 100644
--- a/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ServiceInstance.java
+++ b/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ServiceInstance.java
@@ -9,6 +9,7 @@ import java.util.Objects;
* @author bjorncs
*/
public class ServiceInstance<STATUS> {
+
private final ConfigId configId;
private final HostName hostName;
private final STATUS serviceStatus;
@@ -57,4 +58,5 @@ public class ServiceInstance<STATUS> {
public int hashCode() {
return Objects.hash(configId, hostName, serviceStatus);
}
+
}
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 cf867a893e6..784ff9d1e38 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
@@ -41,4 +41,5 @@ public class ServiceType {
public int hashCode() {
return Objects.hash(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 31a34dc9d1b..ba9d6251569 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
@@ -10,6 +10,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 {
+
private final String id;
public TenantId(String id) {
@@ -41,4 +42,5 @@ public class TenantId {
public int hashCode() {
return Objects.hash(id);
}
+
}