diff options
author | Eike Stepper | 2008-09-12 06:12:26 +0000 |
---|---|---|
committer | Eike Stepper | 2008-09-12 06:12:26 +0000 |
commit | 2d1ba2e8a0d87fdc0cc8ca45c6deeab4311a89fb (patch) | |
tree | a08c9ec5574ec91a62e3e0115d3496079193cdbf | |
parent | 83890534b5798912a4eb06512d4a0a306601c2c6 (diff) | |
download | cdo-2d1ba2e8a0d87fdc0cc8ca45c6deeab4311a89fb.tar.gz cdo-2d1ba2e8a0d87fdc0cc8ca45c6deeab4311a89fb.tar.xz cdo-2d1ba2e8a0d87fdc0cc8ca45c6deeab4311a89fb.zip |
[247117] Remove NOOPStore
https://bugs.eclipse.org/bugs/show_bug.cgi?id=247117
7 files changed, 4 insertions, 323 deletions
diff --git a/plugins/org.eclipse.emf.cdo.server/plugin.xml b/plugins/org.eclipse.emf.cdo.server/plugin.xml index 8152bbe16a..365aa9fbff 100644 --- a/plugins/org.eclipse.emf.cdo.server/plugin.xml +++ b/plugins/org.eclipse.emf.cdo.server/plugin.xml @@ -47,8 +47,8 @@ <extension point="org.eclipse.emf.cdo.server.storeFactories"> <storeFactory - class="org.eclipse.emf.cdo.internal.server.NOOPStoreFactory" - storeType="noop"/> + class="org.eclipse.emf.cdo.internal.server.MEMStoreFactory" + storeType="mem"/> </extension> <extension diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/NOOPStore.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/NOOPStore.java deleted file mode 100644 index e92cc0c90c..0000000000 --- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/NOOPStore.java +++ /dev/null @@ -1,76 +0,0 @@ -/*************************************************************************** - * Copyright (c) 2004 - 2008 Eike Stepper, Germany. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Eike Stepper - initial API and implementation - **************************************************************************/ -package org.eclipse.emf.cdo.internal.server; - -import org.eclipse.emf.cdo.server.ISession; -import org.eclipse.emf.cdo.server.IView; - -/** - * @author Eike Stepper - */ -public class NOOPStore extends LongIDStore -{ - public static final String TYPE = "noop"; - - public NOOPStore() - { - super(TYPE); - } - - @Override - public boolean hasBranchingSupport() - { - return false; - } - - @Override - public boolean hasWriteDeltaSupport() - { - return true; - } - - @Override - public boolean hasAuditingSupport() - { - return true; - } - - public void repairAfterCrash() - { - // Do nothing - } - - @Override - public NOOPStoreAccessor createReader(ISession session) - { - return new NOOPStoreAccessor(this, session); - } - - @Override - public NOOPStoreAccessor createWriter(IView view) - { - return new NOOPStoreAccessor(this, view); - } - - @Override - protected StoreAccessorPool getReaderPool(ISession session, boolean forReleasing) - { - // Pooling of store accessors not supported - return null; - } - - @Override - protected StoreAccessorPool getWriterPool(IView view, boolean forReleasing) - { - // Pooling of store accessors not supported - return null; - } -} diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/NOOPStoreAccessor.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/NOOPStoreAccessor.java deleted file mode 100644 index 255bddfd96..0000000000 --- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/NOOPStoreAccessor.java +++ /dev/null @@ -1,153 +0,0 @@ -/*************************************************************************** - * Copyright (c) 2004 - 2008 Eike Stepper, Germany. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Eike Stepper - initial API and implementation - **************************************************************************/ -package org.eclipse.emf.cdo.internal.server; - -import org.eclipse.emf.cdo.common.id.CDOID; -import org.eclipse.emf.cdo.common.model.CDOClassRef; -import org.eclipse.emf.cdo.common.model.CDOFeature; -import org.eclipse.emf.cdo.common.model.CDOPackage; -import org.eclipse.emf.cdo.common.model.CDOPackageInfo; -import org.eclipse.emf.cdo.common.query.CDOQueryInfo; -import org.eclipse.emf.cdo.common.revision.CDORevision; -import org.eclipse.emf.cdo.server.IQueryContext; -import org.eclipse.emf.cdo.server.ISession; -import org.eclipse.emf.cdo.server.IStoreChunkReader; -import org.eclipse.emf.cdo.server.IStoreReader; -import org.eclipse.emf.cdo.server.IStoreWriter; -import org.eclipse.emf.cdo.server.IView; - -import org.eclipse.net4j.util.collection.CloseableIterator; - -import java.util.Collection; -import java.util.Collections; - -/** - * @author Eike Stepper - */ -public class NOOPStoreAccessor extends StoreAccessor implements IStoreReader, IStoreWriter -{ - public NOOPStoreAccessor(NOOPStore store, ISession session) - { - super(store, session); - } - - public NOOPStoreAccessor(NOOPStore store, IView view) - { - super(store, view); - } - - @Override - public NOOPStore getStore() - { - return (NOOPStore)super.getStore(); - } - - public IStoreChunkReader createChunkReader(CDORevision revision, CDOFeature feature) - { - return new NOOPStoreChunkReader(this, revision, feature); - } - - public Collection<CDOPackageInfo> readPackageInfos() - { - return Collections.emptySet(); - } - - public void readPackage(CDOPackage cdoPackage) - { - throw new UnsupportedOperationException(); - } - - public CloseableIterator<CDOID> readObjectIDs(boolean withTypes) - { - throw new UnsupportedOperationException(); - } - - public CDOClassRef readObjectType(CDOID id) - { - throw new UnsupportedOperationException(); - } - - public CDORevision readRevision(CDOID id, int referenceChunk) - { - throw new UnsupportedOperationException(); - } - - public CDORevision readRevisionByTime(CDOID id, int referenceChunk, long timeStamp) - { - throw new UnsupportedOperationException(); - } - - public CDORevision readRevisionByVersion(CDOID id, int referenceChunk, int version) - { - throw new UnsupportedOperationException(); - } - - public CDOID readResourceID(String path) - { - throw new UnsupportedOperationException(); - } - - public String readResourcePath(CDOID id) - { - throw new UnsupportedOperationException(); - } - - /** - * @since 2.0 - */ - public void queryResources(QueryResourcesContext context) - { - throw new UnsupportedOperationException(); - } - - /** - * @since 2.0 - */ - public void executeQuery(CDOQueryInfo info, IQueryContext context) - { - throw new UnsupportedOperationException(); - } - - /** - * TODO Clarify the meaning of {@link IStoreReader#refreshRevisions()} - * - * @since 2.0 - */ - public void refreshRevisions() - { - // Do nothing - } - - @Override - protected void doActivate() throws Exception - { - // Do nothing - } - - @Override - protected void doDeactivate() throws Exception - { - // Do nothing - } - - @Override - protected void doPassivate() throws Exception - { - // Pooling of store accessors not supported - } - - @Override - protected void doUnpassivate() throws Exception - { - // Pooling of store accessors not supported - } - -} diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/NOOPStoreChunkReader.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/NOOPStoreChunkReader.java deleted file mode 100644 index 41977fb9e4..0000000000 --- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/NOOPStoreChunkReader.java +++ /dev/null @@ -1,45 +0,0 @@ -/*************************************************************************** - * Copyright (c) 2004 - 2008 Eike Stepper, Germany. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Eike Stepper - initial API and implementation - **************************************************************************/ -package org.eclipse.emf.cdo.internal.server; - -import org.eclipse.emf.cdo.common.model.CDOFeature; -import org.eclipse.emf.cdo.common.revision.CDORevision; -import org.eclipse.emf.cdo.server.IStoreReader; - -import java.util.List; - -/** - * @author Eike Stepper - */ -public class NOOPStoreChunkReader extends StoreChunkReader -{ - public NOOPStoreChunkReader(IStoreReader storeReader, CDORevision revision, CDOFeature feature) - { - super(storeReader, revision, feature); - } - - @Override - public void addSimpleChunk(int index) - { - throw new UnsupportedOperationException(); - } - - @Override - public void addRangedChunk(int fromIndex, int toIndex) - { - throw new UnsupportedOperationException(); - } - - public List<Chunk> executeRead() - { - throw new UnsupportedOperationException(); - } -} diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/NOOPStoreFactory.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/NOOPStoreFactory.java deleted file mode 100644 index 6b9f4381d0..0000000000 --- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/NOOPStoreFactory.java +++ /dev/null @@ -1,36 +0,0 @@ -/*************************************************************************** - * Copyright (c) 2004 - 2008 Eike Stepper, Germany. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Eike Stepper - initial API and implementation - **************************************************************************/ -package org.eclipse.emf.cdo.internal.server; - -import org.eclipse.emf.cdo.server.IStore; -import org.eclipse.emf.cdo.server.IStoreFactory; - -import org.w3c.dom.Element; - -/** - * @author Eike Stepper - */ -public class NOOPStoreFactory implements IStoreFactory -{ - public NOOPStoreFactory() - { - } - - public String getStoreType() - { - return NOOPStore.TYPE; - } - - public IStore createStore(Element storeConfig) - { - return new NOOPStore(); - } -} diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/StoreUtil.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/StoreUtil.java index 3f932ea9df..b2ce9d6e66 100644 --- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/StoreUtil.java +++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/StoreUtil.java @@ -11,7 +11,6 @@ package org.eclipse.emf.cdo.server; import org.eclipse.emf.cdo.internal.server.MEMStore; -import org.eclipse.emf.cdo.internal.server.NOOPStore; /** * @author Eike Stepper @@ -22,11 +21,6 @@ public final class StoreUtil { } - public static IStore createNOOPStore() - { - return new NOOPStore(); - } - public static IMEMStore createMEMStore() { return new MEMStore(); diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ResourceTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ResourceTest.java index 3ee8650932..c5e832dae6 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ResourceTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ResourceTest.java @@ -6,7 +6,6 @@ import org.eclipse.emf.cdo.CDOTransaction; import org.eclipse.emf.cdo.CDOView; import org.eclipse.emf.cdo.eresource.CDOResource; import org.eclipse.emf.cdo.internal.server.MEMStore; -import org.eclipse.emf.cdo.internal.server.NOOPStore; import org.eclipse.emf.cdo.server.IStore; import org.eclipse.emf.cdo.tests.model1.Model1Factory; import org.eclipse.emf.cdo.tests.model1.Product; @@ -50,7 +49,7 @@ public class ResourceTest extends AbstractCDOTest } IStore store = getRepository().getStore(); - if (!(store instanceof MEMStore || store instanceof NOOPStore)) + if (!(store instanceof MEMStore)) { restartContainer(); } @@ -106,7 +105,7 @@ public class ResourceTest extends AbstractCDOTest assertEquals(CDOURIUtil.createResourceURI(session, "test1"), resource.getURI()); assertEquals(transaction.getResourceSet(), resource.getResourceSet()); } - + public void testRemoveResourceWithCloseView() throws Exception { { @@ -207,8 +206,6 @@ public class ResourceTest extends AbstractCDOTest session.close(); } - - /** * http://bugs.eclipse.org/208689 */ |