From a193fc368800ab2dfd81ca24c31610200d21f73a Mon Sep 17 00:00:00 2001 From: Mahmoud Ben Hassine Date: Mon, 12 Jun 2023 15:55:32 +0200 Subject: [PATCH] Replace String concatenation with text blocks where appropriate --- .../JdbcBatchItemWriterBuilderTests.java | 16 +++++++------ .../JdbcCursorItemReaderBuilderTests.java | 18 +++++++++------ .../JdbcPagingItemReaderBuilderTests.java | 23 +++++++++++-------- 3 files changed, 34 insertions(+), 23 deletions(-) diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/builder/JdbcBatchItemWriterBuilderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/builder/JdbcBatchItemWriterBuilderTests.java index bfe65ff78..cdc7c5fc7 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/builder/JdbcBatchItemWriterBuilderTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/builder/JdbcBatchItemWriterBuilderTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2016-2022 the original author or authors. + * Copyright 2016-2023 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. @@ -234,9 +234,8 @@ class JdbcBatchItemWriterBuilderTests { private void verifyRow(int i, String i1, String nine) { JdbcOperations template = new JdbcTemplate(this.dataSource); - assertEquals(1, - (int) template.queryForObject("select count(*) from foo where first = ? and second = ? and third = ?", - Integer.class, i, i1, nine)); + String sql = "select count(*) from foo where first = ? and second = ? and third = ?"; + assertEquals(1, (int) template.queryForObject(sql, Integer.class, i, i1, nine)); } public static class Foo { @@ -282,9 +281,12 @@ class JdbcBatchItemWriterBuilderTests { @Configuration public static class TestDataSourceConfiguration { - private static final String CREATE_SQL = "CREATE TABLE FOO (\n" - + "\tID BIGINT IDENTITY NOT NULL PRIMARY KEY ,\n" + "\tFIRST BIGINT ,\n" - + "\tSECOND VARCHAR(5) NOT NULL,\n" + "\tTHIRD VARCHAR(5) NOT NULL) ;"; + private static final String CREATE_SQL = """ + CREATE TABLE FOO ( + ID BIGINT IDENTITY NOT NULL PRIMARY KEY , + FIRST BIGINT , + SECOND VARCHAR(5) NOT NULL, + THIRD VARCHAR(5) NOT NULL) ;"""; @Bean public DataSource dataSource() { diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/builder/JdbcCursorItemReaderBuilderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/builder/JdbcCursorItemReaderBuilderTests.java index 09d8a0002..b742b848f 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/builder/JdbcCursorItemReaderBuilderTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/builder/JdbcCursorItemReaderBuilderTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2016-2022 the original author or authors. + * Copyright 2016-2023 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. @@ -378,13 +378,17 @@ class JdbcCursorItemReaderBuilderTests { @Configuration public static class TestDataSourceConfiguration { - private static final String CREATE_SQL = "CREATE TABLE FOO (\n" - + "\tID BIGINT IDENTITY NOT NULL PRIMARY KEY ,\n" + "\tFIRST BIGINT ,\n" - + "\tSECOND VARCHAR(5) NOT NULL,\n" + "\tTHIRD VARCHAR(5) NOT NULL) ;"; + private static final String CREATE_SQL = """ + CREATE TABLE FOO ( + ID BIGINT IDENTITY NOT NULL PRIMARY KEY , + FIRST BIGINT , + SECOND VARCHAR(5) NOT NULL, + THIRD VARCHAR(5) NOT NULL);"""; - private static final String INSERT_SQL = "INSERT INTO FOO (FIRST, SECOND, THIRD) VALUES (1, '2', '3');" - + "INSERT INTO FOO (FIRST, SECOND, THIRD) VALUES (4, '5', '6');" - + "INSERT INTO FOO (FIRST, SECOND, THIRD) VALUES (7, '8', '9');"; + private static final String INSERT_SQL = """ + INSERT INTO FOO (FIRST, SECOND, THIRD) VALUES (1, '2', '3'); + INSERT INTO FOO (FIRST, SECOND, THIRD) VALUES (4, '5', '6'); + INSERT INTO FOO (FIRST, SECOND, THIRD) VALUES (7, '8', '9');"""; @Bean public DataSource dataSource() { diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/builder/JdbcPagingItemReaderBuilderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/builder/JdbcPagingItemReaderBuilderTests.java index 78208d68e..47999e920 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/builder/JdbcPagingItemReaderBuilderTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/builder/JdbcPagingItemReaderBuilderTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2017-2022 the original author or authors. + * Copyright 2017-2023 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. @@ -46,6 +46,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows; /** * @author Michael Minella * @author Drummond Dawson + * @author Mahmoud Ben Hassine */ class JdbcPagingItemReaderBuilderTests { @@ -356,15 +357,19 @@ class JdbcPagingItemReaderBuilderTests { @Configuration public static class TestDataSourceConfiguration { - private static final String CREATE_SQL = "CREATE TABLE FOO (\n" - + "\tID BIGINT IDENTITY NOT NULL PRIMARY KEY ,\n" + "\tFIRST BIGINT ,\n" - + "\tSECOND VARCHAR(5) NOT NULL,\n" + "\tTHIRD VARCHAR(5) NOT NULL) ;"; + private static final String CREATE_SQL = """ + CREATE TABLE FOO ( + ID BIGINT IDENTITY NOT NULL PRIMARY KEY , + FIRST BIGINT , + SECOND VARCHAR(5) NOT NULL, + THIRD VARCHAR(5) NOT NULL) ;"""; - private static final String INSERT_SQL = "INSERT INTO FOO (FIRST, SECOND, THIRD) VALUES (1, '2', '3');" - + "INSERT INTO FOO (FIRST, SECOND, THIRD) VALUES (4, '5', '6');" - + "INSERT INTO FOO (FIRST, SECOND, THIRD) VALUES (7, '8', '9');" - + "INSERT INTO FOO (FIRST, SECOND, THIRD) VALUES (10, '11', '12');" - + "INSERT INTO FOO (FIRST, SECOND, THIRD) VALUES (13, '14', '15');"; + private static final String INSERT_SQL = """ + INSERT INTO FOO (FIRST, SECOND, THIRD) VALUES (1, '2', '3'); + INSERT INTO FOO (FIRST, SECOND, THIRD) VALUES (4, '5', '6'); + INSERT INTO FOO (FIRST, SECOND, THIRD) VALUES (7, '8', '9'); + INSERT INTO FOO (FIRST, SECOND, THIRD) VALUES (10, '11', '12'); + INSERT INTO FOO (FIRST, SECOND, THIRD) VALUES (13, '14', '15');"""; @Bean public DataSource dataSource() {