You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jdo-commits@db.apache.org by mb...@apache.org on 2023/01/08 18:04:08 UTC
[db-jdo] 10/18: JDO-823: Using Constants prefix when accessing constants from the Constants interface
This is an automated email from the ASF dual-hosted git repository.
mbo pushed a commit to branch JDO-823-2
in repository https://gitbox.apache.org/repos/asf/db-jdo.git
commit 4dc1e417bb851614d4eb574923508db4165611cb
Author: Michael Bouschen <Mi...@akquinet.de>
AuthorDate: Sat Jan 7 21:39:18 2023 +0100
JDO-823: Using Constants prefix when accessing constants from the Constants interface
---
api/src/main/java/javax/jdo/JDOHelper.java | 107 ++++++++++++---------
.../test/java/javax/jdo/AbstractJDOConfigTest.java | 3 +-
api/src/test/java/javax/jdo/EnhancerTest.java | 6 +-
.../test/java/javax/jdo/JDOHelperConfigTest.java | 81 ++++++++++------
api/src/test/java/javax/jdo/PMFService.java | 5 +-
api/src/test/java/javax/jdo/stub/StubPMF.java | 52 +++++-----
.../tck/api/persistencemanager/GetProperties.java | 46 ++++-----
.../SetTransactionIsolationLevel.java | 16 +--
.../jdo/tck/transactions/SetIsolationLevel.java | 8 +-
9 files changed, 189 insertions(+), 135 deletions(-)
diff --git a/api/src/main/java/javax/jdo/JDOHelper.java b/api/src/main/java/javax/jdo/JDOHelper.java
index 1ffb13f6..1689195e 100644
--- a/api/src/main/java/javax/jdo/JDOHelper.java
+++ b/api/src/main/java/javax/jdo/JDOHelper.java
@@ -97,27 +97,39 @@ public class JDOHelper implements Constants {
static Map<String, String> createAttributePropertyXref() {
Map<String, String> xref = new HashMap<>();
- xref.put(PMF_ATTRIBUTE_CLASS, PROPERTY_PERSISTENCE_MANAGER_FACTORY_CLASS);
- xref.put(PMF_ATTRIBUTE_CONNECTION_DRIVER_NAME, PROPERTY_CONNECTION_DRIVER_NAME);
- xref.put(PMF_ATTRIBUTE_CONNECTION_FACTORY_NAME, PROPERTY_CONNECTION_FACTORY_NAME);
- xref.put(PMF_ATTRIBUTE_CONNECTION_FACTORY2_NAME, PROPERTY_CONNECTION_FACTORY2_NAME);
- xref.put(PMF_ATTRIBUTE_CONNECTION_PASSWORD, PROPERTY_CONNECTION_PASSWORD);
- xref.put(PMF_ATTRIBUTE_CONNECTION_URL, PROPERTY_CONNECTION_URL);
- xref.put(PMF_ATTRIBUTE_CONNECTION_USER_NAME, PROPERTY_CONNECTION_USER_NAME);
- xref.put(PMF_ATTRIBUTE_IGNORE_CACHE, PROPERTY_IGNORE_CACHE);
- xref.put(PMF_ATTRIBUTE_MAPPING, PROPERTY_MAPPING);
- xref.put(PMF_ATTRIBUTE_MULTITHREADED, PROPERTY_MULTITHREADED);
- xref.put(PMF_ATTRIBUTE_NONTRANSACTIONAL_READ, PROPERTY_NONTRANSACTIONAL_READ);
- xref.put(PMF_ATTRIBUTE_NONTRANSACTIONAL_WRITE, PROPERTY_NONTRANSACTIONAL_WRITE);
- xref.put(PMF_ATTRIBUTE_OPTIMISTIC, PROPERTY_OPTIMISTIC);
- xref.put(PMF_ATTRIBUTE_PERSISTENCE_UNIT_NAME, PROPERTY_PERSISTENCE_UNIT_NAME);
- xref.put(PMF_ATTRIBUTE_NAME, PROPERTY_NAME);
- xref.put(PMF_ATTRIBUTE_RESTORE_VALUES, PROPERTY_RESTORE_VALUES);
- xref.put(PMF_ATTRIBUTE_RETAIN_VALUES, PROPERTY_RETAIN_VALUES);
- xref.put(PMF_ATTRIBUTE_DETACH_ALL_ON_COMMIT, PROPERTY_DETACH_ALL_ON_COMMIT);
- xref.put(PMF_ATTRIBUTE_SERVER_TIME_ZONE_ID, PROPERTY_SERVER_TIME_ZONE_ID);
- xref.put(PMF_ATTRIBUTE_DATASTORE_READ_TIMEOUT_MILLIS, PROPERTY_DATASTORE_READ_TIMEOUT_MILLIS);
- xref.put(PMF_ATTRIBUTE_DATASTORE_WRITE_TIMEOUT_MILLIS, PROPERTY_DATASTORE_WRITE_TIMEOUT_MILLIS);
+ xref.put(Constants.PMF_ATTRIBUTE_CLASS, Constants.PROPERTY_PERSISTENCE_MANAGER_FACTORY_CLASS);
+ xref.put(
+ Constants.PMF_ATTRIBUTE_CONNECTION_DRIVER_NAME, Constants.PROPERTY_CONNECTION_DRIVER_NAME);
+ xref.put(
+ Constants.PMF_ATTRIBUTE_CONNECTION_FACTORY_NAME,
+ Constants.PROPERTY_CONNECTION_FACTORY_NAME);
+ xref.put(
+ Constants.PMF_ATTRIBUTE_CONNECTION_FACTORY2_NAME,
+ Constants.PROPERTY_CONNECTION_FACTORY2_NAME);
+ xref.put(Constants.PMF_ATTRIBUTE_CONNECTION_PASSWORD, Constants.PROPERTY_CONNECTION_PASSWORD);
+ xref.put(Constants.PMF_ATTRIBUTE_CONNECTION_URL, Constants.PROPERTY_CONNECTION_URL);
+ xref.put(Constants.PMF_ATTRIBUTE_CONNECTION_USER_NAME, Constants.PROPERTY_CONNECTION_USER_NAME);
+ xref.put(Constants.PMF_ATTRIBUTE_IGNORE_CACHE, Constants.PROPERTY_IGNORE_CACHE);
+ xref.put(Constants.PMF_ATTRIBUTE_MAPPING, Constants.PROPERTY_MAPPING);
+ xref.put(Constants.PMF_ATTRIBUTE_MULTITHREADED, Constants.PROPERTY_MULTITHREADED);
+ xref.put(
+ Constants.PMF_ATTRIBUTE_NONTRANSACTIONAL_READ, Constants.PROPERTY_NONTRANSACTIONAL_READ);
+ xref.put(
+ Constants.PMF_ATTRIBUTE_NONTRANSACTIONAL_WRITE, Constants.PROPERTY_NONTRANSACTIONAL_WRITE);
+ xref.put(Constants.PMF_ATTRIBUTE_OPTIMISTIC, Constants.PROPERTY_OPTIMISTIC);
+ xref.put(
+ Constants.PMF_ATTRIBUTE_PERSISTENCE_UNIT_NAME, Constants.PROPERTY_PERSISTENCE_UNIT_NAME);
+ xref.put(Constants.PMF_ATTRIBUTE_NAME, Constants.PROPERTY_NAME);
+ xref.put(Constants.PMF_ATTRIBUTE_RESTORE_VALUES, Constants.PROPERTY_RESTORE_VALUES);
+ xref.put(Constants.PMF_ATTRIBUTE_RETAIN_VALUES, Constants.PROPERTY_RETAIN_VALUES);
+ xref.put(Constants.PMF_ATTRIBUTE_DETACH_ALL_ON_COMMIT, Constants.PROPERTY_DETACH_ALL_ON_COMMIT);
+ xref.put(Constants.PMF_ATTRIBUTE_SERVER_TIME_ZONE_ID, Constants.PROPERTY_SERVER_TIME_ZONE_ID);
+ xref.put(
+ Constants.PMF_ATTRIBUTE_DATASTORE_READ_TIMEOUT_MILLIS,
+ Constants.PROPERTY_DATASTORE_READ_TIMEOUT_MILLIS);
+ xref.put(
+ Constants.PMF_ATTRIBUTE_DATASTORE_WRITE_TIMEOUT_MILLIS,
+ Constants.PROPERTY_DATASTORE_WRITE_TIMEOUT_MILLIS);
return Collections.unmodifiableMap(xref);
}
@@ -572,7 +584,8 @@ public class JDOHelper implements Constants {
*/
public static PersistenceManagerFactory getPersistenceManagerFactory() {
ClassLoader cl = getContextClassLoader();
- return getPersistenceManagerFactory(null, ANONYMOUS_PERSISTENCE_MANAGER_FACTORY_NAME, cl, cl);
+ return getPersistenceManagerFactory(
+ null, Constants.ANONYMOUS_PERSISTENCE_MANAGER_FACTORY_NAME, cl, cl);
}
/**
@@ -586,7 +599,7 @@ public class JDOHelper implements Constants {
*/
public static PersistenceManagerFactory getPersistenceManagerFactory(ClassLoader pmfClassLoader) {
return getPersistenceManagerFactory(
- null, ANONYMOUS_PERSISTENCE_MANAGER_FACTORY_NAME, pmfClassLoader, pmfClassLoader);
+ null, Constants.ANONYMOUS_PERSISTENCE_MANAGER_FACTORY_NAME, pmfClassLoader, pmfClassLoader);
}
/**
@@ -697,7 +710,7 @@ public class JDOHelper implements Constants {
JDOImplHelper.assertOnlyKnownStandardProperties(props);
// first try to get the class name from the properties object.
- String pmfClassName = (String) props.get(PROPERTY_PERSISTENCE_MANAGER_FACTORY_CLASS);
+ String pmfClassName = (String) props.get(Constants.PROPERTY_PERSISTENCE_MANAGER_FACTORY_CLASS);
if (!isNullOrBlank(pmfClassName)) {
// a valid name was returned from the properties.
@@ -723,7 +736,7 @@ public class JDOHelper implements Constants {
*/
Enumeration<URL> urls = null;
try {
- urls = getResources(pmfClassLoader, SERVICE_LOOKUP_PMF_RESOURCE_NAME);
+ urls = getResources(pmfClassLoader, Constants.SERVICE_LOOKUP_PMF_RESOURCE_NAME);
} catch (Throwable ex) {
exceptions.add(ex);
}
@@ -950,8 +963,8 @@ public class JDOHelper implements Constants {
Map<Object, Object> props = null;
// trim spaces from name and ensure non-null
- name = (name == null ? ANONYMOUS_PERSISTENCE_MANAGER_FACTORY_NAME : name.trim());
- if (!ANONYMOUS_PERSISTENCE_MANAGER_FACTORY_NAME.equals(name)) {
+ name = (name == null ? Constants.ANONYMOUS_PERSISTENCE_MANAGER_FACTORY_NAME : name.trim());
+ if (!Constants.ANONYMOUS_PERSISTENCE_MANAGER_FACTORY_NAME.equals(name)) {
props = loadPropertiesFromResource(resourceLoader, name);
}
@@ -959,8 +972,8 @@ public class JDOHelper implements Constants {
// add the SPI property to inform the implementation that
// the PMF was configured by the given resource name
// and not via named PMF for proper deserialization
- props.put(PROPERTY_SPI_RESOURCE_NAME, name);
- props.remove(PROPERTY_NAME);
+ props.put(Constants.PROPERTY_SPI_RESOURCE_NAME, name);
+ props.remove(Constants.PROPERTY_NAME);
return getPersistenceManagerFactory(overrides, props, pmfLoader);
}
// props were null; try getting from jdoconfig.xml
@@ -968,15 +981,15 @@ public class JDOHelper implements Constants {
if (props != null) {
// inform the impl that the config came from a jdoconfig.xml
// element with the given name
- props.put(PROPERTY_NAME, name);
- props.remove(PROPERTY_SPI_RESOURCE_NAME);
+ props.put(Constants.PROPERTY_NAME, name);
+ props.remove(Constants.PROPERTY_SPI_RESOURCE_NAME);
// we have loaded a Properties, delegate to implementation
return getPersistenceManagerFactory(overrides, props, pmfLoader);
}
// no properties found; last try to see if name is a JPA PU name
- if (!ANONYMOUS_PERSISTENCE_MANAGER_FACTORY_NAME.equals(name)) {
+ if (!Constants.ANONYMOUS_PERSISTENCE_MANAGER_FACTORY_NAME.equals(name)) {
props = new Properties();
- props.put(PROPERTY_PERSISTENCE_UNIT_NAME, name);
+ props.put(Constants.PROPERTY_PERSISTENCE_UNIT_NAME, name);
return getPersistenceManagerFactory(overrides, props, pmfLoader);
}
@@ -1121,7 +1134,7 @@ public class JDOHelper implements Constants {
*/
protected static Map<Object, Object> getPropertiesFromJdoconfig(
String name, ClassLoader resourceLoader) {
- return getNamedPMFProperties(name, resourceLoader, JDOCONFIG_RESOURCE_NAME);
+ return getNamedPMFProperties(name, resourceLoader, Constants.JDOCONFIG_RESOURCE_NAME);
}
/**
@@ -1270,7 +1283,7 @@ public class JDOHelper implements Constants {
MSG.msg("EXC_InvalidJDOConfigNoRoot", url.toExternalForm()));
}
- NodeList pmfs = root.getElementsByTagName(ELEMENT_PERSISTENCE_MANAGER_FACTORY);
+ NodeList pmfs = root.getElementsByTagName(Constants.ELEMENT_PERSISTENCE_MANAGER_FACTORY);
for (int i = 0; i < pmfs.getLength(); i++) {
Node pmfElement = pmfs.item(i);
@@ -1280,8 +1293,8 @@ public class JDOHelper implements Constants {
Properties pmfPropertiesFromElements = readPropertiesFromPMFSubelements(pmfElement, url);
// for informative error handling, get name (or names) now
- String pmfNameFromAtts = pmfPropertiesFromAttributes.getProperty(PROPERTY_NAME);
- String pmfNameFromElem = pmfPropertiesFromElements.getProperty(PROPERTY_NAME);
+ String pmfNameFromAtts = pmfPropertiesFromAttributes.getProperty(Constants.PROPERTY_NAME);
+ String pmfNameFromElem = pmfPropertiesFromElements.getProperty(Constants.PROPERTY_NAME);
String pmfName = null;
if (isNullOrBlank(pmfNameFromAtts)) {
@@ -1291,7 +1304,7 @@ public class JDOHelper implements Constants {
pmfName = pmfNameFromElem;
} else {
// PMF name not given at all, means the "anonymous" PMF
- pmfName = ANONYMOUS_PERSISTENCE_MANAGER_FACTORY_NAME;
+ pmfName = Constants.ANONYMOUS_PERSISTENCE_MANAGER_FACTORY_NAME;
}
} else {
// PMF name given in an attribute
@@ -1401,11 +1414,11 @@ public class JDOHelper implements Constants {
String elementName = element.getNodeName();
NamedNodeMap attributes = element.getAttributes();
- if (ELEMENT_PROPERTY.equalsIgnoreCase(elementName)) {
+ if (Constants.ELEMENT_PROPERTY.equalsIgnoreCase(elementName)) {
// <property name="..." value="..."/>
// get the "name" attribute's value (required)
- Node nameAtt = attributes.getNamedItem(PROPERTY_ATTRIBUTE_NAME);
+ Node nameAtt = attributes.getNamedItem(Constants.PROPERTY_ATTRIBUTE_NAME);
if (nameAtt == null) {
throw new JDOFatalUserException(MSG.msg("EXC_PropertyElementHasNoNameAttribute", url));
}
@@ -1428,15 +1441,16 @@ public class JDOHelper implements Constants {
}
// get the "value" attribute's value (optional)
- Node valueAtt = attributes.getNamedItem(PROPERTY_ATTRIBUTE_VALUE);
+ Node valueAtt = attributes.getNamedItem(Constants.PROPERTY_ATTRIBUTE_VALUE);
String value = valueAtt == null ? null : valueAtt.getNodeValue().trim();
p.put(propertyName, value);
- } else if (ELEMENT_INSTANCE_LIFECYCLE_LISTENER.equals(elementName)) {
+ } else if (Constants.ELEMENT_INSTANCE_LIFECYCLE_LISTENER.equals(elementName)) {
// <instance-lifecycle-listener listener="..." classes="..."/>
// get the "listener" attribute's value
- Node listenerAtt = attributes.getNamedItem(INSTANCE_LIFECYCLE_LISTENER_ATTRIBUTE_LISTENER);
+ Node listenerAtt =
+ attributes.getNamedItem(Constants.INSTANCE_LIFECYCLE_LISTENER_ATTRIBUTE_LISTENER);
if (listenerAtt == null) {
throw new JDOFatalUserException(MSG.msg("EXC_MissingListenerAttribute", url));
}
@@ -1447,10 +1461,11 @@ public class JDOHelper implements Constants {
// listener properties are of the form
// "javax.jdo.option.InstanceLifecycleListener." + listener
- listener = PROPERTY_PREFIX_INSTANCE_LIFECYCLE_LISTENER + listener;
+ listener = Constants.PROPERTY_PREFIX_INSTANCE_LIFECYCLE_LISTENER + listener;
// get the "classes" attribute's value (optional)
- Node classesAtt = attributes.getNamedItem(INSTANCE_LIFECYCLE_LISTENER_ATTRIBUTE_CLASSES);
+ Node classesAtt =
+ attributes.getNamedItem(Constants.INSTANCE_LIFECYCLE_LISTENER_ATTRIBUTE_CLASSES);
String value = classesAtt == null ? "" : classesAtt.getNodeValue().trim();
p.put(listener, value);
@@ -1633,7 +1648,7 @@ public class JDOHelper implements Constants {
ArrayList<Throwable> exceptions = new ArrayList<>();
int numberOfJDOEnhancers = 0;
try {
- Enumeration<URL> urls = getResources(loader, SERVICE_LOOKUP_ENHANCER_RESOURCE_NAME);
+ Enumeration<URL> urls = getResources(loader, Constants.SERVICE_LOOKUP_ENHANCER_RESOURCE_NAME);
if (urls != null) {
while (urls.hasMoreElements()) {
numberOfJDOEnhancers++;
diff --git a/api/src/test/java/javax/jdo/AbstractJDOConfigTest.java b/api/src/test/java/javax/jdo/AbstractJDOConfigTest.java
index 567d5f4f..04cec026 100644
--- a/api/src/test/java/javax/jdo/AbstractJDOConfigTest.java
+++ b/api/src/test/java/javax/jdo/AbstractJDOConfigTest.java
@@ -118,7 +118,8 @@ public abstract class AbstractJDOConfigTest extends AbstractTest {
protected String getPMFClassNameViaServiceLookup(ClassLoader loader) {
try {
- Enumeration<URL> urls = JDOHelper.getResources(loader, SERVICE_LOOKUP_PMF_RESOURCE_NAME);
+ Enumeration<URL> urls =
+ JDOHelper.getResources(loader, Constants.SERVICE_LOOKUP_PMF_RESOURCE_NAME);
while (urls.hasMoreElements()) {
// return the first one found
return JDOHelper.getClassNameFromURL(urls.nextElement());
diff --git a/api/src/test/java/javax/jdo/EnhancerTest.java b/api/src/test/java/javax/jdo/EnhancerTest.java
index 3c584751..55c81849 100644
--- a/api/src/test/java/javax/jdo/EnhancerTest.java
+++ b/api/src/test/java/javax/jdo/EnhancerTest.java
@@ -90,7 +90,7 @@ public class EnhancerTest extends AbstractTest {
public void testInvalidOption() {
// invoke enhancer with an invalid option
InvocationResult result = invokeEnhancer("-poo");
- assertEquals("Wrong return value ", ENHANCER_USAGE_ERROR, result.getExitValue());
+ assertEquals("Wrong return value ", Constants.ENHANCER_USAGE_ERROR, result.getExitValue());
String errorString = result.getErrorString();
assertTrue(
"Expected Usage message from err:\n" + errorString,
@@ -109,13 +109,13 @@ public class EnhancerTest extends AbstractTest {
+ outputString
+ " with err:\n"
+ errorString,
- outputString.contains(PROPERTY_ENHANCER_VENDOR_NAME));
+ outputString.contains(Constants.PROPERTY_ENHANCER_VENDOR_NAME));
assertTrue(
"Expected MockEnhancer version message from out:\n"
+ outputString
+ " with err:\n"
+ errorString,
- outputString.contains(PROPERTY_ENHANCER_VERSION_NUMBER));
+ outputString.contains(Constants.PROPERTY_ENHANCER_VERSION_NUMBER));
assertTrue(
"Expected MockEnhancer vendor message from out:\n"
+ outputString
diff --git a/api/src/test/java/javax/jdo/JDOHelperConfigTest.java b/api/src/test/java/javax/jdo/JDOHelperConfigTest.java
index 802a8149..9f86c12b 100644
--- a/api/src/test/java/javax/jdo/JDOHelperConfigTest.java
+++ b/api/src/test/java/javax/jdo/JDOHelperConfigTest.java
@@ -71,47 +71,70 @@ public class JDOHelperConfigTest extends AbstractJDOConfigTest implements Consta
Map<String, String> expected = new HashMap<>();
if (!excludeName) {
- expected.put(PROPERTY_NAME, PMF_ATTRIBUTE_NAME + "." + testVariant);
+ expected.put(Constants.PROPERTY_NAME, Constants.PMF_ATTRIBUTE_NAME + "." + testVariant);
}
if (!excludePUName) {
expected.put(
- PROPERTY_PERSISTENCE_UNIT_NAME, PMF_ATTRIBUTE_PERSISTENCE_UNIT_NAME + "." + testVariant);
+ Constants.PROPERTY_PERSISTENCE_UNIT_NAME,
+ Constants.PMF_ATTRIBUTE_PERSISTENCE_UNIT_NAME + "." + testVariant);
}
expected.put(
- PROPERTY_PERSISTENCE_MANAGER_FACTORY_CLASS, PMF_ATTRIBUTE_CLASS + "." + testVariant);
+ Constants.PROPERTY_PERSISTENCE_MANAGER_FACTORY_CLASS,
+ Constants.PMF_ATTRIBUTE_CLASS + "." + testVariant);
expected.put(
- PROPERTY_CONNECTION_DRIVER_NAME, PMF_ATTRIBUTE_CONNECTION_DRIVER_NAME + "." + testVariant);
+ Constants.PROPERTY_CONNECTION_DRIVER_NAME,
+ Constants.PMF_ATTRIBUTE_CONNECTION_DRIVER_NAME + "." + testVariant);
expected.put(
- PROPERTY_CONNECTION_FACTORY_NAME,
- PMF_ATTRIBUTE_CONNECTION_FACTORY_NAME + "." + testVariant);
+ Constants.PROPERTY_CONNECTION_FACTORY_NAME,
+ Constants.PMF_ATTRIBUTE_CONNECTION_FACTORY_NAME + "." + testVariant);
expected.put(
- PROPERTY_CONNECTION_FACTORY2_NAME,
- PMF_ATTRIBUTE_CONNECTION_FACTORY2_NAME + "." + testVariant);
+ Constants.PROPERTY_CONNECTION_FACTORY2_NAME,
+ Constants.PMF_ATTRIBUTE_CONNECTION_FACTORY2_NAME + "." + testVariant);
expected.put(
- PROPERTY_CONNECTION_PASSWORD, PMF_ATTRIBUTE_CONNECTION_PASSWORD + "." + testVariant);
- expected.put(PROPERTY_CONNECTION_URL, PMF_ATTRIBUTE_CONNECTION_URL + "." + testVariant);
+ Constants.PROPERTY_CONNECTION_PASSWORD,
+ Constants.PMF_ATTRIBUTE_CONNECTION_PASSWORD + "." + testVariant);
expected.put(
- PROPERTY_CONNECTION_USER_NAME, PMF_ATTRIBUTE_CONNECTION_USER_NAME + "." + testVariant);
- expected.put(PROPERTY_IGNORE_CACHE, PMF_ATTRIBUTE_IGNORE_CACHE + "." + testVariant);
- expected.put(PROPERTY_MAPPING, PMF_ATTRIBUTE_MAPPING + "." + testVariant);
- expected.put(PROPERTY_MULTITHREADED, PMF_ATTRIBUTE_MULTITHREADED + "." + testVariant);
+ Constants.PROPERTY_CONNECTION_URL,
+ Constants.PMF_ATTRIBUTE_CONNECTION_URL + "." + testVariant);
expected.put(
- PROPERTY_NONTRANSACTIONAL_READ, PMF_ATTRIBUTE_NONTRANSACTIONAL_READ + "." + testVariant);
+ Constants.PROPERTY_CONNECTION_USER_NAME,
+ Constants.PMF_ATTRIBUTE_CONNECTION_USER_NAME + "." + testVariant);
expected.put(
- PROPERTY_NONTRANSACTIONAL_WRITE, PMF_ATTRIBUTE_NONTRANSACTIONAL_WRITE + "." + testVariant);
- expected.put(PROPERTY_OPTIMISTIC, PMF_ATTRIBUTE_OPTIMISTIC + "." + testVariant);
- expected.put(PROPERTY_RESTORE_VALUES, PMF_ATTRIBUTE_RESTORE_VALUES + "." + testVariant);
- expected.put(PROPERTY_RETAIN_VALUES, PMF_ATTRIBUTE_RETAIN_VALUES + "." + testVariant);
+ Constants.PROPERTY_IGNORE_CACHE, Constants.PMF_ATTRIBUTE_IGNORE_CACHE + "." + testVariant);
+ expected.put(Constants.PROPERTY_MAPPING, Constants.PMF_ATTRIBUTE_MAPPING + "." + testVariant);
expected.put(
- PROPERTY_DETACH_ALL_ON_COMMIT, PMF_ATTRIBUTE_DETACH_ALL_ON_COMMIT + "." + testVariant);
+ Constants.PROPERTY_MULTITHREADED,
+ Constants.PMF_ATTRIBUTE_MULTITHREADED + "." + testVariant);
expected.put(
- PROPERTY_SERVER_TIME_ZONE_ID, PMF_ATTRIBUTE_SERVER_TIME_ZONE_ID + "." + testVariant);
+ Constants.PROPERTY_NONTRANSACTIONAL_READ,
+ Constants.PMF_ATTRIBUTE_NONTRANSACTIONAL_READ + "." + testVariant);
+ expected.put(
+ Constants.PROPERTY_NONTRANSACTIONAL_WRITE,
+ Constants.PMF_ATTRIBUTE_NONTRANSACTIONAL_WRITE + "." + testVariant);
+ expected.put(
+ Constants.PROPERTY_OPTIMISTIC, Constants.PMF_ATTRIBUTE_OPTIMISTIC + "." + testVariant);
+ expected.put(
+ Constants.PROPERTY_RESTORE_VALUES,
+ Constants.PMF_ATTRIBUTE_RESTORE_VALUES + "." + testVariant);
+ expected.put(
+ Constants.PROPERTY_RETAIN_VALUES,
+ Constants.PMF_ATTRIBUTE_RETAIN_VALUES + "." + testVariant);
+ expected.put(
+ Constants.PROPERTY_DETACH_ALL_ON_COMMIT,
+ Constants.PMF_ATTRIBUTE_DETACH_ALL_ON_COMMIT + "." + testVariant);
+ expected.put(
+ Constants.PROPERTY_SERVER_TIME_ZONE_ID,
+ Constants.PMF_ATTRIBUTE_SERVER_TIME_ZONE_ID + "." + testVariant);
// listeners
for (int i = 0; i < listenerCount; i++) {
expected.put(
- PROPERTY_PREFIX_INSTANCE_LIFECYCLE_LISTENER + "listener." + testVariant + ".listener" + i,
+ Constants.PROPERTY_PREFIX_INSTANCE_LIFECYCLE_LISTENER
+ + "listener."
+ + testVariant
+ + ".listener"
+ + i,
"classes." + testVariant + ".classes" + i);
}
@@ -198,7 +221,7 @@ public class JDOHelperConfigTest extends AbstractJDOConfigTest implements Consta
vendorSpecificPropertyCount,
excludeName,
excludePUName);
- String name = testVariantName == null ? null : expected.get(PROPERTY_NAME);
+ String name = testVariantName == null ? null : expected.get(Constants.PROPERTY_NAME);
Map<Object, Object> actual = JDOHelper.getPropertiesFromJdoconfig(name, loader);
assertNotNull("No properties found", actual);
@@ -246,7 +269,8 @@ public class JDOHelperConfigTest extends AbstractJDOConfigTest implements Consta
};
URLClassLoader loader = new JDOConfigTestClassLoader(getClass().getClassLoader(), classpaths);
Map<Object, Object> actual =
- JDOHelper.getPropertiesFromJdoconfig(ANONYMOUS_PERSISTENCE_MANAGER_FACTORY_NAME, loader);
+ JDOHelper.getPropertiesFromJdoconfig(
+ Constants.ANONYMOUS_PERSISTENCE_MANAGER_FACTORY_NAME, loader);
assertNotNull("Anonymous PMF with no properties returned null", actual);
assertEquals("Anonymous PMF with no properties had properties", 0, actual.size());
}
@@ -258,7 +282,8 @@ public class JDOHelperConfigTest extends AbstractJDOConfigTest implements Consta
getClass().getClassLoader(), JDOCONFIG_CLASSPATH_PREFIX + "/Positive02/");
Map<Object, Object> properties =
- JDOHelper.getPropertiesFromJdoconfig(ANONYMOUS_PERSISTENCE_MANAGER_FACTORY_NAME, loader);
+ JDOHelper.getPropertiesFromJdoconfig(
+ Constants.ANONYMOUS_PERSISTENCE_MANAGER_FACTORY_NAME, loader);
assertNotNull("Anonymous PMF with no properties returned null", properties);
assertEquals("Anonymous PMF with no properties had properties", 0, properties.size());
}
@@ -309,7 +334,8 @@ public class JDOHelperConfigTest extends AbstractJDOConfigTest implements Consta
Map<String, String> expected = prepareInitialExpectedMap("positive06.pmf0", 2, 0, true, true);
Map<Object, Object> actual =
- JDOHelper.getPropertiesFromJdoconfig(ANONYMOUS_PERSISTENCE_MANAGER_FACTORY_NAME, loader);
+ JDOHelper.getPropertiesFromJdoconfig(
+ Constants.ANONYMOUS_PERSISTENCE_MANAGER_FACTORY_NAME, loader);
assertNotNull("No properties found", actual);
assertEqualProperties(expected, actual);
@@ -323,7 +349,8 @@ public class JDOHelperConfigTest extends AbstractJDOConfigTest implements Consta
Map<String, String> expected = prepareInitialExpectedMap("positive07.pmf0", 2, 0, true, false);
Map<Object, Object> actual =
- JDOHelper.getPropertiesFromJdoconfig(ANONYMOUS_PERSISTENCE_MANAGER_FACTORY_NAME, loader);
+ JDOHelper.getPropertiesFromJdoconfig(
+ Constants.ANONYMOUS_PERSISTENCE_MANAGER_FACTORY_NAME, loader);
assertNotNull("No properties found", actual);
assertEqualProperties(expected, actual);
diff --git a/api/src/test/java/javax/jdo/PMFService.java b/api/src/test/java/javax/jdo/PMFService.java
index 4c62901d..90ef38b0 100644
--- a/api/src/test/java/javax/jdo/PMFService.java
+++ b/api/src/test/java/javax/jdo/PMFService.java
@@ -41,10 +41,11 @@ public class PMFService implements Constants {
private static void setPMFProperties(
PersistenceManagerFactory pmf, Map<?, ?> props, Map<?, ?> overrides) {
- pmf.setConnectionDriverName((String) props.get(PROPERTY_CONNECTION_DRIVER_NAME));
+ pmf.setConnectionDriverName((String) props.get(Constants.PROPERTY_CONNECTION_DRIVER_NAME));
if (overrides != null) {
- pmf.setConnectionDriverName((String) overrides.get(PROPERTY_CONNECTION_DRIVER_NAME));
+ pmf.setConnectionDriverName(
+ (String) overrides.get(Constants.PROPERTY_CONNECTION_DRIVER_NAME));
}
}
}
diff --git a/api/src/test/java/javax/jdo/stub/StubPMF.java b/api/src/test/java/javax/jdo/stub/StubPMF.java
index ff74693b..6768ac2c 100644
--- a/api/src/test/java/javax/jdo/stub/StubPMF.java
+++ b/api/src/test/java/javax/jdo/stub/StubPMF.java
@@ -421,107 +421,107 @@ public class StubPMF implements PersistenceManagerFactory, Constants {
void setProperty(String name, Object value) {
String val = value.toString();
- if (name.equals(PROPERTY_PERSISTENCE_MANAGER_FACTORY_CLASS)) {
+ if (name.equals(Constants.PROPERTY_PERSISTENCE_MANAGER_FACTORY_CLASS)) {
setPersistenceManagerFactoryClass(val);
return;
}
- if (name.equals(PROPERTY_CONNECTION_DRIVER_NAME)) {
+ if (name.equals(Constants.PROPERTY_CONNECTION_DRIVER_NAME)) {
setConnectionDriverName(val);
return;
}
- if (name.equals(PROPERTY_CONNECTION_FACTORY_NAME)) {
+ if (name.equals(Constants.PROPERTY_CONNECTION_FACTORY_NAME)) {
setConnectionFactoryName(val);
return;
}
- if (name.equals(PROPERTY_CONNECTION_FACTORY2_NAME)) {
+ if (name.equals(Constants.PROPERTY_CONNECTION_FACTORY2_NAME)) {
setConnectionFactory2Name(val);
return;
}
- if (name.equals(PROPERTY_CONNECTION_PASSWORD)) {
+ if (name.equals(Constants.PROPERTY_CONNECTION_PASSWORD)) {
setConnectionPassword(val);
return;
}
- if (name.equals(PROPERTY_CONNECTION_URL)) {
+ if (name.equals(Constants.PROPERTY_CONNECTION_URL)) {
setConnectionURL(val);
return;
}
- if (name.equals(PROPERTY_CONNECTION_USER_NAME)) {
+ if (name.equals(Constants.PROPERTY_CONNECTION_USER_NAME)) {
setConnectionUserName(val);
return;
}
- if (name.equals(PROPERTY_IGNORE_CACHE)) {
+ if (name.equals(Constants.PROPERTY_IGNORE_CACHE)) {
setCopyOnAttach(Boolean.parseBoolean(val));
return;
}
- if (name.equals(PROPERTY_DATASTORE_READ_TIMEOUT_MILLIS)) {
+ if (name.equals(Constants.PROPERTY_DATASTORE_READ_TIMEOUT_MILLIS)) {
setDatastoreReadTimeoutMillis(Integer.parseInt(val));
return;
}
- if (name.equals(PROPERTY_DATASTORE_WRITE_TIMEOUT_MILLIS)) {
+ if (name.equals(Constants.PROPERTY_DATASTORE_WRITE_TIMEOUT_MILLIS)) {
setDatastoreWriteTimeoutMillis(Integer.parseInt(val));
return;
}
- if (name.equals(PROPERTY_DETACH_ALL_ON_COMMIT)) {
+ if (name.equals(Constants.PROPERTY_DETACH_ALL_ON_COMMIT)) {
setDetachAllOnCommit(Boolean.parseBoolean(val));
return;
}
- if (name.equals(PROPERTY_IGNORE_CACHE)) {
+ if (name.equals(Constants.PROPERTY_IGNORE_CACHE)) {
setIgnoreCache(Boolean.parseBoolean(val));
return;
}
- if (name.equals(PROPERTY_MAPPING)) {
+ if (name.equals(Constants.PROPERTY_MAPPING)) {
setMapping(val);
return;
}
- if (name.equals(PROPERTY_MULTITHREADED)) {
+ if (name.equals(Constants.PROPERTY_MULTITHREADED)) {
setMultithreaded(Boolean.parseBoolean(val));
return;
}
- if (name.equals(PROPERTY_NAME)) {
+ if (name.equals(Constants.PROPERTY_NAME)) {
setName(val);
return;
}
- if (name.equals(PROPERTY_NONTRANSACTIONAL_READ)) {
+ if (name.equals(Constants.PROPERTY_NONTRANSACTIONAL_READ)) {
setNontransactionalRead(Boolean.parseBoolean(val));
return;
}
- if (name.equals(PROPERTY_NONTRANSACTIONAL_WRITE)) {
+ if (name.equals(Constants.PROPERTY_NONTRANSACTIONAL_WRITE)) {
setNontransactionalWrite(Boolean.parseBoolean(val));
return;
}
- if (name.equals(PROPERTY_OPTIMISTIC)) {
+ if (name.equals(Constants.PROPERTY_OPTIMISTIC)) {
setOptimistic(Boolean.parseBoolean(val));
return;
}
- if (name.equals(PROPERTY_PERSISTENCE_UNIT_NAME)) {
+ if (name.equals(Constants.PROPERTY_PERSISTENCE_UNIT_NAME)) {
setPersistenceUnitName(val);
return;
}
- if (name.equals(PROPERTY_READONLY)) {
+ if (name.equals(Constants.PROPERTY_READONLY)) {
setReadOnly(Boolean.parseBoolean(val));
return;
}
- if (name.equals(PROPERTY_RESTORE_VALUES)) {
+ if (name.equals(Constants.PROPERTY_RESTORE_VALUES)) {
setRestoreValues(Boolean.parseBoolean(val));
return;
}
- if (name.equals(PROPERTY_RETAIN_VALUES)) {
+ if (name.equals(Constants.PROPERTY_RETAIN_VALUES)) {
setRetainValues(Boolean.parseBoolean(val));
return;
}
- if (name.equals(PROPERTY_SERVER_TIME_ZONE_ID)) {
+ if (name.equals(Constants.PROPERTY_SERVER_TIME_ZONE_ID)) {
setServerTimeZoneID(val);
return;
}
- if (name.equals(PROPERTY_TRANSACTION_ISOLATION_LEVEL)) {
+ if (name.equals(Constants.PROPERTY_TRANSACTION_ISOLATION_LEVEL)) {
setTransactionIsolationLevel(val);
return;
}
- if (name.equals(PROPERTY_TRANSACTION_TYPE)) {
+ if (name.equals(Constants.PROPERTY_TRANSACTION_TYPE)) {
setTransactionType(val);
return;
}
- if (name.equals(PROPERTY_SPI_RESOURCE_NAME)) {
+ if (name.equals(Constants.PROPERTY_SPI_RESOURCE_NAME)) {
setSpiResourceName(val);
return;
}
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/GetProperties.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/GetProperties.java
index 7c56d0b3..a6dbe0bb 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/GetProperties.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/GetProperties.java
@@ -212,7 +212,7 @@ public class GetProperties extends JDO_Test implements Constants {
}
private final TestProperty testCopyOnAttach =
- new AbstractAPITestProperty(PROPERTY_COPY_ON_ATTACH, true, false) {
+ new AbstractAPITestProperty(Constants.PROPERTY_COPY_ON_ATTACH, true, false) {
public Object get(PersistenceManager pm) {
return pm.getCopyOnAttach();
}
@@ -223,7 +223,7 @@ public class GetProperties extends JDO_Test implements Constants {
};
private final TestProperty testDatastoreReadTimeoutMillis =
- new AbstractAPITestProperty(PROPERTY_DATASTORE_READ_TIMEOUT_MILLIS, 20, 40) {
+ new AbstractAPITestProperty(Constants.PROPERTY_DATASTORE_READ_TIMEOUT_MILLIS, 20, 40) {
public Object get(PersistenceManager pm) {
return pm.getDatastoreReadTimeoutMillis();
}
@@ -234,7 +234,7 @@ public class GetProperties extends JDO_Test implements Constants {
};
private final TestProperty testDatastoreWriteTimeoutMillis =
- new AbstractAPITestProperty(PROPERTY_DATASTORE_WRITE_TIMEOUT_MILLIS, 60, 80) {
+ new AbstractAPITestProperty(Constants.PROPERTY_DATASTORE_WRITE_TIMEOUT_MILLIS, 60, 80) {
public Object get(PersistenceManager pm) {
return pm.getDatastoreWriteTimeoutMillis();
}
@@ -245,7 +245,7 @@ public class GetProperties extends JDO_Test implements Constants {
};
private final TestProperty testMultithreaded =
- new AbstractAPITestProperty(PROPERTY_MULTITHREADED, true, false) {
+ new AbstractAPITestProperty(Constants.PROPERTY_MULTITHREADED, true, false) {
public Object get(PersistenceManager pm) {
return pm.getMultithreaded();
}
@@ -256,7 +256,7 @@ public class GetProperties extends JDO_Test implements Constants {
};
private final TestProperty testLowerCaseMultithreaded =
- new AbstractAPITestProperty(PROPERTY_MULTITHREADED, true, false) {
+ new AbstractAPITestProperty(Constants.PROPERTY_MULTITHREADED, true, false) {
public Object get(PersistenceManager pm) {
return pm.getMultithreaded();
}
@@ -267,7 +267,7 @@ public class GetProperties extends JDO_Test implements Constants {
};
private final TestProperty testUpperCaseMultithreaded =
- new AbstractAPITestProperty(PROPERTY_MULTITHREADED, true, false) {
+ new AbstractAPITestProperty(Constants.PROPERTY_MULTITHREADED, true, false) {
public Object get(PersistenceManager pm) {
return pm.getMultithreaded();
}
@@ -278,7 +278,7 @@ public class GetProperties extends JDO_Test implements Constants {
};
private final TestProperty testDetachAllOnCommit =
- new AbstractAPITestProperty(PROPERTY_DETACH_ALL_ON_COMMIT, true, false) {
+ new AbstractAPITestProperty(Constants.PROPERTY_DETACH_ALL_ON_COMMIT, true, false) {
public Object get(PersistenceManager pm) {
return pm.getDetachAllOnCommit();
}
@@ -289,7 +289,7 @@ public class GetProperties extends JDO_Test implements Constants {
};
private final TestProperty testIgnoreCache =
- new AbstractAPITestProperty(PROPERTY_IGNORE_CACHE, true, false) {
+ new AbstractAPITestProperty(Constants.PROPERTY_IGNORE_CACHE, true, false) {
public Object get(PersistenceManager pm) {
return pm.getIgnoreCache();
}
@@ -300,7 +300,7 @@ public class GetProperties extends JDO_Test implements Constants {
};
private final TestProperty testOptimistic =
- new AbstractAPITestProperty(PROPERTY_OPTIMISTIC, true, false) {
+ new AbstractAPITestProperty(Constants.PROPERTY_OPTIMISTIC, true, false) {
public Object get(PersistenceManager pm) {
return pm.currentTransaction().getOptimistic();
}
@@ -311,7 +311,7 @@ public class GetProperties extends JDO_Test implements Constants {
};
private final TestProperty testRetainValues =
- new AbstractAPITestProperty(PROPERTY_RETAIN_VALUES, true, false) {
+ new AbstractAPITestProperty(Constants.PROPERTY_RETAIN_VALUES, true, false) {
public Object get(PersistenceManager pm) {
return pm.currentTransaction().getRetainValues();
}
@@ -322,7 +322,7 @@ public class GetProperties extends JDO_Test implements Constants {
};
private final TestProperty testRestoreValues =
- new AbstractAPITestProperty(PROPERTY_RESTORE_VALUES, true, false) {
+ new AbstractAPITestProperty(Constants.PROPERTY_RESTORE_VALUES, true, false) {
public Object get(PersistenceManager pm) {
return pm.currentTransaction().getRestoreValues();
}
@@ -333,7 +333,7 @@ public class GetProperties extends JDO_Test implements Constants {
};
private final TestProperty testNontransactionalRead =
- new AbstractAPITestProperty(PROPERTY_NONTRANSACTIONAL_READ, true, false) {
+ new AbstractAPITestProperty(Constants.PROPERTY_NONTRANSACTIONAL_READ, true, false) {
public Object get(PersistenceManager pm) {
return pm.currentTransaction().getNontransactionalRead();
}
@@ -344,7 +344,7 @@ public class GetProperties extends JDO_Test implements Constants {
};
private final TestProperty testNontransactionalWrite =
- new AbstractAPITestProperty(PROPERTY_NONTRANSACTIONAL_WRITE, true, false) {
+ new AbstractAPITestProperty(Constants.PROPERTY_NONTRANSACTIONAL_WRITE, true, false) {
public Object get(PersistenceManager pm) {
return pm.currentTransaction().getNontransactionalWrite();
}
@@ -355,7 +355,7 @@ public class GetProperties extends JDO_Test implements Constants {
};
private final TestProperty testIllegalArgument =
- new AbstractNonAPITestProperty(PROPERTY_IGNORE_CACHE, 1, false) {};
+ new AbstractNonAPITestProperty(Constants.PROPERTY_IGNORE_CACHE, 1, false) {};
private Set<TestProperty> setOf(TestProperty... testPropertys) {
Set<TestProperty> result = new HashSet<>();
@@ -376,20 +376,22 @@ public class GetProperties extends JDO_Test implements Constants {
testLowerCaseMultithreaded.setMessageForWrongResultAfterSet(ASSERTION_FAILED_12_19_3);
testUpperCaseMultithreaded.setMessageForWrongResultAfterSet(ASSERTION_FAILED_12_19_3);
testOptionalProperties.put(
- PROPERTY_MULTITHREADED,
+ Constants.PROPERTY_MULTITHREADED,
setOf(testMultithreaded, testLowerCaseMultithreaded, testUpperCaseMultithreaded));
testOptionalProperties.put(
- OPTION_DATASTORE_TIMEOUT,
+ Constants.OPTION_DATASTORE_TIMEOUT,
setOf(testDatastoreReadTimeoutMillis, testDatastoreWriteTimeoutMillis));
testOptimistic.setMessageForWrongResultAfterSet(ASSERTION_FAILED_12_19_4);
- testOptionalProperties.put(PROPERTY_OPTIMISTIC, setOf(testOptimistic));
+ testOptionalProperties.put(Constants.PROPERTY_OPTIMISTIC, setOf(testOptimistic));
testRetainValues.setMessageForWrongResultAfterSet(ASSERTION_FAILED_12_19_4);
- testOptionalProperties.put(PROPERTY_RETAIN_VALUES, setOf(testRetainValues));
+ testOptionalProperties.put(Constants.PROPERTY_RETAIN_VALUES, setOf(testRetainValues));
testNontransactionalRead.setMessageForWrongResultAfterSet(ASSERTION_FAILED_12_19_4);
- testOptionalProperties.put(PROPERTY_NONTRANSACTIONAL_READ, setOf(testNontransactionalRead));
+ testOptionalProperties.put(
+ Constants.PROPERTY_NONTRANSACTIONAL_READ, setOf(testNontransactionalRead));
testNontransactionalWrite.setMessageForWrongResultAfterSet(ASSERTION_FAILED_12_19_4);
- testOptionalProperties.put(PROPERTY_NONTRANSACTIONAL_WRITE, setOf(testNontransactionalWrite));
+ testOptionalProperties.put(
+ Constants.PROPERTY_NONTRANSACTIONAL_WRITE, setOf(testNontransactionalWrite));
supportedOptions = pmf.supportedOptions();
for (String supportedOption : supportedOptions) {
@@ -442,9 +444,9 @@ public class GetProperties extends JDO_Test implements Constants {
// changing a property of the returned set of property values must not change the underlying
// property value
- pm.setProperty(PROPERTY_COPY_ON_ATTACH, true);
+ pm.setProperty(Constants.PROPERTY_COPY_ON_ATTACH, true);
Map<String, Object> props = pm.getProperties();
- props.put(PROPERTY_COPY_ON_ATTACH, false);
+ props.put(Constants.PROPERTY_COPY_ON_ATTACH, false);
errorIfNotEqual(ASSERTION_FAILED_12_19_6, true, pm.getCopyOnAttach());
failOnError();
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/SetTransactionIsolationLevel.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/SetTransactionIsolationLevel.java
index 1aaf33b4..ea6532c9 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/SetTransactionIsolationLevel.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/SetTransactionIsolationLevel.java
@@ -45,7 +45,11 @@ public class SetTransactionIsolationLevel extends JDO_Test implements Constants
/** All specified transaction isolation levels */
private static final String[] transactionIsolationLevels =
new String[] {
- TX_READ_UNCOMMITTED, TX_READ_COMMITTED, TX_REPEATABLE_READ, TX_SNAPSHOT, TX_SERIALIZABLE
+ Constants.TX_READ_UNCOMMITTED,
+ Constants.TX_READ_COMMITTED,
+ Constants.TX_REPEATABLE_READ,
+ Constants.TX_SNAPSHOT,
+ Constants.TX_SERIALIZABLE
};
private PersistenceManagerFactory pmf2;
@@ -87,7 +91,7 @@ public class SetTransactionIsolationLevel extends JDO_Test implements Constants
/** Set TransactionIsolationLevel to all values. */
public void testTransactionIsolationLevelReadCommittedSupported() {
// this test depends on setUp initializing supportedOptions
- String readCommitted = PROPERTY_TRANSACTION_ISOLATION_LEVEL_READ_COMMITTED;
+ String readCommitted = Constants.PROPERTY_TRANSACTION_ISOLATION_LEVEL_READ_COMMITTED;
// make sure read committed is supported
if (!isSupported(readCommitted)) {
appendMessage(
@@ -103,9 +107,9 @@ public class SetTransactionIsolationLevel extends JDO_Test implements Constants
pmf.setConnectionURL(getPMFProperty(CONNECTION_URL_PROP));
pmf.setConnectionUserName(getPMFProperty(CONNECTION_USERNAME_PROP));
pmf.setConnectionPassword(getPMFProperty(CONNECTION_PASSWORD_PROP));
- pmf.setConnectionDriverName(getPMFProperty(PROPERTY_CONNECTION_DRIVER_NAME));
+ pmf.setConnectionDriverName(getPMFProperty(Constants.PROPERTY_CONNECTION_DRIVER_NAME));
- String property = PROPERTY_TRANSACTION_ISOLATION_LEVEL + "." + level;
+ String property = Constants.PROPERTY_TRANSACTION_ISOLATION_LEVEL + "." + level;
try {
pmf.setTransactionIsolationLevel(level);
@@ -142,9 +146,9 @@ public class SetTransactionIsolationLevel extends JDO_Test implements Constants
}
/** */
private void getPMFsetTransactionIsolationLevelFromProperties(String level) {
- String property = PROPERTY_TRANSACTION_ISOLATION_LEVEL + "." + level;
+ String property = Constants.PROPERTY_TRANSACTION_ISOLATION_LEVEL + "." + level;
Map<Object, Object> modifiedProps = new HashMap<>(PMFPropertiesObject);
- modifiedProps.put(PROPERTY_TRANSACTION_ISOLATION_LEVEL, level);
+ modifiedProps.put(Constants.PROPERTY_TRANSACTION_ISOLATION_LEVEL, level);
if (isSupported(property)) {
pmf2 = JDOHelper.getPersistenceManagerFactory(modifiedProps);
String actual = pmf2.getTransactionIsolationLevel();
diff --git a/tck/src/main/java/org/apache/jdo/tck/transactions/SetIsolationLevel.java b/tck/src/main/java/org/apache/jdo/tck/transactions/SetIsolationLevel.java
index 11c01af0..75850151 100644
--- a/tck/src/main/java/org/apache/jdo/tck/transactions/SetIsolationLevel.java
+++ b/tck/src/main/java/org/apache/jdo/tck/transactions/SetIsolationLevel.java
@@ -42,7 +42,11 @@ public class SetIsolationLevel extends JDO_Test implements Constants {
/** All specified isolation levels */
private static final String[] isolationLevels =
new String[] {
- TX_READ_UNCOMMITTED, TX_READ_COMMITTED, TX_REPEATABLE_READ, TX_SNAPSHOT, TX_SERIALIZABLE
+ Constants.TX_READ_UNCOMMITTED,
+ Constants.TX_READ_COMMITTED,
+ Constants.TX_REPEATABLE_READ,
+ Constants.TX_SNAPSHOT,
+ Constants.TX_SERIALIZABLE
};
/**
@@ -123,7 +127,7 @@ public class SetIsolationLevel extends JDO_Test implements Constants {
/** */
private void setIsolationLevel(String level) {
Transaction tx = pm.currentTransaction();
- String property = PROPERTY_TRANSACTION_ISOLATION_LEVEL + "." + level;
+ String property = Constants.PROPERTY_TRANSACTION_ISOLATION_LEVEL + "." + level;
if (isSupported(property)) {
tx.setIsolationLevel(level);
String actual = tx.getIsolationLevel();