aurora-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject incubator-aurora git commit: Renaming storage.thrift job store structs.
Date Wed, 25 Feb 2015 02:32:25 GMT
Repository: incubator-aurora
Updated Branches:
  refs/heads/master cd681d9e0 -> 4d5885b84


Renaming storage.thrift job store structs.

Reviewed at https://reviews.apache.org/r/31394/


Project: http://git-wip-us.apache.org/repos/asf/incubator-aurora/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-aurora/commit/4d5885b8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-aurora/tree/4d5885b8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-aurora/diff/4d5885b8

Branch: refs/heads/master
Commit: 4d5885b8442af7a37a06255db5b0918d991bd498
Parents: cd681d9
Author: Maxim Khutornenko <maxim@apache.org>
Authored: Tue Feb 24 18:31:57 2015 -0800
Committer: Maxim Khutornenko <maxim@apache.org>
Committed: Tue Feb 24 18:31:57 2015 -0800

----------------------------------------------------------------------
 .../thrift/org/apache/aurora/gen/storage.thrift | 10 +--
 .../scheduler/cron/quartz/AuroraCronJob.java    |  2 +-
 .../cron/quartz/CronJobManagerImpl.java         | 30 +++----
 .../aurora/scheduler/http/StructDump.java       |  2 +-
 .../aurora/scheduler/quota/QuotaManager.java    |  2 +-
 .../aurora/scheduler/storage/CronJobStore.java  | 64 ++++++++++++++
 .../scheduler/storage/ForwardingStore.java      | 14 +--
 .../aurora/scheduler/storage/JobStore.java      | 64 --------------
 .../aurora/scheduler/storage/Storage.java       |  6 +-
 .../scheduler/storage/StorageBackfill.java      |  4 +-
 .../aurora/scheduler/storage/db/DbStorage.java  |  4 +-
 .../scheduler/storage/log/LogStorage.java       | 18 ++--
 .../storage/log/SnapshotStoreImpl.java          | 18 ++--
 .../storage/log/StreamManagerImpl.java          |  2 +-
 .../storage/log/WriteAheadStorage.java          | 14 +--
 .../scheduler/storage/mem/MemJobStore.java      |  4 +-
 .../scheduler/storage/mem/MemStorage.java       |  6 +-
 .../scheduler/storage/mem/MemStorageModule.java |  6 +-
 .../thrift/SchedulerThriftInterface.java        |  8 +-
 .../cron/quartz/AuroraCronJobTest.java          |  4 +-
 .../aurora/scheduler/cron/quartz/CronIT.java    |  2 +-
 .../cron/quartz/CronJobManagerImplTest.java     |  4 +-
 .../scheduler/storage/StorageBackfillTest.java  |  4 +-
 .../scheduler/storage/backup/RecoveryTest.java  |  4 +-
 .../storage/backup/StorageBackupTest.java       |  6 +-
 .../scheduler/storage/log/LogStorageTest.java   | 14 +--
 .../storage/log/SnapshotStoreImplTest.java      |  6 +-
 .../storage/log/WriteAheadStorageTest.java      |  6 +-
 .../storage/mem/MemCronJobStoreTest.java        | 91 ++++++++++++++++++++
 .../scheduler/storage/mem/MemJobStoreTest.java  | 91 --------------------
 .../storage/testing/StorageTestUtil.java        | 10 +--
 31 files changed, 259 insertions(+), 261 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/4d5885b8/api/src/main/thrift/org/apache/aurora/gen/storage.thrift
----------------------------------------------------------------------
diff --git a/api/src/main/thrift/org/apache/aurora/gen/storage.thrift b/api/src/main/thrift/org/apache/aurora/gen/storage.thrift
index d3b50d7..26c5db8 100644
--- a/api/src/main/thrift/org/apache/aurora/gen/storage.thrift
+++ b/api/src/main/thrift/org/apache/aurora/gen/storage.thrift
@@ -24,8 +24,7 @@ struct SaveFrameworkId {
   1: string id
 }
 
-// TODO(maxim): Rename this into SaveCronJob.
-struct SaveAcceptedJob {
+struct SaveCronJob {
   2: api.JobConfiguration jobConfig
 }
 
@@ -99,7 +98,7 @@ struct PruneJobUpdateHistory {
 
 union Op {
   1: SaveFrameworkId saveFrameworkId
-  2: SaveAcceptedJob saveAcceptedJob
+  2: SaveCronJob saveCronJob
   5: RemoveJob removeJob
   6: SaveTasks saveTasks
   7: RemoveTasks removeTasks
@@ -126,8 +125,7 @@ struct Transaction {
   2: i32 schemaVersion
 }
 
-// TODO(maxim): rename this into StoredCronJob.
-struct StoredJob {
+struct StoredCronJob {
   3: api.JobConfiguration jobConfiguration
 }
 
@@ -160,7 +158,7 @@ struct Snapshot {
 
   3: set<api.HostAttributes> hostAttributes
   4: set<api.ScheduledTask> tasks
-  5: set<StoredJob> jobs
+  5: set<StoredCronJob> cronJobs
   6: SchedulerMetadata schedulerMetadata
   8: set<QuotaConfiguration> quotaConfigurations
   9: set<api.Lock> locks

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/4d5885b8/src/main/java/org/apache/aurora/scheduler/cron/quartz/AuroraCronJob.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/cron/quartz/AuroraCronJob.java b/src/main/java/org/apache/aurora/scheduler/cron/quartz/AuroraCronJob.java
index c883421..3b5dcf8 100644
--- a/src/main/java/org/apache/aurora/scheduler/cron/quartz/AuroraCronJob.java
+++ b/src/main/java/org/apache/aurora/scheduler/cron/quartz/AuroraCronJob.java
@@ -116,7 +116,7 @@ class AuroraCronJob implements Job {
         new Storage.MutateWork.Quiet<Optional<DeferredLaunch>>() {
           @Override
           public Optional<DeferredLaunch> apply(Storage.MutableStoreProvider storeProvider) {
-            Optional<IJobConfiguration> config = storeProvider.getJobStore().fetchJob(key);
+            Optional<IJobConfiguration> config = storeProvider.getCronJobStore().fetchJob(key);
             if (!config.isPresent()) {
               LOG.warning(String.format(
                   "Cron was triggered for %s but no job with that key was found in storage.",

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/4d5885b8/src/main/java/org/apache/aurora/scheduler/cron/quartz/CronJobManagerImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/cron/quartz/CronJobManagerImpl.java b/src/main/java/org/apache/aurora/scheduler/cron/quartz/CronJobManagerImpl.java
index 916cb6d..770672c 100644
--- a/src/main/java/org/apache/aurora/scheduler/cron/quartz/CronJobManagerImpl.java
+++ b/src/main/java/org/apache/aurora/scheduler/cron/quartz/CronJobManagerImpl.java
@@ -31,7 +31,7 @@ import org.apache.aurora.scheduler.cron.CronException;
 import org.apache.aurora.scheduler.cron.CronJobManager;
 import org.apache.aurora.scheduler.cron.CrontabEntry;
 import org.apache.aurora.scheduler.cron.SanitizedCronJob;
-import org.apache.aurora.scheduler.storage.JobStore;
+import org.apache.aurora.scheduler.storage.CronJobStore;
 import org.apache.aurora.scheduler.storage.Storage;
 import org.apache.aurora.scheduler.storage.Storage.MutateWork;
 import org.apache.aurora.scheduler.storage.Storage.Work;
@@ -72,7 +72,7 @@ class CronJobManagerImpl implements CronJobManager {
     storage.read(new Work<Void, CronException>() {
       @Override
       public Void apply(Storage.StoreProvider storeProvider) throws CronException {
-        checkCronExists(jobKey, storeProvider.getJobStore());
+        checkCronExists(jobKey, storeProvider.getCronJobStore());
         triggerJob(jobKey);
         return null;
       }
@@ -106,11 +106,11 @@ class CronJobManagerImpl implements CronJobManager {
     storage.write(new MutateWork.NoResult<CronException>() {
       @Override
       public void execute(Storage.MutableStoreProvider storeProvider) throws CronException {
-        checkCronExists(jobKey, storeProvider.getJobStore());
+        checkCronExists(jobKey, storeProvider.getCronJobStore());
 
-        removeJob(jobKey, storeProvider.getJobStore());
+        removeJob(jobKey, storeProvider.getCronJobStore());
         descheduleJob(jobKey);
-        saveJob(config, storeProvider.getJobStore());
+        saveJob(config, storeProvider.getCronJobStore());
         scheduleJob(config.getCrontabEntry(), jobKey);
       }
     });
@@ -125,32 +125,32 @@ class CronJobManagerImpl implements CronJobManager {
     storage.write(new MutateWork.NoResult<CronException>() {
       @Override
       protected void execute(Storage.MutableStoreProvider storeProvider) throws CronException {
-        checkNotExists(jobKey, storeProvider.getJobStore());
+        checkNotExists(jobKey, storeProvider.getCronJobStore());
 
-        saveJob(cronJob, storeProvider.getJobStore());
+        saveJob(cronJob, storeProvider.getCronJobStore());
         scheduleJob(cronJob.getCrontabEntry(), jobKey);
       }
     });
   }
 
-  private void checkNotExists(IJobKey jobKey, JobStore jobStore) throws CronException {
-    if (jobStore.fetchJob(jobKey).isPresent()) {
+  private void checkNotExists(IJobKey jobKey, CronJobStore cronJobStore) throws CronException {
+    if (cronJobStore.fetchJob(jobKey).isPresent()) {
       throw new CronException(formatMessage("Job already exists for %s.", jobKey));
     }
   }
 
-  private void checkCronExists(IJobKey jobKey, JobStore jobStore) throws CronException {
-    if (!jobStore.fetchJob(jobKey).isPresent()) {
+  private void checkCronExists(IJobKey jobKey, CronJobStore cronJobStore) throws CronException {
+    if (!cronJobStore.fetchJob(jobKey).isPresent()) {
       throw new CronException(formatMessage("No cron job found for %s.", jobKey));
     }
   }
 
-  private void removeJob(IJobKey jobKey, JobStore.Mutable jobStore) {
+  private void removeJob(IJobKey jobKey, CronJobStore.Mutable jobStore) {
     jobStore.removeJob(jobKey);
     LOG.info(formatMessage("Deleted cron job %s from storage.", jobKey));
   }
 
-  private void saveJob(SanitizedCronJob cronJob, JobStore.Mutable jobStore) {
+  private void saveJob(SanitizedCronJob cronJob, CronJobStore.Mutable jobStore) {
     IJobConfiguration config = cronJob.getSanitizedConfig().getJobConfig();
 
     jobStore.saveAcceptedJob(config);
@@ -176,11 +176,11 @@ class CronJobManagerImpl implements CronJobManager {
     return storage.write(new MutateWork.Quiet<Boolean>() {
       @Override
       public Boolean apply(Storage.MutableStoreProvider storeProvider) {
-        if (!storeProvider.getJobStore().fetchJob(jobKey).isPresent()) {
+        if (!storeProvider.getCronJobStore().fetchJob(jobKey).isPresent()) {
           return false;
         }
 
-        removeJob(jobKey, storeProvider.getJobStore());
+        removeJob(jobKey, storeProvider.getCronJobStore());
         descheduleJob(jobKey);
         return true;
       }

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/4d5885b8/src/main/java/org/apache/aurora/scheduler/http/StructDump.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/http/StructDump.java b/src/main/java/org/apache/aurora/scheduler/http/StructDump.java
index e7ee0cf..05434f8 100644
--- a/src/main/java/org/apache/aurora/scheduler/http/StructDump.java
+++ b/src/main/java/org/apache/aurora/scheduler/http/StructDump.java
@@ -108,7 +108,7 @@ public class StructDump extends JerseyTemplateServlet {
         new Work.Quiet<Optional<? extends TBase<?, ?>>>() {
           @Override
           public Optional<JobConfiguration> apply(StoreProvider storeProvider) {
-            return storeProvider.getJobStore().fetchJob(jobKey)
+            return storeProvider.getCronJobStore().fetchJob(jobKey)
                 .transform(IJobConfiguration.TO_BUILDER);
           }
         });

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/4d5885b8/src/main/java/org/apache/aurora/scheduler/quota/QuotaManager.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/quota/QuotaManager.java b/src/main/java/org/apache/aurora/scheduler/quota/QuotaManager.java
index 199dc11..8444d22 100644
--- a/src/main/java/org/apache/aurora/scheduler/quota/QuotaManager.java
+++ b/src/main/java/org/apache/aurora/scheduler/quota/QuotaManager.java
@@ -212,7 +212,7 @@ public interface QuotaManager {
       }
 
       Map<IJobKey, IJobConfiguration> cronTemplates =
-          FluentIterable.from(storeProvider.getJobStore().fetchJobs())
+          FluentIterable.from(storeProvider.getCronJobStore().fetchJobs())
               .filter(Predicates.compose(Predicates.equalTo(role), JobKeys.CONFIG_TO_ROLE))
               .uniqueIndex(JobKeys.FROM_CONFIG);
 

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/4d5885b8/src/main/java/org/apache/aurora/scheduler/storage/CronJobStore.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/storage/CronJobStore.java b/src/main/java/org/apache/aurora/scheduler/storage/CronJobStore.java
new file mode 100644
index 0000000..d78474a
--- /dev/null
+++ b/src/main/java/org/apache/aurora/scheduler/storage/CronJobStore.java
@@ -0,0 +1,64 @@
+/**
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.aurora.scheduler.storage;
+
+import com.google.common.base.Optional;
+
+import org.apache.aurora.scheduler.storage.entities.IJobConfiguration;
+import org.apache.aurora.scheduler.storage.entities.IJobKey;
+
+/**
+ * Stores cron job configuration data.
+ */
+public interface CronJobStore {
+
+  /**
+   * Fetches all {@code JobConfiguration} instances.
+   *
+   * @return {@link Iterable} of job configurations.
+   */
+  Iterable<IJobConfiguration> fetchJobs();
+
+  /**
+   * Fetches the {@code JobConfiguration} for the specified {@code jobKey} if it exists.
+   *
+   * @param jobKey The jobKey identifying the job to be fetched.
+   * @return the job configuration for the given {@code jobKey} or absent if none is found.
+   */
+  Optional<IJobConfiguration> fetchJob(IJobKey jobKey);
+
+  interface Mutable extends CronJobStore {
+    /**
+     * Saves the job configuration for a job that has been accepted by the scheduler.
+     * TODO(William Farner): Consider accepting SanitizedConfiguration here to require that
+     * validation always happens for things entering storage.
+     *
+     * @param jobConfig The configuration of the accepted job.
+     */
+    void saveAcceptedJob(IJobConfiguration jobConfig);
+
+    /**
+     * Removes the job configuration for the job identified by {@code jobKey}.
+     * If there is no stored configuration for the identified job, this method returns silently.
+     *
+     * @param jobKey the key identifying the job to delete.
+     */
+    void removeJob(IJobKey jobKey);
+
+    /**
+     * Deletes all jobs.
+     */
+    void deleteJobs();
+  }
+}

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/4d5885b8/src/main/java/org/apache/aurora/scheduler/storage/ForwardingStore.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/storage/ForwardingStore.java b/src/main/java/org/apache/aurora/scheduler/storage/ForwardingStore.java
index fc8e2f4..6ade817 100644
--- a/src/main/java/org/apache/aurora/scheduler/storage/ForwardingStore.java
+++ b/src/main/java/org/apache/aurora/scheduler/storage/ForwardingStore.java
@@ -45,7 +45,7 @@ import static java.util.Objects.requireNonNull;
  */
 public class ForwardingStore implements
     SchedulerStore,
-    JobStore,
+    CronJobStore,
     TaskStore,
     LockStore,
     QuotaStore,
@@ -53,7 +53,7 @@ public class ForwardingStore implements
     JobUpdateStore {
 
   private final SchedulerStore schedulerStore;
-  private final JobStore jobStore;
+  private final CronJobStore cronJobStore;
   private final TaskStore taskStore;
   private final LockStore lockStore;
   private final QuotaStore quotaStore;
@@ -64,7 +64,7 @@ public class ForwardingStore implements
    * Creates a new forwarding store that delegates to the providing default stores.
    *
    * @param schedulerStore Delegate.
-   * @param jobStore Delegate.
+   * @param cronJobStore Delegate.
    * @param taskStore Delegate.
    * @param lockStore Delegate.
    * @param quotaStore Delegate.
@@ -73,7 +73,7 @@ public class ForwardingStore implements
    */
   public ForwardingStore(
       SchedulerStore schedulerStore,
-      JobStore jobStore,
+      CronJobStore cronJobStore,
       TaskStore taskStore,
       LockStore lockStore,
       QuotaStore quotaStore,
@@ -81,7 +81,7 @@ public class ForwardingStore implements
       JobUpdateStore jobUpdateStore) {
 
     this.schedulerStore = requireNonNull(schedulerStore);
-    this.jobStore = requireNonNull(jobStore);
+    this.cronJobStore = requireNonNull(cronJobStore);
     this.taskStore = requireNonNull(taskStore);
     this.lockStore = requireNonNull(lockStore);
     this.quotaStore = requireNonNull(quotaStore);
@@ -96,12 +96,12 @@ public class ForwardingStore implements
 
   @Override
   public Iterable<IJobConfiguration> fetchJobs() {
-    return jobStore.fetchJobs();
+    return cronJobStore.fetchJobs();
   }
 
   @Override
   public Optional<IJobConfiguration> fetchJob(IJobKey jobKey) {
-    return jobStore.fetchJob(jobKey);
+    return cronJobStore.fetchJob(jobKey);
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/4d5885b8/src/main/java/org/apache/aurora/scheduler/storage/JobStore.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/storage/JobStore.java b/src/main/java/org/apache/aurora/scheduler/storage/JobStore.java
deleted file mode 100644
index 748b2cb..0000000
--- a/src/main/java/org/apache/aurora/scheduler/storage/JobStore.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/**
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.aurora.scheduler.storage;
-
-import com.google.common.base.Optional;
-
-import org.apache.aurora.scheduler.storage.entities.IJobConfiguration;
-import org.apache.aurora.scheduler.storage.entities.IJobKey;
-
-/**
- * Stores job configuration data.
- */
-public interface JobStore {
-
-  /**
-   * Fetches all {@code JobConfiguration} instances.
-   *
-   * @return {@link Iterable} of job configurations.
-   */
-  Iterable<IJobConfiguration> fetchJobs();
-
-  /**
-   * Fetches the {@code JobConfiguration} for the specified {@code jobKey} if it exists.
-   *
-   * @param jobKey The jobKey identifying the job to be fetched.
-   * @return the job configuration for the given {@code jobKey} or absent if none is found.
-   */
-  Optional<IJobConfiguration> fetchJob(IJobKey jobKey);
-
-  interface Mutable extends JobStore {
-    /**
-     * Saves the job configuration for a job that has been accepted by the scheduler.
-     * TODO(William Farner): Consider accepting SanitizedConfiguration here to require that
-     * validation always happens for things entering storage.
-     *
-     * @param jobConfig The configuration of the accepted job.
-     */
-    void saveAcceptedJob(IJobConfiguration jobConfig);
-
-    /**
-     * Removes the job configuration for the job identified by {@code jobKey}.
-     * If there is no stored configuration for the identified job, this method returns silently.
-     *
-     * @param jobKey the key identifying the job to delete.
-     */
-    void removeJob(IJobKey jobKey);
-
-    /**
-     * Deletes all jobs.
-     */
-    void deleteJobs();
-  }
-}

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/4d5885b8/src/main/java/org/apache/aurora/scheduler/storage/Storage.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/storage/Storage.java b/src/main/java/org/apache/aurora/scheduler/storage/Storage.java
index 41b7053..6180a36 100644
--- a/src/main/java/org/apache/aurora/scheduler/storage/Storage.java
+++ b/src/main/java/org/apache/aurora/scheduler/storage/Storage.java
@@ -34,7 +34,7 @@ public interface Storage {
 
   interface StoreProvider {
     SchedulerStore getSchedulerStore();
-    JobStore getJobStore();
+    CronJobStore getCronJobStore();
     TaskStore getTaskStore();
     LockStore getLockStore();
     QuotaStore getQuotaStore();
@@ -44,7 +44,7 @@ public interface Storage {
 
   interface MutableStoreProvider extends StoreProvider {
     SchedulerStore.Mutable getSchedulerStore();
-    JobStore.Mutable getJobStore();
+    CronJobStore.Mutable getCronJobStore();
 
     /**
      * Gets access to the mutable task store.
@@ -288,7 +288,7 @@ public interface Storage {
       return storage.read(new Work.Quiet<Iterable<IJobConfiguration>>() {
         @Override
         public Iterable<IJobConfiguration> apply(Storage.StoreProvider storeProvider) {
-          return storeProvider.getJobStore().fetchJobs();
+          return storeProvider.getCronJobStore().fetchJobs();
         }
       });
     }

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/4d5885b8/src/main/java/org/apache/aurora/scheduler/storage/StorageBackfill.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/storage/StorageBackfill.java b/src/main/java/org/apache/aurora/scheduler/storage/StorageBackfill.java
index 7a99afa..a82fbb5 100644
--- a/src/main/java/org/apache/aurora/scheduler/storage/StorageBackfill.java
+++ b/src/main/java/org/apache/aurora/scheduler/storage/StorageBackfill.java
@@ -47,7 +47,7 @@ public final class StorageBackfill {
     // Utility class.
   }
 
-  private static void backfillJobDefaults(JobStore.Mutable jobStore) {
+  private static void backfillJobDefaults(CronJobStore.Mutable jobStore) {
     for (JobConfiguration job : IJobConfiguration.toBuildersList(jobStore.fetchJobs())) {
       populateJobKey(job.getTaskConfig(), BACKFILLED_JOB_CONFIG_KEYS);
       ConfigurationManager.applyDefaultsIfUnset(job);
@@ -73,7 +73,7 @@ public final class StorageBackfill {
    * @param storeProvider Storage provider.
    */
   public static void backfill(final MutableStoreProvider storeProvider) {
-    backfillJobDefaults(storeProvider.getJobStore());
+    backfillJobDefaults(storeProvider.getCronJobStore());
 
     // Backfilling job keys has to be done in a separate transaction to ensure follow up scoped
     // Query calls work against upgraded MemTaskStore, which does not support deprecated fields.

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/4d5885b8/src/main/java/org/apache/aurora/scheduler/storage/db/DbStorage.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/storage/db/DbStorage.java b/src/main/java/org/apache/aurora/scheduler/storage/db/DbStorage.java
index ea4afb4..526df10 100644
--- a/src/main/java/org/apache/aurora/scheduler/storage/db/DbStorage.java
+++ b/src/main/java/org/apache/aurora/scheduler/storage/db/DbStorage.java
@@ -25,7 +25,7 @@ import org.apache.aurora.gen.JobUpdateAction;
 import org.apache.aurora.gen.JobUpdateStatus;
 import org.apache.aurora.gen.MaintenanceMode;
 import org.apache.aurora.scheduler.storage.AttributeStore;
-import org.apache.aurora.scheduler.storage.JobStore;
+import org.apache.aurora.scheduler.storage.CronJobStore;
 import org.apache.aurora.scheduler.storage.JobUpdateStore;
 import org.apache.aurora.scheduler.storage.LockStore;
 import org.apache.aurora.scheduler.storage.QuotaStore;
@@ -84,7 +84,7 @@ class DbStorage extends AbstractIdleService implements Storage {
       }
 
       @Override
-      public JobStore.Mutable getJobStore() {
+      public CronJobStore.Mutable getCronJobStore() {
         throw new UnsupportedOperationException("Not yet implemented.");
       }
 

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/4d5885b8/src/main/java/org/apache/aurora/scheduler/storage/log/LogStorage.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/storage/log/LogStorage.java b/src/main/java/org/apache/aurora/scheduler/storage/log/LogStorage.java
index 0229b92..63b5b1f 100644
--- a/src/main/java/org/apache/aurora/scheduler/storage/log/LogStorage.java
+++ b/src/main/java/org/apache/aurora/scheduler/storage/log/LogStorage.java
@@ -49,7 +49,7 @@ import org.apache.aurora.gen.JobUpdateKey;
 import org.apache.aurora.gen.storage.LogEntry;
 import org.apache.aurora.gen.storage.Op;
 import org.apache.aurora.gen.storage.RewriteTask;
-import org.apache.aurora.gen.storage.SaveAcceptedJob;
+import org.apache.aurora.gen.storage.SaveCronJob;
 import org.apache.aurora.gen.storage.SaveJobInstanceUpdateEvent;
 import org.apache.aurora.gen.storage.SaveJobUpdateEvent;
 import org.apache.aurora.gen.storage.SaveQuota;
@@ -60,8 +60,8 @@ import org.apache.aurora.scheduler.events.EventSink;
 import org.apache.aurora.scheduler.log.Log.Stream.InvalidPositionException;
 import org.apache.aurora.scheduler.log.Log.Stream.StreamAccessException;
 import org.apache.aurora.scheduler.storage.AttributeStore;
+import org.apache.aurora.scheduler.storage.CronJobStore;
 import org.apache.aurora.scheduler.storage.DistributedSnapshotStore;
-import org.apache.aurora.scheduler.storage.JobStore;
 import org.apache.aurora.scheduler.storage.JobUpdateStore;
 import org.apache.aurora.scheduler.storage.LockStore;
 import org.apache.aurora.scheduler.storage.QuotaStore;
@@ -190,7 +190,7 @@ public class LogStorage implements NonVolatileStorage, DistributedSnapshotStore
   private final Amount<Long, Time> snapshotInterval;
   private final Storage writeBehindStorage;
   private final SchedulerStore.Mutable writeBehindSchedulerStore;
-  private final JobStore.Mutable writeBehindJobStore;
+  private final CronJobStore.Mutable writeBehindJobStore;
   private final TaskStore.Mutable writeBehindTaskStore;
   private final LockStore.Mutable writeBehindLockStore;
   private final QuotaStore.Mutable writeBehindQuotaStore;
@@ -232,7 +232,7 @@ public class LogStorage implements NonVolatileStorage, DistributedSnapshotStore
       SnapshotStore<Snapshot> snapshotStore,
       @WriteBehind Storage storage,
       @WriteBehind SchedulerStore.Mutable schedulerStore,
-      @WriteBehind JobStore.Mutable jobStore,
+      @WriteBehind CronJobStore.Mutable jobStore,
       @WriteBehind TaskStore.Mutable taskStore,
       @WriteBehind LockStore.Mutable lockStore,
       @WriteBehind QuotaStore.Mutable quotaStore,
@@ -265,7 +265,7 @@ public class LogStorage implements NonVolatileStorage, DistributedSnapshotStore
       Amount<Long, Time> snapshotInterval,
       Storage delegateStorage,
       SchedulerStore.Mutable schedulerStore,
-      JobStore.Mutable jobStore,
+      CronJobStore.Mutable jobStore,
       TaskStore.Mutable taskStore,
       LockStore.Mutable lockStore,
       QuotaStore.Mutable quotaStore,
@@ -361,12 +361,12 @@ public class LogStorage implements NonVolatileStorage, DistributedSnapshotStore
             writeBehindSchedulerStore.saveFrameworkId(op.getSaveFrameworkId().getId());
           }
         })
-        .put(Op._Fields.SAVE_ACCEPTED_JOB, new Closure<Op>() {
+        .put(Op._Fields.SAVE_CRON_JOB, new Closure<Op>() {
           @Override
           public void execute(Op op) {
-            SaveAcceptedJob acceptedJob = op.getSaveAcceptedJob();
+            SaveCronJob cronJob = op.getSaveCronJob();
             writeBehindJobStore.saveAcceptedJob(
-                IJobConfiguration.build(acceptedJob.getJobConfig()));
+                IJobConfiguration.build(cronJob.getJobConfig()));
           }
         })
         .put(Op._Fields.REMOVE_JOB, new Closure<Op>() {
@@ -612,7 +612,7 @@ public class LogStorage implements NonVolatileStorage, DistributedSnapshotStore
         persist(snapshot);
         LOG.info("Snapshot complete."
             + " host attrs: " + snapshot.getHostAttributesSize()
-            + ", jobs: " + snapshot.getJobsSize()
+            + ", cron jobs: " + snapshot.getCronJobsSize()
             + ", locks: " + snapshot.getLocksSize()
             + ", quota confs: " + snapshot.getQuotaConfigurationsSize()
             + ", tasks: " + snapshot.getTasksSize());

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/4d5885b8/src/main/java/org/apache/aurora/scheduler/storage/log/SnapshotStoreImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/storage/log/SnapshotStoreImpl.java b/src/main/java/org/apache/aurora/scheduler/storage/log/SnapshotStoreImpl.java
index 72b9895..06de538 100644
--- a/src/main/java/org/apache/aurora/scheduler/storage/log/SnapshotStoreImpl.java
+++ b/src/main/java/org/apache/aurora/scheduler/storage/log/SnapshotStoreImpl.java
@@ -34,7 +34,7 @@ import org.apache.aurora.gen.Lock;
 import org.apache.aurora.gen.storage.QuotaConfiguration;
 import org.apache.aurora.gen.storage.SchedulerMetadata;
 import org.apache.aurora.gen.storage.Snapshot;
-import org.apache.aurora.gen.storage.StoredJob;
+import org.apache.aurora.gen.storage.StoredCronJob;
 import org.apache.aurora.gen.storage.StoredJobUpdateDetails;
 import org.apache.aurora.scheduler.base.Query;
 import org.apache.aurora.scheduler.storage.JobUpdateStore;
@@ -132,21 +132,21 @@ public class SnapshotStoreImpl implements SnapshotStore<Snapshot> {
       new SnapshotField() {
         @Override
         public void saveToSnapshot(StoreProvider store, Snapshot snapshot) {
-          ImmutableSet.Builder<StoredJob> jobs = ImmutableSet.builder();
+          ImmutableSet.Builder<StoredCronJob> jobs = ImmutableSet.builder();
 
-          for (IJobConfiguration config : store.getJobStore().fetchJobs()) {
-            jobs.add(new StoredJob(config.newBuilder()));
+          for (IJobConfiguration config : store.getCronJobStore().fetchJobs()) {
+            jobs.add(new StoredCronJob(config.newBuilder()));
           }
-          snapshot.setJobs(jobs.build());
+          snapshot.setCronJobs(jobs.build());
         }
 
         @Override
         public void restoreFromSnapshot(MutableStoreProvider store, Snapshot snapshot) {
-          store.getJobStore().deleteJobs();
+          store.getCronJobStore().deleteJobs();
 
-          if (snapshot.isSetJobs()) {
-            for (StoredJob job : snapshot.getJobs()) {
-              store.getJobStore().saveAcceptedJob(
+          if (snapshot.isSetCronJobs()) {
+            for (StoredCronJob job : snapshot.getCronJobs()) {
+              store.getCronJobStore().saveAcceptedJob(
                   IJobConfiguration.build(job.getJobConfiguration()));
             }
           }

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/4d5885b8/src/main/java/org/apache/aurora/scheduler/storage/log/StreamManagerImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/storage/log/StreamManagerImpl.java b/src/main/java/org/apache/aurora/scheduler/storage/log/StreamManagerImpl.java
index ee88d7c..12da352 100644
--- a/src/main/java/org/apache/aurora/scheduler/storage/log/StreamManagerImpl.java
+++ b/src/main/java/org/apache/aurora/scheduler/storage/log/StreamManagerImpl.java
@@ -306,7 +306,7 @@ class StreamManagerImpl implements StreamManager {
           prior.setSaveFrameworkId(next.getSaveFrameworkId());
           return true;
 
-        case SAVE_ACCEPTED_JOB:
+        case SAVE_CRON_JOB:
         case REMOVE_JOB:
         case SAVE_QUOTA:
         case REMOVE_QUOTA:

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/4d5885b8/src/main/java/org/apache/aurora/scheduler/storage/log/WriteAheadStorage.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/storage/log/WriteAheadStorage.java b/src/main/java/org/apache/aurora/scheduler/storage/log/WriteAheadStorage.java
index aa22266..e61a6b4 100644
--- a/src/main/java/org/apache/aurora/scheduler/storage/log/WriteAheadStorage.java
+++ b/src/main/java/org/apache/aurora/scheduler/storage/log/WriteAheadStorage.java
@@ -31,7 +31,7 @@ import org.apache.aurora.gen.storage.RemoveLock;
 import org.apache.aurora.gen.storage.RemoveQuota;
 import org.apache.aurora.gen.storage.RemoveTasks;
 import org.apache.aurora.gen.storage.RewriteTask;
-import org.apache.aurora.gen.storage.SaveAcceptedJob;
+import org.apache.aurora.gen.storage.SaveCronJob;
 import org.apache.aurora.gen.storage.SaveFrameworkId;
 import org.apache.aurora.gen.storage.SaveHostAttributes;
 import org.apache.aurora.gen.storage.SaveJobInstanceUpdateEvent;
@@ -45,8 +45,8 @@ import org.apache.aurora.scheduler.base.Tasks;
 import org.apache.aurora.scheduler.events.EventSink;
 import org.apache.aurora.scheduler.events.PubsubEvent;
 import org.apache.aurora.scheduler.storage.AttributeStore;
+import org.apache.aurora.scheduler.storage.CronJobStore;
 import org.apache.aurora.scheduler.storage.ForwardingStore;
-import org.apache.aurora.scheduler.storage.JobStore;
 import org.apache.aurora.scheduler.storage.JobUpdateStore;
 import org.apache.aurora.scheduler.storage.LockStore;
 import org.apache.aurora.scheduler.storage.QuotaStore;
@@ -78,7 +78,7 @@ import static org.apache.aurora.scheduler.storage.log.LogStorage.TransactionMana
 class WriteAheadStorage extends ForwardingStore implements
     MutableStoreProvider,
     SchedulerStore.Mutable,
-    JobStore.Mutable,
+    CronJobStore.Mutable,
     TaskStore.Mutable,
     LockStore.Mutable,
     QuotaStore.Mutable,
@@ -87,7 +87,7 @@ class WriteAheadStorage extends ForwardingStore implements
 
   private final TransactionManager transactionManager;
   private final SchedulerStore.Mutable schedulerStore;
-  private final JobStore.Mutable jobStore;
+  private final CronJobStore.Mutable jobStore;
   private final TaskStore.Mutable taskStore;
   private final LockStore.Mutable lockStore;
   private final QuotaStore.Mutable quotaStore;
@@ -111,7 +111,7 @@ class WriteAheadStorage extends ForwardingStore implements
   WriteAheadStorage(
       TransactionManager transactionManager,
       SchedulerStore.Mutable schedulerStore,
-      JobStore.Mutable jobStore,
+      CronJobStore.Mutable jobStore,
       TaskStore.Mutable taskStore,
       LockStore.Mutable lockStore,
       QuotaStore.Mutable quotaStore,
@@ -238,7 +238,7 @@ class WriteAheadStorage extends ForwardingStore implements
   public void saveAcceptedJob(final IJobConfiguration jobConfig) {
     requireNonNull(jobConfig);
 
-    write(Op.saveAcceptedJob(new SaveAcceptedJob(jobConfig.newBuilder())));
+    write(Op.saveCronJob(new SaveCronJob(jobConfig.newBuilder())));
     jobStore.saveAcceptedJob(jobConfig);
   }
 
@@ -354,7 +354,7 @@ class WriteAheadStorage extends ForwardingStore implements
   }
 
   @Override
-  public JobStore.Mutable getJobStore() {
+  public CronJobStore.Mutable getCronJobStore() {
     return this;
   }
 

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/4d5885b8/src/main/java/org/apache/aurora/scheduler/storage/mem/MemJobStore.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/storage/mem/MemJobStore.java b/src/main/java/org/apache/aurora/scheduler/storage/mem/MemJobStore.java
index c9ffc38..f9e9e89 100644
--- a/src/main/java/org/apache/aurora/scheduler/storage/mem/MemJobStore.java
+++ b/src/main/java/org/apache/aurora/scheduler/storage/mem/MemJobStore.java
@@ -20,14 +20,14 @@ import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Maps;
 
 import org.apache.aurora.scheduler.base.JobKeys;
-import org.apache.aurora.scheduler.storage.JobStore;
+import org.apache.aurora.scheduler.storage.CronJobStore;
 import org.apache.aurora.scheduler.storage.entities.IJobConfiguration;
 import org.apache.aurora.scheduler.storage.entities.IJobKey;
 
 /**
  * An in-memory job store.
  */
-class MemJobStore implements JobStore.Mutable {
+class MemJobStore implements CronJobStore.Mutable {
   private final Map<IJobKey, IJobConfiguration> jobs = Maps.newConcurrentMap();
 
   @Override

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/4d5885b8/src/main/java/org/apache/aurora/scheduler/storage/mem/MemStorage.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/storage/mem/MemStorage.java b/src/main/java/org/apache/aurora/scheduler/storage/mem/MemStorage.java
index bc3a7c5..dafe1c4 100644
--- a/src/main/java/org/apache/aurora/scheduler/storage/mem/MemStorage.java
+++ b/src/main/java/org/apache/aurora/scheduler/storage/mem/MemStorage.java
@@ -29,7 +29,7 @@ import com.twitter.common.inject.Bindings;
 import com.twitter.common.inject.TimedInterceptor.Timed;
 
 import org.apache.aurora.scheduler.storage.AttributeStore;
-import org.apache.aurora.scheduler.storage.JobStore;
+import org.apache.aurora.scheduler.storage.CronJobStore;
 import org.apache.aurora.scheduler.storage.JobUpdateStore;
 import org.apache.aurora.scheduler.storage.LockStore;
 import org.apache.aurora.scheduler.storage.QuotaStore;
@@ -61,7 +61,7 @@ public class MemStorage implements Storage {
   @Inject
   MemStorage(
       @Delegated final SchedulerStore.Mutable schedulerStore,
-      final JobStore.Mutable jobStore,
+      final CronJobStore.Mutable jobStore,
       final TaskStore.Mutable taskStore,
       @Delegated final LockStore.Mutable lockStore,
       @Delegated final Storage delegated,
@@ -77,7 +77,7 @@ public class MemStorage implements Storage {
       }
 
       @Override
-      public JobStore.Mutable getJobStore() {
+      public CronJobStore.Mutable getCronJobStore() {
         return jobStore;
       }
 

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/4d5885b8/src/main/java/org/apache/aurora/scheduler/storage/mem/MemStorageModule.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/storage/mem/MemStorageModule.java b/src/main/java/org/apache/aurora/scheduler/storage/mem/MemStorageModule.java
index 31c25d0..9068aa4 100644
--- a/src/main/java/org/apache/aurora/scheduler/storage/mem/MemStorageModule.java
+++ b/src/main/java/org/apache/aurora/scheduler/storage/mem/MemStorageModule.java
@@ -19,7 +19,7 @@ import com.google.inject.Key;
 import com.google.inject.PrivateModule;
 import com.twitter.common.inject.Bindings.KeyFactory;
 
-import org.apache.aurora.scheduler.storage.JobStore;
+import org.apache.aurora.scheduler.storage.CronJobStore;
 import org.apache.aurora.scheduler.storage.Storage;
 import org.apache.aurora.scheduler.storage.Storage.Volatile;
 import org.apache.aurora.scheduler.storage.TaskStore;
@@ -35,7 +35,7 @@ import static java.util.Objects.requireNonNull;
  *   <li>Keyed with keys provided by the provided{@code keyFactory}:</li>
  *     <ul>
  *       <li>{@link org.apache.aurora.scheduler.storage.SchedulerStore}</li>
- *       <li>{@link org.apache.aurora.scheduler.storage.JobStore}</li>
+ *       <li>{@link org.apache.aurora.scheduler.storage.CronJobStore}</li>
  *       <li>{@link org.apache.aurora.scheduler.storage.TaskStore}</li>
  *       <li>{@link org.apache.aurora.scheduler.storage.LockStore}</li>
  *       <li>{@link org.apache.aurora.scheduler.storage.QuotaStore}</li>
@@ -69,7 +69,7 @@ public final class MemStorageModule extends PrivateModule {
     expose(exposedMemStorageKey);
     bind(MemStorage.class).in(Singleton.class);
 
-    bindStore(JobStore.Mutable.class, MemJobStore.class);
+    bindStore(CronJobStore.Mutable.class, MemJobStore.class);
     bindStore(TaskStore.Mutable.class, MemTaskStore.class);
   }
 }

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/4d5885b8/src/main/java/org/apache/aurora/scheduler/thrift/SchedulerThriftInterface.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/thrift/SchedulerThriftInterface.java b/src/main/java/org/apache/aurora/scheduler/thrift/SchedulerThriftInterface.java
index 059626f..56398f3 100644
--- a/src/main/java/org/apache/aurora/scheduler/thrift/SchedulerThriftInterface.java
+++ b/src/main/java/org/apache/aurora/scheduler/thrift/SchedulerThriftInterface.java
@@ -105,7 +105,7 @@ import org.apache.aurora.scheduler.state.LockManager.LockException;
 import org.apache.aurora.scheduler.state.MaintenanceController;
 import org.apache.aurora.scheduler.state.StateManager;
 import org.apache.aurora.scheduler.state.UUIDGenerator;
-import org.apache.aurora.scheduler.storage.JobStore;
+import org.apache.aurora.scheduler.storage.CronJobStore;
 import org.apache.aurora.scheduler.storage.Storage;
 import org.apache.aurora.scheduler.storage.Storage.MutableStoreProvider;
 import org.apache.aurora.scheduler.storage.Storage.MutateWork;
@@ -828,7 +828,7 @@ class SchedulerThriftInterface implements AuroraAdmin.Iface {
     });
   }
 
-  private Optional<String> rewriteJob(JobConfigRewrite jobRewrite, JobStore.Mutable jobStore) {
+  private Optional<String> rewriteJob(JobConfigRewrite jobRewrite, CronJobStore.Mutable jobStore) {
     IJobConfiguration existingJob = IJobConfiguration.build(jobRewrite.getOldJob());
     IJobConfiguration rewrittenJob;
     Optional<String> error = Optional.absent();
@@ -902,7 +902,7 @@ class SchedulerThriftInterface implements AuroraAdmin.Iface {
     Optional<String> error;
     switch (command.getSetField()) {
       case JOB_REWRITE:
-        error = rewriteJob(command.getJobRewrite(), storeProvider.getJobStore());
+        error = rewriteJob(command.getJobRewrite(), storeProvider.getCronJobStore());
         break;
 
       case INSTANCE_REWRITE:
@@ -980,7 +980,7 @@ class SchedulerThriftInterface implements AuroraAdmin.Iface {
 
   public Optional<IJobConfiguration> getCronJob(StoreProvider storeProvider, final IJobKey jobKey) {
     requireNonNull(jobKey);
-    return storeProvider.getJobStore().fetchJob(jobKey);
+    return storeProvider.getCronJobStore().fetchJob(jobKey);
   }
 
   private String getRoleFromLockKey(ILockKey lockKey) {

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/4d5885b8/src/test/java/org/apache/aurora/scheduler/cron/quartz/AuroraCronJobTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/cron/quartz/AuroraCronJobTest.java b/src/test/java/org/apache/aurora/scheduler/cron/quartz/AuroraCronJobTest.java
index 7bef09e..91cf5ed 100644
--- a/src/test/java/org/apache/aurora/scheduler/cron/quartz/AuroraCronJobTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/cron/quartz/AuroraCronJobTest.java
@@ -75,7 +75,7 @@ public class AuroraCronJobTest extends EasyMockTest {
     storage.write(new Storage.MutateWork.NoResult.Quiet() {
       @Override
       protected void execute(MutableStoreProvider storeProvider) {
-        storeProvider.getJobStore().saveAcceptedJob(
+        storeProvider.getCronJobStore().saveAcceptedJob(
             IJobConfiguration.build(QuartzTestUtil.JOB.newBuilder().setCronSchedule(null)));
       }
     });
@@ -165,7 +165,7 @@ public class AuroraCronJobTest extends EasyMockTest {
     storage.write(new Storage.MutateWork.NoResult.Quiet() {
       @Override
       public void execute(MutableStoreProvider storeProvider) {
-        storeProvider.getJobStore().saveAcceptedJob(
+        storeProvider.getCronJobStore().saveAcceptedJob(
             QuartzTestUtil.makeSanitizedCronJob(policy).getSanitizedConfig().getJobConfig());
       }
     });

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/4d5885b8/src/test/java/org/apache/aurora/scheduler/cron/quartz/CronIT.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/cron/quartz/CronIT.java b/src/test/java/org/apache/aurora/scheduler/cron/quartz/CronIT.java
index c3f8d1b..d4f8b5b 100644
--- a/src/test/java/org/apache/aurora/scheduler/cron/quartz/CronIT.java
+++ b/src/test/java/org/apache/aurora/scheduler/cron/quartz/CronIT.java
@@ -138,7 +138,7 @@ public class CronIT extends EasyMockTest {
     storage.write(new Storage.MutateWork.NoResult.Quiet() {
       @Override
       public void execute(Storage.MutableStoreProvider storeProvider) {
-        storeProvider.getJobStore().saveAcceptedJob(CRON_JOB);
+        storeProvider.getCronJobStore().saveAcceptedJob(CRON_JOB);
       }
     });
 

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/4d5885b8/src/test/java/org/apache/aurora/scheduler/cron/quartz/CronJobManagerImplTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/cron/quartz/CronJobManagerImplTest.java b/src/test/java/org/apache/aurora/scheduler/cron/quartz/CronJobManagerImplTest.java
index d4c14af..d313326 100644
--- a/src/test/java/org/apache/aurora/scheduler/cron/quartz/CronJobManagerImplTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/cron/quartz/CronJobManagerImplTest.java
@@ -250,7 +250,7 @@ public class CronJobManagerImplTest extends EasyMockTest {
     storage.write(new Storage.MutateWork.NoResult<Exception>() {
       @Override
       protected void execute(Storage.MutableStoreProvider storeProvider) throws Exception {
-        storeProvider.getJobStore().saveAcceptedJob(
+        storeProvider.getCronJobStore().saveAcceptedJob(
             QuartzTestUtil.makeSanitizedCronJob().getSanitizedConfig().getJobConfig());
       }
     });
@@ -260,7 +260,7 @@ public class CronJobManagerImplTest extends EasyMockTest {
     return storage.read(new Storage.Work.Quiet<Optional<IJobConfiguration>>() {
       @Override
       public Optional<IJobConfiguration> apply(Storage.StoreProvider storeProvider) {
-        return storeProvider.getJobStore().fetchJob(QuartzTestUtil.AURORA_JOB_KEY);
+        return storeProvider.getCronJobStore().fetchJob(QuartzTestUtil.AURORA_JOB_KEY);
       }
     });
   }

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/4d5885b8/src/test/java/org/apache/aurora/scheduler/storage/StorageBackfillTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/storage/StorageBackfillTest.java b/src/test/java/org/apache/aurora/scheduler/storage/StorageBackfillTest.java
index b48994f..90a05ba 100644
--- a/src/test/java/org/apache/aurora/scheduler/storage/StorageBackfillTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/storage/StorageBackfillTest.java
@@ -110,7 +110,7 @@ public class StorageBackfillTest {
     storage.write(new Storage.MutateWork.NoResult.Quiet() {
       @Override
       protected void execute(Storage.MutableStoreProvider storeProvider) {
-        storeProvider.getJobStore().saveAcceptedJob(IJobConfiguration.build(config));
+        storeProvider.getCronJobStore().saveAcceptedJob(IJobConfiguration.build(config));
       }
     });
 
@@ -120,7 +120,7 @@ public class StorageBackfillTest {
         storage.read(new Storage.Work.Quiet<Iterable<IJobConfiguration>>() {
           @Override
           public Iterable<IJobConfiguration> apply(Storage.StoreProvider storeProvider) {
-            return storeProvider.getJobStore().fetchJobs();
+            return storeProvider.getCronJobStore().fetchJobs();
           }
         }));
 

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/4d5885b8/src/test/java/org/apache/aurora/scheduler/storage/backup/RecoveryTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/storage/backup/RecoveryTest.java b/src/test/java/org/apache/aurora/scheduler/storage/backup/RecoveryTest.java
index 91789e7..5853c03 100644
--- a/src/test/java/org/apache/aurora/scheduler/storage/backup/RecoveryTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/storage/backup/RecoveryTest.java
@@ -34,7 +34,7 @@ import org.apache.aurora.gen.TaskConfig;
 import org.apache.aurora.gen.storage.QuotaConfiguration;
 import org.apache.aurora.gen.storage.SchedulerMetadata;
 import org.apache.aurora.gen.storage.Snapshot;
-import org.apache.aurora.gen.storage.StoredJob;
+import org.apache.aurora.gen.storage.StoredCronJob;
 import org.apache.aurora.gen.storage.StoredJobUpdateDetails;
 import org.apache.aurora.scheduler.base.Query;
 import org.apache.aurora.scheduler.base.Tasks;
@@ -167,7 +167,7 @@ public class RecoveryTest extends EasyMockTest {
   private static Snapshot makeSnapshot(ScheduledTask... tasks) {
     return new Snapshot()
         .setHostAttributes(ImmutableSet.<HostAttributes>of())
-        .setJobs(ImmutableSet.<StoredJob>of())
+        .setCronJobs(ImmutableSet.<StoredCronJob>of())
         .setSchedulerMetadata(new SchedulerMetadata().setVersion(CURRENT_API_VERSION))
         .setQuotaConfigurations(ImmutableSet.<QuotaConfiguration>of())
         .setTasks(ImmutableSet.<ScheduledTask>builder().add(tasks).build())

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/4d5885b8/src/test/java/org/apache/aurora/scheduler/storage/backup/StorageBackupTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/storage/backup/StorageBackupTest.java b/src/test/java/org/apache/aurora/scheduler/storage/backup/StorageBackupTest.java
index 0c73a9f..ebe5517 100644
--- a/src/test/java/org/apache/aurora/scheduler/storage/backup/StorageBackupTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/storage/backup/StorageBackupTest.java
@@ -37,7 +37,7 @@ import org.apache.aurora.gen.ScheduledTask;
 import org.apache.aurora.gen.storage.QuotaConfiguration;
 import org.apache.aurora.gen.storage.SchedulerMetadata;
 import org.apache.aurora.gen.storage.Snapshot;
-import org.apache.aurora.gen.storage.StoredJob;
+import org.apache.aurora.gen.storage.StoredCronJob;
 import org.apache.aurora.scheduler.storage.SnapshotStore;
 import org.apache.aurora.scheduler.storage.backup.StorageBackup.StorageBackupImpl;
 import org.apache.aurora.scheduler.storage.backup.StorageBackup.StorageBackupImpl.BackupConfig;
@@ -170,8 +170,8 @@ public class StorageBackupTest extends EasyMockTest {
         new HostAttributes(
             "hostA",
             ImmutableSet.of(new Attribute("attr", ImmutableSet.of("value"))))));
-    snapshot.setJobs(ImmutableSet.of(
-        new StoredJob(new JobConfiguration().setKey(new JobKey("owner", "env", "jobA")))));
+    snapshot.setCronJobs(ImmutableSet.of(
+        new StoredCronJob(new JobConfiguration().setKey(new JobKey("owner", "env", "jobA")))));
     snapshot.setQuotaConfigurations(
         ImmutableSet.of(new QuotaConfiguration("roleA", new ResourceAggregate(10, 1024, 1024))));
     snapshot.setSchedulerMetadata(new SchedulerMetadata().setFrameworkId("frameworkId"));

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/4d5885b8/src/test/java/org/apache/aurora/scheduler/storage/log/LogStorageTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/storage/log/LogStorageTest.java b/src/test/java/org/apache/aurora/scheduler/storage/log/LogStorageTest.java
index 31b75f4..cb6ba25 100644
--- a/src/test/java/org/apache/aurora/scheduler/storage/log/LogStorageTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/storage/log/LogStorageTest.java
@@ -65,7 +65,7 @@ import org.apache.aurora.gen.storage.RemoveLock;
 import org.apache.aurora.gen.storage.RemoveQuota;
 import org.apache.aurora.gen.storage.RemoveTasks;
 import org.apache.aurora.gen.storage.RewriteTask;
-import org.apache.aurora.gen.storage.SaveAcceptedJob;
+import org.apache.aurora.gen.storage.SaveCronJob;
 import org.apache.aurora.gen.storage.SaveFrameworkId;
 import org.apache.aurora.gen.storage.SaveHostAttributes;
 import org.apache.aurora.gen.storage.SaveJobInstanceUpdateEvent;
@@ -294,9 +294,9 @@ public class LogStorageTest extends EasyMockTest {
     builder.add(createTransaction(Op.saveFrameworkId(new SaveFrameworkId("bob"))));
     storageUtil.schedulerStore.saveFrameworkId("bob");
 
-    SaveAcceptedJob acceptedJob = new SaveAcceptedJob().setJobConfig(new JobConfiguration());
-    builder.add(createTransaction(Op.saveAcceptedJob(acceptedJob)));
-    storageUtil.jobStore.saveAcceptedJob(IJobConfiguration.build(acceptedJob.getJobConfig()));
+    SaveCronJob cronJob = new SaveCronJob().setJobConfig(new JobConfiguration());
+    builder.add(createTransaction(Op.saveCronJob(cronJob)));
+    storageUtil.jobStore.saveAcceptedJob(IJobConfiguration.build(cronJob.getJobConfig()));
 
     RemoveJob removeJob = new RemoveJob(JOB_KEY.newBuilder());
     builder.add(createTransaction(Op.removeJob(removeJob)));
@@ -544,13 +544,13 @@ public class LogStorageTest extends EasyMockTest {
         storageUtil.expectWrite();
         storageUtil.jobStore.saveAcceptedJob(jobConfig);
         streamMatcher.expectTransaction(
-            Op.saveAcceptedJob(new SaveAcceptedJob(jobConfig.newBuilder())))
+            Op.saveCronJob(new SaveCronJob(jobConfig.newBuilder())))
             .andReturn(position);
       }
 
       @Override
       protected void performMutations(MutableStoreProvider storeProvider) {
-        storeProvider.getJobStore().saveAcceptedJob(jobConfig);
+        storeProvider.getCronJobStore().saveAcceptedJob(jobConfig);
       }
     }.run();
   }
@@ -569,7 +569,7 @@ public class LogStorageTest extends EasyMockTest {
 
       @Override
       protected void performMutations(MutableStoreProvider storeProvider) {
-        storeProvider.getJobStore().removeJob(JOB_KEY);
+        storeProvider.getCronJobStore().removeJob(JOB_KEY);
       }
     }.run();
   }

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/4d5885b8/src/test/java/org/apache/aurora/scheduler/storage/log/SnapshotStoreImplTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/storage/log/SnapshotStoreImplTest.java b/src/test/java/org/apache/aurora/scheduler/storage/log/SnapshotStoreImplTest.java
index 343106c..982968a 100644
--- a/src/test/java/org/apache/aurora/scheduler/storage/log/SnapshotStoreImplTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/storage/log/SnapshotStoreImplTest.java
@@ -41,7 +41,7 @@ import org.apache.aurora.gen.ScheduledTask;
 import org.apache.aurora.gen.storage.QuotaConfiguration;
 import org.apache.aurora.gen.storage.SchedulerMetadata;
 import org.apache.aurora.gen.storage.Snapshot;
-import org.apache.aurora.gen.storage.StoredJob;
+import org.apache.aurora.gen.storage.StoredCronJob;
 import org.apache.aurora.gen.storage.StoredJobUpdateDetails;
 import org.apache.aurora.scheduler.base.JobKeys;
 import org.apache.aurora.scheduler.base.Query;
@@ -96,7 +96,7 @@ public class SnapshotStoreImplTest extends EasyMockTest {
     // dropped.
     IHostAttributes legacyAttribute = IHostAttributes.build(
         new HostAttributes("host", ImmutableSet.<Attribute>of()));
-    StoredJob job = new StoredJob(
+    StoredCronJob job = new StoredCronJob(
         new JobConfiguration().setKey(new JobKey("owner", "env", "name")));
     String frameworkId = "framework_id";
     ILock lock = ILock.build(new Lock()
@@ -171,7 +171,7 @@ public class SnapshotStoreImplTest extends EasyMockTest {
         .setTasks(IScheduledTask.toBuildersSet(tasks))
         .setQuotaConfigurations(quotas)
         .setHostAttributes(ImmutableSet.of(attribute.newBuilder(), legacyAttribute.newBuilder()))
-        .setJobs(ImmutableSet.of(job))
+        .setCronJobs(ImmutableSet.of(job))
         .setSchedulerMetadata(metadata)
         .setLocks(ImmutableSet.of(lock.newBuilder()))
         .setJobUpdateDetails(ImmutableSet.of(

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/4d5885b8/src/test/java/org/apache/aurora/scheduler/storage/log/WriteAheadStorageTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/storage/log/WriteAheadStorageTest.java b/src/test/java/org/apache/aurora/scheduler/storage/log/WriteAheadStorageTest.java
index 36809ac..4d447d3 100644
--- a/src/test/java/org/apache/aurora/scheduler/storage/log/WriteAheadStorageTest.java
+++ b/src/test/java/org/apache/aurora/scheduler/storage/log/WriteAheadStorageTest.java
@@ -36,7 +36,7 @@ import org.apache.aurora.scheduler.base.Query;
 import org.apache.aurora.scheduler.events.EventSink;
 import org.apache.aurora.scheduler.events.PubsubEvent;
 import org.apache.aurora.scheduler.storage.AttributeStore;
-import org.apache.aurora.scheduler.storage.JobStore;
+import org.apache.aurora.scheduler.storage.CronJobStore;
 import org.apache.aurora.scheduler.storage.JobUpdateStore;
 import org.apache.aurora.scheduler.storage.LockStore;
 import org.apache.aurora.scheduler.storage.QuotaStore;
@@ -58,7 +58,7 @@ public class WriteAheadStorageTest extends EasyMockTest {
 
   private LogStorage.TransactionManager transactionManager;
   private SchedulerStore.Mutable schedulerStore;
-  private JobStore.Mutable jobStore;
+  private CronJobStore.Mutable jobStore;
   private TaskStore.Mutable taskStore;
   private LockStore.Mutable lockStore;
   private QuotaStore.Mutable quotaStore;
@@ -72,7 +72,7 @@ public class WriteAheadStorageTest extends EasyMockTest {
   public void setUp() {
     transactionManager = createMock(LogStorage.TransactionManager.class);
     schedulerStore = createMock(SchedulerStore.Mutable.class);
-    jobStore = createMock(JobStore.Mutable.class);
+    jobStore = createMock(CronJobStore.Mutable.class);
     taskStore = createMock(TaskStore.Mutable.class);
     lockStore = createMock(LockStore.Mutable.class);
     quotaStore = createMock(QuotaStore.Mutable.class);

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/4d5885b8/src/test/java/org/apache/aurora/scheduler/storage/mem/MemCronJobStoreTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/storage/mem/MemCronJobStoreTest.java b/src/test/java/org/apache/aurora/scheduler/storage/mem/MemCronJobStoreTest.java
new file mode 100644
index 0000000..58256af
--- /dev/null
+++ b/src/test/java/org/apache/aurora/scheduler/storage/mem/MemCronJobStoreTest.java
@@ -0,0 +1,91 @@
+/**
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.aurora.scheduler.storage.mem;
+
+import com.google.common.collect.ImmutableSet;
+
+import org.apache.aurora.gen.JobConfiguration;
+import org.apache.aurora.scheduler.base.JobKeys;
+import org.apache.aurora.scheduler.storage.CronJobStore;
+import org.apache.aurora.scheduler.storage.entities.IJobConfiguration;
+import org.apache.aurora.scheduler.storage.entities.IJobKey;
+import org.junit.Before;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+public class MemCronJobStoreTest {
+  private static final IJobConfiguration JOB_A = makeJob("a");
+  private static final IJobConfiguration JOB_B = makeJob("b");
+
+  private static final IJobKey KEY_A = JOB_A.getKey();
+  private static final IJobKey KEY_B = JOB_B.getKey();
+
+  private CronJobStore.Mutable store;
+
+  @Before
+  public void setUp() {
+    store = new MemJobStore();
+  }
+
+  @Test
+  public void testJobStore() {
+    assertNull(store.fetchJob(JobKeys.from("nobody", "nowhere", "noname")).orNull());
+    assertEquals(ImmutableSet.<IJobConfiguration>of(), store.fetchJobs());
+
+    store.saveAcceptedJob(JOB_A);
+    assertEquals(JOB_A, store.fetchJob(KEY_A).orNull());
+    assertEquals(ImmutableSet.of(JOB_A), store.fetchJobs());
+
+    store.saveAcceptedJob(JOB_B);
+    assertEquals(JOB_B, store.fetchJob(KEY_B).orNull());
+    assertEquals(ImmutableSet.of(JOB_A, JOB_B), store.fetchJobs());
+
+    store.removeJob(KEY_B);
+    assertEquals(ImmutableSet.of(JOB_A), store.fetchJobs());
+
+    store.deleteJobs();
+    assertEquals(ImmutableSet.<IJobConfiguration>of(), store.fetchJobs());
+  }
+
+  @Test
+  public void testJobStoreSameEnvironment() {
+    IJobConfiguration templateConfig = makeJob("labrat");
+    JobConfiguration prodBuilder = templateConfig.newBuilder();
+    prodBuilder.getKey().setEnvironment("prod");
+    IJobConfiguration prod = IJobConfiguration.build(prodBuilder);
+    JobConfiguration stagingBuilder = templateConfig.newBuilder();
+    stagingBuilder.getKey().setEnvironment("staging");
+    IJobConfiguration staging = IJobConfiguration.build(stagingBuilder);
+
+    store.saveAcceptedJob(prod);
+    store.saveAcceptedJob(staging);
+
+    assertNull(store.fetchJob(
+        IJobKey.build(templateConfig.getKey().newBuilder().setEnvironment("test"))).orNull());
+    assertEquals(prod, store.fetchJob(prod.getKey()).orNull());
+    assertEquals(staging, store.fetchJob(staging.getKey()).orNull());
+
+    store.removeJob(prod.getKey());
+    assertNull(store.fetchJob(prod.getKey()).orNull());
+    assertEquals(staging, store.fetchJob(staging.getKey()).orNull());
+  }
+
+  private static IJobConfiguration makeJob(String name) {
+    return IJobConfiguration.build(
+        new JobConfiguration().setKey(JobKeys.from("role-" + name, "env-" + name, name)
+            .newBuilder()));
+  }
+}

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/4d5885b8/src/test/java/org/apache/aurora/scheduler/storage/mem/MemJobStoreTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/storage/mem/MemJobStoreTest.java b/src/test/java/org/apache/aurora/scheduler/storage/mem/MemJobStoreTest.java
deleted file mode 100644
index b9ade45..0000000
--- a/src/test/java/org/apache/aurora/scheduler/storage/mem/MemJobStoreTest.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/**
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.aurora.scheduler.storage.mem;
-
-import com.google.common.collect.ImmutableSet;
-
-import org.apache.aurora.gen.JobConfiguration;
-import org.apache.aurora.scheduler.base.JobKeys;
-import org.apache.aurora.scheduler.storage.JobStore;
-import org.apache.aurora.scheduler.storage.entities.IJobConfiguration;
-import org.apache.aurora.scheduler.storage.entities.IJobKey;
-import org.junit.Before;
-import org.junit.Test;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-
-public class MemJobStoreTest {
-  private static final IJobConfiguration JOB_A = makeJob("a");
-  private static final IJobConfiguration JOB_B = makeJob("b");
-
-  private static final IJobKey KEY_A = JOB_A.getKey();
-  private static final IJobKey KEY_B = JOB_B.getKey();
-
-  private JobStore.Mutable store;
-
-  @Before
-  public void setUp() {
-    store = new MemJobStore();
-  }
-
-  @Test
-  public void testJobStore() {
-    assertNull(store.fetchJob(JobKeys.from("nobody", "nowhere", "noname")).orNull());
-    assertEquals(ImmutableSet.<IJobConfiguration>of(), store.fetchJobs());
-
-    store.saveAcceptedJob(JOB_A);
-    assertEquals(JOB_A, store.fetchJob(KEY_A).orNull());
-    assertEquals(ImmutableSet.of(JOB_A), store.fetchJobs());
-
-    store.saveAcceptedJob(JOB_B);
-    assertEquals(JOB_B, store.fetchJob(KEY_B).orNull());
-    assertEquals(ImmutableSet.of(JOB_A, JOB_B), store.fetchJobs());
-
-    store.removeJob(KEY_B);
-    assertEquals(ImmutableSet.of(JOB_A), store.fetchJobs());
-
-    store.deleteJobs();
-    assertEquals(ImmutableSet.<IJobConfiguration>of(), store.fetchJobs());
-  }
-
-  @Test
-  public void testJobStoreSameEnvironment() {
-    IJobConfiguration templateConfig = makeJob("labrat");
-    JobConfiguration prodBuilder = templateConfig.newBuilder();
-    prodBuilder.getKey().setEnvironment("prod");
-    IJobConfiguration prod = IJobConfiguration.build(prodBuilder);
-    JobConfiguration stagingBuilder = templateConfig.newBuilder();
-    stagingBuilder.getKey().setEnvironment("staging");
-    IJobConfiguration staging = IJobConfiguration.build(stagingBuilder);
-
-    store.saveAcceptedJob(prod);
-    store.saveAcceptedJob(staging);
-
-    assertNull(store.fetchJob(
-        IJobKey.build(templateConfig.getKey().newBuilder().setEnvironment("test"))).orNull());
-    assertEquals(prod, store.fetchJob(prod.getKey()).orNull());
-    assertEquals(staging, store.fetchJob(staging.getKey()).orNull());
-
-    store.removeJob(prod.getKey());
-    assertNull(store.fetchJob(prod.getKey()).orNull());
-    assertEquals(staging, store.fetchJob(staging.getKey()).orNull());
-  }
-
-  private static IJobConfiguration makeJob(String name) {
-    return IJobConfiguration.build(
-        new JobConfiguration().setKey(JobKeys.from("role-" + name, "env-" + name, name)
-            .newBuilder()));
-  }
-}

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/4d5885b8/src/test/java/org/apache/aurora/scheduler/storage/testing/StorageTestUtil.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/storage/testing/StorageTestUtil.java b/src/test/java/org/apache/aurora/scheduler/storage/testing/StorageTestUtil.java
index 6feddc3..1795749 100644
--- a/src/test/java/org/apache/aurora/scheduler/storage/testing/StorageTestUtil.java
+++ b/src/test/java/org/apache/aurora/scheduler/storage/testing/StorageTestUtil.java
@@ -18,7 +18,7 @@ import com.twitter.common.testing.easymock.EasyMockTest;
 
 import org.apache.aurora.scheduler.base.Query;
 import org.apache.aurora.scheduler.storage.AttributeStore;
-import org.apache.aurora.scheduler.storage.JobStore;
+import org.apache.aurora.scheduler.storage.CronJobStore;
 import org.apache.aurora.scheduler.storage.JobUpdateStore;
 import org.apache.aurora.scheduler.storage.LockStore;
 import org.apache.aurora.scheduler.storage.QuotaStore;
@@ -49,7 +49,7 @@ public class StorageTestUtil {
   public final TaskStore.Mutable taskStore;
   public final QuotaStore.Mutable quotaStore;
   public final AttributeStore.Mutable attributeStore;
-  public final JobStore.Mutable jobStore;
+  public final CronJobStore.Mutable jobStore;
   public final LockStore.Mutable lockStore;
   public final SchedulerStore.Mutable schedulerStore;
   public final JobUpdateStore.Mutable jobUpdateStore;
@@ -66,7 +66,7 @@ public class StorageTestUtil {
     this.taskStore = easyMock.createMock(TaskStore.Mutable.class);
     this.quotaStore = easyMock.createMock(QuotaStore.Mutable.class);
     this.attributeStore = easyMock.createMock(AttributeStore.Mutable.class);
-    this.jobStore = easyMock.createMock(JobStore.Mutable.class);
+    this.jobStore = easyMock.createMock(CronJobStore.Mutable.class);
     this.lockStore = easyMock.createMock(LockStore.Mutable.class);
     this.schedulerStore = easyMock.createMock(SchedulerStore.Mutable.class);
     this.jobUpdateStore = easyMock.createMock(JobUpdateStore.Mutable.class);
@@ -101,7 +101,7 @@ public class StorageTestUtil {
     expect(storeProvider.getTaskStore()).andReturn(taskStore).anyTimes();
     expect(storeProvider.getQuotaStore()).andReturn(quotaStore).anyTimes();
     expect(storeProvider.getAttributeStore()).andReturn(attributeStore).anyTimes();
-    expect(storeProvider.getJobStore()).andReturn(jobStore).anyTimes();
+    expect(storeProvider.getCronJobStore()).andReturn(jobStore).anyTimes();
     expect(storeProvider.getLockStore()).andReturn(lockStore).anyTimes();
     expect(storeProvider.getSchedulerStore()).andReturn(schedulerStore).anyTimes();
     expect(storeProvider.getJobUpdateStore()).andReturn(jobUpdateStore).anyTimes();
@@ -109,7 +109,7 @@ public class StorageTestUtil {
     expect(mutableStoreProvider.getUnsafeTaskStore()).andReturn(taskStore).anyTimes();
     expect(mutableStoreProvider.getQuotaStore()).andReturn(quotaStore).anyTimes();
     expect(mutableStoreProvider.getAttributeStore()).andReturn(attributeStore).anyTimes();
-    expect(mutableStoreProvider.getJobStore()).andReturn(jobStore).anyTimes();
+    expect(mutableStoreProvider.getCronJobStore()).andReturn(jobStore).anyTimes();
     expect(mutableStoreProvider.getLockStore()).andReturn(lockStore).anyTimes();
     expect(mutableStoreProvider.getSchedulerStore()).andReturn(schedulerStore).anyTimes();
     expect(mutableStoreProvider.getJobUpdateStore()).andReturn(jobUpdateStore).anyTimes();


Mime
View raw message