From eafb50ddc4ee10b7217b24d4576814d50540fcbf Mon Sep 17 00:00:00 2001
From: vkovtun <vkovtun@ethz.ch>
Date: Thu, 6 Jun 2024 13:31:37 +0200
Subject: [PATCH] BIS-1335: Trying to fix remaining failing tests on the CI
server.
---
.../server/asapi/v3/executor/exporter/ExportExecutor.java | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/exporter/ExportExecutor.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/exporter/ExportExecutor.java
index d53eb823034..bd99a8e1c44 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/exporter/ExportExecutor.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/exporter/ExportExecutor.java
@@ -1479,16 +1479,15 @@ public class ExportExecutor implements IExportExecutor
propertyAssignments.sort(Comparator.comparingInt(PropertyAssignment::getOrdinal));
final Map<String, Serializable> properties = includeSampleProperties((IPropertiesHolder) entityObj);
+ boolean firstAssignment = true;
String currentSection = null;
for (final PropertyAssignment propertyAssignment : propertyAssignments)
{
- if (!Objects.equals(propertyAssignment.getSection(), currentSection) || propertyAssignment.getOrdinal() == 1)
+ if (!Objects.equals(propertyAssignment.getSection(), currentSection) || firstAssignment)
{
currentSection = propertyAssignment.getSection();
documentBuilder.addHeader(currentSection != null ? currentSection : "", 3);
- } else
- {
- System.out.printf("Skipping property assignment: %s. Current section: %s.%n", propertyAssignment, currentSection);
+ firstAssignment = false;
}
final PropertyType propertyType = propertyAssignment.getPropertyType();
--
GitLab