From 43c931014a4719ccebab8e7cd6173d45ee6bcaaf Mon Sep 17 00:00:00 2001 From: Patrick Linskey Date: Fri, 27 Apr 2007 20:46:03 +0000 Subject: [PATCH] OPENJPA-226 git-svn-id: https://svn.apache.org/repos/asf/incubator/openjpa/trunk@533218 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/openjpa/conf/OpenJPAConfigurationImpl.java | 10 ++++++---- .../java/org/apache/openjpa/kernel/DetachManager.java | 2 +- .../java/org/apache/openjpa/kernel/DetachState.java | 7 +++++++ .../apache/openjpa/kernel/VersionAttachStrategy.java | 2 +- .../org/apache/openjpa/conf/localizer.properties | 2 +- .../TestGetReferenceAndImplicitDetachment.java | 2 +- openjpa-project/src/doc/manual/ref_guide_conf.xml | 2 +- openjpa-project/src/doc/manual/ref_guide_remote.xml | 6 +++--- 8 files changed, 21 insertions(+), 12 deletions(-) diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/conf/OpenJPAConfigurationImpl.java b/openjpa-kernel/src/main/java/org/apache/openjpa/conf/OpenJPAConfigurationImpl.java index da57d4a7c..6275c6db0 100644 --- a/openjpa-kernel/src/main/java/org/apache/openjpa/conf/OpenJPAConfigurationImpl.java +++ b/openjpa-kernel/src/main/java/org/apache/openjpa/conf/OpenJPAConfigurationImpl.java @@ -360,10 +360,12 @@ public class OpenJPAConfigurationImpl addValue(autoDetach); detachStatePlugin = addPlugin("DetachState", true); - aliases = - new String[] { "loaded", DetachOptions.Loaded.class.getName(), - "fgs", DetachOptions.FetchGroups.class.getName(), "all", - DetachOptions.All.class.getName(), }; + aliases = new String[] { + "loaded", DetachOptions.Loaded.class.getName(), + "fgs", DetachOptions.FetchGroups.class.getName(), + "fetch-groups", DetachOptions.FetchGroups.class.getName(), + "all", DetachOptions.All.class.getName(), + }; detachStatePlugin.setAliases(aliases); detachStatePlugin.setDefault(aliases[0]); detachStatePlugin.setString(aliases[0]); diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DetachManager.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DetachManager.java index bebc49c70..8ef8bdc01 100644 --- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DetachManager.java +++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DetachManager.java @@ -162,7 +162,7 @@ public class DetachManager // create bitset of fields to detach; if mode is all we can use // currently loaded bitset clone, since we know all fields are loaded if (idxs != null) { - if (detachMode == DETACH_FGS) + if (detachMode == DETACH_FETCH_GROUPS) setFetchGroupFields(broker, sm, idxs); else idxs.or(sm.getLoaded()); diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DetachState.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DetachState.java index af7e17ced..18fd09b0e 100644 --- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DetachState.java +++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DetachState.java @@ -28,6 +28,13 @@ public interface DetachState { /** * Mode to detach all fields in the current fetch groups. + * + * @since 0.9.8 + */ + public static final int DETACH_FETCH_GROUPS = 0; + + /** + * @deprecated */ public static final int DETACH_FGS = 0; diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/VersionAttachStrategy.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/VersionAttachStrategy.java index 735a3e14c..852ab6cf9 100644 --- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/VersionAttachStrategy.java +++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/VersionAttachStrategy.java @@ -133,7 +133,7 @@ class VersionAttachStrategy case DETACH_ALL: attachField(manager, toAttach, sm, fmds[i], true); break; - case DETACH_FGS: + case DETACH_FETCH_GROUPS: if (fetch.requiresFetch(fmds[i]) != FetchConfiguration.FETCH_NONE) attachField(manager, toAttach, sm, fmds[i], true); diff --git a/openjpa-kernel/src/main/resources/org/apache/openjpa/conf/localizer.properties b/openjpa-kernel/src/main/resources/org/apache/openjpa/conf/localizer.properties index 39b39c829..d9f9a6f7b 100644 --- a/openjpa-kernel/src/main/resources/org/apache/openjpa/conf/localizer.properties +++ b/openjpa-kernel/src/main/resources/org/apache/openjpa/conf/localizer.properties @@ -353,7 +353,7 @@ AutoDetach-expert: true DetachState-name: Detach states DetachState-desc: Plugin describing the set of field values which will be \ included in the default detach and related options. These states are \ - "loaded", "all", and "fgs". + "loaded", "all", and "fetch-groups". DetachState-type: General DetachState-cat: Optimization DetachState-displayorder: 50 diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/TestGetReferenceAndImplicitDetachment.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/TestGetReferenceAndImplicitDetachment.java index e14908636..83f5953d4 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/TestGetReferenceAndImplicitDetachment.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detachment/TestGetReferenceAndImplicitDetachment.java @@ -30,7 +30,7 @@ public class TestGetReferenceAndImplicitDetachment extends SingleEMFTestCase { public void setUp() { - setUp("openjpa.DetachState", "fgs", + setUp("openjpa.DetachState", "fetch-groups", DetachmentOneManyParent.class, DetachmentOneManyChild.class); } diff --git a/openjpa-project/src/doc/manual/ref_guide_conf.xml b/openjpa-project/src/doc/manual/ref_guide_conf.xml index 3fff5763b..51150b8c8 100644 --- a/openjpa-project/src/doc/manual/ref_guide_conf.xml +++ b/openjpa-project/src/doc/manual/ref_guide_conf.xml @@ -1583,7 +1583,7 @@ DetachState Possible values: loaded, -fgs, all +fetch-groups, all Description: Determines which fields are part diff --git a/openjpa-project/src/doc/manual/ref_guide_remote.xml b/openjpa-project/src/doc/manual/ref_guide_remote.xml index ce287c48d..bcd5deae8 100644 --- a/openjpa-project/src/doc/manual/ref_guide_remote.xml +++ b/openjpa-project/src/doc/manual/ref_guide_remote.xml @@ -239,7 +239,7 @@ default. -fgs: Detach all fields and relations in the current +fetch-groups: Detach all fields and relations in the current fetch configuration. For more information on custom fetch groups, see . @@ -333,7 +333,7 @@ use detached state managers, as determined by the settings above. Configuring Detached State -<property name="openjpa.DetachState" value="fgs(DetachedStateField=true)"/> +<property name="openjpa.DetachState" value="fetch-groups(DetachedStateField=true)"/> @@ -345,7 +345,7 @@ for controlling detached state: public static final int DETACH_LOADED; -public static final int DETACH_FGS; +public static final int DETACH_FETCH_GROUPS; public static final int DETACH_ALL; public int getDetachState(); public void setDetachState(int mode);