adding singleColumnImport boolean parameter per reviewer suggestion.

Marin · Marin · commit 389e63c64cb8 · 2025-02-20T19:30:49.000+02:00
diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/campaign/importer/CampaignFormDataImportLayout.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/campaign/importer/CampaignFormDataImportLayout.java
@@ -41,7 +41,8 @@ public CampaignFormDataImportLayout(CampaignFormMetaReferenceDto campaignForm, C
 					campaignForm.getUuid(),
 					campaignReferenceDto,
 					(ValueSeparator) separator.getValue());
-				importer.startImport(this::extendDownloadErrorReportButton, currentUI, false);
+				importer.startImport(this::extendDownloadErrorReportButton, currentUI, false, false
+				);
 			} catch (IOException | CsvValidationException e) {
 				new Notification(
 					I18nProperties.getString(Strings.headingImportFailed),
diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/campaign/importer/CampaignFormDataImporter.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/campaign/importer/CampaignFormDataImporter.java
@@ -79,11 +79,11 @@ public CampaignFormDataImporter(
 	}
 
 	@Override
-	public void startImport(Consumer<StreamResource> addErrorReportToLayoutCallback, UI currentUI, boolean duplicatesPossible)
+	public void startImport(Consumer<StreamResource> addErrorReportToLayoutCallback, UI currentUI, boolean duplicatesPossible, boolean singleColumnImport)
 		throws IOException, CsvValidationException {
 
 		this.currentUI = currentUI;
-		super.startImport(addErrorReportToLayoutCallback, currentUI, duplicatesPossible);
+		super.startImport(addErrorReportToLayoutCallback, currentUI, duplicatesPossible, singleColumnImport);
 	}
 
 	@Override
diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/caze/importer/CaseImportLayout.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/caze/importer/CaseImportLayout.java
@@ -49,7 +49,7 @@ public CaseImportLayout() {
 
 			try {
 				CaseImporter importer = new CaseImporter(file, true, currentUser, (ValueSeparator) separator.getValue());
-				importer.startImport(this::extendDownloadErrorReportButton, currentUI, true);
+				importer.startImport(this::extendDownloadErrorReportButton, currentUI, true, false);
 			} catch (IOException | CsvValidationException e) {
 				new Notification(
 					I18nProperties.getString(Strings.headingImportFailed),
diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/caze/importer/CaseImporter.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/caze/importer/CaseImporter.java
@@ -84,11 +84,11 @@ public CaseImporter(File inputFile, boolean hasEntityClassRow, UserDto currentUs
 	}
 
 	@Override
-	public void startImport(Consumer<StreamResource> addErrorReportToLayoutCallback, UI currentUI, boolean duplicatesPossible)
+	public void startImport(Consumer<StreamResource> addErrorReportToLayoutCallback, UI currentUI, boolean duplicatesPossible, boolean singleColumnImport)
 		throws IOException, CsvValidationException {
 
 		this.currentUI = currentUI;
-		super.startImport(addErrorReportToLayoutCallback, currentUI, duplicatesPossible);
+		super.startImport(addErrorReportToLayoutCallback, currentUI, duplicatesPossible, false);
 	}
 
 	@Override
diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/caze/importer/CountryImporter.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/caze/importer/CountryImporter.java
@@ -128,7 +128,7 @@ private void insertColumnEntryIntoData(CountryDto newEntityDto, String value, St
 	}
 
 	public void startImport(Consumer<StreamResource> errorReportConsumer, UI currentUI) throws IOException, CsvValidationException {
-		startImport(errorReportConsumer, currentUI, true);
+		startImport(errorReportConsumer, currentUI, true, false);
 	}
 
 	@Override
diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/caze/importer/LineListingImportLayout.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/caze/importer/LineListingImportLayout.java
@@ -39,7 +39,7 @@ public LineListingImportLayout() {
 
 			try {
 				CaseImporter importer = new CaseImporter(file, false, currentUser, (ValueSeparator) separator.getValue());
-				importer.startImport(this::extendDownloadErrorReportButton, currentUI, true);
+				importer.startImport(this::extendDownloadErrorReportButton, currentUI, true, false);
 			} catch (IOException | CsvValidationException e) {
 				new Notification(
 					I18nProperties.getString(Strings.headingImportFailed),
diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/configuration/infrastructure/ImportDefaultContinentsLayout.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/configuration/infrastructure/ImportDefaultContinentsLayout.java
@@ -51,7 +51,7 @@ protected void doImport(File importFile) throws IOException, CsvValidationExcept
 			isAllowOverwrite(),
 			(ValueSeparator) separator.getValue());
 		importer.setCsvSeparator(',');
-		importer.startImport(this::extendDownloadErrorReportButton, currentUI, false);
+		importer.startImport(this::extendDownloadErrorReportButton, currentUI, false, false);
 	}
 
 	@Override
diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/configuration/infrastructure/ImportDefaultSubcontinentsLayout.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/configuration/infrastructure/ImportDefaultSubcontinentsLayout.java
@@ -48,7 +48,7 @@ protected void doImport(File importFile) throws IOException, CsvValidationExcept
 			isAllowOverwrite(),
 			(ValueSeparator) separator.getValue());
 		importer.setCsvSeparator(',');
-		importer.startImport(this::extendDownloadErrorReportButton, currentUI, false);
+		importer.startImport(this::extendDownloadErrorReportButton, currentUI, false, false);
 	}
 
 	@Override
diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/configuration/infrastructure/ImportSurveyTokensLayout.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/configuration/infrastructure/ImportSurveyTokensLayout.java
@@ -53,7 +53,7 @@ public ImportSurveyTokensLayout(SurveyDto survey) {
 						currentUser,
 						survey,
 						(ValueSeparator) separator.getValue());
-				importer.startImport(this::extendDownloadErrorReportButton, currentUI, false);
+				importer.startImport(this::extendDownloadErrorReportButton, currentUI, false, true);
 			} catch (IOException | CsvValidationException e) {
 				new Notification(
 						I18nProperties.getString(Strings.headingImportFailed),
diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/configuration/infrastructure/InfrastructureImportLayout.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/configuration/infrastructure/InfrastructureImportLayout.java
@@ -108,7 +108,7 @@ public InfrastructureImportLayout(InfrastructureType infrastructureType) {
 				try {
 					DataImporter importer =
 						new PopulationDataImporter(file, currentUser, dfCollectionDate.getValue(), (ValueSeparator) separator.getValue());
-					importer.startImport(this::extendDownloadErrorReportButton, currentUI, true);
+					importer.startImport(this::extendDownloadErrorReportButton, currentUI, true, false);
 				} catch (IOException | CsvValidationException e) {
 					new Notification(
 						I18nProperties.getString(Strings.headingImportFailed),
@@ -197,7 +197,7 @@ public InfrastructureImportLayout(InfrastructureType infrastructureType) {
 							"Import is currently not implemented for infrastructure type " + infrastructureType.name());
 					}
 
-					importer.startImport(this::extendDownloadErrorReportButton, currentUI, true);
+					importer.startImport(this::extendDownloadErrorReportButton, currentUI, true, false);
 				} catch (IOException | CsvValidationException e) {
 					new Notification(
 						I18nProperties.getString(Strings.headingImportFailed),
diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/contact/importer/CaseContactsImportLayout.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/contact/importer/CaseContactsImportLayout.java
@@ -38,7 +38,7 @@ public CaseContactsImportLayout(CaseDataDto caze) {
 			resetDownloadErrorReportButton();
 			try {
 				ContactImporter importer = new ContactImporter(file, currentUser, caze, (ValueSeparator) separator.getValue());
-				importer.startImport(this::extendDownloadErrorReportButton, currentUI, false);
+				importer.startImport(this::extendDownloadErrorReportButton, currentUI, false, false);
 			} catch (IOException | CsvValidationException e) {
 				new Notification(
 					I18nProperties.getString(Strings.headingImportFailed),
diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/contact/importer/ContactImporter.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/contact/importer/ContactImporter.java
@@ -95,11 +95,11 @@ public ContactImporter(File inputFile, UserDto currentUser, CaseDataDto caze, Va
 	}
 
 	@Override
-	public void startImport(Consumer<StreamResource> addErrorReportToLayoutCallback, UI currentUI, boolean duplicatesPossible)
+	public void startImport(Consumer<StreamResource> addErrorReportToLayoutCallback, UI currentUI, boolean duplicatesPossible, boolean singleColumnImport)
 		throws IOException, CsvValidationException {
 
 		this.currentUI = currentUI;
-		super.startImport(addErrorReportToLayoutCallback, currentUI, duplicatesPossible);
+		super.startImport(addErrorReportToLayoutCallback, currentUI, duplicatesPossible, singleColumnImport);
 	}
 
 	@Override
diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/contact/importer/ContactsImportLayout.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/contact/importer/ContactsImportLayout.java
@@ -35,7 +35,7 @@ public ContactsImportLayout() {
 
 			try {
 				ContactImporter importer = new ContactImporter(file, currentUser, null, (ValueSeparator) separator.getValue());
-				importer.startImport(this::extendDownloadErrorReportButton, currentUI, false);
+				importer.startImport(this::extendDownloadErrorReportButton, currentUI, false, false);
 			} catch (IOException | CsvValidationException e) {
 				new Notification(
 					I18nProperties.getString(Strings.headingImportFailed),
diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/environment/importer/EnvironmentImportLayout.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/environment/importer/EnvironmentImportLayout.java
@@ -50,7 +50,7 @@ public EnvironmentImportLayout() {
 
 			try {
 				EnvironmentImporter importer = new EnvironmentImporter(file, true, currentUser, (ValueSeparator) separator.getValue());
-				importer.startImport(EnvironmentImportLayout.this::extendDownloadErrorReportButton, currentUI, true);
+				importer.startImport(EnvironmentImportLayout.this::extendDownloadErrorReportButton, currentUI, true, false);
 			} catch (IOException | CsvValidationException e) {
 				new Notification(
 					I18nProperties.getString(Strings.headingImportFailed),
diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/events/eventparticipantimporter/EventParticipantImportLayout.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/events/eventparticipantimporter/EventParticipantImportLayout.java
@@ -56,7 +56,7 @@ public EventParticipantImportLayout(EventReferenceDto event) {
 				EventDto eventDto = FacadeProvider.getEventFacade().getEventByUuid(event.getUuid(), false);
 				EventParticipantImporter importer =
 					new EventParticipantImporter(file, currentUser, eventDto, (ValueSeparator) separator.getValue());
-				importer.startImport(this::extendDownloadErrorReportButton, currentUI, true);
+				importer.startImport(this::extendDownloadErrorReportButton, currentUI, true, false);
 			} catch (IOException | CsvValidationException e) {
 				new Notification(
 					I18nProperties.getString(Strings.headingImportFailed),
diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/events/eventparticipantimporter/EventParticipantImporter.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/events/eventparticipantimporter/EventParticipantImporter.java
@@ -95,11 +95,11 @@ public EventParticipantImporter(File inputFile, UserDto currentUser, EventDto ev
 	}
 
 	@Override
-	public void startImport(Consumer<StreamResource> addErrorReportToLayoutCallback, UI currentUI, boolean duplicatesPossible)
+	public void startImport(Consumer<StreamResource> addErrorReportToLayoutCallback, UI currentUI, boolean duplicatesPossible, boolean singleColumnImport)
 		throws IOException, CsvValidationException {
 
 		this.currentUI = currentUI;
-		super.startImport(addErrorReportToLayoutCallback, currentUI, duplicatesPossible);
+		super.startImport(addErrorReportToLayoutCallback, currentUI, duplicatesPossible, singleColumnImport);
 	}
 
 	@Override
diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/events/importer/EventImportLayout.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/events/importer/EventImportLayout.java
@@ -49,7 +49,7 @@ public EventImportLayout() {
 
 			try {
 				EventImporter importer = new EventImporter(file, true, currentUser, (ValueSeparator) separator.getValue());
-				importer.startImport(EventImportLayout.this::extendDownloadErrorReportButton, currentUI, true);
+				importer.startImport(EventImportLayout.this::extendDownloadErrorReportButton, currentUI, true, false);
 			} catch (IOException | CsvValidationException e) {
 				new Notification(
 					I18nProperties.getString(Strings.headingImportFailed),
diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/events/importer/EventImporter.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/events/importer/EventImporter.java
@@ -71,11 +71,11 @@ public EventImporter(File inputFile, boolean hasEntityClassRow, UserDto currentU
 	}
 
 	@Override
-	public void startImport(Consumer<StreamResource> addErrorReportToLayoutCallback, UI currentUI, boolean duplicatesPossible)
+	public void startImport(Consumer<StreamResource> addErrorReportToLayoutCallback, UI currentUI, boolean duplicatesPossible, boolean singleColumnImport)
 		throws IOException, CsvValidationException {
 
 		this.currentUI = currentUI;
-		super.startImport(addErrorReportToLayoutCallback, currentUI, duplicatesPossible);
+		super.startImport(addErrorReportToLayoutCallback, currentUI, duplicatesPossible, singleColumnImport);
 	}
 
 	@Override
diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/importer/DataImporter.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/importer/DataImporter.java
@@ -157,7 +157,8 @@ public DataImporter(File inputFile, boolean hasEntityClassRow, UserDto currentUs
 	/**
 	 * Opens a progress layout and runs the import logic in a separate thread.
 	 */
-	public void startImport(Consumer<StreamResource> errorReportConsumer, UI currentUI, boolean duplicatesPossible)
+	public void startImport(Consumer<StreamResource> errorReportConsumer, UI currentUI, boolean duplicatesPossible,
+							boolean singleColumnImport)
 		throws IOException, CsvValidationException {
 
 		ImportProgressLayout progressLayout = this.getImportProgressLayout(currentUI, duplicatesPossible);
@@ -177,7 +178,7 @@ public void startImport(Consumer<StreamResource> errorReportConsumer, UI current
 				I18nProperties.setUserLanguage(currentUser.getLanguage());
 				FacadeProvider.getI18nFacade().setUserLanguage(currentUser.getLanguage());
 
-				ImportResult importResult = runImport();
+				ImportResult importResult = runImport(singleColumnImport);
 				ImportResultStatus importStatus = importResult.getStatus();
 				boolean hasSkips = importResult.isHasSkips();
 
@@ -251,7 +252,7 @@ protected ImportProgressLayout getImportProgressLayout(UI currentUI, boolean sho
 	/**
 	 * To be called by async import thread or unit test
 	 */
-	public ImportResult runImport() throws IOException, InvalidColumnException, InterruptedException, CsvValidationException {
+	public ImportResult runImport(boolean singleColumnImport) throws IOException, InvalidColumnException, InterruptedException, CsvValidationException {
 		logger.debug("runImport - {}", inputFile.getAbsolutePath());
 
 		long t0 = System.currentTimeMillis();
@@ -285,7 +286,7 @@ public ImportResult runImport() throws IOException, InvalidColumnException, Inte
 			errorReportCsvWriter.writeNext(columnNames);
 
 			// validate headers
-			if (!columnNames[1].toLowerCase().contains("token".toLowerCase())) {
+			if (!singleColumnImport) {
 				if (entityClasses != null && entityClasses.length <= 1 || entityProperties.length <= 1) {
 					writeImportError(new String[0], I18nProperties.getValidationError(Validations.importProbablyInvalidSeparator));
 					return ImportResult.withStatus(ImportResultStatus.CANCELED_WITH_ERRORS, false);
diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/selfreport/importer/SelfReportImportLayout.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/selfreport/importer/SelfReportImportLayout.java
@@ -32,7 +32,7 @@ public SelfReportImportLayout() {
 
 			try {
 				SelfReportImporter importer = new SelfReportImporter(file, true, currentUser, (ValueSeparator) separator.getValue());
-				importer.startImport(SelfReportImportLayout.this::extendDownloadErrorReportButton, currentUI, true);
+				importer.startImport(SelfReportImportLayout.this::extendDownloadErrorReportButton, currentUI, true, false);
 			} catch (IOException | CsvValidationException e) {
 				new Notification(
 					I18nProperties.getString(Strings.headingImportFailed),
diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/travelentry/importer/TravelEntryImportLayout.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/travelentry/importer/TravelEntryImportLayout.java
@@ -44,7 +44,7 @@ public TravelEntryImportLayout() {
 			resetDownloadErrorReportButton();
 			try {
 				TravelEntryImporter importer = new TravelEntryImporter(file, false, currentUser, (ValueSeparator) separator.getValue());
-				importer.startImport(this::extendDownloadErrorReportButton, currentUI, true);
+				importer.startImport(this::extendDownloadErrorReportButton, currentUI, true, false);
 			} catch (IOException | CsvValidationException e) {
 				new Notification(
 					I18nProperties.getString(Strings.headingImportFailed),
diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/travelentry/importer/TravelEntryImporter.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/travelentry/importer/TravelEntryImporter.java
@@ -50,11 +50,11 @@ public TravelEntryImporter(File inputFile, boolean hasEntityClassRow, UserDto cu
 	}
 
 	@Override
-	public void startImport(Consumer<StreamResource> errorReportConsumer, UI currentUI, boolean duplicatesPossible)
+	public void startImport(Consumer<StreamResource> errorReportConsumer, UI currentUI, boolean duplicatesPossible, boolean singleColumnImport)
 		throws IOException, CsvValidationException {
 
 		this.currentUI = currentUI;
-		super.startImport(errorReportConsumer, currentUI, duplicatesPossible);
+		super.startImport(errorReportConsumer, currentUI, duplicatesPossible, singleColumnImport);
 	}
 
 	@Override
diff --git a/sormas-ui/src/test/java/de/symeda/sormas/ui/caze/importer/CaseImporterTest.java b/sormas-ui/src/test/java/de/symeda/sormas/ui/caze/importer/CaseImporterTest.java
diff --git a/sormas-ui/src/test/java/de/symeda/sormas/ui/contact/importer/ContactImporterTest.java b/sormas-ui/src/test/java/de/symeda/sormas/ui/contact/importer/ContactImporterTest.java
diff --git a/sormas-ui/src/test/java/de/symeda/sormas/ui/dashboard/campaigns/CampaignFormDataImporterTest.java b/sormas-ui/src/test/java/de/symeda/sormas/ui/dashboard/campaigns/CampaignFormDataImporterTest.java
diff --git a/sormas-ui/src/test/java/de/symeda/sormas/ui/environment/EnvironmentImporterTest.java b/sormas-ui/src/test/java/de/symeda/sormas/ui/environment/EnvironmentImporterTest.java
diff --git a/sormas-ui/src/test/java/de/symeda/sormas/ui/event/eventparticipantimporter/EventParticipantImporterTest.java b/sormas-ui/src/test/java/de/symeda/sormas/ui/event/eventparticipantimporter/EventParticipantImporterTest.java
diff --git a/sormas-ui/src/test/java/de/symeda/sormas/ui/event/importer/EventImporterTest.java b/sormas-ui/src/test/java/de/symeda/sormas/ui/event/importer/EventImporterTest.java
diff --git a/sormas-ui/src/test/java/de/symeda/sormas/ui/importer/CountryImporterTest.java b/sormas-ui/src/test/java/de/symeda/sormas/ui/importer/CountryImporterTest.java
diff --git a/sormas-ui/src/test/java/de/symeda/sormas/ui/importer/InfrastructureImporterTest.java b/sormas-ui/src/test/java/de/symeda/sormas/ui/importer/InfrastructureImporterTest.java
diff --git a/sormas-ui/src/test/java/de/symeda/sormas/ui/importexport/ImportExportTest.java b/sormas-ui/src/test/java/de/symeda/sormas/ui/importexport/ImportExportTest.java
diff --git a/sormas-ui/src/test/java/de/symeda/sormas/ui/selfreport/SelfReportImporterTest.java b/sormas-ui/src/test/java/de/symeda/sormas/ui/selfreport/SelfReportImporterTest.java
diff --git a/sormas-ui/src/test/java/de/symeda/sormas/ui/travelentry/importer/TravelEntryImporterTest.java b/sormas-ui/src/test/java/de/symeda/sormas/ui/travelentry/importer/TravelEntryImporterTest.java

Original file line number	Diff line number	Diff line change
`@@ -79,11 +79,11 @@ public CampaignFormDataImporter(`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`@Override`
`82`		`- public void startImport(Consumer<StreamResource> addErrorReportToLayoutCallback, UI currentUI, boolean duplicatesPossible)`
	`82`	`+ public void startImport(Consumer<StreamResource> addErrorReportToLayoutCallback, UI currentUI, boolean duplicatesPossible, boolean singleColumnImport)`
`83`	`83`	`throws IOException, CsvValidationException {`
`84`	`84`
`85`	`85`	`this.currentUI = currentUI;`
`86`		`- super.startImport(addErrorReportToLayoutCallback, currentUI, duplicatesPossible);`
	`86`	`+ super.startImport(addErrorReportToLayoutCallback, currentUI, duplicatesPossible, singleColumnImport);`
`87`	`87`	`}`
`88`	`88`
`89`	`89`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -84,11 +84,11 @@ public CaseImporter(File inputFile, boolean hasEntityClassRow, UserDto currentUs`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`@Override`
`87`		`- public void startImport(Consumer<StreamResource> addErrorReportToLayoutCallback, UI currentUI, boolean duplicatesPossible)`
	`87`	`+ public void startImport(Consumer<StreamResource> addErrorReportToLayoutCallback, UI currentUI, boolean duplicatesPossible, boolean singleColumnImport)`
`88`	`88`	`throws IOException, CsvValidationException {`
`89`	`89`
`90`	`90`	`this.currentUI = currentUI;`
`91`		`- super.startImport(addErrorReportToLayoutCallback, currentUI, duplicatesPossible);`
	`91`	`+ super.startImport(addErrorReportToLayoutCallback, currentUI, duplicatesPossible, false);`
`92`	`92`	`}`
`93`	`93`
`94`	`94`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -128,7 +128,7 @@ private void insertColumnEntryIntoData(CountryDto newEntityDto, String value, St`
`128`	`128`	`}`
`129`	`129`
`130`	`130`	`public void startImport(Consumer<StreamResource> errorReportConsumer, UI currentUI) throws IOException, CsvValidationException {`
`131`		`- startImport(errorReportConsumer, currentUI, true);`
	`131`	`+ startImport(errorReportConsumer, currentUI, true, false);`
`132`	`132`	`}`
`133`	`133`
`134`	`134`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ protected void doImport(File importFile) throws IOException, CsvValidationExcept`
`51`	`51`	`isAllowOverwrite(),`
`52`	`52`	`(ValueSeparator) separator.getValue());`
`53`	`53`	`importer.setCsvSeparator(',');`
`54`		`- importer.startImport(this::extendDownloadErrorReportButton, currentUI, false);`
	`54`	`+ importer.startImport(this::extendDownloadErrorReportButton, currentUI, false, false);`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ protected void doImport(File importFile) throws IOException, CsvValidationExcept`
`48`	`48`	`isAllowOverwrite(),`
`49`	`49`	`(ValueSeparator) separator.getValue());`
`50`	`50`	`importer.setCsvSeparator(',');`
`51`		`- importer.startImport(this::extendDownloadErrorReportButton, currentUI, false);`
	`51`	`+ importer.startImport(this::extendDownloadErrorReportButton, currentUI, false, false);`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`@Override`