From 1bf2f752096d70101be69d0809e98a00ab6d6662 Mon Sep 17 00:00:00 2001
From: Tor-Einar Skog <tor-einar.skog@nibio.no>
Date: Tue, 28 Apr 2020 14:48:09 +0200
Subject: [PATCH] Fixing deserialization of Weather data
---
pom.xml | 4 +-
.../deliaradicummodel/DeliaRadicumModel.java | 8 +-
.../DeliaRadicumModel$1.class | Bin 872 -> 0 bytes
.../deliaradicummodel/DeliaRadicumModel.class | Bin 11481 -> 11248 bytes
.../DeliaRadicumModelDataMatrix.class | Bin 545 -> 545 bytes
...eliaradicummodel.DeliaRadicumModelTest.xml | 82 +++++++++---------
...eliaradicummodel.DeliaRadicumModelTest.txt | 2 +-
.../DeliaRadicumModelTest$1.class | Bin 870 -> 900 bytes
.../DeliaRadicumModelTest.class | Bin 10329 -> 10359 bytes
9 files changed, 46 insertions(+), 50 deletions(-)
delete mode 100644 target/classes/no/nibio/vips/model/deliaradicummodel/DeliaRadicumModel$1.class
diff --git a/pom.xml b/pom.xml
index 270f0bb..4944b29 100755
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
</dependencies>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
+ <maven.compiler.source>10</maven.compiler.source>
+ <maven.compiler.target>10</maven.compiler.target>
</properties>
</project>
\ No newline at end of file
diff --git a/src/main/java/no/nibio/vips/model/deliaradicummodel/DeliaRadicumModel.java b/src/main/java/no/nibio/vips/model/deliaradicummodel/DeliaRadicumModel.java
index 4ff6d24..ea055dc 100755
--- a/src/main/java/no/nibio/vips/model/deliaradicummodel/DeliaRadicumModel.java
+++ b/src/main/java/no/nibio/vips/model/deliaradicummodel/DeliaRadicumModel.java
@@ -19,8 +19,6 @@
package no.nibio.vips.model.deliaradicummodel;
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.ObjectMapper;
import java.io.IOException;
import java.text.DecimalFormat;
import java.util.ArrayList;
@@ -288,9 +286,7 @@ public class DeliaRadicumModel extends I18nImpl implements Model{
this.TJM10 = new ArrayList<>();
// Init data matrix
this.dataMatrix = new DeliaRadicumModelDataMatrix();
-
- ObjectMapper mapper = new ObjectMapper();
-
+
// Setting timezone
this.timeZone = TimeZone.getTimeZone((String) config.getConfigParameter("timeZone"));
//System.out.println("TimeZone=" + this.timeZone);
@@ -298,7 +294,7 @@ public class DeliaRadicumModel extends I18nImpl implements Model{
// Importing weather data, creating collections
// Can accept both hourly and daily data
WeatherUtil wUtil = new WeatherUtil();
- List<WeatherObservation> observations = mapper.convertValue(config.getConfigParameter("observations"), new TypeReference<List<WeatherObservation>>(){});
+ List<WeatherObservation> observations = this.modelUtil.extractWeatherObservationList(config.getConfigParameter("observations"));
for(WeatherObservation o:observations)
{
switch(o.getElementMeasurementTypeId())
diff --git a/target/classes/no/nibio/vips/model/deliaradicummodel/DeliaRadicumModel$1.class b/target/classes/no/nibio/vips/model/deliaradicummodel/DeliaRadicumModel$1.class
deleted file mode 100644
index 02bcb429dc9d4e14ad26e5f3bc4309d63af4edf5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 872
zcmX^0Z`VEs1_omWIZg&<1~D!M76x&41_^csNk#^?l8nq^6$3^FOP{=a{k+Vi%zXW_
z%z|S5-29Z(9Q~BkoXo_c#FWhB(p-p$3rHjgBH{~DW6j9GW|NthSz^b?V532{DVkx7
z3@pz1DXEMM{63j^seYxoNvTC4iAg!Bj0{3P`N@enVTnbVAU;%(1>|%_1|HA6ywoD+
zoW$bd)M7>kYjRznVrb3Cz!{vGo|jlsT9nGjkmHk_pR1piSX`1?RFRvbpOu)LU7Vk%
zpPXNms$WuBkg6Y2S&$l(nwDCWnwOkv<CB$GmZ)D^l9{9LlUZD1gXWObypqh4O8xNE
z#FC8EBLAe~)S|M)lFa-(YddQ@YeojH;QZ2}<W#pzkcY)Ef>{q_IwJ$WYhH3resN}A
zx^HSpMt%xAgA@;gG=mHe11kd?4+A@cEF*&@nK7wi$jG2elAjqF%*nKikwKt1wZu6;
zFD)~@v<Msyj0`&H$p;!{;B<zf)*6&tm^C!R7!(+o8CVz?7#IZvKtTXvF)%Q&GjK34
zGH^05FxW9LF)%SOFmP#UZ)ITA+RnhVk%57MiGhoOfq{*Ik%56xmw}ssfk6zSih+lL
tj{yX@z@{-WurTn0)eA5Pf@vWJVFm^U76uUpQ3hU+xeSa9%peU63;-;K`UwC4
diff --git a/target/classes/no/nibio/vips/model/deliaradicummodel/DeliaRadicumModel.class b/target/classes/no/nibio/vips/model/deliaradicummodel/DeliaRadicumModel.class
index 6ccfe7663f6d29ca85284a620028a512aa1e6b92..639d0283e442d542cb1e17988108ff15e8bb24c3 100644
GIT binary patch
delta 4764
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
delta 4866
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
diff --git a/target/classes/no/nibio/vips/model/deliaradicummodel/DeliaRadicumModelDataMatrix.class b/target/classes/no/nibio/vips/model/deliaradicummodel/DeliaRadicumModelDataMatrix.class
index f7e33768c7b326ec6fee16274df3dd84f5235d16..55a1800910f2d3dee5ef0ae18d9e821e3dd855b4 100644
GIT binary patch
delta 17
ZcmZ3;vXF)2)W2Q(7#JALHgZTZ0RTIL1)Tr@
delta 17
ZcmZ3;vXF)2)W2Q(7#J9gH*!ca0RTI61)2Z=
diff --git a/target/surefire-reports/TEST-no.nibio.vips.model.deliaradicummodel.DeliaRadicumModelTest.xml b/target/surefire-reports/TEST-no.nibio.vips.model.deliaradicummodel.DeliaRadicumModelTest.xml
index 4b75410..08ed70b 100644
--- a/target/surefire-reports/TEST-no.nibio.vips.model.deliaradicummodel.DeliaRadicumModelTest.xml
+++ b/target/surefire-reports/TEST-no.nibio.vips.model.deliaradicummodel.DeliaRadicumModelTest.xml
@@ -1,78 +1,78 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<testsuite tests="15" failures="0" name="no.nibio.vips.model.deliaradicummodel.DeliaRadicumModelTest" time="0.929" errors="0" skipped="0">
+<testsuite tests="15" failures="0" name="no.nibio.vips.model.deliaradicummodel.DeliaRadicumModelTest" time="0.895" errors="0" skipped="0">
<properties>
<property name="java.runtime.name" value="OpenJDK Runtime Environment"/>
- <property name="sun.boot.library.path" value="/usr/lib/jvm/java-8-openjdk-amd64/jre/lib/amd64"/>
- <property name="java.vm.version" value="25.131-b11"/>
- <property name="java.vm.vendor" value="Oracle Corporation"/>
- <property name="java.vendor.url" value="http://java.oracle.com/"/>
- <property name="path.separator" value=":"/>
+ <property name="java.vm.version" value="11.0.7+10-post-Ubuntu-2ubuntu218.04"/>
+ <property name="sun.boot.library.path" value="/usr/lib/jvm/java-11-openjdk-amd64/lib"/>
+ <property name="maven.multiModuleProjectDirectory" value="/home/treinar/prosjekter/vips/Sourcecode/DeliaRadicumModel"/>
+ <property name="java.vm.vendor" value="Ubuntu"/>
+ <property name="java.vendor.url" value="https://ubuntu.com/"/>
<property name="guice.disable.misplaced.annotation.check" value="true"/>
+ <property name="path.separator" value=":"/>
<property name="java.vm.name" value="OpenJDK 64-Bit Server VM"/>
- <property name="file.encoding.pkg" value="sun.io"/>
+ <property name="sun.os.patch.level" value="unknown"/>
<property name="user.country" value="US"/>
<property name="sun.java.launcher" value="SUN_STANDARD"/>
- <property name="sun.os.patch.level" value="unknown"/>
<property name="java.vm.specification.name" value="Java Virtual Machine Specification"/>
<property name="user.dir" value="/home/treinar/prosjekter/vips/Sourcecode/DeliaRadicumModel"/>
- <property name="java.runtime.version" value="1.8.0_131-8u131-b11-2ubuntu1.16.04.3-b11"/>
+ <property name="java.vm.compressedOopsMode" value="Zero based"/>
+ <property name="java.runtime.version" value="11.0.7+10-post-Ubuntu-2ubuntu218.04"/>
<property name="java.awt.graphicsenv" value="sun.awt.X11GraphicsEnvironment"/>
- <property name="java.endorsed.dirs" value="/usr/lib/jvm/java-8-openjdk-amd64/jre/lib/endorsed"/>
<property name="os.arch" value="amd64"/>
<property name="java.io.tmpdir" value="/tmp"/>
<property name="line.separator" value="
"/>
<property name="java.vm.specification.vendor" value="Oracle Corporation"/>
<property name="os.name" value="Linux"/>
- <property name="maven.ext.class.path" value="/home/treinar/bin/netbeans-8.2/java/maven-nblib/netbeans-eventspy.jar"/>
- <property name="classworlds.conf" value="/home/treinar/bin/netbeans-8.2/java/maven/bin/m2.conf"/>
+ <property name="maven.ext.class.path" value="/home/treinar/bin/netbeans-10/java/maven-nblib/netbeans-eventspy.jar"/>
+ <property name="classworlds.conf" value="/home/treinar/bin/netbeans-10/java/maven/bin/m2.conf"/>
<property name="sun.jnu.encoding" value="UTF-8"/>
- <property name="java.library.path" value="/usr/lib/jvm/java-8-openjdk-amd64/jre/lib/amd64:/usr/lib/jvm/java-8-openjdk-amd64/jre/lib/i386::/usr/java/packages/lib/amd64:/usr/lib/x86_64-linux-gnu/jni:/lib/x86_64-linux-gnu:/usr/lib/x86_64-linux-gnu:/usr/lib/jni:/lib:/usr/lib"/>
+ <property name="java.library.path" value="/usr/java/packages/lib:/usr/lib/x86_64-linux-gnu/jni:/lib/x86_64-linux-gnu:/usr/lib/x86_64-linux-gnu:/usr/lib/jni:/lib:/usr/lib"/>
+ <property name="jdk.debug" value="release"/>
+ <property name="java.class.version" value="55.0"/>
<property name="java.specification.name" value="Java Platform API Specification"/>
- <property name="java.class.version" value="52.0"/>
<property name="sun.management.compiler" value="HotSpot 64-Bit Tiered Compilers"/>
- <property name="os.version" value="4.4.0-97-generic"/>
+ <property name="os.version" value="5.3.0-46-generic"/>
<property name="user.home" value="/home/treinar"/>
<property name="user.timezone" value="Europe/Oslo"/>
<property name="java.awt.printerjob" value="sun.print.PSPrinterJob"/>
<property name="file.encoding" value="UTF-8"/>
- <property name="java.specification.version" value="1.8"/>
+ <property name="java.specification.version" value="11"/>
<property name="user.name" value="treinar"/>
- <property name="java.class.path" value="/home/treinar/bin/netbeans-8.2/java/maven/boot/plexus-classworlds-2.4.jar"/>
- <property name="java.vm.specification.version" value="1.8"/>
+ <property name="java.class.path" value="/home/treinar/bin/netbeans-10/java/maven/boot/plexus-classworlds-2.5.2.jar"/>
+ <property name="java.vm.specification.version" value="11"/>
<property name="sun.arch.data.model" value="64"/>
- <property name="java.home" value="/usr/lib/jvm/java-8-openjdk-amd64/jre"/>
- <property name="sun.java.command" value="org.codehaus.plexus.classworlds.launcher.Launcher -Dmaven.ext.class.path=/home/treinar/bin/netbeans-8.2/java/maven-nblib/netbeans-eventspy.jar install"/>
- <property name="java.specification.vendor" value="Oracle Corporation"/>
+ <property name="sun.java.command" value="org.codehaus.plexus.classworlds.launcher.Launcher -Dmaven.ext.class.path=/home/treinar/bin/netbeans-10/java/maven-nblib/netbeans-eventspy.jar install"/>
+ <property name="java.home" value="/usr/lib/jvm/java-11-openjdk-amd64"/>
<property name="user.language" value="en"/>
+ <property name="java.specification.vendor" value="Oracle Corporation"/>
<property name="awt.toolkit" value="sun.awt.X11.XToolkit"/>
- <property name="java.vm.info" value="mixed mode"/>
- <property name="java.version" value="1.8.0_131"/>
- <property name="java.ext.dirs" value="/usr/lib/jvm/java-8-openjdk-amd64/jre/lib/ext:/usr/java/packages/lib/ext"/>
+ <property name="java.vm.info" value="mixed mode, sharing"/>
+ <property name="java.version" value="11.0.7"/>
<property name="securerandom.source" value="file:/dev/./urandom"/>
- <property name="sun.boot.class.path" value="/usr/lib/jvm/java-8-openjdk-amd64/jre/lib/resources.jar:/usr/lib/jvm/java-8-openjdk-amd64/jre/lib/rt.jar:/usr/lib/jvm/java-8-openjdk-amd64/jre/lib/sunrsasign.jar:/usr/lib/jvm/java-8-openjdk-amd64/jre/lib/jsse.jar:/usr/lib/jvm/java-8-openjdk-amd64/jre/lib/jce.jar:/usr/lib/jvm/java-8-openjdk-amd64/jre/lib/charsets.jar:/usr/lib/jvm/java-8-openjdk-amd64/jre/lib/jfr.jar:/usr/lib/jvm/java-8-openjdk-amd64/jre/classes"/>
- <property name="java.vendor" value="Oracle Corporation"/>
- <property name="maven.home" value="/home/treinar/bin/netbeans-8.2/java/maven"/>
+ <property name="java.vendor" value="Ubuntu"/>
+ <property name="maven.home" value="/home/treinar/bin/netbeans-10/java/maven"/>
<property name="file.separator" value="/"/>
- <property name="java.vendor.url.bug" value="http://bugreport.sun.com/bugreport/"/>
- <property name="sun.cpu.endian" value="little"/>
+ <property name="java.version.date" value="2020-04-14"/>
+ <property name="java.vendor.url.bug" value="https://bugs.launchpad.net/ubuntu/+source/openjdk-lts"/>
<property name="sun.io.unicode.encoding" value="UnicodeLittle"/>
+ <property name="sun.cpu.endian" value="little"/>
<property name="sun.desktop" value="gnome"/>
<property name="sun.cpu.isalist" value=""/>
</properties>
- <testcase classname="no.nibio.vips.model.deliaradicummodel.DeliaRadicumModelTest" name="testGetSampleConfig" time="0.005"/>
- <testcase classname="no.nibio.vips.model.deliaradicummodel.DeliaRadicumModelTest" name="testSetConfiguration" time="0.322"/>
- <testcase classname="no.nibio.vips.model.deliaradicummodel.DeliaRadicumModelTest" name="testAcceptance" time="0.405"/>
- <testcase classname="no.nibio.vips.model.deliaradicummodel.DeliaRadicumModelTest" name="testWithSwedishData" time="0.116"/>
- <testcase classname="no.nibio.vips.model.deliaradicummodel.DeliaRadicumModelTest" name="testGetModelId" time="0.001"/>
- <testcase classname="no.nibio.vips.model.deliaradicummodel.DeliaRadicumModelTest" name="testGetModelName_0args" time="0.001"/>
- <testcase classname="no.nibio.vips.model.deliaradicummodel.DeliaRadicumModelTest" name="testGetModelName_String" time="0"/>
+ <testcase classname="no.nibio.vips.model.deliaradicummodel.DeliaRadicumModelTest" name="testGetWarningStatusInterpretation_String" time="0.037"/>
+ <testcase classname="no.nibio.vips.model.deliaradicummodel.DeliaRadicumModelTest" name="testGetWarningStatusInterpretation_0args" time="0.001"/>
+ <testcase classname="no.nibio.vips.model.deliaradicummodel.DeliaRadicumModelTest" name="testAcceptance" time="0.672"/>
+ <testcase classname="no.nibio.vips.model.deliaradicummodel.DeliaRadicumModelTest" name="testWithSwedishData" time="0.086"/>
+ <testcase classname="no.nibio.vips.model.deliaradicummodel.DeliaRadicumModelTest" name="testGetModelId" time="0"/>
+ <testcase classname="no.nibio.vips.model.deliaradicummodel.DeliaRadicumModelTest" name="testGetModelName_0args" time="0"/>
+ <testcase classname="no.nibio.vips.model.deliaradicummodel.DeliaRadicumModelTest" name="testGetModelName_String" time="0.001"/>
<testcase classname="no.nibio.vips.model.deliaradicummodel.DeliaRadicumModelTest" name="testGetLicense" time="0"/>
<testcase classname="no.nibio.vips.model.deliaradicummodel.DeliaRadicumModelTest" name="testGetCopyright" time="0"/>
- <testcase classname="no.nibio.vips.model.deliaradicummodel.DeliaRadicumModelTest" name="testGetModelDescription_0args" time="0.027"/>
- <testcase classname="no.nibio.vips.model.deliaradicummodel.DeliaRadicumModelTest" name="testGetModelDescription_String" time="0.005"/>
- <testcase classname="no.nibio.vips.model.deliaradicummodel.DeliaRadicumModelTest" name="testGetWarningStatusInterpretation_0args" time="0"/>
- <testcase classname="no.nibio.vips.model.deliaradicummodel.DeliaRadicumModelTest" name="testGetWarningStatusInterpretation_String" time="0"/>
- <testcase classname="no.nibio.vips.model.deliaradicummodel.DeliaRadicumModelTest" name="testGetModelUsage_0args" time="0.001"/>
+ <testcase classname="no.nibio.vips.model.deliaradicummodel.DeliaRadicumModelTest" name="testGetModelDescription_0args" time="0.047"/>
+ <testcase classname="no.nibio.vips.model.deliaradicummodel.DeliaRadicumModelTest" name="testGetModelDescription_String" time="0.013"/>
+ <testcase classname="no.nibio.vips.model.deliaradicummodel.DeliaRadicumModelTest" name="testGetModelUsage_0args" time="0"/>
<testcase classname="no.nibio.vips.model.deliaradicummodel.DeliaRadicumModelTest" name="testGetModelUsage_String" time="0"/>
+ <testcase classname="no.nibio.vips.model.deliaradicummodel.DeliaRadicumModelTest" name="testGetSampleConfig" time="0.028"/>
+ <testcase classname="no.nibio.vips.model.deliaradicummodel.DeliaRadicumModelTest" name="testSetConfiguration" time="0.01"/>
</testsuite>
\ No newline at end of file
diff --git a/target/surefire-reports/no.nibio.vips.model.deliaradicummodel.DeliaRadicumModelTest.txt b/target/surefire-reports/no.nibio.vips.model.deliaradicummodel.DeliaRadicumModelTest.txt
index 204cb29..da9fe52 100644
--- a/target/surefire-reports/no.nibio.vips.model.deliaradicummodel.DeliaRadicumModelTest.txt
+++ b/target/surefire-reports/no.nibio.vips.model.deliaradicummodel.DeliaRadicumModelTest.txt
@@ -1,4 +1,4 @@
-------------------------------------------------------------------------------
Test set: no.nibio.vips.model.deliaradicummodel.DeliaRadicumModelTest
-------------------------------------------------------------------------------
-Tests run: 15, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.929 sec
+Tests run: 15, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.942 sec
diff --git a/target/test-classes/no/nibio/vips/model/deliaradicummodel/DeliaRadicumModelTest$1.class b/target/test-classes/no/nibio/vips/model/deliaradicummodel/DeliaRadicumModelTest$1.class
index 3447d918192e39f6aa26ff816e6c80fb8ac626d5..beac300910a6ce00d0d51805099ab8dc37d98742 100644
GIT binary patch
delta 145
zcmaFH*1|4z>ff$?3=9lr4Dy@|%nagO3@i*1><p6Z3{o4VWElkod{av@@>2p5ixP8F
zOHzx9Cz~?%2}|=Z$S}zAFt9SP@i4G6$T2e5PAs&ZEXeePk!kWbCRa0l1_lOJMh4af
q0R|QZ0R{#JCI&$UAuuh>Ai}`Fz``KPAjZJUz`(%8z{tSN00saqzZIqc
delta 116
zcmZo+f5s+t>ff$?3=9m$404<d%nV{&3@i-d><kj@43ZnAWEm%WG4=>c@i0g;$nY?*
zGO+P5urtUqGT2Tmw4SWO^n{UdGAFaEHVXqk0|NsSg8+jdm=<CXW?*1oVGv;uW#DCC
NVBlh4WMF0h0{}wK4S@gv
diff --git a/target/test-classes/no/nibio/vips/model/deliaradicummodel/DeliaRadicumModelTest.class b/target/test-classes/no/nibio/vips/model/deliaradicummodel/DeliaRadicumModelTest.class
index f686b77563b8f06342a4abb39a4bb5f82a58e948..e6a41d874fd196831073cb23e1611f9d09b66a24 100644
GIT binary patch
delta 1145
zcmcZ^@I9dZ)W2Q(7#JAL7#q15au^PCG8|zz%E3^_#c+(_I6K1$E(TVH!yF7Jxfrq;
zPJuY5LBtsjhO=A@=NQg&G4L^5U}v}pqA!7n%OK(kH$y+eRc?j}4A(%!b#{gu+zg@&
zH@O%h8E$bhh%(#;aqn<3+-0c02jbrc5f3;R9&#`|;$WD<!SI-a;Ry%BQ!WMvhG!fM
z&p8-ga4@`NXL!ZI@S2N3o#7405pO}PcN`4wIT${G_#Z*UCk}?sAo>dj!&eafjf3Gk
zi2ea0esVDU0@1%g#2*fZzg!IUtPKA^y#E}G3|tJXjEo$NOze!zAd3%kGO#kTa4|SA
zva&O>aWUjDvU4$VFmiG+xG-|DGjek=crYC1V%W#X!^N<lk(Zs3kDZa9i@}%SFgv3F
z7lS`Y(uYxyi@}HCDhI;~E(RY)ArK+V&M3mg5XLCV#o*5vD8|kx&dw;o#SjHjAH^ui
z!6*e%CC$Ys!zjze5XC6R!6*-+6*w3bK{84pjxskxKcfl<qbe7p8lyS~!xnZ%4R%IN
zc1Equ=NPvziD<Jk>M$~JxmF~n7L;V>=M}Rv>TaIK@}F5skDXDUozZ}iLBKb)BqKj1
zAh9ShH?<_SsCe=m4nsjh9!4WZV|GRp9!66}Ge!pU$sdHxCyR0_L^3g&^DtU4S~4<l
zyOtK^7o_U@7w6=&Gg|R5S~J@4FxoQOF)|2cC6*=XmzHGa=sPFoq~@h07V$9JGdh3>
zM;=BeMrR&I7e-eeMmI)x9!3vFPeumm$q(5?b%IihOLIzi7`;F$ycvCX7=0Q2co_W|
z1K1e@c^HEjgLxQ3Kq8@xev{90Rx*b%hEMk9%C9%$VR*?H!NVBI7{$oIlb%}Qo1c=J
z<CmD5%E-XL!|<Ll3PeORGH|7*miS~Qr{)!>@-TdcsdmmUs4U7%&nV$x_zDsehMC}!
zTAW;z2@X6ShVLL#zB5KMGRUQ;mV_r3<z?oj2bUz4lukay%5TlX@C&5i7f1mw%z)71
z#Pn1ihQA=0zaSa@^wg5z#N2|MROkG>w9IrKMh3>H$<5sM+%XK(c^G3s!7V-6k6l`n
zhcS*Zo}Dp)hcS^ciH9MNF`1FUaI%50*dz|l$uc}5+$oHyJdA0K>5L5OAmPaugas!j
z@wf?OfI>BsF^h*W8{`?=$sdHRc~lHRM&$4?<}&6@{?B8pn$K9k$iSPEpYEAgl3G-j
znB$qk!&t~z#LigE!&t&t%EMU3SUx$CS5~S5<R;d##GKMp9>z+>Djvpa#u^^RTE@D`
zGkA5`>UkI&7|k}H=3Ot&$h5gy^(d3d0R{#JRz`;13=9lR3<tsFA%<KA1_mw$Musp3
GFaQ8KWBafG
delta 1117
zcmew!a5JF()W2Q(7#J9g85_75au^PAG8|?&!og6-#c-727(2spE(TVHLmUhzxEQh-
zPJ%e6K*VVdhBI6YXBp0MG4L^*XJ@zoqA!AoOCaJhH$y+e6>f$J3|B$KHFk#U+zg@&
zH@Fxg8E$eih%(#)ac^@m++nD{3*z4c5%)P59&j)`<Y1V>!SINK;V}op6D|e^hNm11
z&o~&Kb1=MMXL!lM@QRB;o#8de5pO`Ow;T-bI2hi8_#Z&TM-GNhAo?>0!xs?!m4o3M
zi2e>DesD1S1kt}h#BUCUKU@s;tPFoaynh@F|G5}g85uYj8QB?`Ko%e3WME}v=3;PQ
zWMOAy<zmQTWaDCFXXM~waAD+RXXN5y@L)K^#juZ&n~PyTBM&<xFFPY27lSXuA$CT7
zE(U*)qz|J27lRMO6%K|KTns*pf*?YOol%&JA&gOki@~2UP?VifjGa-Oiy;c6K8jI-
zgHaNsN{Wk7no)*}A&OC!gHaAd%X2U)fMgUw93^gsenw>uMinkbRYo-qhAr%j>g<df
z?2MY5&oORc647F3)MjMha;->CEhx#%&nsqU)Y&|Z<v%mKE<2+hJEQ*O^&EzL20V<0
zj7IE?#ypHBjHZ*{aYThNGMe!)nloB3GH|<=7UdVD>iZYx<g+tc@-SL4TJtd4FxoOQ
z2xTRfCF+-!Waj8QC+4K)r6d;dFxoNNg9ry6Mn^^`9!6(I7am4eMmHWtcSeuN^Eee$
zJVC-<jNUwqK8(IRjDC#%?2G|CjDd_nJdD90kq}1T$&WZInL`=FCdYB**PHS%ykHFH
zVT@pmWMtq;Pc8AyPf5-3OUzAWWMJT7c*htCBBB@>xYAQgd@_?$^NLe>7(T&NJLeZv
z7G<Vql<+Wo0f`C2OmImpPA<v>hYJtGH;^gc7^4^&<kC}1!V`<~GV{`dOA<>;C;M;<
zTK)t{{{%_%!nB7LC#I+JF#G|@`~k`Er>B+#C*~I9q&ny4rDdk`F#KnXoIH)&o+FxJ
zIuBzEqv_<k+zP_6jB)IY@jQ$PjEOu9d5lSn42F{%g~cXua8B0e5#df|OyOZnWlUpa
zP=^WU^7sj)gMu)FF_VWe3*-sg$sak)Ctu)T;ZZRJnUc-Jn8TPmS%}v*CXX?nk%2cS
zKixC0B(<n4F~>87hp~XMke#uJhq0Kkgom+|v5b*HA~h#9H#M)sH#M=iv<S=$sVqnZ
zDK2L;Wn^G2OUx-v<zcK~tmI*=Vyxz2tYNI3yqZ^+t&WGWp3!vkJ>K==jEtN6RF5)A
aGBF%rU|?WkILMI8z`(%8z{n8B00sb*UHWDK
--
GitLab