From ed310069fea1782c8c683cbd70a166bec80aab9e Mon Sep 17 00:00:00 2001 From: Michael Minella Date: Wed, 5 Feb 2014 16:35:38 -0600 Subject: [PATCH] BATCH-2163: Updated documentation and copyright dates --- .../src/main/sql/destroy.sql.vpp | 1 - .../support/SqliteMaxValueIncrementer.java | 22 ++++++++++++++++++- .../support/SqlitePagingQueryProvider.java | 11 +++++++++- .../SqlitePagingQueryProviderTests.java | 2 +- 4 files changed, 32 insertions(+), 4 deletions(-) diff --git a/spring-batch-core/src/main/sql/destroy.sql.vpp b/spring-batch-core/src/main/sql/destroy.sql.vpp index 8bc6d06a3..b83400985 100644 --- a/spring-batch-core/src/main/sql/destroy.sql.vpp +++ b/spring-batch-core/src/main/sql/destroy.sql.vpp @@ -3,7 +3,6 @@ DROP TABLE $!{IFEXISTSBEFORE} BATCH_JOB_EXECUTION_CONTEXT $!{IFEXISTS}; DROP TABLE $!{IFEXISTSBEFORE} BATCH_JOB_EXECUTION_PARAMS $!{IFEXISTS}; DROP TABLE $!{IFEXISTSBEFORE} BATCH_STEP_EXECUTION $!{IFEXISTS}; DROP TABLE $!{IFEXISTSBEFORE} BATCH_JOB_EXECUTION $!{IFEXISTS}; -DROP TABLE $!{IFEXISTSBEFORE} BATCH_JOB_PARAMS $!{IFEXISTS}; DROP TABLE $!{IFEXISTSBEFORE} BATCH_JOB_INSTANCE $!{IFEXISTS}; DROP ${SEQUENCE} $!{IFEXISTSBEFORE} BATCH_STEP_EXECUTION_SEQ $!{IFEXISTS}; diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/support/SqliteMaxValueIncrementer.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/support/SqliteMaxValueIncrementer.java index b54110b81..18afb104e 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/support/SqliteMaxValueIncrementer.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/support/SqliteMaxValueIncrementer.java @@ -1,11 +1,27 @@ +/* + * Copyright 2014 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 + * + * http://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.item.database.support; -import javax.sql.DataSource; import java.sql.Connection; import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Statement; +import javax.sql.DataSource; + import org.springframework.dao.DataAccessResourceFailureException; import org.springframework.jdbc.datasource.DataSourceUtils; import org.springframework.jdbc.support.JdbcUtils; @@ -16,6 +32,7 @@ import org.springframework.jdbc.support.incrementer.AbstractColumnMaxValueIncrem * should ideally be in Spring JDBC. * * @author Luke Taylor + * @since 3.0 */ class SqliteMaxValueIncrementer extends AbstractColumnMaxValueIncrementer { @@ -23,6 +40,9 @@ class SqliteMaxValueIncrementer extends AbstractColumnMaxValueIncrementer { super(dataSource, incrementerName, columnName); } + /* (non-Javadoc) + * @see org.springframework.jdbc.support.incrementer.AbstractDataFieldMaxValueIncrementer#getNextKey() + */ @Override protected long getNextKey() { Connection con = DataSourceUtils.getConnection(getDataSource()); diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/support/SqlitePagingQueryProvider.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/support/SqlitePagingQueryProvider.java index 08889e964..e7a7aff25 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/support/SqlitePagingQueryProvider.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/support/SqlitePagingQueryProvider.java @@ -1,5 +1,5 @@ /* - * Copyright 2006-2012 the original author or authors. + * Copyright 2014 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. @@ -26,11 +26,17 @@ import org.springframework.util.StringUtils; * @since 3.0.0 */ public class SqlitePagingQueryProvider extends AbstractSqlPagingQueryProvider { + /* (non-Javadoc) + * @see org.springframework.batch.item.database.support.AbstractSqlPagingQueryProvider#generateFirstPageQuery(int) + */ @Override public String generateFirstPageQuery(int pageSize) { return SqlPagingQueryUtils.generateLimitSqlQuery(this, false, buildLimitClause(pageSize)); } + /* (non-Javadoc) + * @see org.springframework.batch.item.database.support.AbstractSqlPagingQueryProvider#generateRemainingPagesQuery(int) + */ @Override public String generateRemainingPagesQuery(int pageSize) { if(StringUtils.hasText(getGroupClause())) { @@ -41,6 +47,9 @@ public class SqlitePagingQueryProvider extends AbstractSqlPagingQueryProvider { } } + /* (non-Javadoc) + * @see org.springframework.batch.item.database.support.AbstractSqlPagingQueryProvider#generateJumpToItemQuery(int, int) + */ @Override public String generateJumpToItemQuery(int itemIndex, int pageSize) { int page = itemIndex / pageSize; diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/support/SqlitePagingQueryProviderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/support/SqlitePagingQueryProviderTests.java index 72c73d76f..340a67d4c 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/support/SqlitePagingQueryProviderTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/support/SqlitePagingQueryProviderTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2006-2012 the original author or authors. + * Copyright 2014 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.