Removed special api module and moved interfaces to core.
git-svn-id: https://svn.apache.org/repos/asf/directmemory/lightning/trunk@1398080 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/lightning-api/pom.xml b/lightning-api/pom.xml
deleted file mode 100644
index 8d3ac57..0000000
--- a/lightning-api/pom.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <artifactId>lightning-api</artifactId>
- <name>Lightning :: API</name>
-
- <parent>
- <artifactId>lightning</artifactId>
- <groupId>org.apache.directmemory.lightning</groupId>
- <version>0.0.1-SNAPSHOT</version>
- </parent>
-
- <dependencies>
- <dependency>
- <groupId>com.carrotsearch</groupId>
- <artifactId>hppc</artifactId>
- <version>0.4.1</version>
- </dependency>
- </dependencies>
-</project>
\ No newline at end of file
diff --git a/lightning-core/pom.xml b/lightning-core/pom.xml
index f2fb156..b452aef 100644
--- a/lightning-core/pom.xml
+++ b/lightning-core/pom.xml
@@ -31,18 +31,6 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>lightning-api</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- </dependency>
-
- <dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
<scope>provided</scope>
@@ -58,6 +46,10 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>com.carrotsearch</groupId>
+ <artifactId>hppc</artifactId>
+ </dependency>
<dependency>
<groupId>junit</groupId>
diff --git a/lightning-api/src/main/java/org/apache/directmemory/lightning/ClassComparisonStrategy.java b/lightning-core/src/main/java/org/apache/directmemory/lightning/ClassComparisonStrategy.java
similarity index 100%
rename from lightning-api/src/main/java/org/apache/directmemory/lightning/ClassComparisonStrategy.java
rename to lightning-core/src/main/java/org/apache/directmemory/lightning/ClassComparisonStrategy.java
diff --git a/lightning-core/src/main/java/org/apache/directmemory/lightning/Lightning.java b/lightning-core/src/main/java/org/apache/directmemory/lightning/Lightning.java
index 34c39aa..6ff3d96 100644
--- a/lightning-core/src/main/java/org/apache/directmemory/lightning/Lightning.java
+++ b/lightning-core/src/main/java/org/apache/directmemory/lightning/Lightning.java
@@ -31,7 +31,7 @@
import org.apache.directmemory.lightning.configuration.SerializerDefinition;
import org.apache.directmemory.lightning.internal.InternalSerializerCreator;
import org.apache.directmemory.lightning.logging.Logger;
-import org.apache.directmemory.lightning.logging.LoggerAdapter;
+import org.apache.directmemory.lightning.logging.NoOpLogger;
import org.apache.directmemory.lightning.metadata.ValueNullableEvaluator;
public final class Lightning
@@ -71,7 +71,7 @@
private File debugCacheDirectory = null;
- private Logger logger = new LoggerAdapter();
+ private Logger logger = new NoOpLogger();
private Builder()
{
diff --git a/lightning-api/src/main/java/org/apache/directmemory/lightning/Marshaller.java b/lightning-core/src/main/java/org/apache/directmemory/lightning/Marshaller.java
similarity index 100%
rename from lightning-api/src/main/java/org/apache/directmemory/lightning/Marshaller.java
rename to lightning-core/src/main/java/org/apache/directmemory/lightning/Marshaller.java
diff --git a/lightning-api/src/main/java/org/apache/directmemory/lightning/MarshallerContext.java b/lightning-core/src/main/java/org/apache/directmemory/lightning/MarshallerContext.java
similarity index 100%
rename from lightning-api/src/main/java/org/apache/directmemory/lightning/MarshallerContext.java
rename to lightning-core/src/main/java/org/apache/directmemory/lightning/MarshallerContext.java
diff --git a/lightning-api/src/main/java/org/apache/directmemory/lightning/MarshallerStrategy.java b/lightning-core/src/main/java/org/apache/directmemory/lightning/MarshallerStrategy.java
similarity index 100%
rename from lightning-api/src/main/java/org/apache/directmemory/lightning/MarshallerStrategy.java
rename to lightning-core/src/main/java/org/apache/directmemory/lightning/MarshallerStrategy.java
diff --git a/lightning-api/src/main/java/org/apache/directmemory/lightning/SerializationContext.java b/lightning-core/src/main/java/org/apache/directmemory/lightning/SerializationContext.java
similarity index 100%
rename from lightning-api/src/main/java/org/apache/directmemory/lightning/SerializationContext.java
rename to lightning-core/src/main/java/org/apache/directmemory/lightning/SerializationContext.java
diff --git a/lightning-api/src/main/java/org/apache/directmemory/lightning/SerializationStrategy.java b/lightning-core/src/main/java/org/apache/directmemory/lightning/SerializationStrategy.java
similarity index 100%
rename from lightning-api/src/main/java/org/apache/directmemory/lightning/SerializationStrategy.java
rename to lightning-core/src/main/java/org/apache/directmemory/lightning/SerializationStrategy.java
diff --git a/lightning-api/src/main/java/org/apache/directmemory/lightning/Serializer.java b/lightning-core/src/main/java/org/apache/directmemory/lightning/Serializer.java
similarity index 100%
rename from lightning-api/src/main/java/org/apache/directmemory/lightning/Serializer.java
rename to lightning-core/src/main/java/org/apache/directmemory/lightning/Serializer.java
diff --git a/lightning-api/src/main/java/org/apache/directmemory/lightning/Streamed.java b/lightning-core/src/main/java/org/apache/directmemory/lightning/Streamed.java
similarity index 100%
rename from lightning-api/src/main/java/org/apache/directmemory/lightning/Streamed.java
rename to lightning-core/src/main/java/org/apache/directmemory/lightning/Streamed.java
diff --git a/lightning-api/src/main/java/org/apache/directmemory/lightning/TypeBindableMarshaller.java b/lightning-core/src/main/java/org/apache/directmemory/lightning/TypeBindableMarshaller.java
similarity index 100%
rename from lightning-api/src/main/java/org/apache/directmemory/lightning/TypeBindableMarshaller.java
rename to lightning-core/src/main/java/org/apache/directmemory/lightning/TypeBindableMarshaller.java
diff --git a/lightning-api/src/main/java/org/apache/directmemory/lightning/configuration/SerializerDefinition.java b/lightning-core/src/main/java/org/apache/directmemory/lightning/configuration/SerializerDefinition.java
similarity index 100%
rename from lightning-api/src/main/java/org/apache/directmemory/lightning/configuration/SerializerDefinition.java
rename to lightning-core/src/main/java/org/apache/directmemory/lightning/configuration/SerializerDefinition.java
diff --git a/lightning-api/src/main/java/org/apache/directmemory/lightning/configuration/TypeIntrospector.java b/lightning-core/src/main/java/org/apache/directmemory/lightning/configuration/TypeIntrospector.java
similarity index 100%
rename from lightning-api/src/main/java/org/apache/directmemory/lightning/configuration/TypeIntrospector.java
rename to lightning-core/src/main/java/org/apache/directmemory/lightning/configuration/TypeIntrospector.java
diff --git a/lightning-api/src/main/java/org/apache/directmemory/lightning/exceptions/ClassDefinitionInconsistentException.java b/lightning-core/src/main/java/org/apache/directmemory/lightning/exceptions/ClassDefinitionInconsistentException.java
similarity index 100%
rename from lightning-api/src/main/java/org/apache/directmemory/lightning/exceptions/ClassDefinitionInconsistentException.java
rename to lightning-core/src/main/java/org/apache/directmemory/lightning/exceptions/ClassDefinitionInconsistentException.java
diff --git a/lightning-api/src/main/java/org/apache/directmemory/lightning/exceptions/IllegalAccessorException.java b/lightning-core/src/main/java/org/apache/directmemory/lightning/exceptions/IllegalAccessorException.java
similarity index 100%
rename from lightning-api/src/main/java/org/apache/directmemory/lightning/exceptions/IllegalAccessorException.java
rename to lightning-core/src/main/java/org/apache/directmemory/lightning/exceptions/IllegalAccessorException.java
diff --git a/lightning-api/src/main/java/org/apache/directmemory/lightning/exceptions/IllegalPropertyAccessException.java b/lightning-core/src/main/java/org/apache/directmemory/lightning/exceptions/IllegalPropertyAccessException.java
similarity index 100%
rename from lightning-api/src/main/java/org/apache/directmemory/lightning/exceptions/IllegalPropertyAccessException.java
rename to lightning-core/src/main/java/org/apache/directmemory/lightning/exceptions/IllegalPropertyAccessException.java
diff --git a/lightning-api/src/main/java/org/apache/directmemory/lightning/exceptions/SerializerDefinitionException.java b/lightning-core/src/main/java/org/apache/directmemory/lightning/exceptions/SerializerDefinitionException.java
similarity index 100%
rename from lightning-api/src/main/java/org/apache/directmemory/lightning/exceptions/SerializerDefinitionException.java
rename to lightning-core/src/main/java/org/apache/directmemory/lightning/exceptions/SerializerDefinitionException.java
diff --git a/lightning-api/src/main/java/org/apache/directmemory/lightning/exceptions/SerializerExecutionException.java b/lightning-core/src/main/java/org/apache/directmemory/lightning/exceptions/SerializerExecutionException.java
similarity index 100%
rename from lightning-api/src/main/java/org/apache/directmemory/lightning/exceptions/SerializerExecutionException.java
rename to lightning-core/src/main/java/org/apache/directmemory/lightning/exceptions/SerializerExecutionException.java
diff --git a/lightning-api/src/main/java/org/apache/directmemory/lightning/exceptions/SerializerMarshallerGeneratorException.java b/lightning-core/src/main/java/org/apache/directmemory/lightning/exceptions/SerializerMarshallerGeneratorException.java
similarity index 100%
rename from lightning-api/src/main/java/org/apache/directmemory/lightning/exceptions/SerializerMarshallerGeneratorException.java
rename to lightning-core/src/main/java/org/apache/directmemory/lightning/exceptions/SerializerMarshallerGeneratorException.java
diff --git a/lightning-api/src/main/java/org/apache/directmemory/lightning/generator/DefinitionBuildingContext.java b/lightning-core/src/main/java/org/apache/directmemory/lightning/generator/DefinitionBuildingContext.java
similarity index 100%
rename from lightning-api/src/main/java/org/apache/directmemory/lightning/generator/DefinitionBuildingContext.java
rename to lightning-core/src/main/java/org/apache/directmemory/lightning/generator/DefinitionBuildingContext.java
diff --git a/lightning-api/src/main/java/org/apache/directmemory/lightning/generator/DefinitionVisitor.java b/lightning-core/src/main/java/org/apache/directmemory/lightning/generator/DefinitionVisitor.java
similarity index 100%
rename from lightning-api/src/main/java/org/apache/directmemory/lightning/generator/DefinitionVisitor.java
rename to lightning-core/src/main/java/org/apache/directmemory/lightning/generator/DefinitionVisitor.java
diff --git a/lightning-api/src/main/java/org/apache/directmemory/lightning/generator/PropertyDescriptorFactory.java b/lightning-core/src/main/java/org/apache/directmemory/lightning/generator/PropertyDescriptorFactory.java
similarity index 100%
rename from lightning-api/src/main/java/org/apache/directmemory/lightning/generator/PropertyDescriptorFactory.java
rename to lightning-core/src/main/java/org/apache/directmemory/lightning/generator/PropertyDescriptorFactory.java
diff --git a/lightning-api/src/main/java/org/apache/directmemory/lightning/instantiator/ObjectInstantiator.java b/lightning-core/src/main/java/org/apache/directmemory/lightning/instantiator/ObjectInstantiator.java
similarity index 100%
rename from lightning-api/src/main/java/org/apache/directmemory/lightning/instantiator/ObjectInstantiator.java
rename to lightning-core/src/main/java/org/apache/directmemory/lightning/instantiator/ObjectInstantiator.java
diff --git a/lightning-api/src/main/java/org/apache/directmemory/lightning/instantiator/ObjectInstantiatorFactory.java b/lightning-core/src/main/java/org/apache/directmemory/lightning/instantiator/ObjectInstantiatorFactory.java
similarity index 100%
rename from lightning-api/src/main/java/org/apache/directmemory/lightning/instantiator/ObjectInstantiatorFactory.java
rename to lightning-core/src/main/java/org/apache/directmemory/lightning/instantiator/ObjectInstantiatorFactory.java
diff --git a/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/InternalSerializer.java b/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/InternalSerializer.java
index c3811b8..dbea74e 100644
--- a/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/InternalSerializer.java
+++ b/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/InternalSerializer.java
@@ -100,7 +100,7 @@
marshallerGenerator.generateMarshaller( classDescriptor.getType(),
classDescriptor.getPropertyDescriptors(), marshallers,
this, serializationStrategy, objectInstantiatorFactory,
- debugCacheDirectory );
+ debugCacheDirectory, logger );
( (InternalClassDescriptor) classDescriptor ).setMarshaller( marshaller );
marshallers.put( classDescriptor.getType(), marshaller );
diff --git a/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/InternalSerializerCreator.java b/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/InternalSerializerCreator.java
index a186123..dc1872e 100644
--- a/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/InternalSerializerCreator.java
+++ b/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/InternalSerializerCreator.java
@@ -46,7 +46,7 @@
import org.apache.directmemory.lightning.internal.util.ClassUtil;
import org.apache.directmemory.lightning.internal.util.TypeUtil;
import org.apache.directmemory.lightning.logging.Logger;
-import org.apache.directmemory.lightning.logging.LoggerAdapter;
+import org.apache.directmemory.lightning.logging.NoOpLogger;
import org.apache.directmemory.lightning.metadata.Attribute;
import org.apache.directmemory.lightning.metadata.ClassDefinition;
import org.apache.directmemory.lightning.metadata.ClassDescriptor;
@@ -75,7 +75,7 @@
private File debugCacheDirectory = null;
- private Logger logger = new LoggerAdapter();
+ private Logger logger = new NoOpLogger();
public InternalSerializerCreator()
{
diff --git a/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/generator/BytecodeMarshallerGenerator.java b/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/generator/BytecodeMarshallerGenerator.java
index 642e37e..86dc2ca 100644
--- a/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/generator/BytecodeMarshallerGenerator.java
+++ b/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/generator/BytecodeMarshallerGenerator.java
@@ -19,7 +19,16 @@
* under the License.
*/
-import org.apache.commons.io.IOUtils;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.PrintStream;
+import java.lang.reflect.Constructor;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
import org.apache.directmemory.lightning.Marshaller;
import org.apache.directmemory.lightning.MarshallerStrategy;
import org.apache.directmemory.lightning.SerializationStrategy;
@@ -28,6 +37,7 @@
import org.apache.directmemory.lightning.internal.ClassDescriptorAwareSerializer;
import org.apache.directmemory.lightning.internal.InternalMarshallerStrategy;
import org.apache.directmemory.lightning.internal.util.ClassUtil;
+import org.apache.directmemory.lightning.logging.Logger;
import org.apache.directmemory.lightning.metadata.PropertyDescriptor;
import org.objectweb.asm.ClassWriter;
import org.objectweb.asm.FieldVisitor;
@@ -36,15 +46,6 @@
import org.objectweb.asm.Opcodes;
import org.objectweb.asm.Type;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.PrintStream;
-import java.lang.reflect.Constructor;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
public class BytecodeMarshallerGenerator
implements Opcodes, GeneratorConstants, MarshallerGenerator
{
@@ -57,7 +58,7 @@
ClassDescriptorAwareSerializer serializer,
SerializationStrategy serializationStrategy,
ObjectInstantiatorFactory objectInstantiatorFactory,
- File debugCacheDirectory )
+ File debugCacheDirectory, Logger logger )
{
try
@@ -69,9 +70,9 @@
Collections.sort( propertyDescriptorsCopy );
// Build className e.g. "SomeTypeMarshaller$$X$$Lightning"
- String className = new StringBuilder(
- !type.isArray() ? type.getSimpleName() : type.getComponentType().getSimpleName() + "Array" ).append(
- "Marshaller" ).append( GENEREATED_CLASS_ID.getAndIncrement() ).append( "Lightning" ).toString();
+ String className =
+ new StringBuilder( !type.isArray() ? type.getSimpleName() : type.getComponentType().getSimpleName()
+ + "Array" ).append( "Marshaller" ).append( GENEREATED_CLASS_ID.getAndIncrement() ).append( "Lightning" ).toString();
// Build class
cw.visit( V1_6, ACC_PUBLIC & ACC_SUPER, className, null, SUPER_CLASS_INTERNAL_TYPE, null );
@@ -104,7 +105,14 @@
}
finally
{
- IOUtils.closeQuietly( out );
+ try
+ {
+ out.close();
+ }
+ catch ( IOException e )
+ {
+ logger.warn( String.format( "Class %s could not be cached", className ), e );
+ }
}
}
@@ -119,7 +127,8 @@
}
catch ( Exception e )
{
- throw new SerializerMarshallerGeneratorException( "Marshaller for type " + type + " could not be generated",
+ throw new SerializerMarshallerGeneratorException(
+ "Marshaller for type " + type + " could not be generated",
e );
}
}
@@ -132,27 +141,31 @@
FieldVisitor fv = null;
// Write PropertyDescriptor field
- fv = cw.visitField( ACC_FINAL & ACC_PRIVATE, toFinalFieldName( "descriptor", propertyDescriptor ),
- PROPERTYDESCRIPTOR_CLASS_DESCRIPTOR, null, null );
+ fv =
+ cw.visitField( ACC_FINAL & ACC_PRIVATE, toFinalFieldName( "descriptor", propertyDescriptor ),
+ PROPERTYDESCRIPTOR_CLASS_DESCRIPTOR, null, null );
fv.visitEnd();
if ( propertyDescriptor.getType().isArray()
&& !propertyDescriptor.getType().getComponentType().isPrimitive() )
{
// Write ComponentType PropertyDescriptor field
- fv = cw.visitField( ACC_FINAL & ACC_PRIVATE, toFinalFieldName( "component", propertyDescriptor ),
- CHEATINGPROPERTYDESCRIPTOR_CLASS_DESCRIPTOR, null, null );
+ fv =
+ cw.visitField( ACC_FINAL & ACC_PRIVATE, toFinalFieldName( "component", propertyDescriptor ),
+ CHEATINGPROPERTYDESCRIPTOR_CLASS_DESCRIPTOR, null, null );
fv.visitEnd();
}
// Write Marshaller field
- fv = cw.visitField( ACC_FINAL & ACC_PRIVATE, toFinalFieldName( "marshaller", propertyDescriptor ),
- MARSHALLER_CLASS_DESCRIPTOR, null, null );
+ fv =
+ cw.visitField( ACC_FINAL & ACC_PRIVATE, toFinalFieldName( "marshaller", propertyDescriptor ),
+ MARSHALLER_CLASS_DESCRIPTOR, null, null );
fv.visitEnd();
// Write PropertyAccessor field
- fv = cw.visitField( ACC_FINAL & ACC_PRIVATE, toFinalFieldName( "accessor", propertyDescriptor ),
- PROPERTYACCESSOR_CLASS_DESCRIPTOR, null, null );
+ fv =
+ cw.visitField( ACC_FINAL & ACC_PRIVATE, toFinalFieldName( "accessor", propertyDescriptor ),
+ PROPERTYACCESSOR_CLASS_DESCRIPTOR, null, null );
fv.visitEnd();
}
}
@@ -178,8 +191,7 @@
mv.visitVarInsn( ALOAD, 4 );
// Call super(Class, Map)
- mv.visitMethodInsn( INVOKESPECIAL, SUPER_CLASS_INTERNAL_TYPE, "<init>",
- MARSHALLER_SUPER_CONSTRUCTOR_SIGNATURE );
+ mv.visitMethodInsn( INVOKESPECIAL, SUPER_CLASS_INTERNAL_TYPE, "<init>", MARSHALLER_SUPER_CONSTRUCTOR_SIGNATURE );
// Fill fields with marshallers
for ( int i = 0; i < propertyDescriptors.size(); i++ )
@@ -395,8 +407,7 @@
mv.visitVarInsn( ALOAD, 4 );
// Call Marshaller#marshall on properties marshaller
- mv.visitMethodInsn( INVOKEINTERFACE, MARSHALLER_CLASS_INTERNAL_TYPE, "marshall",
- MARSHALLER_MARSHALL_SIGNATURE );
+ mv.visitMethodInsn( INVOKEINTERFACE, MARSHALLER_CLASS_INTERNAL_TYPE, "marshall", MARSHALLER_MARSHALL_SIGNATURE );
}
private void visitObjectArrayPropertyAccessorRead( MethodVisitor mv, String className,
@@ -481,8 +492,7 @@
mv.visitVarInsn( ALOAD, 4 );
// Call Marshaller#marshall on properties marshaller
- mv.visitMethodInsn( INVOKEINTERFACE, MARSHALLER_CLASS_INTERNAL_TYPE, "marshall",
- MARSHALLER_MARSHALL_SIGNATURE );
+ mv.visitMethodInsn( INVOKEINTERFACE, MARSHALLER_CLASS_INTERNAL_TYPE, "marshall", MARSHALLER_MARSHALL_SIGNATURE );
// Test if loop ends
mv.visitIincInsn( 7, 1 );
@@ -891,8 +901,7 @@
private String toFinalFieldName( String prefix, PropertyDescriptor propertyDescriptor )
{
- return new StringBuilder( prefix.toUpperCase() ).append( "_" ).append(
- propertyDescriptor.getPropertyName().toUpperCase() ).append( "_LIGHTNING" ).toString();
+ return new StringBuilder( prefix.toUpperCase() ).append( "_" ).append( propertyDescriptor.getPropertyName().toUpperCase() ).append( "_LIGHTNING" ).toString();
}
protected void visitSystemOutPrintln( MethodVisitor mv, int stackPosition )
diff --git a/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/generator/MarshallerGenerator.java b/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/generator/MarshallerGenerator.java
index 6637c54..806725f 100644
--- a/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/generator/MarshallerGenerator.java
+++ b/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/generator/MarshallerGenerator.java
@@ -26,6 +26,7 @@
import org.apache.directmemory.lightning.SerializationStrategy;
import org.apache.directmemory.lightning.instantiator.ObjectInstantiatorFactory;
import org.apache.directmemory.lightning.internal.ClassDescriptorAwareSerializer;
+import org.apache.directmemory.lightning.logging.Logger;
import org.apache.directmemory.lightning.metadata.PropertyDescriptor;
public interface MarshallerGenerator
@@ -34,6 +35,7 @@
Marshaller generateMarshaller( Class<?> type, List<PropertyDescriptor> propertyDescriptors,
Map<Class<?>, Marshaller> marshallers, ClassDescriptorAwareSerializer serializer,
SerializationStrategy serializationStrategy,
- ObjectInstantiatorFactory objectInstantiatorFactory, File debugCacheDirectory );
+ ObjectInstantiatorFactory objectInstantiatorFactory, File debugCacheDirectory,
+ Logger logger );
}
diff --git a/lightning-api/src/main/java/org/apache/directmemory/lightning/io/SerializerInputStream.java b/lightning-core/src/main/java/org/apache/directmemory/lightning/io/SerializerInputStream.java
similarity index 100%
rename from lightning-api/src/main/java/org/apache/directmemory/lightning/io/SerializerInputStream.java
rename to lightning-core/src/main/java/org/apache/directmemory/lightning/io/SerializerInputStream.java
diff --git a/lightning-api/src/main/java/org/apache/directmemory/lightning/io/SerializerOutputStream.java b/lightning-core/src/main/java/org/apache/directmemory/lightning/io/SerializerOutputStream.java
similarity index 100%
rename from lightning-api/src/main/java/org/apache/directmemory/lightning/io/SerializerOutputStream.java
rename to lightning-core/src/main/java/org/apache/directmemory/lightning/io/SerializerOutputStream.java
diff --git a/lightning-api/src/main/java/org/apache/directmemory/lightning/logging/LogLevel.java b/lightning-core/src/main/java/org/apache/directmemory/lightning/logging/LogLevel.java
similarity index 100%
rename from lightning-api/src/main/java/org/apache/directmemory/lightning/logging/LogLevel.java
rename to lightning-core/src/main/java/org/apache/directmemory/lightning/logging/LogLevel.java
diff --git a/lightning-api/src/main/java/org/apache/directmemory/lightning/logging/Logger.java b/lightning-core/src/main/java/org/apache/directmemory/lightning/logging/Logger.java
similarity index 100%
rename from lightning-api/src/main/java/org/apache/directmemory/lightning/logging/Logger.java
rename to lightning-core/src/main/java/org/apache/directmemory/lightning/logging/Logger.java
diff --git a/lightning-api/src/main/java/org/apache/directmemory/lightning/logging/LoggerAdapter.java b/lightning-core/src/main/java/org/apache/directmemory/lightning/logging/NoOpLogger.java
similarity index 97%
rename from lightning-api/src/main/java/org/apache/directmemory/lightning/logging/LoggerAdapter.java
rename to lightning-core/src/main/java/org/apache/directmemory/lightning/logging/NoOpLogger.java
index fb58d78..23a52e4 100644
--- a/lightning-api/src/main/java/org/apache/directmemory/lightning/logging/LoggerAdapter.java
+++ b/lightning-core/src/main/java/org/apache/directmemory/lightning/logging/NoOpLogger.java
@@ -18,23 +18,23 @@
*/
package org.apache.directmemory.lightning.logging;
-public class LoggerAdapter
+public class NoOpLogger
implements Logger
{
private final String name;
- public LoggerAdapter()
+ public NoOpLogger()
{
this( "Default" );
}
- public LoggerAdapter( Class<?> clazz )
+ public NoOpLogger( Class<?> clazz )
{
this( clazz.getCanonicalName() );
}
- public LoggerAdapter( String name )
+ public NoOpLogger( String name )
{
this.name = name;
}
diff --git a/lightning-api/src/main/java/org/apache/directmemory/lightning/metadata/AccessorType.java b/lightning-core/src/main/java/org/apache/directmemory/lightning/metadata/AccessorType.java
similarity index 100%
rename from lightning-api/src/main/java/org/apache/directmemory/lightning/metadata/AccessorType.java
rename to lightning-core/src/main/java/org/apache/directmemory/lightning/metadata/AccessorType.java
diff --git a/lightning-api/src/main/java/org/apache/directmemory/lightning/metadata/ArrayPropertyAccessor.java b/lightning-core/src/main/java/org/apache/directmemory/lightning/metadata/ArrayPropertyAccessor.java
similarity index 100%
rename from lightning-api/src/main/java/org/apache/directmemory/lightning/metadata/ArrayPropertyAccessor.java
rename to lightning-core/src/main/java/org/apache/directmemory/lightning/metadata/ArrayPropertyAccessor.java
diff --git a/lightning-api/src/main/java/org/apache/directmemory/lightning/metadata/Attribute.java b/lightning-core/src/main/java/org/apache/directmemory/lightning/metadata/Attribute.java
similarity index 100%
rename from lightning-api/src/main/java/org/apache/directmemory/lightning/metadata/Attribute.java
rename to lightning-core/src/main/java/org/apache/directmemory/lightning/metadata/Attribute.java
diff --git a/lightning-api/src/main/java/org/apache/directmemory/lightning/metadata/ClassDefinition.java b/lightning-core/src/main/java/org/apache/directmemory/lightning/metadata/ClassDefinition.java
similarity index 100%
rename from lightning-api/src/main/java/org/apache/directmemory/lightning/metadata/ClassDefinition.java
rename to lightning-core/src/main/java/org/apache/directmemory/lightning/metadata/ClassDefinition.java
diff --git a/lightning-api/src/main/java/org/apache/directmemory/lightning/metadata/ClassDefinitionContainer.java b/lightning-core/src/main/java/org/apache/directmemory/lightning/metadata/ClassDefinitionContainer.java
similarity index 100%
rename from lightning-api/src/main/java/org/apache/directmemory/lightning/metadata/ClassDefinitionContainer.java
rename to lightning-core/src/main/java/org/apache/directmemory/lightning/metadata/ClassDefinitionContainer.java
diff --git a/lightning-api/src/main/java/org/apache/directmemory/lightning/metadata/ClassDescriptor.java b/lightning-core/src/main/java/org/apache/directmemory/lightning/metadata/ClassDescriptor.java
similarity index 100%
rename from lightning-api/src/main/java/org/apache/directmemory/lightning/metadata/ClassDescriptor.java
rename to lightning-core/src/main/java/org/apache/directmemory/lightning/metadata/ClassDescriptor.java
diff --git a/lightning-api/src/main/java/org/apache/directmemory/lightning/metadata/PropertyAccessor.java b/lightning-core/src/main/java/org/apache/directmemory/lightning/metadata/PropertyAccessor.java
similarity index 100%
rename from lightning-api/src/main/java/org/apache/directmemory/lightning/metadata/PropertyAccessor.java
rename to lightning-core/src/main/java/org/apache/directmemory/lightning/metadata/PropertyAccessor.java
diff --git a/lightning-api/src/main/java/org/apache/directmemory/lightning/metadata/PropertyDescriptor.java b/lightning-core/src/main/java/org/apache/directmemory/lightning/metadata/PropertyDescriptor.java
similarity index 100%
rename from lightning-api/src/main/java/org/apache/directmemory/lightning/metadata/PropertyDescriptor.java
rename to lightning-core/src/main/java/org/apache/directmemory/lightning/metadata/PropertyDescriptor.java
diff --git a/lightning-api/src/main/java/org/apache/directmemory/lightning/metadata/ValueNullableEvaluator.java b/lightning-core/src/main/java/org/apache/directmemory/lightning/metadata/ValueNullableEvaluator.java
similarity index 100%
rename from lightning-api/src/main/java/org/apache/directmemory/lightning/metadata/ValueNullableEvaluator.java
rename to lightning-core/src/main/java/org/apache/directmemory/lightning/metadata/ValueNullableEvaluator.java
diff --git a/lightning-api/src/main/java/org/apache/directmemory/lightning/metadata/ValuePropertyAccessor.java b/lightning-core/src/main/java/org/apache/directmemory/lightning/metadata/ValuePropertyAccessor.java
similarity index 100%
rename from lightning-api/src/main/java/org/apache/directmemory/lightning/metadata/ValuePropertyAccessor.java
rename to lightning-core/src/main/java/org/apache/directmemory/lightning/metadata/ValuePropertyAccessor.java
diff --git a/lightning-core/src/test/java/org/apache/directmemory/lightning/GenericTypedTestCase.java b/lightning-core/src/test/java/org/apache/directmemory/lightning/GenericTypedTestCase.java
index b5e0e8f..03c4244 100644
--- a/lightning-core/src/test/java/org/apache/directmemory/lightning/GenericTypedTestCase.java
+++ b/lightning-core/src/test/java/org/apache/directmemory/lightning/GenericTypedTestCase.java
@@ -33,7 +33,7 @@
import org.apache.directmemory.lightning.io.SerializerInputStream;
import org.apache.directmemory.lightning.io.SerializerOutputStream;
import org.apache.directmemory.lightning.logging.LogLevel;
-import org.apache.directmemory.lightning.logging.LoggerAdapter;
+import org.apache.directmemory.lightning.logging.NoOpLogger;
import org.apache.directmemory.lightning.metadata.Attribute;
import org.apache.directmemory.lightning.metadata.ClassDefinitionContainer;
import org.junit.Test;
@@ -319,7 +319,7 @@
}
public static class DebugLogger
- extends LoggerAdapter
+ extends NoOpLogger
{
@Override
diff --git a/lightning-core/src/test/java/org/apache/directmemory/lightning/internal/ClassDefinitionContainerTestCase.java b/lightning-core/src/test/java/org/apache/directmemory/lightning/internal/ClassDefinitionContainerTestCase.java
index ccc8e89..309606e 100644
--- a/lightning-core/src/test/java/org/apache/directmemory/lightning/internal/ClassDefinitionContainerTestCase.java
+++ b/lightning-core/src/test/java/org/apache/directmemory/lightning/internal/ClassDefinitionContainerTestCase.java
@@ -24,7 +24,7 @@
import org.apache.directmemory.lightning.internal.InternalClassDefinition;
import org.apache.directmemory.lightning.internal.InternalClassDefinitionContainer;
-import org.apache.directmemory.lightning.logging.LoggerAdapter;
+import org.apache.directmemory.lightning.logging.NoOpLogger;
import org.apache.directmemory.lightning.metadata.ClassDefinition;
import org.apache.directmemory.lightning.metadata.ClassDefinitionContainer;
import org.apache.directmemory.lightning.metadata.PropertyDescriptor;
@@ -46,7 +46,7 @@
{
PropertyDescriptor label = null;
classDefinitions.add( new InternalClassDefinition( clazz, Collections.<PropertyDescriptor> emptyList(),
- new LoggerAdapter() ) );
+ new NoOpLogger() ) );
}
ClassDefinitionContainer classDefinitionContainer = new InternalClassDefinitionContainer( classDefinitions );
diff --git a/lightning-core/src/test/java/org/apache/directmemory/lightning/internal/util/DebugLogger.java b/lightning-core/src/test/java/org/apache/directmemory/lightning/internal/util/DebugLogger.java
index 16c6e8e..9e12c38 100644
--- a/lightning-core/src/test/java/org/apache/directmemory/lightning/internal/util/DebugLogger.java
+++ b/lightning-core/src/test/java/org/apache/directmemory/lightning/internal/util/DebugLogger.java
@@ -21,10 +21,10 @@
import java.io.PrintStream;
import org.apache.directmemory.lightning.logging.LogLevel;
-import org.apache.directmemory.lightning.logging.LoggerAdapter;
+import org.apache.directmemory.lightning.logging.NoOpLogger;
public class DebugLogger
- extends LoggerAdapter
+ extends NoOpLogger
{
@Override
diff --git a/pom.xml b/pom.xml
index 9ce3731..d04bac0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,7 +37,6 @@
<modules>
<module>lightning-core</module>
<module>lightning-maven-plugin</module>
- <module>lightning-api</module>
<module>lightning-maven-integration-test</module>
<module>lightning-maven-eclipse-helper</module>
<module>lightning-maven-eclipse-helper-feature</module>
@@ -64,6 +63,15 @@
<properties>
<maven.version>[3.0.3,)</maven.version>
+ <hppc.version>0.4.1</hppc.version>
+ <asm.version>4.0</asm.version>
+ <reflectasm.version>1.01</reflectasm.version>
+
+ <junit.version>4.10</junit.version>
+
+ <jgroups.version>3.0.4.Final</jgroups.version>
+ <spring.version>2.5.6</spring.version>
+
<rat-plugin.version>0.8</rat-plugin.version>
</properties>
@@ -73,12 +81,12 @@
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
- <version>4.0</version>
+ <version>${asm.version}</version>
</dependency>
<dependency>
<groupId>com.googlecode</groupId>
<artifactId>reflectasm</artifactId>
- <version>1.01</version>
+ <version>${reflectasm.version}</version>
<exclusions>
<exclusion>
<groupId>asm</groupId>
@@ -86,11 +94,16 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>com.carrotsearch</groupId>
+ <artifactId>hppc</artifactId>
+ <version>${hppc.version}</version>
+ </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.9</version>
+ <version>${junit.version}</version>
<scope>test</scope>
</dependency>
<!-- Core dependencies -->
@@ -99,12 +112,12 @@
<dependency>
<groupId>org.jgroups</groupId>
<artifactId>jgroups</artifactId>
- <version>3.0.4.Final</version>
+ <version>${jgroups.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
- <version>2.5.6</version>
+ <version>${spring.version}</version>
</dependency>
<!-- Integration dependencies -->
@@ -114,7 +127,6 @@
<artifactId>velocity</artifactId>
<version>1.7</version>
</dependency>
-
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
@@ -198,20 +210,16 @@
</exclusion>
</exclusions>
</dependency>
+ <!-- Maven plugin dependencies -->
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>2.4</version>
- </dependency>
-
+ <!-- Maven plugin test dependencies -->
<dependency>
<groupId>org.apache.maven.plugin-testing</groupId>
<artifactId>maven-plugin-testing-harness</artifactId>
<version>2.0-alpha-1</version>
<scope>test</scope>
</dependency>
- <!-- Maven plugin dependencies -->
+ <!-- Maven plugin test dependencies -->
</dependencies>
</dependencyManagement>