Просмотр исходного кода

Refactored test package names and added FileIndexStore and BlobHash classes.

Winston Li 12 лет назад
Родитель
Сommit
ae5a55747e
29 измененных файлов с 94 добавлено и 35 удалено
  1. 35 0
      services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/filestore/BlobHash.java
  2. 21 0
      services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/filestore/FileIndexStore.java
  3. 8 2
      services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/filestore/WLDirectoryNode.java
  4. 1 1
      services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/filestore/WLFileStore.java
  5. 1 1
      services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/model/WLDataModel.java
  6. 0 1
      services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/model/WLProject.java
  7. 1 1
      services/git-bridge/test/uk/ac/ic/wlgitbridge/MainTests.java
  8. 1 1
      services/git-bridge/test/uk/ac/ic/wlgitbridge/application/WLGitBridgeApplicationTests.java
  9. 1 1
      services/git-bridge/test/uk/ac/ic/wlgitbridge/application/WLGitBridgeServerTests.java
  10. 1 1
      services/git-bridge/test/uk/ac/ic/wlgitbridge/application/exception/InvalidProgramArgumentsExceptionTests.java
  11. 1 1
      services/git-bridge/test/uk/ac/ic/wlgitbridge/application/jetty/NullLoggerTests.java
  12. 1 1
      services/git-bridge/test/uk/ac/ic/wlgitbridge/bridge/WLBridgedProjectTests.java
  13. 1 1
      services/git-bridge/test/uk/ac/ic/wlgitbridge/git/WLGitServletConfigTests.java
  14. 1 1
      services/git-bridge/test/uk/ac/ic/wlgitbridge/git/WLGitServletTests.java
  15. 1 1
      services/git-bridge/test/uk/ac/ic/wlgitbridge/git/exception/InvalidRootDirectoryPathException.java
  16. 1 1
      services/git-bridge/test/uk/ac/ic/wlgitbridge/git/handler/WLReceivePackFactoryTests.java
  17. 1 1
      services/git-bridge/test/uk/ac/ic/wlgitbridge/git/handler/WLRepositoryResolverTests.java
  18. 1 1
      services/git-bridge/test/uk/ac/ic/wlgitbridge/git/handler/WLUploadPackTests.java
  19. 1 1
      services/git-bridge/test/uk/ac/ic/wlgitbridge/git/handler/hook/CheckNonFastForwardHookTests.java
  20. 1 1
      services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/SnapshotRepositoryBuilderTests.java
  21. 1 2
      services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/api/request/base/RequestTests.java
  22. 1 1
      services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/api/request/base/SnapshotAPIRequestTests.java
  23. 1 1
      services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/api/request/getdoc/SnapshotGetDocRequestTests.java
  24. 1 3
      services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/api/request/getforversion/SnapshotGetForVersionRequestTests.java
  25. 1 2
      services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/api/request/getsavedvers/SnapshotGetSavedVersRequestTests.java
  26. 6 0
      services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/filestore/BlobHashTest.java
  27. 1 1
      services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/model/SnapshotTests.java
  28. 1 1
      services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/model/WLDataModelTests.java
  29. 1 5
      services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/model/WLProjectTests.java

+ 35 - 0
services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/filestore/BlobHash.java

@@ -0,0 +1,35 @@
+package uk.ac.ic.wlgitbridge.writelatex.filestore;
+
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.Arrays;
+
+/**
+ * Created by Winston on 08/11/14.
+ */
+public class BlobHash {
+
+    private byte[] hash;
+
+    public BlobHash(byte[] blob) {
+        MessageDigest md = null;
+        try {
+            md = MessageDigest.getInstance("SHA-256");
+            hash = md.digest(blob);
+            System.out.println(Arrays.toString(hash));
+        } catch (NoSuchAlgorithmException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        return obj instanceof BlobHash && Arrays.equals(((BlobHash) obj).hash, hash);
+    }
+
+    @Override
+    public int hashCode() {
+        return Arrays.hashCode(hash);
+    }
+
+}

+ 21 - 0
services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/filestore/FileIndexStore.java

@@ -0,0 +1,21 @@
+package uk.ac.ic.wlgitbridge.writelatex.filestore;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Created by Winston on 08/11/14.
+ */
+public class FileIndexStore {
+
+    private final Map<BlobHash, String> blobHashMappings;
+    private final Map<String, String> urlMappings;
+
+    public FileIndexStore() {
+        blobHashMappings = new HashMap<BlobHash, String>();
+        urlMappings = new HashMap<String, String>();
+    }
+
+
+
+}

+ 8 - 2
services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/db/WLDirectoryNode.java → services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/filestore/WLDirectoryNode.java

@@ -1,8 +1,10 @@
-package uk.ac.ic.wlgitbridge.writelatex.db;
+package uk.ac.ic.wlgitbridge.writelatex.filestore;
 
 import uk.ac.ic.wlgitbridge.writelatex.model.Snapshot;
 import uk.ac.ic.wlgitbridge.writelatex.model.WLProject;
 
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -22,7 +24,11 @@ public class WLDirectoryNode {
     }
 
     public void updateFromProject(WLProject project) {
-        Snapshot snapshot = project.getLatestSnapshot();
+        updateFromLatestSnapshot(project.getLatestSnapshot());
+    }
+
+    private void updateFromLatestSnapshot(Snapshot snapshot) {
+
     }
 
 }

+ 1 - 1
services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/db/WLFileStore.java → services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/filestore/WLFileStore.java

@@ -1,4 +1,4 @@
-package uk.ac.ic.wlgitbridge.writelatex.db;
+package uk.ac.ic.wlgitbridge.writelatex.filestore;
 
 import uk.ac.ic.wlgitbridge.writelatex.model.WLProject;
 

+ 1 - 1
services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/model/WLDataModel.java

@@ -4,7 +4,7 @@ import uk.ac.ic.wlgitbridge.writelatex.api.SnapshotDBAPI;
 import uk.ac.ic.wlgitbridge.writelatex.api.request.exception.FailedConnectionException;
 import uk.ac.ic.wlgitbridge.writelatex.api.request.getdoc.SnapshotGetDocRequest;
 import uk.ac.ic.wlgitbridge.writelatex.api.request.getdoc.exception.InvalidProjectException;
-import uk.ac.ic.wlgitbridge.writelatex.db.WLFileStore;
+import uk.ac.ic.wlgitbridge.writelatex.filestore.WLFileStore;
 
 import java.util.HashMap;
 import java.util.List;

+ 0 - 1
services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/model/WLProject.java

@@ -3,7 +3,6 @@ package uk.ac.ic.wlgitbridge.writelatex.model;
 import uk.ac.ic.wlgitbridge.writelatex.SnapshotFetcher;
 import uk.ac.ic.wlgitbridge.writelatex.api.request.exception.FailedConnectionException;
 import uk.ac.ic.wlgitbridge.writelatex.api.request.getdoc.exception.InvalidProjectException;
-import uk.ac.ic.wlgitbridge.writelatex.db.WLFileStore;
 
 import java.util.HashMap;
 import java.util.List;

+ 1 - 1
services/git-bridge/test/uk/ac/ic/wlgitbridge/test/MainTests.java → services/git-bridge/test/uk/ac/ic/wlgitbridge/MainTests.java

@@ -1,4 +1,4 @@
-package uk.ac.ic.wlgitbridge.test;
+package uk.ac.ic.wlgitbridge;
 
 import org.junit.Test;
 

+ 1 - 1
services/git-bridge/test/uk/ac/ic/wlgitbridge/test/application/WLGitBridgeApplicationTests.java → services/git-bridge/test/uk/ac/ic/wlgitbridge/application/WLGitBridgeApplicationTests.java

@@ -1,4 +1,4 @@
-package uk.ac.ic.wlgitbridge.test.application;
+package uk.ac.ic.wlgitbridge.application;
 
 import org.junit.Test;
 

+ 1 - 1
services/git-bridge/test/uk/ac/ic/wlgitbridge/test/application/WLGitBridgeServerTests.java → services/git-bridge/test/uk/ac/ic/wlgitbridge/application/WLGitBridgeServerTests.java

@@ -1,4 +1,4 @@
-package uk.ac.ic.wlgitbridge.test.application;
+package uk.ac.ic.wlgitbridge.application;
 
 import org.junit.Test;
 

+ 1 - 1
services/git-bridge/test/uk/ac/ic/wlgitbridge/test/application/exception/InvalidProgramArgumentsExceptionTests.java → services/git-bridge/test/uk/ac/ic/wlgitbridge/application/exception/InvalidProgramArgumentsExceptionTests.java

@@ -1,4 +1,4 @@
-package uk.ac.ic.wlgitbridge.test.application.exception;
+package uk.ac.ic.wlgitbridge.application.exception;
 
 import org.junit.Test;
 

+ 1 - 1
services/git-bridge/test/uk/ac/ic/wlgitbridge/test/application/jetty/NullLoggerTests.java → services/git-bridge/test/uk/ac/ic/wlgitbridge/application/jetty/NullLoggerTests.java

@@ -1,4 +1,4 @@
-package uk.ac.ic.wlgitbridge.test.application.jetty;
+package uk.ac.ic.wlgitbridge.application.jetty;
 
 import org.junit.Test;
 

+ 1 - 1
services/git-bridge/test/uk/ac/ic/wlgitbridge/test/bridge/WLBridgedProjectTests.java → services/git-bridge/test/uk/ac/ic/wlgitbridge/bridge/WLBridgedProjectTests.java

@@ -1,4 +1,4 @@
-package uk.ac.ic.wlgitbridge.test.bridge;
+package uk.ac.ic.wlgitbridge.bridge;
 
 import org.junit.Test;
 

+ 1 - 1
services/git-bridge/test/uk/ac/ic/wlgitbridge/test/git/WLGitServletConfigTests.java → services/git-bridge/test/uk/ac/ic/wlgitbridge/git/WLGitServletConfigTests.java

@@ -1,4 +1,4 @@
-package uk.ac.ic.wlgitbridge.test.git;
+package uk.ac.ic.wlgitbridge.git;
 
 import org.junit.Test;
 

+ 1 - 1
services/git-bridge/test/uk/ac/ic/wlgitbridge/test/git/WLGitServletTests.java → services/git-bridge/test/uk/ac/ic/wlgitbridge/git/WLGitServletTests.java

@@ -1,4 +1,4 @@
-package uk.ac.ic.wlgitbridge.test.git;
+package uk.ac.ic.wlgitbridge.git;
 
 import org.junit.Test;
 

+ 1 - 1
services/git-bridge/test/uk/ac/ic/wlgitbridge/test/git/exception/InvalidRootDirectoryPathException.java → services/git-bridge/test/uk/ac/ic/wlgitbridge/git/exception/InvalidRootDirectoryPathException.java

@@ -1,4 +1,4 @@
-package uk.ac.ic.wlgitbridge.test.git.exception;
+package uk.ac.ic.wlgitbridge.git.exception;
 
 import org.junit.Test;
 

+ 1 - 1
services/git-bridge/test/uk/ac/ic/wlgitbridge/test/git/handler/WLReceivePackFactoryTests.java → services/git-bridge/test/uk/ac/ic/wlgitbridge/git/handler/WLReceivePackFactoryTests.java

@@ -1,4 +1,4 @@
-package uk.ac.ic.wlgitbridge.test.git.handler;
+package uk.ac.ic.wlgitbridge.git.handler;
 
 import org.junit.Test;
 

+ 1 - 1
services/git-bridge/test/uk/ac/ic/wlgitbridge/test/git/handler/WLRepositoryResolverTests.java → services/git-bridge/test/uk/ac/ic/wlgitbridge/git/handler/WLRepositoryResolverTests.java

@@ -1,4 +1,4 @@
-package uk.ac.ic.wlgitbridge.test.git.handler;
+package uk.ac.ic.wlgitbridge.git.handler;
 
 import org.junit.Test;
 

+ 1 - 1
services/git-bridge/test/uk/ac/ic/wlgitbridge/test/git/handler/WLUploadPackTests.java → services/git-bridge/test/uk/ac/ic/wlgitbridge/git/handler/WLUploadPackTests.java

@@ -1,4 +1,4 @@
-package uk.ac.ic.wlgitbridge.test.git.handler;
+package uk.ac.ic.wlgitbridge.git.handler;
 
 import org.junit.Test;
 

+ 1 - 1
services/git-bridge/test/uk/ac/ic/wlgitbridge/test/git/handler/hook/CheckNonFastForwardHookTests.java → services/git-bridge/test/uk/ac/ic/wlgitbridge/git/handler/hook/CheckNonFastForwardHookTests.java

@@ -1,4 +1,4 @@
-package uk.ac.ic.wlgitbridge.test.git.handler.hook;
+package uk.ac.ic.wlgitbridge.git.handler.hook;
 
 import org.junit.Test;
 

+ 1 - 1
services/git-bridge/test/uk/ac/ic/wlgitbridge/test/writelatex/SnapshotRepositoryBuilderTests.java → services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/SnapshotRepositoryBuilderTests.java

@@ -1,4 +1,4 @@
-package uk.ac.ic.wlgitbridge.test.writelatex;
+package uk.ac.ic.wlgitbridge.writelatex;
 
 import org.junit.Test;
 

+ 1 - 2
services/git-bridge/test/uk/ac/ic/wlgitbridge/test/writelatex/api/request/base/RequestTests.java → services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/api/request/base/RequestTests.java

@@ -1,7 +1,6 @@
-package uk.ac.ic.wlgitbridge.test.writelatex.api.request.base;
+package uk.ac.ic.wlgitbridge.writelatex.api.request.base;
 
 import org.junit.Test;
-import uk.ac.ic.wlgitbridge.writelatex.api.request.base.Request;
 import uk.ac.ic.wlgitbridge.writelatex.api.request.getdoc.SnapshotGetDocRequest;
 import uk.ac.ic.wlgitbridge.writelatex.api.request.getforversion.SnapshotGetForVersionRequest;
 import uk.ac.ic.wlgitbridge.writelatex.api.request.getsavedvers.SnapshotGetSavedVersRequest;

+ 1 - 1
services/git-bridge/test/uk/ac/ic/wlgitbridge/test/writelatex/api/request/base/SnapshotAPIRequestTests.java → services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/api/request/base/SnapshotAPIRequestTests.java

@@ -1,4 +1,4 @@
-package uk.ac.ic.wlgitbridge.test.writelatex.api.request.base;
+package uk.ac.ic.wlgitbridge.writelatex.api.request.base;
 
 import org.junit.Test;
 

+ 1 - 1
services/git-bridge/test/uk/ac/ic/wlgitbridge/test/writelatex/api/request/getdoc/SnapshotGetDocRequestTests.java → services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/api/request/getdoc/SnapshotGetDocRequestTests.java

@@ -1,4 +1,4 @@
-package uk.ac.ic.wlgitbridge.test.writelatex.api.request.getdoc;
+package uk.ac.ic.wlgitbridge.writelatex.api.request.getdoc;
 
 import org.junit.Test;
 

+ 1 - 3
services/git-bridge/test/uk/ac/ic/wlgitbridge/test/writelatex/api/request/getforversion/SnapshotGetForVersionRequestTests.java → services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/api/request/getforversion/SnapshotGetForVersionRequestTests.java

@@ -1,8 +1,6 @@
-package uk.ac.ic.wlgitbridge.test.writelatex.api.request.getforversion;
+package uk.ac.ic.wlgitbridge.writelatex.api.request.getforversion;
 
 import org.junit.Test;
-import uk.ac.ic.wlgitbridge.writelatex.api.request.getforversion.SnapshotGetForVersionRequest;
-import uk.ac.ic.wlgitbridge.writelatex.api.request.getforversion.SnapshotGetForVersionResult;
 
 /**
  * Created by Winston on 06/11/14.

+ 1 - 2
services/git-bridge/test/uk/ac/ic/wlgitbridge/test/writelatex/api/request/getsavedvers/SnapshotGetSavedVersRequestTests.java → services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/api/request/getsavedvers/SnapshotGetSavedVersRequestTests.java

@@ -1,7 +1,6 @@
-package uk.ac.ic.wlgitbridge.test.writelatex.api.request.getsavedvers;
+package uk.ac.ic.wlgitbridge.writelatex.api.request.getsavedvers;
 
 import org.junit.Test;
-import uk.ac.ic.wlgitbridge.writelatex.api.request.getsavedvers.SnapshotGetSavedVersRequest;
 
 /**
  * Created by Winston on 06/11/14.

Разница между файлами не показана из-за своего большого размера
+ 6 - 0
services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/filestore/BlobHashTest.java


+ 1 - 1
services/git-bridge/test/uk/ac/ic/wlgitbridge/test/writelatex/model/SnapshotTests.java → services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/model/SnapshotTests.java

@@ -1,4 +1,4 @@
-package uk.ac.ic.wlgitbridge.test.writelatex.model;
+package uk.ac.ic.wlgitbridge.writelatex.model;
 
 import org.junit.Test;
 

+ 1 - 1
services/git-bridge/test/uk/ac/ic/wlgitbridge/test/writelatex/model/WLDataModelTests.java → services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/model/WLDataModelTests.java

@@ -1,4 +1,4 @@
-package uk.ac.ic.wlgitbridge.test.writelatex.model;
+package uk.ac.ic.wlgitbridge.writelatex.model;
 
 import org.junit.Test;
 

+ 1 - 5
services/git-bridge/test/uk/ac/ic/wlgitbridge/test/writelatex/model/WLProjectTests.java → services/git-bridge/test/uk/ac/ic/wlgitbridge/writelatex/model/WLProjectTests.java

@@ -1,12 +1,8 @@
-package uk.ac.ic.wlgitbridge.test.writelatex.model;
+package uk.ac.ic.wlgitbridge.writelatex.model;
 
 import org.junit.Test;
 import uk.ac.ic.wlgitbridge.writelatex.api.request.exception.FailedConnectionException;
 import uk.ac.ic.wlgitbridge.writelatex.api.request.getdoc.exception.InvalidProjectException;
-import uk.ac.ic.wlgitbridge.writelatex.model.WLProject;
-
-import java.io.IOException;
-import java.util.concurrent.ExecutionException;
 
 /**
  * Created by Winston on 06/11/14.

Некоторые файлы не были показаны из-за большого количества измененных файлов