summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJon Marius Venstad <jvenstad@yahoo-inc.com>2018-06-20 11:17:33 +0200
committerJon Marius Venstad <jvenstad@yahoo-inc.com>2018-06-20 11:17:33 +0200
commit10205b5625cfc7bb69131b2671bc777134a5f44b (patch)
treef9f603efdce15814b20b2c83e28500e97e64fe27
parentf046f3ef6d95d44049aecb03c809592d8e2294b2 (diff)
Move files to correct module
-rw-r--r--controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/LogStore.java (renamed from controller-server/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/LogStore.java)8
-rw-r--r--controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/deployment/JobType.java (renamed from controller-server/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/deployment/JobType.java)1
2 files changed, 5 insertions, 4 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/LogStore.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/LogStore.java
index 608a6e6ae9f..0a7bacefffb 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/LogStore.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/LogStore.java
@@ -1,17 +1,19 @@
package com.yahoo.vespa.hosted.controller.api.integration;
import com.yahoo.config.provision.ApplicationId;
+import com.yahoo.vespa.hosted.controller.api.integration.deployment.JobType;
import com.yahoo.vespa.hosted.controller.api.integration.zone.ZoneId;
+// TODO jvenstad: Change most of this.
public interface LogStore {
/** Returns the log of the given deployment job. */
- String getTestLog(ApplicationId applicationId, ZoneId zoneId, int buildId);
+ String getTestLog(ApplicationId application, JobType jobType, int build);
/** Stores the given log for the given deployment job. */
- void setTestLog(ApplicationId applicationId, ZoneId zoneId, int buildId, String log);
+ void setTestLog(ApplicationId application, JobType jobType, int build, String log);
/** Deletes the log for the given deployment job. */
- void deleteTestLog(ApplicationId applicationId, ZoneId zoneId, int buildId);
+ void deleteTestLog(ApplicationId application, JobType jobType, int build);
}
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/deployment/JobType.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/deployment/JobType.java
index 93ca86486d3..c9c73c3844a 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/deployment/JobType.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/deployment/JobType.java
@@ -5,7 +5,6 @@ import com.yahoo.config.provision.Environment;
import com.yahoo.config.provision.RegionName;
import com.yahoo.config.provision.SystemName;
import com.yahoo.vespa.hosted.controller.api.integration.zone.ZoneId;
-import com.yahoo.vespa.hosted.controller.application.DeploymentJobs;
import java.util.Optional;
import java.util.stream.Stream;