Simple configuration file

Author: bozaro

Diff for: git-as-svn/.idea/runConfigurations/Main.xml

@@ -14,7 +14,9 @@ dependencies {
   compile "org.jetbrains:annotations:13.0"
   compile "org.eclipse.jgit:org.eclipse.jgit:3.4.0.201406110918-r"
   compile "org.tmatesoft.svnkit:svnkit:1.8.5"
+  compile "org.yaml:snakeyaml:1.13"
   compile "org.slf4j:slf4j-simple:1.7.7"
+  compile "com.beust:jcommander:1.35"
   testCompile "org.testng:testng:6.8.8"
 }
 

Diff for: git-as-svn/build.gradle

@@ -0,0 +1,5 @@
+!!svnserver.config.Config:
+port: 3690
+repository:
+  branch: local
+  path: ../.git

Diff for: git-as-svn/config.example

@@ -0,0 +1,32 @@
+package svnserver.config;
+
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Top configuration object.
+ *
+ * @author a.navrotskiy
+ */
+public final class Config {
+  private int port = 3690;
+
+  @NotNull
+  private RepositoryConfig repository = new RepositoryConfig();
+
+  public void setPort(int port) {
+    this.port = port;
+  }
+
+  public int getPort() {
+    return port;
+  }
+
+  public void setRepository(@NotNull RepositoryConfig repository) {
+    this.repository = repository;
+  }
+
+  @NotNull
+  public RepositoryConfig getRepository() {
+    return repository;
+  }
+}

Diff for: git-as-svn/src/main/java/svnserver/config/Config.java

@@ -0,0 +1,33 @@
+package svnserver.config;
+
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Repository configuration.
+ *
+ * @author a.navrotskiy
+ */
+public class RepositoryConfig {
+  @NotNull
+  private String branch = "master";
+  @NotNull
+  private String path = ".git";
+
+  @NotNull
+  public String getBranch() {
+    return branch;
+  }
+
+  public void setBranch(@NotNull String branch) {
+    this.branch = branch;
+  }
+
+  @NotNull
+  public String getPath() {
+    return path;
+  }
+
+  public void setPath(@NotNull String path) {
+    this.path = path;
+  }
+}

Diff for: git-as-svn/src/main/java/svnserver/config/RepositoryConfig.java

@@ -14,6 +14,7 @@
 import org.tmatesoft.svn.core.SVNException;
 import svnserver.StringHelper;
 import svnserver.auth.User;
+import svnserver.config.RepositoryConfig;
 import svnserver.repository.VcsCommitBuilder;
 import svnserver.repository.VcsDeltaConsumer;
 import svnserver.repository.VcsFile;
@@ -22,6 +23,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.util.*;
@@ -57,12 +59,16 @@ public class GitRepository implements VcsRepository {
   @NotNull
   private final Map<String, String> cacheMd5 = new ConcurrentHashMap<>();
 
-  public GitRepository(@NotNull String uuid, @NotNull String branch) throws IOException {
-    this.uuid = uuid;
-    this.repository = new FileRepository(findGitPath());
-    this.branch = repository.getRef(branch).getName();
+  public GitRepository(@NotNull RepositoryConfig config) throws IOException, SVNException {
+    this.repository = new FileRepository(new File(config.getPath()).getAbsolutePath());
+    final Ref branchRef = repository.getRef(config.getBranch());
+    if (branchRef == null) {
+      throw new IOException("Branch not found: " + config.getBranch());
+    }
+    this.branch = branchRef.getName();
     addRevisionInfo(getEmptyCommit(repository));
     updateRevisions();
+    this.uuid = UUID.nameUUIDFromBytes((getRevisionInfo(1).getCommit().getName() + "\0" + branch).getBytes(StandardCharsets.UTF_8)).toString();
   }
 
   @Override

Diff for: git-as-svn/src/main/java/svnserver/repository/git/GitRepository.java

@@ -0,0 +1,59 @@
+package svnserver.server;
+
+import com.beust.jcommander.JCommander;
+import com.beust.jcommander.Parameter;
+import org.jetbrains.annotations.NotNull;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.tmatesoft.svn.core.SVNException;
+import org.yaml.snakeyaml.Yaml;
+import svnserver.config.Config;
+
+import java.io.*;
+import java.nio.charset.StandardCharsets;
+
+/**
+ * Entry point.
+ *
+ * @author a.navrotskiy
+ */
+public class Main {
+  @NotNull
+  private static final Logger log = LoggerFactory.getLogger(SvnServer.class);
+
+  public static void main(@NotNull String[] args) throws IOException, SVNException {
+    final CmdArgs cmd = new CmdArgs();
+    final JCommander jc = new JCommander(cmd);
+    jc.parse(args);
+    if (cmd.help) {
+      jc.usage();
+      return;
+    }
+    // Load config
+    Yaml yaml = new Yaml();
+    Config config;
+    try (
+        InputStream stream = new FileInputStream(cmd.configuration);
+        Reader reader = new InputStreamReader(stream, StandardCharsets.UTF_8)
+    ) {
+      config = yaml.loadAs(reader, Config.class);
+    }
+    if (cmd.showConfig) {
+      log.info("Actual config:\n{}", yaml.dump(config));
+    }
+    new SvnServer(config).start();
+  }
+
+  public static class CmdArgs {
+    @Parameter(names = {"-c", "--config"}, description = "Configuration file name", required = true)
+    @NotNull
+    private File configuration;
+
+    @Parameter(names = {"--show-config"}, description = "Show actual configuration on start")
+    private boolean showConfig = false;
+
+    @Parameter(names = {"-h", "--help"}, description = "Show help", help = true)
+    private boolean help = false;
+  }
+
+}

Diff for: git-as-svn/src/main/java/svnserver/server/Main.java

@@ -11,6 +11,7 @@
 import svnserver.auth.LocalUserDB;
 import svnserver.auth.User;
 import svnserver.auth.UserDB;
+import svnserver.config.Config;
 import svnserver.parser.MessageParser;
 import svnserver.parser.SvnServerParser;
 import svnserver.parser.SvnServerToken;
@@ -48,8 +49,11 @@ public class SvnServer {
   private final Map<String, BaseCmd<?>> commands = new HashMap<>();
   @NotNull
   private final VcsRepository repository;
+  @NotNull
+  private final Config config;
 
-  public SvnServer() throws IOException {
+  public SvnServer(@NotNull Config config) throws IOException, SVNException {
+    this.config = config;
 
     commands.put("commit", new CommitCmd());
     commands.put("diff", new DiffCmd());
@@ -64,15 +68,11 @@ public SvnServer() throws IOException {
     commands.put("stat", new StatCmd());
     commands.put("update", new UpdateCmd());
 
-    repository = new GitRepository("4f0c5325-dd55-4330-b24c-0e9e40eb504b", "local");
-  }
-
-  public static void main(String[] args) throws IOException {
-    new SvnServer().server(3690);
+    repository = new GitRepository(config.getRepository());
   }
 
-  private void server(int port) throws IOException {
-    final ServerSocket serverSocket = new ServerSocket(port);
+  public void start() throws IOException {
+    final ServerSocket serverSocket = new ServerSocket(config.getPort());
     while (true) {
       final Socket socket = serverSocket.accept();
       new Thread(() -> {