From 0b1981d169593525f4575746ea509460379bb540 Mon Sep 17 00:00:00 2001
From: Kai Reinhard <K.Reinhard@micromata.de>
Date: Sun, 30 Dec 2018 06:15:23 +0000
Subject: [PATCH] Unchecked warnings...
---
borgbutler-core/src/main/java/de/micromata/borgbutler/jobs/AbstractCommandLineJob.java | 2 +-
borgbutler-core/src/main/java/de/micromata/borgbutler/jobs/AbstractJob.java | 2 +-
borgbutler-core/src/main/java/de/micromata/borgbutler/jobs/JobQueue.java | 2 +-
borgbutler-core/src/main/java/de/micromata/borgbutler/BorgCommands.java | 3 +--
borgbutler-core/src/test/java/de/micromata/borgbutler/jobs/TestJob.java | 2 +-
borgbutler-core/src/main/java/de/micromata/borgbutler/BorgJob.java | 2 +-
borgbutler-core/src/main/java/de/micromata/borgbutler/BorgQueueExecutor.java | 8 ++++----
7 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/borgbutler-core/src/main/java/de/micromata/borgbutler/BorgCommands.java b/borgbutler-core/src/main/java/de/micromata/borgbutler/BorgCommands.java
index 4e55fa2..c2319c2 100644
--- a/borgbutler-core/src/main/java/de/micromata/borgbutler/BorgCommands.java
+++ b/borgbutler-core/src/main/java/de/micromata/borgbutler/BorgCommands.java
@@ -17,7 +17,6 @@
import java.io.IOException;
import java.time.LocalDateTime;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.List;
/**
@@ -217,7 +216,7 @@
return restoreDir;
}
- private static BorgJob execute(BorgCommand command) {
+ private static BorgJob<Void> execute(BorgCommand command) {
Validate.notNull(command);
return BorgQueueExecutor.getInstance().execute(command);
}
diff --git a/borgbutler-core/src/main/java/de/micromata/borgbutler/BorgJob.java b/borgbutler-core/src/main/java/de/micromata/borgbutler/BorgJob.java
index 7ed166b..a2db33a 100644
--- a/borgbutler-core/src/main/java/de/micromata/borgbutler/BorgJob.java
+++ b/borgbutler-core/src/main/java/de/micromata/borgbutler/BorgJob.java
@@ -17,7 +17,7 @@
* A queue is important because Borg doesn't support parallel calls for one repository.
* For each repository one single queue is allocated.
*/
-public class BorgJob<T> extends AbstractCommandLineJob<String> {
+public class BorgJob<T> extends AbstractCommandLineJob {
private Logger log = LoggerFactory.getLogger(BorgJob.class);
@Getter
private BorgCommand command;
diff --git a/borgbutler-core/src/main/java/de/micromata/borgbutler/BorgQueueExecutor.java b/borgbutler-core/src/main/java/de/micromata/borgbutler/BorgQueueExecutor.java
index 8b42a3a..d24e27a 100644
--- a/borgbutler-core/src/main/java/de/micromata/borgbutler/BorgQueueExecutor.java
+++ b/borgbutler-core/src/main/java/de/micromata/borgbutler/BorgQueueExecutor.java
@@ -35,13 +35,13 @@
}
}
- public BorgJob execute(BorgCommand command) {
- BorgJob job = new BorgJob(command);
+ public BorgJob<Void> execute(BorgCommand command) {
+ BorgJob<Void> job = new BorgJob<Void>(command);
return execute(job);
}
- public BorgJob execute(BorgJob job) {
- return (BorgJob)getQueue(job.getCommand().getRepoConfig()).append(job);
+ public <T> BorgJob<T> execute(BorgJob<T> job) {
+ return (BorgJob<T>)getQueue(job.getCommand().getRepoConfig()).append(job);
}
private BorgQueueExecutor() {
diff --git a/borgbutler-core/src/main/java/de/micromata/borgbutler/jobs/AbstractCommandLineJob.java b/borgbutler-core/src/main/java/de/micromata/borgbutler/jobs/AbstractCommandLineJob.java
index 9ffc59a..92c656b 100644
--- a/borgbutler-core/src/main/java/de/micromata/borgbutler/jobs/AbstractCommandLineJob.java
+++ b/borgbutler-core/src/main/java/de/micromata/borgbutler/jobs/AbstractCommandLineJob.java
@@ -18,7 +18,7 @@
* A queue is important because Borg doesn't support parallel calls for one repository.
* For each repository one single queue is allocated.
*/
-public abstract class AbstractCommandLineJob<T> extends AbstractJob<T> {
+public abstract class AbstractCommandLineJob extends AbstractJob<String> {
private Logger log = LoggerFactory.getLogger(AbstractCommandLineJob.class);
private ExecuteWatchdog watchdog;
@Getter
diff --git a/borgbutler-core/src/main/java/de/micromata/borgbutler/jobs/AbstractJob.java b/borgbutler-core/src/main/java/de/micromata/borgbutler/jobs/AbstractJob.java
index fb93c7b..127b3fc 100644
--- a/borgbutler-core/src/main/java/de/micromata/borgbutler/jobs/AbstractJob.java
+++ b/borgbutler-core/src/main/java/de/micromata/borgbutler/jobs/AbstractJob.java
@@ -88,7 +88,7 @@
return false;
}
- public abstract JobResult execute();
+ public abstract JobResult<T> execute();
/**
* A job is identified by this id. If a job with the same id is already queued (not yet finished), this job will
diff --git a/borgbutler-core/src/main/java/de/micromata/borgbutler/jobs/JobQueue.java b/borgbutler-core/src/main/java/de/micromata/borgbutler/jobs/JobQueue.java
index fae9913..5f4a10a 100644
--- a/borgbutler-core/src/main/java/de/micromata/borgbutler/jobs/JobQueue.java
+++ b/borgbutler-core/src/main/java/de/micromata/borgbutler/jobs/JobQueue.java
@@ -30,7 +30,7 @@
* @param job
* @return The given job (if it's not already running or queued), otherwise the already running or queued job.
*/
- public AbstractJob append(AbstractJob<T> job) {
+ public AbstractJob<T> append(AbstractJob<T> job) {
synchronized (queue) {
for (AbstractJob<T> queuedJob : queue) {
if (Objects.equals(queuedJob.getId(), job.getId())) {
diff --git a/borgbutler-core/src/test/java/de/micromata/borgbutler/jobs/TestJob.java b/borgbutler-core/src/test/java/de/micromata/borgbutler/jobs/TestJob.java
index 17d4666..9a4077d 100644
--- a/borgbutler-core/src/test/java/de/micromata/borgbutler/jobs/TestJob.java
+++ b/borgbutler-core/src/test/java/de/micromata/borgbutler/jobs/TestJob.java
@@ -6,7 +6,7 @@
import java.io.File;
-public class TestJob extends AbstractCommandLineJob<String> {
+public class TestJob extends AbstractCommandLineJob {
private Logger log = LoggerFactory.getLogger(TestJob.class);
private int time;
private File counterScript;
--
Gitblit v1.10.0