jobInfoRemoval: removing JobInfo class, renaming Job to BenchmarkJob

haas-imagej-client/src/main/java/cz/it4i/fiji/haas/Job.java

@@ -116,6 +116,7 @@ public class Job {
 	}
 
 	public JobState getState() {
+		updateJobInfo();
 		return getJobInfo().getState();
 	}
 

haas-imagej-client/src/main/java/cz/it4i/fiji/haas/JobManager.java

 package cz.it4i.fiji.haas;
 
 import java.io.IOException;
-import java.io.InputStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.Calendar;
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.LinkedList;
-import java.util.List;
-import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
 import org.slf4j.Logger;
@@ -20,7 +16,6 @@ import cz.it4i.fiji.haas_java_client.HaaSClient.UploadingFile;
 import cz.it4i.fiji.haas_java_client.JobState;
 import cz.it4i.fiji.haas_java_client.Settings;
 import cz.it4i.fiji.haas_java_client.SynchronizableFileType;
-import javafx.beans.value.ObservableValueBase;
 import net.imagej.updater.util.Progress;
 
 public class JobManager {
@@ -41,29 +36,23 @@ public class JobManager {
 		this.settings = settings;
 	}
 
-	public JobInfo createJob() throws IOException {
+	public Job createJob() throws IOException {
 		Job job;
 		if (jobs == null) {
 			jobs = new LinkedList<>();
 		}
 		jobs.add(job = new Job(settings.getJobName(), workDirectory, this::getHaasClient));
-		return new JobInfo(job) {
-			@Override
-			public JobState getState() {
-				job.updateInfo();
-				return super.getState();
-			}
-		};
+		return job;
 	}
 
-	public JobInfo startJob(Iterable<UploadingFile> files, Progress notifier) throws IOException {
-		JobInfo result = createJob();
+	public Job startJob(Iterable<UploadingFile> files, Progress notifier) throws IOException {
+		Job result = createJob();
 		result.uploadFiles(files, notifier);
 		result.submit();
 		return result;
 	}
 
-	public Collection<JobInfo> getJobs() {
+	public Collection<Job> getJobs() {
 		if (jobs == null) {
 			jobs = new LinkedList<>();
 			try {
@@ -75,7 +64,7 @@ public class JobManager {
 				throw new RuntimeException(e);
 			}
 		}
-		return jobs.stream().map(j -> new JobInfo(j)).collect(Collectors.toList());
+		return jobs.stream().collect(Collectors.toList());
 	}
 
 	public void downloadJob(Long id, Progress notifier) {
@@ -114,100 +103,4 @@ public class JobManager {
 			return offset;
 		}
 	}
-
-	public static class JobInfo extends ObservableValueBase<JobInfo> {
-
-		private Job job;
-
-		public JobInfo(Job job) {
-			this.job = job;
-		}
-
-		public void uploadFiles(Iterable<UploadingFile> files, Progress notifier) {
-			job.uploadFiles(files,notifier);
-		}
-
-		public void uploadFilesByName(Iterable<String> files, Progress notifier) {
-			job.uploadFilesByName(files, notifier);
-		}
-
-		public void submit() {
-			job.submit();
-		}
-
-		public Long getId() {
-			return job.getJobId();
-		}
-
-		public JobState getState() {
-			return job.getState();
-		}
-
-		public String getCreationTime() {
-			return getStringFromTimeSafely(job.getCreationTime());
-		}
-
-		public String getStartTime() {
-			return getStringFromTimeSafely(job.getStartTime());
-		}
-
-		public String getEndTime() {
-			return getStringFromTimeSafely(job.getEndTime());
-		}
-
-		public void downloadData(Progress notifier) {
-			downloadData(x -> true, notifier);
-		}
-
-		public void downloadData(Predicate<String> predicate, Progress notifier) {
-			job.download(predicate, notifier);
-			fireValueChangedEvent();
-
-		}
-
-		public void waitForStart() {
-			// TODO Auto-generated method stub
-
-		}
-
-		public void updateInfo() {
-			job.updateInfo();
-		}
-
-		@Override
-		public JobInfo getValue() {
-			return this;
-		}
-
-		public Path storeDataInWorkdirectory(UploadingFile uploadingFile) throws IOException {
-			return job.storeDataInWorkdirectory(uploadingFile);
-		}
-
-		public List<String> getOutput(Iterable<JobSynchronizableFile> files) {
-			return job.getOutput(files);
-		}
-
-		private String getStringFromTimeSafely(Calendar time) {
-			return time != null ? time.getTime().toString() : "N/A";
-		}
-
-		public InputStream openLocalFile(String name) throws IOException {
-			return job.openLocalFile(name);
-		}
-
-		public void setProperty(String name, String value) {
-			job.setProperty(name, value);
-
-		}
-
-		public String getProperty(String name) {
-			return job.getProperty(name);
-		}
-
-		public Path getDirectory() {
-			return job.getDirectory();
-		}
-
-	}
-
 }

haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/core/BenchmarkJobManager.java

@@ -10,6 +10,7 @@ import java.nio.file.InvalidPathException;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.Arrays;
+import java.util.Calendar;
 import java.util.Collection;
 import java.util.LinkedList;
 import java.util.List;
@@ -21,8 +22,8 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.yaml.snakeyaml.Yaml;
 
+import cz.it4i.fiji.haas.Job;
 import cz.it4i.fiji.haas.JobManager;
-import cz.it4i.fiji.haas.JobManager.JobInfo;
 import cz.it4i.fiji.haas.JobManager.JobSynchronizableFile;
 import cz.it4i.fiji.haas.UploadingFileFromResource;
 import cz.it4i.fiji.haas_java_client.HaaSClient;
@@ -38,90 +39,93 @@ public class BenchmarkJobManager {
 	private static Logger log = LoggerFactory
 			.getLogger(cz.it4i.fiji.haas_spim_benchmark.core.BenchmarkJobManager.class);
 
-	public final class Job extends ObservableValueBase<Job> {
-		private JobInfo jobInfo;
-
+	public final class BenchmarkJob extends ObservableValueBase<BenchmarkJob> {
+		
+		private Job job;
 		private JobState oldState;
 
-		public Job(JobInfo ji) {
+		public BenchmarkJob(Job job) {
 			super();
-			this.jobInfo = ji;
+			this.job = job;
 		}
 
 		public void startJob(Progress progress) throws IOException {
-			jobInfo.uploadFilesByName(Arrays.asList(Constants.CONFIG_YAML), progress);
-			String outputName = getOutputName(jobInfo.openLocalFile(Constants.CONFIG_YAML));
-			jobInfo.submit();
-			jobInfo.setProperty(Constants.SPIM_OUTPUT_FILENAME_PATTERN, outputName);
+			job.uploadFilesByName(Arrays.asList(Constants.CONFIG_YAML), progress);
+			String outputName = getOutputName(job.openLocalFile(Constants.CONFIG_YAML));
+			job.submit();
+			job.setProperty(Constants.SPIM_OUTPUT_FILENAME_PATTERN, outputName);
 			setDownloaded(false);
 		}
 
 		public JobState getState() {
-			return oldState = jobInfo.getState();
+			job.updateInfo();
+			return oldState = job.getState();
 		}
 
 		public void downloadData(Progress progress) throws IOException {
-			JobInfo ji = jobInfo;
-			if (ji.getState() == JobState.Finished) {
-				String filePattern = ji.getProperty(Constants.SPIM_OUTPUT_FILENAME_PATTERN);
-				ji.downloadData(downloadFinishedData(filePattern), progress);
-			} else if (ji.getState() == JobState.Failed) {
-				ji.downloadData(downloadFailedData(), progress);
+			if (this.job.getState() == JobState.Finished) {
+				String filePattern = this.job.getProperty(Constants.SPIM_OUTPUT_FILENAME_PATTERN);
+				this.job.download(downloadFinishedData(filePattern), progress);
+			} else if (this.job.getState() == JobState.Failed) {
+				this.job.download(downloadFailedData(), progress);
 			}
+			fireValueChangedEvent();
 			setDownloaded(true);
 		}
 
-		public void downloadStatistics(Progress progress) throws IOException {
-			JobInfo ji = jobInfo;
-			ji.downloadData(BenchmarkJobManager.downloadStatistics(), progress);
-			Path resultFile = ji.getDirectory().resolve(Constants.BENCHMARK_RESULT_FILE);
+		public void downloadStatistics(Progress progress) throws IOException {			
+			this.job.download(BenchmarkJobManager.downloadStatistics(), progress);
+			fireValueChangedEvent();
+			Path resultFile = this.job.getDirectory().resolve(Constants.BENCHMARK_RESULT_FILE);
 			if (resultFile != null)
 				BenchmarkJobManager.formatResultFile(resultFile);
 		}
 
 		public List<String> getOutput(List<JobSynchronizableFile> files) {
-			return jobInfo.getOutput(files);
+			return this.job.getOutput(files);
 		}
 
 		public long getId() {
-			return jobInfo.getId();
+			return this.job.getJobId();
 		}
 
 		public String getCreationTime() {
-			return jobInfo.getCreationTime();
+			return getStringFromTimeSafely(this.job.getCreationTime());
 		}
 
 		public String getStartTime() {
-			return jobInfo.getStartTime();
+			return getStringFromTimeSafely(this.job.getStartTime());
 		}
 
 		public String getEndTime() {
-			return jobInfo.getEndTime();
+			return getStringFromTimeSafely(this.job.getEndTime());
+		}
+		
+		private String getStringFromTimeSafely(Calendar time) {
+			return time != null ? time.getTime().toString() : "N/A";
 		}
 
 		@Override
-		public Job getValue() {
+		public BenchmarkJob getValue() {
 			return this;
 		}
 
 		@Override
 		public int hashCode() {
-			return jobInfo.getId().hashCode();
+			return Long.hashCode(this.job.getJobId());
 		}
 
 		@Override
 		public boolean equals(Object obj) {
-			if (obj instanceof Job) {
-				Job job = (Job) obj;
+			if (obj instanceof BenchmarkJob) {
+				BenchmarkJob job = (BenchmarkJob) obj;
 				return job.getId() == getId();
-
 			}
 			return false;
 		}
 
-		public void update(Job job) {
-			jobInfo = job.jobInfo;
-			if (jobInfo.getState() != oldState) {
+		public void update(BenchmarkJob benchmarkJob) {
+			if (benchmarkJob.job.getState() != oldState) {
 				fireValueChangedEvent();
 			}
 		}
@@ -130,22 +134,22 @@ public class BenchmarkJobManager {
 			return getDownloaded();
 		}
 
-		public Job update() {
-			jobInfo.updateInfo();
+		public BenchmarkJob update() {
+			this.job.updateInfo();
 			return this;
 		}
 
 		public Path getDirectory() {
-			return jobInfo.getDirectory();
+			return this.job.getDirectory();
 		}
 		
 
 		private void setDownloaded(boolean b) {
-			jobInfo.setProperty(JOB_HAS_DATA_TO_DOWNLOAD_PROPERTY, b + "");
+			this.job.setProperty(JOB_HAS_DATA_TO_DOWNLOAD_PROPERTY, b + "");
 		}
 		
 		private boolean getDownloaded() {
-			String downloadedStr = jobInfo.getProperty(JOB_HAS_DATA_TO_DOWNLOAD_PROPERTY);
+			String downloadedStr = this.job.getProperty(JOB_HAS_DATA_TO_DOWNLOAD_PROPERTY);
 			return downloadedStr != null && Boolean.parseBoolean(downloadedStr);
 		}
 	}
@@ -156,13 +160,13 @@ public class BenchmarkJobManager {
 		jobManager = new JobManager(params.workingDirectory(), constructSettingsFromParams(params));
 	}
 
-	public Job createJob() throws IOException {
-		JobInfo jobInfo = jobManager.createJob();
-		jobInfo.storeDataInWorkdirectory(getUploadingFile());
-		return convertJob(jobInfo);
+	public BenchmarkJob createJob() throws IOException {
+		Job job = jobManager.createJob();
+		job.storeDataInWorkdirectory(getUploadingFile());
+		return convertJob(job);
 	}
 
-	public Collection<Job> getJobs() throws IOException {
+	public Collection<BenchmarkJob> getJobs() throws IOException {
 		return jobManager.getJobs().stream().map(this::convertJob).collect(Collectors.toList());
 	}
 
@@ -171,8 +175,8 @@ public class BenchmarkJobManager {
 		return new UploadingFileFromResource("", Constants.CONFIG_YAML);
 	}
 
-	private Job convertJob(JobInfo jobInfo) {
-		return new Job(jobInfo);
+	private BenchmarkJob convertJob(Job job) {
+		return new BenchmarkJob(job);
 	}
 
 	private String getOutputName(InputStream openLocalFile) throws IOException {

haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/ui/BenchmarkSPIMController.java

@@ -33,7 +33,7 @@ import cz.it4i.fiji.haas.ui.ProgressDialog;
 import cz.it4i.fiji.haas.ui.TableViewContextMenu;
 import cz.it4i.fiji.haas_java_client.JobState;
 import cz.it4i.fiji.haas_spim_benchmark.core.BenchmarkJobManager;
-import cz.it4i.fiji.haas_spim_benchmark.core.BenchmarkJobManager.Job;
+import cz.it4i.fiji.haas_spim_benchmark.core.BenchmarkJobManager.BenchmarkJob;
 import cz.it4i.fiji.haas_spim_benchmark.core.Constants;
 import cz.it4i.fiji.haas_spim_benchmark.core.FXFrameExecutorService;
 import javafx.fxml.FXML;
@@ -43,7 +43,7 @@ import net.imagej.updater.util.Progress;
 
 public class BenchmarkSPIMController implements FXFrame.Controller {
 
-	private static boolean notNullValue(Job j, Predicate<Job> pred) {
+	private static boolean notNullValue(BenchmarkJob j, Predicate<BenchmarkJob> pred) {
 		if (j == null) {
 			return false;
 		} else {
@@ -52,7 +52,7 @@ public class BenchmarkSPIMController implements FXFrame.Controller {
 	}
 
 	@FXML
-	private TableView<Job> jobs;
+	private TableView<BenchmarkJob> jobs;
 
 	private BenchmarkJobManager manager;
 
@@ -97,7 +97,7 @@ public class BenchmarkSPIMController implements FXFrame.Controller {
 	}
 
 	private void initMenu() {
-		TableViewContextMenu<Job> menu = new TableViewContextMenu<>(jobs);
+		TableViewContextMenu<BenchmarkJob> menu = new TableViewContextMenu<>(jobs);
 		menu.addItem("Create job", x -> executeWSCallAsync("Creating job", p -> manager.createJob()),
 				j -> true);
 		menu.addItem("Start job", job -> executeWSCallAsync("Starting job", p -> job.startJob(p)),
@@ -118,7 +118,7 @@ public class BenchmarkSPIMController implements FXFrame.Controller {
 
 	}
 
-	private void open(Job j) {
+	private void open(BenchmarkJob j) {
 		executorServiceUI.execute(() -> {
 			Desktop desktop = Desktop.getDesktop();
 			try {
@@ -174,15 +174,15 @@ public class BenchmarkSPIMController implements FXFrame.Controller {
 			executorServiceUI.execute(() -> {
 				
 
-				Set<Job> old = new HashSet<Job>(jobs.getItems());
-				Map<Job, Job> actual;
+				Set<BenchmarkJob> old = new HashSet<BenchmarkJob>(jobs.getItems());
+				Map<BenchmarkJob, BenchmarkJob> actual;
 				try {
 					actual = manager.getJobs().stream().
 							collect(Collectors.toMap(job -> job, job -> job));
 				} catch (IOException e) {
 					throw new RuntimeException(e);
 				}
-				for (Job job : old) {
+				for (BenchmarkJob job : old) {
 					if (!actual.containsKey(job)) {
 						jobs.getItems().remove(job);
 					} else {
@@ -191,7 +191,7 @@ public class BenchmarkSPIMController implements FXFrame.Controller {
 				}
 				progress.done();
 				executorServiceFX.execute(() -> {
-					for (Job job : actual.keySet()) {
+					for (BenchmarkJob job : actual.keySet()) {
 						if (!old.contains(job)) {
 							jobs.getItems().add(job);
 						}
@@ -211,9 +211,9 @@ public class BenchmarkSPIMController implements FXFrame.Controller {
 	}
 
 	@SuppressWarnings("unchecked")
-	private void setCellValueFactory(int index, Function<Job, String> mapper) {
-		((TableColumn<Job, String>) jobs.getColumns().get(index))
-				.setCellValueFactory(f -> new ObservableValueAdapter<Job, String>(f.getValue(), mapper));
+	private void setCellValueFactory(int index, Function<BenchmarkJob, String> mapper) {
+		((TableColumn<BenchmarkJob, String>) jobs.getColumns().get(index))
+				.setCellValueFactory(f -> new ObservableValueAdapter<BenchmarkJob, String>(f.getValue(), mapper));
 
 	}
 

haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/ui/JobOutputView.java

@@ -20,7 +20,7 @@ import org.slf4j.LoggerFactory;
 
 import cz.it4i.fiji.haas.JobManager.JobSynchronizableFile;
 import cz.it4i.fiji.haas_java_client.SynchronizableFileType;
-import cz.it4i.fiji.haas_spim_benchmark.core.BenchmarkJobManager.Job;
+import cz.it4i.fiji.haas_spim_benchmark.core.BenchmarkJobManager.BenchmarkJob;
 
 public class JobOutputView {
 	@SuppressWarnings("unused")
@@ -28,11 +28,11 @@ public class JobOutputView {
 	private Timer timer;
 	private JDialog theDialog;
 	private JTextArea theText;
-	private Job job;
+	private BenchmarkJob job;
 	private ExecutorService executor;
 	private long readedChars = 0;
 
-	public JobOutputView(Window parent, ExecutorService executor, Job job, long refreshTimeout) {
+	public JobOutputView(Window parent, ExecutorService executor, BenchmarkJob job, long refreshTimeout) {
 		this.job = job;
 		this.executor = executor;
 		constructFrame(parent);

haas-spim-benchmark/src/test/java/cz/it4i/fiji/haas/RunBenchmark.java

@@ -14,7 +14,7 @@ import cz.it4i.fiji.haas.ui.DummyProgress;
 import cz.it4i.fiji.haas_java_client.JobState;
 import cz.it4i.fiji.haas_java_client.SynchronizableFileType;
 import cz.it4i.fiji.haas_spim_benchmark.core.BenchmarkJobManager;
-import cz.it4i.fiji.haas_spim_benchmark.core.BenchmarkJobManager.Job;
+import cz.it4i.fiji.haas_spim_benchmark.core.BenchmarkJobManager.BenchmarkJob;
 import cz.it4i.fiji.haas_spim_benchmark.core.BenchmarkSPIMParameters;
 
 public class RunBenchmark {
@@ -23,7 +23,7 @@ public class RunBenchmark {
 	public static class CreateJob {
 		public static void main(String[] args) throws IOException {
 			BenchmarkJobManager benchmarkJobManager = new BenchmarkJobManager(getBenchmarkSPIMParameters());
-			Job ji = benchmarkJobManager.createJob();
+			BenchmarkJob ji = benchmarkJobManager.createJob();
 			log.info("job: " + ji.getId() + " created.");
 		}
 	}
@@ -31,7 +31,7 @@ public class RunBenchmark {
 	public static class ProcessJobs {
 		public static void main(String[] args) throws IOException {
 			BenchmarkJobManager benchmarkJobManager = new BenchmarkJobManager(getBenchmarkSPIMParameters());
-			for (Job job : benchmarkJobManager.getJobs()) {
+			for (BenchmarkJob job : benchmarkJobManager.getJobs()) {
 				JobState state;
 				log.info("job: " + job.getId() + " hasStatus " + (state = job.getState()));
 				if (state == JobState.Configuring) {