[439337] Remove lock states prefetch API

Remove lock states prefetch API and keep it internal until we fixes
others issues.

Change-Id: I89de29ecab8e35b23373c3fe81a6be0c68fa1340
Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=439337
Signed-off-by: Esteban Dugueperoux <esteban.dugueperoux@obeo.fr>

7 files changed, 23 insertions, 54 deletions

diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/ServerCDOView.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/ServerCDOView.java
index 0550b76cf4..77e87990d3 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/ServerCDOView.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/ServerCDOView.java
@@ -48,13 +48,13 @@ import org.eclipse.emf.cdo.view.CDOAdapterPolicy;
 import org.eclipse.emf.cdo.view.CDOFeatureAnalyzer;
 import org.eclipse.emf.cdo.view.CDOFetchRuleManager;
 import org.eclipse.emf.cdo.view.CDOInvalidationPolicy;
-import org.eclipse.emf.cdo.view.CDOLockStateLoadingPolicy;
 import org.eclipse.emf.cdo.view.CDORevisionPrefetchingPolicy;
 import org.eclipse.emf.cdo.view.CDOStaleReferencePolicy;
 import org.eclipse.emf.cdo.view.CDOView;
 
 import org.eclipse.emf.internal.cdo.session.SessionUtil;
 import org.eclipse.emf.internal.cdo.view.AbstractCDOView;
+import org.eclipse.emf.internal.cdo.view.CDOLockStateLoadingPolicy;
 
 import org.eclipse.net4j.util.concurrent.IRWLockManager.LockType;
 import org.eclipse.net4j.util.event.IListener;
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_439337_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_439337_Test.java
index 3d02e77192..34848c20d8 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_439337_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_439337_Test.java
@@ -26,6 +26,8 @@ import org.eclipse.emf.cdo.transaction.CDOTransaction;
 import org.eclipse.emf.cdo.util.CDOUtil;
 import org.eclipse.emf.cdo.view.CDOView;
 
+import org.eclipse.emf.internal.cdo.view.CDOViewImpl.OptionsImpl;
+
 import org.eclipse.net4j.signal.ISignalProtocol;
 import org.eclipse.net4j.signal.SignalCounter;
 
@@ -81,7 +83,7 @@ public class Bugzilla_439337_Test extends AbstractCDOTest
   {
     CDOSession session = openSession();
     CDOView view = session.openView();
-    view.options().setLockStatePrefetchEnabled(true);
+    ((OptionsImpl)view.options()).setLockStatePrefetchEnabled(true);
     testCDOLockState(view, true);
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_466721_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_466721_Test.java
index 676e8b0b7e..f62568881b 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_466721_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_466721_Test.java
@@ -21,6 +21,8 @@ import org.eclipse.emf.cdo.util.CDOUtil;
 import org.eclipse.emf.cdo.util.ObjectNotFoundException;
 import org.eclipse.emf.cdo.view.CDOView;
 
+import org.eclipse.emf.internal.cdo.view.CDOViewImpl.OptionsImpl;
+
 import org.eclipse.net4j.util.om.OMPlatform;
 import org.eclipse.net4j.util.om.log.OMLogHandler;
 import org.eclipse.net4j.util.om.log.OMLogger;
@@ -46,7 +48,7 @@ public class Bugzilla_466721_Test extends AbstractCDOTest
   {
     CDOSession session1 = openSession();
     CDOTransaction transaction1 = session1.openTransaction();
-    transaction1.options().setLockStatePrefetchEnabled(true);
+    ((OptionsImpl)transaction1.options()).setLockStatePrefetchEnabled(true);
     CDOResource resource1 = transaction1.createResource(getResourcePath(RESOURCE_NAME));
     Company company = getModel1Factory().createCompany();
     resource1.getContents().add(company);
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOView.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOView.java
index 6edeec568e..52760945b1 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOView.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOView.java
@@ -24,7 +24,6 @@ import org.eclipse.emf.cdo.common.branch.CDOBranchPoint;
 import org.eclipse.emf.cdo.common.commit.CDOChangeSetData;
 import org.eclipse.emf.cdo.common.commit.CDOCommitHistory;
 import org.eclipse.emf.cdo.common.id.CDOID;
-import org.eclipse.emf.cdo.common.lock.CDOLockState;
 import org.eclipse.emf.cdo.common.revision.CDORevision;
 import org.eclipse.emf.cdo.common.util.CDOException;
 import org.eclipse.emf.cdo.eresource.CDOBinaryResource;
@@ -633,34 +632,6 @@ public interface CDOView extends CDOCommonView, CDOUpdatable, CDOCommitHistory.P
     public void setInvalidationNotificationEnabled(boolean enabled);
 
     /**
-     * Indicates whether this view will fetch {@link CDOLockState lock states} in its cache when a {@link CDORevision revision} is fetched. A lock state is fetched only if the view's cache does not contains it already or {@link Options#isLockNotificationEnabled()} return false, as in this last case the view's lock state cache can be outdated.
-     *
-     * @see CDOLockState
-     * @since 4.4
-     */
-    public boolean isLockStatePrefetchEnabled();
-
-    /**
-     * Specifies whether this view will load {@link CDOLockState lock states} in its cache when a {@link CDORevision revision} is loaded. A lock state is loaded only if the view's cache does not contains it already or {@link Options#isLockNotificationEnabled() lock notification view option} is disabled, as in this last case the view's lock state cache can be outdated.
-     *
-     * Note that lock state will not be loaded automatically for CDOResource, {@link CDOResource#cdoLockState()} must be called explicitly to load it.
-     *
-     * @see CDOLockState
-     * @since 4.4
-     */
-    public void setLockStatePrefetchEnabled(boolean enabled);
-
-    /**
-     * @since 4.4
-     */
-    public CDOLockStateLoadingPolicy getLockStateLoadingPolicy();
-
-    /**
-     * @since 4.4
-     */
-    public void setLockStateLoadingPolicy(CDOLockStateLoadingPolicy lockStateLoadingPolicy);
-
-    /**
      * @since 3.0
      */
     public CDOInvalidationPolicy getInvalidationPolicy();
@@ -834,19 +805,6 @@ public interface CDOView extends CDOCommonView, CDOUpdatable, CDOCommitHistory.P
     }
 
     /**
-     * An {@link IOptionsEvent options event} fired from common view {@link CDOCommonView#options() options} when the
-     * {@link Options#setLockStatePrefetchEnabled(boolean) lock state prefetch enabled} option has changed.
-     *
-     * @author Esteban Dugueperoux
-     * @noextend This interface is not intended to be extended by clients.
-     * @noimplement This interface is not intended to be implemented by clients.
-     * @since 4.4
-     */
-    public interface LockStatePrefetchEvent extends IOptionsEvent
-    {
-    }
-
-    /**
      * An {@link IOptionsEvent options event} fired from view {@link CDOView#options() options} when the
      * {@link Options#setInvalidationNotificationEnabled(boolean) invalidation notification enabled} option has changed.
      *
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDODefaultLockStateLoadingPolicy.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDODefaultLockStateLoadingPolicy.java
index eb6efc6f60..87a29cb370 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDODefaultLockStateLoadingPolicy.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDODefaultLockStateLoadingPolicy.java
@@ -8,7 +8,7 @@
  * Contributors:
  *    Eike Stepper - initial API and implementation
  */
-package org.eclipse.emf.cdo.view;
+package org.eclipse.emf.internal.cdo.view;
 
 import org.eclipse.emf.cdo.common.id.CDOID;
 import org.eclipse.emf.cdo.common.lock.CDOLockState;
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOLockStateLoadingPolicy.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOLockStateLoadingPolicy.java
index 7d95e7602f..8a95302c9c 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/view/CDOLockStateLoadingPolicy.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOLockStateLoadingPolicy.java
@@ -8,22 +8,24 @@
  * Contributors:
  *    Esteban Dugueperoux - initial API and implementation
  */
-package org.eclipse.emf.cdo.view;
+package org.eclipse.emf.internal.cdo.view;
 
 import org.eclipse.emf.cdo.common.id.CDOID;
 import org.eclipse.emf.cdo.common.lock.CDOLockState;
 import org.eclipse.emf.cdo.common.revision.CDORevision;
 import org.eclipse.emf.cdo.eresource.CDOResource;
-import org.eclipse.emf.cdo.view.CDOView.Options;
+import org.eclipse.emf.cdo.view.CDOView;
+
+import org.eclipse.emf.internal.cdo.view.CDOViewImpl.OptionsImpl;
 
 import org.eclipse.emf.ecore.resource.ResourceSet;
 
 /**
- * An interface to control if {@link CDOLockState lock states} are loaded when {@link CDORevision revisions} are loaded to limit requests sent to server. This interface is to be used when {@link Options#setLockStatePrefetchEnabled(boolean) lock state prefetch view option} is enabled.
+ * An interface to control if {@link CDOLockState lock states} are loaded when {@link CDORevision revisions} are loaded to limit requests sent to server. This interface is to be used when {@link OptionsImpl#setLockStatePrefetchEnabled(boolean) lock state prefetch view option} is enabled.
  * <br/>
  * <br/>
  * Note that lock states will not be loaded automatically for {@link CDOResource} when being created through {@link ResourceSet#getResource(org.eclipse.emf.common.util.URI, boolean)}, {@link CDOResource#cdoLockState()} must be called explicitly to load it.
- * @see Options#setLockStatePrefetchEnabled(boolean)
+ * @see OptionsImpl#setLockStatePrefetchEnabled(boolean)
  * @author Esteban Dugueperoux
  * @since 4.4
  */
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOViewImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOViewImpl.java
index e35749eaf1..f48c37960d 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOViewImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOViewImpl.java
@@ -45,10 +45,8 @@ import org.eclipse.emf.cdo.util.LockTimeoutException;
 import org.eclipse.emf.cdo.util.ReadOnlyException;
 import org.eclipse.emf.cdo.util.StaleRevisionLockException;
 import org.eclipse.emf.cdo.view.CDOAdapterPolicy;
-import org.eclipse.emf.cdo.view.CDODefaultLockStateLoadingPolicy;
 import org.eclipse.emf.cdo.view.CDOFeatureAnalyzer;
 import org.eclipse.emf.cdo.view.CDOInvalidationPolicy;
-import org.eclipse.emf.cdo.view.CDOLockStateLoadingPolicy;
 import org.eclipse.emf.cdo.view.CDORevisionPrefetchingPolicy;
 import org.eclipse.emf.cdo.view.CDOStaleReferencePolicy;
 import org.eclipse.emf.cdo.view.CDOView;
@@ -80,6 +78,7 @@ import org.eclipse.net4j.util.om.log.OMLogger;
 import org.eclipse.net4j.util.om.monitor.EclipseMonitor;
 import org.eclipse.net4j.util.om.monitor.OMMonitor;
 import org.eclipse.net4j.util.om.trace.ContextTracer;
+import org.eclipse.net4j.util.options.IOptionsEvent;
 import org.eclipse.net4j.util.options.OptionsEvent;
 import org.eclipse.net4j.util.ref.ReferenceType;
 import org.eclipse.net4j.util.ref.ReferenceValueMap;
@@ -2013,7 +2012,7 @@ public class CDOViewImpl extends AbstractCDOView
    * @author Eike Stepper
    * @since 2.0
    */
-  protected class OptionsImpl extends Notifier implements Options
+  public class OptionsImpl extends Notifier implements Options
   {
     private boolean loadNotificationEnabled;
 
@@ -2559,9 +2558,15 @@ public class CDOViewImpl extends AbstractCDOView
     }
 
     /**
+     * An {@link IOptionsEvent options event} fired from common view {@link CDOCommonView#options() options} when the
+     * {@link OptionsImpl#setLockStatePrefetchEnabled(boolean) lock state prefetch enabled} option has changed.
+     *
      * @author Esteban Dugueperoux
+     * @noextend This interface is not intended to be extended by clients.
+     * @noimplement This interface is not intended to be implemented by clients.
+     * @since 4.4
      */
-    private final class LockStatePrefetchEventImpl extends OptionsEvent implements LockStatePrefetchEvent
+    private final class LockStatePrefetchEventImpl extends OptionsEvent
     {
       private static final long serialVersionUID = 1L;