You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2023/02/08 20:53:50 UTC
[commons-beanutils] branch master updated: Split up classes that depend on the JPMS java.sql module into their own packages
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-beanutils.git
The following commit(s) were added to refs/heads/master by this push:
new 5b90d778 Split up classes that depend on the JPMS java.sql module into their own packages
5b90d778 is described below
commit 5b90d778165ce267131f8bde23219870746988d5
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Wed Feb 8 15:53:46 2023 -0500
Split up classes that depend on the JPMS java.sql module into their own
packages
---
.../commons/beanutils2/ConvertUtilsBean.java | 6 +++---
.../converters/{ => sql}/SqlDateConverter.java | 4 +++-
.../converters/{ => sql}/SqlTimeConverter.java | 4 +++-
.../{ => sql}/SqlTimestampConverter.java | 4 +++-
.../beanutils2/converters/sql/package-info.java | 24 +++++++++++++++++++++
.../beanutils2/locale/LocaleConvertUtilsBean.java | 6 +++---
.../{ => sql}/SqlDateLocaleConverter.java | 4 +++-
.../{ => sql}/SqlTimeLocaleConverter.java | 4 +++-
.../{ => sql}/SqlTimestampLocaleConverter.java | 4 +++-
.../locale/converters/sql/package-info.java | 25 ++++++++++++++++++++++
.../converters/DateConverterTestBase.java | 10 ++++-----
.../{ => sql}/SqlDateConverterTestCase.java | 5 ++++-
.../{ => sql}/SqlTimeConverterTestCase.java | 4 +++-
.../{ => sql}/SqlTimestampConverterTestCase.java | 4 +++-
14 files changed, 88 insertions(+), 20 deletions(-)
diff --git a/src/main/java/org/apache/commons/beanutils2/ConvertUtilsBean.java b/src/main/java/org/apache/commons/beanutils2/ConvertUtilsBean.java
index 45360b9a..4098d9d6 100644
--- a/src/main/java/org/apache/commons/beanutils2/ConvertUtilsBean.java
+++ b/src/main/java/org/apache/commons/beanutils2/ConvertUtilsBean.java
@@ -68,9 +68,6 @@ import org.apache.commons.beanutils2.converters.OffsetTimeConverter;
import org.apache.commons.beanutils2.converters.PathConverter;
import org.apache.commons.beanutils2.converters.PeriodConverter;
import org.apache.commons.beanutils2.converters.ShortConverter;
-import org.apache.commons.beanutils2.converters.SqlDateConverter;
-import org.apache.commons.beanutils2.converters.SqlTimeConverter;
-import org.apache.commons.beanutils2.converters.SqlTimestampConverter;
import org.apache.commons.beanutils2.converters.StringConverter;
import org.apache.commons.beanutils2.converters.URIConverter;
import org.apache.commons.beanutils2.converters.URLConverter;
@@ -80,6 +77,9 @@ import org.apache.commons.beanutils2.converters.YearMonthConverter;
import org.apache.commons.beanutils2.converters.ZoneIdConverter;
import org.apache.commons.beanutils2.converters.ZoneOffsetConverter;
import org.apache.commons.beanutils2.converters.ZonedDateTimeConverter;
+import org.apache.commons.beanutils2.converters.sql.SqlDateConverter;
+import org.apache.commons.beanutils2.converters.sql.SqlTimeConverter;
+import org.apache.commons.beanutils2.converters.sql.SqlTimestampConverter;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
diff --git a/src/main/java/org/apache/commons/beanutils2/converters/SqlDateConverter.java b/src/main/java/org/apache/commons/beanutils2/converters/sql/SqlDateConverter.java
similarity index 94%
rename from src/main/java/org/apache/commons/beanutils2/converters/SqlDateConverter.java
rename to src/main/java/org/apache/commons/beanutils2/converters/sql/SqlDateConverter.java
index 7bcb8f14..c7ccf92e 100644
--- a/src/main/java/org/apache/commons/beanutils2/converters/SqlDateConverter.java
+++ b/src/main/java/org/apache/commons/beanutils2/converters/sql/SqlDateConverter.java
@@ -14,10 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.beanutils2.converters;
+package org.apache.commons.beanutils2.converters.sql;
import java.sql.Date;
+import org.apache.commons.beanutils2.converters.DateTimeConverter;
+
/**
* {@link DateTimeConverter} implementation that handles conversion to
* and from <b>java.sql.Date</b> objects.
diff --git a/src/main/java/org/apache/commons/beanutils2/converters/SqlTimeConverter.java b/src/main/java/org/apache/commons/beanutils2/converters/sql/SqlTimeConverter.java
similarity index 96%
rename from src/main/java/org/apache/commons/beanutils2/converters/SqlTimeConverter.java
rename to src/main/java/org/apache/commons/beanutils2/converters/sql/SqlTimeConverter.java
index 93d7bbb4..305c74ab 100644
--- a/src/main/java/org/apache/commons/beanutils2/converters/SqlTimeConverter.java
+++ b/src/main/java/org/apache/commons/beanutils2/converters/sql/SqlTimeConverter.java
@@ -14,13 +14,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.beanutils2.converters;
+package org.apache.commons.beanutils2.converters.sql;
import java.sql.Time;
import java.text.DateFormat;
import java.util.Locale;
import java.util.TimeZone;
+import org.apache.commons.beanutils2.converters.DateTimeConverter;
+
/**
* {@link DateTimeConverter} implementation that handles conversion to
* and from <b>java.sql.Time</b> objects.
diff --git a/src/main/java/org/apache/commons/beanutils2/converters/SqlTimestampConverter.java b/src/main/java/org/apache/commons/beanutils2/converters/sql/SqlTimestampConverter.java
similarity index 96%
rename from src/main/java/org/apache/commons/beanutils2/converters/SqlTimestampConverter.java
rename to src/main/java/org/apache/commons/beanutils2/converters/sql/SqlTimestampConverter.java
index 633c9f9e..c75b4ad9 100644
--- a/src/main/java/org/apache/commons/beanutils2/converters/SqlTimestampConverter.java
+++ b/src/main/java/org/apache/commons/beanutils2/converters/sql/SqlTimestampConverter.java
@@ -14,13 +14,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.beanutils2.converters;
+package org.apache.commons.beanutils2.converters.sql;
import java.sql.Timestamp;
import java.text.DateFormat;
import java.util.Locale;
import java.util.TimeZone;
+import org.apache.commons.beanutils2.converters.DateTimeConverter;
+
/**
* {@link DateTimeConverter} implementation that handles conversion to
* and from <b>java.sql.Timestamp</b> objects.
diff --git a/src/main/java/org/apache/commons/beanutils2/converters/sql/package-info.java b/src/main/java/org/apache/commons/beanutils2/converters/sql/package-info.java
new file mode 100644
index 00000000..89da0de7
--- /dev/null
+++ b/src/main/java/org/apache/commons/beanutils2/converters/sql/package-info.java
@@ -0,0 +1,24 @@
+/*
+ * 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.
+ */
+
+/**
+ * Standard implementations of the SQL
+ * {@link org.apache.commons.beanutils2.Converter} interface that are
+ * pre-registered with {@link org.apache.commons.beanutils2.ConvertUtils} at
+ * startup time.
+ */
+package org.apache.commons.beanutils2.converters.sql;
diff --git a/src/main/java/org/apache/commons/beanutils2/locale/LocaleConvertUtilsBean.java b/src/main/java/org/apache/commons/beanutils2/locale/LocaleConvertUtilsBean.java
index 564277a5..176d38f4 100644
--- a/src/main/java/org/apache/commons/beanutils2/locale/LocaleConvertUtilsBean.java
+++ b/src/main/java/org/apache/commons/beanutils2/locale/LocaleConvertUtilsBean.java
@@ -32,10 +32,10 @@ import org.apache.commons.beanutils2.locale.converters.FloatLocaleConverter;
import org.apache.commons.beanutils2.locale.converters.IntegerLocaleConverter;
import org.apache.commons.beanutils2.locale.converters.LongLocaleConverter;
import org.apache.commons.beanutils2.locale.converters.ShortLocaleConverter;
-import org.apache.commons.beanutils2.locale.converters.SqlDateLocaleConverter;
-import org.apache.commons.beanutils2.locale.converters.SqlTimeLocaleConverter;
-import org.apache.commons.beanutils2.locale.converters.SqlTimestampLocaleConverter;
import org.apache.commons.beanutils2.locale.converters.StringLocaleConverter;
+import org.apache.commons.beanutils2.locale.converters.sql.SqlDateLocaleConverter;
+import org.apache.commons.beanutils2.locale.converters.sql.SqlTimeLocaleConverter;
+import org.apache.commons.beanutils2.locale.converters.sql.SqlTimestampLocaleConverter;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
diff --git a/src/main/java/org/apache/commons/beanutils2/locale/converters/SqlDateLocaleConverter.java b/src/main/java/org/apache/commons/beanutils2/locale/converters/sql/SqlDateLocaleConverter.java
similarity index 98%
rename from src/main/java/org/apache/commons/beanutils2/locale/converters/SqlDateLocaleConverter.java
rename to src/main/java/org/apache/commons/beanutils2/locale/converters/sql/SqlDateLocaleConverter.java
index 09a39bf6..e5b37cc2 100644
--- a/src/main/java/org/apache/commons/beanutils2/locale/converters/SqlDateLocaleConverter.java
+++ b/src/main/java/org/apache/commons/beanutils2/locale/converters/sql/SqlDateLocaleConverter.java
@@ -15,12 +15,14 @@
* limitations under the License.
*/
-package org.apache.commons.beanutils2.locale.converters;
+package org.apache.commons.beanutils2.locale.converters.sql;
import java.sql.Date;
import java.text.ParseException;
import java.util.Locale;
+import org.apache.commons.beanutils2.locale.converters.DateLocaleConverter;
+
/**
* <p>Standard {@link org.apache.commons.beanutils2.locale.LocaleConverter}
* implementation that converts an incoming
diff --git a/src/main/java/org/apache/commons/beanutils2/locale/converters/SqlTimeLocaleConverter.java b/src/main/java/org/apache/commons/beanutils2/locale/converters/sql/SqlTimeLocaleConverter.java
similarity index 98%
rename from src/main/java/org/apache/commons/beanutils2/locale/converters/SqlTimeLocaleConverter.java
rename to src/main/java/org/apache/commons/beanutils2/locale/converters/sql/SqlTimeLocaleConverter.java
index 73982241..baf71786 100644
--- a/src/main/java/org/apache/commons/beanutils2/locale/converters/SqlTimeLocaleConverter.java
+++ b/src/main/java/org/apache/commons/beanutils2/locale/converters/sql/SqlTimeLocaleConverter.java
@@ -15,12 +15,14 @@
* limitations under the License.
*/
-package org.apache.commons.beanutils2.locale.converters;
+package org.apache.commons.beanutils2.locale.converters.sql;
import java.sql.Time;
import java.text.ParseException;
import java.util.Locale;
+import org.apache.commons.beanutils2.locale.converters.DateLocaleConverter;
+
/**
* <p>Standard {@link org.apache.commons.beanutils2.locale.LocaleConverter}
* implementation that converts an incoming
diff --git a/src/main/java/org/apache/commons/beanutils2/locale/converters/SqlTimestampLocaleConverter.java b/src/main/java/org/apache/commons/beanutils2/locale/converters/sql/SqlTimestampLocaleConverter.java
similarity index 98%
rename from src/main/java/org/apache/commons/beanutils2/locale/converters/SqlTimestampLocaleConverter.java
rename to src/main/java/org/apache/commons/beanutils2/locale/converters/sql/SqlTimestampLocaleConverter.java
index dc367942..0478c9bd 100644
--- a/src/main/java/org/apache/commons/beanutils2/locale/converters/SqlTimestampLocaleConverter.java
+++ b/src/main/java/org/apache/commons/beanutils2/locale/converters/sql/SqlTimestampLocaleConverter.java
@@ -15,12 +15,14 @@
* limitations under the License.
*/
-package org.apache.commons.beanutils2.locale.converters;
+package org.apache.commons.beanutils2.locale.converters.sql;
import java.sql.Timestamp;
import java.text.ParseException;
import java.util.Locale;
+import org.apache.commons.beanutils2.locale.converters.DateLocaleConverter;
+
/**
* <p>Standard {@link org.apache.commons.beanutils2.locale.LocaleConverter}
* implementation that converts an incoming
diff --git a/src/main/java/org/apache/commons/beanutils2/locale/converters/sql/package-info.java b/src/main/java/org/apache/commons/beanutils2/locale/converters/sql/package-info.java
new file mode 100644
index 00000000..307248f3
--- /dev/null
+++ b/src/main/java/org/apache/commons/beanutils2/locale/converters/sql/package-info.java
@@ -0,0 +1,25 @@
+/*
+ * 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.
+ */
+
+/**
+ * Standard implementations of the locale-aware
+ * {@link org.apache.commons.beanutils2.locale.LocaleConverter} interface that
+ * are pre-registered with locale-aware SQL
+ * {@link org.apache.commons.beanutils2.locale.LocaleConvertUtils} at startup
+ * time.
+ */
+package org.apache.commons.beanutils2.locale.converters.sql;
diff --git a/src/test/java/org/apache/commons/beanutils2/converters/DateConverterTestBase.java b/src/test/java/org/apache/commons/beanutils2/converters/DateConverterTestBase.java
index 70ff839e..97863a43 100644
--- a/src/test/java/org/apache/commons/beanutils2/converters/DateConverterTestBase.java
+++ b/src/test/java/org/apache/commons/beanutils2/converters/DateConverterTestBase.java
@@ -62,7 +62,7 @@ public abstract class DateConverterTestBase<T> extends TestCase {
* @param date The date or calendar object
* @return The time in milliseconds
*/
- long getTimeInMillis(final Object date) {
+ protected long getTimeInMillis(final Object date) {
if (date instanceof java.sql.Date) {
return ((java.sql.Date) date).getTime();
}
@@ -102,7 +102,7 @@ public abstract class DateConverterTestBase<T> extends TestCase {
* @param converter The converter to use
* @param value The value to convert
*/
- void invalidConversion(final Converter converter, final Object value) {
+ protected void invalidConversion(final Converter converter, final Object value) {
final String valueType = value == null ? "null" : value.getClass().getName();
final String msg = "Converting '" + valueType + "' value '" + value + "'";
try {
@@ -132,7 +132,7 @@ public abstract class DateConverterTestBase<T> extends TestCase {
* @param expected The expected result
* @param value The value to convert
*/
- void stringConversion(final Converter converter, final String expected, final Object value) {
+ protected void stringConversion(final Converter converter, final String expected, final Object value) {
final String valueType = value == null ? "null" : value.getClass().getName();
final String msg = "Converting '" + valueType + "' value '" + value + "' to String";
try {
@@ -554,7 +554,7 @@ public abstract class DateConverterTestBase<T> extends TestCase {
* @param locale The locale to use (or null)
* @return parsed Calendar value
*/
- T toType(final String value, final String pattern, final Locale locale) {
+ protected T toType(final String value, final String pattern, final Locale locale) {
return toType(toCalendar(value, pattern, locale));
}
@@ -564,7 +564,7 @@ public abstract class DateConverterTestBase<T> extends TestCase {
* @param expected The expected result
* @param value The value to convert
*/
- void validConversion(final Converter converter, final Object expected, final Object value) {
+ protected void validConversion(final Converter converter, final Object expected, final Object value) {
final String valueType = value == null ? "null" : value.getClass().getName();
final String msg = "Converting '" + valueType + "' value '" + value + "'";
try {
diff --git a/src/test/java/org/apache/commons/beanutils2/converters/SqlDateConverterTestCase.java b/src/test/java/org/apache/commons/beanutils2/converters/sql/SqlDateConverterTestCase.java
similarity index 94%
rename from src/test/java/org/apache/commons/beanutils2/converters/SqlDateConverterTestCase.java
rename to src/test/java/org/apache/commons/beanutils2/converters/sql/SqlDateConverterTestCase.java
index f17d3a6a..b408bf54 100644
--- a/src/test/java/org/apache/commons/beanutils2/converters/SqlDateConverterTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/converters/sql/SqlDateConverterTestCase.java
@@ -15,11 +15,14 @@
* limitations under the License.
*/
-package org.apache.commons.beanutils2.converters;
+package org.apache.commons.beanutils2.converters.sql;
import java.sql.Date;
import java.util.Calendar;
+import org.apache.commons.beanutils2.converters.DateConverterTestBase;
+import org.apache.commons.beanutils2.converters.DateTimeConverter;
+
import junit.framework.TestSuite;
/**
diff --git a/src/test/java/org/apache/commons/beanutils2/converters/SqlTimeConverterTestCase.java b/src/test/java/org/apache/commons/beanutils2/converters/sql/SqlTimeConverterTestCase.java
similarity index 97%
rename from src/test/java/org/apache/commons/beanutils2/converters/SqlTimeConverterTestCase.java
rename to src/test/java/org/apache/commons/beanutils2/converters/sql/SqlTimeConverterTestCase.java
index 4c66d37a..dce4571f 100644
--- a/src/test/java/org/apache/commons/beanutils2/converters/SqlTimeConverterTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/converters/sql/SqlTimeConverterTestCase.java
@@ -15,12 +15,14 @@
* limitations under the License.
*/
-package org.apache.commons.beanutils2.converters;
+package org.apache.commons.beanutils2.converters.sql;
import java.sql.Time;
import java.util.Calendar;
import java.util.Locale;
+import org.apache.commons.beanutils2.converters.DateConverterTestBase;
+
import junit.framework.TestSuite;
/**
diff --git a/src/test/java/org/apache/commons/beanutils2/converters/SqlTimestampConverterTestCase.java b/src/test/java/org/apache/commons/beanutils2/converters/sql/SqlTimestampConverterTestCase.java
similarity index 97%
rename from src/test/java/org/apache/commons/beanutils2/converters/SqlTimestampConverterTestCase.java
rename to src/test/java/org/apache/commons/beanutils2/converters/sql/SqlTimestampConverterTestCase.java
index 846e0627..61e61f1d 100644
--- a/src/test/java/org/apache/commons/beanutils2/converters/SqlTimestampConverterTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/converters/sql/SqlTimestampConverterTestCase.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.commons.beanutils2.converters;
+package org.apache.commons.beanutils2.converters.sql;
import java.sql.Timestamp;
import java.text.DateFormat;
@@ -23,6 +23,8 @@ import java.util.Calendar;
import java.util.Date;
import java.util.Locale;
+import org.apache.commons.beanutils2.converters.DateConverterTestBase;
+
import junit.framework.TestSuite;
/**