From 65eee78143547f72ea9fc638218440c896cfcacf Mon Sep 17 00:00:00 2001 From: schmer Date: Tue, 20 Feb 2018 09:28:34 +0100 Subject: [PATCH] Reading .json files from properties ctx. --- .../core/cache/broker/json/PricelayerBrokerJson.java | 9 +++++++-- .../core/cache/broker/json/SiteDataBrokerJson.java | 10 +++++++--- .../core/cache/broker/json/SupplierDataBrokerJson.java | 9 +++++++-- 3 files changed, 21 insertions(+), 7 deletions(-) diff --git a/open-ssp-parent/core/src/main/java/com/atg/openssp/core/cache/broker/json/PricelayerBrokerJson.java b/open-ssp-parent/core/src/main/java/com/atg/openssp/core/cache/broker/json/PricelayerBrokerJson.java index f28d0034..23f2a45f 100644 --- a/open-ssp-parent/core/src/main/java/com/atg/openssp/core/cache/broker/json/PricelayerBrokerJson.java +++ b/open-ssp-parent/core/src/main/java/com/atg/openssp/core/cache/broker/json/PricelayerBrokerJson.java @@ -5,6 +5,8 @@ import java.nio.file.Files; import java.nio.file.Paths; +import javax.xml.bind.PropertyException; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -13,6 +15,8 @@ import com.atg.openssp.core.cache.type.PricelayerCache; import com.google.gson.Gson; +import util.properties.ProjectProperty; + /** * @author André Schmer * @@ -27,7 +31,8 @@ public PricelayerBrokerJson() {} protected boolean doCaching() { final Gson gson = new Gson(); try { - final String content = new String(Files.readAllBytes(Paths.get("price_layer.json")), StandardCharsets.UTF_8); + final String path = ProjectProperty.readFile("price_layer.json").getAbsolutePath(); + final String content = new String(Files.readAllBytes(Paths.get(path)), StandardCharsets.UTF_8); final PricelayerDto dto = gson.fromJson(content, PricelayerDto.class); if (dto != null) { log.info("sizeof pricelayer data=" + dto.getPricelayer().size()); @@ -39,7 +44,7 @@ protected boolean doCaching() { log.error("no price data"); return false; - } catch (final IOException e) { + } catch (final IOException | PropertyException e) { log.error(getClass() + ", " + e.getMessage()); } diff --git a/open-ssp-parent/core/src/main/java/com/atg/openssp/core/cache/broker/json/SiteDataBrokerJson.java b/open-ssp-parent/core/src/main/java/com/atg/openssp/core/cache/broker/json/SiteDataBrokerJson.java index 9497367c..508217d1 100644 --- a/open-ssp-parent/core/src/main/java/com/atg/openssp/core/cache/broker/json/SiteDataBrokerJson.java +++ b/open-ssp-parent/core/src/main/java/com/atg/openssp/core/cache/broker/json/SiteDataBrokerJson.java @@ -5,6 +5,8 @@ import java.nio.file.Files; import java.nio.file.Paths; +import javax.xml.bind.PropertyException; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -13,6 +15,8 @@ import com.atg.openssp.core.cache.type.SiteDataCache; import com.google.gson.Gson; +import util.properties.ProjectProperty; + /** * @author André Schmer * @@ -27,7 +31,8 @@ public SiteDataBrokerJson() {} protected boolean doCaching() { final Gson gson = new Gson(); try { - final String content = new String(Files.readAllBytes(Paths.get("site_db.json")), StandardCharsets.UTF_8); + final String path = ProjectProperty.readFile("site_db.json").getAbsolutePath(); + final String content = new String(Files.readAllBytes(Paths.get(path)), StandardCharsets.UTF_8); final SiteDto dto = gson.fromJson(content, SiteDto.class); if (dto != null) { log.info("sizeof site data=" + dto.getSites().size()); @@ -36,10 +41,9 @@ protected boolean doCaching() { }); return true; } - log.error("no Site data"); return false; - } catch (final IOException e) { + } catch (final PropertyException | IOException e) { log.error(getClass() + ", " + e.getMessage()); } diff --git a/open-ssp-parent/core/src/main/java/com/atg/openssp/core/cache/broker/json/SupplierDataBrokerJson.java b/open-ssp-parent/core/src/main/java/com/atg/openssp/core/cache/broker/json/SupplierDataBrokerJson.java index 8b71879f..ea454884 100644 --- a/open-ssp-parent/core/src/main/java/com/atg/openssp/core/cache/broker/json/SupplierDataBrokerJson.java +++ b/open-ssp-parent/core/src/main/java/com/atg/openssp/core/cache/broker/json/SupplierDataBrokerJson.java @@ -5,6 +5,8 @@ import java.nio.file.Files; import java.nio.file.Paths; +import javax.xml.bind.PropertyException; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -14,6 +16,8 @@ import com.atg.openssp.core.exchange.channel.rtb.OpenRtbConnector; import com.google.gson.Gson; +import util.properties.ProjectProperty; + /** * * This special data broker loads the {@see SupplierDto} data from a file based store which holds the data for the supplier, also known as DSP. and put into a @@ -36,7 +40,8 @@ public SupplierDataBrokerJson() {} public boolean doCaching() { final Gson gson = new Gson(); try { - final String content = new String(Files.readAllBytes(Paths.get("supplier_db.json")), StandardCharsets.UTF_8); + final String path = ProjectProperty.readFile("supplier_db.json").getAbsolutePath(); + final String content = new String(Files.readAllBytes(Paths.get(path)), StandardCharsets.UTF_8); final SupplierDto dto = gson.fromJson(content, SupplierDto.class); if (dto != null) { log.info("sizeof supplier data=" + dto.getSupplier().size()); @@ -49,7 +54,7 @@ public boolean doCaching() { log.error("no Supplier data"); return false; - } catch (final IOException e) { + } catch (final IOException | PropertyException e) { log.error(getClass() + ", " + e.getMessage()); }