This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-dbutils.git
commit a37591a6282cc110e1ba57720301fa99b85d5e92
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Mon Jul 31 19:44:34 2023 -0400
Move new annotation to main package
Update Javadoc
---
.../apache/commons/dbutils/AbstractQueryRunner.java | 6 +++---
.../org/apache/commons/dbutils/BeanProcessor.java | 2 --
.../commons/dbutils/{annotations => }/Column.java | 4 ++--
.../commons/dbutils/annotations/package-info.java | 21 ---------------------
.../apache/commons/dbutils/BeanProcessorTest.java | 2 --
5 files changed, 5 insertions(+), 30 deletions(-)
diff --git a/src/main/java/org/apache/commons/dbutils/AbstractQueryRunner.java
b/src/main/java/org/apache/commons/dbutils/AbstractQueryRunner.java
index cb58fc1..3d9bac4 100644
--- a/src/main/java/org/apache/commons/dbutils/AbstractQueryRunner.java
+++ b/src/main/java/org/apache/commons/dbutils/AbstractQueryRunner.java
@@ -207,7 +207,7 @@ public abstract class AbstractQueryRunner {
* Calls {@link DbUtils#closeQuietly(Connection)}.
*
* @param conn Connection to close.
- * @since 2.0
+ * @since 1.8.0
*/
protected void closeQuietly(final Connection conn) {
DbUtils.closeQuietly(conn);
@@ -217,7 +217,7 @@ public abstract class AbstractQueryRunner {
* Calls {@link DbUtils#closeQuietly(ResultSet)}.
*
* @param rs ResultSet to close.
- * @since 2.0
+ * @since 1.8.0
*/
protected void closeQuietly(final ResultSet rs) {
DbUtils.closeQuietly(rs);
@@ -227,7 +227,7 @@ public abstract class AbstractQueryRunner {
* Calls {@link DbUtils#closeQuietly(Statement)}.
*
* @param statement ResultSet to close.
- * @since 2.0
+ * @since 1.8.0
*/
protected void closeQuietly(final Statement statement) {
DbUtils.closeQuietly(statement);
diff --git a/src/main/java/org/apache/commons/dbutils/BeanProcessor.java
b/src/main/java/org/apache/commons/dbutils/BeanProcessor.java
index 39f64a4..63e54d6 100644
--- a/src/main/java/org/apache/commons/dbutils/BeanProcessor.java
+++ b/src/main/java/org/apache/commons/dbutils/BeanProcessor.java
@@ -33,8 +33,6 @@ import java.util.List;
import java.util.Map;
import java.util.ServiceLoader;
-import org.apache.commons.dbutils.annotations.Column;
-
/**
* <p>
* {@code BeanProcessor} matches column names to bean property names
diff --git a/src/main/java/org/apache/commons/dbutils/annotations/Column.java
b/src/main/java/org/apache/commons/dbutils/Column.java
similarity index 95%
rename from src/main/java/org/apache/commons/dbutils/annotations/Column.java
rename to src/main/java/org/apache/commons/dbutils/Column.java
index 4835d24..a8209ce 100644
--- a/src/main/java/org/apache/commons/dbutils/annotations/Column.java
+++ b/src/main/java/org/apache/commons/dbutils/Column.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.dbutils.annotations;
+package org.apache.commons.dbutils;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
@@ -24,7 +24,7 @@ import java.lang.annotation.Target;
/**
* Annotation for BeanProcessor to receive hints of the field name rather than
dissecting the method name.
*
- * @since 2.0
+ * @since 1.8.0
*/
@Target({ ElementType.METHOD})
@Retention(RetentionPolicy.RUNTIME)
diff --git
a/src/main/java/org/apache/commons/dbutils/annotations/package-info.java
b/src/main/java/org/apache/commons/dbutils/annotations/package-info.java
deleted file mode 100644
index 925bd29..0000000
--- a/src/main/java/org/apache/commons/dbutils/annotations/package-info.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You 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.
- */
-
-/**
- * Annotations used in DbUtils.
- */
-package org.apache.commons.dbutils.annotations;
diff --git a/src/test/java/org/apache/commons/dbutils/BeanProcessorTest.java
b/src/test/java/org/apache/commons/dbutils/BeanProcessorTest.java
index 73d0d0d..14a4cfb 100644
--- a/src/test/java/org/apache/commons/dbutils/BeanProcessorTest.java
+++ b/src/test/java/org/apache/commons/dbutils/BeanProcessorTest.java
@@ -28,8 +28,6 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.apache.commons.dbutils.annotations.Column;
-
public class BeanProcessorTest extends BaseTestCase {
private static class IndexedPropertyTestClass {
