From 46faa51ba7df45036cc1e027fabec6cb2e66de7e Mon Sep 17 00:00:00 2001
From: vkovtun <viktor.kovtun@id.ethz.ch>
Date: Tue, 4 Apr 2023 16:27:22 +0200
Subject: [PATCH] SSDM-13256: Fixing the issue with "$$" being exported. Fixing
failing tests.
---
.../AbstractXLSEntityTypeExportHelper.java | 7 +++----
.../xls/export/DataSetExpectations.java | 4 ++++
.../xls/export/DataSetTypeExpectations.java | 4 ++--
.../export/ExperimentTypeExpectations.java | 6 +++---
.../xls/export/SampleTypeExpectations.java | 6 +++---
...ypeWithBareSamplePropertyExpectations.java | 2 +-
...thChainedSamplePropertiesExpectations.java | 4 ++--
...ithCyclicSamplePropertiesExpectations.java | 4 ++--
...pleTypeWithSamplePropertyExpectations.java | 2 +-
...ypeWithVocabularyPropertyExpectations.java | 4 ++--
.../resources/export-data-set-plain-text.xlsx | Bin 6334 -> 6331 bytes
.../resources/export-data-set-rich-text.xlsx | Bin 6390 -> 6389 bytes
.../export-sample-compatible-with-import.xlsx | Bin 6472 -> 6471 bytes
...iltered-fields-compatible-with-import.xlsx | Bin 6167 -> 6166 bytes
14 files changed, 23 insertions(+), 20 deletions(-)
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/export/helper/AbstractXLSEntityTypeExportHelper.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/export/helper/AbstractXLSEntityTypeExportHelper.java
index cd2d633b259..85930c3cff5 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/export/helper/AbstractXLSEntityTypeExportHelper.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/export/helper/AbstractXLSEntityTypeExportHelper.java
@@ -161,7 +161,7 @@ public abstract class AbstractXLSEntityTypeExportHelper<ENTITY_TYPE extends IEnt
final AdditionResult additionResult = addEntityTypePropertyAssignments(rowNumber,
entityType.getPropertyAssignments(), exportableKind, permId,
- entityTypeExportFieldsMap, compatibleWithImport);
+ compatibleWithImport);
warnings.addAll(additionResult.getWarnings());
rowNumber = additionResult.getRowNumber();
@@ -174,8 +174,7 @@ public abstract class AbstractXLSEntityTypeExportHelper<ENTITY_TYPE extends IEnt
protected AdditionResult addEntityTypePropertyAssignments(int rowNumber,
final Collection<PropertyAssignment> propertyAssignments, final ExportableKind exportableKind,
- final String permId, final Map<String, List<Map<String, String>>> entityTypeExportFieldsMap,
- final boolean compatibleWithImport)
+ final String permId, final boolean compatibleWithImport)
{
final Collection<String> warnings = new ArrayList<>(
addRow(rowNumber++, true, exportableKind, permId, compatibleWithImport
@@ -187,7 +186,7 @@ public abstract class AbstractXLSEntityTypeExportHelper<ENTITY_TYPE extends IEnt
final Plugin plugin = propertyAssignment.getPlugin();
final Vocabulary vocabulary = propertyType.getVocabulary();
- final String code = (propertyType.isManagedInternally() ? INTERNAL_PROPERTY_PREFIX : "") + propertyType.getCode();
+ final String code = propertyType.getCode();
final String[] values = {
String.valueOf(VersionUtils.getStoredVersion(allVersions, ImportTypes.PROPERTY_TYPE, null, code)),
code,
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/DataSetExpectations.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/DataSetExpectations.java
index 074a950497e..fccc56487f7 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/DataSetExpectations.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/DataSetExpectations.java
@@ -28,6 +28,7 @@ import org.jmock.api.Invocation;
import org.jmock.lib.action.CustomAction;
import ch.ethz.sis.openbis.generic.asapi.v3.IApplicationServerApi;
+import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.ArchivingStatus;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.PhysicalData;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.entitytype.EntityKind;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.entitytype.id.EntityTypePermId;
@@ -100,16 +101,19 @@ class DataSetExpectations extends Expectations
physicalData[0].setArchivingRequested(false);
physicalData[0].setPresentInArchive(true);
physicalData[0].setStorageConfirmation(true);
+ physicalData[0].setStatus(ArchivingStatus.AVAILABLE);
physicalData[1] = new PhysicalData();
physicalData[1].setArchivingRequested(true);
physicalData[1].setPresentInArchive(false);
physicalData[1].setStorageConfirmation(false);
+ physicalData[1].setStatus(ArchivingStatus.AVAILABLE);
physicalData[2] = new PhysicalData();
physicalData[2].setArchivingRequested(true);
physicalData[2].setPresentInArchive(true);
physicalData[2].setStorageConfirmation(false);
+ physicalData[2].setStatus(ArchivingStatus.ARCHIVED);
final DataSet[] dataSets = new DataSet[3];
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/DataSetTypeExpectations.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/DataSetTypeExpectations.java
index f02c6824650..6e82e8d0fa0 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/DataSetTypeExpectations.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/DataSetTypeExpectations.java
@@ -82,7 +82,7 @@ class DataSetTypeExpectations extends Expectations
propertyAssignments[0] = PropertyAssignmentFactory.createPropertyAssignment(
propertyAssignmentFetchOptions);
- propertyAssignments[0].getPropertyType().setCode("NAME");
+ propertyAssignments[0].getPropertyType().setCode("$NAME");
propertyAssignments[0].setMandatory(false);
propertyAssignments[0].setShowInEditView(true);
propertyAssignments[0].setSection("General info");
@@ -106,7 +106,7 @@ class DataSetTypeExpectations extends Expectations
propertyAssignments[2] = PropertyAssignmentFactory.createPropertyAssignment(
propertyAssignmentFetchOptions);
- propertyAssignments[2].getPropertyType().setCode("XMLCOMMENTS");
+ propertyAssignments[2].getPropertyType().setCode("$XMLCOMMENTS");
propertyAssignments[2].setMandatory(false);
propertyAssignments[2].setShowInEditView(false);
propertyAssignments[2].getPropertyType().setManagedInternally(true);
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/ExperimentTypeExpectations.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/ExperimentTypeExpectations.java
index 3e6d20ae6a6..1c428d50a78 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/ExperimentTypeExpectations.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/ExperimentTypeExpectations.java
@@ -86,7 +86,7 @@ class ExperimentTypeExpectations extends Expectations
propertyAssignments[0] = PropertyAssignmentFactory.createPropertyAssignment(
fetchOptions.withPropertyAssignments());
- propertyAssignments[0].getPropertyType().setCode("NAME");
+ propertyAssignments[0].getPropertyType().setCode("$NAME");
propertyAssignments[0].setMandatory(false);
propertyAssignments[0].setShowInEditView(true);
propertyAssignments[0].setSection("General info");
@@ -97,7 +97,7 @@ class ExperimentTypeExpectations extends Expectations
propertyAssignments[1] = PropertyAssignmentFactory.createPropertyAssignment(
fetchOptions.withPropertyAssignments());
- propertyAssignments[1].getPropertyType().setCode("DEFAULT_OBJECT_TYPE");
+ propertyAssignments[1].getPropertyType().setCode("$DEFAULT_OBJECT_TYPE");
propertyAssignments[1].setMandatory(false);
propertyAssignments[1].setShowInEditView(true);
propertyAssignments[1].setSection("General info");
@@ -121,7 +121,7 @@ class ExperimentTypeExpectations extends Expectations
propertyAssignments[3] = PropertyAssignmentFactory.createPropertyAssignment(
fetchOptions.withPropertyAssignments());
- propertyAssignments[3].getPropertyType().setCode("XMLCOMMENTS");
+ propertyAssignments[3].getPropertyType().setCode("$XMLCOMMENTS");
propertyAssignments[3].setMandatory(false);
propertyAssignments[3].setShowInEditView(false);
propertyAssignments[3].getPropertyType().setManagedInternally(true);
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/SampleTypeExpectations.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/SampleTypeExpectations.java
index 5da30a0232b..367c56c3303 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/SampleTypeExpectations.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/SampleTypeExpectations.java
@@ -100,7 +100,7 @@ class SampleTypeExpectations extends Expectations
propertyAssignments[0] = PropertyAssignmentFactory.createPropertyAssignment(
fetchOptions.withPropertyAssignments());
- propertyAssignments[0].getPropertyType().setCode("NAME");
+ propertyAssignments[0].getPropertyType().setCode("$NAME");
propertyAssignments[0].setMandatory(false);
propertyAssignments[0].setShowInEditView(true);
propertyAssignments[0].setSection("General info");
@@ -111,7 +111,7 @@ class SampleTypeExpectations extends Expectations
propertyAssignments[1] = PropertyAssignmentFactory.createPropertyAssignment(
fetchOptions.withPropertyAssignments());
- propertyAssignments[1].getPropertyType().setCode("DOCUMENT");
+ propertyAssignments[1].getPropertyType().setCode("$DOCUMENT");
propertyAssignments[1].setMandatory(false);
propertyAssignments[1].setShowInEditView(true);
propertyAssignments[1].setSection("General info");
@@ -124,7 +124,7 @@ class SampleTypeExpectations extends Expectations
propertyAssignments[2] = PropertyAssignmentFactory.createPropertyAssignment(
fetchOptions.withPropertyAssignments());
- propertyAssignments[2].getPropertyType().setCode("ANNOTATIONS_STATE");
+ propertyAssignments[2].getPropertyType().setCode("$ANNOTATIONS_STATE");
propertyAssignments[2].setMandatory(false);
propertyAssignments[2].setShowInEditView(false);
propertyAssignments[2].getPropertyType().setManagedInternally(true);
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/SampleTypeWithBareSamplePropertyExpectations.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/SampleTypeWithBareSamplePropertyExpectations.java
index b83874fe903..d288fcf6c46 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/SampleTypeWithBareSamplePropertyExpectations.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/SampleTypeWithBareSamplePropertyExpectations.java
@@ -100,7 +100,7 @@ class SampleTypeWithBareSamplePropertyExpectations extends Expectations
propertyAssignments[0] = PropertyAssignmentFactory.createPropertyAssignment(
fetchOptions.withPropertyAssignments());
- propertyAssignments[0].getPropertyType().setCode("NAME");
+ propertyAssignments[0].getPropertyType().setCode("$NAME");
propertyAssignments[0].setMandatory(true);
propertyAssignments[0].setShowInEditView(true);
propertyAssignments[0].setSection("General info");
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/SampleTypeWithChainedSamplePropertiesExpectations.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/SampleTypeWithChainedSamplePropertiesExpectations.java
index 8b1ad81ccb3..93572b36201 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/SampleTypeWithChainedSamplePropertiesExpectations.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/SampleTypeWithChainedSamplePropertiesExpectations.java
@@ -140,7 +140,7 @@ class SampleTypeWithChainedSamplePropertiesExpectations extends Expectations
final PropertyAssignmentFetchOptions propertyAssignmentFetchOptions = fetchOptions.withPropertyAssignments();
propertyAssignments[0] = PropertyAssignmentFactory.createPropertyAssignment(propertyAssignmentFetchOptions);
- propertyAssignments[0].getPropertyType().setCode("NAME");
+ propertyAssignments[0].getPropertyType().setCode("$NAME");
propertyAssignments[0].setMandatory(true);
propertyAssignments[0].setShowInEditView(true);
propertyAssignments[0].setSection("General info");
@@ -212,7 +212,7 @@ class SampleTypeWithChainedSamplePropertiesExpectations extends Expectations
final PropertyAssignment[] propertyAssignments = new PropertyAssignment[5];
propertyAssignments[0] = PropertyAssignmentFactory.createPropertyAssignment(propertyAssignmentFetchOptions);
- propertyAssignments[0].getPropertyType().setCode("NAME");
+ propertyAssignments[0].getPropertyType().setCode("$NAME");
propertyAssignments[0].setMandatory(true);
propertyAssignments[0].setShowInEditView(true);
propertyAssignments[0].setSection("General info");
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/SampleTypeWithCyclicSamplePropertiesExpectations.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/SampleTypeWithCyclicSamplePropertiesExpectations.java
index ce59a4b7252..adc7bea77c6 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/SampleTypeWithCyclicSamplePropertiesExpectations.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/SampleTypeWithCyclicSamplePropertiesExpectations.java
@@ -139,7 +139,7 @@ class SampleTypeWithCyclicSamplePropertiesExpectations extends Expectations
final PropertyAssignmentFetchOptions propertyAssignmentFetchOptions = fetchOptions.withPropertyAssignments();
propertyAssignments[0] = PropertyAssignmentFactory.createPropertyAssignment(propertyAssignmentFetchOptions);
- propertyAssignments[0].getPropertyType().setCode("NAME");
+ propertyAssignments[0].getPropertyType().setCode("$NAME");
propertyAssignments[0].setMandatory(true);
propertyAssignments[0].setShowInEditView(true);
propertyAssignments[0].setSection("General info");
@@ -223,7 +223,7 @@ class SampleTypeWithCyclicSamplePropertiesExpectations extends Expectations
final PropertyAssignment[] propertyAssignments = new PropertyAssignment[5];
propertyAssignments[0] = PropertyAssignmentFactory.createPropertyAssignment(propertyAssignmentFetchOptions);
- propertyAssignments[0].getPropertyType().setCode("NAME");
+ propertyAssignments[0].getPropertyType().setCode("$NAME");
propertyAssignments[0].setMandatory(true);
propertyAssignments[0].setShowInEditView(true);
propertyAssignments[0].setSection("General info");
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/SampleTypeWithSamplePropertyExpectations.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/SampleTypeWithSamplePropertyExpectations.java
index 366335c732a..a95ff2d028d 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/SampleTypeWithSamplePropertyExpectations.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/SampleTypeWithSamplePropertyExpectations.java
@@ -171,7 +171,7 @@ class SampleTypeWithSamplePropertyExpectations extends Expectations
propertyAssignments[0] = PropertyAssignmentFactory.createPropertyAssignment(
fetchOptions.withPropertyAssignments());
- propertyAssignments[0].getPropertyType().setCode("NAME");
+ propertyAssignments[0].getPropertyType().setCode("$NAME");
propertyAssignments[0].setMandatory(true);
propertyAssignments[0].setShowInEditView(true);
propertyAssignments[0].setSection("General info");
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/SampleTypeWithVocabularyPropertyExpectations.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/SampleTypeWithVocabularyPropertyExpectations.java
index 3eb95e9a342..3b1169803d8 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/SampleTypeWithVocabularyPropertyExpectations.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/SampleTypeWithVocabularyPropertyExpectations.java
@@ -179,7 +179,7 @@ class SampleTypeWithVocabularyPropertyExpectations extends Expectations
propertyAssignments[0] = PropertyAssignmentFactory.createPropertyAssignment(
fetchOptions.withPropertyAssignments());
- propertyAssignments[0].getPropertyType().setCode("NAME");
+ propertyAssignments[0].getPropertyType().setCode("$NAME");
propertyAssignments[0].setMandatory(false);
propertyAssignments[0].setShowInEditView(true);
propertyAssignments[0].setSection("General info");
@@ -190,7 +190,7 @@ class SampleTypeWithVocabularyPropertyExpectations extends Expectations
propertyAssignments[1] = PropertyAssignmentFactory.createPropertyAssignment(
fetchOptions.withPropertyAssignments());
- propertyAssignments[1].getPropertyType().setCode("BARCODE");
+ propertyAssignments[1].getPropertyType().setCode("$BARCODE");
propertyAssignments[1].setMandatory(false);
propertyAssignments[1].setShowInEditView(false);
propertyAssignments[1].setSection("General info");
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/resources/export-data-set-plain-text.xlsx b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/resources/export-data-set-plain-text.xlsx
index 23a8108ac15da282be9e92d696fd475638eec732..9077e4d823c7a224080539661eaaca4a54ac4b44 100644
GIT binary patch
delta 3188
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
M7Ul)Y3jMbJ4_G6$YybcN
delta 3168
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
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/resources/export-data-set-rich-text.xlsx b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/resources/export-data-set-rich-text.xlsx
index 059256318f6f79b477b2b471c74eba3f295256d9..a872b05d2070ab60de061ad8e6d23f6aec863f81 100644
GIT binary patch
delta 3185
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
TRRvTS_=4C4g|j(8exLde@XD~I
delta 3156
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
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/resources/export-sample-compatible-with-import.xlsx b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/resources/export-sample-compatible-with-import.xlsx
index 85ea05ae9fc814155f6538b2474679d1d4e3b494..c5174f1d75277603112dbe2b8e584d6a39334966 100644
GIT binary patch
delta 3306
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
delta 3292
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
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/resources/export-sample-filtered-fields-compatible-with-import.xlsx b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/resources/export-sample-filtered-fields-compatible-with-import.xlsx
index 88dbc885700cabf108b1c2d232bc628a376a9ed2..095637531f9c7e3c998923b07690e1df3f19f991 100644
GIT binary patch
delta 2505
zcmY*bc{mj67oM>-!%SwlW-|6d_9gBZB4X?$Zj!B1_Wfob%ODp~LuQOJC9WxQ8$yG!
zG-XMVeJRsqiG&%;P*>Tm^n338_5Jg{&-a}7obNg3e9t)rT4XKgNn2jNUjQHw2*A0N
zRt=R0^6p}-F7Q{LJrc}&nfE&(as^cJ%uA&hSmJn9ajeW$fW)m!hWXVIH?3=Kj&-w7
zaU_8Hr}<&3-m~1#Op$_QD(1d=JQrrR(3kimXQ*R<z4}{`t9!SKY4$}4{mPKZgC)w!
zi#eP-#y!W(>zr2_tUg>ttiMU>$lr?Fe!;$8lM#4LyPk2}QHmMV(^cAEZZm?x=cs0o
z8<MY!`NVZkl36(wd6SrY;hDFc5v-R=Io4jI(u6mb34Oy^^0C%LdxFr}qh6S7{l2OZ
z>I1hhhq;W+yJ|^kr`(SjWp&}Gs~J46&z%slP<=9W!gMvguxKVyS8DoeThq=g_?q0X
zI@~6XR%`gxiX7K1jh;EY>}h(Jf6>Zfy_P5k(!!tj)owDVbLi`T`B_1b&+5Xq;(GPG
zr~7c>u_9o*J;H@%8DQuq-+Yi?K-G`Zv5rji=wtJ|0_xC>mxa@x&;=|OM@_hbRk5>q
zFJkI3t>6~{JC7;QUfE7gM3QA~&+#mm6~zy!JZYs5=wT@<)t;GIz7u)mgKa#1;@*Nz
z@=`n-Vw(;;Ok9cXQ~N2%e40mn%uZQ?2R$q6Y<n+}0}{up1*-}yAoPM^^AhuZwE1z1
zU)EF#!&y&5+x3Zq0&Agxz^HX|rxrx_t?Jo*Nti`J{u+<-j*$oW7lbnV-|NkkMcuAi
zM))O@Bfp`;&z0$+uy=Zk@8xf5R#4h~6xM=nDN?cqn@XHjA1MZ830*uRu9I^o`A|Zh
zY0~LUR~0@yJ+#K`#B?^7tw$YATZ71L-RE^?##=oF&rxb1!g)S@X%IWP#94qffs%RA
z46BL3wpok*e&JPrRMXtHS-O2^ABnoK?!O~fs_5<gY9Qj?J|*@eu>P+;bNWQyZkK5s
z=Xsj#Z$~pF@t2YtM2!PSvl`Iqj+v6L(4H}jZ=QJhk1GispGw>19}&*!b!kx9&qZ&1
zQz<|-mulOlx{-66Krshj9g;X;=#dh2G{&!#Ci_OVWhm3_uoq@Y+=B6>bdmF?wEpD#
z$ML8bYIqg=_>0666uDyZ5&9~fz3KV(nsDxI%`3%cqu*;a4x+UC%LN)|VPi*!O+>))
zrxMNaASpNmo^2u;VTe_WYQrjL5<nT5I=3x#v9}g7=U^*z3oMKD^&aX(B?V(e^lgej
zaNG-iuXTzS!g{g{us40OW8k)C2Ylp;T6(9O((N{23b3K5O$*P~@ptIf7^ZJ|-RtFR
zb>dr#b>huT^dWjkMf%-9%(eIal)-Tp8eitd#M<Z>+-~XDyWW@`{Aqn-=S$T1LiRZb
zOyQ0>@0D-*s-a}4MM6_5X@7hmpR)azZWAj`i9qH6Ruk1pNZJ_&-1LW*+<h0+G7hQh
zY6(&LR;gDBHel2%nBsIG&co0fR{6~x#kfjj)Xhl;=a$P++4NtbIL0Y4cr!B>uL;pL
za>?&cKK_KzSzH?0$Y!P+EaJ8duM(?8xfz~Q)K+|Q9x@PQUn_cx*aO~RSJ6Vxld
zj04zJ$e(k25yyJ!1H<Nvo3njmX(MixRfmmFn=foA+l~L(g*dXT<H)~iEPEp*NAU*m
zBCJ~vbdRaAQCD*QDBfKXi+^Z>v|Avj6g7>g^V(~DHmduBjZj-pJ}+>r@Vvm);}03K
zH$oe+W5NW-u&@$u>V)21LyPJW3}V)}YJ>ZCRXn$12C*6{ly-z`DkSYE<PqMDlTdW;
z##pbVI3{+4OV!5nr06`3STgXcEg1KRaC@ctsW*nydMaRPgll5*4u1`v1-oQ~pNb0w
z^gd9U`B>r@Q(3J{JEEc8sG!;K9zV}vcC8Yk7aAXP(2XIs4GmsLa5gg8GC>~iOvqYc
z;wkboDMQtsP93gx7+CMr^d!{^PXjLzPCg*DH`iwI`Mpj3IOYA9$O~wDad}rB!y7g<
z7TDq@;wJL0!rf)Y!4AQ&c^SwrrnxTeH5^pllR&&z#vG+%?)2-@dR@<_u2oLfd^tmD
zTu9Pt;1Kv{cYr5t_krM_yrg~+007)10f3(-L#+c8`C~K$?0>XJh_Wzke8{1B190C7
zJK1V*n>uw7;ZIarY1uXks3!wOo%VlOU9FWmN?BY`d6OFD^cVQbJ~-F}>}f?W%$>P_
zAXrc2{*~(D_AE`3aXla@AKaQ&x9m*^W{Y@C{6V_-+^!SVuVr)ljM-}zLx&_x9vhKt
z4ssa^UwP?bLR3NxpmLFTN&OH$vq9B7qPHB*y0+R`^(078Y^b=eKNdC^rjbfxwWpyk
zbv#gzhImk;pA|L7)Er)nZhWQ@a=&HgMoW)O5!2D^eqoh}370(t5=CH4;jzGIwNdl4
z1C1N)SEsE>@?NC06@NJEVPyBzntJI|uEeuaTF9}2=YeIm5NUjulOTw^KbSb6gNg>8
zI1|vPi4MDL3|MmUprMn5^vlD)zH`ErzYS}b>e*5tiDWS^k2WMng^V0#@8}O|J^2y_
z7k167@s33M9qv0__b~tU@sBGFw6P6)X6WiRkS9myGojw`0>5R0&W=aGHvjh$t#u^b
zPXGb{D?9+e&(oX8gv;ZDTD2hQOB-U()(SCDS47r_8trJ6;EV@sgrR$Y(dHi<(%N`$
zh%0k7GVkma%K_Vw+S6}=3ArPY{;nh?-d0+!?`TQywtAQ&;-F5da!|3ECCJ}irZb~{
ze*y_sgVicA+c>}y{J{9T*j34iN$v4(_SMc$%HUvZ_E(V|P<XpGXIJ!rk06WWPL^1v
zM%%F5Hc~~+n1!s{>Q|6fF!C=u!)LRs&I$3ZC_woSD{i@6_nRe6t0~%kvPg=LHC|#k
zn0xA))8AO>yl!=2LhNs|ppdx?nF;vl%#=@_&9vCFzaNUm#jg}<$YdXBkDG8fwC=0A
z^&>SDIfUUi002PQ&CgHmON5IK@9i^lqSPPVn=6Li+iPBm8SJ3|0t4OMb58&J1BkW=
zecA6f4$EJ01G`QYb`y@;#s7{mlz0{@Nn{`(doFqr5<pkt0^*R&ciI2f3I3mEm%)hY
yNZB7Y6uE!j3;W5Yix`ZQ+4D+3O7QTC5@kijhz#Wa0wE=UOyUAkQ6O3DyXqgJY>WB;
delta 2506
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
KSB&tFsQ&=bCx4It
--
GitLab