multiple proj locations and 9.3 (#3)

Author: azahnen

xtraplatform-nativ-loader/src/main/java/de/ii/xtraplatform/nativ/loader/domain/XtraplatformNative.java

@@ -65,6 +65,10 @@ public static Path getLibPath(String parentName) {
     return TMP_DIR.resolve(parentName).resolve(LIB_DIR_NAME);
   }
 
+  public static Path getDataPath(String parentName) {
+    return TMP_DIR.resolve(parentName).resolve(DATA_DIR_NAME);
+  }
+
   private static void copyLibToTmpDir(Class<?> contextClass, String parentName, String resource) {
     File lib = getLibPath(parentName).resolve(resource).toFile();
     if (!lib.exists()) {

xtraplatform-proj/build.gradle

@@ -6,7 +6,7 @@ maturity = 'CANDIDATE'
 
 ext {
     //TODO: when changed, adjust ProjLoaderImpl.getName (can we inject it?)
-    projVersion = '9.1.0'
+    projVersion = '9.3.0'
     buildVersion = '1'
     generatedResourcesDir = new File(buildDir, 'generated/src/main/resources/')
     embeddedLibDir = new File(generatedResourcesDir, "proj-${projVersion}-${buildVersion}/lib")

xtraplatform-proj/src/main/java/de/ii/xtraplatform/proj/domain/ProjLoaderImpl.java

@@ -11,14 +11,10 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import de.ii.xtraplatform.base.domain.AppLifeCycle;
-import de.ii.xtraplatform.base.domain.LogContext;
-import de.ii.xtraplatform.blobs.domain.BlobStore;
-import java.io.IOException;
+import de.ii.xtraplatform.nativ.loader.domain.XtraplatformNative;
 import java.nio.file.Path;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import org.slf4j.Logger;
@@ -29,42 +25,21 @@
 public class ProjLoaderImpl implements ProjLoader, AppLifeCycle {
 
   private static final Logger LOGGER = LoggerFactory.getLogger(ProjLoaderImpl.class);
-  private static final String RESOURCES_PATH = "proj";
-
-  private final BlobStore blobStore;
-  private Optional<Path> dataDirectory;
+  private final Path dataDirectory;
 
   @Inject
-  public ProjLoaderImpl(BlobStore blobStore) {
-    this.blobStore = blobStore.with(RESOURCES_PATH);
-    this.dataDirectory = Optional.empty();
+  public ProjLoaderImpl() {
+    this.dataDirectory = XtraplatformNative.getDataPath(getName());
   }
 
   // for unit tests only
   ProjLoaderImpl(Path dataDirectory) {
-    this.dataDirectory = Optional.ofNullable(dataDirectory);
-    this.blobStore = null;
-  }
-
-  @Override
-  public int getPriority() {
-    return 900;
-  }
-
-  @Override
-  public void onStart() {
-    if (dataDirectory.isEmpty() && Objects.nonNull(blobStore)) {
-      try {
-        this.dataDirectory = blobStore.asLocalPath(Path.of(""), true);
-      } catch (IOException e) {
-        LogContext.error(LOGGER, e, "Could not initialize PROJ data directory");
-      }
-    }
+    this.dataDirectory = dataDirectory;
   }
 
   @Override
   public String getName() {
-    return "proj-9.1.0-1";
+    return "proj-9.3.0-1";
   }
 
   @Override
@@ -83,12 +58,8 @@ public List<String> getLibraries() {
 
   @Override
   public Map<Path, List<String>> getResources() {
-    if (dataDirectory.isEmpty()) {
-      return ImmutableMap.of();
-    }
-
     return ImmutableMap.of(
-        dataDirectory.get(),
+        dataDirectory,
         ImmutableList.of(
             "CH",
             "deformation_model.schema.json",
@@ -109,6 +80,6 @@ public Map<Path, List<String>> getResources() {
 
   @Override
   public Path getDataDirectory() {
-    return dataDirectory.orElseThrow();
+    return dataDirectory;
   }
 }