Spring/spring-batch
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

change parameterValues check -> CollectionUtils.isEmpty

Browse Source 
Resolves #4021
This commit is contained in:
me
2021-10-23 20:33:35 +09:00
committed by Mahmoud Ben Hassine
parent 875be704c2
commit 212b3ce950
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/HibernateItemReaderHelper.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2006-2021 the original author or authors.
* Copyright 2006-2022 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.
@@ -28,6 +28,7 @@ import org.hibernate.StatelessSession;
import org.springframework.batch.item.database.orm.HibernateQueryProvider;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.util.Assert;
import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;
/**
@@ -36,7 +37,7 @@ import org.springframework.util.StringUtils;
*
* @author Dave Syer
* @author Mahmoud Ben Hassine
*
* @author June Young. Park
*/
public class HibernateItemReaderHelper<T> implements InitializingBean {
@@ -84,7 +85,7 @@ public class HibernateItemReaderHelper<T> implements InitializingBean {
*/
public void setUseStatelessSession(boolean useStatelessSession) {
Assert.state(statefulSession == null && statelessSession == null,
"The useStatelessSession flag can only be set before a session is initialized.");
"The useStatelessSession flag can only be set before a session is initialized.");
this.useStatelessSession = useStatelessSession;
}
@@ -103,7 +104,7 @@ public class HibernateItemReaderHelper<T> implements InitializingBean {
if (queryProvider == null) {
Assert.notNull(sessionFactory, "session factory must be set");
Assert.state(StringUtils.hasText(queryString) ^ StringUtils.hasText(queryName),
"queryString or queryName must be set");
"queryString or queryName must be set");
}
}
@@ -117,7 +118,7 @@ public class HibernateItemReaderHelper<T> implements InitializingBean {
*/
public ScrollableResults getForwardOnlyCursor(int fetchSize, Map<String, Object> parameterValues) {
Query<? extends T> query = createQuery();
if (parameterValues != null) {
if (!CollectionUtils.isEmpty(parameterValues)) {
query.setProperties(parameterValues);
}
return query.setFetchSize(fetchSize).scroll(ScrollMode.FORWARD_ONLY);
@@ -215,7 +216,7 @@ public class HibernateItemReaderHelper<T> implements InitializingBean {
clear();
Query<? extends T> query = createQuery();
if (parameterValues != null) {
if (!CollectionUtils.isEmpty(parameterValues)) {
query.setProperties(parameterValues);
}
return query.setFetchSize(fetchSize).setFirstResult(page * pageSize).setMaxResults(pageSize).list();