Author: hthomann
Date: Wed Jun 13 00:01:57 2012
New Revision: 1349588
URL: http://svn.apache.org/viewvc?rev=1349588&view=rev
Log:
OPENJPA-2139: Reverting previous changes to 1.2.x as we've found further
considerartion/design is needed.
Modified:
openjpa/branches/1.2.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingDefaultsImpl.java
openjpa/branches/1.2.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingRepository.java
openjpa/branches/1.2.x/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/AbstractBrokerFactory.java
openjpa/branches/1.2.x/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/PersistenceMappingDefaults.java
Modified:
openjpa/branches/1.2.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingDefaultsImpl.java
URL:
http://svn.apache.org/viewvc/openjpa/branches/1.2.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingDefaultsImpl.java?rev=1349588&r1=1349587&r2=1349588&view=diff
==============================================================================
---
openjpa/branches/1.2.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingDefaultsImpl.java
(original)
+++
openjpa/branches/1.2.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingDefaultsImpl.java
Wed Jun 13 00:01:57 2012
@@ -48,7 +48,7 @@ import serp.util.Strings;
public class MappingDefaultsImpl
implements MappingDefaults, Configurable {
- private transient DBDictionary dict = null;
+ protected transient DBDictionary dict = null;
private String _baseClassStrategy = null;
private String _subclassStrategy = null;
private String _versionStrategy = null;
@@ -72,18 +72,7 @@ public class MappingDefaultsImpl
private String _orderName = null;
private String _nullIndName = null;
private boolean _removeHungarianNotation = false;
- private Configuration conf = null;
- /**
- * Convenient access to dictionary for mappings.
- */
- public DBDictionary getDBDictionary() {
- if (dict == null) {
- dict = ((JDBCConfiguration) conf).getDBDictionaryInstance();
- }
- return dict;
- }
-
public boolean isRemoveHungarianNotation() {
return _removeHungarianNotation;
}
@@ -523,9 +512,8 @@ public class MappingDefaultsImpl
public String getTableName(ClassMapping cls, Schema schema) {
String name = Strings.getClassName(cls.getDescribedType()).
replace('$', '_');
- if (!_defMissing && getDBDictionary() != null) {
- name = getDBDictionary().getValidTableName(name, schema);
- }
+ if (!_defMissing)
+ name = dict.getValidTableName(name, schema);
return name;
}
@@ -538,9 +526,8 @@ public class MappingDefaultsImpl
tableName = tableName.substring(0, 5);
name = tableName + "_" + name;
}
- if (!_defMissing && getDBDictionary() != null){
- name = getDBDictionary().getValidTableName(name, schema);
- }
+ if (!_defMissing)
+ name = dict.getValidTableName(name, schema);
return name;
}
@@ -562,13 +549,9 @@ public class MappingDefaultsImpl
if (!_defMissing || _removeHungarianNotation)
{
String name = col.getName();
- if (_removeHungarianNotation) {
+ if (_removeHungarianNotation)
name = removeHungarianNotation(name);
- }
-
- if (getDBDictionary() != null) {
- col.setName(getDBDictionary().getValidColumnName(name, table));
- }
+ col.setName(dict.getValidColumnName(name, table));
}
}
@@ -720,23 +703,15 @@ public class MappingDefaultsImpl
* Generate an index name.
*/
protected String getIndexName(String name, Table table, Column[] cols) {
- String toReturn = null;
-
// always use dict for index names because no spec mandates them
// based on defaults
- if (name == null) {
+ if (name == null)
name = cols[0].getName();
- }
- if (_removeHungarianNotation){
+ if (_removeHungarianNotation)
name = removeHungarianNotation(name);
- }
-
- if (getDBDictionary() != null) {
- toReturn = getDBDictionary().getValidIndexName(name, table);
- }
-
- return toReturn;
+
+ return dict.getValidIndexName(name, table);
}
public Index getIndex(ValueMapping vm, String name, Table table,
@@ -789,7 +764,7 @@ public class MappingDefaultsImpl
///////////////////////////////
public void setConfiguration(Configuration conf) {
- this.conf=conf;
+ dict = ((JDBCConfiguration) conf).getDBDictionaryInstance();
}
public void startConfiguration() {
Modified:
openjpa/branches/1.2.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingRepository.java
URL:
http://svn.apache.org/viewvc/openjpa/branches/1.2.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingRepository.java?rev=1349588&r1=1349587&r2=1349588&view=diff
==============================================================================
---
openjpa/branches/1.2.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingRepository.java
(original)
+++
openjpa/branches/1.2.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingRepository.java
Wed Jun 13 00:01:57 2012
@@ -123,9 +123,6 @@ public class MappingRepository
* Convenient access to dictionary for mappings.
*/
public DBDictionary getDBDictionary() {
- if (_dict == null) {
- _dict = ((JDBCConfiguration)
getConfiguration()).getDBDictionaryInstance();
- }
return _dict;
}
@@ -827,8 +824,6 @@ public class MappingRepository
*/
protected FieldStrategy defaultStrategy(FieldMapping field,
boolean installHandlers, boolean adapting) {
- DBDictionary dict = getDBDictionary();
-
// not persistent?
if (field.getManagement() != field.MANAGE_PERSISTENT
|| field.isVersion())
@@ -846,7 +841,7 @@ public class MappingRepository
}
if (field.isSerialized()) {
- if (dict != null && dict.maxEmbeddedBlobSize != -1)
+ if (_dict.maxEmbeddedBlobSize != -1)
return new MaxEmbeddedBlobFieldStrategy();
} else {
// check for mapped strategy
@@ -863,12 +858,12 @@ public class MappingRepository
// check for known field strategies
if (!field.isSerialized() && (field.getType() == byte[].class
|| field.getType() == Byte[].class)) {
- if (dict != null && dict.maxEmbeddedBlobSize != -1)
+ if (_dict.maxEmbeddedBlobSize != -1)
return new MaxEmbeddedByteArrayFieldStrategy();
} else if (!field.isSerialized()
&& (field.getType() == char[].class
|| field.getType() == Character[].class)) {
- if (dict != null && dict.maxEmbeddedClobSize != -1 &&
isClob(field, false))
+ if (_dict.maxEmbeddedClobSize != -1 && isClob(field, false))
return new MaxEmbeddedCharArrayFieldStrategy();
} else if (!field.isSerialized()) {
FieldStrategy strat = defaultTypeStrategy(field, installHandlers,
@@ -891,7 +886,7 @@ public class MappingRepository
getLog().warn(_loc.get("no-field-strategy", field));
field.setSerialized(true);
}
- if (dict != null && dict.maxEmbeddedBlobSize == -1) {
+ if (_dict.maxEmbeddedBlobSize == -1) {
if (installHandlers)
field.setHandler(BlobValueHandler.getInstance());
return new HandlerFieldStrategy();
@@ -917,8 +912,7 @@ public class MappingRepository
case JavaTypes.STRING:
if (!isClob(field, false))
return new StringFieldStrategy();
- DBDictionary dict = getDBDictionary();
- if (dict != null && dict.maxEmbeddedClobSize != -1)
+ if (_dict.maxEmbeddedClobSize != -1)
return new MaxEmbeddedClobFieldStrategy();
break;
case JavaTypes.PC:
@@ -1122,11 +1116,9 @@ public class MappingRepository
* not take into account the named handler, if any.
*/
protected ValueHandler defaultHandler(ValueMapping val, boolean adapting) {
- DBDictionary dict = getDBDictionary();
-
if (val.isSerialized()) {
- if (dict != null && dict.maxEmbeddedBlobSize != -1)
- warnMaxEmbedded(val, dict.maxEmbeddedBlobSize);
+ if (_dict.maxEmbeddedBlobSize != -1)
+ warnMaxEmbedded(val, _dict.maxEmbeddedBlobSize);
return BlobValueHandler.getInstance();
}
@@ -1136,8 +1128,8 @@ public class MappingRepository
if (val.getType() == byte[].class
|| val.getType() == Byte[].class) {
- if (dict != null && dict.maxEmbeddedBlobSize != -1)
- warnMaxEmbedded(val, dict.maxEmbeddedBlobSize);
+ if (_dict.maxEmbeddedBlobSize != -1)
+ warnMaxEmbedded(val, _dict.maxEmbeddedBlobSize);
return ByteArrayValueHandler.getInstance();
}
if (val.getType() == char[].class
@@ -1216,13 +1208,12 @@ public class MappingRepository
Column col = (Column) cols.get(0);
if (col.getSize() != -1 && col.getType() != Types.CLOB)
return false;
-
- DBDictionary dict = getDBDictionary();
- if (dict != null && dict.getPreferredType(Types.CLOB) != Types.CLOB)
+
+ if (_dict.getPreferredType(Types.CLOB) != Types.CLOB)
return false;
- if (warn && dict != null && dict.maxEmbeddedClobSize != -1)
- warnMaxEmbedded(val, dict.maxEmbeddedClobSize);
+ if (warn && _dict.maxEmbeddedClobSize != -1)
+ warnMaxEmbedded(val, _dict.maxEmbeddedClobSize);
return true;
}
@@ -1350,6 +1341,7 @@ public class MappingRepository
super.endConfiguration();
JDBCConfiguration conf = (JDBCConfiguration) getConfiguration();
+ _dict = conf.getDBDictionaryInstance();
if (_defaults == null)
_defaults = conf.getMappingDefaultsInstance();
if (_schema != null && _schema instanceof Configurable) {
Modified:
openjpa/branches/1.2.x/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/AbstractBrokerFactory.java
URL:
http://svn.apache.org/viewvc/openjpa/branches/1.2.x/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/AbstractBrokerFactory.java?rev=1349588&r1=1349587&r2=1349588&view=diff
==============================================================================
---
openjpa/branches/1.2.x/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/AbstractBrokerFactory.java
(original)
+++
openjpa/branches/1.2.x/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/AbstractBrokerFactory.java
Wed Jun 13 00:01:57 2012
@@ -612,9 +612,8 @@ public abstract class AbstractBrokerFact
_readOnly = true;
Log log = _conf.getLog(OpenJPAConfiguration.LOG_RUNTIME);
- if (log.isInfoEnabled()){
+ if (log.isInfoEnabled())
log.info(getFactoryInitializationBanner());
- }
if (log.isTraceEnabled()) {
Map props = _conf.toProperties(true);
String lineSep = J2DoPrivHelper.getLineSeparator();
@@ -651,10 +650,6 @@ public abstract class AbstractBrokerFact
_conf.getBrokerFactoryEventManager().fireEvent(
new BrokerFactoryEvent(this,
BrokerFactoryEvent.BROKER_FACTORY_CREATED));
- } catch (RuntimeException e) {
- // if the db connection is not available we need to reset the state
- _readOnly = false;
- throw e;
} finally {
unlock();
}
Modified:
openjpa/branches/1.2.x/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/PersistenceMappingDefaults.java
URL:
http://svn.apache.org/viewvc/openjpa/branches/1.2.x/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/PersistenceMappingDefaults.java?rev=1349588&r1=1349587&r2=1349588&view=diff
==============================================================================
---
openjpa/branches/1.2.x/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/PersistenceMappingDefaults.java
(original)
+++
openjpa/branches/1.2.x/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/PersistenceMappingDefaults.java
Wed Jun 13 00:01:57 2012
@@ -34,10 +34,8 @@ import org.apache.openjpa.jdbc.meta.stra
import org.apache.openjpa.jdbc.schema.Column;
import org.apache.openjpa.jdbc.schema.Schema;
import org.apache.openjpa.jdbc.schema.Table;
-import org.apache.openjpa.jdbc.sql.DBDictionary;
import org.apache.openjpa.jdbc.sql.JoinSyntaxes;
import org.apache.openjpa.meta.JavaTypes;
-
import serp.util.Strings;
/**
@@ -113,7 +111,7 @@ public class PersistenceMappingDefaults
if (FlatClassStrategy.ALIAS.equals(strat))
return new ValueMapDiscriminatorStrategy();
if (VerticalClassStrategy.ALIAS.equals(strat)
- && getDBDictionary() != null && getDBDictionary().joinSyntax !=
JoinSyntaxes.SYNTAX_TRADITIONAL)
+ && dict.joinSyntax != JoinSyntaxes.SYNTAX_TRADITIONAL)
return new SubclassJoinDiscriminatorStrategy();
return NoneDiscriminatorStrategy.getInstance();
}
@@ -160,18 +158,14 @@ public class PersistenceMappingDefaults
name = fm.getDefiningMapping().getTypeAlias();
String targetName = ((Column) target).getName();
String tempName = null;
- DBDictionary dict = getDBDictionary();
- if (dict != null && (name.length() + targetName.length()) >=
dict.maxColumnNameLength){
+ if ((name.length() + targetName.length()) >= dict.maxColumnNameLength)
tempName = name.substring(0, dict.maxColumnNameLength
- targetName.length() - 1);
- }
// suffix with '_' + target column
if (tempName == null)
tempName = name;
name = tempName + "_" + targetName;
- if (dict != null){
- name = dict.getValidColumnName(name, foreign);
- }
+ name = dict.getValidColumnName(name, foreign);
col.setName(name);
}
@@ -199,9 +193,7 @@ public class PersistenceMappingDefaults
name = name + "_" + ((Column) target).getName();
// No need to check for uniqueness.
- if (getDBDictionary() != null){
- name = getDBDictionary().getValidColumnName(name, local,
false);
- }
+ name = dict.getValidColumnName(name, local, false);
col.setName(name);
}
}
