Author: pcl
Date: Mon Aug 20 18:37:39 2007
New Revision: 567900
URL: http://svn.apache.org/viewvc?rev=567900&view=rev
Log:
OPENJPA-317. Moved away from requiring Type at the end of enums, in favor of
alignment with existing OpenJPA config settings.
Added:
openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/FetchMode.java
- copied, changed from r567838,
openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/EagerFetchType.java
openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/JoinSyntax.java
- copied, changed from r567838,
openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/JoinSyntaxType.java
openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/LRSSize.java
- copied, changed from r567838,
openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/LRSSizeType.java
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/CallbackMode.java
- copied, changed from r567838,
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/CallbackType.java
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/ConnectionRetainMode.java
- copied, changed from r567838,
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/ConnectionRetainType.java
Removed:
openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/EagerFetchType.java
openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/JoinSyntaxType.java
openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/LRSSizeType.java
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/CallbackType.java
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/ConnectionRetainType.java
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/AnnotationPersistenceMappingParser.java
openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/EagerFetchMode.java
openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/ForeignKeyAction.java
openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/JDBCFetchPlan.java
openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/JDBCFetchPlanImpl.java
openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/SubclassFetchMode.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/TestJDBCEnumToKernelConstantMappings.java
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerImpl.java
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAEntityManager.java
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAEntityManagerSPI.java
openjpa/trunk/openjpa-persistence/src/test/java/org/apache/openjpa/persistence/TestEnumToKernelConstantMappings.java
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/AnnotationPersistenceMappingParser.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/AnnotationPersistenceMappingParser.java?rev=567900&r1=567899&r2=567900&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/AnnotationPersistenceMappingParser.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/AnnotationPersistenceMappingParser.java
Mon Aug 20 18:37:39 2007
@@ -745,8 +745,8 @@
/**
* Translate the fetch mode enum value to the internal OpenJPA constant.
*/
- private static int toEagerFetchModeConstant(EagerFetchType type) {
- switch (type) {
+ private static int toEagerFetchModeConstant(FetchMode mode) {
+ switch (mode) {
case NONE:
return EagerFetchModes.EAGER_NONE;
case JOIN:
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/EagerFetchMode.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/EagerFetchMode.java?rev=567900&r1=567899&r2=567900&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/EagerFetchMode.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/EagerFetchMode.java
Mon Aug 20 18:37:39 2007
@@ -35,5 +35,5 @@
@Retention(RUNTIME)
public @interface EagerFetchMode {
- EagerFetchType value() default EagerFetchType.NONE;
+ FetchMode value() default FetchMode.NONE;
}
Copied:
openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/FetchMode.java
(from r567838,
openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/EagerFetchType.java)
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/FetchMode.java?p2=openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/FetchMode.java&p1=openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/EagerFetchType.java&r1=567838&r2=567900&rev=567900&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/EagerFetchType.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/FetchMode.java
Mon Aug 20 18:37:39 2007
@@ -27,14 +27,14 @@
* @since 0.4.0
* @published
*/
-public enum EagerFetchType {
+public enum FetchMode {
NONE(EagerFetchModes.EAGER_NONE),
JOIN(EagerFetchModes.EAGER_JOIN),
PARALLEL(EagerFetchModes.EAGER_PARALLEL);
private final int eagerFetchConstant;
- private EagerFetchType(int value) {
+ private FetchMode(int value) {
eagerFetchConstant = value;
}
@@ -42,7 +42,7 @@
return eagerFetchConstant;
}
- static EagerFetchType fromKernelConstant(int kernelConstant) {
+ static FetchMode fromKernelConstant(int kernelConstant) {
switch (kernelConstant) {
case EagerFetchModes.EAGER_NONE:
return NONE;
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/ForeignKeyAction.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/ForeignKeyAction.java?rev=567900&r1=567899&r2=567900&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/ForeignKeyAction.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/ForeignKeyAction.java
Mon Aug 20 18:37:39 2007
@@ -30,4 +30,4 @@
CASCADE,
NULL,
DEFAULT
-};
+}
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/JDBCFetchPlan.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/JDBCFetchPlan.java?rev=567900&r1=567899&r2=567900&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/JDBCFetchPlan.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/JDBCFetchPlan.java
Mon Aug 20 18:37:39 2007
@@ -37,22 +37,22 @@
/**
* Eager fetch mode in loading relations.
*/
- public EagerFetchType getEagerFetchMode();
+ public FetchMode getEagerFetchMode();
/**
* Eager fetch mode in loading relations.
*/
- public JDBCFetchPlan setEagerFetchMode(EagerFetchType type);
+ public JDBCFetchPlan setEagerFetchMode(FetchMode mode);
/**
* Eager fetch mode in loading subclasses.
*/
- public EagerFetchType getSubclassFetchMode();
+ public FetchMode getSubclassFetchMode();
/**
* Eager fetch mode in loading subclasses.
*/
- public JDBCFetchPlan setSubclassFetchMode(EagerFetchType type);
+ public JDBCFetchPlan setSubclassFetchMode(FetchMode mode);
/**
* Type of JDBC result set to use for query results.
@@ -77,22 +77,22 @@
/**
* How to determine the size of a large result set.
*/
- public LRSSizeType getLRSSize();
+ public LRSSize getLRSSize();
/**
* How to determine the size of a large result set.
*/
- public JDBCFetchPlan setLRSSize(LRSSizeType lrsSize);
+ public JDBCFetchPlan setLRSSize(LRSSize lrsSize);
/**
* SQL join syntax.
*/
- public JoinSyntaxType getJoinSyntax();
+ public JoinSyntax getJoinSyntax();
/**
* SQL join syntax.
*/
- public JDBCFetchPlan setJoinSyntax(JoinSyntaxType syntax);
+ public JDBCFetchPlan setJoinSyntax(JoinSyntax syntax);
/**
* The isolation level for queries issued to the database. This overrides
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/JDBCFetchPlanImpl.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/JDBCFetchPlanImpl.java?rev=567900&r1=567899&r2=567900&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/JDBCFetchPlanImpl.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/JDBCFetchPlanImpl.java
Mon Aug 20 18:37:39 2007
@@ -55,21 +55,21 @@
return _fetch;
}
- public EagerFetchType getEagerFetchMode() {
- return EagerFetchType.fromKernelConstant(_fetch.getEagerFetchMode());
+ public FetchMode getEagerFetchMode() {
+ return FetchMode.fromKernelConstant(_fetch.getEagerFetchMode());
}
- public JDBCFetchPlanImpl setEagerFetchMode(EagerFetchType type) {
- _fetch.setEagerFetchMode(type.toKernelConstant());
+ public JDBCFetchPlanImpl setEagerFetchMode(FetchMode mode) {
+ _fetch.setEagerFetchMode(mode.toKernelConstant());
return this;
}
- public EagerFetchType getSubclassFetchMode() {
- return
EagerFetchType.fromKernelConstant(_fetch.getSubclassFetchMode());
+ public FetchMode getSubclassFetchMode() {
+ return FetchMode.fromKernelConstant(_fetch.getSubclassFetchMode());
}
- public JDBCFetchPlanImpl setSubclassFetchMode(EagerFetchType type) {
- _fetch.setSubclassFetchMode(type.toKernelConstant());
+ public JDBCFetchPlanImpl setSubclassFetchMode(FetchMode mode) {
+ _fetch.setSubclassFetchMode(mode.toKernelConstant());
return this;
}
@@ -91,20 +91,20 @@
return this;
}
- public LRSSizeType getLRSSize() {
- return LRSSizeType.fromKernelConstant(_fetch.getLRSSize());
+ public LRSSize getLRSSize() {
+ return LRSSize.fromKernelConstant(_fetch.getLRSSize());
}
- public JDBCFetchPlanImpl setLRSSize(LRSSizeType lrsSize) {
+ public JDBCFetchPlanImpl setLRSSize(LRSSize lrsSize) {
_fetch.setLRSSize(lrsSize.toKernelConstant());
return this;
}
- public JoinSyntaxType getJoinSyntax() {
- return JoinSyntaxType.fromKernelConstant(_fetch.getJoinSyntax());
+ public JoinSyntax getJoinSyntax() {
+ return JoinSyntax.fromKernelConstant(_fetch.getJoinSyntax());
}
- public JDBCFetchPlanImpl setJoinSyntax(JoinSyntaxType syntax) {
+ public JDBCFetchPlanImpl setJoinSyntax(JoinSyntax syntax) {
_fetch.setJoinSyntax(syntax.toKernelConstant());
return this;
}
Copied:
openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/JoinSyntax.java
(from r567838,
openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/JoinSyntaxType.java)
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/JoinSyntax.java?p2=openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/JoinSyntax.java&p1=openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/JoinSyntaxType.java&r1=567838&r2=567900&rev=567900&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/JoinSyntaxType.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/JoinSyntax.java
Mon Aug 20 18:37:39 2007
@@ -26,14 +26,14 @@
* @since 1.0.0
* @published
*/
-public enum JoinSyntaxType {
+public enum JoinSyntax {
SQL92(JoinSyntaxes.SYNTAX_SQL92),
TRADITIONAL(JoinSyntaxes.SYNTAX_TRADITIONAL),
DATABASE(JoinSyntaxes.SYNTAX_DATABASE);
private final int joinSyntaxConstant;
- private JoinSyntaxType(int value) {
+ private JoinSyntax(int value) {
joinSyntaxConstant = value;
}
@@ -41,7 +41,7 @@
return joinSyntaxConstant;
}
- static JoinSyntaxType fromKernelConstant(int kernelConstant) {
+ static JoinSyntax fromKernelConstant(int kernelConstant) {
switch (kernelConstant) {
case JoinSyntaxes.SYNTAX_SQL92:
return SQL92;
Copied:
openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/LRSSize.java
(from r567838,
openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/LRSSizeType.java)
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/LRSSize.java?p2=openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/LRSSize.java&p1=openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/LRSSizeType.java&r1=567838&r2=567900&rev=567900&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/LRSSizeType.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/LRSSize.java
Mon Aug 20 18:37:39 2007
@@ -26,14 +26,14 @@
* @since 1.0.0
* @published
*/
-public enum LRSSizeType {
+public enum LRSSize {
UNKNOWN(LRSSizes.SIZE_UNKNOWN),
LAST(LRSSizes.SIZE_LAST),
QUERY(LRSSizes.SIZE_QUERY);
private final int lrsConstant;
- private LRSSizeType(int value) {
+ private LRSSize(int value) {
lrsConstant = value;
}
@@ -41,7 +41,7 @@
return lrsConstant;
}
- static LRSSizeType fromKernelConstant(int kernelConstant) {
+ static LRSSize fromKernelConstant(int kernelConstant) {
switch (kernelConstant) {
case LRSSizes.SIZE_UNKNOWN:
return UNKNOWN;
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/SubclassFetchMode.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/SubclassFetchMode.java?rev=567900&r1=567899&r2=567900&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/SubclassFetchMode.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/SubclassFetchMode.java
Mon Aug 20 18:37:39 2007
@@ -34,5 +34,5 @@
@Retention(RUNTIME)
public @interface SubclassFetchMode {
- EagerFetchType value() default EagerFetchType.NONE;
+ FetchMode value() default FetchMode.NONE;
}
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/TestJDBCEnumToKernelConstantMappings.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/TestJDBCEnumToKernelConstantMappings.java?rev=567900&r1=567899&r2=567900&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/TestJDBCEnumToKernelConstantMappings.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/TestJDBCEnumToKernelConstantMappings.java
Mon Aug 20 18:37:39 2007
@@ -30,89 +30,89 @@
public void testEagerFetchModes() {
assertEquals(EagerFetchModes.EAGER_NONE,
- EagerFetchType.NONE.toKernelConstant());
- assertEquals(EagerFetchType.NONE,
- EagerFetchType.fromKernelConstant(
+ FetchMode.NONE.toKernelConstant());
+ assertEquals(FetchMode.NONE,
+ FetchMode.fromKernelConstant(
EagerFetchModes.EAGER_NONE));
- assertEquals(EagerFetchType.NONE.toKernelConstant(),
- EagerFetchType.NONE.ordinal());
+ assertEquals(FetchMode.NONE.toKernelConstant(),
+ FetchMode.NONE.ordinal());
assertEquals(EagerFetchModes.EAGER_JOIN,
- EagerFetchType.JOIN.toKernelConstant());
- assertEquals(EagerFetchType.JOIN,
- EagerFetchType.fromKernelConstant(
+ FetchMode.JOIN.toKernelConstant());
+ assertEquals(FetchMode.JOIN,
+ FetchMode.fromKernelConstant(
EagerFetchModes.EAGER_JOIN));
- assertEquals(EagerFetchType.JOIN.toKernelConstant(),
- EagerFetchType.JOIN.ordinal());
+ assertEquals(FetchMode.JOIN.toKernelConstant(),
+ FetchMode.JOIN.ordinal());
assertEquals(EagerFetchModes.EAGER_PARALLEL,
- EagerFetchType.PARALLEL.toKernelConstant());
- assertEquals(EagerFetchType.PARALLEL,
- EagerFetchType.fromKernelConstant(
+ FetchMode.PARALLEL.toKernelConstant());
+ assertEquals(FetchMode.PARALLEL,
+ FetchMode.fromKernelConstant(
EagerFetchModes.EAGER_PARALLEL));
- assertEquals(EagerFetchType.PARALLEL.toKernelConstant(),
- EagerFetchType.PARALLEL.ordinal());
+ assertEquals(FetchMode.PARALLEL.toKernelConstant(),
+ FetchMode.PARALLEL.ordinal());
assertEquals(getConstantCount(EagerFetchModes.class),
- EagerFetchType.values().length);
+ FetchMode.values().length);
}
public void testLRSSizeType() {
assertEquals(LRSSizes.SIZE_UNKNOWN,
- LRSSizeType.UNKNOWN.toKernelConstant());
- assertEquals(LRSSizeType.UNKNOWN,
- LRSSizeType.fromKernelConstant(
+ LRSSize.UNKNOWN.toKernelConstant());
+ assertEquals(LRSSize.UNKNOWN,
+ LRSSize.fromKernelConstant(
LRSSizes.SIZE_UNKNOWN));
- assertEquals(LRSSizeType.UNKNOWN.toKernelConstant(),
- LRSSizeType.UNKNOWN.ordinal());
+ assertEquals(LRSSize.UNKNOWN.toKernelConstant(),
+ LRSSize.UNKNOWN.ordinal());
assertEquals(LRSSizes.SIZE_LAST,
- LRSSizeType.LAST.toKernelConstant());
- assertEquals(LRSSizeType.LAST,
- LRSSizeType.fromKernelConstant(
+ LRSSize.LAST.toKernelConstant());
+ assertEquals(LRSSize.LAST,
+ LRSSize.fromKernelConstant(
LRSSizes.SIZE_LAST));
- assertEquals(LRSSizeType.LAST.toKernelConstant(),
- LRSSizeType.LAST.ordinal());
+ assertEquals(LRSSize.LAST.toKernelConstant(),
+ LRSSize.LAST.ordinal());
assertEquals(LRSSizes.SIZE_QUERY,
- LRSSizeType.QUERY.toKernelConstant());
- assertEquals(LRSSizeType.QUERY,
- LRSSizeType.fromKernelConstant(
+ LRSSize.QUERY.toKernelConstant());
+ assertEquals(LRSSize.QUERY,
+ LRSSize.fromKernelConstant(
LRSSizes.SIZE_QUERY));
- assertEquals(LRSSizeType.QUERY.toKernelConstant(),
- LRSSizeType.QUERY.ordinal());
+ assertEquals(LRSSize.QUERY.toKernelConstant(),
+ LRSSize.QUERY.ordinal());
assertEquals(getConstantCount(LRSSizes.class),
- LRSSizeType.values().length);
+ LRSSize.values().length);
}
public void testJoinSyntaxType() {
assertEquals(JoinSyntaxes.SYNTAX_SQL92,
- JoinSyntaxType.SQL92.toKernelConstant());
- assertEquals(JoinSyntaxType.SQL92,
- JoinSyntaxType.fromKernelConstant(
+ JoinSyntax.SQL92.toKernelConstant());
+ assertEquals(JoinSyntax.SQL92,
+ JoinSyntax.fromKernelConstant(
JoinSyntaxes.SYNTAX_SQL92));
- assertEquals(JoinSyntaxType.SQL92.toKernelConstant(),
- JoinSyntaxType.SQL92.ordinal());
+ assertEquals(JoinSyntax.SQL92.toKernelConstant(),
+ JoinSyntax.SQL92.ordinal());
assertEquals(JoinSyntaxes.SYNTAX_TRADITIONAL,
- JoinSyntaxType.TRADITIONAL.toKernelConstant());
- assertEquals(JoinSyntaxType.TRADITIONAL,
- JoinSyntaxType.fromKernelConstant(
+ JoinSyntax.TRADITIONAL.toKernelConstant());
+ assertEquals(JoinSyntax.TRADITIONAL,
+ JoinSyntax.fromKernelConstant(
JoinSyntaxes.SYNTAX_TRADITIONAL));
- assertEquals(JoinSyntaxType.TRADITIONAL.toKernelConstant(),
- JoinSyntaxType.TRADITIONAL.ordinal());
+ assertEquals(JoinSyntax.TRADITIONAL.toKernelConstant(),
+ JoinSyntax.TRADITIONAL.ordinal());
assertEquals(JoinSyntaxes.SYNTAX_DATABASE,
- JoinSyntaxType.DATABASE.toKernelConstant());
- assertEquals(JoinSyntaxType.DATABASE,
- JoinSyntaxType.fromKernelConstant(
+ JoinSyntax.DATABASE.toKernelConstant());
+ assertEquals(JoinSyntax.DATABASE,
+ JoinSyntax.fromKernelConstant(
JoinSyntaxes.SYNTAX_DATABASE));
- assertEquals(JoinSyntaxType.DATABASE.toKernelConstant(),
- JoinSyntaxType.DATABASE.ordinal());
+ assertEquals(JoinSyntax.DATABASE.toKernelConstant(),
+ JoinSyntax.DATABASE.ordinal());
assertEquals(getConstantCount(JoinSyntaxes.class),
- JoinSyntaxType.values().length);
+ JoinSyntax.values().length);
}
public void testResultSetType() {
Copied:
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/CallbackMode.java
(from r567838,
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/CallbackType.java)
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/CallbackMode.java?p2=openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/CallbackMode.java&p1=openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/CallbackType.java&r1=567838&r2=567900&rev=567900&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/CallbackType.java
(original)
+++
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/CallbackMode.java
Mon Aug 20 18:37:39 2007
@@ -29,7 +29,7 @@
* @since 1.0.0
* @published
*/
-public enum CallbackType {
+public enum CallbackMode {
FAIL_FAST(CallbackModes.CALLBACK_FAIL_FAST),
IGNORE(CallbackModes.CALLBACK_IGNORE),
LOG(CallbackModes.CALLBACK_LOG),
@@ -38,29 +38,29 @@
private final int callbackMode;
- private CallbackType(int value) {
+ private CallbackMode(int value) {
callbackMode = value;
}
- public static EnumSet<CallbackType> toEnumSet(int callback) {
- EnumSet<CallbackType> types = EnumSet.noneOf(CallbackType.class);
+ public static EnumSet<CallbackMode> toEnumSet(int callback) {
+ EnumSet<CallbackMode> modes = EnumSet.noneOf(CallbackMode.class);
if ((callback & CallbackModes.CALLBACK_FAIL_FAST) != 0)
- types.add(FAIL_FAST);
+ modes.add(FAIL_FAST);
if ((callback & CallbackModes.CALLBACK_IGNORE) != 0)
- types.add(IGNORE);
+ modes.add(IGNORE);
if ((callback & CallbackModes.CALLBACK_LOG) != 0)
- types.add(LOG);
+ modes.add(LOG);
if ((callback & CallbackModes.CALLBACK_RETHROW) != 0)
- types.add(RETHROW);
+ modes.add(RETHROW);
if ((callback & CallbackModes.CALLBACK_ROLLBACK) != 0)
- types.add(ROLLBACK);
- return types;
+ modes.add(ROLLBACK);
+ return modes;
}
- public static int fromEnumSet(EnumSet<CallbackType> types) {
+ public static int fromEnumSet(EnumSet<CallbackMode> modes) {
int callback = 0;
- for (CallbackType type : types)
- callback |= type.callbackMode;
+ for (CallbackMode mode : modes)
+ callback |= mode.callbackMode;
return callback;
}
}
Copied:
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/ConnectionRetainMode.java
(from r567838,
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/ConnectionRetainType.java)
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/ConnectionRetainMode.java?p2=openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/ConnectionRetainMode.java&p1=openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/ConnectionRetainType.java&r1=567838&r2=567900&rev=567900&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/ConnectionRetainType.java
(original)
+++
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/ConnectionRetainMode.java
Mon Aug 20 18:37:39 2007
@@ -27,14 +27,14 @@
* @since 1.0.0
* @published
*/
-public enum ConnectionRetainType {
+public enum ConnectionRetainMode {
ON_DEMAND(ConnectionRetainModes.CONN_RETAIN_DEMAND),
TRANSACTION(ConnectionRetainModes.CONN_RETAIN_TRANS),
ALWAYS(ConnectionRetainModes.CONN_RETAIN_ALWAYS);
private final int connectionRetainConstant;
- private ConnectionRetainType(int value) {
+ private ConnectionRetainMode(int value) {
connectionRetainConstant = value;
}
@@ -42,7 +42,7 @@
return connectionRetainConstant;
}
- static ConnectionRetainType fromKernelConstant(int kernelConstant) {
+ static ConnectionRetainMode fromKernelConstant(int kernelConstant) {
switch (kernelConstant) {
case ConnectionRetainModes.CONN_RETAIN_DEMAND:
return ON_DEMAND;
Modified:
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerImpl.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerImpl.java?rev=567900&r1=567899&r2=567900&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerImpl.java
(original)
+++
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/EntityManagerImpl.java
Mon Aug 20 18:37:39 2007
@@ -110,8 +110,8 @@
}
}
- public ConnectionRetainType getConnectionRetainMode() {
- return ConnectionRetainType.fromKernelConstant(
+ public ConnectionRetainMode getConnectionRetainMode() {
+ return ConnectionRetainMode.fromKernelConstant(
_broker.getConnectionRetainMode());
}
@@ -290,21 +290,21 @@
_broker.removeTransactionListener(listener);
}
- public EnumSet<CallbackType> getTransactionListenerCallbackMode() {
- return CallbackType.toEnumSet(
+ public EnumSet<CallbackMode> getTransactionListenerCallbackMode() {
+ return CallbackMode.toEnumSet(
_broker.getTransactionListenerCallbackMode());
}
- public void setTransactionListenerCallbackMode(CallbackType type) {
+ public void setTransactionListenerCallbackMode(CallbackMode mode) {
assertNotCloseInvoked();
_broker.setTransactionListenerCallbackMode(
- CallbackType.fromEnumSet(EnumSet.of(type)));
+ CallbackMode.fromEnumSet(EnumSet.of(mode)));
}
- public void setTransactionListenerCallbackMode(EnumSet<CallbackType>
types){
+ public void setTransactionListenerCallbackMode(EnumSet<CallbackMode>
modes){
assertNotCloseInvoked();
_broker.setTransactionListenerCallbackMode(
- CallbackType.fromEnumSet(types));
+ CallbackMode.fromEnumSet(modes));
}
public void addLifecycleListener(Object listener, Class... classes) {
@@ -317,21 +317,21 @@
_broker.removeLifecycleListener(listener);
}
- public EnumSet<CallbackType> getLifecycleListenerCallbackMode() {
- return CallbackType.toEnumSet(
+ public EnumSet<CallbackMode> getLifecycleListenerCallbackMode() {
+ return CallbackMode.toEnumSet(
_broker.getLifecycleListenerCallbackMode());
}
- public void setLifecycleListenerCallbackMode(CallbackType type) {
+ public void setLifecycleListenerCallbackMode(CallbackMode mode) {
assertNotCloseInvoked();
_broker.setLifecycleListenerCallbackMode(
- CallbackType.fromEnumSet(EnumSet.of(type)));
+ CallbackMode.fromEnumSet(EnumSet.of(mode)));
}
- public void setLifecycleListenerCallbackMode(EnumSet<CallbackType> types) {
+ public void setLifecycleListenerCallbackMode(EnumSet<CallbackMode> modes) {
assertNotCloseInvoked();
_broker.setLifecycleListenerCallbackMode(
- CallbackType.fromEnumSet(types));
+ CallbackMode.fromEnumSet(modes));
}
@SuppressWarnings("unchecked")
Modified:
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAEntityManager.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAEntityManager.java?rev=567900&r1=567899&r2=567900&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAEntityManager.java
(original)
+++
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAEntityManager.java
Mon Aug 20 18:37:39 2007
@@ -48,7 +48,7 @@
/**
* Return the connection retain mode for this entity manager.
*/
- public ConnectionRetainType getConnectionRetainMode();
+ public ConnectionRetainMode getConnectionRetainMode();
/**
* Whether this entity manager is using managed transactions.
Modified:
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAEntityManagerSPI.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAEntityManagerSPI.java?rev=567900&r1=567899&r2=567900&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAEntityManagerSPI.java
(original)
+++
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAEntityManagerSPI.java
Mon Aug 20 18:37:39 2007
@@ -51,24 +51,24 @@
public void removeTransactionListener(Object listener);
/**
- * The [EMAIL PROTECTED] CallbackType} flags for handling transaction
listener
+ * The [EMAIL PROTECTED] CallbackMode} flags for handling transaction
listener
* exceptions.
*/
- public EnumSet<CallbackType> getTransactionListenerCallbackMode();
+ public EnumSet<CallbackMode> getTransactionListenerCallbackMode();
/**
- * The [EMAIL PROTECTED] CallbackType} flag for handling transaction
listener
+ * The [EMAIL PROTECTED] CallbackMode} flag for handling transaction
listener
* exceptions. The flags provided here will entirely replace the
* previous settings.
*/
- public void setTransactionListenerCallbackMode(CallbackType type);
+ public void setTransactionListenerCallbackMode(CallbackMode mode);
/**
- * The [EMAIL PROTECTED] CallbackType} flags for handling transaction
listener
+ * The [EMAIL PROTECTED] CallbackMode} flags for handling transaction
listener
* exceptions. The flags provided here will entirely replace the
* previous settings.
*/
- public void setTransactionListenerCallbackMode(EnumSet<CallbackType>
types);
+ public void setTransactionListenerCallbackMode(EnumSet<CallbackMode>
modes);
/**
* Register a listener for lifecycle-related events on the specified
@@ -83,22 +83,22 @@
public void removeLifecycleListener(Object listener);
/**
- * The [EMAIL PROTECTED] CallbackType} flags for handling lifecycle
listener
+ * The [EMAIL PROTECTED] CallbackMode} flags for handling lifecycle
listener
* exceptions.
*/
- public EnumSet<CallbackType> getLifecycleListenerCallbackMode();
+ public EnumSet<CallbackMode> getLifecycleListenerCallbackMode();
/**
- * The [EMAIL PROTECTED] CallbackType} flag for handling lifecycle listener
+ * The [EMAIL PROTECTED] CallbackMode} flag for handling lifecycle listener
* exceptions. The flags provided here will entirely replace the
* previous settings.
*/
- public void setLifecycleListenerCallbackMode(CallbackType type);
+ public void setLifecycleListenerCallbackMode(CallbackMode mode);
/**
- * The [EMAIL PROTECTED] CallbackType} flags for handling lifecycle
listener
+ * The [EMAIL PROTECTED] CallbackMode} flags for handling lifecycle
listener
* exceptions. The flags provided here will entirely replace the
* previous settings.
*/
- public void setLifecycleListenerCallbackMode(EnumSet<CallbackType> types);
+ public void setLifecycleListenerCallbackMode(EnumSet<CallbackMode> modes);
}
Modified:
openjpa/trunk/openjpa-persistence/src/test/java/org/apache/openjpa/persistence/TestEnumToKernelConstantMappings.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/test/java/org/apache/openjpa/persistence/TestEnumToKernelConstantMappings.java?rev=567900&r1=567899&r2=567900&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence/src/test/java/org/apache/openjpa/persistence/TestEnumToKernelConstantMappings.java
(original)
+++
openjpa/trunk/openjpa-persistence/src/test/java/org/apache/openjpa/persistence/TestEnumToKernelConstantMappings.java
Mon Aug 20 18:37:39 2007
@@ -34,31 +34,31 @@
public void testConnectionRetainModes() {
assertEquals(ConnectionRetainModes.CONN_RETAIN_ALWAYS,
- ConnectionRetainType.ALWAYS.toKernelConstant());
- assertEquals(ConnectionRetainType.ALWAYS,
- ConnectionRetainType.fromKernelConstant(
+ ConnectionRetainMode.ALWAYS.toKernelConstant());
+ assertEquals(ConnectionRetainMode.ALWAYS,
+ ConnectionRetainMode.fromKernelConstant(
ConnectionRetainModes.CONN_RETAIN_ALWAYS));
- assertEquals(ConnectionRetainType.ALWAYS.toKernelConstant(),
- ConnectionRetainType.ALWAYS.ordinal());
+ assertEquals(ConnectionRetainMode.ALWAYS.toKernelConstant(),
+ ConnectionRetainMode.ALWAYS.ordinal());
assertEquals(ConnectionRetainModes.CONN_RETAIN_DEMAND,
- ConnectionRetainType.ON_DEMAND.toKernelConstant());
- assertEquals(ConnectionRetainType.ON_DEMAND,
- ConnectionRetainType.fromKernelConstant(
+ ConnectionRetainMode.ON_DEMAND.toKernelConstant());
+ assertEquals(ConnectionRetainMode.ON_DEMAND,
+ ConnectionRetainMode.fromKernelConstant(
ConnectionRetainModes.CONN_RETAIN_DEMAND));
- assertEquals(ConnectionRetainType.ON_DEMAND.toKernelConstant(),
- ConnectionRetainType.ON_DEMAND.ordinal());
+ assertEquals(ConnectionRetainMode.ON_DEMAND.toKernelConstant(),
+ ConnectionRetainMode.ON_DEMAND.ordinal());
assertEquals(ConnectionRetainModes.CONN_RETAIN_TRANS,
- ConnectionRetainType.TRANSACTION.toKernelConstant());
- assertEquals(ConnectionRetainType.TRANSACTION,
- ConnectionRetainType.fromKernelConstant(
+ ConnectionRetainMode.TRANSACTION.toKernelConstant());
+ assertEquals(ConnectionRetainMode.TRANSACTION,
+ ConnectionRetainMode.fromKernelConstant(
ConnectionRetainModes.CONN_RETAIN_TRANS));
- assertEquals(ConnectionRetainType.TRANSACTION.toKernelConstant(),
- ConnectionRetainType.TRANSACTION.ordinal());
+ assertEquals(ConnectionRetainMode.TRANSACTION.toKernelConstant(),
+ ConnectionRetainMode.TRANSACTION.ordinal());
assertEquals(getConstantCount(ConnectionRetainModes.class),
- ConnectionRetainType.values().length);
+ ConnectionRetainMode.values().length);
}
public void testDetachState() {
@@ -183,45 +183,45 @@
public void testCallbackMode() {
assertEquals(getConstantCount(CallbackModes.class),
- CallbackType.values().length);
+ CallbackMode.values().length);
- assertEquals(EnumSet.of(CallbackType.FAIL_FAST),
- CallbackType.toEnumSet(CallbackModes.CALLBACK_FAIL_FAST));
+ assertEquals(EnumSet.of(CallbackMode.FAIL_FAST),
+ CallbackMode.toEnumSet(CallbackModes.CALLBACK_FAIL_FAST));
assertEquals(CallbackModes.CALLBACK_FAIL_FAST,
- CallbackType.fromEnumSet(EnumSet.of(CallbackType.FAIL_FAST)));
+ CallbackMode.fromEnumSet(EnumSet.of(CallbackMode.FAIL_FAST)));
- assertEquals(EnumSet.of(CallbackType.IGNORE),
- CallbackType.toEnumSet(CallbackModes.CALLBACK_IGNORE));
+ assertEquals(EnumSet.of(CallbackMode.IGNORE),
+ CallbackMode.toEnumSet(CallbackModes.CALLBACK_IGNORE));
assertEquals(CallbackModes.CALLBACK_IGNORE,
- CallbackType.fromEnumSet(EnumSet.of(CallbackType.IGNORE)));
+ CallbackMode.fromEnumSet(EnumSet.of(CallbackMode.IGNORE)));
- assertEquals(EnumSet.of(CallbackType.LOG),
- CallbackType.toEnumSet(CallbackModes.CALLBACK_LOG));
+ assertEquals(EnumSet.of(CallbackMode.LOG),
+ CallbackMode.toEnumSet(CallbackModes.CALLBACK_LOG));
assertEquals(CallbackModes.CALLBACK_LOG,
- CallbackType.fromEnumSet(EnumSet.of(CallbackType.LOG)));
+ CallbackMode.fromEnumSet(EnumSet.of(CallbackMode.LOG)));
- assertEquals(EnumSet.of(CallbackType.RETHROW),
- CallbackType.toEnumSet(CallbackModes.CALLBACK_RETHROW));
+ assertEquals(EnumSet.of(CallbackMode.RETHROW),
+ CallbackMode.toEnumSet(CallbackModes.CALLBACK_RETHROW));
assertEquals(CallbackModes.CALLBACK_RETHROW,
- CallbackType.fromEnumSet(EnumSet.of(CallbackType.RETHROW)));
+ CallbackMode.fromEnumSet(EnumSet.of(CallbackMode.RETHROW)));
- assertEquals(EnumSet.of(CallbackType.ROLLBACK),
- CallbackType.toEnumSet(CallbackModes.CALLBACK_ROLLBACK));
+ assertEquals(EnumSet.of(CallbackMode.ROLLBACK),
+ CallbackMode.toEnumSet(CallbackModes.CALLBACK_ROLLBACK));
assertEquals(CallbackModes.CALLBACK_ROLLBACK,
- CallbackType.fromEnumSet(EnumSet.of(CallbackType.ROLLBACK)));
+ CallbackMode.fromEnumSet(EnumSet.of(CallbackMode.ROLLBACK)));
- assertEquals(EnumSet.of(CallbackType.ROLLBACK, CallbackType.IGNORE),
- CallbackType.toEnumSet(CallbackModes.CALLBACK_ROLLBACK
+ assertEquals(EnumSet.of(CallbackMode.ROLLBACK, CallbackMode.IGNORE),
+ CallbackMode.toEnumSet(CallbackModes.CALLBACK_ROLLBACK
| CallbackModes.CALLBACK_IGNORE));
assertEquals(
CallbackModes.CALLBACK_ROLLBACK | CallbackModes.CALLBACK_IGNORE,
- CallbackType.fromEnumSet(
- EnumSet.of(CallbackType.ROLLBACK, CallbackType.IGNORE)));
+ CallbackMode.fromEnumSet(
+ EnumSet.of(CallbackMode.ROLLBACK, CallbackMode.IGNORE)));
- assertEquals(EnumSet.allOf(CallbackType.class),
- CallbackType.toEnumSet(
+ assertEquals(EnumSet.allOf(CallbackMode.class),
+ CallbackMode.toEnumSet(
CallbackModes.CALLBACK_FAIL_FAST
| CallbackModes.CALLBACK_IGNORE
| CallbackModes.CALLBACK_LOG
@@ -232,7 +232,7 @@
| CallbackModes.CALLBACK_LOG
| CallbackModes.CALLBACK_RETHROW
| CallbackModes.CALLBACK_ROLLBACK,
- CallbackType.fromEnumSet(EnumSet.allOf(CallbackType.class)));
+ CallbackMode.fromEnumSet(EnumSet.allOf(CallbackMode.class)));
}
public void testQueryOperationTypes() {
