From a85dfcd91f1699d2df53a5f4e3f220755644f07e Mon Sep 17 00:00:00 2001
From: Martijn van Groningen <martijn.v.groningen@gmail.com>
Date: Fri, 9 Dec 2016 15:56:22 +0100
Subject: [PATCH] changed end back to primitive long renamed private method

Original commit: elastic/x-pack-elasticsearch@fc1849dbc6399c609569d5708f5317ae0080bb13
---
 .../elasticsearch/xpack/prelert/action/GetJobsAction.java   | 6 +++---
 .../xpack/prelert/job/scheduler/ScheduledJob.java           | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/prelert/action/GetJobsAction.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/prelert/action/GetJobsAction.java
index abe785ec7c7..08106cdbf73 100644
--- a/elasticsearch/src/main/java/org/elasticsearch/xpack/prelert/action/GetJobsAction.java
+++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/prelert/action/GetJobsAction.java
@@ -505,7 +505,7 @@ public class GetJobsAction extends Action<GetJobsAction.Request, GetJobsAction.R
                 Job jobConfig = request.config() ? jobs.results().get(0) : null;
                 DataCounts dataCounts = readDataCounts(request.dataCounts(), request.getJobId());
                 ModelSizeStats modelSizeStats = readModelSizeStats(request.modelSizeStats(), request.getJobId());
-                SchedulerStatus schedulerStatus = readSchedulerState(request.schedulerStatus(), request.getJobId());
+                SchedulerStatus schedulerStatus = readSchedulerStatus(request.schedulerStatus(), request.getJobId());
                 JobStatus jobStatus = readJobStatus(request.status(), request.getJobId());
 
                 Response.JobInfo jobInfo = new Response.JobInfo(
@@ -522,7 +522,7 @@ public class GetJobsAction extends Action<GetJobsAction.Request, GetJobsAction.R
                     Job jobConfig = request.config() ? job : null;
                     DataCounts dataCounts = readDataCounts(request.dataCounts(), job.getId());
                     ModelSizeStats modelSizeStats = readModelSizeStats(request.modelSizeStats(), job.getId());
-                    SchedulerStatus schedulerStatus = readSchedulerState(request.schedulerStatus(), job.getId());
+                    SchedulerStatus schedulerStatus = readSchedulerStatus(request.schedulerStatus(), job.getId());
                     JobStatus jobStatus = readJobStatus(request.status(), job.getId());
                     Response.JobInfo jobInfo = new Response.JobInfo(job.getId(), jobConfig, dataCounts, modelSizeStats,
                             schedulerStatus, jobStatus);
@@ -557,7 +557,7 @@ public class GetJobsAction extends Action<GetJobsAction.Request, GetJobsAction.R
             return null;
         }
 
-        private SchedulerStatus readSchedulerState(boolean schedulerState, String jobId) {
+        private SchedulerStatus readSchedulerStatus(boolean schedulerState, String jobId) {
             return schedulerState ? jobManager.getSchedulerStatus(jobId).orElse(null) : null;
         }
 
diff --git a/elasticsearch/src/main/java/org/elasticsearch/xpack/prelert/job/scheduler/ScheduledJob.java b/elasticsearch/src/main/java/org/elasticsearch/xpack/prelert/job/scheduler/ScheduledJob.java
index b53db5c2fe9..1a65f53fc29 100644
--- a/elasticsearch/src/main/java/org/elasticsearch/xpack/prelert/job/scheduler/ScheduledJob.java
+++ b/elasticsearch/src/main/java/org/elasticsearch/xpack/prelert/job/scheduler/ScheduledJob.java
@@ -112,7 +112,7 @@ class ScheduledJob {
         return running;
     }
 
-    private void run(long start, Long end, FlushJobAction.Request flushRequest) throws IOException {
+    private void run(long start, long end, FlushJobAction.Request flushRequest) throws IOException {
         if (end <= start) {
             return;
         }