- CHG: Version bump for release.

germinateplatform · Jan 29, 2025 · 62bae34 · 62bae34
1 parent fdc27d3
commit 62bae34
Showing 7 changed files with 17 additions and 15 deletions.
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/build.gradle b/build.gradle
@@ -3,7 +3,7 @@ plugins {
 }
 
 group 'uk.ac.hutton.germinate-importer'
-version '4.7.4'
+version '4.8.0'
 
 compileJava.options.encoding = 'UTF-8'
 sourceCompatibility = 21

diff --git a/lib/germinate-codegen-4.7.4.jar → lib/germinate-codegen-4.8.0.jar b/lib/germinate-codegen-4.7.4.jar → lib/germinate-codegen-4.8.0.jar
diff --git a/lib/germinate-core-4.7.4.jar b/lib/germinate-core-4.7.4.jar
diff --git a/lib/germinate-core-4.8.0.jar b/lib/germinate-core-4.8.0.jar
diff --git a/src/main/java/jhi/germinate/server/util/importer/ClimateDataImporter.java b/src/main/java/jhi/germinate/server/util/importer/ClimateDataImporter.java
@@ -286,13 +286,13 @@ private void checkData(Sheet s)
 
 			if (headers != null)
 			{
-				List<String> climates = headers.stream()
+				List<String> climateHeaders = headers.stream()
 											   .skip(2)
 											   .map(this::getCellValue)
 											   .filter(c -> !StringUtils.isEmpty(c))
 											   .toList();
 				// Get the data type for each column
-				List<ClimatesDatatype> dataTypes = climates.stream()
+				List<ClimatesDatatype> dataTypes = climateHeaders.stream()
 														  .map(c -> climateDefinitions.get(c).getDatatype())
 														  .toList();
 
@@ -316,13 +316,13 @@ private void checkData(Sheet s)
 								 }
 								 catch (NumberFormatException e)
 								 {
-									 addImportResult(ImportStatus.GENERIC_INVALID_NUMBER, r.getRowNum(), "Value of a numeric climate " + climates.get(i - 2) +" isn't a number: " + cellValue);
+									 addImportResult(ImportStatus.GENERIC_INVALID_NUMBER, r.getRowNum(), "Value of a numeric climate " + climateHeaders.get(i - 2) +" isn't a number: " + cellValue);
 								 }
 								 break;
 							 case date:
 								 Date date = getCellValueDate(r, i);
 								 if (date == null)
-									 addImportResult(ImportStatus.GENERIC_INVALID_DATE, r.getRowNum(), "Value of a date climate isn't a date: " + cellValue);
+									 addImportResult(ImportStatus.GENERIC_INVALID_DATE, r.getRowNum(), "Value of a date climate " + climateHeaders.get(i - 2) +" isn't a date: " + cellValue);
 								 break;
 
 							 case categorical:

diff --git a/src/main/java/jhi/germinate/server/util/importer/TraitDataImporter.java b/src/main/java/jhi/germinate/server/util/importer/TraitDataImporter.java
@@ -661,9 +661,9 @@ private void checkData(Sheet s)
 																	  .filter(t -> !StringUtils.isEmpty(t.getName()))
 																	  .filter(t -> t.getRestrictions() != null)
 																	  .map(Phenotypes::getName)
-																	  .collect(Collectors.toList());
+																	  .toList();
 
-				if (traitsWithRestrictions.size() > 0)
+				if (!traitsWithRestrictions.isEmpty())
 				{
 					// Store trait name to column index mapping
 					Map<String, Integer> traitIndex = new HashMap<>();