Polish contribution

- Adhere to rules from Checkstyle
- Simplify implementation
- Fix bug in other test-case (apparent after simplifying the implementation)

Signed-off-by: Marten Deinum <[email protected]>

Author: Marten Deinum

spring-batch-excel/src/main/java/org/springframework/batch/extensions/excel/support/rowset/DefaultRowSet.java

@@ -77,12 +77,9 @@ public Properties getProperties() {
 		}
 
 		Properties props = new Properties();
-		for (int i = 0; i < this.currentRow.length; i++) {
+		for (int i = 0; i < names.length; i++) {
 			String value = this.currentRow[i];
 			if (value != null) {
-				if (i > names.length - 1) {
-					break;
-				}
 				props.setProperty(names[i], value);
 			}
 		}

spring-batch-excel/src/test/java/org/springframework/batch/extensions/excel/streaming/StreamingXlsxMappingTests.java

@@ -34,7 +34,7 @@ class StreamingXlsxMappingTests {
 
 	@Test
 	void readAndMapRowsUsingRowMapper() throws Exception {
-		var columns = new String[] {"id", "position", "lastName", "firstName", "birthYear", "debutYear", "comment"};
+		var columns = new String[] {"id", "position", "lastName", "firstName", "birthYear", "debutYear"};
 		var rowSetFactory = new DefaultRowSetFactory();
 		rowSetFactory.setColumnNameExtractor(new StaticColumnNameExtractor(columns));
 

spring-batch-excel/src/test/java/org/springframework/batch/extensions/excel/support/rowset/DefaultRowSetTest.java renamed to spring-batch-excel/src/test/java/org/springframework/batch/extensions/excel/support/rowset/DefaultRowSetTests.java

@@ -1,28 +1,37 @@
+/*
+ * Copyright 2025-2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package org.springframework.batch.extensions.excel.support.rowset;
 
+import java.util.Arrays;
+
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.Mockito;
-import org.springframework.batch.extensions.excel.MockSheet;
-import org.springframework.batch.extensions.excel.Sheet;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Properties;
+import org.springframework.batch.extensions.excel.MockSheet;
 
-import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
-import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.BDDMockito.given;
+import static org.assertj.core.api.Assertions.assertThat;
 
-class DefaultRowSetTest {
+class DefaultRowSetTests {
 
 	private DefaultRowSet rowSet;
 
 	@BeforeEach
 	void setUp() {
-		rowSet = new DefaultRowSet(new MockSheet(
+		this.rowSet = new DefaultRowSet(new MockSheet(
 				"Sheet1",
 				Arrays.asList("col1a,col1b,col1c".split(","), "col2a,col2b,col2c".split(","), "col3a,col3b,col3c".split(","))
 		), new RowSetMetaData() {
@@ -40,8 +49,8 @@ public String getSheetName() {
 
 	@Test
 	void shouldReturnPropsSizeEqualsToMetadataColumns() {
-		rowSet.next();
-		var properties = rowSet.getProperties();
+		this.rowSet.next();
+		var properties = this.rowSet.getProperties();
 
 		assertThat(properties.size()).isEqualTo(2);
 		assertThat(properties.getProperty("cola")).isEqualTo("col1a");