Author: simonetripodi
Date: Wed Feb 15 16:49:10 2012
New Revision: 1244587
URL: http://svn.apache.org/viewvc?rev=1244587&view=rev
Log:
protostuff extracted as a separate module
Added:
incubator/directmemory/trunk/serializers/protostuff/src/main/java/org/apache/directmemory/serialization/ProtoStuffSerializerV1.java
- copied, changed from r1244501,
incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/serialization/ProtoStuffSerializerV1.java
incubator/directmemory/trunk/serializers/protostuff/src/main/java/org/apache/directmemory/serialization/ProtoStuffWithLinkedBufferSerializer.java
- copied, changed from r1244501,
incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/serialization/ProtoStuffWithLinkedBufferSerializer.java
incubator/directmemory/trunk/serializers/protostuff/src/main/java/org/apache/directmemory/serialization/package-info.java
(with props)
incubator/directmemory/trunk/serializers/protostuff/src/main/resources/META-INF/
- copied from r1244501,
incubator/directmemory/trunk/directmemory-cache/src/test/resources/META-INF/
incubator/directmemory/trunk/serializers/protostuff/src/test/
incubator/directmemory/trunk/serializers/protostuff/src/test/java/
incubator/directmemory/trunk/serializers/protostuff/src/test/java/org/
incubator/directmemory/trunk/serializers/protostuff/src/test/java/org/apache/
incubator/directmemory/trunk/serializers/protostuff/src/test/java/org/apache/directmemory/
incubator/directmemory/trunk/serializers/protostuff/src/test/java/org/apache/directmemory/serialization/
incubator/directmemory/trunk/serializers/protostuff/src/test/java/org/apache/directmemory/serialization/DummyPojo.java
- copied, changed from r1244501,
incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/misc/DummyPojo.java
incubator/directmemory/trunk/serializers/protostuff/src/test/java/org/apache/directmemory/serialization/ProtostuffTestCase.java
(with props)
Removed:
incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/serialization/ProtoStuffSerializerV1.java
incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/serialization/ProtoStuffWithLinkedBufferSerializer.java
incubator/directmemory/trunk/directmemory-cache/src/test/resources/META-INF/
Modified:
incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/serialization/SerializerFactoryTestCase.java
incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/serialization/SerializerTest.java
incubator/directmemory/trunk/pom.xml
incubator/directmemory/trunk/serializers/protostuff/pom.xml
incubator/directmemory/trunk/serializers/protostuff/src/main/resources/META-INF/services/org.apache.directmemory.serialization.Serializer
Modified:
incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/serialization/SerializerFactoryTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/serialization/SerializerFactoryTestCase.java?rev=1244587&r1=1244586&r2=1244587&view=diff
==============================================================================
---
incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/serialization/SerializerFactoryTestCase.java
(original)
+++
incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/serialization/SerializerFactoryTestCase.java
Wed Feb 15 16:49:10 2012
@@ -35,7 +35,7 @@ public final class SerializerFactoryTest
{
Serializer serializer = createNewSerializer();
- assertTrue( serializer instanceof ProtoStuffWithLinkedBufferSerializer
);
+ assertTrue( serializer instanceof StandardSerializer );
}
}
Modified:
incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/serialization/SerializerTest.java
URL:
http://svn.apache.org/viewvc/incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/serialization/SerializerTest.java?rev=1244587&r1=1244586&r2=1244587&view=diff
==============================================================================
---
incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/serialization/SerializerTest.java
(original)
+++
incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/serialization/SerializerTest.java
Wed Feb 15 16:49:10 2012
@@ -28,10 +28,6 @@ import org.apache.directmemory.measures.
import org.apache.directmemory.measures.MonitorService;
import org.apache.directmemory.measures.Ram;
import org.apache.directmemory.misc.DummyPojo;
-import org.apache.directmemory.serialization.ProtoStuffSerializerV1;
-import
org.apache.directmemory.serialization.ProtoStuffWithLinkedBufferSerializer;
-import org.apache.directmemory.serialization.Serializer;
-import org.apache.directmemory.serialization.StandardSerializer;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -77,27 +73,6 @@ public class SerializerTest
}
@Test
- public void ProtostuffTest()
- throws IOException, ClassNotFoundException, InstantiationException,
IllegalAccessException
- {
- testSerializer( "protostuff-old", new ProtoStuffSerializerV1(),
Ram.Kb( 1 ), 20000 );
- testSerializer( "protostuff-old", new ProtoStuffSerializerV1(),
Ram.Kb( 2 ), 20000 );
- testSerializer( "protostuff-old", new ProtoStuffSerializerV1(),
Ram.Kb( 3 ), 20000 );
- testSerializer( "protostuff-old", new ProtoStuffSerializerV1(),
Ram.Kb( 4 ), 20000 );
- }
-
- @Test
- public void ProtostuffV2Test()
- throws IOException, ClassNotFoundException, InstantiationException,
IllegalAccessException
- {
- testSerializer( "protostuff-new", new
ProtoStuffWithLinkedBufferSerializer(), Ram.Kb( 1 ), 20000 );
- testSerializer( "protostuff-new", new
ProtoStuffWithLinkedBufferSerializer(), Ram.Kb( 2 ), 20000 );
- testSerializer( "protostuff-new", new
ProtoStuffWithLinkedBufferSerializer(), Ram.Kb( 3 ), 20000 );
- testSerializer( "protostuff-new", new
ProtoStuffWithLinkedBufferSerializer(), Ram.Kb( 4 ), 20000 );
- testSerializer( "cinquantamila", new
ProtoStuffWithLinkedBufferSerializer(), Ram.Kb( 3 ), 50000 );
- }
-
- @Test
public void StandardTest()
throws IOException, ClassNotFoundException, InstantiationException,
IllegalAccessException
{
@@ -106,4 +81,5 @@ public class SerializerTest
testSerializer( "java-serialization", new StandardSerializer(),
Ram.Kb( 3 ), 20000 );
testSerializer( "java-serialization", new StandardSerializer(),
Ram.Kb( 4 ), 20000 );
}
+
}
Modified: incubator/directmemory/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/directmemory/trunk/pom.xml?rev=1244587&r1=1244586&r2=1244587&view=diff
==============================================================================
--- incubator/directmemory/trunk/pom.xml (original)
+++ incubator/directmemory/trunk/pom.xml Wed Feb 15 16:49:10 2012
@@ -194,6 +194,7 @@ under the License.
<modules>
<module>directmemory-cache</module>
<module>platforms</module>
+ <module>serializers/protostuff</module>
<module>itests</module>
<module>examples</module>
</modules>
Modified: incubator/directmemory/trunk/serializers/protostuff/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/directmemory/trunk/serializers/protostuff/pom.xml?rev=1244587&r1=1244586&r2=1244587&view=diff
==============================================================================
--- incubator/directmemory/trunk/serializers/protostuff/pom.xml (original)
+++ incubator/directmemory/trunk/serializers/protostuff/pom.xml Wed Feb 15
16:49:10 2012
@@ -53,6 +53,7 @@ under the License.
<groupId>${project.parent.groupId}</groupId>
<artifactId>directmemory-cache</artifactId>
<version>${project.parent.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>com.dyuproject.protostuff</groupId>
@@ -74,6 +75,12 @@ under the License.
</dependencies>
<build>
+ <resources>
+ <resource>
+ <directory>${basedir}/src/main/resources</directory>
+ </resource>
+ </resources>
+
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Copied:
incubator/directmemory/trunk/serializers/protostuff/src/main/java/org/apache/directmemory/serialization/ProtoStuffSerializerV1.java
(from r1244501,
incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/serialization/ProtoStuffSerializerV1.java)
URL:
http://svn.apache.org/viewvc/incubator/directmemory/trunk/serializers/protostuff/src/main/java/org/apache/directmemory/serialization/ProtoStuffSerializerV1.java?p2=incubator/directmemory/trunk/serializers/protostuff/src/main/java/org/apache/directmemory/serialization/ProtoStuffSerializerV1.java&p1=incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/serialization/ProtoStuffSerializerV1.java&r1=1244501&r2=1244587&rev=1244587&view=diff
==============================================================================
---
incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/serialization/ProtoStuffSerializerV1.java
(original)
+++
incubator/directmemory/trunk/serializers/protostuff/src/main/java/org/apache/directmemory/serialization/ProtoStuffSerializerV1.java
Wed Feb 15 16:49:10 2012
@@ -31,7 +31,7 @@ import org.apache.directmemory.measures.
import com.dyuproject.protostuff.LinkedBuffer;
import com.dyuproject.protostuff.Schema;
-public class ProtoStuffSerializerV1
+public final class ProtoStuffSerializerV1
implements Serializer
{
Copied:
incubator/directmemory/trunk/serializers/protostuff/src/main/java/org/apache/directmemory/serialization/ProtoStuffWithLinkedBufferSerializer.java
(from r1244501,
incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/serialization/ProtoStuffWithLinkedBufferSerializer.java)
URL:
http://svn.apache.org/viewvc/incubator/directmemory/trunk/serializers/protostuff/src/main/java/org/apache/directmemory/serialization/ProtoStuffWithLinkedBufferSerializer.java?p2=incubator/directmemory/trunk/serializers/protostuff/src/main/java/org/apache/directmemory/serialization/ProtoStuffWithLinkedBufferSerializer.java&p1=incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/serialization/ProtoStuffWithLinkedBufferSerializer.java&r1=1244501&r2=1244587&rev=1244587&view=diff
==============================================================================
---
incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/serialization/ProtoStuffWithLinkedBufferSerializer.java
(original)
+++
incubator/directmemory/trunk/serializers/protostuff/src/main/java/org/apache/directmemory/serialization/ProtoStuffWithLinkedBufferSerializer.java
Wed Feb 15 16:49:10 2012
@@ -112,4 +112,5 @@ public final class ProtoStuffWithLinkedB
mergeFrom( source, object, schema );
return object;
}
+
}
Added:
incubator/directmemory/trunk/serializers/protostuff/src/main/java/org/apache/directmemory/serialization/package-info.java
URL:
http://svn.apache.org/viewvc/incubator/directmemory/trunk/serializers/protostuff/src/main/java/org/apache/directmemory/serialization/package-info.java?rev=1244587&view=auto
==============================================================================
---
incubator/directmemory/trunk/serializers/protostuff/src/main/java/org/apache/directmemory/serialization/package-info.java
(added)
+++
incubator/directmemory/trunk/serializers/protostuff/src/main/java/org/apache/directmemory/serialization/package-info.java
Wed Feb 15 16:49:10 2012
@@ -0,0 +1,23 @@
+/**
+ * Protostuff Serializer adapter.
+ */
+package org.apache.directmemory.serialization;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
+ */
Propchange:
incubator/directmemory/trunk/serializers/protostuff/src/main/java/org/apache/directmemory/serialization/package-info.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
incubator/directmemory/trunk/serializers/protostuff/src/main/java/org/apache/directmemory/serialization/package-info.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange:
incubator/directmemory/trunk/serializers/protostuff/src/main/java/org/apache/directmemory/serialization/package-info.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified:
incubator/directmemory/trunk/serializers/protostuff/src/main/resources/META-INF/services/org.apache.directmemory.serialization.Serializer
URL:
http://svn.apache.org/viewvc/incubator/directmemory/trunk/serializers/protostuff/src/main/resources/META-INF/services/org.apache.directmemory.serialization.Serializer?rev=1244587&r1=1244501&r2=1244587&view=diff
==============================================================================
---
incubator/directmemory/trunk/serializers/protostuff/src/main/resources/META-INF/services/org.apache.directmemory.serialization.Serializer
(original)
+++
incubator/directmemory/trunk/serializers/protostuff/src/main/resources/META-INF/services/org.apache.directmemory.serialization.Serializer
Wed Feb 15 16:49:10 2012
@@ -16,3 +16,4 @@
# under the License.
org.apache.directmemory.serialization.ProtoStuffWithLinkedBufferSerializer
+org.apache.directmemory.serialization.ProtoStuffSerializerV1.java
Copied:
incubator/directmemory/trunk/serializers/protostuff/src/test/java/org/apache/directmemory/serialization/DummyPojo.java
(from r1244501,
incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/misc/DummyPojo.java)
URL:
http://svn.apache.org/viewvc/incubator/directmemory/trunk/serializers/protostuff/src/test/java/org/apache/directmemory/serialization/DummyPojo.java?p2=incubator/directmemory/trunk/serializers/protostuff/src/test/java/org/apache/directmemory/serialization/DummyPojo.java&p1=incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/misc/DummyPojo.java&r1=1244501&r2=1244587&rev=1244587&view=diff
==============================================================================
---
incubator/directmemory/trunk/directmemory-cache/src/test/java/org/apache/directmemory/misc/DummyPojo.java
(original)
+++
incubator/directmemory/trunk/serializers/protostuff/src/test/java/org/apache/directmemory/serialization/DummyPojo.java
Wed Feb 15 16:49:10 2012
@@ -1,4 +1,4 @@
-package org.apache.directmemory.misc;
+package org.apache.directmemory.serialization;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -21,7 +21,9 @@ package org.apache.directmemory.misc;
import java.io.Serializable;
-
+/**
+ * Copied from the core.
+ */
public class DummyPojo
implements Serializable
{
Added:
incubator/directmemory/trunk/serializers/protostuff/src/test/java/org/apache/directmemory/serialization/ProtostuffTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/directmemory/trunk/serializers/protostuff/src/test/java/org/apache/directmemory/serialization/ProtostuffTestCase.java?rev=1244587&view=auto
==============================================================================
---
incubator/directmemory/trunk/serializers/protostuff/src/test/java/org/apache/directmemory/serialization/ProtostuffTestCase.java
(added)
+++
incubator/directmemory/trunk/serializers/protostuff/src/test/java/org/apache/directmemory/serialization/ProtostuffTestCase.java
Wed Feb 15 16:49:10 2012
@@ -0,0 +1,75 @@
+package org.apache.directmemory.serialization;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
+ */
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import java.io.IOException;
+
+import org.apache.directmemory.measures.Monitor;
+import org.apache.directmemory.measures.MonitorService;
+import org.apache.directmemory.measures.Ram;
+import org.junit.Test;
+
+public final class ProtostuffTestCase
+{
+
+ private void testSerializer( String name, Serializer serializer, int size,
int howMany )
+ throws IOException, ClassNotFoundException, InstantiationException,
IllegalAccessException
+ {
+ MonitorService stopWatch = Monitor.get( "serializer." + name + "." +
size + "bytes" );
+ MonitorService stopWatch2 = Monitor.get( "deserializer." + name + "."
+ size + "bytes" );
+ DummyPojo pojo = new DummyPojo( "test", size );
+ for ( int i = 0; i < howMany; i++ )
+ {
+ long split = stopWatch.start();
+ final byte[] array = serializer.serialize( pojo );
+ stopWatch.stop( split );
+ long split2 = stopWatch2.start();
+ DummyPojo check = serializer.deserialize( array, pojo.getClass() );
+ stopWatch2.stop( split2 );
+ assertNotNull( "object has not been serialized", check );
+ assertEquals( pojo.name, check.name );
+ }
+ }
+
+ @Test
+ public void ProtostuffTest()
+ throws IOException, ClassNotFoundException, InstantiationException,
IllegalAccessException
+ {
+ testSerializer( "protostuff-old", new ProtoStuffSerializerV1(),
Ram.Kb( 1 ), 20000 );
+ testSerializer( "protostuff-old", new ProtoStuffSerializerV1(),
Ram.Kb( 2 ), 20000 );
+ testSerializer( "protostuff-old", new ProtoStuffSerializerV1(),
Ram.Kb( 3 ), 20000 );
+ testSerializer( "protostuff-old", new ProtoStuffSerializerV1(),
Ram.Kb( 4 ), 20000 );
+ }
+
+ @Test
+ public void ProtostuffV2Test()
+ throws IOException, ClassNotFoundException, InstantiationException,
IllegalAccessException
+ {
+ testSerializer( "protostuff-new", new
ProtoStuffWithLinkedBufferSerializer(), Ram.Kb( 1 ), 20000 );
+ testSerializer( "protostuff-new", new
ProtoStuffWithLinkedBufferSerializer(), Ram.Kb( 2 ), 20000 );
+ testSerializer( "protostuff-new", new
ProtoStuffWithLinkedBufferSerializer(), Ram.Kb( 3 ), 20000 );
+ testSerializer( "protostuff-new", new
ProtoStuffWithLinkedBufferSerializer(), Ram.Kb( 4 ), 20000 );
+ testSerializer( "cinquantamila", new
ProtoStuffWithLinkedBufferSerializer(), Ram.Kb( 3 ), 50000 );
+ }
+
+}
Propchange:
incubator/directmemory/trunk/serializers/protostuff/src/test/java/org/apache/directmemory/serialization/ProtostuffTestCase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
incubator/directmemory/trunk/serializers/protostuff/src/test/java/org/apache/directmemory/serialization/ProtostuffTestCase.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange:
incubator/directmemory/trunk/serializers/protostuff/src/test/java/org/apache/directmemory/serialization/ProtostuffTestCase.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
