From 9072ebe79991c9cf3663d859ca43c46d3997e7ef Mon Sep 17 00:00:00 2001 From: Eric Maynard Date: Fri, 2 Aug 2024 15:28:18 -0700 Subject: [PATCH 1/2] support non-resource conf-file for eclipse link metastore --- .../PolarisEclipseLinkMetaStoreSessionImpl.java | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/extension/persistence/eclipselink/src/main/java/io/polaris/extension/persistence/impl/eclipselink/PolarisEclipseLinkMetaStoreSessionImpl.java b/extension/persistence/eclipselink/src/main/java/io/polaris/extension/persistence/impl/eclipselink/PolarisEclipseLinkMetaStoreSessionImpl.java index 43a78436f2..eb8af1b39e 100644 --- a/extension/persistence/eclipselink/src/main/java/io/polaris/extension/persistence/impl/eclipselink/PolarisEclipseLinkMetaStoreSessionImpl.java +++ b/extension/persistence/eclipselink/src/main/java/io/polaris/extension/persistence/impl/eclipselink/PolarisEclipseLinkMetaStoreSessionImpl.java @@ -47,6 +47,9 @@ import jakarta.persistence.EntityTransaction; import jakarta.persistence.OptimisticLockException; import jakarta.persistence.Persistence; + +import java.io.FileInputStream; +import java.io.FileNotFoundException; import java.io.InputStream; import java.util.HashMap; import java.util.List; @@ -117,6 +120,15 @@ public PolarisEclipseLinkMetaStoreSessionImpl( this.storageIntegrationProvider = storageIntegrationProvider; } + private InputStream loadFile(String path) throws FileNotFoundException { + InputStream input = null; + input = this.getClass().getClassLoader().getResourceAsStream(path); + if (input == null) { + input = new FileInputStream(path); + } + return input; + } + /** Load the persistence unit properties from a given configuration file */ private Map loadProperties(String confFile, String persistenceUnitName) { if (this.properties != null) { @@ -124,7 +136,7 @@ private Map loadProperties(String confFile, String persistenceUn } try { - InputStream input = this.getClass().getClassLoader().getResourceAsStream(confFile); + InputStream input = loadFile(confFile); DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); DocumentBuilder builder = factory.newDocumentBuilder(); Document doc = builder.parse(input); From 4f709ca8cfe1d2b377c7db1da4c1e08c43f44a4f Mon Sep 17 00:00:00 2001 From: Eric Maynard Date: Fri, 2 Aug 2024 15:31:44 -0700 Subject: [PATCH 2/2] lint --- .../impl/eclipselink/PolarisEclipseLinkMetaStoreSessionImpl.java | 1 - 1 file changed, 1 deletion(-) diff --git a/extension/persistence/eclipselink/src/main/java/io/polaris/extension/persistence/impl/eclipselink/PolarisEclipseLinkMetaStoreSessionImpl.java b/extension/persistence/eclipselink/src/main/java/io/polaris/extension/persistence/impl/eclipselink/PolarisEclipseLinkMetaStoreSessionImpl.java index eb8af1b39e..1b386ef92e 100644 --- a/extension/persistence/eclipselink/src/main/java/io/polaris/extension/persistence/impl/eclipselink/PolarisEclipseLinkMetaStoreSessionImpl.java +++ b/extension/persistence/eclipselink/src/main/java/io/polaris/extension/persistence/impl/eclipselink/PolarisEclipseLinkMetaStoreSessionImpl.java @@ -47,7 +47,6 @@ import jakarta.persistence.EntityTransaction; import jakarta.persistence.OptimisticLockException; import jakarta.persistence.Persistence; - import java.io.FileInputStream; import java.io.FileNotFoundException; import java.io.InputStream;