X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.slc.detached%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fdetached%2Fdrivers%2FFileDriver.java;fp=org.argeo.slc.detached%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fdetached%2Fdrivers%2FFileDriver.java;h=cc9d1392246c22565f91658e69effc92dd6f0dbd;hb=cf1adb6cbf016fe861e7b6952776081a0339c4d3;hp=89522ed0aaacf7ba07ff43a23b3b70334787c9f0;hpb=3ac6b9361cb1761ed67360988931e6103ef3ba9d;p=gpl%2Fargeo-slc.git

diff --git a/org.argeo.slc.detached/src/main/java/org/argeo/slc/detached/drivers/FileDriver.java b/org.argeo.slc.detached/src/main/java/org/argeo/slc/detached/drivers/FileDriver.java
index 89522ed0a..cc9d13922 100644
--- a/org.argeo.slc.detached/src/main/java/org/argeo/slc/detached/drivers/FileDriver.java
+++ b/org.argeo.slc.detached/src/main/java/org/argeo/slc/detached/drivers/FileDriver.java
@@ -3,66 +3,129 @@ package org.argeo.slc.detached.drivers;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
+import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.argeo.slc.detached.DetachedClient;
+import org.argeo.slc.detached.DetachedCommunication;
 import org.argeo.slc.detached.DetachedDriver;
 import org.argeo.slc.detached.DetachedException;
-import org.argeo.slc.detached.DetachedStepAnswer;
-import org.argeo.slc.detached.DetachedStepRequest;
+import org.argeo.slc.detached.DetachedAnswer;
+import org.argeo.slc.detached.DetachedRequest;
+import org.springframework.beans.factory.InitializingBean;
 
-public class FileDriver implements DetachedDriver, DetachedClient {
-	private File requestDir;
-	private File answerDir;
+public class FileDriver implements DetachedDriver, DetachedClient,
+		InitializingBean {
+	private final static Log log = LogFactory.getLog(FileDriver.class);
 
-	public synchronized DetachedStepRequest receiveRequest() throws Exception {
-		if (!requestDir.exists())
-			throw new DetachedException("Request dir "
-					+ requestDir.getCanonicalPath() + " does not exist.");
+	private File baseDir;
+	private File requestsDir;
+	private File answersDir;
+	private File processedRequestsDir;
+	private File processedAnswersDir;
 
+	public synchronized DetachedRequest receiveRequest() throws Exception {
+		return (DetachedRequest) receiveFile(requestsDir,
+				processedRequestsDir);
+	}
+
+	public void sendAnswer(DetachedAnswer answer) throws Exception {
+		sendFile(answersDir, answer);
+	}
+
+	public DetachedAnswer receiveAnswer() throws Exception {
+		return (DetachedAnswer) receiveFile(answersDir, processedAnswersDir);
+	}
+
+	public void sendRequest(DetachedRequest request) throws Exception {
+		sendFile(requestsDir, request);
+	}
+
+	protected void sendFile(File dir, DetachedCommunication detCom)
+			throws Exception {
+		File file = new File(dir.getPath() + File.separator + detCom.getUuid());
+		File lockFile = createLockFile(file);
+		ObjectOutputStream out = new ObjectOutputStream(new FileOutputStream(
+				file));
+		out.writeObject(detCom);
+		out.close();
+		lockFile.delete();
+	}
+
+	protected DetachedCommunication receiveFile(File dir, File processedDir)
+			throws Exception {
 		File file = null;
 		while (file == null) {
-			File[] files = requestDir.listFiles();
+			File[] files = dir.listFiles();
 			if (files.length > 0)
 				file = files[0];
 			else
 				Thread.sleep(1000);
 		}
 
+		File lockFile = nameLockFile(file);
+		while (lockFile.exists())
+			// TODO: implements time out
+			Thread.sleep(100);
+
 		ObjectInputStream in = new ObjectInputStream(new FileInputStream(file));
-		DetachedStepRequest request = (DetachedStepRequest) in.readObject();
+		DetachedCommunication detCom = (DetachedCommunication) in.readObject();
 		in.close();
 
-		file.delete();// move it to a processed dir instead?
-		return request;
+		// Move to processed dir
+		file.renameTo(new File(processedDir.getAbsolutePath() + File.separator
+				+ file.getName()));
+		return detCom;
+
 	}
 
-	public void sendAnswer(DetachedStepAnswer answer) throws Exception {
-		// TODO Auto-generated method stub
+	protected File createLockFile(File file) {
+		File lockFile = nameLockFile(file);
+		try {
+			lockFile.createNewFile();
+		} catch (IOException e) {
+			throw new DetachedException("Cannot create lock file " + lockFile);
+		}
+		return lockFile;
+	}
 
+	protected File nameLockFile(File file) {
+		return new File(file.getAbsolutePath() + ".lck");
 	}
 
-	public DetachedStepAnswer receiveAnswer() throws Exception {
-		// TODO Auto-generated method stub
-		return null;
+	public void setBaseDir(File baseDir) {
+		this.baseDir = baseDir;
 	}
 
-	public void sendRequest(DetachedStepRequest request) throws Exception {
-		File file = new File(requestDir.getPath() + File.separator
-				+ request.getUuid());
-		ObjectOutputStream out = new ObjectOutputStream(new FileOutputStream(
-				file));
-		out.writeObject(request);
-		out.close();
+	public void init() {
+		this.requestsDir = new File(baseDir.getAbsolutePath() + File.separator
+				+ "requests");
+		this.answersDir = new File(baseDir.getAbsolutePath() + File.separator
+				+ "answers");
+		this.processedRequestsDir = new File(baseDir.getAbsolutePath()
+				+ File.separator + "processed" + File.separator + "requests");
+		this.processedAnswersDir = new File(baseDir.getAbsolutePath()
+				+ File.separator + "processed" + File.separator + "answers");
+
+		createIfNotExist(requestsDir);
+		createIfNotExist(answersDir);
+		createIfNotExist(processedRequestsDir);
+		createIfNotExist(processedAnswersDir);
 	}
 
-	public void setRequestDir(File requestDir) {
-		this.requestDir = requestDir;
+	private void createIfNotExist(File dir) {
+		if (!dir.exists()) {
+			log.warn("Dir " + requestsDir.getAbsolutePath()
+					+ " does not exist. Creating it...");
+			dir.mkdirs();
+		}
 	}
 
-	public void setAnswerDir(File answerDir) {
-		this.answerDir = answerDir;
+	public void afterPropertiesSet() throws Exception {
+		init();
 	}
 
 }