github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-09-16 02:52:31 -04:00
Code Issues Projects Releases Packages Wiki Activity

Added fix for testing equality of ByteBlobs

Browse source
This commit is contained in:
Winston Li 2014-12-04 18:28:12 +00:00
parent 1f239d7118
commit 794a0e29e6
3 changed files with 20 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/filestore/blob/ByteBlob.java
View file

@ -3,6 +3,8 @@ package uk.ac.ic.wlgitbridge.writelatex.filestore.blob;
import uk.ac.ic.wlgitbridge.writelatex.filestore.node.AttachmentNode;
import uk.ac.ic.wlgitbridge.writelatex.model.db.PersistentStoreAPI;
import java.util.Arrays;
/**
* Created by Winston on 14/11/14.
*/
@ -19,6 +21,15 @@ public class ByteBlob extends Blob {
return contents;
}
@Override
public boolean equals(Object obj) {
if (!(obj instanceof ByteBlob)) {
return false;
}
ByteBlob that = (ByteBlob) obj;
return Arrays.equals(contents, that.contents);
}
@Override
public void updatePersistentStore(PersistentStoreAPI persistentStore, AttachmentNode node) {
persistentStore.addFileNodeBlob(node.getProjectName(), node.getFilePath(), node.isChanged(), contents);

9
services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/filestore/node/BlobNode.java
View file

@ -34,6 +34,15 @@ public class BlobNode extends FileNode {
this.blob = new ByteBlob(blob);
}
@Override
public boolean equals(Object obj) {
if (!(obj instanceof BlobNode)) {
return false;
}
BlobNode that = (BlobNode) obj;
return super.equals(that) && blob.equals(that.blob);
}
@Override
public void indexWith(FileNodeIndexer fileNodeIndexer) {
fileNodeIndexer.index(this);

1
services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/filestore/node/WLDirectoryNode.java
View file

@ -92,7 +92,6 @@ public class WLDirectoryNode implements PersistentStoreSource, PersistentStoreUp
public WLDirectoryNode createFromRawDirectoryContents(RawDirectoryContents rawDirectoryContents, File attachmentDirectory) throws IOException, FailedConnectionException {
Map<String, FileNode> candidateFileNodeTable = new HashMap<String, FileNode>();
System.out.println("Attachment directory: " + attachmentDirectory + ", projectName: " + projectName);
File projectAttDirectory = new File(attachmentDirectory, projectName);
projectAttDirectory.mkdirs();
WLFileStore.deleteInDirectory(projectAttDirectory);