You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@polygene.apache.org by ni...@apache.org on 2015/04/17 18:43:54 UTC
[1/2] zest-qi4j git commit: Removing SLF4J from the Core package,
and re-introduce it later via Qi4j abstractions.
Repository: zest-qi4j
Updated Branches:
refs/heads/Drop_slf4j_dependency [created] 72524b337
Removing SLF4J from the Core package, and re-introduce it later via Qi4j abstractions.
Project: http://git-wip-us.apache.org/repos/asf/zest-qi4j/repo
Commit: http://git-wip-us.apache.org/repos/asf/zest-qi4j/commit/c69d16e4
Tree: http://git-wip-us.apache.org/repos/asf/zest-qi4j/tree/c69d16e4
Diff: http://git-wip-us.apache.org/repos/asf/zest-qi4j/diff/c69d16e4
Branch: refs/heads/Drop_slf4j_dependency
Commit: c69d16e48885194ac3871a7aa853545a7f84be66
Parents: 6ab86be
Author: Niclas Hedhman <ni...@hedhman.org>
Authored: Sun Apr 5 11:06:08 2015 +0300
Committer: Niclas Hedhman <ni...@hedhman.org>
Committed: Sun Apr 5 11:06:08 2015 +0300
----------------------------------------------------------------------
core/api/build.gradle | 1 -
.../ApplicationPassivationThread.java | 5 +-
core/bootstrap/build.gradle | 1 -
core/functional/build.gradle | 4 --
.../java/org/qi4j/functional/Iterables.java | 12 +---
.../src/main/java/org/qi4j/io/Transforms.java | 2 +-
.../test/java/org/qi4j/io/InputOutputTest.java | 8 +--
core/runtime/build.gradle | 2 -
.../ImportedServiceReferenceInstance.java | 3 -
.../helpers/JSONMapEntityStoreMixin.java | 59 ++++++++++----------
.../helpers/MapEntityStoreMixin.java | 59 ++++++++++----------
.../spi/value/ValueDeserializerAdapter.java | 59 +-------------------
.../qi4j/spi/value/ValueSerializerAdapter.java | 12 ----
.../org/qi4j/test/AbstractQi4jBaseTest.java | 14 -----
.../org/qi4j/test/AbstractQi4jScenarioTest.java | 14 -----
...AbstractValueCompositeSerializationTest.java | 7 ---
extensions/entitystore-jclouds/build.gradle | 20 +++----
extensions/entitystore-preferences/build.gradle | 15 +++--
extensions/entitystore-riak/build.gradle | 18 +++---
extensions/indexing-elasticsearch/build.gradle | 1 +
extensions/indexing-rdf/build.gradle | 1 +
extensions/indexing-solr/build.gradle | 1 +
extensions/migration/build.gradle | 1 +
extensions/reindexer/build.gradle | 1 +
libraries/circuitbreaker/build.gradle | 1 +
libraries/eventsourcing/build.gradle | 1 +
libraries/fileconfig/build.gradle | 1 +
libraries/jmx/build.gradle | 1 +
libraries/rest-client/build.gradle | 1 +
libraries/rest-server/build.gradle | 1 +
libraries/scheduler/build.gradle | 1 +
libraries/servlet/build.gradle | 3 +-
libraries/shiro-core/build.gradle | 1 +
libraries/shiro-web/build.gradle | 1 +
libraries/sql-liquibase/build.gradle | 1 +
libraries/sql/build.gradle | 1 +
libraries/struts2-plugin/build.gradle | 1 +
samples/dci-cargo/dcisample_a/build.gradle | 1 +
samples/dci-cargo/dcisample_b/build.gradle | 1 +
tests/performance/build.gradle | 3 +-
40 files changed, 115 insertions(+), 225 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/c69d16e4/core/api/build.gradle
----------------------------------------------------------------------
diff --git a/core/api/build.gradle b/core/api/build.gradle
index ccaa0f2..69a2336 100644
--- a/core/api/build.gradle
+++ b/core/api/build.gradle
@@ -10,6 +10,5 @@ dependencies {
testCompile project( ':org.qi4j.extensions:org.qi4j.extension.valueserialization-orgjson' )
testRuntime project( ':org.qi4j.core:org.qi4j.core.runtime' )
- testRuntime libraries.slf4j_simple
}
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/c69d16e4/core/api/src/main/java/org/qi4j/api/activation/ApplicationPassivationThread.java
----------------------------------------------------------------------
diff --git a/core/api/src/main/java/org/qi4j/api/activation/ApplicationPassivationThread.java b/core/api/src/main/java/org/qi4j/api/activation/ApplicationPassivationThread.java
index facec4f..a83ab2f 100644
--- a/core/api/src/main/java/org/qi4j/api/activation/ApplicationPassivationThread.java
+++ b/core/api/src/main/java/org/qi4j/api/activation/ApplicationPassivationThread.java
@@ -18,8 +18,9 @@
package org.qi4j.api.activation;
import java.io.PrintStream;
+import java.util.logging.Level;
+import java.util.logging.Logger;
import org.qi4j.api.structure.Application;
-import org.slf4j.Logger;
/**
* Application Passivation Thread to use as a Shutdown Hook.
@@ -92,7 +93,7 @@ public final class ApplicationPassivationThread
String message = application.name() + " " + ex.getMessage();
if( logger != null )
{
- logger.error( message, ex );
+ logger.log( Level.SEVERE, message, ex );
}
else if( output != null )
{
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/c69d16e4/core/bootstrap/build.gradle
----------------------------------------------------------------------
diff --git a/core/bootstrap/build.gradle b/core/bootstrap/build.gradle
index 0d2f882..3a61656 100644
--- a/core/bootstrap/build.gradle
+++ b/core/bootstrap/build.gradle
@@ -5,6 +5,5 @@ dependencies {
compile project( ':org.qi4j.core:org.qi4j.core.spi' )
testRuntime project( ':org.qi4j.core:org.qi4j.core.runtime' )
- testRuntime libraries.slf4j_simple
}
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/c69d16e4/core/functional/build.gradle
----------------------------------------------------------------------
diff --git a/core/functional/build.gradle b/core/functional/build.gradle
index 6872d43..63e2296 100644
--- a/core/functional/build.gradle
+++ b/core/functional/build.gradle
@@ -2,8 +2,4 @@ jar { manifest { name = "Qi4j Functional"}}
dependencies {
- compile libraries.slf4j_api
-
- testRuntime libraries.slf4j_simple
-
}
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/c69d16e4/core/functional/src/main/java/org/qi4j/functional/Iterables.java
----------------------------------------------------------------------
diff --git a/core/functional/src/main/java/org/qi4j/functional/Iterables.java b/core/functional/src/main/java/org/qi4j/functional/Iterables.java
index a3daf56..ec5ae43 100644
--- a/core/functional/src/main/java/org/qi4j/functional/Iterables.java
+++ b/core/functional/src/main/java/org/qi4j/functional/Iterables.java
@@ -26,16 +26,12 @@ import java.util.Iterator;
import java.util.List;
import java.util.NoSuchElementException;
import java.util.Set;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* Utility methods for working with Iterables. See test for examples of how to use.
*/
public final class Iterables
{
- private static Logger debugLogger = LoggerFactory.getLogger( Iterables.class );
-
@SuppressWarnings( "raw" )
private static final Iterable EMPTY = new Iterable()
{
@@ -580,21 +576,15 @@ public final class Iterables
@Override
public T map( T t )
{
- if( functions.length == 0 )
- {
- debugLogger.info( msgFormat.format( new Object[]{ t } ) );
- }
- else
+ if( functions.length != 0 )
{
String[] mapped = new String[ functions.length ];
for( int i = 0; i < functions.length; i++ )
{
Function<T, String> function = functions[i];
mapped[i] = function.map( t );
- debugLogger.info( msgFormat.format( mapped ) );
}
}
-
return t;
}
}, iterable );
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/c69d16e4/core/io/src/main/java/org/qi4j/io/Transforms.java
----------------------------------------------------------------------
diff --git a/core/io/src/main/java/org/qi4j/io/Transforms.java b/core/io/src/main/java/org/qi4j/io/Transforms.java
index c7bcb7d..f42b982 100644
--- a/core/io/src/main/java/org/qi4j/io/Transforms.java
+++ b/core/io/src/main/java/org/qi4j/io/Transforms.java
@@ -19,9 +19,9 @@ import java.nio.charset.Charset;
import java.text.MessageFormat;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.locks.Lock;
+import java.util.logging.Logger;
import org.qi4j.functional.Function;
import org.qi4j.functional.Specification;
-import org.slf4j.Logger;
/**
* Utility class for I/O transforms
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/c69d16e4/core/io/src/test/java/org/qi4j/io/InputOutputTest.java
----------------------------------------------------------------------
diff --git a/core/io/src/test/java/org/qi4j/io/InputOutputTest.java b/core/io/src/test/java/org/qi4j/io/InputOutputTest.java
index 72f2885..220e856 100644
--- a/core/io/src/test/java/org/qi4j/io/InputOutputTest.java
+++ b/core/io/src/test/java/org/qi4j/io/InputOutputTest.java
@@ -33,12 +33,12 @@ import java.util.Arrays;
import java.util.List;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
+import java.util.logging.Logger;
import org.hamcrest.CoreMatchers;
import org.junit.Assert;
import org.junit.Test;
import org.qi4j.functional.Function;
import org.qi4j.functional.Visitor;
-import org.slf4j.LoggerFactory;
import static java.util.Arrays.asList;
import static org.qi4j.functional.Iterables.iterable;
@@ -145,7 +145,7 @@ public class InputOutputTest
File source = sourceFile();
text( source ).transferTo(
- Transforms.map( new Transforms.Log<String>( LoggerFactory.getLogger( getClass() ), "Line: {0}" ),
+ Transforms.map( new Transforms.Log<String>( Logger.getLogger( getClass().getName() ), "Line: {0}" ),
Outputs.<String>noop() ) );
}
@@ -159,7 +159,7 @@ public class InputOutputTest
Inputs.iterable( iterable( data ) ).transferTo(
Transforms.map(
new Transforms.ProgressLog<Integer>(
- LoggerFactory.getLogger( InputOutputTest.class ), "Data transferred: {0}", 10 ),
+ Logger.getLogger( InputOutputTest.class.getName() ), "Data transferred: {0}", 10 ),
Outputs.<Integer>noop() ) );
}
@@ -282,7 +282,7 @@ public class InputOutputTest
input.transferTo(
Transforms.map(
- new Transforms.Log<String>( LoggerFactory.getLogger( getClass() ), "Line: {0}" ),
+ new Transforms.Log<String>( Logger.getLogger( getClass().getName() ), "Line: {0}" ),
Outputs.systemOut()
)
);
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/c69d16e4/core/runtime/build.gradle
----------------------------------------------------------------------
diff --git a/core/runtime/build.gradle b/core/runtime/build.gradle
index c9827a0..9df9f21 100644
--- a/core/runtime/build.gradle
+++ b/core/runtime/build.gradle
@@ -12,6 +12,4 @@ dependencies {
testCompile project(":org.qi4j.core:org.qi4j.core.testsupport")
testCompile project(":org.qi4j.libraries:org.qi4j.library.constraints")
- testRuntime libraries.slf4j_simple
-
}
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/c69d16e4/core/runtime/src/main/java/org/qi4j/runtime/service/ImportedServiceReferenceInstance.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/qi4j/runtime/service/ImportedServiceReferenceInstance.java b/core/runtime/src/main/java/org/qi4j/runtime/service/ImportedServiceReferenceInstance.java
index 4e792df..15f65cd 100644
--- a/core/runtime/src/main/java/org/qi4j/runtime/service/ImportedServiceReferenceInstance.java
+++ b/core/runtime/src/main/java/org/qi4j/runtime/service/ImportedServiceReferenceInstance.java
@@ -28,7 +28,6 @@ import org.qi4j.api.service.ServiceReference;
import org.qi4j.api.service.ServiceUnavailableException;
import org.qi4j.api.structure.Module;
import org.qi4j.runtime.activation.ActivationDelegate;
-import org.slf4j.LoggerFactory;
/**
* Implementation of ServiceReference. This manages the reference to the imported service.
@@ -135,8 +134,6 @@ public final class ImportedServiceReferenceInstance<T>
}
catch( ServiceImporterException ex )
{
- LoggerFactory.getLogger( getClass() )
- .warn( "Imported service throwed an exception on isAvailable(), will return false.", ex );
return false;
}
}
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/c69d16e4/core/spi/src/main/java/org/qi4j/spi/entitystore/helpers/JSONMapEntityStoreMixin.java
----------------------------------------------------------------------
diff --git a/core/spi/src/main/java/org/qi4j/spi/entitystore/helpers/JSONMapEntityStoreMixin.java b/core/spi/src/main/java/org/qi4j/spi/entitystore/helpers/JSONMapEntityStoreMixin.java
index d64617a..21d641a 100644
--- a/core/spi/src/main/java/org/qi4j/spi/entitystore/helpers/JSONMapEntityStoreMixin.java
+++ b/core/spi/src/main/java/org/qi4j/spi/entitystore/helpers/JSONMapEntityStoreMixin.java
@@ -62,8 +62,6 @@ import org.qi4j.spi.entitystore.EntityStoreException;
import org.qi4j.spi.entitystore.EntityStoreSPI;
import org.qi4j.spi.entitystore.EntityStoreUnitOfWork;
import org.qi4j.spi.entitystore.StateCommitter;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import static org.qi4j.functional.Iterables.first;
@@ -106,8 +104,6 @@ public class JSONMapEntityStoreMixin
protected String uuid;
private int count;
- private Logger logger;
-
public JSONMapEntityStoreMixin()
{
}
@@ -116,8 +112,6 @@ public class JSONMapEntityStoreMixin
public void setUpJSONMapES()
throws Exception
{
- logger = LoggerFactory.getLogger( descriptor.identity() );
-
uuid = descriptor.identity() + "-" + UUID.randomUUID().toString();
if( caching != null )
{
@@ -318,7 +312,14 @@ public class JSONMapEntityStoreMixin
// Synch back 100 at a time
if( migrated.size() > 100 )
{
- synchMigratedEntities( migrated );
+ try
+ {
+ synchMigratedEntities( migrated );
+ }
+ catch( IOException e )
+ {
+ throw new EntityStoreException( "Synchronization of Migrated Entities failed.", e );
+ }
}
}
receiver.receive( entity );
@@ -328,7 +329,14 @@ public class JSONMapEntityStoreMixin
// Synch any remaining migrated entities
if( !migrated.isEmpty() )
{
- synchMigratedEntities( migrated );
+ try
+ {
+ synchMigratedEntities( migrated );
+ }
+ catch( IOException e )
+ {
+ throw new EntityStoreException( "Synchronization of Migrated Entities failed.", e );
+ }
}
}
} );
@@ -344,31 +352,25 @@ public class JSONMapEntityStoreMixin
}
private void synchMigratedEntities( final List<EntityState> migratedEntities )
+ throws IOException
{
- try
+ mapEntityStore.applyChanges( new MapEntityStore.MapChanges()
{
- mapEntityStore.applyChanges( new MapEntityStore.MapChanges()
+ @Override
+ public void visitMap( MapEntityStore.MapChanger changer )
+ throws IOException
{
- @Override
- public void visitMap( MapEntityStore.MapChanger changer )
- throws IOException
+ for( EntityState migratedEntity : migratedEntities )
{
- for( EntityState migratedEntity : migratedEntities )
+ JSONEntityState state = (JSONEntityState) migratedEntity;
+ try( Writer writer = changer.updateEntity( state.identity(), state.entityDescriptor() ) )
{
- JSONEntityState state = (JSONEntityState) migratedEntity;
- try( Writer writer = changer.updateEntity( state.identity(), state.entityDescriptor() ) )
- {
- writeEntityState( state, writer, state.version(), state.lastModified() );
- }
+ writeEntityState( state, writer, state.version(), state.lastModified() );
}
}
- } );
- migratedEntities.clear();
- }
- catch( IOException e )
- {
- logger.warn( "Could not store migrated entites", e );
- }
+ }
+ } );
+ migratedEntities.clear();
}
protected String newUnitOfWorkId()
@@ -424,11 +426,6 @@ public class JSONMapEntityStoreMixin
// Do nothing - set version to be correct
jsonObject.put( JSONKeys.APPLICATION_VERSION, application.version() );
}
-
- LoggerFactory.getLogger( getClass() ).debug( "Updated version nr on " + identity
- + " from " + currentAppVersion
- + " to " + application.version() );
-
// State changed
status = EntityStatus.UPDATED;
}
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/c69d16e4/core/spi/src/main/java/org/qi4j/spi/entitystore/helpers/MapEntityStoreMixin.java
----------------------------------------------------------------------
diff --git a/core/spi/src/main/java/org/qi4j/spi/entitystore/helpers/MapEntityStoreMixin.java b/core/spi/src/main/java/org/qi4j/spi/entitystore/helpers/MapEntityStoreMixin.java
index b4abf53..0e91b0a 100644
--- a/core/spi/src/main/java/org/qi4j/spi/entitystore/helpers/MapEntityStoreMixin.java
+++ b/core/spi/src/main/java/org/qi4j/spi/entitystore/helpers/MapEntityStoreMixin.java
@@ -65,8 +65,6 @@ import org.qi4j.spi.entitystore.EntityStoreException;
import org.qi4j.spi.entitystore.EntityStoreSPI;
import org.qi4j.spi.entitystore.EntityStoreUnitOfWork;
import org.qi4j.spi.entitystore.StateCommitter;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import static org.qi4j.functional.Iterables.first;
@@ -104,15 +102,11 @@ public class MapEntityStoreMixin
protected String uuid;
private int count;
- private Logger logger;
-
@Override
public void activateMapEntityStore()
throws Exception
{
uuid = UUID.randomUUID().toString() + "-";
-
- logger = LoggerFactory.getLogger( descriptor.identity() );
}
// EntityStore
@@ -247,7 +241,14 @@ public class MapEntityStoreMixin
// Synch back 100 at a time
if( migrated.size() > 100 )
{
- synchMigratedEntities( migrated );
+ try
+ {
+ synchMigratedEntities( migrated );
+ }
+ catch( IOException e )
+ {
+ throw new EntityStoreException( "Synchronization of Migrated Entities failed.", e );
+ }
}
}
receiver.receive( entity );
@@ -257,7 +258,14 @@ public class MapEntityStoreMixin
// Synch any remaining migrated entities
if( !migrated.isEmpty() )
{
- synchMigratedEntities( migrated );
+ try
+ {
+ synchMigratedEntities( migrated );
+ }
+ catch( IOException e )
+ {
+ throw new EntityStoreException( "Synchronization of Migrated Entities failed.", e );
+ }
}
}
} );
@@ -273,31 +281,25 @@ public class MapEntityStoreMixin
}
private void synchMigratedEntities( final List<EntityState> migratedEntities )
+ throws IOException
{
- try
+ mapEntityStore.applyChanges( new MapEntityStore.MapChanges()
{
- mapEntityStore.applyChanges( new MapEntityStore.MapChanges()
+ @Override
+ public void visitMap( MapEntityStore.MapChanger changer )
+ throws IOException
{
- @Override
- public void visitMap( MapEntityStore.MapChanger changer )
- throws IOException
+ for( EntityState migratedEntity : migratedEntities )
{
- for( EntityState migratedEntity : migratedEntities )
+ DefaultEntityState state = (DefaultEntityState) migratedEntity;
+ try( Writer writer = changer.updateEntity( state.identity(), state.entityDescriptor() ) )
{
- DefaultEntityState state = (DefaultEntityState) migratedEntity;
- try( Writer writer = changer.updateEntity( state.identity(), state.entityDescriptor() ) )
- {
- writeEntityState( state, writer, state.version(), state.lastModified() );
- }
+ writeEntityState( state, writer, state.version(), state.lastModified() );
}
}
- } );
- migratedEntities.clear();
- }
- catch( IOException e )
- {
- logger.warn( "Could not store migrated entites", e );
- }
+ }
+ } );
+ migratedEntities.clear();
}
protected String newUnitOfWorkId()
@@ -408,11 +410,6 @@ public class MapEntityStoreMixin
// Do nothing - set version to be correct
jsonObject.put( JSONKeys.APPLICATION_VERSION, application.version() );
}
-
- LoggerFactory.getLogger( MapEntityStoreMixin.class )
- .debug(
- "Updated version nr on " + identity + " from " + currentAppVersion + " to " + application.version() );
-
// State changed
status = EntityStatus.UPDATED;
}
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/c69d16e4/core/spi/src/main/java/org/qi4j/spi/value/ValueDeserializerAdapter.java
----------------------------------------------------------------------
diff --git a/core/spi/src/main/java/org/qi4j/spi/value/ValueDeserializerAdapter.java b/core/spi/src/main/java/org/qi4j/spi/value/ValueDeserializerAdapter.java
index 73056fe..b3532b2 100644
--- a/core/spi/src/main/java/org/qi4j/spi/value/ValueDeserializerAdapter.java
+++ b/core/spi/src/main/java/org/qi4j/spi/value/ValueDeserializerAdapter.java
@@ -32,6 +32,7 @@ import java.util.List;
import java.util.Map;
import java.util.Scanner;
import java.util.Set;
+import java.util.logging.Logger;
import org.joda.time.DateTime;
import org.joda.time.LocalDate;
import org.joda.time.LocalDateTime;
@@ -56,8 +57,6 @@ import org.qi4j.api.value.ValueDeserializer;
import org.qi4j.api.value.ValueSerializationException;
import org.qi4j.functional.Function;
import org.qi4j.functional.Function2;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import static org.qi4j.functional.Iterables.empty;
import static org.qi4j.functional.Iterables.first;
@@ -106,9 +105,6 @@ public abstract class ValueDeserializerAdapter<InputType, InputNodeType>
throws Exception;
}
- private static final Logger LOG = LoggerFactory.getLogger( ValueDeserializerAdapter.class );
- private static final Logger PULL_PARSING_LOG = LoggerFactory.getLogger( ValueDeserializerAdapter.class.getName() + "#PullParsing" );
- private static final Logger TREE_PARSING_LOG = LoggerFactory.getLogger( ValueDeserializerAdapter.class.getName() + "#TreeParsing" );
private static final String UTF_8 = "UTF-8";
private final Map<Class<?>, Function<Object, Object>> deserializers = new HashMap<>( 16 );
private final Map<Class<?>, ComplexDeserializer<Object, InputType, InputNodeType>> complexDeserializers = new HashMap<>( 2 );
@@ -307,11 +303,6 @@ public abstract class ValueDeserializerAdapter<InputType, InputNodeType>
private void setValuesModuleFinder( Function<Application, Module> valuesModuleFinder )
{
- if( valuesModuleFinder != null )
- {
- LOG.debug( "Will use the provided Function to find Module to build new ValueComposites instances: {}",
- valuesModuleFinder );
- }
this.valuesModuleFinder = valuesModuleFinder;
this.valuesModule = null;
}
@@ -331,7 +322,6 @@ public abstract class ValueDeserializerAdapter<InputType, InputNodeType>
{
throw new ValueSerializationException( "Values Module provided by the finder Function was null." );
}
- LOG.debug( "Will use a specific Module to build new ValueComposites instances: {}", valuesModule );
}
}
return valuesModule;
@@ -508,25 +498,21 @@ public abstract class ValueDeserializerAdapter<InputType, InputNodeType>
else // Explicit ValueComposite
if( ValueCompositeType.class.isAssignableFrom( valueType.getClass() ) )
{
- PULL_PARSING_LOG.trace( "ValueCompositeType assignable - deserializeValueComposite( {} )", input );
return (T) deserializeValueComposite( valueType, input );
}
else // Explicit Collections
if( CollectionType.class.isAssignableFrom( valueType.getClass() ) )
{
- PULL_PARSING_LOG.trace( "CollectionType assignable - deserializeCollection( {} )", input );
return (T) deserializeCollection( (CollectionType) valueType, input );
}
else // Explicit Map
if( MapType.class.isAssignableFrom( valueType.getClass() ) )
{
- PULL_PARSING_LOG.trace( "MapType assignable - deserializeMap( {} )", input );
return (T) deserializeMap( (MapType) valueType, input );
}
else // Enum
if( EnumType.class.isAssignableFrom( valueType.getClass() ) || type.isEnum() )
{
- PULL_PARSING_LOG.trace( "EnumType assignable - readValue( {} )", input );
return (T) Enum.valueOf( (Class) type, readPlainValue( input ).toString() );
}
else // Array
@@ -535,7 +521,6 @@ public abstract class ValueDeserializerAdapter<InputType, InputNodeType>
return (T) deserializeBase64Serialized( readPlainValue( input ).toString() );
}
// Guessed Deserialization
- PULL_PARSING_LOG.trace( "Unknown ValueType - deserializeGuessed( {} )", input );
return (T) deserializeGuessed( valueType, input );
}
@@ -592,10 +577,7 @@ public abstract class ValueDeserializerAdapter<InputType, InputNodeType>
private <T> T deserializeValueComposite( ValueType valueType, InputType input )
throws Exception
{
- PULL_PARSING_LOG.trace( "Switching to TREE PARSING @( {} )", input );
InputNodeType inputNode = readObjectTree( input );
- TREE_PARSING_LOG.trace( "Switched to TREE PARSING @( {} )", input );
- TREE_PARSING_LOG.trace( "ObjectNode is {}", inputNode );
if( inputNode == null )
{
return null;
@@ -612,9 +594,6 @@ public abstract class ValueDeserializerAdapter<InputType, InputNodeType>
inputNode,
"_type",
this.<String>buildDeserializeInputNodeFunction( new ValueType( String.class ) ) );
- TREE_PARSING_LOG.trace(
- "In deserializeNodeValueComposite(), getObjectFieldValue( {} ) returned '{}'",
- inputNode, typeInfo );
if( typeInfo != null )
{
ValueDescriptor valueDescriptor = valuesModule().valueDescriptor( typeInfo );
@@ -624,12 +603,6 @@ public abstract class ValueDeserializerAdapter<InputType, InputNodeType>
}
valueCompositeType = valueDescriptor.valueType();
valueBuilderType = Class.forName( typeInfo );
- if( !valueType.equals( valueCompositeType ) )
- {
- TREE_PARSING_LOG.debug(
- "Overriding {} with {} as defined in _type field.",
- valueType, valueCompositeType );
- }
}
return deserializeValueComposite( valueCompositeType, valueBuilderType, inputNode );
}
@@ -651,9 +624,6 @@ public abstract class ValueDeserializerAdapter<InputType, InputNodeType>
inputNode,
propertyName,
buildDeserializeInputNodeFunction( property.valueType() ) );
- TREE_PARSING_LOG.trace(
- "In deserializeValueComposite(), getObjectFieldValue( {} ) for key {} returned '{}' of class {}",
- inputNode, propertyName, value, value == null ? "N/A" : value.getClass() );
if( property.isImmutable() )
{
if( value instanceof Set )
@@ -669,20 +639,11 @@ public abstract class ValueDeserializerAdapter<InputType, InputNodeType>
value = Collections.unmodifiableMap( (Map<?, ?>) value );
}
}
- TREE_PARSING_LOG.trace( "Property {}#{}( {} ) deserialized value is '{}' of class {}",
- property.qualifiedName().type(),
- property.qualifiedName().name(),
- property.valueType(),
- value,
- value == null ? "N/A" : value.getClass() );
}
else
{
// Serialized object does not contain the field, try to default it
value = property.initialValue( valuesModule() );
- TREE_PARSING_LOG.trace(
- "Property {} was not defined in serialized object and has been defaulted to '{}'",
- property.qualifiedName(), value );
}
stateMap.put( propertyName, value );
}
@@ -770,9 +731,6 @@ public abstract class ValueDeserializerAdapter<InputType, InputNodeType>
if( deserializers.get( type ) != null )
{
Object value = asSimpleValue( inputNode );
- TREE_PARSING_LOG.trace(
- "While registered deserializer attempt, asSimpleValue( {} ) returned '{}'",
- inputNode, value );
if( value == null )
{
return null;
@@ -802,9 +760,6 @@ public abstract class ValueDeserializerAdapter<InputType, InputNodeType>
if( EnumType.class.isAssignableFrom( valueType.getClass() ) || type.isEnum() )
{
Object value = asSimpleValue( inputNode );
- TREE_PARSING_LOG.trace(
- "While Enum deserialize attempt, asSimpleValue( {} ) returned '{}'",
- inputNode, value );
if( value == null )
{
return null;
@@ -926,18 +881,12 @@ public abstract class ValueDeserializerAdapter<InputType, InputNodeType>
inputNode,
"_type",
this.<String>buildDeserializeInputNodeFunction( new ValueType( String.class ) ) );
- TREE_PARSING_LOG.trace(
- "In deserializeNodeGuessed(), getObjectFieldValue( {} ) returned '{}'",
- inputNode, typeInfo );
ValueDescriptor valueDescriptor = valuesModule().valueDescriptor( typeInfo );
if( valueDescriptor == null )
{
throw new ValueSerializationException( "Specified value type could not be resolved: " + typeInfo );
}
valueCompositeType = valueDescriptor.valueType();
- TREE_PARSING_LOG.debug(
- "Overriding {} with {} as defined in _type field.",
- valueType, valueCompositeType );
}
else // without _type info
{
@@ -947,9 +896,6 @@ public abstract class ValueDeserializerAdapter<InputType, InputNodeType>
throw new ValueSerializationException( "Don't know how to deserialize " + inputNode );
}
valueCompositeType = valueDescriptor.valueType();
- TREE_PARSING_LOG.debug(
- "Overriding {} with {} as found in available ValueComposites.",
- valueType, valueCompositeType );
}
Class<?> valueBuilderType = first( valueCompositeType.types() );
return deserializeValueComposite( valueCompositeType, valueBuilderType, inputNode );
@@ -963,9 +909,6 @@ public abstract class ValueDeserializerAdapter<InputType, InputNodeType>
throws Exception
{
Object value = asSimpleValue( inputNode );
- TREE_PARSING_LOG.trace(
- "While Base64 deserialize attempt, asSimpleValue( {} ) returned '{}'",
- inputNode, value );
if( value == null )
{
return null;
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/c69d16e4/core/spi/src/main/java/org/qi4j/spi/value/ValueSerializerAdapter.java
----------------------------------------------------------------------
diff --git a/core/spi/src/main/java/org/qi4j/spi/value/ValueSerializerAdapter.java b/core/spi/src/main/java/org/qi4j/spi/value/ValueSerializerAdapter.java
index 8e21416..8b6246f 100644
--- a/core/spi/src/main/java/org/qi4j/spi/value/ValueSerializerAdapter.java
+++ b/core/spi/src/main/java/org/qi4j/spi/value/ValueSerializerAdapter.java
@@ -48,8 +48,6 @@ import org.qi4j.api.value.ValueSerializationException;
import org.qi4j.api.value.ValueSerializer;
import org.qi4j.functional.Function;
import org.qi4j.functional.Function2;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import static org.qi4j.functional.Iterables.first;
@@ -94,7 +92,6 @@ public abstract class ValueSerializerAdapter<OutputType>
throws Exception;
}
- private static final Logger LOG = LoggerFactory.getLogger( ValueSerializerAdapter.class );
private static final String UTF_8 = "UTF-8";
private static <TO, FROM extends TO> Function2<Options, FROM, TO> identitySerializer()
@@ -364,13 +361,11 @@ public abstract class ValueSerializerAdapter<OutputType>
// Null
if( object == null )
{
- LOG.trace( "Null object -> onValue( null )" );
onValue( output, null );
}
else // Registered serializer
if( serializers.get( object.getClass() ) != null )
{
- LOG.trace( "Registered serializer matches -> onValue( serialized )" );
onValue( output, serializers.get( object.getClass() ).map( options, object ) );
}
else if( complexSerializers.get( object.getClass() ) != null )
@@ -380,42 +375,35 @@ public abstract class ValueSerializerAdapter<OutputType>
else // ValueComposite
if( ValueComposite.class.isAssignableFrom( object.getClass() ) )
{
- LOG.trace( "ValueComposite assignable -> serializeValueComposite( object )" );
serializeValueComposite( options, object, output, rootPass );
}
else // EntityComposite
if( EntityComposite.class.isAssignableFrom( object.getClass() ) )
{
- LOG.trace( "EntityComposite assignable -> serializeEntityComposite( object )" );
serializeEntityComposite( object, output );
}
else // Collection - Iterable
if( Iterable.class.isAssignableFrom( object.getClass() ) )
{
- LOG.trace( "Iterable assignable -> serializeIterable( object )" );
serializeIterable( options, object, output );
}
else // Array - QUID Remove this and use java serialization for arrays?
if( object.getClass().isArray() )
{
- LOG.trace( "Object isArray -> serializeBase64Serializable( object )" );
serializeBase64Serializable( object, output );
}
else // Map
if( Map.class.isAssignableFrom( object.getClass() ) )
{
- LOG.trace( "Map assignable -> serializeMap( object )" );
serializeMap( options, object, output );
}
else // Enum
if( object.getClass().isEnum() )
{
- LOG.trace( "Object is an enum -> onValue( object.toString() )" );
onValue( output, object.toString() );
}
else // Fallback to Base64 encoded Java Serialization
{
- LOG.trace( "Unknown object type -> serializeBase64Serializable( object )" );
serializeBase64Serializable( object, output );
}
}
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/c69d16e4/core/testsupport/src/main/java/org/qi4j/test/AbstractQi4jBaseTest.java
----------------------------------------------------------------------
diff --git a/core/testsupport/src/main/java/org/qi4j/test/AbstractQi4jBaseTest.java b/core/testsupport/src/main/java/org/qi4j/test/AbstractQi4jBaseTest.java
index 3c878a1..2b094bf 100644
--- a/core/testsupport/src/main/java/org/qi4j/test/AbstractQi4jBaseTest.java
+++ b/core/testsupport/src/main/java/org/qi4j/test/AbstractQi4jBaseTest.java
@@ -11,8 +11,6 @@ import org.qi4j.bootstrap.ApplicationAssemblyFactory;
import org.qi4j.bootstrap.AssemblyException;
import org.qi4j.bootstrap.Energy4Java;
import org.qi4j.spi.Qi4jSPI;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
public abstract class AbstractQi4jBaseTest
{
@@ -23,8 +21,6 @@ public abstract class AbstractQi4jBaseTest
protected ApplicationDescriptor applicationModel;
protected Application application;
- private Logger log;
-
@Before
public void setUp()
throws Exception
@@ -111,14 +107,4 @@ public abstract class AbstractQi4jBaseTest
application.passivate();
}
}
-
- protected Logger getLog()
- {
- if( this.log == null )
- {
- this.log = LoggerFactory.getLogger( this.getClass() );
- }
-
- return this.log;
- }
}
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/c69d16e4/core/testsupport/src/main/java/org/qi4j/test/AbstractQi4jScenarioTest.java
----------------------------------------------------------------------
diff --git a/core/testsupport/src/main/java/org/qi4j/test/AbstractQi4jScenarioTest.java b/core/testsupport/src/main/java/org/qi4j/test/AbstractQi4jScenarioTest.java
index 48e1f0b..0d2ceff 100644
--- a/core/testsupport/src/main/java/org/qi4j/test/AbstractQi4jScenarioTest.java
+++ b/core/testsupport/src/main/java/org/qi4j/test/AbstractQi4jScenarioTest.java
@@ -28,8 +28,6 @@ import org.qi4j.bootstrap.Assembler;
import org.qi4j.bootstrap.AssemblyException;
import org.qi4j.bootstrap.Energy4Java;
import org.qi4j.spi.Qi4jSPI;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* Base class for Qi4j scenario tests. This will create one Qi4j application per class instead of per test.
@@ -48,8 +46,6 @@ public abstract class AbstractQi4jScenarioTest
static protected Assembler assembler; // Initialize this in static block of subclass
- static private Logger log;
-
@BeforeClass
public static void setUp()
throws Exception
@@ -144,14 +140,4 @@ public abstract class AbstractQi4jScenarioTest
application.passivate();
}
}
-
- protected Logger getLog()
- {
- if( this.log == null )
- {
- this.log = LoggerFactory.getLogger( this.getClass() );
- }
-
- return this.log;
- }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/c69d16e4/core/testsupport/src/main/java/org/qi4j/test/value/AbstractValueCompositeSerializationTest.java
----------------------------------------------------------------------
diff --git a/core/testsupport/src/main/java/org/qi4j/test/value/AbstractValueCompositeSerializationTest.java b/core/testsupport/src/main/java/org/qi4j/test/value/AbstractValueCompositeSerializationTest.java
index 933503c..bb23e0b 100644
--- a/core/testsupport/src/main/java/org/qi4j/test/value/AbstractValueCompositeSerializationTest.java
+++ b/core/testsupport/src/main/java/org/qi4j/test/value/AbstractValueCompositeSerializationTest.java
@@ -49,8 +49,6 @@ import org.qi4j.bootstrap.AssemblyException;
import org.qi4j.bootstrap.ModuleAssembly;
import org.qi4j.test.AbstractQi4jTest;
import org.qi4j.test.EntityTestAssembler;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.is;
@@ -69,7 +67,6 @@ public abstract class AbstractValueCompositeSerializationTest
@Rule
@SuppressWarnings( "PublicField" )
public TestName testName = new TestName();
- private Logger log;
@Override
public void assemble( ModuleAssembly module )
@@ -84,7 +81,6 @@ public abstract class AbstractValueCompositeSerializationTest
@Before
public void before()
{
- log = LoggerFactory.getLogger( testName.getMethodName() );
module.injectTo( this );
}
@Service
@@ -105,8 +101,6 @@ public abstract class AbstractValueCompositeSerializationTest
valueSerialization.serialize( some, output );
String stateString = output.toString( "UTF-8" );
- log.info( "Complex ValueComposite state:\n\n{}\n", stateString );
-
// Deserialize using Module API
SomeValue some2 = module.newValueFromSerializedState( SomeValue.class, stateString );
@@ -122,7 +116,6 @@ public abstract class AbstractValueCompositeSerializationTest
}
catch( Exception ex )
{
- log.error( ex.getMessage(), ex );
throw ex;
}
finally
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/c69d16e4/extensions/entitystore-jclouds/build.gradle
----------------------------------------------------------------------
diff --git a/extensions/entitystore-jclouds/build.gradle b/extensions/entitystore-jclouds/build.gradle
index 413503b..15d7e09 100644
--- a/extensions/entitystore-jclouds/build.gradle
+++ b/extensions/entitystore-jclouds/build.gradle
@@ -1,19 +1,19 @@
description = "Qi4j JClouds EntityStore Extension"
-jar { manifest { name = "Qi4j Extension - EntityStore - JClouds" }}
+jar { manifest { name = "Qi4j Extension - EntityStore - JClouds" } }
dependencies {
- compile project( ":org.qi4j.core:org.qi4j.core.bootstrap" )
- compile project( ":org.qi4j.libraries:org.qi4j.library.locking" )
- compile libraries.jclouds_core
- compile libraries.jclouds_blobstore
+ compile project( ":org.qi4j.core:org.qi4j.core.bootstrap" )
+ compile project( ":org.qi4j.libraries:org.qi4j.library.locking" )
+ compile libraries.slf4j_api
+ compile libraries.jclouds_core
+ compile libraries.jclouds_blobstore
- testCompile project( ":org.qi4j.core:org.qi4j.core.testsupport" )
- testCompile(project(":org.qi4j.extensions:org.qi4j.extension.valueserialization-orgjson"))
-
- testRuntime project( ":org.qi4j.core:org.qi4j.core.runtime" )
- testRuntime libraries.logback
+ testCompile project( ":org.qi4j.core:org.qi4j.core.testsupport" )
+ testCompile( project( ":org.qi4j.extensions:org.qi4j.extension.valueserialization-orgjson" ) )
+ testRuntime project( ":org.qi4j.core:org.qi4j.core.runtime" )
+ testRuntime libraries.logback
}
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/c69d16e4/extensions/entitystore-preferences/build.gradle
----------------------------------------------------------------------
diff --git a/extensions/entitystore-preferences/build.gradle b/extensions/entitystore-preferences/build.gradle
index 4992c84..fbe1bd3 100644
--- a/extensions/entitystore-preferences/build.gradle
+++ b/extensions/entitystore-preferences/build.gradle
@@ -1,17 +1,16 @@
-
description = "Qi4j Preferences EntityStore Extension"
-jar { manifest { name = "Qi4j Extension - EntityStore - Preferences" }}
+jar { manifest { name = "Qi4j Extension - EntityStore - Preferences" } }
dependencies {
-
- compile(project(":org.qi4j.core:org.qi4j.core.bootstrap"))
- testCompile(project(":org.qi4j.core:org.qi4j.core.testsupport"))
- testCompile(project(":org.qi4j.extensions:org.qi4j.extension.valueserialization-orgjson"))
+ compile( project( ":org.qi4j.core:org.qi4j.core.bootstrap" ) )
+ compile libraries.slf4j_api
- testRuntime(project(":org.qi4j.core:org.qi4j.core.runtime"))
- testRuntime(libraries.logback)
+ testCompile( project( ":org.qi4j.core:org.qi4j.core.testsupport" ) )
+ testCompile( project( ":org.qi4j.extensions:org.qi4j.extension.valueserialization-orgjson" ) )
+ testRuntime( project( ":org.qi4j.core:org.qi4j.core.runtime" ) )
+ testRuntime( libraries.logback )
}
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/c69d16e4/extensions/entitystore-riak/build.gradle
----------------------------------------------------------------------
diff --git a/extensions/entitystore-riak/build.gradle b/extensions/entitystore-riak/build.gradle
index 1066bab..a15aed7 100644
--- a/extensions/entitystore-riak/build.gradle
+++ b/extensions/entitystore-riak/build.gradle
@@ -1,18 +1,18 @@
description = "Qi4j Riak EntityStore Extension"
-jar { manifest { name = "Qi4j Extension - EntityStore - Riak" }}
+jar { manifest { name = "Qi4j Extension - EntityStore - Riak" } }
dependencies {
-
- compile(project(":org.qi4j.core:org.qi4j.core.bootstrap"))
- compile(project(":org.qi4j.libraries:org.qi4j.library.locking"))
- compile(libraries.riak)
- testCompile(project(":org.qi4j.core:org.qi4j.core.testsupport"))
- testCompile(project(":org.qi4j.extensions:org.qi4j.extension.valueserialization-orgjson"))
+ compile( project( ":org.qi4j.core:org.qi4j.core.bootstrap" ) )
+ compile( project( ":org.qi4j.libraries:org.qi4j.library.locking" ) )
+ compile libraries.slf4j_api
+ compile( libraries.riak )
- testRuntime(project(":org.qi4j.core:org.qi4j.core.runtime"))
- testRuntime(libraries.logback)
+ testCompile( project( ":org.qi4j.core:org.qi4j.core.testsupport" ) )
+ testCompile( project( ":org.qi4j.extensions:org.qi4j.extension.valueserialization-orgjson" ) )
+ testRuntime( project( ":org.qi4j.core:org.qi4j.core.runtime" ) )
+ testRuntime( libraries.logback )
}
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/c69d16e4/extensions/indexing-elasticsearch/build.gradle
----------------------------------------------------------------------
diff --git a/extensions/indexing-elasticsearch/build.gradle b/extensions/indexing-elasticsearch/build.gradle
index a1a2c4c..868f9d2 100644
--- a/extensions/indexing-elasticsearch/build.gradle
+++ b/extensions/indexing-elasticsearch/build.gradle
@@ -6,6 +6,7 @@ dependencies {
compile project(":org.qi4j.core:org.qi4j.core.bootstrap")
compile project(":org.qi4j.libraries:org.qi4j.library.fileconfig")
+ compile libraries.slf4j_api
compile libraries.elasticsearch
testCompile project(":org.qi4j.core:org.qi4j.core.testsupport")
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/c69d16e4/extensions/indexing-rdf/build.gradle
----------------------------------------------------------------------
diff --git a/extensions/indexing-rdf/build.gradle b/extensions/indexing-rdf/build.gradle
index b15ec67..39b71a7 100644
--- a/extensions/indexing-rdf/build.gradle
+++ b/extensions/indexing-rdf/build.gradle
@@ -8,6 +8,7 @@ dependencies {
compile project( ":org.qi4j.libraries:org.qi4j.library.rdf" )
compile libraries.sesame
compile libraries.commons_lang
+ compile libraries.slf4j_api
testCompile project( ':org.qi4j.extensions:org.qi4j.extension.valueserialization-orgjson' )
testCompile project( ':org.qi4j.extensions:org.qi4j.extension.entitystore-preferences' )
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/c69d16e4/extensions/indexing-solr/build.gradle
----------------------------------------------------------------------
diff --git a/extensions/indexing-solr/build.gradle b/extensions/indexing-solr/build.gradle
index b808ff1..2a4c3b0 100644
--- a/extensions/indexing-solr/build.gradle
+++ b/extensions/indexing-solr/build.gradle
@@ -7,6 +7,7 @@ dependencies {
compile(project(":org.qi4j.libraries:org.qi4j.library.fileconfig"))
compile(project(":org.qi4j.libraries:org.qi4j.library.rdf"))
compile(libraries.solr)
+ compile libraries.slf4j_api
testCompile(project(":org.qi4j.core:org.qi4j.core.testsupport"))
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/c69d16e4/extensions/migration/build.gradle
----------------------------------------------------------------------
diff --git a/extensions/migration/build.gradle b/extensions/migration/build.gradle
index d5bd8c3..29efde1 100644
--- a/extensions/migration/build.gradle
+++ b/extensions/migration/build.gradle
@@ -4,6 +4,7 @@ jar { manifest { name = "Qi4j Extension - Migration" }}
dependencies {
compile(project(":org.qi4j.core:org.qi4j.core.spi"))
+ compile libraries.slf4j_api
testCompile(project(":org.qi4j.core:org.qi4j.core.testsupport"))
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/c69d16e4/extensions/reindexer/build.gradle
----------------------------------------------------------------------
diff --git a/extensions/reindexer/build.gradle b/extensions/reindexer/build.gradle
index 35ae6eb..05b87ba 100644
--- a/extensions/reindexer/build.gradle
+++ b/extensions/reindexer/build.gradle
@@ -3,6 +3,7 @@ jar { manifest { description = "Qi4j Reindexer Extension" }}
dependencies {
compile(project(":org.qi4j.core:org.qi4j.core.spi"))
+ compile(libraries.slf4j_api)
testCompile(project(":org.qi4j.core:org.qi4j.core.testsupport"))
testCompile(project(':org.qi4j.extensions:org.qi4j.extension.entitystore-jdbm'))
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/c69d16e4/libraries/circuitbreaker/build.gradle
----------------------------------------------------------------------
diff --git a/libraries/circuitbreaker/build.gradle b/libraries/circuitbreaker/build.gradle
index 8070a77..e513dd9 100644
--- a/libraries/circuitbreaker/build.gradle
+++ b/libraries/circuitbreaker/build.gradle
@@ -5,6 +5,7 @@ jar { manifest {name = "Qi4j Library - Circuit Breaker"}}
dependencies {
compile project( ':org.qi4j.core:org.qi4j.core.api' )
compile project( ':org.qi4j.libraries:org.qi4j.library.jmx' )
+ compile libraries.slf4j_api
testCompile project( ':org.qi4j.core:org.qi4j.core.testsupport' )
testCompile libraries.awaitility
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/c69d16e4/libraries/eventsourcing/build.gradle
----------------------------------------------------------------------
diff --git a/libraries/eventsourcing/build.gradle b/libraries/eventsourcing/build.gradle
index 47e5f74..911ca77 100644
--- a/libraries/eventsourcing/build.gradle
+++ b/libraries/eventsourcing/build.gradle
@@ -4,6 +4,7 @@ jar { manifest { name = "Qi4j Library - Event Sourcing" }}
dependencies {
compile(project(":org.qi4j.core:org.qi4j.core.bootstrap"))
+ compile libraries.slf4j_api
testCompile(project(":org.qi4j.core:org.qi4j.core.testsupport"))
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/c69d16e4/libraries/fileconfig/build.gradle
----------------------------------------------------------------------
diff --git a/libraries/fileconfig/build.gradle b/libraries/fileconfig/build.gradle
index 91f9366..75000d9 100644
--- a/libraries/fileconfig/build.gradle
+++ b/libraries/fileconfig/build.gradle
@@ -4,6 +4,7 @@ jar { manifest { name = "Qi4j Library - FileConfig" }}
dependencies {
compile(project(":org.qi4j.core:org.qi4j.core.bootstrap"))
+ compile libraries.slf4j_api
testCompile(project(":org.qi4j.core:org.qi4j.core.testsupport"))
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/c69d16e4/libraries/jmx/build.gradle
----------------------------------------------------------------------
diff --git a/libraries/jmx/build.gradle b/libraries/jmx/build.gradle
index 3216061..3878cb0 100644
--- a/libraries/jmx/build.gradle
+++ b/libraries/jmx/build.gradle
@@ -4,6 +4,7 @@ jar { manifest { name = "Qi4j Library - JMX" }}
dependencies {
compile(project(":org.qi4j.core:org.qi4j.core.bootstrap"))
+ compile libraries.slf4j_api
testCompile(project(":org.qi4j.core:org.qi4j.core.testsupport"))
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/c69d16e4/libraries/rest-client/build.gradle
----------------------------------------------------------------------
diff --git a/libraries/rest-client/build.gradle b/libraries/rest-client/build.gradle
index ab9fa12..f4813cf 100644
--- a/libraries/rest-client/build.gradle
+++ b/libraries/rest-client/build.gradle
@@ -7,6 +7,7 @@ dependencies {
compile project( ":org.qi4j.core:org.qi4j.core.api" )
compile project( ":org.qi4j.libraries:org.qi4j.library.rest-common" )
compile libraries.restlet
+ compile libraries.slf4j_api
testCompile project( ":org.qi4j.core:org.qi4j.core.testsupport" )
testCompile project( ":org.qi4j.libraries:org.qi4j.library.rest-server" )
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/c69d16e4/libraries/rest-server/build.gradle
----------------------------------------------------------------------
diff --git a/libraries/rest-server/build.gradle b/libraries/rest-server/build.gradle
index 4a8e093..abbc9b8 100644
--- a/libraries/rest-server/build.gradle
+++ b/libraries/rest-server/build.gradle
@@ -6,6 +6,7 @@ dependencies {
compile(project(":org.qi4j.core:org.qi4j.core.api"))
compile(project(":org.qi4j.libraries:org.qi4j.library.rest-common"))
compile(libraries.servlet_api)
+ compile libraries.slf4j_api
compile(libraries.velocity)
compile(libraries.restlet)
compile(libraries.freemarker)
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/c69d16e4/libraries/scheduler/build.gradle
----------------------------------------------------------------------
diff --git a/libraries/scheduler/build.gradle b/libraries/scheduler/build.gradle
index eab2322..931c517 100644
--- a/libraries/scheduler/build.gradle
+++ b/libraries/scheduler/build.gradle
@@ -7,6 +7,7 @@ dependencies {
compile project( ":org.qi4j.core:org.qi4j.core.bootstrap" )
compile project( ':org.qi4j.libraries:org.qi4j.library.constraints' )
compile libraries.sked
+ compile libraries.slf4j_api
testCompile project( ":org.qi4j.core:org.qi4j.core.testsupport" )
testCompile project( ":org.qi4j.extensions:org.qi4j.extension.indexing-rdf" )
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/c69d16e4/libraries/servlet/build.gradle
----------------------------------------------------------------------
diff --git a/libraries/servlet/build.gradle b/libraries/servlet/build.gradle
index 657a4f7..3117492 100644
--- a/libraries/servlet/build.gradle
+++ b/libraries/servlet/build.gradle
@@ -4,7 +4,8 @@ jar { manifest { name = "Qi4j Library - Servlet" }}
dependencies {
compile( project(":org.qi4j.core:org.qi4j.core.bootstrap") )
- compile( libraries.servlet_api )
+ compile libraries.servlet_api
+ compile libraries.slf4j_api
testCompile( project(":org.qi4j.core:org.qi4j.core.testsupport") )
testCompile( libraries.jetty_webapp )
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/c69d16e4/libraries/shiro-core/build.gradle
----------------------------------------------------------------------
diff --git a/libraries/shiro-core/build.gradle b/libraries/shiro-core/build.gradle
index 28422b0..f8bebb2 100644
--- a/libraries/shiro-core/build.gradle
+++ b/libraries/shiro-core/build.gradle
@@ -7,6 +7,7 @@ dependencies {
compile project( ":org.qi4j.core:org.qi4j.core.bootstrap" )
compile libraries.shiro
compile libraries.bouncy_castle
+ compile libraries.slf4j_api
testCompile project( ":org.qi4j.core:org.qi4j.core.testsupport" )
testCompile project( ":org.qi4j.libraries:org.qi4j.library.shiro-web" )
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/c69d16e4/libraries/shiro-web/build.gradle
----------------------------------------------------------------------
diff --git a/libraries/shiro-web/build.gradle b/libraries/shiro-web/build.gradle
index 26fe0d6..b1d713f 100644
--- a/libraries/shiro-web/build.gradle
+++ b/libraries/shiro-web/build.gradle
@@ -10,6 +10,7 @@ dependencies {
compile project( ':org.qi4j.libraries:org.qi4j.library.http' )
compile libraries.shiro_web
compile libraries.servlet_api
+ compile libraries.slf4j_api
testCompile project( ":org.qi4j.core:org.qi4j.core.testsupport" )
testCompile project( ":org.qi4j.libraries:org.qi4j.library.shiro-web" )
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/c69d16e4/libraries/sql-liquibase/build.gradle
----------------------------------------------------------------------
diff --git a/libraries/sql-liquibase/build.gradle b/libraries/sql-liquibase/build.gradle
index 20bff89..36dc3b4 100644
--- a/libraries/sql-liquibase/build.gradle
+++ b/libraries/sql-liquibase/build.gradle
@@ -5,6 +5,7 @@ jar { manifest { name = "Qi4j Library - SQL Liquibase" }}
dependencies {
compile(project(":org.qi4j.libraries:org.qi4j.library.sql"))
compile(libraries.liquibase)
+ compile libraries.slf4j_api
testCompile(project(":org.qi4j.core:org.qi4j.core.testsupport"))
testCompile(project(":org.qi4j.libraries:org.qi4j.library.sql-c3p0"))
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/c69d16e4/libraries/sql/build.gradle
----------------------------------------------------------------------
diff --git a/libraries/sql/build.gradle b/libraries/sql/build.gradle
index 2d1ae83..2b15f51 100644
--- a/libraries/sql/build.gradle
+++ b/libraries/sql/build.gradle
@@ -7,6 +7,7 @@ dependencies {
compile(project(":org.qi4j.libraries:org.qi4j.library.circuitbreaker"))
compile(project(":org.qi4j.libraries:org.qi4j.library.conversion"))
compile(project(":org.qi4j.libraries:org.qi4j.library.jmx"))
+ compile libraries.slf4j_api
testCompile(project(":org.qi4j.core:org.qi4j.core.testsupport"))
testCompile(project(":org.qi4j.core:org.qi4j.core.runtime"))
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/c69d16e4/libraries/struts2-plugin/build.gradle
----------------------------------------------------------------------
diff --git a/libraries/struts2-plugin/build.gradle b/libraries/struts2-plugin/build.gradle
index 4e75ab5..d579a54 100644
--- a/libraries/struts2-plugin/build.gradle
+++ b/libraries/struts2-plugin/build.gradle
@@ -7,6 +7,7 @@ dependencies {
compile(libraries.struts_core)
compile(libraries.freemarker)
compile(libraries.servlet_api)
+ compile(libraries.slf4j_api)
testCompile(project(":org.qi4j.core:org.qi4j.core.testsupport"))
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/c69d16e4/samples/dci-cargo/dcisample_a/build.gradle
----------------------------------------------------------------------
diff --git a/samples/dci-cargo/dcisample_a/build.gradle b/samples/dci-cargo/dcisample_a/build.gradle
index 26c1b9c..bb19386 100644
--- a/samples/dci-cargo/dcisample_a/build.gradle
+++ b/samples/dci-cargo/dcisample_a/build.gradle
@@ -15,6 +15,7 @@ dependencies {
compile(libraries.wicket)
compile(libraries.wicket_devutils)
compile(libraries.wicket_stateless)
+ compile libraries.slf4j_api
runtime(project(":org.qi4j.core:org.qi4j.core.runtime"))
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/c69d16e4/samples/dci-cargo/dcisample_b/build.gradle
----------------------------------------------------------------------
diff --git a/samples/dci-cargo/dcisample_b/build.gradle b/samples/dci-cargo/dcisample_b/build.gradle
index ebea1d2..f5dec29 100644
--- a/samples/dci-cargo/dcisample_b/build.gradle
+++ b/samples/dci-cargo/dcisample_b/build.gradle
@@ -15,6 +15,7 @@ dependencies {
compile(libraries.wicket)
compile(libraries.wicket_devutils)
compile(libraries.wicket_stateless)
+ compile libraries.slf4j_api
runtime(project(":org.qi4j.core:org.qi4j.core.runtime"))
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/c69d16e4/tests/performance/build.gradle
----------------------------------------------------------------------
diff --git a/tests/performance/build.gradle b/tests/performance/build.gradle
index f08c88e..c1f790d 100644
--- a/tests/performance/build.gradle
+++ b/tests/performance/build.gradle
@@ -10,7 +10,8 @@ dependencies {
compile project( ":org.qi4j.core:org.qi4j.core.bootstrap" )
compile libraries.junit
-
+ compile libraries.slf4j_api
+
perfCompile sourceSets.main.output
perfCompile configurations.testCompile
perfCompile sourceSets.test.output
[2/2] zest-qi4j git commit: Merge branch 'develop' into
Drop_slf4j_dependency
Posted by ni...@apache.org.
Merge branch 'develop' into Drop_slf4j_dependency
Project: http://git-wip-us.apache.org/repos/asf/zest-qi4j/repo
Commit: http://git-wip-us.apache.org/repos/asf/zest-qi4j/commit/72524b33
Tree: http://git-wip-us.apache.org/repos/asf/zest-qi4j/tree/72524b33
Diff: http://git-wip-us.apache.org/repos/asf/zest-qi4j/diff/72524b33
Branch: refs/heads/Drop_slf4j_dependency
Commit: 72524b3377652a84fc9e8a9d6b631ecb6908b7ee
Parents: c69d16e d7159b1
Author: Niclas Hedhman <ni...@hedhman.org>
Authored: Sun Apr 5 11:07:56 2015 +0300
Committer: Niclas Hedhman <ni...@hedhman.org>
Committed: Sun Apr 5 11:07:56 2015 +0300
----------------------------------------------------------------------
build.gradle | 15 +-
core/api/src/docs/unitofwork.txt | 3 +-
.../org/qi4j/api/unitofwork/UnitOfWork.java | 113 ++-
.../composite/FunctionStateResolver.java | 71 ++
.../qi4j/runtime/composite/StateResolver.java | 36 +
.../runtime/entity/EntityPropertyInstance.java | 2 +-
.../qi4j/runtime/entity/EntityStateModel.java | 2 +-
.../qi4j/runtime/injection/DependencyModel.java | 12 +-
.../injection/InjectionProviderFactory.java | 6 +-
.../qi4j/runtime/structure/ModuleInstance.java | 87 +-
.../runtime/structure/ModuleUnitOfWork.java | 109 ++-
.../unitofwork/EntityBuilderInstance.java | 50 +-
.../runtime/value/ValueBuilderInstance.java | 3 +-
.../runtime/value/ValueBuilderWithState.java | 19 +-
.../qi4j/runtime/value/ValueStateInstance.java | 4 +-
.../org/qi4j/runtime/value/ValueStateModel.java | 21 +-
.../composite/CompositeModelResolverTest.java | 4 +-
.../entity/EntityBuilderWithStateTest.java | 148 ++++
.../ServiceInstantiationTests.java | 18 +-
.../transients/TransientBuilderFactoryTest.java | 2 +-
.../qi4j/runtime/instantiation/My.properties | 1 +
.../runtime/instantiation/MyService.properties | 1 -
doap.rdf | 64 ++
.../internal/AbstractElasticSearchSupport.java | 11 +-
gradle/wrapper/gradle-wrapper.properties | 2 +-
libraries/conversion/src/docs/conversion.txt | 41 +-
.../conversion/values/EntityToValue.java | 34 +-
.../qi4j/library/conversion/values/Shared.java | 67 ++
.../conversion/values/ValueToEntity.java | 132 +++
.../values/ValueToEntityAssembler.java | 39 +
.../conversion/values/ValueToEntityMixin.java | 829 +++++++++++++++++++
.../conversion/values/ValueToEntityService.java | 27 +
.../conversion/values/EntityToValueTest.java | 190 +----
.../library/conversion/values/TestModel.java | 200 +++++
.../conversion/values/ValueToEntityTest.java | 351 ++++++++
.../rest/server/DomainEventSourceResource.java | 2 +-
.../replay/ApplicationEventPlayer.java | 7 +-
.../source/ApplicationEventSource.java | 11 +-
.../helper/ApplicationEventParameters.java | 1 -
.../domain/replay/DomainEventPlayer.java | 6 +-
.../domain/source/EventSource.java | 1 +
.../domain/source/helper/EventParameters.java | 1 -
.../domain/source/helper/EventRouter.java | 2 +-
.../domain/source/helper/UnitOfWorkRouter.java | 2 +-
.../java/org/qi4j/lang/groovy/GroovyMixin.java | 2 +-
.../qi4j/lang/javascript/JavaScriptMixin.java | 2 +-
.../java/org/qi4j/lang/jruby/JRubyMixin.java | 2 +-
.../bootstrap/Qi4jApplicationBootstrap.java | 17 +-
.../library/spring/importer/SpringImporter.java | 2 +-
.../library/struts2/Qi4jPropertyAccessor.java | 2 +-
.../src/docs/tutorials/howto-create-concern.txt | 4 +-
.../src/docs/tutorials/howto-create-entity.txt | 11 +-
.../createEntity/CarEntityFactoryMixin.java | 8 +-
.../wicket/form/DateTextFieldWithPicker.java | 2 +-
.../handling/ProcessHandlingEvent.java | 2 +-
.../wicket/form/DateTextFieldWithPicker.java | 2 +-
.../qi4j/envisage/detail/DetailModelPane.java | 4 +-
.../org/qi4j/envisage/detail/GeneralPane.java | 10 +-
.../org/qi4j/envisage/graph/GraphBuilder.java | 8 +-
.../java/org/qi4j/envisage/print/PDFWriter.java | 6 +-
.../envisage/tree/StructureModelBuilder.java | 6 +-
.../envisage/tree/TreeModelCellRenderer.java | 2 +-
.../qi4j/envisage/tree/TypeModelBuilder.java | 4 +-
.../descriptor/ActivatorDetailDescriptor.java | 15 +-
.../descriptor/ApplicationDetailDescriptor.java | 34 +-
.../ApplicationDetailDescriptorBuilder.java | 7 +-
.../descriptor/CompositeDetailDescriptor.java | 15 +-
.../descriptor/ConstructorDetailDescriptor.java | 3 +
.../descriptor/EntityDetailDescriptor.java | 16 +-
.../ImportedServiceDetailDescriptor.java | 29 +-
.../model/descriptor/LayerDetailDescriptor.java | 36 +-
.../MethodConcernDetailDescriptor.java | 6 +-
.../descriptor/ModuleDetailDescriptor.java | 85 +-
.../descriptor/ObjectDetailDescriptor.java | 15 +-
.../descriptor/ServiceDetailDescriptor.java | 28 +-
.../descriptor/TransientDetailDescriptor.java | 40 +
.../model/descriptor/ValueDetailDescriptor.java | 14 +
.../org/qi4j/tools/model/util/SPIFinder.java | 50 +-
.../model/util/ServiceConfigurationFinder.java | 8 +-
.../tools/model/util/ServiceUsageFinder.java | 28 +-
.../qi4j/tools/model/VisitableDetailTest.java | 148 ++++
81 files changed, 2907 insertions(+), 513 deletions(-)
----------------------------------------------------------------------