wbrawner/Store
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

FileSystem factory (#28)

Browse source 
* Add FileSystem factory
This commit is contained in:
Michal Drabik 2017-01-06 22:39:21 +01:00 committed by Mike Nakhimovich
parent 296c8aa281
commit efd342c027
11 changed files with 45 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/src/main/java/com/nytimes/android/sample/activity/PersistingStoreActivity.java
View file

@ -6,11 +6,10 @@ import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import android.support.v7.widget.Toolbar;
import android.widget.Toast;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.nytimes.android.external.fs.SourcePersister;
import com.nytimes.android.external.fs.impl.FileSystemImpl;
import com.nytimes.android.external.fs.filesystem.FileSystemFactory;
import com.nytimes.android.external.store.base.Store;
import com.nytimes.android.external.store.base.impl.BarCode;
import com.nytimes.android.external.store.base.impl.ParsingStoreBuilder;
@ -23,10 +22,8 @@ import com.nytimes.android.sample.data.model.Post;
import com.nytimes.android.sample.data.model.RedditData;
import com.nytimes.android.sample.data.remote.Api;
import com.nytimes.android.sample.reddit.PostAdapter;
import java.io.IOException;
import java.util.List;
import okio.BufferedSource;
import retrofit2.GsonConverterFactory;
import retrofit2.Retrofit;
@ -100,7 +97,7 @@ public class PersistingStoreActivity extends AppCompatActivity {
}
private SourcePersister persister() throws IOException {
return new SourcePersister(new FileSystemImpl(getApplicationContext().getCacheDir()));
return new SourcePersister(FileSystemFactory.create(getApplicationContext().getCacheDir()));
}
private Observable<BufferedSource> fetcher(BarCode barCode) {

1
filesystem/src/main/java/com/nytimes/android/external/fs/SourceFileReader.java vendored
View file

@ -1,5 +1,6 @@
package com.nytimes.android.external.fs;
import com.nytimes.android.external.fs.filesystem.FileSystem;
import com.nytimes.android.external.store.base.DiskRead;
import com.nytimes.android.external.store.base.impl.BarCode;

1
filesystem/src/main/java/com/nytimes/android/external/fs/SourceFileWriter.java vendored
View file

@ -1,5 +1,6 @@
package com.nytimes.android.external.fs;
import com.nytimes.android.external.fs.filesystem.FileSystem;
import com.nytimes.android.external.store.base.DiskWrite;
import com.nytimes.android.external.store.base.impl.BarCode;

1
filesystem/src/main/java/com/nytimes/android/external/fs/SourcePersister.java vendored
View file

@ -2,6 +2,7 @@ package com.nytimes.android.external.fs;
import android.support.annotation.NonNull;
import com.nytimes.android.external.fs.filesystem.FileSystem;
import com.nytimes.android.external.store.base.Persister;
import com.nytimes.android.external.store.base.impl.BarCode;

6
filesystem/src/main/java/com/nytimes/android/external/fs/impl/BreadthFirstFileTreeIterator.java → filesystem/src/main/java/com/nytimes/android/external/fs/filesystem/BreadthFirstFileTreeIterator.java vendored
View file

@ -1,4 +1,4 @@
package com.nytimes.android.external.fs.impl;
package com.nytimes.android.external.fs.filesystem;
/*
* Copyright 2004-2007 the original author or authors.
@ -31,7 +31,7 @@ import java.util.NoSuchElementException;
@since 1.1
*/
public class BreadthFirstFileTreeIterator implements Iterator{
class BreadthFirstFileTreeIterator implements Iterator{
private File root;
private int currentIndex = 0;
@ -45,7 +45,7 @@ public class BreadthFirstFileTreeIterator implements Iterator{
@param root The root directory
*/
public BreadthFirstFileTreeIterator(File root){
BreadthFirstFileTreeIterator(File root){
this.root = root;
this.currentList = root.listFiles();
this.directories = new Stack();

2
filesystem/src/main/java/com/nytimes/android/external/fs/impl/FSFile.java → filesystem/src/main/java/com/nytimes/android/external/fs/filesystem/FSFile.java vendored
View file

@ -1,4 +1,4 @@
package com.nytimes.android.external.fs.impl;
package com.nytimes.android.external.fs.filesystem;
import com.nytimes.android.external.fs.Util;

2
filesystem/src/main/java/com/nytimes/android/external/fs/FileSystem.java → filesystem/src/main/java/com/nytimes/android/external/fs/filesystem/FileSystem.java vendored
View file

@ -1,4 +1,4 @@
package com.nytimes.android.external.fs;
package com.nytimes.android.external.fs.filesystem;
import java.io.File;
import java.io.FileNotFoundException;

21
filesystem/src/main/java/com/nytimes/android/external/fs/filesystem/FileSystemFactory.java vendored Normal file
View file

@ -0,0 +1,21 @@
package com.nytimes.android.external.fs.filesystem;
import java.io.File;
import java.io.IOException;
/**
* Factory for {@link FileSystem}.
*/
public class FileSystemFactory {
/**
* Creates new instance of {@link FileSystemImpl}.
*
* @param root root directory.
* @return new instance of {@link FileSystemImpl}.
* @throws IOException
*/
public static FileSystem create(File root) throws IOException {
return new FileSystemImpl(root);
}
}

11
filesystem/src/main/java/com/nytimes/android/external/fs/impl/FileSystemImpl.java → filesystem/src/main/java/com/nytimes/android/external/fs/filesystem/FileSystemImpl.java vendored
View file

@ -1,8 +1,7 @@
package com.nytimes.android.external.fs.impl;
package com.nytimes.android.external.fs.filesystem;
import com.nytimes.android.external.cache.CacheLoader;
import com.nytimes.android.external.cache.LoadingCache;
import com.nytimes.android.external.fs.FileSystem;
import com.nytimes.android.external.fs.Util;
import java.io.File;
@ -22,13 +21,13 @@ import static java.lang.String.format;
* <p>
* All operations are on the caller's thread.
*/
public class FileSystemImpl implements FileSystem {
class FileSystemImpl implements FileSystem {
private final Util util = new Util();
final LoadingCache<String, FSFile> files;
final File root;
private final LoadingCache<String, FSFile> files;
private final File root;
public FileSystemImpl(final File root) throws IOException {
FileSystemImpl(final File root) throws IOException {
this.root = root;
this.files = newBuilder().maximumSize(20)

11
filesystem/src/test/java/com/nytimes/android/external/fs/MultiTest.java vendored
View file

@ -1,24 +1,21 @@
package com.nytimes.android.external.fs;
import com.google.common.collect.ImmutableMap;
import com.nytimes.android.external.fs.filesystem.FileSystem;
import com.nytimes.android.external.fs.filesystem.FileSystemFactory;
import com.nytimes.android.external.fs.impl.BaseTestCase;
import com.nytimes.android.external.fs.impl.FileSystemImpl;
import org.junit.Test;
import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.IOException;
import java.util.List;
import java.util.Map;
import okio.BufferedSource;
import okio.Okio;
import org.junit.Test;
import static com.google.common.base.Charsets.UTF_8;
import static com.google.common.io.Files.createTempDir;
import static java.util.Arrays.asList;
import static org.assertj.core.api.Assertions.assertThat;
public class MultiTest extends BaseTestCase {
@ -31,7 +28,7 @@ public class MultiTest extends BaseTestCase {
private FileSystem createAndPopulateTestFileSystem() throws IOException {
File baseDir = createTempDir();
FileSystem fileSystem = new FileSystemImpl(baseDir);
FileSystem fileSystem = FileSystemFactory.create(baseDir);
for (String path : fileData.keySet()) {
for (String data : fileData.get(path)) {
BufferedSource source = source(data);

13
filesystem/src/test/java/com/nytimes/android/external/fs/impl/SimpleTest.java vendored
View file

@ -1,22 +1,19 @@
package com.nytimes.android.external.fs.impl;
import com.nytimes.android.external.fs.FileSystem;
import org.junit.Before;
import org.junit.Test;
import com.nytimes.android.external.fs.filesystem.FileSystem;
import com.nytimes.android.external.fs.filesystem.FileSystemFactory;
import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.FileNotFoundException;
import java.io.IOException;
import okio.BufferedSource;
import okio.Okio;
import org.junit.Before;
import org.junit.Test;
import static com.google.common.base.Charsets.UTF_8;
import static com.google.common.io.Files.createTempDir;
import static org.assertj.core.api.Assertions.assertThat;
public class SimpleTest extends BaseTestCase {
@ -29,7 +26,7 @@ public class SimpleTest extends BaseTestCase {
@Before
public void start() throws IOException {
File baseDir = createTempDir();
fileSystem = new FileSystemImpl(baseDir);
fileSystem = FileSystemFactory.create(baseDir);
}
@Test(expected = FileNotFoundException.class)