ref #8189 moving method getFolderSeperator() back to CdmUtils

diff --git a/cdmlib-commons/src/main/java/eu/etaxonomy/cdm/common/CdmUtils.java b/cdmlib-commons/src/main/java/eu/etaxonomy/cdm/common/CdmUtils.java
index 2b7899e58df4386ebf15013b66d7c7c6bd29c833..172d6378ad0c91a0d6fb8e37242cec477328d9ab 100644 (file)
--- a/cdmlib-commons/src/main/java/eu/etaxonomy/cdm/common/CdmUtils.java
+++ b/cdmlib-commons/src/main/java/eu/etaxonomy/cdm/common/CdmUtils.java
@@ -10,6 +10,7 @@
 package eu.etaxonomy.cdm.common;
 
 import java.io.BufferedReader;
+import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
@@ -32,7 +33,6 @@ import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 
 /**
- * Util class for consistent access to and creation of per instance application configuration files.
  *
  * @author a.mueller
  * @author a.kohlbecker
@@ -41,6 +41,37 @@ public class CdmUtils {
 
     private static final Logger logger = Logger.getLogger(CdmUtils.class);
 
+    //folder separator
+    static String folderSeparator;
+
+    static final String MUST_EXIST_FILE = "MUST-EXIST.txt";
+
+
+    /**
+     * @return
+     */
+    static public String getFolderSeperator(){
+        if (folderSeparator == null){
+            URL url = CdmUtils.class.getResource("/"+ MUST_EXIST_FILE);
+            if ( url != null && ! urlIsJarOrBundle(url) ){
+                folderSeparator =  File.separator;
+            }else{
+                folderSeparator = "/";
+            }
+        }
+        return folderSeparator;
+    }
+
+
+    /**
+     * @param url
+     * @return
+     */
+    static private boolean urlIsJarOrBundle(URL url){
+        return url.getProtocol().startsWith("jar") || url.getProtocol().startsWith("bundleresource");
+    }
+
+
     /**
      * Returns the an InputStream for a read-only source
      * @param resourceFileName the resources path within the classpath(!)

diff --git a/cdmlib-commons/src/test/java/eu/etaxonomy/cdm/common/CdmUtilsTest.java b/cdmlib-commons/src/test/java/eu/etaxonomy/cdm/common/CdmUtilsTest.java
index fac603184597f7796c2b9458bbb166a4aa1b24be..509d5eb28a37df34c2e45263360800a512ad360f 100644 (file)
--- a/cdmlib-commons/src/test/java/eu/etaxonomy/cdm/common/CdmUtilsTest.java
+++ b/cdmlib-commons/src/test/java/eu/etaxonomy/cdm/common/CdmUtilsTest.java
@@ -9,6 +9,10 @@
 \r
 package eu.etaxonomy.cdm.common;\r
 \r
+import static org.junit.Assert.assertNotNull;\r
+\r
+import java.io.IOException;\r
+import java.io.InputStream;\r
 import java.util.regex.Pattern;\r
 \r
 import org.apache.log4j.Level;\r
@@ -115,6 +119,17 @@ public class CdmUtilsTest {
 //        System.out.println(CdmUtils.quoteRegExWithWildcard(str));\r
     }\r
 \r
+    @Test\r
+    public void testGetReadableResourceStream() {\r
+        String resourceFileName = CdmUtils.MUST_EXIST_FILE;\r
+        try {\r
+            InputStream inputStream = CdmUtils.getReadableResourceStream(resourceFileName);\r
+            assertNotNull(inputStream);\r
+        } catch (IOException e) {\r
+            Assert.fail("IOException");\r
+        }\r
+    }\r
+\r
 \r
 \r
 \r

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/dwca/out/TermMapping.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/dwca/out/TermMapping.java
index a917ae37c39b86d1cb306de610c5cc64c4b84495..30738debd9f82a507d7d138f582f682cea7c1f8e 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/dwca/out/TermMapping.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/dwca/out/TermMapping.java
@@ -19,7 +19,6 @@ import org.apache.log4j.Logger;
 \r
 import au.com.bytecode.opencsv.CSVReader;\r
 import eu.etaxonomy.cdm.common.CdmUtils;\r
-import eu.etaxonomy.cdm.config.ConfigFileUtil;\r
 \r
 /**\r
  * @author a.mueller\r
@@ -45,7 +44,7 @@ public class TermMapping {
 \r
 \r
        private void readMapping(String filename) throws IOException {\r
-               String strResourceFileName = "mapping" + ConfigFileUtil.getFolderSeperator() + filename;\r
+               String strResourceFileName = "mapping" + CdmUtils.getFolderSeperator() + filename;\r
                InputStreamReader isr = CdmUtils.getUtf8ResourceReader(strResourceFileName);\r
                CSVReader reader = new CSVReader(isr, separator);\r
 \r

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/term/init/TermLoader.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/term/init/TermLoader.java
index 02f9b23f45bf86d68c3297d035ac17b86ed6d168..0615f44506afc964d223686ccb8ab4d1d1f668f4 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/term/init/TermLoader.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/term/init/TermLoader.java
@@ -23,7 +23,6 @@ import org.apache.log4j.Logger;
 import org.springframework.stereotype.Component;
 
 import au.com.bytecode.opencsv.CSVReader;
-import eu.etaxonomy.cdm.api.utility.config.ConfigFileUtil;
 import eu.etaxonomy.cdm.common.CdmUtils;
 import eu.etaxonomy.cdm.model.term.DefinedTermBase;
 import eu.etaxonomy.cdm.model.term.OrderedTermBase;
@@ -197,7 +196,7 @@ public class TermLoader implements ITermLoader {
         */
        private CSVReader getCsvReader(VocabularyEnum vocType) throws IOException {
                String filename = vocType.name()+".csv";
-               String strResourceFileName = "terms" + ConfigFileUtil.getFolderSeperator() + filename;
+               String strResourceFileName = "terms" + CdmUtils.getFolderSeperator() + filename;
                if (logger.isDebugEnabled()){logger.debug("strResourceFileName is " + strResourceFileName);}
                CSVReader reader = new CSVReader(CdmUtils.getUtf8ResourceReader(strResourceFileName));
                return reader;

diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/config/ConfigFileUtil.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/config/ConfigFileUtil.java
index 97cc8cfcea24dfbaaa5bb5eae0ce3c886e1f0c1e..d9078cfae0f01e63f0d2e850d7077b50a04ce0a3 100644 (file)
--- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/config/ConfigFileUtil.java
+++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/config/ConfigFileUtil.java
@@ -13,7 +13,6 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.IOException;
-import java.net.URL;
 import java.nio.file.Files;
 import java.util.Properties;
 
@@ -21,13 +20,11 @@ import org.apache.log4j.Logger;
 import org.springframework.context.EnvironmentAware;
 import org.springframework.core.env.Environment;
 
-import eu.etaxonomy.cdm.common.CdmUtils;
-
 /**
+ * Utility class for consistent access to and creation of per instance application configuration files.
  *
+ * @author a.mueller
  * @author a.kohlbecker
- * @since May 8, 2017
- *
  */
 public class ConfigFileUtil implements EnvironmentAware {
 
@@ -56,9 +53,6 @@ public class ConfigFileUtil implements EnvironmentAware {
      */
     public static final String SUBFOLDER_WEBAPP = "remote-webapp";
 
-    static final String MUST_EXIST_FILE = "MUST-EXIST.txt";
-
-
     protected Environment env;
 
     @Override
@@ -71,33 +65,6 @@ public class ConfigFileUtil implements EnvironmentAware {
         }
     }
 
-    //folder separator
-    static String folderSeparator;
-
-    /**
-     * @return
-     */
-    static public String getFolderSeperator(){
-        if (folderSeparator == null){
-            URL url = CdmUtils.class.getResource("/"+ MUST_EXIST_FILE);
-            if ( url != null && ! urlIsJarOrBundle(url) ){
-                folderSeparator =  File.separator;
-            }else{
-                folderSeparator = "/";
-            }
-        }
-        return folderSeparator;
-    }
-
-
-    /**
-     * @param url
-     * @return
-     */
-    static private boolean urlIsJarOrBundle(URL url){
-        return url.getProtocol().startsWith("jar") || url.getProtocol().startsWith("bundleresource");
-    }
-
 
     public static File getCdmHomeDir() {
         return new File(perUserCdmFolder + File.separator);

diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/v31_33/TermVocabularyRepresentationUpdater.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/v31_33/TermVocabularyRepresentationUpdater.java
index 6719f84facefdede373eefff467cd311a4d0c259..5bdae9805c7df37a5cd111674cb32985677b1703 100644 (file)
--- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/v31_33/TermVocabularyRepresentationUpdater.java
+++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/v31_33/TermVocabularyRepresentationUpdater.java
@@ -18,7 +18,6 @@ import org.apache.log4j.Logger;
 import au.com.bytecode.opencsv.CSVReader;\r
 import eu.etaxonomy.cdm.common.CdmUtils;\r
 import eu.etaxonomy.cdm.common.monitor.IProgressMonitor;\r
-import eu.etaxonomy.cdm.config.ConfigFileUtil;\r
 import eu.etaxonomy.cdm.database.ICdmDataSource;\r
 import eu.etaxonomy.cdm.database.update.CaseType;\r
 import eu.etaxonomy.cdm.database.update.SchemaUpdateResult;\r
@@ -67,7 +66,7 @@ public class TermVocabularyRepresentationUpdater
                        for(VocabularyEnum vocabularyEnum : VocabularyEnum.values()) {\r
                                //read vocabulary from terms files\r
                                String filename = vocabularyEnum.name()+".csv";\r
-                               CSVReader reader = new CSVReader(CdmUtils.getUtf8ResourceReader("terms" + ConfigFileUtil.getFolderSeperator() + filename));\r
+                               CSVReader reader = new CSVReader(CdmUtils.getUtf8ResourceReader("terms" + CdmUtils.getFolderSeperator() + filename));\r
                                String [] nextLine = reader.readNext();\r
                                TermVocabulary<?> voc = TermVocabulary.NewInstance(TermType.Unknown);\r
                                voc.readCsvLine(arrayedLine(nextLine));\r

diff --git a/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/config/ConfigFileUtilTest.java b/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/config/ConfigFileUtilTest.java
index 3b91b81311b37bc1c2ad77ebef71b53b20fd2bfa..9d44b845a9c67b805f2df3a426cdcb0fd62cbbfb 100644 (file)
--- a/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/config/ConfigFileUtilTest.java
+++ b/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/config/ConfigFileUtilTest.java
@@ -9,11 +9,7 @@
 
 package eu.etaxonomy.cdm.config;
 
-import static org.junit.Assert.assertNotNull;
-
 import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
 
 import org.junit.Assert;
 import org.junit.Ignore;
@@ -24,20 +20,10 @@ import eu.etaxonomy.cdm.common.CdmUtils;
 
 public class ConfigFileUtilTest {
 
-       @Test
-       public void testGetReadableResourceStream() {
-               String resourceFileName = ConfigFileUtil.MUST_EXIST_FILE;
-               try {
-                       InputStream inputStream = CdmUtils.getReadableResourceStream(resourceFileName);
-                       assertNotNull(inputStream);
-               } catch (IOException e) {
-                       Assert.fail("IOException");
-               }
-       }
 
        @Test
        public void testGetFolderSeperator() {
-               Assert.assertEquals(File.separator, ConfigFileUtil.getFolderSeperator());
+               Assert.assertEquals(File.separator, CdmUtils.getFolderSeperator());
        }
 
        @Test