[HWKMETRICS-648] changes based on PR review

hawkular · Apr 20, 2017 · 45f64c7 · 45f64c7
1 parent fbe4a7a
commit 45f64c7
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/core/metrics-core-service/src/main/java/org/hawkular/metrics/core/jobs/JobsServiceImpl.java b/core/metrics-core-service/src/main/java/org/hawkular/metrics/core/jobs/JobsServiceImpl.java
@@ -197,16 +197,16 @@ private void maybeScheduleMetricExpirationJob(List<JobDetails> backgroundJobs) {
 
             //Get start of next day
             long nextStart = DateTimeService.current24HourTimeSlice().plusDays(1).getMillis();
-            JobDetails JobDetails = scheduler.scheduleJob(DeleteExpiredMetrics.JOB_NAME, DeleteExpiredMetrics.JOB_NAME,
+            JobDetails jobDetails = scheduler.scheduleJob(DeleteExpiredMetrics.JOB_NAME, DeleteExpiredMetrics.JOB_NAME,
                     ImmutableMap.of(), new RepeatingTrigger.Builder().withTriggerTime(nextStart)
                             .withInterval(this.metricExpirationJobFrequencyInDays, TimeUnit.DAYS).build())
                     .toBlocking().value();
-            backgroundJobs.add(JobDetails);
-            configurationService.save(configId, jobIdConfigKey, JobDetails.getJobId().toString()).toBlocking();
+            backgroundJobs.add(jobDetails);
+            configurationService.save(configId, jobIdConfigKey, jobDetails.getJobId().toString()).toBlocking();
             configurationService.save(configId, jobFrequencyKey, this.metricExpirationJobFrequencyInDays + "")
                     .toBlocking();
 
-            logger.info("Created and scheduled " + JobDetails);
+            logger.info("Created and scheduled " + jobDetails);
         }
     }
 

diff --git a/...ore-service/src/test/java/org/hawkular/metrics/core/service/metrics/BaseMetricsITest.java b/...ore-service/src/test/java/org/hawkular/metrics/core/service/metrics/BaseMetricsITest.java
@@ -93,7 +93,7 @@ public void initClass() {
     @BeforeMethod(alwaysRun = true)
     public void initMethod() {
         session.execute("TRUNCATE tenants");
-//        session.execute("TRUNCATE data");
+        session.execute("TRUNCATE data");
         session.execute("TRUNCATE data_compressed");
         session.execute("TRUNCATE metrics_idx");
         session.execute("TRUNCATE retentions_idx");

diff --git a/job-scheduler/src/test/java/org/hawkular/metrics/scheduler/impl/JobExecutionTest.java b/job-scheduler/src/test/java/org/hawkular/metrics/scheduler/impl/JobExecutionTest.java
@@ -876,8 +876,6 @@ private JobDetails createJobDetails(UUID jobId, String jobType, String jobName,
             Trigger trigger) {
         return jobsService.createJobDetails(jobId, jobType, jobName, parameters, trigger,
                 new Date(trigger.getTriggerTime()));
-//        return new JobDetails(jobId, jobType, jobName, new JobParametersImpl(parameters, DEFAULT_SAVE_PARAMS),
-//                trigger);
     }
 
     private class TestLatch extends CountDownLatch {