Merge pull request #4 from tamada/plainfile

単なるファイルを扱う PlainFileDataSource を追加した．

src/main/java/com/github/kunai/entries/Entry.java

@@ -15,6 +15,8 @@ default boolean isClass(){
         return name.endsWith(".class");
     }
 
+    boolean endsWith(String suffix);
+
     boolean isName(String name);
 
     default URI loadFrom(){

src/main/java/com/github/kunai/entries/PathEntry.java

@@ -30,17 +30,19 @@ public InputStream openStream() throws IOException{
         return source.openStream(path);
     }
 
-    public boolean isName(Name name){
-        return path.endsWith(name.toString());
+    @Override
+    public boolean endsWith(String suffix){
+        return path.toString()
+                .endsWith(suffix);
     }
 
     @Override
     public boolean isName(String name){
-        return isName(new Name(name));
+        return path.endsWith(name);
     }
 
     @Override
     public String toString(){
-        return String.format("%s <%s>", loadFrom(), isClass()? className(): path);
+        return String.format("%s <%s>", loadFrom(), isClass() && className() != null? className(): path());
     }
 }

src/main/java/com/github/kunai/source/AbstractDataSource.java

@@ -14,11 +14,11 @@ int getStartIndex(String name){
     String parseClassName(String name){
         int start = getStartIndex(name);
         int last = getLastIndex(name, ".class");
-        return parseClassName(name, start, last);
+        return trimName(name, start, last);
     }
 
-    private String parseClassName(String name, int start, int last){
-        if(start > 0 && start < last)
+    String trimName(String name, int start, int last){
+        if(start >= 0 && start < last)
             return name.substring(start, last);
         return name;
     }

src/main/java/com/github/kunai/source/DirectoryDataSource.java

@@ -29,15 +29,9 @@ public Stream<Entry> stream() {
     public ClassName parseClassName(Path targetPath){
         Path path = basePath.relativize(targetPath);
         String name = path.toString();
-        return parse(name, getLastIndex(name, ".class"));
+        return new ClassName(super.parseClassName(name));
     }
 
-    private ClassName parse(String name, int lastIndex){
-        if(lastIndex > 0) 
-            name = name.substring(0, lastIndex);
-        return new ClassName(name);
-    }
-
     @Override
     public void close(){
         // do nothing

src/main/java/com/github/kunai/source/PlainFileDataSource.java

@@ -0,0 +1,39 @@
+package com.github.kunai.source;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.stream.Stream;
+
+import com.github.kunai.entries.ClassName;
+import com.github.kunai.entries.Entry;
+import com.github.kunai.entries.PathEntry;
+
+public class PlainFileDataSource extends AbstractDataSource implements PathResolver{
+    private Path path;
+
+    public PlainFileDataSource(Path path){
+        this.path = path;
+    }
+
+    @Override
+    public Stream<Entry> stream() {
+        return Stream.of(new PathEntry(path, this));
+    }
+
+    @Override
+    public void close() throws IOException {
+        // do nothing.
+    }
+
+    @Override
+    public InputStream openStream(Path path) throws IOException {
+        return Files.newInputStream(path);
+    }
+
+    @Override
+    public ClassName parseClassName(Path path) {
+        return null;
+    }
+}

src/main/java/com/github/kunai/source/factories/DataSourceFactories.java

@@ -18,6 +18,7 @@ public DataSourceFactories(){
         factories.add(new WarFileDataSourceFactory());
         factories.add(new ClassFileDataSourceFactory());
         factories.add(new DirectoryDataSourceFactory());
+        factories.add(new PlainFileDataSourceFactory());
     }
 
     public Optional<DataSourceFactory> find(Path path) throws IOException{

src/main/java/com/github/kunai/source/factories/PlainFileDataSourceFactory.java

@@ -0,0 +1,24 @@
+package com.github.kunai.source.factories;
+
+import java.nio.file.FileSystem;
+import java.nio.file.Path;
+import java.nio.file.attribute.BasicFileAttributes;
+
+import com.github.kunai.entries.KunaiException;
+import com.github.kunai.source.DataSource;
+import com.github.kunai.source.PlainFileDataSource;
+
+class PlainFileDataSourceFactory implements DataSourceFactory{
+    public PlainFileDataSourceFactory(){
+    }
+
+    @Override
+    public boolean isTarget(Path path, FileSystem system, BasicFileAttributes attributes){
+        return attributes.isRegularFile();
+    }
+
+    @Override
+    public DataSource build(Path path, FileSystem system) throws KunaiException{
+        return new PlainFileDataSource(path);
+    }
+}

src/test/java/com/github/kunai/source/AbstractDataSourceTest.java

@@ -0,0 +1,23 @@
+package com.github.kunai.source;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
+import java.nio.file.Paths;
+
+import org.junit.Test;
+
+public class AbstractDataSourceTest{
+    @Test
+    public void testBasic() throws Exception{
+        try(PlainFileDataSource source = new PlainFileDataSource(Paths.get("target/test-classes/dummy.class/emptyfile"))){
+            assertThat(source.getStartIndex("/hoge.class"), is(1));
+            assertThat(source.getStartIndex("hoge.class"), is(0));
+            assertThat(source.trimName("/hoge.class", 1, 5), is("hoge"));
+            assertThat(source.trimName("aaa", -1, 1), is("aaa"));
+            assertThat(source.trimName("aaa", 2, 1), is("aaa"));
+            assertThat(source.trimName("aaa", 0, 1), is("a"));
+        }
+    }
+
+}

src/test/java/com/github/kunai/source/ClassFileDataSourceTest.java

@@ -28,12 +28,12 @@ public void testDataSource() throws Exception{
 
         assertThat(factory.isTarget(path), is(true));
 
-        DataSource source = factory.build(path);
-
-        Entry[] entries = source.stream().toArray(count -> new Entry[count]);
-        assertThat(entries.length, is(1));
-        assertThat(entries[0].isName("sample/hello/HelloWorld.class"), is(true));
-        assertThat(entries[0].isClass(), is(true));
-        assertThat(entries[0].className(), is(new ClassName("sample.hello.HelloWorld")));
+        try(DataSource source = factory.build(path)){
+            Entry[] entries = source.stream().toArray(count -> new Entry[count]);
+            assertThat(entries.length, is(1));
+            assertThat(entries[0].isName("sample/hello/HelloWorld.class"), is(true));
+            assertThat(entries[0].isClass(), is(true));
+            assertThat(entries[0].className(), is(new ClassName("sample.hello.HelloWorld")));
+        }
     }
 }

src/test/java/com/github/kunai/source/DirectoryDataSourceTest.java

@@ -28,19 +28,19 @@ public void testDataSource() throws Exception{
 
         assertThat(factory.isTarget(path), is(true));
 
-        DataSource source = factory.build(path);
-
-        Entry[] entries = source.stream()
-                .sorted(new EntryComparator())
-                .toArray(count -> new Entry[count]);
-        assertThat(entries.length, is(2));
-
-        assertThat(entries[0].isName("sample/hello/HelloWorld.class"), is(true));
-        assertThat(entries[0].isClass(), is(true));
-        assertThat(entries[0].className(), is(new ClassName("sample.hello.HelloWorld")));
-
-        assertThat(entries[1].isName("sample/hello/Launcher.class"), is(true));
-        assertThat(entries[1].isClass(), is(true));
-        assertThat(entries[1].className(), is(new ClassName("sample.hello.Launcher")));
+        try(DataSource source = factory.build(path)){
+            Entry[] entries = source.stream()
+                    .sorted(new EntryComparator())
+                    .toArray(count -> new Entry[count]);
+            assertThat(entries.length, is(2));
+
+            assertThat(entries[0].isName("sample/hello/HelloWorld.class"), is(true));
+            assertThat(entries[0].isClass(), is(true));
+            assertThat(entries[0].className(), is(new ClassName("sample.hello.HelloWorld")));
+
+            assertThat(entries[1].isName("sample/hello/Launcher.class"), is(true));
+            assertThat(entries[1].isClass(), is(true));
+            assertThat(entries[1].className(), is(new ClassName("sample.hello.Launcher")));
+        }
     }
 }

src/test/java/com/github/kunai/source/factories/ClassFileDataSourceFactoryTest.java

@@ -0,0 +1,40 @@
+package com.github.kunai.source.factories;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
+import java.io.File;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import com.github.kunai.entries.ClassName;
+import com.github.kunai.entries.Entry;
+import com.github.kunai.source.DataSource;
+
+public class ClassFileDataSourceFactoryTest {
+    private Path path;
+    private Path dummyPath;
+    private ClassFileDataSourceFactory factory = new ClassFileDataSourceFactory();
+
+    @Before
+    public void setUp(){
+        path = Paths.get("target/test-classes/hello/target/classes/sample/hello/HelloWorld.class");
+        dummyPath = Paths.get("target/test-classes/dummy.class");
+    }
+
+    @Test
+    public void testBasic() throws Exception{
+        assertThat(factory.isTarget(path), is(true));
+        assertThat(factory.isTarget(dummyPath), is(false));
+
+        DataSource source = factory.build(new File(path.toString()));
+        Entry[] entries = source.stream().toArray(size -> new Entry[size]);
+
+        assertThat(entries.length, is(1));
+        assertThat(entries[0].className(), is(new ClassName("sample.hello.HelloWorld")));
+        assertThat(entries[0].isClass(), is(true));
+    }
+}

src/test/java/com/github/kunai/source/factories/DefaultDataSourceFactoryTest.java

@@ -1,7 +1,7 @@
 package com.github.kunai.source.factories;
 
-import static org.junit.Assert.assertThat;
 import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
 
 import java.nio.file.Path;
 import java.nio.file.Paths;

src/test/java/com/github/kunai/source/factories/PlainFileDataSourceFactoryTest.java

@@ -0,0 +1,43 @@
+package com.github.kunai.source.factories;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.nullValue;
+import static org.junit.Assert.assertThat;
+
+import java.io.File;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import com.github.kunai.entries.Entry;
+import com.github.kunai.source.DataSource;
+
+public class PlainFileDataSourceFactoryTest {
+    private Path path;
+    private Path dummyPath;
+    private DataSourceFactory factory = new PlainFileDataSourceFactory();
+
+    @Before
+    public void setUp(){
+        path = Paths.get("target/test-classes/hello/target/classes/sample/hello/HelloWorld.class");
+        dummyPath = Paths.get("target/test-classes/dummy.class");
+    }
+
+    @Test
+    public void testBasic() throws Exception{
+        assertThat(factory.isTarget(path), is(true));
+        assertThat(factory.isTarget(dummyPath), is(false));
+
+        DataSource source = factory.build(new File(path.toString()));
+        Entry[] entries = source.stream().toArray(size -> new Entry[size]);
+
+        assertThat(entries.length, is(1));
+        assertThat(entries[0].endsWith(".class"), is(true));
+        assertThat(entries[0].loadFrom(), is(path.toUri()));
+        assertThat(entries[0].className(), is(nullValue()));
+        assertThat(entries[0].isClass(), is(true));
+        assertThat(entries[0].toString(), is(String.format("%s <%s>", path.toUri(), path)));
+    }
+}