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-dbcp.git
The following commit(s) were added to refs/heads/master by this push:
new e099337 Refactor boilerplate.
e099337 is described below
commit e099337103b5eca37d59fee7e3555f5c51857da0
Author: Gary Gregory <gardgreg...@gmail.com>
AuthorDate: Fri Jul 9 09:54:40 2021 -0400
Refactor boilerplate.
---
.../dbcp2/managed/TestSynchronizationOrder.java | 97 ++--------------------
.../dbcp2/transaction/TransactionAdapter.java | 70 ++++++++++++++++
.../transaction/TransactionManagerAdapter.java | 80 ++++++++++++++++++
.../TransactionSynchronizationRegistryAdapter.java | 63 ++++++++++++++
4 files changed, 219 insertions(+), 91 deletions(-)
diff --git
a/src/test/java/org/apache/commons/dbcp2/managed/TestSynchronizationOrder.java
b/src/test/java/org/apache/commons/dbcp2/managed/TestSynchronizationOrder.java
index 1d348ec..b5853a9 100644
---
a/src/test/java/org/apache/commons/dbcp2/managed/TestSynchronizationOrder.java
+++
b/src/test/java/org/apache/commons/dbcp2/managed/TestSynchronizationOrder.java
@@ -48,6 +48,9 @@ import org.apache.commons.dbcp2.DelegatingConnection;
import org.apache.commons.dbcp2.PoolableConnection;
import org.apache.commons.dbcp2.PoolableConnectionFactory;
import org.apache.commons.dbcp2.TesterClassLoader;
+import org.apache.commons.dbcp2.transaction.TransactionAdapter;
+import org.apache.commons.dbcp2.transaction.TransactionManagerAdapter;
+import
org.apache.commons.dbcp2.transaction.TransactionSynchronizationRegistryAdapter;
import org.apache.commons.pool2.impl.GenericObjectPool;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
@@ -135,23 +138,13 @@ public class TestSynchronizationOrder {
@BeforeEach
public void setup() {
- transactionManager = new TransactionManager() {
+ transactionManager = new TransactionManagerAdapter() {
private Transaction transaction;
@Override
public void begin() throws NotSupportedException, SystemException {
- transaction = new Transaction() {
-
- @Override
- public void commit() throws HeuristicMixedException,
HeuristicRollbackException, RollbackException, SecurityException,
SystemException {
-
- }
-
- @Override
- public boolean delistResource(final XAResource xaResource,
final int i) throws IllegalStateException, SystemException {
- return false;
- }
+ transaction = new TransactionAdapter() {
@Override
public boolean enlistResource(final XAResource xaResource)
throws IllegalStateException, RollbackException, SystemException {
@@ -160,104 +153,26 @@ public class TestSynchronizationOrder {
}
@Override
- public int getStatus() throws SystemException {
- return 0;
- }
-
- @Override
public void registerSynchronization(final Synchronization
synchronization) throws IllegalStateException, RollbackException,
SystemException {
transactionManagerRegistered = true;
}
-
- @Override
- public void rollback() throws IllegalStateException,
SystemException {
-
- }
-
- @Override
- public void setRollbackOnly() throws
IllegalStateException, SystemException {
-
- }
};
}
@Override
- public void commit() throws HeuristicMixedException,
HeuristicRollbackException, IllegalStateException, RollbackException,
SecurityException, SystemException {
-
- }
-
- @Override
- public int getStatus() throws SystemException {
- return 0;
- }
-
- @Override
public Transaction getTransaction() throws SystemException {
return transaction;
}
- @Override
- public void resume(final Transaction transaction) throws
IllegalStateException, InvalidTransactionException, SystemException {
-
- }
-
- @Override
- public void rollback() throws IllegalStateException,
SecurityException, SystemException {
-
- }
-
- @Override
- public void setRollbackOnly() throws IllegalStateException,
SystemException {
-
- }
-
- @Override
- public void setTransactionTimeout(final int i) throws
SystemException {
-
- }
-
- @Override
- public Transaction suspend() throws SystemException {
- return null;
- }
};
- transactionSynchronizationRegistry = new
TransactionSynchronizationRegistry() {
-
- @Override
- public Object getResource(final Object o) {
- return null;
- }
-
- @Override
- public boolean getRollbackOnly() {
- return false;
- }
-
- @Override
- public Object getTransactionKey() {
- return null;
- }
-
- @Override
- public int getTransactionStatus() {
- return 0;
- }
-
- @Override
- public void putResource(final Object o, final Object o1) {
-
- }
+ transactionSynchronizationRegistry = new
TransactionSynchronizationRegistryAdapter() {
@Override
public void registerInterposedSynchronization(final
Synchronization synchronization) {
transactionSynchronizationRegistryRegistered = true;
}
- @Override
- public void setRollbackOnly() {
-
- }
};
bmds = new BasicManagedDataSource();
diff --git
a/src/test/java/org/apache/commons/dbcp2/transaction/TransactionAdapter.java
b/src/test/java/org/apache/commons/dbcp2/transaction/TransactionAdapter.java
new file mode 100644
index 0000000..4df889e
--- /dev/null
+++ b/src/test/java/org/apache/commons/dbcp2/transaction/TransactionAdapter.java
@@ -0,0 +1,70 @@
+/*
+ * 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.
+ */
+
+package org.apache.commons.dbcp2.transaction;
+
+import javax.transaction.HeuristicMixedException;
+import javax.transaction.HeuristicRollbackException;
+import javax.transaction.RollbackException;
+import javax.transaction.Synchronization;
+import javax.transaction.SystemException;
+import javax.transaction.Transaction;
+import javax.transaction.xa.XAResource;
+
+/**
+ * A Transaction adapter.
+ */
+public class TransactionAdapter implements Transaction {
+
+ @Override
+ public void commit() throws HeuristicMixedException,
HeuristicRollbackException, RollbackException,
+ SecurityException, SystemException {
+ // Noop
+ }
+
+ @Override
+ public boolean delistResource(XAResource arg0, int arg1) throws
IllegalStateException, SystemException {
+ return false;
+ }
+
+ @Override
+ public boolean enlistResource(XAResource arg0) throws
IllegalStateException, RollbackException, SystemException {
+ return false;
+ }
+
+ @Override
+ public int getStatus() throws SystemException {
+ return 0;
+ }
+
+ @Override
+ public void registerSynchronization(Synchronization arg0)
+ throws IllegalStateException, RollbackException, SystemException {
+ // Noop
+ }
+
+ @Override
+ public void rollback() throws IllegalStateException, SystemException {
+ // Noop
+ }
+
+ @Override
+ public void setRollbackOnly() throws IllegalStateException,
SystemException {
+ // Noop
+ }
+
+}
diff --git
a/src/test/java/org/apache/commons/dbcp2/transaction/TransactionManagerAdapter.java
b/src/test/java/org/apache/commons/dbcp2/transaction/TransactionManagerAdapter.java
new file mode 100644
index 0000000..b6a3b10
--- /dev/null
+++
b/src/test/java/org/apache/commons/dbcp2/transaction/TransactionManagerAdapter.java
@@ -0,0 +1,80 @@
+/*
+ * 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.
+ */
+
+package org.apache.commons.dbcp2.transaction;
+
+import javax.transaction.HeuristicMixedException;
+import javax.transaction.HeuristicRollbackException;
+import javax.transaction.InvalidTransactionException;
+import javax.transaction.NotSupportedException;
+import javax.transaction.RollbackException;
+import javax.transaction.SystemException;
+import javax.transaction.Transaction;
+import javax.transaction.TransactionManager;
+
+/**
+ * A TransactionManager adapter.
+ */
+public class TransactionManagerAdapter implements TransactionManager {
+
+ @Override
+ public void begin() throws NotSupportedException, SystemException {
+ // Noop
+ }
+
+ @Override
+ public void commit() throws HeuristicMixedException,
HeuristicRollbackException, IllegalStateException,
+ RollbackException, SecurityException, SystemException {
+ // Noop
+ }
+
+ @Override
+ public int getStatus() throws SystemException {
+ return 0;
+ }
+
+ @Override
+ public Transaction getTransaction() throws SystemException {
+ return null;
+ }
+
+ @Override
+ public void resume(Transaction arg0) throws IllegalStateException,
InvalidTransactionException, SystemException {
+ // Noop
+ }
+
+ @Override
+ public void rollback() throws IllegalStateException, SecurityException,
SystemException {
+ // Noop
+ }
+
+ @Override
+ public void setRollbackOnly() throws IllegalStateException,
SystemException {
+ // Noop
+ }
+
+ @Override
+ public void setTransactionTimeout(int arg0) throws SystemException {
+ // Noop
+ }
+
+ @Override
+ public Transaction suspend() throws SystemException {
+ return null;
+ }
+
+}
diff --git
a/src/test/java/org/apache/commons/dbcp2/transaction/TransactionSynchronizationRegistryAdapter.java
b/src/test/java/org/apache/commons/dbcp2/transaction/TransactionSynchronizationRegistryAdapter.java
new file mode 100644
index 0000000..460068e
--- /dev/null
+++
b/src/test/java/org/apache/commons/dbcp2/transaction/TransactionSynchronizationRegistryAdapter.java
@@ -0,0 +1,63 @@
+/*
+ * 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.
+ */
+
+package org.apache.commons.dbcp2.transaction;
+
+import javax.transaction.Synchronization;
+import javax.transaction.TransactionSynchronizationRegistry;
+
+/**
+ * A TransactionSynchronizationRegistry adapter.
+ */
+public class TransactionSynchronizationRegistryAdapter implements
TransactionSynchronizationRegistry {
+
+ @Override
+ public Object getResource(Object arg0) {
+ return null;
+ }
+
+ @Override
+ public boolean getRollbackOnly() {
+ return false;
+ }
+
+ @Override
+ public Object getTransactionKey() {
+ return null;
+ }
+
+ @Override
+ public int getTransactionStatus() {
+ return 0;
+ }
+
+ @Override
+ public void putResource(Object arg0, Object arg1) {
+ // Noop
+ }
+
+ @Override
+ public void registerInterposedSynchronization(Synchronization arg0) {
+ // Noop
+ }
+
+ @Override
+ public void setRollbackOnly() {
+ // Noop
+ }
+
+}
