From 475d5ff6a1f131de95085caa89159938b15c67df Mon Sep 17 00:00:00 2001 From: Alexander Nozik Date: Sun, 15 Oct 2017 14:04:36 +0300 Subject: [PATCH] Minor fixes in caching and caching test. --- numass-core/src/main/java/inr/numass/data/NumassDataUtils.java | 2 +- numass-main/src/main/java/inr/numass/NumassIO.java | 2 +- numass-main/src/main/java/inr/numass/WorkspaceTest.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/numass-core/src/main/java/inr/numass/data/NumassDataUtils.java b/numass-core/src/main/java/inr/numass/data/NumassDataUtils.java index fe83133b..56f3fe38 100644 --- a/numass-core/src/main/java/inr/numass/data/NumassDataUtils.java +++ b/numass-core/src/main/java/inr/numass/data/NumassDataUtils.java @@ -36,7 +36,7 @@ public class NumassDataUtils { @Override public Meta meta() { - MetaBuilder metaBuilder = new MetaBuilder("meta"); + MetaBuilder metaBuilder = new MetaBuilder(); sets.forEach(set -> metaBuilder.putNode(set.getName(), set.meta())); return metaBuilder; } diff --git a/numass-main/src/main/java/inr/numass/NumassIO.java b/numass-main/src/main/java/inr/numass/NumassIO.java index cde9755f..dbf9bb21 100644 --- a/numass-main/src/main/java/inr/numass/NumassIO.java +++ b/numass-main/src/main/java/inr/numass/NumassIO.java @@ -95,7 +95,7 @@ public class NumassIO extends BasicIOManager { } String dirName = String.join(File.separator, tokens); - String fileName = name.removeNameSpace().toString(); + String fileName = name.removeNameSpace().toString() + ".out"; OutputStream out = buildOut(getWorkDirectory(), dirName, fileName); registry.add(out); return out; diff --git a/numass-main/src/main/java/inr/numass/WorkspaceTest.java b/numass-main/src/main/java/inr/numass/WorkspaceTest.java index 49f4f991..0a87a6fe 100644 --- a/numass-main/src/main/java/inr/numass/WorkspaceTest.java +++ b/numass-main/src/main/java/inr/numass/WorkspaceTest.java @@ -24,7 +24,7 @@ public class WorkspaceTest { String storagepath = "D:\\Work\\Numass\\data\\"; Workspace workspace = BasicWorkspace.builder() .setContext(Numass.buildContext()) - .loadData("", new StorageDataFactory(), new MetaBuilder("storage").putValue("path", storagepath)) + .data("", new StorageDataFactory(), new MetaBuilder("storage").putValue("path", storagepath)) .build(); }