Changeset 8 for src/main/java/geniusweb/profilesserver/AutoUpdatingProfilesFactory.java

Timestamp:

01/28/20 10:19:55 (5 years ago)

Author:

bart

Message:

Update 28 jan 2020

File:

• src/main/java/geniusweb/profilesserver/AutoUpdatingProfilesFactory.java (modified) (7 diffs)

src/main/java/geniusweb/profilesserver/AutoUpdatingProfilesFactory.java

@@ -9 +9 @@
 import java.util.List;
 import java.util.logging.Level;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
 
 import geniusweb.issuevalue.Domain;
@@ -42 +40 @@
 public class AutoUpdatingProfilesFactory extends DefaultProfilesFactory {
 
+        private static final String PROFILES_ROOTDIR = "PROFILES_ROOTDIR";
         private static final String DOMAINSREPO = "domainsrepo";
         private static final String JSON = ".json";
@@ -47 +46 @@
         private Path rootdir;
         private final Reporter log;
-        private static final ObjectMapper jackson = new ObjectMapper();
 
         public AutoUpdatingProfilesFactory(Reporter logger) {
@@ -217 +215 @@
                 Profile profile = null;
                 try {
-                        profile = jackson.readValue(profilefile, Profile.class);
+                        profile = Jackson.instance().readValue(profilefile, Profile.class);
                 } catch (IOException e) {
                         log.log(Level.WARNING, "File " + profilefile
@@ -250 +248 @@
                 String expectedName = withoutExtension(domainfile.getName());
                 try {
-                        domain = jackson.readValue(domainfile, Domain.class);
+                        domain = Jackson.instance().readValue(domainfile, Domain.class);
                 } catch (IOException e) {
                         log.log(Level.WARNING, "File " + domainfile
@@ -341 +339 @@
                 // Search back upwards to projectroot.
                 Path dir;
+                String path = System.getenv(PROFILES_ROOTDIR);
+                if (path != null) {
+                        dir = Paths.get(path);
+                        if (!dir.toFile().exists())
+                                throw new RuntimeException("Hard set path PROFILES_ROOTDIR='"
+                                                + PROFILES_ROOTDIR + "' does not exist ");
+                        return dir;
+                }
                 try {
                         dir = Paths.get(getClass().getProtectionDomain().getCodeSource()
@@ -355 +361 @@
                         dir = dir.getParent();
                 }
-                return Paths.get(DOMAINSREPO); // bit silly, it's not there, but we need
-                                                                                // to do something.
+                throw new RuntimeException("Path to " + DOMAINSREPO + " was not found");
         }