Skip to content

Commit

Permalink
Cleaned unused imports, used try-with-resource to ensure resources ge…
Browse files Browse the repository at this point in the history 
…t closed where applicable
  • Loading branch information
@ajs6f
ajs6f committed Apr 8, 2013
1 parent dc88a28 commit e5b2670
Show file tree
Hide file tree
Showing 5 changed files with 200 additions and 185 deletions.
1 change: 0 additions & 1 deletion src/main/java/org/fcrepo/federation/bagit/BagItExtraPropertiesStore.java
View file
Expand Up @@ -10,7 +10,6 @@
import java.util.Map;

import org.modeshape.jcr.cache.DocumentStoreException;
import org.modeshape.jcr.federation.spi.Connector;
import org.modeshape.jcr.federation.spi.ExtraPropertiesStore;
import org.modeshape.jcr.value.Name;
import org.modeshape.jcr.value.Property;
Expand Down
293 changes: 152 additions & 141 deletions src/main/java/org/fcrepo/federation/bagit/BagItWatchService.java
View file
@@ -1,10 +1,9 @@

package org.fcrepo.federation.bagit;

import static java.nio.file.StandardWatchEventKinds.ENTRY_MODIFY;

import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.FileReader;
import java.io.IOException;
import java.io.LineNumberReader;
Expand All @@ -27,144 +26,156 @@
import com.google.common.base.Function;

public class BagItWatchService implements WatchService {

private static final Logger logger = LoggerFactory.getLogger(BagItWatchService.class);

static final Pattern MANIFEST = Pattern.compile("^manifest-([^\\.]+).txt$");
static final Pattern TAG_MANIFEST = Pattern.compile("^tagmanifest-([^\\.]+).txt$");

static GetFilesFromManifest getFilesFromManifest = new GetFilesFromManifest();

WatchService delegate;

Collection<Path> tagFiles = new ArrayList<Path>();

Collection<Path> manifests = new ArrayList<Path>();

BagItWatchService() throws IOException {
delegate = FileSystems.getDefault().newWatchService();
}

/**
* Constructor to facilitate testing
* @param delegate
*/
BagItWatchService(WatchService delegate) {
this.delegate = delegate;
}

public BagItWatchService(File bagItDir) throws IOException {
this();
for (File file: bagItDir.listFiles()) {
if (isManifest(file)) {
monitorManifest(file);
} else if (isTagManifest(file)) {
for (File listedFile: getFilesFromManifest.apply(file)) monitorTagFile(listedFile);
}
}
}

@Override
public void close() throws IOException {
delegate.close();
}

@Override
public WatchKey poll() {
return delegate.poll();
}

@Override
public WatchKey poll(long timeout, TimeUnit unit)
throws InterruptedException {
return delegate.poll(timeout, unit);
}

@Override
public WatchKey take() throws InterruptedException {
return delegate.take();
}

public void monitorTagFile(File input) throws IOException {
Path path = Paths.get(input.toURI());
if (!tagFiles.contains(path)) tagFiles.add(path);
path.register(delegate, ENTRY_MODIFY);
}

public void monitorManifest(File input) throws IOException {
Path path = Paths.get(input.toURI());
if (!manifests.contains(path)) manifests.add(path);
path.register(delegate, ENTRY_MODIFY);
}

boolean isManifest(String fileName) {
Matcher m = MANIFEST.matcher(fileName);
if (m.find()) {
String csa = m.group(1);
try {
MessageDigest.getInstance(csa);
return true;
} catch (NoSuchAlgorithmException e) {
logger.warn("Ignoring potential manifest file {} because {} is not a supported checksum algorithm.", fileName, csa);
}
}
return false;
}

boolean isManifest(File file) {
if (file.isFile() && file.canRead() && !file.isHidden()) {
return(isManifest(file.getName()));
} else return false;
}

boolean isManifest(Path path) {
return isManifest(path.toFile());
}

boolean isTagManifest(String fileName) {
Matcher m = TAG_MANIFEST.matcher(fileName);
if (m.find()) {
String csa = m.group(1);
try {
MessageDigest.getInstance(csa);
return true;
} catch (NoSuchAlgorithmException e) {
logger.warn("Ignoring potential tag-manifest file {} because {} is not a supported checksum algorithm.", fileName, csa);
}
}
return false;
}

boolean isTagManifest(File file) {
if (file.isFile() && file.canRead() && !file.isHidden()) {
return isTagManifest(file.getName());
} else return false;
}

boolean isTagManifest(Path path) {
return isManifest(path.toFile());
}

static class GetFilesFromManifest implements Function<File, Collection<File>> {

@Override
public Collection<File> apply(File input) {
try {
ArrayList<File> result = new ArrayList<File>();
LineNumberReader lnr = new LineNumberReader(new FileReader(input));
String line = null;
while((line = lnr.readLine()) != null) {
String fileName = line.split(" ")[0];
File file = new File(input.getParentFile(), fileName);
result.add(file);
}
return result;
} catch (IOException e) {
e.printStackTrace();
return null;
}
}

}

private static final Logger logger = LoggerFactory
.getLogger(BagItWatchService.class);

static final Pattern MANIFEST = Pattern.compile("^manifest-([^\\.]+).txt$");

static final Pattern TAG_MANIFEST = Pattern
.compile("^tagmanifest-([^\\.]+).txt$");

static GetFilesFromManifest getFilesFromManifest =
new GetFilesFromManifest();

WatchService delegate;

Collection<Path> tagFiles = new ArrayList<Path>();

Collection<Path> manifests = new ArrayList<Path>();

BagItWatchService()
throws IOException {
delegate = FileSystems.getDefault().newWatchService();
}

/**
* Constructor to facilitate testing
* @param delegate
*/
BagItWatchService(WatchService delegate) {
this.delegate = delegate;
}

public BagItWatchService(File bagItDir)
throws IOException {
this();
for (File file : bagItDir.listFiles()) {
if (isManifest(file)) {
monitorManifest(file);
} else if (isTagManifest(file)) {
for (File listedFile : getFilesFromManifest.apply(file))
monitorTagFile(listedFile);
}
}
}

@Override
public void close() throws IOException {
delegate.close();
}

@Override
public WatchKey poll() {
return delegate.poll();
}

@Override
public WatchKey poll(long timeout, TimeUnit unit)
throws InterruptedException {
return delegate.poll(timeout, unit);
}

@Override
public WatchKey take() throws InterruptedException {
return delegate.take();
}

public void monitorTagFile(File input) throws IOException {
Path path = Paths.get(input.toURI());
if (!tagFiles.contains(path)) tagFiles.add(path);
path.register(delegate, ENTRY_MODIFY);
}

public void monitorManifest(File input) throws IOException {
Path path = Paths.get(input.toURI());
if (!manifests.contains(path)) manifests.add(path);
path.register(delegate, ENTRY_MODIFY);
}

boolean isManifest(String fileName) {
Matcher m = MANIFEST.matcher(fileName);
if (m.find()) {
String csa = m.group(1);
try {
MessageDigest.getInstance(csa);
return true;
} catch (NoSuchAlgorithmException e) {
logger.warn(
"Ignoring potential manifest file {} because {} is not a supported checksum algorithm.",
fileName, csa);
}
}
return false;
}

boolean isManifest(File file) {
if (file.isFile() && file.canRead() && !file.isHidden()) {
return (isManifest(file.getName()));
} else
return false;
}

boolean isManifest(Path path) {
return isManifest(path.toFile());
}

boolean isTagManifest(String fileName) {
Matcher m = TAG_MANIFEST.matcher(fileName);
if (m.find()) {
String csa = m.group(1);
try {
MessageDigest.getInstance(csa);
return true;
} catch (NoSuchAlgorithmException e) {
logger.warn(
"Ignoring potential tag-manifest file {} because {} is not a supported checksum algorithm.",
fileName, csa);
}
}
return false;
}

boolean isTagManifest(File file) {
if (file.isFile() && file.canRead() && !file.isHidden()) {
return isTagManifest(file.getName());
} else
return false;
}

boolean isTagManifest(Path path) {
return isManifest(path.toFile());
}

static class GetFilesFromManifest implements
Function<File, Collection<File>> {

@Override
public Collection<File> apply(File input) {
try (final LineNumberReader lnr =
new LineNumberReader(new FileReader(input))) {
ArrayList<File> result = new ArrayList<File>();
String line = null;
while ((line = lnr.readLine()) != null) {
String fileName = line.split(" ")[0];
File file = new File(input.getParentFile(), fileName);
result.add(file);
}
return result;
} catch (IOException e) {
e.printStackTrace();
return null;
}
}
}
}
1 change: 0 additions & 1 deletion src/test/java/org/fcrepo/federation/bagit/BagItConnectorIT.java
View file
Expand Up @@ -9,7 +9,6 @@
import org.apache.http.client.ClientProtocolException;
import org.apache.http.client.methods.HttpGet;
import org.apache.http.util.EntityUtils;
import org.fcrepo.federation.bagit.AbstractResourceIT;
import org.junit.Test;

public class BagItConnectorIT extends AbstractResourceIT {
Expand Down
7 changes: 0 additions & 7 deletions src/test/java/org/fcrepo/federation/bagit/BagItExtraPropertiesStoreTest.java
View file
Expand Up @@ -2,15 +2,8 @@
package org.fcrepo.federation.bagit;

import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;

import org.junit.Before;
import org.junit.Test;

import java.util.Map;

import org.modeshape.jcr.value.Name;
import org.modeshape.jcr.value.Property;


public class BagItExtraPropertiesStoreTest {
Expand Down

0 comments on commit e5b2670

Please sign in to comment.