From 8eab7b633194611c7358192bcb470b28a68fffd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Baginski?= Date: Fri, 9 Oct 2020 20:45:16 +0200 Subject: [PATCH] [rrd4j] Corrected the default configurations (third try) (#8708) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Applied the changes found by spotless. According the comments DEFAULT_NUMERIC, DEFAULT_QUANTIFIABLE config should have 5 archives, the 4th was missing. Additionally the ConsolFunction changed in the DEFAULT_QUANTIFIABLE. The DEFAULT_OTHER config had false computed archives. Signed-off-by: Jürgen Baginski --- .../persistence/rrd4j/internal/RRD4jPersistenceService.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/bundles/org.openhab.persistence.rrd4j/src/main/java/org/openhab/persistence/rrd4j/internal/RRD4jPersistenceService.java b/bundles/org.openhab.persistence.rrd4j/src/main/java/org/openhab/persistence/rrd4j/internal/RRD4jPersistenceService.java index c67d3f996..9dd09004c 100644 --- a/bundles/org.openhab.persistence.rrd4j/src/main/java/org/openhab/persistence/rrd4j/internal/RRD4jPersistenceService.java +++ b/bundles/org.openhab.persistence.rrd4j/src/main/java/org/openhab/persistence/rrd4j/internal/RRD4jPersistenceService.java @@ -367,7 +367,8 @@ public class RRD4jPersistenceService implements QueryablePersistenceService { // 3. granularity of 15m for the last year // 4. granularity of 1h for the last 5 years // 5. granularity of 1d for the last 10 years - defaultNumeric.addArchives("LAST,0.5,1,360:LAST,0.5,6,10080:LAST,0.5,90,36500:LAST,0.5,360,43800:LAST,0.5,8640,3650"); + defaultNumeric + .addArchives("LAST,0.5,1,360:LAST,0.5,6,10080:LAST,0.5,90,36500:LAST,0.5,360,43800:LAST,0.5,8640,3650"); rrdDefs.put(DEFAULT_NUMERIC, defaultNumeric); RrdDefConfig defaultQuantifiable = new RrdDefConfig(DEFAULT_QUANTIFIABLE); @@ -379,7 +380,8 @@ public class RRD4jPersistenceService implements QueryablePersistenceService { // 3. granularity of 15m for the last year // 4. granularity of 1h for the last 5 years // 5. granularity of 1d for the last 10 years - defaultQuantifiable.addArchives("AVERAGE,0.5,1,360:AVERAGE,0.5,6,10080:AVERAGE,0.5,90,36500:AVERAGE,0.5,360,43800:AVERAGE,0.5,8640,3650"); + defaultQuantifiable.addArchives( + "AVERAGE,0.5,1,360:AVERAGE,0.5,6,10080:AVERAGE,0.5,90,36500:AVERAGE,0.5,360,43800:AVERAGE,0.5,8640,3650"); rrdDefs.put(DEFAULT_QUANTIFIABLE, defaultQuantifiable); RrdDefConfig defaultOther = new RrdDefConfig(DEFAULT_OTHER);