Merge pull request #12 from rec-jvm/enhance/original-record

[#11] Add toString method for Wrapper and Record

build.gradle

@@ -1,5 +1,5 @@
 allprojects {
-    version = '0.1.2'
+    version = '0.1.3'
 
     buildscript {
         ext.kotlin_version = '1.0.5'

rec-accessor/src/main/java/net/kimleo/rec/accessor/RecordWrapper.java

@@ -48,4 +48,9 @@ private T getByIndex(Integer index, Indexible<T> record) {
     public List<String> keys() {
         return fieldNames.keySet().stream().collect(Collectors.toList());
     }
+
+    @Override
+    public String toString() {
+        return record.toString();
+    }
 }

rec-core/src/main/java/net/kimleo/rec/loader/strategy/DefaultLoadingStrategy.java

@@ -1,5 +1,6 @@
 package net.kimleo.rec.loader.strategy;
 
+import net.kimleo.rec.Pair;
 import net.kimleo.rec.loader.LoadingConfig;
 import net.kimleo.rec.loader.RecordLoader;
 import net.kimleo.rec.repository.RecRepository;
@@ -11,6 +12,7 @@
 import java.nio.file.Paths;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 import static net.kimleo.rec.util.Sys.die;
@@ -26,17 +28,17 @@ public DefaultLoadingStrategy(String path) {
     @Override
     public List<LoadingConfig> configs() {
         File[] files = new File(path).listFiles();
-        List<File> recs = Arrays.stream(files)
-                .filter(file -> file.getName().endsWith(".rec")).collect(Collectors.toList());
+        System.out.println(path);
+        if (files == null) {
+            die(String.format("Not a directory %s", path));
+        }
 
-        recs.forEach(file -> {
-            if (Files.exists(Paths.get(dataFileOf(file.getName())))) {
-                die(String.format("No data file fount for %s", file));
-            }
-        });
+        Map<String, File> recFiles = Arrays.stream(files)
+                .filter(it -> it.getName().endsWith(".rec")).collect(Collectors.toMap(File::getName, it -> it));
 
-        return recs.stream()
-                .map(file -> new LoadingConfig(dataFileOf(file.getAbsolutePath()), file.getAbsolutePath()))
+        return Arrays.stream(files)
+                .filter( file -> recFiles.containsKey(file.getName() + ".rec"))
+                .map(f -> new LoadingConfig(f.getAbsolutePath(), recFiles.get(f.getName() + ".rec").getAbsolutePath()))
                 .collect(Collectors.toList());
     }
 
@@ -50,8 +52,4 @@ public static RecRepository repo(String path) {
         return new RecRepository(sets);
     }
 
-    @NotNull
-    private String dataFileOf(String file) {
-        return file.substring(0, file.length() - 4);
-    }
 }

rec-core/src/main/kotlin/net/kimleo/rec/record/Record.kt

@@ -19,6 +19,10 @@ data class Record(val cells: List<Cell>, val text: String, val original: Boolean
     override fun get(index: Int): String {
         return cells[index].value
     }
+
+    override fun toString(): String {
+        return text
+    }
 }
 
 fun SepValEntry.toRecord() = Record(this.values.map(::Cell), this.source)

testjs.sh

@@ -1,2 +1,2 @@
 #/bin/bash
-java -jar rec-app/build/libs/rec-app-0.1.2.jar js rec-scripting/src/test/resources/test_exec.js
+java -jar rec-app/build/libs/rec-app-0.1.3.jar js rec-scripting/src/test/resources/test_exec.js

testrec.sh

@@ -1,2 +1,2 @@
 #/bin/bash
-java -jar rec-app/build/libs/rec-app-0.1.2.jar rec-core/src/test/resources/
+java -jar rec-app/build/libs/rec-app-0.1.3.jar rec-core/src/test/resources/