Remove IntelliJ warnings in tests

DavideD · DavideD · commit 6b541a1813c5 · 2022-06-14T11:01:56.000+01:00
diff --git a/hibernate-reactive-core/src/test/java/org/hibernate/reactive/BaseReactiveTest.java b/hibernate-reactive-core/src/test/java/org/hibernate/reactive/BaseReactiveTest.java
@@ -174,7 +174,7 @@ private <T> CriteriaQuery<T> queryForDelete(Class<T> entityClass) {
 
 	@Before
 	public void before(TestContext context) {
-		test( context, setupSessionFactory( () -> constructConfiguration() ) );
+		test( context, setupSessionFactory( this::constructConfiguration ) );
 	}
 
 	/**
diff --git a/hibernate-reactive-core/src/test/java/org/hibernate/reactive/CurrentUser.java b/hibernate-reactive-core/src/test/java/org/hibernate/reactive/CurrentUser.java
@@ -47,7 +47,7 @@ public static class LoggedUserGeneratorWithStage extends StageValueGenerator<Str
 
 		@Override
 		public CompletionStage<String> generateValue(Stage.Session session, Object owner) {
-			Objects.nonNull( session );
+			Objects.requireNonNull( session );
 			String value = CurrentUser.INSTANCE.get();
 			return completedFuture( value );
 		}
@@ -57,7 +57,7 @@ public static class LoggedUserGeneratorWithMutiny extends MutinyValueGenerator<S
 
 		@Override
 		public Uni<String> generateValue(Mutiny.Session session, Object owner) {
-			Objects.nonNull( session );
+			Objects.requireNonNull( session );
 			String value = CurrentUser.INSTANCE.get();
 			return Uni.createFrom().item( value );
 		}
diff --git a/hibernate-reactive-core/src/test/java/org/hibernate/reactive/EagerElementCollectionForBasicTypeListTest.java b/hibernate-reactive-core/src/test/java/org/hibernate/reactive/EagerElementCollectionForBasicTypeListTest.java
@@ -314,7 +314,7 @@ public void setNewElementCollectionWithStageAPI(TestContext context) {
 						.thenAccept( foundPerson -> {
 							context.assertNotNull( foundPerson );
 							context.assertFalse( foundPerson.getPhones().isEmpty() );
-							foundPerson.setPhones( Arrays.asList( "555" ) );
+							foundPerson.setPhones( List.of( "555" ) );
 						} )
 				)
 				.thenCompose( v -> openSession() )
@@ -331,7 +331,7 @@ public void setNewElementCollectionWithMutinyAPI(TestContext context) {
 						.invoke( foundPerson -> {
 							context.assertNotNull( foundPerson );
 							context.assertFalse( foundPerson.getPhones().isEmpty() );
-							foundPerson.setPhones( Arrays.asList( "555" ) );
+							foundPerson.setPhones( List.of( "555" ) );
 						} )
 				)
 				.chain( this::openMutinySession )
diff --git a/hibernate-reactive-core/src/test/java/org/hibernate/reactive/EagerElementCollectionForBasicTypeSetTest.java b/hibernate-reactive-core/src/test/java/org/hibernate/reactive/EagerElementCollectionForBasicTypeSetTest.java
@@ -214,7 +214,7 @@ public void setNewElementCollectionWithStageAPI(TestContext context){
 						.thenAccept( foundPerson -> {
 							context.assertNotNull( foundPerson );
 							context.assertFalse( foundPerson.getPhones().isEmpty() );
-							foundPerson.setPhones( new HashSet<>( Arrays.asList( "555" ) ) );
+							foundPerson.setPhones( new HashSet<>( List.of( "555" ) ) );
 						} )
 						.thenCompose( v -> session.flush() ) )
 				.thenCompose( v -> openSession() )
@@ -231,7 +231,7 @@ public void setNewElementCollectionWithMutinyAPI(TestContext context) {
 						.invoke( foundPerson -> {
 							context.assertNotNull( foundPerson );
 							context.assertFalse( foundPerson.getPhones().isEmpty() );
-							foundPerson.setPhones( new HashSet<>( Arrays.asList( "555" ) ) );
+							foundPerson.setPhones( new HashSet<>( List.of( "555" ) ) );
 						} ) )
 				.chain( this::openMutinySession )
 				.chain( session -> session.find( Person.class, thePerson.getId() ) )
diff --git a/hibernate-reactive-core/src/test/java/org/hibernate/reactive/EagerElementCollectionForEmbeddableTypeListTest.java b/hibernate-reactive-core/src/test/java/org/hibernate/reactive/EagerElementCollectionForEmbeddableTypeListTest.java
@@ -402,7 +402,7 @@ public void setNewElementCollectionStageAPI(TestContext context) {
 				.thenCompose( session -> session
 						.find( Person.class, thePerson.getId() )
 						// replace phones with list of 1 phone
-						.thenAccept( foundPerson -> foundPerson.setPhones( Arrays.asList( new Phone( "000-000-0000" ) ) ) )
+						.thenAccept( foundPerson -> foundPerson.setPhones( List.of( new Phone( "000-000-0000" ) ) ) )
 						.thenCompose( v -> session.flush() ) )
 				.thenCompose( v -> openSession() )
 				.thenCompose( session -> session.find( Person.class, thePerson.getId() ) )
@@ -415,7 +415,7 @@ public void setNewElementCollectionMutinyAPI(TestContext context) {
 		test( context, openMutinySession()
 				.chain( session -> session.find( Person.class, thePerson.getId() )
 						// replace phones with list of 1 phone
-						.invoke( foundPerson -> foundPerson.setPhones( Arrays.asList( new Phone( "000-000-0000" ) ) ) )
+						.invoke( foundPerson -> foundPerson.setPhones( List.of( new Phone( "000-000-0000" ) ) ) )
 						.call( session::flush ) )
 				.chain( this::openMutinySession )
 				.chain( session -> session.find( Person.class, thePerson.getId() ) )
diff --git a/hibernate-reactive-core/src/test/java/org/hibernate/reactive/EagerElementCollectionForEmbeddedEmbeddableTest.java b/hibernate-reactive-core/src/test/java/org/hibernate/reactive/EagerElementCollectionForEmbeddedEmbeddableTest.java
@@ -417,7 +417,7 @@ public void setNewElementCollectionStageAPI(TestContext context) {
 				.thenCompose( session -> session.find( Person.class, thePerson.getId() )
 						// replace phones with list of 1 phone
 						.thenAccept( foundPerson -> foundPerson.getPhone()
-								.setAlternativePhones( Arrays.asList( new AlternativePhone( MOBILE, "555" ) ) ) )
+								.setAlternativePhones( List.of( new AlternativePhone( MOBILE, "555" ) ) ) )
 						.thenCompose( v -> session.flush() ) )
 				.thenCompose( v -> openSession() )
 				.thenCompose( session -> session.find( Person.class, thePerson.getId() ) )
@@ -432,7 +432,7 @@ public void setNewElementCollectionMutinyAPI(TestContext context) {
 						.find( Person.class, thePerson.getId())
 						// replace phones with list of 1 phone
 						.invoke( foundPerson -> foundPerson.getPhone()
-								.setAlternativePhones( Arrays.asList( new AlternativePhone( MOBILE, "555" ) ) ) )
+								.setAlternativePhones( List.of( new AlternativePhone( MOBILE, "555" ) ) ) )
 						.call( session::flush ) )
 				.chain( this::openMutinySession )
 				.chain( session -> session.find( Person.class, thePerson.getId() ) )
diff --git a/hibernate-reactive-core/src/test/java/org/hibernate/reactive/EagerOrderedElementCollectionForEmbeddableTypeListTest.java b/hibernate-reactive-core/src/test/java/org/hibernate/reactive/EagerOrderedElementCollectionForEmbeddableTypeListTest.java
@@ -401,7 +401,7 @@ public void setNewElementCollectionStageAPI(TestContext context) {
 				.withTransaction( (session, tx) -> session
 						.find( Person.class, thePerson.getId() )
 						// replace phones with list of 1 phone
-						.thenAccept( foundPerson -> foundPerson.setPhones( Arrays.asList( new Phone( "000-000-0000" ) ) ) ) )
+						.thenAccept( foundPerson -> foundPerson.setPhones( List.of( new Phone( "000-000-0000" ) ) ) ) )
 				.thenCompose( s -> openSession() )
 				.thenCompose( session -> session.find( Person.class, thePerson.getId() ) )
 				.thenAccept( changedPerson -> assertPhones( context, changedPerson, "000-000-0000" ) )
@@ -414,7 +414,7 @@ public void setNewElementCollectionMutinyAPI(TestContext context) {
 				.withTransaction( (session, tx) -> session
 						.find( Person.class, thePerson.getId() )
 						// replace phones with list of 1 phone
-						.invoke( foundPerson -> foundPerson.setPhones( Arrays.asList( new Phone( "000-000-0000" ) ) ) ) )
+						.invoke( foundPerson -> foundPerson.setPhones( List.of( new Phone( "000-000-0000" ) ) ) ) )
 				.chain( this::openMutinySession )
 				.chain( session -> session.find( Person.class, thePerson.getId() ) )
 				.invoke( changedPerson -> assertPhones( context, changedPerson, "000-000-0000" ) )
diff --git a/hibernate-reactive-core/src/test/java/org/hibernate/reactive/HQLUpdateQueryTest.java b/hibernate-reactive-core/src/test/java/org/hibernate/reactive/HQLUpdateQueryTest.java
@@ -87,7 +87,7 @@ public void testInsertQuery(TestContext context) {
 		insertQueryBuilder.append( "'" ).append( chestnut.getName() ).append( "', " );
 		insertQueryBuilder.append( "'" ).append( chestnut.getDescription() ).append( "', " );
 		insertQueryBuilder.append( "'" ).append( chestnut.getType() ).append( "' " );
-		insertQueryBuilder.append( " from Flour where id = " + rye.getId() );
+		insertQueryBuilder.append( " from Flour where id = " ).append( rye.getId() );
 		test(
 				context,
 				openSession()
diff --git a/hibernate-reactive-core/src/test/java/org/hibernate/reactive/MyCurrentTenantIdentifierResolver.java b/hibernate-reactive-core/src/test/java/org/hibernate/reactive/MyCurrentTenantIdentifierResolver.java
@@ -22,7 +22,7 @@ public enum Tenant {
 		TENANT_1( "dbtenant1" ),
 		TENANT_2( "dbtenant2" );
 
-		private String dbName;
+		private final String dbName;
 
 		Tenant(String dbName) {
 			this.dbName = dbName;
diff --git a/hibernate-reactive-core/src/test/java/org/hibernate/reactive/containers/DB2Database.java b/hibernate-reactive-core/src/test/java/org/hibernate/reactive/containers/DB2Database.java
@@ -73,7 +73,7 @@ class DB2Database implements TestableDatabase {
 		expectedDBTypeForClass.put( char.class, "CHARACTER" );
 		expectedDBTypeForClass.put( TextType.class, "VARCHAR" );
 		expectedDBTypeForClass.put( String.class, "VARCHAR" );
-	}};
+	}}
 
 	/**
 	 * Holds configuration for the DB2 database container. If the build is run with <code>-Pdocker</code> then
diff --git a/hibernate-reactive-core/src/test/java/org/hibernate/reactive/containers/OracleDatabase.java b/hibernate-reactive-core/src/test/java/org/hibernate/reactive/containers/OracleDatabase.java
@@ -41,7 +41,7 @@ class OracleDatabase implements TestableDatabase {
 
 	public static final OracleDatabase INSTANCE = new OracleDatabase();
 
-	public static Map<Class<?>, String> expectedDBTypeForClass = new HashMap<>();
+	public static final Map<Class<?>, String> expectedDBTypeForClass = new HashMap<>();
 
 	static {
 		{
@@ -94,7 +94,7 @@ class OracleDatabase implements TestableDatabase {
 			// See https://github.com/gvenzl/oci-oracle-xe/issues/64
 			// I choose to limit it to "2 cpus": should be more than enough for any local testing needs,
 			// and keeps things simple.
-			.withCreateContainerCmdModifier( cmd -> cmd.getHostConfig().withCpuCount( 2l ) );
+			.withCreateContainerCmdModifier( cmd -> cmd.getHostConfig().withCpuCount( 2L ) );
 
 	@Override
 	public String getJdbcUrl() {
@@ -112,7 +112,7 @@ public String createJdbcUrl(String host, int port, String database, Map<String,
 			params.forEach( (key, value) -> {
 				paramsBuilder.append( jdbcParamDelimiter() );
 				paramsBuilder.append( key );
-				paramsBuilder.append( "=" );
+				paramsBuilder.append( '=' );
 				paramsBuilder.append( value );
 			} );
 		}
@@ -179,7 +179,7 @@ private static String addCredentialsToUri(String jdbcUrl) {
 		// jdbc:oracle:thin:@localhost:49413/hreact
 		String uri = jdbcUrl;
 		if ( uri.startsWith( "jdbc:" ) ) {
-			jdbcUrl.substring( "jdbc:".length() );
+			uri = uri.substring( "jdbc:".length() );
 		}
 		uri = uri.replace( "thin:@", "thin:" + getCredentials() + "@" );
 		return uri;
diff --git a/hibernate-reactive-core/src/test/java/org/hibernate/reactive/testing/SqlStatementTracker.java b/hibernate-reactive-core/src/test/java/org/hibernate/reactive/testing/SqlStatementTracker.java
@@ -48,14 +48,14 @@ public SqlStatementTracker(Predicate<String> predicate, Properties properties) {
 	}
 
 	private static boolean toBoolean(Object obj) {
-		return Boolean.valueOf( (String) obj );
+		return Boolean.parseBoolean( (String) obj );
 	}
 
 	private static long toLong(Object obj) {
 		if ( obj == null ) {
 			return 0;
 		}
-		return Long.valueOf( (String) obj );
+		return Long.parseLong( (String) obj );
 	}
 
 	@Override
diff --git a/hibernate-reactive-core/src/test/java/org/hibernate/reactive/types/BasicTypesAndCallbacksForAllDBsTest.java b/hibernate-reactive-core/src/test/java/org/hibernate/reactive/types/BasicTypesAndCallbacksForAllDBsTest.java
@@ -395,7 +395,7 @@ public void testDuration(TestContext context) {
 		basic.duration = Duration.ofMillis( 1894657L );
 
 		testField( context, basic, found -> {
-			context.assertTrue( found.duration instanceof Duration );
+			context.assertNotNull( found.duration );
 			context.assertEquals( basic.duration, found.duration );
 		} );
 	}
@@ -406,7 +406,7 @@ public void testInstant(TestContext context) {
 		basic.instant = Instant.now();
 
 		testField( context, basic, found -> {
-			context.assertTrue( found.instant instanceof Instant );
+			context.assertNotNull( found.instant );
 			// Without the truncated it fails with JDK 15+
 			context.assertEquals( basic.instant.truncatedTo( ChronoUnit.MILLIS ),
 								  found.instant.truncatedTo( ChronoUnit.MILLIS ) );
diff --git a/hibernate-reactive-core/src/test/java/org/hibernate/reactive/types/LobTypeTest.java b/hibernate-reactive-core/src/test/java/org/hibernate/reactive/types/LobTypeTest.java
@@ -44,9 +44,7 @@ protected Collection<Class<?>> annotatedEntities() {
 	public void testStringLobType(TestContext context) {
 		String text = "hello world once upon a time it was the best of times it was the worst of times goodbye";
 		StringBuilder longText = new StringBuilder();
-		for ( int i = 0; i < 1000; i++ ) {
-			longText.append( text );
-		}
+		longText.append( text.repeat( 1000 ) );
 		String book = longText.toString();
 
 		Basic basic = new Basic();
@@ -59,9 +57,7 @@ public void testStringLobType(TestContext context) {
 	public void testBytesLobType(TestContext context) {
 		String text = "hello world once upon a time it was the best of times it was the worst of times goodbye";
 		StringBuilder longText = new StringBuilder();
-		for ( int i = 0; i < 1000; i++ ) {
-			longText.append( text );
-		}
+		longText.append( text.repeat( 1000 ) );
 		byte[] pic = longText.toString().getBytes();
 
 		Basic basic = new Basic();

Original file line number	Diff line number	Diff line change
`@@ -174,7 +174,7 @@ private <T> CriteriaQuery<T> queryForDelete(Class<T> entityClass) {`
`174`	`174`
`175`	`175`	`@Before`
`176`	`176`	`public void before(TestContext context) {`
`177`		`- test( context, setupSessionFactory( () -> constructConfiguration() ) );`
	`177`	`+ test( context, setupSessionFactory( this::constructConfiguration ) );`
`178`	`178`	`}`
`179`	`179`
`180`	`180`	`/**`