Removed vestigial support for wrapping Storables.

3 files changed, 1 insertions, 198 deletions

diff --git a/src/test/java/com/amazon/carbonado/TestStorables.java b/src/test/java/com/amazon/carbonado/TestStorables.java
index a78f6dd..795318b 100644
--- a/src/test/java/com/amazon/carbonado/TestStorables.java
+++ b/src/test/java/com/amazon/carbonado/TestStorables.java
@@ -57,7 +57,6 @@ import com.amazon.carbonado.lob.Clob;
 import com.amazon.carbonado.lob.StringClob;
 
 import com.amazon.carbonado.spi.RepairExecutor;
-import com.amazon.carbonado.gen.WrappedSupport;
 
 import com.amazon.carbonado.stored.*;
 
@@ -2898,7 +2897,7 @@ public class TestStorables extends TestCase {
         public abstract int setAssymetricSET();
     }
 
-    public static class InvocationTracker extends StorableTestBasic implements WrappedSupport {
+    public static class InvocationTracker extends StorableTestBasic {
         String mName;
         long mInvocationTracks;
 
@@ -3029,10 +3028,6 @@ public class TestStorables extends TestCase {
             return false;
         }
 
-        public WrappedSupport createSupport(Storable storable) {
-            return new InvocationTracker(mName, mTrace);
-        }
-
         public Storage storage() {
             if (mTrace) System.out.println("storage");
             mInvocationTracks |= sStorage;    // 0x4000
@@ -3154,32 +3149,6 @@ public class TestStorables extends TestCase {
         public void setPropertyValue(String name, Object value) {
             if (mTrace) System.out.println("setPropertyValue(" + name + ", " + value + ')');
         }
-
-        public Repository getRootRepository() {
-            return null;
-        }
-
-        public Trigger getInsertTrigger() {
-            return null;
-        }
-
-        public Trigger getUpdateTrigger() {
-            return null;
-        }
-
-        public Trigger getDeleteTrigger() {
-            return null;
-        }
-
-        public Trigger getLoadTrigger() {
-            return null;
-        }
-
-        public void locallyDisableLoadTrigger() {
-        }
-
-        public void locallyEnableLoadTrigger() {
-        }
     }
 
 }
diff --git a/src/test/java/com/amazon/carbonado/gen/TestWrappedStorableFactory.java b/src/test/java/com/amazon/carbonado/gen/TestWrappedStorableFactory.java
deleted file mode 100644
index 40135f1..0000000
--- a/src/test/java/com/amazon/carbonado/gen/TestWrappedStorableFactory.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/*

- * Copyright 2006 Amazon Technologies, Inc. or its affiliates.

- * Amazon, Amazon.com and Carbonado are trademarks or registered trademarks

- * of Amazon Technologies, Inc. or its affiliates.  All rights reserved.

- *

- * Licensed under the Apache License, Version 2.0 (the "License");

- * you may not use this file except in compliance with the License.

- * You may obtain a copy of the License at

- *

- *     http://www.apache.org/licenses/LICENSE-2.0

- *

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- */

-

-package com.amazon.carbonado.gen;

-

-import java.lang.reflect.Method;

-

-import junit.framework.TestSuite;

-

-import com.amazon.carbonado.Cursor;

-import com.amazon.carbonado.Repository;

-import com.amazon.carbonado.Storable;

-import com.amazon.carbonado.Storage;

-import com.amazon.carbonado.TestStorableBase;

-import com.amazon.carbonado.TestStorables;

-

-import com.amazon.carbonado.stored.StorableTestBasic;

-import com.amazon.carbonado.stored.STBContainer;

-

-/**

- *

- *

- * @author Brian S O'Neill

- * @author Don Schneider

- */

-public class TestWrappedStorableFactory extends TestStorableBase {

-    public static void main(String[] args) {

-        junit.textui.TestRunner.run(suite());

-    }

-

-    public static TestSuite suite() {

-        return new TestSuite(TestWrappedStorableFactory.class);

-    }

-

-    public TestWrappedStorableFactory() {

-        super();

-    }

-

-    /**

-     * Test setAndGet

-     */

-    public void test_proxiedSetAndGet() throws Exception {

-        Class<? extends StorableTestBasic> wrapperClass = StorableGenerator

-            .getWrappedClass(StorableTestBasic.class);

-

-        TestStorables.InvocationTracker props = new TestStorables.InvocationTracker("props");

-        TestStorables.InvocationTracker handler = new TestStorables.InvocationTracker("handler");

-

-        StorableTestBasic wrapper = wrapperClass

-            .getConstructor(WrappedSupport.class, Storable.class)

-            .newInstance(handler, props);

-

-        setPrimaryKeyProperties(wrapper);

-        setBasicProperties(wrapper);

-

-        wrapper.getStringProp();

-        wrapper.getIntProp();

-        wrapper.getLongProp();

-        wrapper.getDoubleProp();

-        wrapper.getId();

-

-        for (Method method : Storable.class.getMethods()) {

-            if (method.getParameterTypes().length > 0) {

-                if (method.getParameterTypes()[0] != String.class) {

-                    method.invoke(wrapper, wrapper);

-                }

-            } else {

-                method.invoke(wrapper, (Object[]) null);

-            }

-        }

-

-        props.assertTrack(TestStorables.ALL_GET_METHODS

-                          | TestStorables.ALL_SET_METHODS

-                          // Copy is called on wrapped storable because wrapped storage is null

-                          | TestStorables.sCopy

-                          | TestStorables.sToStringKeyOnly

-                          | TestStorables.sHasDirtyProperties

-                          | TestStorables.sEqualKeys

-                          | TestStorables.sEqualProperties

-                          | TestStorables.sMarkPropertiesClean

-                          | TestStorables.sMarkAllPropertiesClean

-                          | TestStorables.sMarkPropertiesDirty

-                          | TestStorables.sMarkAllPropertiesDirty

-                          | TestStorables.ALL_COPY_PROP_METHODS);

-

-        handler.assertTrack(TestStorables.sTryLoad

-                            | TestStorables.sLoad

-                            | TestStorables.sInsert

-                            | TestStorables.sTryInsert

-                            | TestStorables.sUpdate

-                            | TestStorables.sTryUpdate

-                            | TestStorables.sDelete

-                            | TestStorables.sTryDelete);

-    }

-

-    /**

-     * Verify that storables from joined property are also wrapped.

-     */

-    public void test_wrappedJoin() throws Exception {

-        Storage<StorableTestBasic> stbStorage =

-            getRepository().storageFor(StorableTestBasic.class);

-        StorableTestBasic stb = stbStorage.prepare();

-        //assertEquals(stbStorage, stb.storage());

-        //assertTrue(stb.storage().getClass().getName().indexOf("IndexedStorage") > 0);

-

-        stb.setId(1);

-        stb.initBasicProperties();

-        stb.setStringProp("Hello");

-        stb.insert();

-

-        stb = stbStorage.prepare();

-        stb.setId(2);

-        stb.initBasicProperties();

-        stb.setStringProp("Hello");

-        stb.insert();

-

-        stb = stbStorage.prepare();

-        stb.setId(3);

-        stb.initBasicProperties();

-        stb.setStringProp("World");

-        stb.insert();

-

-        Storage<STBContainer> containerStorage = getRepository().storageFor(STBContainer.class);

-

-        STBContainer container = containerStorage.prepare();

-        container.setName("A");

-        container.setCategory("Hello");

-        container.setCount(2);

-        container.insert();

-

-        container = containerStorage.prepare();

-        container.setName("B");

-        container.setCategory("World");

-        container.setCount(1);

-        container.insert();

-

-        // Test wrapping of query results

-        /*

-        container = containerStorage.prepare();

-        container.setName("A");

-        container.load();

-        Cursor<StorableTestBasic> cursor = container.getContained().fetch();

-        while (cursor.hasNext()) {

-            stb = cursor.next();

-            assertTrue(stb.storage().getClass().getName().indexOf("IndexedStorage") > 0);

-        }

-        */

-    }

-}

diff --git a/src/test/java/com/amazon/carbonado/repo/replicated/TestProxiedStorable.java b/src/test/java/com/amazon/carbonado/repo/replicated/TestProxiedStorable.java
index b94edc9..e14487f 100644
--- a/src/test/java/com/amazon/carbonado/repo/replicated/TestProxiedStorable.java
+++ b/src/test/java/com/amazon/carbonado/repo/replicated/TestProxiedStorable.java
@@ -33,8 +33,6 @@ import com.amazon.carbonado.SupportException;
 import com.amazon.carbonado.FetchException;

 import com.amazon.carbonado.TestStorableBase;

 

-import com.amazon.carbonado.spi.WrappedStorage;

-

 /*

  * TestProxiedStorable

  *