[Upd] Remove prefix from the ResourceFormat, refactor XLS2TSVConverto…

…r and HTML2TSVConvertor to use ResourceFormat instead of STRING
kbss-cvut · Sep 14, 2023 · 1a9d0b8 · 1a9d0b8
1 parent ba12cfc
commit 1a9d0b8
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/s-pipes-modules/module-tabular/src/main/java/cz/cvut/spipes/modules/ResourceFormat.java b/s-pipes-modules/module-tabular/src/main/java/cz/cvut/spipes/modules/ResourceFormat.java
@@ -13,12 +13,10 @@ public enum ResourceFormat {
     TSV("text/tab-separated-values"),
     HTML("text/html"),
     EXCEL("application/vnd.ms-excel");
-
-    private static String PREFIX = TabularModule.TYPE_URI + "/";
     private final String localName;
 
     public Resource getResource() {
-        return ResourceFactory.createResource(PREFIX + this.localName);
+        return ResourceFactory.createResource(this.localName);
     }
 
     public static ResourceFormat fromResource(Resource resource) {

diff --git a/...s-modules/module-tabular/src/main/java/cz/cvut/spipes/modules/util/HTML2TSVConvertor.java b/...s-modules/module-tabular/src/main/java/cz/cvut/spipes/modules/util/HTML2TSVConvertor.java
@@ -1,6 +1,7 @@
 package cz.cvut.spipes.modules.util;
 
 import cz.cvut.spipes.constants.HTML;
+import cz.cvut.spipes.modules.ResourceFormat;
 import cz.cvut.spipes.registry.StreamResource;
 import cz.cvut.spipes.registry.StringStreamResource;
 import org.jsoup.Jsoup;
@@ -44,7 +45,7 @@ public StringStreamResource convertToTSV(StreamResource streamResource) {
         return new StringStreamResource(
                 streamResource.getUri(),
                 tsvStringBuilder.toString().getBytes(),
-                "text/tsv"
+                ResourceFormat.TSV.toString()
         );
     }
 

diff --git a/...es-modules/module-tabular/src/main/java/cz/cvut/spipes/modules/util/XLS2TSVConvertor.java b/...es-modules/module-tabular/src/main/java/cz/cvut/spipes/modules/util/XLS2TSVConvertor.java
@@ -1,5 +1,6 @@
 package cz.cvut.spipes.modules.util;
 
+import cz.cvut.spipes.modules.ResourceFormat;
 import cz.cvut.spipes.registry.StreamResource;
 import cz.cvut.spipes.registry.StringStreamResource;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
@@ -33,7 +34,7 @@ public StringStreamResource convertToTSV(StreamResource streamResource,int sheet
             return new StringStreamResource(
                     streamResource.getUri(),
                     tsvStringBuilder.toString().getBytes(),
-                    "text/tsv"
+                    ResourceFormat.TSV.toString()
             );
         }
         catch (IOException e) {