mirror of https://github.com/apache/openjpa.git
cleaned up some imports; fixed a typo; changed test case to reduce output
git-svn-id: https://svn.apache.org/repos/asf/incubator/openjpa/trunk@427472 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
eb96e89f4d
commit
e889cd2aef
|
@ -20,7 +20,6 @@ import java.util.Collection;
|
|||
import java.util.Iterator;
|
||||
import java.util.LinkedList;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
|
||||
import org.apache.commons.lang.StringUtils;
|
||||
import org.apache.openjpa.conf.OpenJPAConfiguration;
|
||||
|
|
|
@ -2793,20 +2793,7 @@ public class StateManagerImpl
|
|||
}
|
||||
|
||||
/**
|
||||
* Return whether the second field has any custom fetch groups in common
|
||||
* with the first.
|
||||
*/
|
||||
private static boolean sharesCustomFetchGroups(FieldMetaData fmd1,
|
||||
FieldMetaData fmd2) {
|
||||
String[] fgs = fmd1.getCustomFetchGroups();
|
||||
for (int i = 0; i < fgs.length; i++)
|
||||
if (fmd2.isInFetchGroup(fgs[i]))
|
||||
return true;
|
||||
return false;
|
||||
}
|
||||
|
||||
/**
|
||||
* Helper method to privde the given field number to the given
|
||||
* Helper method to provide the given field number to the given
|
||||
* field manager.
|
||||
*/
|
||||
void provideField(PersistenceCapable pc, FieldManager store, int field) {
|
||||
|
|
|
@ -266,5 +266,4 @@ public class DelegatingStatement implements Statement, Closeable {
|
|||
public int getResultSetHoldability() throws SQLException {
|
||||
throw new UnsupportedOperationException();
|
||||
}
|
||||
}
|
||||
|
||||
}
|
|
@ -20,7 +20,6 @@ import javax.xml.parsers.DocumentBuilderFactory;
|
|||
import javax.xml.parsers.ParserConfigurationException;
|
||||
import javax.xml.parsers.SAXParser;
|
||||
import javax.xml.parsers.SAXParserFactory;
|
||||
import javax.xml.transform.sax.SAXTransformerFactory;
|
||||
|
||||
import org.apache.commons.lang.exception.NestableRuntimeException;
|
||||
import org.w3c.dom.Document;
|
||||
|
@ -42,7 +41,6 @@ public class XMLFactory {
|
|||
// cache parsers and transformers in all possible configurations
|
||||
private static SAXParserFactory[] _saxFactories = null;
|
||||
private static DocumentBuilderFactory[] _domFactories = null;
|
||||
private static SAXTransformerFactory _transFactory = null;
|
||||
private static ErrorHandler _validating;
|
||||
|
||||
static {
|
||||
|
|
|
@ -36,7 +36,6 @@ import org.apache.openjpa.lib.test.AbstractTestCase;
|
|||
public class TestConfigurationImpl extends AbstractTestCase {
|
||||
|
||||
private ConfigurationTest _conf = new ConfigurationTest();
|
||||
private String _def;
|
||||
|
||||
public TestConfigurationImpl(String test) {
|
||||
super(test);
|
||||
|
@ -308,5 +307,12 @@ public class TestConfigurationImpl extends AbstractTestCase {
|
|||
public void deriveObjectKey(Object val) {
|
||||
_objectKey.set(val, true);
|
||||
}
|
||||
|
||||
protected boolean isInvalidProperty(String s) {
|
||||
if ("openjpatest.properties".equals(s))
|
||||
return false;
|
||||
else
|
||||
return super.isInvalidProperty(s);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue