From 5f70da71c8e71990715dcb4be5cc433284abdede Mon Sep 17 00:00:00 2001
From: ulrich
Date: Mon, 05 Apr 2021 12:35:50 +0000
Subject: [PATCH] Lesen und neu fuer Ablageort fertig
---
src/de/uhilger/mediaz/store/FileStorage.java | 47 +++++++++++++++++++++++++++--------------------
1 files changed, 27 insertions(+), 20 deletions(-)
diff --git a/src/de/uhilger/mediaz/store/FileStorage.java b/src/de/uhilger/mediaz/store/FileStorage.java
index 0282ed7..3819699 100644
--- a/src/de/uhilger/mediaz/store/FileStorage.java
+++ b/src/de/uhilger/mediaz/store/FileStorage.java
@@ -49,7 +49,7 @@
public FileStorage(String base) {
this.fileBase = base;
- //TypeToken<List<String>> list = new TypeToken<List<String>>() {};
+ // Beispiel: TypeToken<List<String>> list = new TypeToken<List<String>>() {};
TypeToken<Ablageort> ttAblageort = new TypeToken<Ablageort>() {};
types = new HashMap();
types.put(Ablageort.class.getSimpleName(), ttAblageort);
@@ -69,7 +69,6 @@
* @param o
*/
public File writeToFile(Entity o) throws IOException {
- Gson gson = new Gson();
String className = o.getClass().getSimpleName();
logger.finer(className);
File dir = new File(fileBase, className);
@@ -79,34 +78,29 @@
file.delete();
}
FileWriter fw = new FileWriter(file);
+ Gson gson = new Gson();
fw.write(gson.toJson(o));
fw.flush();
fw.close();
return file;
}
- public Entity readFromFile(File file) throws ClassNotFoundException, FileNotFoundException, IOException {
- String type = typeNameFromPath(file);
+ public String readFromFile(File file) throws IOException {
StringBuilder sb = new StringBuilder();
- FileReader in = new FileReader(file);
- BufferedReader r = new BufferedReader(in);
+ BufferedReader r = new BufferedReader(new FileReader(file));
String line = r.readLine();
while(line != null) {
sb.append(line);
line = r.readLine();
}
r.close();
- in.close();
- String json = sb.toString();
+ return sb.toString();
+ }
+
+ public Entity entityFromFile(File file) throws ClassNotFoundException, FileNotFoundException, IOException {
+ String json = readFromFile(file);
Gson gson = new Gson();
- switch(type) {
- case ST_ABLAGEORT:
- return gson.fromJson(json, Ablageort.class);
- default:
- Ablageort ablage = new Ablageort();
- ablage.setName("Test");
- return ablage;
- }
+ return gson.fromJson(json, typeFromName(typeNameFromPath(file)).getType());
}
private String typeNameFromPath(File file) {
@@ -127,11 +121,8 @@
@Override
public Entity read(String typ, String name) {
- File base = new File(fileBase);
- File dir = new File(base, typ);
- File file = new File(dir, name);
try {
- return readFromFile(file);
+ return entityFromFile(getFile(typ, name));
} catch (ClassNotFoundException | IOException ex) {
logger.log(Level.SEVERE, null, ex);
return null;
@@ -155,6 +146,22 @@
return types.get(name);
}
+ @Override
+ public String readJson(String typ, String name) {
+ try {
+ return readFromFile(getFile(typ, name));
+ } catch (IOException ex) {
+ logger.log(Level.SEVERE, null, ex);
+ return null;
+ }
+ }
+
+ private File getFile(String typ, String name) {
+ File base = new File(fileBase);
+ File dir = new File(base, typ);
+ return new File(dir, name);
+ }
+
}
--
Gitblit v1.9.3