From 58152429848ff2c178967217f7dedc7270d27812 Mon Sep 17 00:00:00 2001 From: Kimmy Leo Date: Fri, 16 Dec 2016 20:01:13 +0800 Subject: [PATCH 1/3] [#11] Add toString method for Wrapper and Record --- .../src/main/java/net/kimleo/rec/accessor/RecordWrapper.java | 5 +++++ rec-core/src/main/kotlin/net/kimleo/rec/record/Record.kt | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/rec-accessor/src/main/java/net/kimleo/rec/accessor/RecordWrapper.java b/rec-accessor/src/main/java/net/kimleo/rec/accessor/RecordWrapper.java index 8deb8ec..84a0307 100644 --- a/rec-accessor/src/main/java/net/kimleo/rec/accessor/RecordWrapper.java +++ b/rec-accessor/src/main/java/net/kimleo/rec/accessor/RecordWrapper.java @@ -48,4 +48,9 @@ private T getByIndex(Integer index, Indexible record) { public List keys() { return fieldNames.keySet().stream().collect(Collectors.toList()); } + + @Override + public String toString() { + return record.toString(); + } } diff --git a/rec-core/src/main/kotlin/net/kimleo/rec/record/Record.kt b/rec-core/src/main/kotlin/net/kimleo/rec/record/Record.kt index 23cd49c..513e13f 100644 --- a/rec-core/src/main/kotlin/net/kimleo/rec/record/Record.kt +++ b/rec-core/src/main/kotlin/net/kimleo/rec/record/Record.kt @@ -19,6 +19,10 @@ data class Record(val cells: List, 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) From 80d00a99d5bce30a86e3efe52193253d6f549c66 Mon Sep 17 00:00:00 2001 From: Kimmy Leo Date: Fri, 16 Dec 2016 20:44:29 +0800 Subject: [PATCH 2/3] [#13] fix the loader file issue --- build.gradle | 2 +- .../strategy/DefaultLoadingStrategy.java | 24 +++++++++---------- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/build.gradle b/build.gradle index 2794816..f50eec7 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ allprojects { - version = '0.1.2' + version = '0.1.3' buildscript { ext.kotlin_version = '1.0.5' diff --git a/rec-core/src/main/java/net/kimleo/rec/loader/strategy/DefaultLoadingStrategy.java b/rec-core/src/main/java/net/kimleo/rec/loader/strategy/DefaultLoadingStrategy.java index ab57399..e71dd70 100644 --- a/rec-core/src/main/java/net/kimleo/rec/loader/strategy/DefaultLoadingStrategy.java +++ b/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 configs() { File[] files = new File(path).listFiles(); - List 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 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); - } } From 521ed26fa98595d66f9ed076b448027de080b9c2 Mon Sep 17 00:00:00 2001 From: Kimmy Leo Date: Fri, 16 Dec 2016 20:52:44 +0800 Subject: [PATCH 3/3] update version number: --- testjs.sh | 2 +- testrec.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/testjs.sh b/testjs.sh index 9b1f905..3b96fe2 100755 --- a/testjs.sh +++ b/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 diff --git a/testrec.sh b/testrec.sh index bcc8c70..226a009 100755 --- a/testrec.sh +++ b/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/