Author: tv
Date: Sun Apr 21 11:37:11 2024
New Revision: 1917233
URL: http://svn.apache.org/viewvc?rev=1917233&view=rev
Log:
Update deprecated code, update JCS to 3.2
Removed:
db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/dsfactory/PerUserPoolDataSourceFactory.java
db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/dsfactory/SharedPoolDataSourceFactory.java
Modified:
db/torque/trunk/torque-runtime/pom.xml
db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/TorqueInstance.java
db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/manager/AbstractBaseManager.java
db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/manager/MethodResultCache.java
db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/manager/NoOpMethodResultCache.java
db/torque/trunk/torque-runtime/src/test/java/org/apache/torque/om/mapper/DateMapperTest.java
db/torque/trunk/torque-runtime/src/test/java/org/apache/torque/om/mapper/LongMapperTest.java
Modified: db/torque/trunk/torque-runtime/pom.xml
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-runtime/pom.xml?rev=1917233&r1=1917232&r2=1917233&view=diff
==============================================================================
--- db/torque/trunk/torque-runtime/pom.xml (original)
+++ db/torque/trunk/torque-runtime/pom.xml Sun Apr 21 11:37:11 2024
@@ -50,12 +50,6 @@
</dependency>
<dependency>
- <groupId>commons-dbcp</groupId>
- <artifactId>commons-dbcp</artifactId>
- <optional>true</optional>
- </dependency>
-
- <dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-dbcp2</artifactId>
</dependency>
@@ -67,7 +61,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
- <artifactId>commons-jcs-core</artifactId>
+ <artifactId>commons-jcs3-core</artifactId>
</dependency>
<dependency>
Modified:
db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/TorqueInstance.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/TorqueInstance.java?rev=1917233&r1=1917232&r2=1917233&view=diff
==============================================================================
---
db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/TorqueInstance.java
(original)
+++
db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/TorqueInstance.java
Sun Apr 21 11:37:11 2024
@@ -36,10 +36,10 @@ import org.apache.commons.configuration2
import org.apache.commons.configuration2.builder.fluent.Parameters;
import org.apache.commons.configuration2.convert.DefaultListDelimiterHandler;
import org.apache.commons.configuration2.ex.ConfigurationException;
-import org.apache.commons.jcs.JCS;
+import org.apache.commons.jcs3.JCS;
import org.apache.commons.lang3.StringUtils;
-import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.apache.torque.adapter.Adapter;
import org.apache.torque.adapter.AdapterFactory;
import org.apache.torque.adapter.IDMethod;
@@ -458,7 +458,7 @@ public class TorqueInstance
String handle = key.substring(0, key.indexOf('.'));
log.debug("handle: {} DataSourceFactory: {}", handle,
classname);
Class<?> dsfClass = Class.forName(classname);
- DataSourceFactory dsf = (DataSourceFactory)
dsfClass.getDeclaredConstructor( null ).newInstance();
+ DataSourceFactory dsf = (DataSourceFactory)
dsfClass.getDeclaredConstructor().newInstance();
Configuration subConf = c.subset(handle);
dsf.initialize(subConf);
@@ -584,7 +584,7 @@ public class TorqueInstance
try
{
Configuration configuration;
- if (!configFile.endsWith("xml"))
+ if (!configFile.endsWith("xml"))
{
FileBasedConfigurationBuilder<PropertiesConfiguration>
propertiesBuilder = new FileBasedConfigurationBuilder<>(
@@ -674,7 +674,7 @@ public class TorqueInstance
if (!managers.containsKey(managedClassKey))
{
String managerClass = conf.getString(key);
- log.info("Added Manager for Class: {} -> {}",
+ log.info("Added Manager for Class: {} -> {}",
managedClassKey, managerClass);
try
{
@@ -711,7 +711,7 @@ public class TorqueInstance
{
try
{
- return (AbstractBaseManager<?>)
Class.forName(className).newInstance();
+ return (AbstractBaseManager<?>)
Class.forName(className).getDeclaredConstructor().newInstance();
}
catch (Exception e)
{
Modified:
db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/manager/AbstractBaseManager.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/manager/AbstractBaseManager.java?rev=1917233&r1=1917232&r2=1917233&view=diff
==============================================================================
---
db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/manager/AbstractBaseManager.java
(original)
+++
db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/manager/AbstractBaseManager.java
Sun Apr 21 11:37:11 2024
@@ -34,12 +34,12 @@ import java.util.concurrent.CopyOnWriteA
import java.util.concurrent.CopyOnWriteArraySet;
import java.util.stream.Collectors;
-import org.apache.commons.jcs.JCS;
-import org.apache.commons.jcs.access.CacheAccess;
-import org.apache.commons.jcs.access.GroupCacheAccess;
-import org.apache.commons.jcs.access.exception.CacheException;
-import org.apache.logging.log4j.Logger;
+import org.apache.commons.jcs3.JCS;
+import org.apache.commons.jcs3.access.CacheAccess;
+import org.apache.commons.jcs3.access.GroupCacheAccess;
+import org.apache.commons.jcs3.access.exception.CacheException;
import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.apache.torque.Column;
import org.apache.torque.Torque;
import org.apache.torque.TorqueException;
@@ -142,11 +142,11 @@ implements Serializable
catch (IllegalAccessException e)
{
throw new TorqueException("Could not access " + getClassName(), e);
- }
+ }
catch (InvocationTargetException e)
{
throw new TorqueException("Could not instantiate " +
getClassName(), e);
- }
+ }
catch (Exception e)
{
throw new TorqueException("Could not invoke constructor " +
getClassName(), e);
Modified:
db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/manager/MethodResultCache.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/manager/MethodResultCache.java?rev=1917233&r1=1917232&r2=1917233&view=diff
==============================================================================
---
db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/manager/MethodResultCache.java
(original)
+++
db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/manager/MethodResultCache.java
Sun Apr 21 11:37:11 2024
@@ -21,10 +21,10 @@ package org.apache.torque.manager;
import java.io.Serializable;
-import org.apache.commons.jcs.access.GroupCacheAccess;
-import org.apache.commons.jcs.access.exception.CacheException;
-import org.apache.logging.log4j.Logger;
+import org.apache.commons.jcs3.access.GroupCacheAccess;
+import org.apache.commons.jcs3.access.exception.CacheException;
import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.apache.torque.TorqueException;
/**
Modified:
db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/manager/NoOpMethodResultCache.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/manager/NoOpMethodResultCache.java?rev=1917233&r1=1917232&r2=1917233&view=diff
==============================================================================
---
db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/manager/NoOpMethodResultCache.java
(original)
+++
db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/manager/NoOpMethodResultCache.java
Sun Apr 21 11:37:11 2024
@@ -21,7 +21,7 @@ package org.apache.torque.manager;
import java.io.Serializable;
-import org.apache.commons.jcs.access.GroupCacheAccess;
+import org.apache.commons.jcs3.access.GroupCacheAccess;
import org.apache.torque.TorqueException;
/**
Modified:
db/torque/trunk/torque-runtime/src/test/java/org/apache/torque/om/mapper/DateMapperTest.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-runtime/src/test/java/org/apache/torque/om/mapper/DateMapperTest.java?rev=1917233&r1=1917232&r2=1917233&view=diff
==============================================================================
---
db/torque/trunk/torque-runtime/src/test/java/org/apache/torque/om/mapper/DateMapperTest.java
(original)
+++
db/torque/trunk/torque-runtime/src/test/java/org/apache/torque/om/mapper/DateMapperTest.java
Sun Apr 21 11:37:11 2024
@@ -30,14 +30,12 @@ import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.Date;
-import org.apache.torque.BaseTestCase;
import org.apache.torque.MockBaseTestCase;
import org.apache.torque.TorqueException;
import org.apache.torque.criteria.Criteria;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
public class DateMapperTest extends MockBaseTestCase
{
@@ -45,6 +43,7 @@ public class DateMapperTest extends Mock
@Mock
private ResultSet resultSet;
+ @Override
@BeforeEach
public void setUp() throws Exception
{
Modified:
db/torque/trunk/torque-runtime/src/test/java/org/apache/torque/om/mapper/LongMapperTest.java
URL:
http://svn.apache.org/viewvc/db/torque/trunk/torque-runtime/src/test/java/org/apache/torque/om/mapper/LongMapperTest.java?rev=1917233&r1=1917232&r2=1917233&view=diff
==============================================================================
---
db/torque/trunk/torque-runtime/src/test/java/org/apache/torque/om/mapper/LongMapperTest.java
(original)
+++
db/torque/trunk/torque-runtime/src/test/java/org/apache/torque/om/mapper/LongMapperTest.java
Sun Apr 21 11:37:11 2024
@@ -29,14 +29,12 @@ import static org.mockito.Mockito.when;
import java.sql.ResultSet;
import java.sql.SQLException;
-import org.apache.torque.BaseTestCase;
import org.apache.torque.MockBaseTestCase;
import org.apache.torque.TorqueException;
import org.apache.torque.criteria.Criteria;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
public class LongMapperTest extends MockBaseTestCase
{
@@ -44,6 +42,7 @@ public class LongMapperTest extends Mock
@Mock
private ResultSet resultSet;
+ @Override
@BeforeEach
public void setUp() throws Exception
{
---------------------------------------------------------------------
To unsubscribe, e-mail: torque-dev-unsubscr...@db.apache.org
For additional commands, e-mail: torque-dev-h...@db.apache.org
