diff options
author | Jon Marius Venstad <jvenstad@yahoo-inc.com> | 2019-04-23 17:02:01 +0200 |
---|---|---|
committer | Jon Marius Venstad <jvenstad@yahoo-inc.com> | 2019-06-06 13:03:28 +0200 |
commit | 838173044df5acd0d947bac163c6bd545e0479df (patch) | |
tree | 4fe2e1e90d457fc632d4b706862885aa10b55e5d /tenant-cd | |
parent | e1c84b011b03e30a43f141d8da8b1107a66d8a1a (diff) |
Move to ai.vespa.hosted
Diffstat (limited to 'tenant-cd')
-rw-r--r-- | tenant-cd/pom.xml | 3 | ||||
-rw-r--r-- | tenant-cd/src/main/java/ai/vespa/hosted/cd/Deployment.java (renamed from tenant-cd/src/main/java/com/yahoo/vespa/tenant/cd/Deployment.java) | 2 | ||||
-rw-r--r-- | tenant-cd/src/main/java/ai/vespa/hosted/cd/Digest.java (renamed from tenant-cd/src/main/java/com/yahoo/vespa/tenant/cd/Digest.java) | 2 | ||||
-rw-r--r-- | tenant-cd/src/main/java/ai/vespa/hosted/cd/Document.java (renamed from tenant-cd/src/main/java/com/yahoo/vespa/tenant/cd/Document.java) | 2 | ||||
-rw-r--r-- | tenant-cd/src/main/java/ai/vespa/hosted/cd/DocumentId.java (renamed from tenant-cd/src/main/java/com/yahoo/vespa/tenant/cd/DocumentId.java) | 2 | ||||
-rw-r--r-- | tenant-cd/src/main/java/ai/vespa/hosted/cd/Endpoint.java (renamed from tenant-cd/src/main/java/com/yahoo/vespa/tenant/cd/Endpoint.java) | 4 | ||||
-rw-r--r-- | tenant-cd/src/main/java/ai/vespa/hosted/cd/Feed.java (renamed from tenant-cd/src/main/java/com/yahoo/vespa/tenant/cd/Feed.java) | 2 | ||||
-rw-r--r-- | tenant-cd/src/main/java/ai/vespa/hosted/cd/FunctionalTest.java (renamed from tenant-cd/src/main/java/com/yahoo/vespa/tenant/cd/FunctionalTest.java) | 2 | ||||
-rw-r--r-- | tenant-cd/src/main/java/ai/vespa/hosted/cd/Query.java (renamed from tenant-cd/src/main/java/com/yahoo/vespa/tenant/cd/Query.java) | 2 | ||||
-rw-r--r-- | tenant-cd/src/main/java/ai/vespa/hosted/cd/Search.java (renamed from tenant-cd/src/main/java/com/yahoo/vespa/tenant/cd/Search.java) | 2 | ||||
-rw-r--r-- | tenant-cd/src/main/java/ai/vespa/hosted/cd/Selection.java (renamed from tenant-cd/src/main/java/com/yahoo/vespa/tenant/cd/Selection.java) | 2 | ||||
-rw-r--r-- | tenant-cd/src/main/java/ai/vespa/hosted/cd/TestConfig.java (renamed from tenant-cd/src/main/java/com/yahoo/vespa/tenant/cd/TestConfig.java) | 3 | ||||
-rw-r--r-- | tenant-cd/src/main/java/ai/vespa/hosted/cd/TestDeployment.java (renamed from tenant-cd/src/main/java/com/yahoo/vespa/tenant/cd/TestDeployment.java) | 2 | ||||
-rw-r--r-- | tenant-cd/src/main/java/ai/vespa/hosted/cd/TestEndpoint.java (renamed from tenant-cd/src/main/java/com/yahoo/vespa/tenant/cd/TestEndpoint.java) | 4 | ||||
-rw-r--r-- | tenant-cd/src/main/java/ai/vespa/hosted/cd/UpgradeTest.java (renamed from tenant-cd/src/main/java/com/yahoo/vespa/tenant/cd/UpgradeTest.java) | 2 | ||||
-rw-r--r-- | tenant-cd/src/main/java/ai/vespa/hosted/cd/Visit.java (renamed from tenant-cd/src/main/java/com/yahoo/vespa/tenant/cd/Visit.java) | 2 | ||||
-rw-r--r-- | tenant-cd/src/main/java/ai/vespa/hosted/cd/VisitEndpoint.java (renamed from tenant-cd/src/main/java/com/yahoo/vespa/tenant/cd/VisitEndpoint.java) | 2 | ||||
-rw-r--r-- | tenant-cd/src/main/java/ai/vespa/hosted/cd/http/HttpEndpoint.java (renamed from tenant-cd/src/main/java/com/yahoo/vespa/tenant/cd/http/HttpEndpoint.java) | 20 | ||||
-rw-r--r-- | tenant-cd/src/main/java/ai/vespa/hosted/cd/http/Security.java (renamed from tenant-cd/src/main/java/com/yahoo/vespa/tenant/cd/http/Security.java) | 2 | ||||
-rw-r--r-- | tenant-cd/src/main/java/ai/vespa/hosted/cd/metrics/Metric.java (renamed from tenant-cd/src/main/java/com/yahoo/vespa/tenant/cd/metrics/Metric.java) | 2 | ||||
-rw-r--r-- | tenant-cd/src/main/java/ai/vespa/hosted/cd/metrics/Metrics.java (renamed from tenant-cd/src/main/java/com/yahoo/vespa/tenant/cd/metrics/Metrics.java) | 4 | ||||
-rw-r--r-- | tenant-cd/src/main/java/ai/vespa/hosted/cd/metrics/Space.java (renamed from tenant-cd/src/main/java/com/yahoo/vespa/tenant/cd/metrics/Space.java) | 2 | ||||
-rw-r--r-- | tenant-cd/src/main/java/ai/vespa/hosted/cd/metrics/Statistic.java (renamed from tenant-cd/src/main/java/com/yahoo/vespa/tenant/cd/metrics/Statistic.java) | 4 | ||||
-rw-r--r-- | tenant-cd/src/main/java/ai/vespa/hosted/cd/metrics/Type.java (renamed from tenant-cd/src/main/java/com/yahoo/vespa/tenant/cd/metrics/Type.java) | 2 |
24 files changed, 35 insertions, 41 deletions
diff --git a/tenant-cd/pom.xml b/tenant-cd/pom.xml index 2fdf5adfb57..5b73e746b3b 100644 --- a/tenant-cd/pom.xml +++ b/tenant-cd/pom.xml @@ -5,7 +5,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> - <artifactId>tenant-cd</artifactId> + <groupId>ai.vespa.hosted</groupId> + <artifactId>cd</artifactId> <name>Hosted Vespa tenant CD</name> <description>Test library for hosted Vespa applications.</description> <url>https://github.com/vespa-engine</url> diff --git a/tenant-cd/src/main/java/com/yahoo/vespa/tenant/cd/Deployment.java b/tenant-cd/src/main/java/ai/vespa/hosted/cd/Deployment.java index 02627ae7c9e..495d2374435 100644 --- a/tenant-cd/src/main/java/com/yahoo/vespa/tenant/cd/Deployment.java +++ b/tenant-cd/src/main/java/ai/vespa/hosted/cd/Deployment.java @@ -1,4 +1,4 @@ -package com.yahoo.vespa.tenant.cd; +package ai.vespa.hosted.cd; /** * A deployment of a Vespa application, which contains endpoints for document and metrics retrieval. diff --git a/tenant-cd/src/main/java/com/yahoo/vespa/tenant/cd/Digest.java b/tenant-cd/src/main/java/ai/vespa/hosted/cd/Digest.java index 73b804dc33c..dee13fdca13 100644 --- a/tenant-cd/src/main/java/com/yahoo/vespa/tenant/cd/Digest.java +++ b/tenant-cd/src/main/java/ai/vespa/hosted/cd/Digest.java @@ -1,4 +1,4 @@ -package com.yahoo.vespa.tenant.cd; +package ai.vespa.hosted.cd; import java.util.Set; diff --git a/tenant-cd/src/main/java/com/yahoo/vespa/tenant/cd/Document.java b/tenant-cd/src/main/java/ai/vespa/hosted/cd/Document.java index acb1ea08623..91adeded65c 100644 --- a/tenant-cd/src/main/java/com/yahoo/vespa/tenant/cd/Document.java +++ b/tenant-cd/src/main/java/ai/vespa/hosted/cd/Document.java @@ -1,4 +1,4 @@ -package com.yahoo.vespa.tenant.cd; +package ai.vespa.hosted.cd; /** * A schema-less representation of a generic Vespa document. diff --git a/tenant-cd/src/main/java/com/yahoo/vespa/tenant/cd/DocumentId.java b/tenant-cd/src/main/java/ai/vespa/hosted/cd/DocumentId.java index c4fc7103b05..9aa8e80c977 100644 --- a/tenant-cd/src/main/java/com/yahoo/vespa/tenant/cd/DocumentId.java +++ b/tenant-cd/src/main/java/ai/vespa/hosted/cd/DocumentId.java @@ -1,4 +1,4 @@ -package com.yahoo.vespa.tenant.cd; +package ai.vespa.hosted.cd; import java.util.Arrays; import java.util.List; diff --git a/tenant-cd/src/main/java/com/yahoo/vespa/tenant/cd/Endpoint.java b/tenant-cd/src/main/java/ai/vespa/hosted/cd/Endpoint.java index e238d38112b..5103a2eed12 100644 --- a/tenant-cd/src/main/java/com/yahoo/vespa/tenant/cd/Endpoint.java +++ b/tenant-cd/src/main/java/ai/vespa/hosted/cd/Endpoint.java @@ -1,6 +1,6 @@ -package com.yahoo.vespa.tenant.cd; +package ai.vespa.hosted.cd; -import com.yahoo.vespa.tenant.cd.metrics.Metrics; +import ai.vespa.hosted.cd.metrics.Metrics; /** * An endpoint in a Vespa application {@link Deployment}, which allows document and metrics retrieval. diff --git a/tenant-cd/src/main/java/com/yahoo/vespa/tenant/cd/Feed.java b/tenant-cd/src/main/java/ai/vespa/hosted/cd/Feed.java index 0b6b1702c80..e9a0a0aeff0 100644 --- a/tenant-cd/src/main/java/com/yahoo/vespa/tenant/cd/Feed.java +++ b/tenant-cd/src/main/java/ai/vespa/hosted/cd/Feed.java @@ -1,4 +1,4 @@ -package com.yahoo.vespa.tenant.cd; +package ai.vespa.hosted.cd; import java.util.Map; import java.util.Set; diff --git a/tenant-cd/src/main/java/com/yahoo/vespa/tenant/cd/FunctionalTest.java b/tenant-cd/src/main/java/ai/vespa/hosted/cd/FunctionalTest.java index 3c48e2d32f0..e6beb313d28 100644 --- a/tenant-cd/src/main/java/com/yahoo/vespa/tenant/cd/FunctionalTest.java +++ b/tenant-cd/src/main/java/ai/vespa/hosted/cd/FunctionalTest.java @@ -1,4 +1,4 @@ -package com.yahoo.vespa.tenant.cd; +package ai.vespa.hosted.cd; /** * Tests that compare the behaviour of a Vespa application deployment against a fixed specification. diff --git a/tenant-cd/src/main/java/com/yahoo/vespa/tenant/cd/Query.java b/tenant-cd/src/main/java/ai/vespa/hosted/cd/Query.java index e8b950c1fe8..d421dc14322 100644 --- a/tenant-cd/src/main/java/com/yahoo/vespa/tenant/cd/Query.java +++ b/tenant-cd/src/main/java/ai/vespa/hosted/cd/Query.java @@ -1,4 +1,4 @@ -package com.yahoo.vespa.tenant.cd; +package ai.vespa.hosted.cd; import java.util.Map; import java.util.stream.Stream; diff --git a/tenant-cd/src/main/java/com/yahoo/vespa/tenant/cd/Search.java b/tenant-cd/src/main/java/ai/vespa/hosted/cd/Search.java index c53553628d9..a7538075f36 100644 --- a/tenant-cd/src/main/java/com/yahoo/vespa/tenant/cd/Search.java +++ b/tenant-cd/src/main/java/ai/vespa/hosted/cd/Search.java @@ -1,4 +1,4 @@ -package com.yahoo.vespa.tenant.cd; +package ai.vespa.hosted.cd; import java.util.SortedMap; diff --git a/tenant-cd/src/main/java/com/yahoo/vespa/tenant/cd/Selection.java b/tenant-cd/src/main/java/ai/vespa/hosted/cd/Selection.java index 2c405c4ceec..021b217a255 100644 --- a/tenant-cd/src/main/java/com/yahoo/vespa/tenant/cd/Selection.java +++ b/tenant-cd/src/main/java/ai/vespa/hosted/cd/Selection.java @@ -1,4 +1,4 @@ -package com.yahoo.vespa.tenant.cd; +package ai.vespa.hosted.cd; /** * A document selection expression, type and cluster, which can be used to visit an {@link Endpoint}. diff --git a/tenant-cd/src/main/java/com/yahoo/vespa/tenant/cd/TestConfig.java b/tenant-cd/src/main/java/ai/vespa/hosted/cd/TestConfig.java index 12b48600fbf..78b3dfdc70d 100644 --- a/tenant-cd/src/main/java/com/yahoo/vespa/tenant/cd/TestConfig.java +++ b/tenant-cd/src/main/java/ai/vespa/hosted/cd/TestConfig.java @@ -1,4 +1,4 @@ -package com.yahoo.vespa.tenant.cd; +package ai.vespa.hosted.cd; import com.yahoo.config.provision.ApplicationId; import com.yahoo.slime.ArrayTraverser; @@ -16,7 +16,6 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.stream.IntStream; /** * The place to obtain environment-dependent configuration for the current test run. diff --git a/tenant-cd/src/main/java/com/yahoo/vespa/tenant/cd/TestDeployment.java b/tenant-cd/src/main/java/ai/vespa/hosted/cd/TestDeployment.java index 21bae8545e4..3360c12e374 100644 --- a/tenant-cd/src/main/java/com/yahoo/vespa/tenant/cd/TestDeployment.java +++ b/tenant-cd/src/main/java/ai/vespa/hosted/cd/TestDeployment.java @@ -1,4 +1,4 @@ -package com.yahoo.vespa.tenant.cd; +package ai.vespa.hosted.cd; /** * A deployment of a Vespa application, which also contains endpoints for document manipulation. diff --git a/tenant-cd/src/main/java/com/yahoo/vespa/tenant/cd/TestEndpoint.java b/tenant-cd/src/main/java/ai/vespa/hosted/cd/TestEndpoint.java index 479ae1d17d2..f6f8a722f19 100644 --- a/tenant-cd/src/main/java/com/yahoo/vespa/tenant/cd/TestEndpoint.java +++ b/tenant-cd/src/main/java/ai/vespa/hosted/cd/TestEndpoint.java @@ -1,6 +1,4 @@ -package com.yahoo.vespa.tenant.cd; - -import java.util.concurrent.Future; +package ai.vespa.hosted.cd; /** * An endpoint in a Vespa application {@link TestDeployment}, which also translates {@link Feed}s to {@link Digest}s. diff --git a/tenant-cd/src/main/java/com/yahoo/vespa/tenant/cd/UpgradeTest.java b/tenant-cd/src/main/java/ai/vespa/hosted/cd/UpgradeTest.java index 329e58b5a89..32083fbd5f6 100644 --- a/tenant-cd/src/main/java/com/yahoo/vespa/tenant/cd/UpgradeTest.java +++ b/tenant-cd/src/main/java/ai/vespa/hosted/cd/UpgradeTest.java @@ -1,4 +1,4 @@ -package com.yahoo.vespa.tenant.cd; +package ai.vespa.hosted.cd; /** * Tests that assert continuity of behaviour for Vespa application deployments, through upgrades. diff --git a/tenant-cd/src/main/java/com/yahoo/vespa/tenant/cd/Visit.java b/tenant-cd/src/main/java/ai/vespa/hosted/cd/Visit.java index 3e36b9434aa..3bb2f59de97 100644 --- a/tenant-cd/src/main/java/com/yahoo/vespa/tenant/cd/Visit.java +++ b/tenant-cd/src/main/java/ai/vespa/hosted/cd/Visit.java @@ -1,4 +1,4 @@ -package com.yahoo.vespa.tenant.cd; +package ai.vespa.hosted.cd; import java.util.Map; diff --git a/tenant-cd/src/main/java/com/yahoo/vespa/tenant/cd/VisitEndpoint.java b/tenant-cd/src/main/java/ai/vespa/hosted/cd/VisitEndpoint.java index 6eb4df625aa..618a004a571 100644 --- a/tenant-cd/src/main/java/com/yahoo/vespa/tenant/cd/VisitEndpoint.java +++ b/tenant-cd/src/main/java/ai/vespa/hosted/cd/VisitEndpoint.java @@ -1,4 +1,4 @@ -package com.yahoo.vespa.tenant.cd; +package ai.vespa.hosted.cd; /** * A remote endpoint in a Vespa application {@link Deployment}, which translates {@link Selection}s to {@link Visit}s. diff --git a/tenant-cd/src/main/java/com/yahoo/vespa/tenant/cd/http/HttpEndpoint.java b/tenant-cd/src/main/java/ai/vespa/hosted/cd/http/HttpEndpoint.java index 45b698e3808..fb5d3ac5ea5 100644 --- a/tenant-cd/src/main/java/com/yahoo/vespa/tenant/cd/http/HttpEndpoint.java +++ b/tenant-cd/src/main/java/ai/vespa/hosted/cd/http/HttpEndpoint.java @@ -1,24 +1,22 @@ -package com.yahoo.vespa.tenant.cd.http; +package ai.vespa.hosted.cd.http; import com.yahoo.slime.Inspector; import com.yahoo.slime.JsonDecoder; import com.yahoo.slime.Slime; -import com.yahoo.vespa.tenant.cd.Digest; -import com.yahoo.vespa.tenant.cd.Feed; -import com.yahoo.vespa.tenant.cd.Query; -import com.yahoo.vespa.tenant.cd.Search; -import com.yahoo.vespa.tenant.cd.Selection; -import com.yahoo.vespa.tenant.cd.TestEndpoint; -import com.yahoo.vespa.tenant.cd.Visit; -import com.yahoo.vespa.tenant.cd.metrics.Metrics; +import ai.vespa.hosted.cd.Digest; +import ai.vespa.hosted.cd.Feed; +import ai.vespa.hosted.cd.Query; +import ai.vespa.hosted.cd.Search; +import ai.vespa.hosted.cd.Selection; +import ai.vespa.hosted.cd.TestEndpoint; +import ai.vespa.hosted.cd.Visit; +import ai.vespa.hosted.cd.metrics.Metrics; -import java.io.IOException; import java.net.URI; import java.net.http.HttpClient; import java.net.http.HttpRequest; import java.net.http.HttpResponse; import java.time.Duration; -import java.util.Objects; import static java.util.Objects.requireNonNull; diff --git a/tenant-cd/src/main/java/com/yahoo/vespa/tenant/cd/http/Security.java b/tenant-cd/src/main/java/ai/vespa/hosted/cd/http/Security.java index ebce7842d6d..b4524e3922a 100644 --- a/tenant-cd/src/main/java/com/yahoo/vespa/tenant/cd/http/Security.java +++ b/tenant-cd/src/main/java/ai/vespa/hosted/cd/http/Security.java @@ -1,4 +1,4 @@ -package com.yahoo.vespa.tenant.cd.http; +package ai.vespa.hosted.cd.http; import com.yahoo.security.KeyUtils; import com.yahoo.security.SslContextBuilder; diff --git a/tenant-cd/src/main/java/com/yahoo/vespa/tenant/cd/metrics/Metric.java b/tenant-cd/src/main/java/ai/vespa/hosted/cd/metrics/Metric.java index 37adf8239fc..59dc6e4bfcf 100644 --- a/tenant-cd/src/main/java/com/yahoo/vespa/tenant/cd/metrics/Metric.java +++ b/tenant-cd/src/main/java/ai/vespa/hosted/cd/metrics/Metric.java @@ -1,4 +1,4 @@ -package com.yahoo.vespa.tenant.cd.metrics; +package ai.vespa.hosted.cd.metrics; import java.util.HashMap; import java.util.Map; diff --git a/tenant-cd/src/main/java/com/yahoo/vespa/tenant/cd/metrics/Metrics.java b/tenant-cd/src/main/java/ai/vespa/hosted/cd/metrics/Metrics.java index fb2528c4df5..9318fec49d1 100644 --- a/tenant-cd/src/main/java/com/yahoo/vespa/tenant/cd/metrics/Metrics.java +++ b/tenant-cd/src/main/java/ai/vespa/hosted/cd/metrics/Metrics.java @@ -1,6 +1,6 @@ -package com.yahoo.vespa.tenant.cd.metrics; +package ai.vespa.hosted.cd.metrics; -import com.yahoo.vespa.tenant.cd.Endpoint; +import ai.vespa.hosted.cd.Endpoint; import java.time.Instant; import java.util.Map; diff --git a/tenant-cd/src/main/java/com/yahoo/vespa/tenant/cd/metrics/Space.java b/tenant-cd/src/main/java/ai/vespa/hosted/cd/metrics/Space.java index 38066373b28..54224345fa9 100644 --- a/tenant-cd/src/main/java/com/yahoo/vespa/tenant/cd/metrics/Space.java +++ b/tenant-cd/src/main/java/ai/vespa/hosted/cd/metrics/Space.java @@ -1,4 +1,4 @@ -package com.yahoo.vespa.tenant.cd.metrics; +package ai.vespa.hosted.cd.metrics; import java.util.List; import java.util.Map; diff --git a/tenant-cd/src/main/java/com/yahoo/vespa/tenant/cd/metrics/Statistic.java b/tenant-cd/src/main/java/ai/vespa/hosted/cd/metrics/Statistic.java index e3315bcd181..65877d15de4 100644 --- a/tenant-cd/src/main/java/com/yahoo/vespa/tenant/cd/metrics/Statistic.java +++ b/tenant-cd/src/main/java/ai/vespa/hosted/cd/metrics/Statistic.java @@ -1,11 +1,9 @@ -package com.yahoo.vespa.tenant.cd.metrics; +package ai.vespa.hosted.cd.metrics; import java.util.HashMap; import java.util.Map; import java.util.NoSuchElementException; import java.util.StringJoiner; -import java.util.function.Function; -import java.util.stream.Collectors; import static java.util.Map.copyOf; diff --git a/tenant-cd/src/main/java/com/yahoo/vespa/tenant/cd/metrics/Type.java b/tenant-cd/src/main/java/ai/vespa/hosted/cd/metrics/Type.java index b8b168cc649..0d75c1c7e35 100644 --- a/tenant-cd/src/main/java/com/yahoo/vespa/tenant/cd/metrics/Type.java +++ b/tenant-cd/src/main/java/ai/vespa/hosted/cd/metrics/Type.java @@ -1,4 +1,4 @@ -package com.yahoo.vespa.tenant.cd.metrics; +package ai.vespa.hosted.cd.metrics; /** * Known statistic types. |