Remove indirection via Client (Command->Client->Operation) when calli…

…ng Operations; reduced to Command->Operation
syncany · Mar 23, 2015 · f81ab9a · f81ab9a
1 parent 3c5e4d3
commit f81ab9a
Show file tree

Hide file tree

Showing 19 changed files with 159 additions and 146 deletions.
diff --git a/syncany-cli/src/main/java/org/syncany/cli/CleanupCommand.java b/syncany-cli/src/main/java/org/syncany/cli/CleanupCommand.java
@@ -24,6 +24,7 @@
 
 import org.syncany.cli.util.CommandLineUtil;
 import org.syncany.operations.OperationResult;
+import org.syncany.operations.cleanup.CleanupOperation;
 import org.syncany.operations.cleanup.CleanupOperationOptions;
 import org.syncany.operations.cleanup.CleanupOperationResult;
 import org.syncany.operations.daemon.messages.CleanupStartCleaningSyncExternalEvent;
@@ -46,7 +47,7 @@ public boolean canExecuteInDaemonScope() {
 	@Override
 	public int execute(String[] operationArgs) throws Exception {
 		CleanupOperationOptions operationOptions = parseOptions(operationArgs);
-		CleanupOperationResult operationResult = client.cleanup(operationOptions);
+		CleanupOperationResult operationResult = new CleanupOperation(config, operationOptions).execute();
 
 		printResults(operationResult);
 

diff --git a/syncany-cli/src/main/java/org/syncany/cli/Command.java b/syncany-cli/src/main/java/org/syncany/cli/Command.java
@@ -20,8 +20,8 @@
 import java.io.File;
 import java.io.PrintStream;
 
-import org.syncany.Client;
 import org.syncany.cli.util.CarriageReturnPrinter;
+import org.syncany.config.Config;
 import org.syncany.config.LocalEventBus;
 import org.syncany.operations.OperationOptions;
 import org.syncany.operations.OperationResult;
@@ -47,7 +47,7 @@
  * @author Philipp C. Heckel <philipp.heckel@gmail.com>
  */
 public abstract class Command {
-	protected Client client;
+	protected Config config;
 	protected File localDir;
 	protected CarriageReturnPrinter out;
 
@@ -112,8 +112,12 @@ public void setLocalDir(File localDir) {
 		this.localDir = localDir;
 	}
 
-	public void setClient(Client client) {
-		this.client = client;
+	public Config getConfig() {
+		return config;
+	}
+
+	public void setConfig(Config config) {
+		this.config = config;
 	}
 
 	public void setOut(PrintStream out) {

diff --git a/syncany-cli/src/main/java/org/syncany/cli/CommandLineClient.java b/syncany-cli/src/main/java/org/syncany/cli/CommandLineClient.java
@@ -381,7 +381,7 @@ private int runCommand(Command command, String commandName, String[] commandArgs
 	}
 
 	private int runLocally(Command command, String[] commandArgs) {
-		command.setClient(this);
+		command.setConfig(config);
 		command.setLocalDir(localDir);
 
 		// Run!

diff --git a/syncany-cli/src/main/java/org/syncany/cli/ConnectCommand.java b/syncany-cli/src/main/java/org/syncany/cli/ConnectCommand.java
@@ -25,6 +25,7 @@
 
 import org.syncany.config.to.ConfigTO;
 import org.syncany.operations.OperationResult;
+import org.syncany.operations.init.ConnectOperation;
 import org.syncany.operations.init.ConnectOperationOptions;
 import org.syncany.operations.init.ConnectOperationOptions.ConnectOptionsStrategy;
 import org.syncany.operations.init.ConnectOperationResult;
@@ -57,7 +58,7 @@ public int execute(String[] operationArgs) throws Exception {
 		ConnectOperationOptions operationOptions = parseOptions(operationArgs);
 
 		while (retryNeeded && performOperation) {
-			ConnectOperationResult operationResult = client.connect(operationOptions, this);
+			ConnectOperationResult operationResult = new ConnectOperation(operationOptions, this).execute();
 			printResults(operationResult);
 
 			retryNeeded = operationResult.getResultCode() != ConnectResultCode.OK

diff --git a/syncany-cli/src/main/java/org/syncany/cli/DebugCommand.java b/syncany-cli/src/main/java/org/syncany/cli/DebugCommand.java
@@ -28,7 +28,6 @@
 import joptsimple.OptionSet;
 
 import org.apache.commons.io.IOUtils;
-import org.syncany.config.Config;
 import org.syncany.operations.OperationOptions;
 import org.syncany.operations.OperationResult;
 
@@ -88,15 +87,14 @@ private void runDebugCommand(List<?> nonOptionArgs) throws Exception {
 			throw new Exception("Given file does not exist: "+decryptFile);			
 		}
 
-		Config config = client.getConfig();
 		InputStream fileInputStream = config.getTransformer().createInputStream(new FileInputStream(decryptFile));
 
 		IOUtils.copy(fileInputStream, System.out);		
 		System.exit(0);
 	}
 
 	private boolean isInitializedScope() {
-		return client != null && client.getConfig() != null;
+		return config != null;
 	}
 
 	@Override

diff --git a/syncany-cli/src/main/java/org/syncany/cli/DownCommand.java b/syncany-cli/src/main/java/org/syncany/cli/DownCommand.java
@@ -31,6 +31,7 @@
 import org.syncany.operations.OperationResult;
 import org.syncany.operations.daemon.messages.DownDownloadFileSyncExternalEvent;
 import org.syncany.operations.daemon.messages.LsRemoteStartSyncExternalEvent;
+import org.syncany.operations.down.DownOperation;
 import org.syncany.operations.down.DownOperationOptions;
 import org.syncany.operations.down.DownOperationOptions.DownConflictStrategy;
 import org.syncany.operations.down.DownOperationResult;
@@ -52,7 +53,7 @@ public boolean canExecuteInDaemonScope() {
 	@Override
 	public int execute(String[] operationArgs) throws Exception {
 		DownOperationOptions operationOptions = parseOptions(operationArgs);		
-		DownOperationResult operationResult = client.down(operationOptions);		
+		DownOperationResult operationResult = new DownOperation(config, operationOptions).execute();		
 
 		printResults(operationResult);
 

diff --git a/syncany-cli/src/main/java/org/syncany/cli/GenlinkCommand.java b/syncany-cli/src/main/java/org/syncany/cli/GenlinkCommand.java
@@ -23,6 +23,7 @@
 import joptsimple.OptionSpec;
 
 import org.syncany.operations.OperationResult;
+import org.syncany.operations.init.GenlinkOperation;
 import org.syncany.operations.init.GenlinkOperationOptions;
 import org.syncany.operations.init.GenlinkOperationResult;
 
@@ -42,7 +43,7 @@ public boolean canExecuteInDaemonScope() {
 	@Override
 	public int execute(String[] operationArgs) throws Exception {
 		GenlinkOperationOptions operationOptions = parseOptions(operationArgs);		
-		GenlinkOperationResult operationResult = client.genlink(operationOptions);		
+		GenlinkOperationResult operationResult = new GenlinkOperation(config, operationOptions).execute();		
 
 		printResults(operationResult);
 

diff --git a/syncany-cli/src/main/java/org/syncany/cli/InitCommand.java b/syncany-cli/src/main/java/org/syncany/cli/InitCommand.java
@@ -36,6 +36,7 @@
 import org.syncany.crypto.CipherUtil;
 import org.syncany.operations.OperationResult;
 import org.syncany.operations.init.GenlinkOperationOptions;
+import org.syncany.operations.init.InitOperation;
 import org.syncany.operations.init.InitOperationOptions;
 import org.syncany.operations.init.InitOperationResult;
 import org.syncany.operations.init.InitOperationResult.InitResultCode;
@@ -65,7 +66,7 @@ public int execute(String[] operationArgs) throws Exception {
 		operationOptions = parseOptions(operationArgs);
 
 		while (retryNeeded && performOperation) {
-			InitOperationResult operationResult = client.init(operationOptions, this);
+			InitOperationResult operationResult = new InitOperation(operationOptions, this).execute();
 			printResults(operationResult);
 
 			retryNeeded = operationResult.getResultCode() != InitResultCode.OK;

diff --git a/syncany-cli/src/main/java/org/syncany/cli/LogCommand.java b/syncany-cli/src/main/java/org/syncany/cli/LogCommand.java
@@ -31,6 +31,7 @@
 
 import org.syncany.operations.OperationResult;
 import org.syncany.operations.log.LightweightDatabaseVersion;
+import org.syncany.operations.log.LogOperation;
 import org.syncany.operations.log.LogOperationOptions;
 import org.syncany.operations.log.LogOperationResult;
 
@@ -55,7 +56,7 @@ public boolean canExecuteInDaemonScope() {
 	@Override
 	public int execute(String[] operationArgs) throws Exception {
 		LogOperationOptions operationOptions = parseOptions(operationArgs);
-		LogOperationResult operationResult = client.log(operationOptions);
+		LogOperationResult operationResult = new LogOperation(config, operationOptions).execute();
 
 		printResults(operationResult);
 

diff --git a/syncany-cli/src/main/java/org/syncany/cli/LsCommand.java b/syncany-cli/src/main/java/org/syncany/cli/LsCommand.java
@@ -41,6 +41,7 @@
 import org.syncany.database.ObjectId;
 import org.syncany.database.PartialFileHistory;
 import org.syncany.operations.OperationResult;
+import org.syncany.operations.ls.LsOperation;
 import org.syncany.operations.ls.LsOperationOptions;
 import org.syncany.operations.ls.LsOperationResult;
 
@@ -71,7 +72,7 @@ public boolean canExecuteInDaemonScope() {
 	@Override
 	public int execute(String[] operationArgs) throws Exception {
 		LsOperationOptions operationOptions = parseOptions(operationArgs);
-		LsOperationResult operationResult = client.ls(operationOptions);
+		LsOperationResult operationResult = new LsOperation(config, operationOptions).execute();
 
 		printResults(operationResult);
 

diff --git a/syncany-cli/src/main/java/org/syncany/cli/LsRemoteCommand.java b/syncany-cli/src/main/java/org/syncany/cli/LsRemoteCommand.java
@@ -22,6 +22,7 @@
 import org.syncany.operations.OperationOptions;
 import org.syncany.operations.OperationResult;
 import org.syncany.operations.daemon.messages.LsRemoteStartSyncExternalEvent;
+import org.syncany.operations.ls_remote.LsRemoteOperation;
 import org.syncany.operations.ls_remote.LsRemoteOperationResult;
 import org.syncany.plugins.transfer.files.DatabaseRemoteFile;
 import org.syncany.plugins.transfer.files.RemoteFile;
@@ -41,7 +42,7 @@ public boolean canExecuteInDaemonScope() {
 
 	@Override
 	public int execute(String[] operationArgs) throws Exception {
-		LsRemoteOperationResult operationResult = client.lsRemote();
+		LsRemoteOperationResult operationResult = new LsRemoteOperation(config).execute();
 		printResults(operationResult);		
 
 		return 0;

diff --git a/syncany-cli/src/main/java/org/syncany/cli/PluginCommand.java b/syncany-cli/src/main/java/org/syncany/cli/PluginCommand.java
@@ -28,14 +28,17 @@
 import org.syncany.operations.daemon.messages.PluginInstallExternalEvent;
 import org.syncany.operations.plugin.ExtendedPluginInfo;
 import org.syncany.operations.plugin.PluginInfo;
+import org.syncany.operations.plugin.PluginOperation;
 import org.syncany.operations.plugin.PluginOperationAction;
 import org.syncany.operations.plugin.PluginOperationOptions;
 import org.syncany.operations.plugin.PluginOperationOptions.PluginListMode;
 import org.syncany.operations.plugin.PluginOperationResult;
 import org.syncany.operations.plugin.PluginOperationResult.PluginResultCode;
 import org.syncany.util.StringUtil;
+
 import com.google.common.collect.Iterables;
 import com.google.common.eventbus.Subscribe;
+
 import joptsimple.OptionParser;
 import joptsimple.OptionSet;
 import joptsimple.OptionSpec;
@@ -56,7 +59,7 @@ public boolean canExecuteInDaemonScope() {
 	@Override
 	public int execute(String[] operationArgs) throws Exception {
 		PluginOperationOptions operationOptions = parseOptions(operationArgs);
-		PluginOperationResult operationResult = client.plugin(operationOptions);
+		PluginOperationResult operationResult = new PluginOperation(config, operationOptions).execute();
 
 		printResults(operationResult);
 

diff --git a/syncany-cli/src/main/java/org/syncany/cli/RestoreCommand.java b/syncany-cli/src/main/java/org/syncany/cli/RestoreCommand.java
@@ -28,6 +28,7 @@
 
 import org.syncany.database.PartialFileHistory.FileHistoryId;
 import org.syncany.operations.OperationResult;
+import org.syncany.operations.restore.RestoreOperation;
 import org.syncany.operations.restore.RestoreOperationOptions;
 import org.syncany.operations.restore.RestoreOperationResult;
 
@@ -47,7 +48,7 @@ public boolean canExecuteInDaemonScope() {
 	@Override
 	public int execute(String[] operationArgs) throws Exception {
 		RestoreOperationOptions operationOptions = parseOptions(operationArgs);
-		RestoreOperationResult operationResult = client.restore(operationOptions);
+		RestoreOperationResult operationResult = new RestoreOperation(config, operationOptions).execute();
 
 		printResults(operationResult);
 

diff --git a/syncany-cli/src/main/java/org/syncany/cli/StatusCommand.java b/syncany-cli/src/main/java/org/syncany/cli/StatusCommand.java
@@ -24,6 +24,7 @@
 
 import org.syncany.operations.OperationResult;
 import org.syncany.operations.daemon.messages.StatusStartSyncExternalEvent;
+import org.syncany.operations.status.StatusOperation;
 import org.syncany.operations.status.StatusOperationOptions;
 import org.syncany.operations.status.StatusOperationResult;
 
@@ -43,7 +44,7 @@ public boolean canExecuteInDaemonScope() {
 	@Override
 	public int execute(String[] operationArgs) throws Exception {
 		StatusOperationOptions operationOptions = parseOptions(operationArgs);
-		StatusOperationResult operationResult = client.status(operationOptions);
+		StatusOperationResult operationResult = new StatusOperation(config, operationOptions).execute();
 
 		printResults(operationResult);
 

diff --git a/syncany-cli/src/main/java/org/syncany/cli/UpCommand.java b/syncany-cli/src/main/java/org/syncany/cli/UpCommand.java
@@ -31,6 +31,7 @@
 import org.syncany.operations.daemon.messages.UpUploadFileInTransactionSyncExternalEvent;
 import org.syncany.operations.daemon.messages.UpUploadFileSyncExternalEvent;
 import org.syncany.operations.status.StatusOperationOptions;
+import org.syncany.operations.up.UpOperation;
 import org.syncany.operations.up.UpOperationOptions;
 import org.syncany.operations.up.UpOperationResult;
 import org.syncany.operations.up.UpOperationResult.UpResultCode;
@@ -54,7 +55,7 @@ public boolean canExecuteInDaemonScope() {
 	@Override
 	public int execute(String[] operationArgs) throws Exception {
 		UpOperationOptions operationOptions = parseOptions(operationArgs);
-		UpOperationResult operationResult = client.up(operationOptions);
+		UpOperationResult operationResult = new UpOperation(config, operationOptions).execute();
 
 		printResults(operationResult);
 

diff --git a/syncany-cli/src/main/java/org/syncany/cli/UpdateCommand.java b/syncany-cli/src/main/java/org/syncany/cli/UpdateCommand.java
@@ -29,6 +29,7 @@
 import org.syncany.operations.OperationResult;
 import org.syncany.operations.daemon.messages.ConnectToHostExternalEvent;
 import org.syncany.operations.update.AppInfo;
+import org.syncany.operations.update.UpdateOperation;
 import org.syncany.operations.update.UpdateOperationAction;
 import org.syncany.operations.update.UpdateOperationOptions;
 import org.syncany.operations.update.UpdateOperationResult;
@@ -50,7 +51,7 @@ public boolean canExecuteInDaemonScope() {
 	@Override
 	public int execute(String[] operationArgs) throws Exception {
 		UpdateOperationOptions operationOptions = parseOptions(operationArgs);
-		UpdateOperationResult operationResult = client.update(operationOptions);
+		UpdateOperationResult operationResult = new UpdateOperation(config, operationOptions).execute();
 
 		printResults(operationResult);
 

diff --git a/syncany-cli/src/main/java/org/syncany/cli/WatchCommand.java b/syncany-cli/src/main/java/org/syncany/cli/WatchCommand.java
@@ -27,6 +27,7 @@
 import joptsimple.OptionSpec;
 
 import org.syncany.operations.OperationResult;
+import org.syncany.operations.watch.WatchOperation;
 import org.syncany.operations.watch.WatchOperationOptions;
 
 public class WatchCommand extends Command {
@@ -47,7 +48,7 @@ public boolean canExecuteInDaemonScope() {
 	@Override
 	public int execute(String[] operationArgs) throws Exception {
 		WatchOperationOptions operationOptions = parseOptions(operationArgs);
-		client.watch(operationOptions);
+		new WatchOperation(config, operationOptions).execute();
 
 		return 0;
 	}