:libraries:logging refine
Project: http://git-wip-us.apache.org/repos/asf/polygene-java/repo Commit: http://git-wip-us.apache.org/repos/asf/polygene-java/commit/b77c7356 Tree: http://git-wip-us.apache.org/repos/asf/polygene-java/tree/b77c7356 Diff: http://git-wip-us.apache.org/repos/asf/polygene-java/diff/b77c7356 Branch: refs/heads/master Commit: b77c7356c66515143c7dfba226fcdd83b2aecf89 Parents: 03a930e Author: Paul Merlin <[email protected]> Authored: Mon May 15 10:47:49 2017 +0200 Committer: Paul Merlin <[email protected]> Committed: Mon May 15 10:47:49 2017 +0200 ---------------------------------------------------------------------- .../logging/debug/records/CompositeDebugRecordEntity.java | 3 +-- .../logging/debug/records/EntityDebugRecordEntity.java | 2 +- .../logging/debug/records/ServiceDebugRecordEntity.java | 3 +-- .../logging/debug/service/DebugServiceConfiguration.java | 2 -- .../logging/debug/service/DebuggingServiceComposite.java | 3 +-- .../library/logging/debug/service/DebuggingServiceMixin.java | 2 +- .../library/logging/log/records/CompositeLogRecord.java | 3 +-- .../library/logging/log/service/LoggingServiceComposite.java | 3 +-- .../library/logging/log/service/LoggingServiceMixin.java | 8 ++++---- .../logging/trace/records/CompositeTraceRecordEntity.java | 3 +-- .../logging/trace/records/EntityTraceRecordEntity.java | 2 +- .../logging/trace/records/ServiceTraceRecordEntity.java | 3 +-- .../logging/trace/service/StandardTraceServiceComposite.java | 3 +-- .../logging/trace/service/TraceServiceConfiguration.java | 3 +-- 14 files changed, 16 insertions(+), 27 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/polygene-java/blob/b77c7356/libraries/logging/src/main/java/org/apache/polygene/library/logging/debug/records/CompositeDebugRecordEntity.java ---------------------------------------------------------------------- diff --git a/libraries/logging/src/main/java/org/apache/polygene/library/logging/debug/records/CompositeDebugRecordEntity.java b/libraries/logging/src/main/java/org/apache/polygene/library/logging/debug/records/CompositeDebugRecordEntity.java index 1cab2a0..082eb19 100644 --- a/libraries/logging/src/main/java/org/apache/polygene/library/logging/debug/records/CompositeDebugRecordEntity.java +++ b/libraries/logging/src/main/java/org/apache/polygene/library/logging/debug/records/CompositeDebugRecordEntity.java @@ -21,10 +21,9 @@ package org.apache.polygene.library.logging.debug.records; import org.apache.polygene.api.composite.Composite; -import org.apache.polygene.api.entity.EntityComposite; import org.apache.polygene.api.property.Property; -public interface CompositeDebugRecordEntity extends DebugRecord, EntityComposite +public interface CompositeDebugRecordEntity extends DebugRecord { Property<Composite> source(); } http://git-wip-us.apache.org/repos/asf/polygene-java/blob/b77c7356/libraries/logging/src/main/java/org/apache/polygene/library/logging/debug/records/EntityDebugRecordEntity.java ---------------------------------------------------------------------- diff --git a/libraries/logging/src/main/java/org/apache/polygene/library/logging/debug/records/EntityDebugRecordEntity.java b/libraries/logging/src/main/java/org/apache/polygene/library/logging/debug/records/EntityDebugRecordEntity.java index 1f58154..e14d28b 100644 --- a/libraries/logging/src/main/java/org/apache/polygene/library/logging/debug/records/EntityDebugRecordEntity.java +++ b/libraries/logging/src/main/java/org/apache/polygene/library/logging/debug/records/EntityDebugRecordEntity.java @@ -23,7 +23,7 @@ package org.apache.polygene.library.logging.debug.records; import org.apache.polygene.api.association.Association; import org.apache.polygene.api.entity.EntityComposite; -public interface EntityDebugRecordEntity extends DebugRecord, EntityComposite +public interface EntityDebugRecordEntity extends DebugRecord { Association<EntityComposite> source(); } http://git-wip-us.apache.org/repos/asf/polygene-java/blob/b77c7356/libraries/logging/src/main/java/org/apache/polygene/library/logging/debug/records/ServiceDebugRecordEntity.java ---------------------------------------------------------------------- diff --git a/libraries/logging/src/main/java/org/apache/polygene/library/logging/debug/records/ServiceDebugRecordEntity.java b/libraries/logging/src/main/java/org/apache/polygene/library/logging/debug/records/ServiceDebugRecordEntity.java index 3e35a78..527236a 100644 --- a/libraries/logging/src/main/java/org/apache/polygene/library/logging/debug/records/ServiceDebugRecordEntity.java +++ b/libraries/logging/src/main/java/org/apache/polygene/library/logging/debug/records/ServiceDebugRecordEntity.java @@ -20,10 +20,9 @@ package org.apache.polygene.library.logging.debug.records; -import org.apache.polygene.api.entity.EntityComposite; import org.apache.polygene.api.property.Property; -public interface ServiceDebugRecordEntity extends DebugRecord, EntityComposite +public interface ServiceDebugRecordEntity extends DebugRecord { Property<String> source(); } http://git-wip-us.apache.org/repos/asf/polygene-java/blob/b77c7356/libraries/logging/src/main/java/org/apache/polygene/library/logging/debug/service/DebugServiceConfiguration.java ---------------------------------------------------------------------- diff --git a/libraries/logging/src/main/java/org/apache/polygene/library/logging/debug/service/DebugServiceConfiguration.java b/libraries/logging/src/main/java/org/apache/polygene/library/logging/debug/service/DebugServiceConfiguration.java index 4744e0b..b1dc920 100644 --- a/libraries/logging/src/main/java/org/apache/polygene/library/logging/debug/service/DebugServiceConfiguration.java +++ b/libraries/logging/src/main/java/org/apache/polygene/library/logging/debug/service/DebugServiceConfiguration.java @@ -20,11 +20,9 @@ package org.apache.polygene.library.logging.debug.service; -import org.apache.polygene.api.configuration.ConfigurationComposite; import org.apache.polygene.api.property.Property; public interface DebugServiceConfiguration - extends ConfigurationComposite { Property<Integer> debugLevel(); } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/polygene-java/blob/b77c7356/libraries/logging/src/main/java/org/apache/polygene/library/logging/debug/service/DebuggingServiceComposite.java ---------------------------------------------------------------------- diff --git a/libraries/logging/src/main/java/org/apache/polygene/library/logging/debug/service/DebuggingServiceComposite.java b/libraries/logging/src/main/java/org/apache/polygene/library/logging/debug/service/DebuggingServiceComposite.java index bb8573c..2143b06 100644 --- a/libraries/logging/src/main/java/org/apache/polygene/library/logging/debug/service/DebuggingServiceComposite.java +++ b/libraries/logging/src/main/java/org/apache/polygene/library/logging/debug/service/DebuggingServiceComposite.java @@ -21,12 +21,11 @@ package org.apache.polygene.library.logging.debug.service; import org.apache.polygene.api.mixin.Mixins; -import org.apache.polygene.api.service.ServiceComposite; import org.apache.polygene.api.sideeffect.SideEffects; import org.apache.polygene.library.logging.log.service.LogOnConsoleSideEffect; @SideEffects( { LogOnConsoleSideEffect.class } ) @Mixins( { DebuggingServiceMixin.class } ) -public interface DebuggingServiceComposite extends DebuggingService, ServiceComposite +public interface DebuggingServiceComposite extends DebuggingService { } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/polygene-java/blob/b77c7356/libraries/logging/src/main/java/org/apache/polygene/library/logging/debug/service/DebuggingServiceMixin.java ---------------------------------------------------------------------- diff --git a/libraries/logging/src/main/java/org/apache/polygene/library/logging/debug/service/DebuggingServiceMixin.java b/libraries/logging/src/main/java/org/apache/polygene/library/logging/debug/service/DebuggingServiceMixin.java index f56aeb3..02aca0f 100644 --- a/libraries/logging/src/main/java/org/apache/polygene/library/logging/debug/service/DebuggingServiceMixin.java +++ b/libraries/logging/src/main/java/org/apache/polygene/library/logging/debug/service/DebuggingServiceMixin.java @@ -122,7 +122,7 @@ public class DebuggingServiceMixin UnitOfWork uow = uowf.newUnitOfWork(); try { - List<Object> paramsList = new ArrayList<Object>( Arrays.asList( params ) ); + List<Object> paramsList = new ArrayList<>( Arrays.asList( params ) ); createDebugRecord( uow, composite, message, paramsList ); uow.complete(); } http://git-wip-us.apache.org/repos/asf/polygene-java/blob/b77c7356/libraries/logging/src/main/java/org/apache/polygene/library/logging/log/records/CompositeLogRecord.java ---------------------------------------------------------------------- diff --git a/libraries/logging/src/main/java/org/apache/polygene/library/logging/log/records/CompositeLogRecord.java b/libraries/logging/src/main/java/org/apache/polygene/library/logging/log/records/CompositeLogRecord.java index 194ad25..9322960 100644 --- a/libraries/logging/src/main/java/org/apache/polygene/library/logging/log/records/CompositeLogRecord.java +++ b/libraries/logging/src/main/java/org/apache/polygene/library/logging/log/records/CompositeLogRecord.java @@ -20,10 +20,9 @@ package org.apache.polygene.library.logging.log.records; import org.apache.polygene.api.composite.Composite; -import org.apache.polygene.api.entity.EntityComposite; import org.apache.polygene.api.property.Property; -public interface CompositeLogRecord extends LogRecord, EntityComposite +public interface CompositeLogRecord extends LogRecord { Property<Composite> source(); } http://git-wip-us.apache.org/repos/asf/polygene-java/blob/b77c7356/libraries/logging/src/main/java/org/apache/polygene/library/logging/log/service/LoggingServiceComposite.java ---------------------------------------------------------------------- diff --git a/libraries/logging/src/main/java/org/apache/polygene/library/logging/log/service/LoggingServiceComposite.java b/libraries/logging/src/main/java/org/apache/polygene/library/logging/log/service/LoggingServiceComposite.java index d291a41..e82c7c8 100644 --- a/libraries/logging/src/main/java/org/apache/polygene/library/logging/log/service/LoggingServiceComposite.java +++ b/libraries/logging/src/main/java/org/apache/polygene/library/logging/log/service/LoggingServiceComposite.java @@ -21,11 +21,10 @@ package org.apache.polygene.library.logging.log.service; import org.apache.polygene.api.mixin.Mixins; -import org.apache.polygene.api.service.ServiceComposite; import org.apache.polygene.api.sideeffect.SideEffects; @SideEffects( { LogOnConsoleSideEffect.class } ) @Mixins( { LoggingServiceMixin.class } ) -public interface LoggingServiceComposite extends LoggingService, ServiceComposite +public interface LoggingServiceComposite extends LoggingService { } http://git-wip-us.apache.org/repos/asf/polygene-java/blob/b77c7356/libraries/logging/src/main/java/org/apache/polygene/library/logging/log/service/LoggingServiceMixin.java ---------------------------------------------------------------------- diff --git a/libraries/logging/src/main/java/org/apache/polygene/library/logging/log/service/LoggingServiceMixin.java b/libraries/logging/src/main/java/org/apache/polygene/library/logging/log/service/LoggingServiceMixin.java index 797e2e9..58dc0d4 100644 --- a/libraries/logging/src/main/java/org/apache/polygene/library/logging/log/service/LoggingServiceMixin.java +++ b/libraries/logging/src/main/java/org/apache/polygene/library/logging/log/service/LoggingServiceMixin.java @@ -51,7 +51,7 @@ public abstract class LoggingServiceMixin UnitOfWork uow = uowf.newUnitOfWork(); try { - List<Object> paramsList = new ArrayList<Object>(); + List<Object> paramsList = new ArrayList<>(); createLogRecord( uow, type, composite, category, message, paramsList ); uow.complete(); } @@ -70,7 +70,7 @@ public abstract class LoggingServiceMixin UnitOfWork uow = uowf.newUnitOfWork(); try { - List<Object> paramsList = new ArrayList<Object>(); + List<Object> paramsList = new ArrayList<>(); paramsList.add( param1 ); createLogRecord( uow, type, composite, category, message, paramsList ); uow.complete(); @@ -90,7 +90,7 @@ public abstract class LoggingServiceMixin UnitOfWork uow = uowf.newUnitOfWork(); try { - List<Object> paramsList = new ArrayList<Object>(); + List<Object> paramsList = new ArrayList<>(); paramsList.add( param1 ); paramsList.add( param2 ); createLogRecord( uow, type, composite, category, message, paramsList ); @@ -112,7 +112,7 @@ public abstract class LoggingServiceMixin UnitOfWork uow = uowf.newUnitOfWork(); try { - List<Object> paramsList = new ArrayList<Object>( Arrays.asList( params ) ); + List<Object> paramsList = new ArrayList<>( Arrays.asList( params ) ); createLogRecord( uow, type, composite, category, message, paramsList ); uow.complete(); } http://git-wip-us.apache.org/repos/asf/polygene-java/blob/b77c7356/libraries/logging/src/main/java/org/apache/polygene/library/logging/trace/records/CompositeTraceRecordEntity.java ---------------------------------------------------------------------- diff --git a/libraries/logging/src/main/java/org/apache/polygene/library/logging/trace/records/CompositeTraceRecordEntity.java b/libraries/logging/src/main/java/org/apache/polygene/library/logging/trace/records/CompositeTraceRecordEntity.java index f2650a0..773a343 100644 --- a/libraries/logging/src/main/java/org/apache/polygene/library/logging/trace/records/CompositeTraceRecordEntity.java +++ b/libraries/logging/src/main/java/org/apache/polygene/library/logging/trace/records/CompositeTraceRecordEntity.java @@ -21,10 +21,9 @@ package org.apache.polygene.library.logging.trace.records; import org.apache.polygene.api.composite.Composite; -import org.apache.polygene.api.entity.EntityComposite; import org.apache.polygene.api.property.Property; -public interface CompositeTraceRecordEntity extends TraceRecord, EntityComposite +public interface CompositeTraceRecordEntity extends TraceRecord { Property<Composite> source(); http://git-wip-us.apache.org/repos/asf/polygene-java/blob/b77c7356/libraries/logging/src/main/java/org/apache/polygene/library/logging/trace/records/EntityTraceRecordEntity.java ---------------------------------------------------------------------- diff --git a/libraries/logging/src/main/java/org/apache/polygene/library/logging/trace/records/EntityTraceRecordEntity.java b/libraries/logging/src/main/java/org/apache/polygene/library/logging/trace/records/EntityTraceRecordEntity.java index 56a21ee..dcf529f 100644 --- a/libraries/logging/src/main/java/org/apache/polygene/library/logging/trace/records/EntityTraceRecordEntity.java +++ b/libraries/logging/src/main/java/org/apache/polygene/library/logging/trace/records/EntityTraceRecordEntity.java @@ -25,7 +25,7 @@ import org.apache.polygene.api.entity.EntityComposite; import org.apache.polygene.api.entity.Queryable; @Queryable( false ) -public interface EntityTraceRecordEntity extends TraceRecord, EntityComposite +public interface EntityTraceRecordEntity extends TraceRecord { Association<EntityComposite> source(); } http://git-wip-us.apache.org/repos/asf/polygene-java/blob/b77c7356/libraries/logging/src/main/java/org/apache/polygene/library/logging/trace/records/ServiceTraceRecordEntity.java ---------------------------------------------------------------------- diff --git a/libraries/logging/src/main/java/org/apache/polygene/library/logging/trace/records/ServiceTraceRecordEntity.java b/libraries/logging/src/main/java/org/apache/polygene/library/logging/trace/records/ServiceTraceRecordEntity.java index 76d33d9..9a5135e 100644 --- a/libraries/logging/src/main/java/org/apache/polygene/library/logging/trace/records/ServiceTraceRecordEntity.java +++ b/libraries/logging/src/main/java/org/apache/polygene/library/logging/trace/records/ServiceTraceRecordEntity.java @@ -20,10 +20,9 @@ package org.apache.polygene.library.logging.trace.records; -import org.apache.polygene.api.entity.EntityComposite; import org.apache.polygene.api.property.Property; -public interface ServiceTraceRecordEntity extends TraceRecord, EntityComposite +public interface ServiceTraceRecordEntity extends TraceRecord { Property<String> source(); } http://git-wip-us.apache.org/repos/asf/polygene-java/blob/b77c7356/libraries/logging/src/main/java/org/apache/polygene/library/logging/trace/service/StandardTraceServiceComposite.java ---------------------------------------------------------------------- diff --git a/libraries/logging/src/main/java/org/apache/polygene/library/logging/trace/service/StandardTraceServiceComposite.java b/libraries/logging/src/main/java/org/apache/polygene/library/logging/trace/service/StandardTraceServiceComposite.java index 16b917c..bc20229 100644 --- a/libraries/logging/src/main/java/org/apache/polygene/library/logging/trace/service/StandardTraceServiceComposite.java +++ b/libraries/logging/src/main/java/org/apache/polygene/library/logging/trace/service/StandardTraceServiceComposite.java @@ -21,12 +21,11 @@ package org.apache.polygene.library.logging.trace.service; import org.apache.polygene.api.mixin.Mixins; -import org.apache.polygene.api.service.ServiceComposite; import org.apache.polygene.api.sideeffect.SideEffects; import org.apache.polygene.library.logging.trace.TraceOnConsoleSideEffect; @SideEffects( TraceOnConsoleSideEffect.class ) @Mixins( TraceServiceMixin.class ) -public interface StandardTraceServiceComposite extends TraceService, ServiceComposite +public interface StandardTraceServiceComposite extends TraceService { } http://git-wip-us.apache.org/repos/asf/polygene-java/blob/b77c7356/libraries/logging/src/main/java/org/apache/polygene/library/logging/trace/service/TraceServiceConfiguration.java ---------------------------------------------------------------------- diff --git a/libraries/logging/src/main/java/org/apache/polygene/library/logging/trace/service/TraceServiceConfiguration.java b/libraries/logging/src/main/java/org/apache/polygene/library/logging/trace/service/TraceServiceConfiguration.java index 954da63..1987907 100644 --- a/libraries/logging/src/main/java/org/apache/polygene/library/logging/trace/service/TraceServiceConfiguration.java +++ b/libraries/logging/src/main/java/org/apache/polygene/library/logging/trace/service/TraceServiceConfiguration.java @@ -21,10 +21,9 @@ package org.apache.polygene.library.logging.trace.service; import org.apache.polygene.api.common.UseDefaults; -import org.apache.polygene.api.configuration.ConfigurationComposite; import org.apache.polygene.api.property.Property; -public interface TraceServiceConfiguration extends ConfigurationComposite +public interface TraceServiceConfiguration { @UseDefaults Property<Integer> traceLevel(); }
