http://git-wip-us.apache.org/repos/asf/polygene-java/blob/931c2eeb/internals/testsupport-internal/src/main/java/org/apache/polygene/test/internal/DockerRule.java ---------------------------------------------------------------------- diff --git a/internals/testsupport-internal/src/main/java/org/apache/polygene/test/internal/DockerRule.java b/internals/testsupport-internal/src/main/java/org/apache/polygene/test/internal/DockerRule.java index f8059bd..35b4f12 100644 --- a/internals/testsupport-internal/src/main/java/org/apache/polygene/test/internal/DockerRule.java +++ b/internals/testsupport-internal/src/main/java/org/apache/polygene/test/internal/DockerRule.java @@ -88,7 +88,7 @@ public class DockerRule .publishAllPorts( true ) .waitForTimeout( 60000 ) .waitFor( rule -> new AndChecker( rule, waitFor ) ); - environment.entrySet().forEach( entry -> builder.env( entry.getKey(), entry.getValue() ) ); + environment.forEach( builder::env ); dockerRule = builder.build(); } }
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/931c2eeb/libraries/constraints/src/main/java/org/apache/polygene/library/constraints/ContainsConstraint.java ---------------------------------------------------------------------- diff --git a/libraries/constraints/src/main/java/org/apache/polygene/library/constraints/ContainsConstraint.java b/libraries/constraints/src/main/java/org/apache/polygene/library/constraints/ContainsConstraint.java index 4467f03..bc62ecd 100644 --- a/libraries/constraints/src/main/java/org/apache/polygene/library/constraints/ContainsConstraint.java +++ b/libraries/constraints/src/main/java/org/apache/polygene/library/constraints/ContainsConstraint.java @@ -28,9 +28,6 @@ import org.apache.polygene.library.constraints.annotation.Contains; public class ContainsConstraint implements Constraint<Contains, String> { - - private static final long serialVersionUID = 1L; - @Override public boolean isValid( Contains annotation, String argument ) { http://git-wip-us.apache.org/repos/asf/polygene-java/blob/931c2eeb/libraries/constraints/src/main/java/org/apache/polygene/library/constraints/GreaterThanConstraint.java ---------------------------------------------------------------------- diff --git a/libraries/constraints/src/main/java/org/apache/polygene/library/constraints/GreaterThanConstraint.java b/libraries/constraints/src/main/java/org/apache/polygene/library/constraints/GreaterThanConstraint.java index 0d58f25..e8469b1 100644 --- a/libraries/constraints/src/main/java/org/apache/polygene/library/constraints/GreaterThanConstraint.java +++ b/libraries/constraints/src/main/java/org/apache/polygene/library/constraints/GreaterThanConstraint.java @@ -28,9 +28,6 @@ import org.apache.polygene.library.constraints.annotation.GreaterThan; public class GreaterThanConstraint implements Constraint<GreaterThan, Number> { - - private static final long serialVersionUID = 1L; - @Override public boolean isValid( GreaterThan annotation, Number argument ) { http://git-wip-us.apache.org/repos/asf/polygene-java/blob/931c2eeb/libraries/constraints/src/main/java/org/apache/polygene/library/constraints/InstanceOfConstraint.java ---------------------------------------------------------------------- diff --git a/libraries/constraints/src/main/java/org/apache/polygene/library/constraints/InstanceOfConstraint.java b/libraries/constraints/src/main/java/org/apache/polygene/library/constraints/InstanceOfConstraint.java index 1bbf7ce..2d36e2f 100644 --- a/libraries/constraints/src/main/java/org/apache/polygene/library/constraints/InstanceOfConstraint.java +++ b/libraries/constraints/src/main/java/org/apache/polygene/library/constraints/InstanceOfConstraint.java @@ -28,9 +28,6 @@ import org.apache.polygene.library.constraints.annotation.InstanceOf; public class InstanceOfConstraint implements Constraint<InstanceOf, Object> { - - private static final long serialVersionUID = 1L; - @Override public boolean isValid( InstanceOf annotation, Object parameter ) throws NullPointerException http://git-wip-us.apache.org/repos/asf/polygene-java/blob/931c2eeb/libraries/constraints/src/main/java/org/apache/polygene/library/constraints/LessThanConstraint.java ---------------------------------------------------------------------- diff --git a/libraries/constraints/src/main/java/org/apache/polygene/library/constraints/LessThanConstraint.java b/libraries/constraints/src/main/java/org/apache/polygene/library/constraints/LessThanConstraint.java index 6f50a82..432cb15 100644 --- a/libraries/constraints/src/main/java/org/apache/polygene/library/constraints/LessThanConstraint.java +++ b/libraries/constraints/src/main/java/org/apache/polygene/library/constraints/LessThanConstraint.java @@ -28,9 +28,6 @@ import org.apache.polygene.library.constraints.annotation.LessThan; public class LessThanConstraint implements Constraint<LessThan, Number> { - - private static final long serialVersionUID = 1L; - @Override public boolean isValid( LessThan annotation, Number argument ) { http://git-wip-us.apache.org/repos/asf/polygene-java/blob/931c2eeb/libraries/constraints/src/main/java/org/apache/polygene/library/constraints/MatchesConstraint.java ---------------------------------------------------------------------- diff --git a/libraries/constraints/src/main/java/org/apache/polygene/library/constraints/MatchesConstraint.java b/libraries/constraints/src/main/java/org/apache/polygene/library/constraints/MatchesConstraint.java index 721c03a..d0b44fa 100644 --- a/libraries/constraints/src/main/java/org/apache/polygene/library/constraints/MatchesConstraint.java +++ b/libraries/constraints/src/main/java/org/apache/polygene/library/constraints/MatchesConstraint.java @@ -29,9 +29,6 @@ import org.apache.polygene.library.constraints.annotation.Matches; public class MatchesConstraint implements Constraint<Matches, String> { - - private static final long serialVersionUID = 1L; - @Override public boolean isValid( Matches annotation, String argument ) { http://git-wip-us.apache.org/repos/asf/polygene-java/blob/931c2eeb/libraries/constraints/src/main/java/org/apache/polygene/library/constraints/MaxLengthConstraint.java ---------------------------------------------------------------------- diff --git a/libraries/constraints/src/main/java/org/apache/polygene/library/constraints/MaxLengthConstraint.java b/libraries/constraints/src/main/java/org/apache/polygene/library/constraints/MaxLengthConstraint.java index 2df3502..5033f91 100644 --- a/libraries/constraints/src/main/java/org/apache/polygene/library/constraints/MaxLengthConstraint.java +++ b/libraries/constraints/src/main/java/org/apache/polygene/library/constraints/MaxLengthConstraint.java @@ -28,9 +28,6 @@ import org.apache.polygene.library.constraints.annotation.MaxLength; public class MaxLengthConstraint implements Constraint<MaxLength, String> { - - private static final long serialVersionUID = 1L; - @Override public boolean isValid( MaxLength annotation, String argument ) { @@ -38,8 +35,6 @@ public class MaxLengthConstraint { return argument.length() <= annotation.value(); } - return false; } - } http://git-wip-us.apache.org/repos/asf/polygene-java/blob/931c2eeb/libraries/constraints/src/main/java/org/apache/polygene/library/constraints/MinLengthConstraint.java ---------------------------------------------------------------------- diff --git a/libraries/constraints/src/main/java/org/apache/polygene/library/constraints/MinLengthConstraint.java b/libraries/constraints/src/main/java/org/apache/polygene/library/constraints/MinLengthConstraint.java index a0e998a..008306f 100644 --- a/libraries/constraints/src/main/java/org/apache/polygene/library/constraints/MinLengthConstraint.java +++ b/libraries/constraints/src/main/java/org/apache/polygene/library/constraints/MinLengthConstraint.java @@ -28,9 +28,6 @@ import org.apache.polygene.library.constraints.annotation.MinLength; public class MinLengthConstraint implements Constraint<MinLength, String> { - - private static final long serialVersionUID = 1L; - @Override public boolean isValid( MinLength annotation, String parameter ) throws NullPointerException @@ -39,8 +36,6 @@ public class MinLengthConstraint { return parameter.length() >= annotation.value(); } - return false; } - } http://git-wip-us.apache.org/repos/asf/polygene-java/blob/931c2eeb/libraries/constraints/src/main/java/org/apache/polygene/library/constraints/NotEmptyCollectionConstraint.java ---------------------------------------------------------------------- diff --git a/libraries/constraints/src/main/java/org/apache/polygene/library/constraints/NotEmptyCollectionConstraint.java b/libraries/constraints/src/main/java/org/apache/polygene/library/constraints/NotEmptyCollectionConstraint.java index 8f1f4e9..5675e05 100644 --- a/libraries/constraints/src/main/java/org/apache/polygene/library/constraints/NotEmptyCollectionConstraint.java +++ b/libraries/constraints/src/main/java/org/apache/polygene/library/constraints/NotEmptyCollectionConstraint.java @@ -29,9 +29,6 @@ import org.apache.polygene.library.constraints.annotation.NotEmpty; public class NotEmptyCollectionConstraint implements Constraint<NotEmpty, Collection> { - - private static final long serialVersionUID = 1L; - @Override public boolean isValid( NotEmpty annotation, Collection value ) { http://git-wip-us.apache.org/repos/asf/polygene-java/blob/931c2eeb/libraries/constraints/src/main/java/org/apache/polygene/library/constraints/OneOfConstraint.java ---------------------------------------------------------------------- diff --git a/libraries/constraints/src/main/java/org/apache/polygene/library/constraints/OneOfConstraint.java b/libraries/constraints/src/main/java/org/apache/polygene/library/constraints/OneOfConstraint.java index 0ad80df..4adce88 100644 --- a/libraries/constraints/src/main/java/org/apache/polygene/library/constraints/OneOfConstraint.java +++ b/libraries/constraints/src/main/java/org/apache/polygene/library/constraints/OneOfConstraint.java @@ -28,9 +28,6 @@ import org.apache.polygene.library.constraints.annotation.OneOf; public class OneOfConstraint implements Constraint<OneOf, String> { - - private static final long serialVersionUID = 1L; - @Override public boolean isValid( OneOf oneOf, String value ) { http://git-wip-us.apache.org/repos/asf/polygene-java/blob/931c2eeb/libraries/constraints/src/main/java/org/apache/polygene/library/constraints/RangeConstraint.java ---------------------------------------------------------------------- diff --git a/libraries/constraints/src/main/java/org/apache/polygene/library/constraints/RangeConstraint.java b/libraries/constraints/src/main/java/org/apache/polygene/library/constraints/RangeConstraint.java index 574b63d..4a7d02d 100644 --- a/libraries/constraints/src/main/java/org/apache/polygene/library/constraints/RangeConstraint.java +++ b/libraries/constraints/src/main/java/org/apache/polygene/library/constraints/RangeConstraint.java @@ -28,9 +28,6 @@ import org.apache.polygene.library.constraints.annotation.Range; public class RangeConstraint implements Constraint<Range, Number> { - - private static final long serialVersionUID = 1L; - @Override public boolean isValid( Range range, Number argument ) { http://git-wip-us.apache.org/repos/asf/polygene-java/blob/931c2eeb/libraries/constraints/src/main/java/org/apache/polygene/library/constraints/URIConstraint.java ---------------------------------------------------------------------- diff --git a/libraries/constraints/src/main/java/org/apache/polygene/library/constraints/URIConstraint.java b/libraries/constraints/src/main/java/org/apache/polygene/library/constraints/URIConstraint.java index 05bbb6e..6ff0f88 100644 --- a/libraries/constraints/src/main/java/org/apache/polygene/library/constraints/URIConstraint.java +++ b/libraries/constraints/src/main/java/org/apache/polygene/library/constraints/URIConstraint.java @@ -26,9 +26,6 @@ import org.apache.polygene.library.constraints.annotation.URI; public class URIConstraint implements Constraint<URI, String> { - - private static final long serialVersionUID = 1L; - @Override @SuppressWarnings( "ResultOfObjectAllocationIgnored" ) public boolean isValid( URI annotation, String value ) @@ -43,5 +40,4 @@ public class URIConstraint return false; } } - } http://git-wip-us.apache.org/repos/asf/polygene-java/blob/931c2eeb/libraries/constraints/src/main/java/org/apache/polygene/library/constraints/URLConstraint.java ---------------------------------------------------------------------- diff --git a/libraries/constraints/src/main/java/org/apache/polygene/library/constraints/URLConstraint.java b/libraries/constraints/src/main/java/org/apache/polygene/library/constraints/URLConstraint.java index 890ba1d..2e7d08c 100644 --- a/libraries/constraints/src/main/java/org/apache/polygene/library/constraints/URLConstraint.java +++ b/libraries/constraints/src/main/java/org/apache/polygene/library/constraints/URLConstraint.java @@ -26,9 +26,6 @@ import org.apache.polygene.library.constraints.annotation.URL; public class URLConstraint implements Constraint<URL, String> { - - private static final long serialVersionUID = 1L; - @Override @SuppressWarnings( "ResultOfObjectAllocationIgnored" ) public boolean isValid( URL annotation, String value ) @@ -43,5 +40,4 @@ public class URLConstraint return false; } } - } http://git-wip-us.apache.org/repos/asf/polygene-java/blob/931c2eeb/libraries/http/src/main/java/org/apache/polygene/library/http/ConstraintInfo.java ---------------------------------------------------------------------- diff --git a/libraries/http/src/main/java/org/apache/polygene/library/http/ConstraintInfo.java b/libraries/http/src/main/java/org/apache/polygene/library/http/ConstraintInfo.java index 77229a2..0f1b7eb 100644 --- a/libraries/http/src/main/java/org/apache/polygene/library/http/ConstraintInfo.java +++ b/libraries/http/src/main/java/org/apache/polygene/library/http/ConstraintInfo.java @@ -24,12 +24,13 @@ import java.io.Serializable; public class ConstraintInfo implements Serializable { + private static final long serialVersionUID = 1L; - public static enum Constraint + public enum Constraint { } - public static enum HttpMethod + public enum HttpMethod { GET, POST, HEAD, PUT, OPTIONS, TRACE, DELETE; http://git-wip-us.apache.org/repos/asf/polygene-java/blob/931c2eeb/libraries/http/src/main/java/org/apache/polygene/library/http/ContextListenerInfo.java ---------------------------------------------------------------------- diff --git a/libraries/http/src/main/java/org/apache/polygene/library/http/ContextListenerInfo.java b/libraries/http/src/main/java/org/apache/polygene/library/http/ContextListenerInfo.java index c683fce..4a01bcd 100644 --- a/libraries/http/src/main/java/org/apache/polygene/library/http/ContextListenerInfo.java +++ b/libraries/http/src/main/java/org/apache/polygene/library/http/ContextListenerInfo.java @@ -25,7 +25,6 @@ import java.util.Map; public class ContextListenerInfo implements Serializable { - private static final long serialVersionUID = 1L; private final Map<String, String> initParams; @@ -39,5 +38,4 @@ public class ContextListenerInfo { return initParams; } - } http://git-wip-us.apache.org/repos/asf/polygene-java/blob/931c2eeb/libraries/http/src/test/java/org/apache/polygene/library/http/HelloWorldServlet.java ---------------------------------------------------------------------- diff --git a/libraries/http/src/test/java/org/apache/polygene/library/http/HelloWorldServlet.java b/libraries/http/src/test/java/org/apache/polygene/library/http/HelloWorldServlet.java index 50818d5..3ddfef8 100644 --- a/libraries/http/src/test/java/org/apache/polygene/library/http/HelloWorldServlet.java +++ b/libraries/http/src/test/java/org/apache/polygene/library/http/HelloWorldServlet.java @@ -30,7 +30,6 @@ import javax.servlet.http.HttpServletResponse; public class HelloWorldServlet extends HttpServlet { - private static final long serialVersionUID = 1L; @Override @@ -45,5 +44,4 @@ public class HelloWorldServlet writer.append( "Hello World" ); } } - } http://git-wip-us.apache.org/repos/asf/polygene-java/blob/931c2eeb/libraries/logging/src/main/java/org/apache/polygene/library/logging/debug/Debug.java ---------------------------------------------------------------------- diff --git a/libraries/logging/src/main/java/org/apache/polygene/library/logging/debug/Debug.java b/libraries/logging/src/main/java/org/apache/polygene/library/logging/debug/Debug.java index 50116fb..77fcf70 100644 --- a/libraries/logging/src/main/java/org/apache/polygene/library/logging/debug/Debug.java +++ b/libraries/logging/src/main/java/org/apache/polygene/library/logging/debug/Debug.java @@ -20,7 +20,6 @@ package org.apache.polygene.library.logging.debug; -import java.io.Serializable; import org.apache.polygene.api.concern.Concerns; import org.apache.polygene.api.mixin.Mixins; import org.apache.polygene.api.mixin.NoopMixin; @@ -40,10 +39,10 @@ public interface Debug void debug( int level, String message ); - void debug( int level, String message, Serializable param1 ); + void debug( int level, String message, Object param1 ); - void debug( int level, String message, Serializable param1, Serializable param2 ); + void debug( int level, String message, Object param1, Object param2 ); - void debug( int level, String message, Serializable... params ); + void debug( int level, String message, Object... params ); } http://git-wip-us.apache.org/repos/asf/polygene-java/blob/931c2eeb/libraries/logging/src/main/java/org/apache/polygene/library/logging/debug/DebugConcern.java ---------------------------------------------------------------------- diff --git a/libraries/logging/src/main/java/org/apache/polygene/library/logging/debug/DebugConcern.java b/libraries/logging/src/main/java/org/apache/polygene/library/logging/debug/DebugConcern.java index 5355aa8..261c640 100644 --- a/libraries/logging/src/main/java/org/apache/polygene/library/logging/debug/DebugConcern.java +++ b/libraries/logging/src/main/java/org/apache/polygene/library/logging/debug/DebugConcern.java @@ -20,7 +20,6 @@ package org.apache.polygene.library.logging.debug; -import java.io.Serializable; import org.apache.polygene.api.PolygeneAPI; import org.apache.polygene.api.common.Optional; import org.apache.polygene.api.composite.Composite; @@ -61,7 +60,7 @@ public class DebugConcern } @Override - public void debug( int priority, String message, Serializable param1 ) + public void debug( int priority, String message, Object param1 ) { if( loggingService == null ) { @@ -74,7 +73,7 @@ public class DebugConcern } @Override - public void debug( int priority, String message, Serializable param1, Serializable param2 ) + public void debug( int priority, String message, Object param1, Object param2 ) { if( loggingService == null ) { @@ -87,7 +86,7 @@ public class DebugConcern } @Override - public void debug( int priority, String message, Serializable... params ) + public void debug( int priority, String message, Object... params ) { if( loggingService == null ) { http://git-wip-us.apache.org/repos/asf/polygene-java/blob/931c2eeb/libraries/logging/src/main/java/org/apache/polygene/library/logging/debug/records/DebugRecord.java ---------------------------------------------------------------------- diff --git a/libraries/logging/src/main/java/org/apache/polygene/library/logging/debug/records/DebugRecord.java b/libraries/logging/src/main/java/org/apache/polygene/library/logging/debug/records/DebugRecord.java index abc6c9e..e776cf3 100644 --- a/libraries/logging/src/main/java/org/apache/polygene/library/logging/debug/records/DebugRecord.java +++ b/libraries/logging/src/main/java/org/apache/polygene/library/logging/debug/records/DebugRecord.java @@ -20,7 +20,6 @@ package org.apache.polygene.library.logging.debug.records; -import java.io.Serializable; import java.time.Instant; import java.util.List; import org.apache.polygene.api.property.Property; @@ -35,5 +34,5 @@ public interface DebugRecord Property<Instant> time(); - Property<List<Serializable>> parameters(); + Property<List<Object>> parameters(); } http://git-wip-us.apache.org/repos/asf/polygene-java/blob/931c2eeb/libraries/logging/src/main/java/org/apache/polygene/library/logging/debug/service/DebugOnConsoleSideEffect.java ---------------------------------------------------------------------- diff --git a/libraries/logging/src/main/java/org/apache/polygene/library/logging/debug/service/DebugOnConsoleSideEffect.java b/libraries/logging/src/main/java/org/apache/polygene/library/logging/debug/service/DebugOnConsoleSideEffect.java index 3b921bb..fb2e408 100644 --- a/libraries/logging/src/main/java/org/apache/polygene/library/logging/debug/service/DebugOnConsoleSideEffect.java +++ b/libraries/logging/src/main/java/org/apache/polygene/library/logging/debug/service/DebugOnConsoleSideEffect.java @@ -21,7 +21,6 @@ package org.apache.polygene.library.logging.debug.service; import java.io.PrintStream; -import java.io.Serializable; import java.lang.reflect.Method; import java.text.MessageFormat; import java.util.ResourceBundle; @@ -67,7 +66,7 @@ public class DebugOnConsoleSideEffect extends SideEffectOf<LoggingService> } @Override - public void debug( Composite composite, String message, Serializable param1 ) + public void debug( Composite composite, String message, Object param1 ) { String localized = bundle.getString( message ); String formatted = MessageFormat.format( localized, param1 ); @@ -79,7 +78,7 @@ public class DebugOnConsoleSideEffect extends SideEffectOf<LoggingService> } @Override - public void debug( Composite composite, String message, Serializable param1, Serializable param2 ) + public void debug( Composite composite, String message, Object param1, Object param2 ) { String localized = bundle.getString( message ); String formatted = MessageFormat.format( localized, param1, param2 ); @@ -91,10 +90,10 @@ public class DebugOnConsoleSideEffect extends SideEffectOf<LoggingService> } @Override - public void debug( Composite composite, String message, Serializable... params ) + public void debug( Composite composite, String message, Object... params ) { String localized = bundle.getString( message ); - String formatted = MessageFormat.format( localized, (Serializable) params ); + String formatted = MessageFormat.format( localized, (Object) params ); OUT.println( "DEBUG:" + getCompositeName( composite ) + ": " + formatted ); if( params[ 0 ] instanceof Throwable ) { http://git-wip-us.apache.org/repos/asf/polygene-java/blob/931c2eeb/libraries/logging/src/main/java/org/apache/polygene/library/logging/debug/service/DebuggingService.java ---------------------------------------------------------------------- diff --git a/libraries/logging/src/main/java/org/apache/polygene/library/logging/debug/service/DebuggingService.java b/libraries/logging/src/main/java/org/apache/polygene/library/logging/debug/service/DebuggingService.java index 2ab98f9..9828450 100644 --- a/libraries/logging/src/main/java/org/apache/polygene/library/logging/debug/service/DebuggingService.java +++ b/libraries/logging/src/main/java/org/apache/polygene/library/logging/debug/service/DebuggingService.java @@ -20,7 +20,6 @@ package org.apache.polygene.library.logging.debug.service; -import java.io.Serializable; import org.apache.polygene.api.composite.Composite; public interface DebuggingService @@ -29,9 +28,9 @@ public interface DebuggingService void debug( Composite composite, String message ); - void debug( Composite composite, String message, Serializable param1 ); + void debug( Composite composite, String message, Object param1 ); - void debug( Composite composite, String message, Serializable param1, Serializable param2 ); + void debug( Composite composite, String message, Object param1, Object param2 ); - void debug( Composite composite, String message, Serializable... params ); + void debug( Composite composite, String message, Object... params ); } http://git-wip-us.apache.org/repos/asf/polygene-java/blob/931c2eeb/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 5da236f..f56aeb3 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 @@ -20,7 +20,6 @@ package org.apache.polygene.library.logging.debug.service; -import java.io.Serializable; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -60,7 +59,7 @@ public class DebuggingServiceMixin UnitOfWork uow = uowf.newUnitOfWork(); try { - List<Serializable> paramsList = new ArrayList<Serializable>(); + List<Object> paramsList = new ArrayList<>(); createDebugRecord( uow, composite, message, paramsList ); uow.complete(); } @@ -75,12 +74,12 @@ public class DebuggingServiceMixin } @Override - public void debug( Composite composite, String message, Serializable param1 ) + public void debug( Composite composite, String message, Object param1 ) { UnitOfWork uow = uowf.newUnitOfWork(); try { - List<Serializable> paramsList = new ArrayList<Serializable>(); + List<Object> paramsList = new ArrayList<>(); paramsList.add( param1 ); createDebugRecord( uow, composite, message, paramsList ); uow.complete(); @@ -96,12 +95,12 @@ public class DebuggingServiceMixin } @Override - public void debug( Composite composite, String message, Serializable param1, Serializable param2 ) + public void debug( Composite composite, String message, Object param1, Object param2 ) { UnitOfWork uow = uowf.newUnitOfWork(); try { - List<Serializable> paramsList = new ArrayList<Serializable>(); + List<Object> paramsList = new ArrayList<>(); paramsList.add( param1 ); paramsList.add( param2 ); createDebugRecord( uow, composite, message, paramsList ); @@ -118,12 +117,12 @@ public class DebuggingServiceMixin } @Override - public void debug( Composite composite, String message, Serializable... params ) + public void debug( Composite composite, String message, Object... params ) { UnitOfWork uow = uowf.newUnitOfWork(); try { - List<Serializable> paramsList = new ArrayList<Serializable>( Arrays.asList( params ) ); + List<Object> paramsList = new ArrayList<Object>( Arrays.asList( params ) ); createDebugRecord( uow, composite, message, paramsList ); uow.complete(); } @@ -137,7 +136,7 @@ public class DebuggingServiceMixin } } - private void createDebugRecord( UnitOfWork uow, Composite composite, String message, List<Serializable> params ) + private void createDebugRecord( UnitOfWork uow, Composite composite, String message, List<Object> params ) { if( composite instanceof ServiceComposite ) { @@ -165,7 +164,7 @@ public class DebuggingServiceMixin } } - private void setStandardStuff( Composite composite, String message, DebugRecord state, List<Serializable> params ) + private void setStandardStuff( Composite composite, String message, DebugRecord state, List<Object> params ) { state.time().set( SystemTime.now() ); state.message().set( message ); http://git-wip-us.apache.org/repos/asf/polygene-java/blob/931c2eeb/libraries/logging/src/main/java/org/apache/polygene/library/logging/log/CategoryLog.java ---------------------------------------------------------------------- diff --git a/libraries/logging/src/main/java/org/apache/polygene/library/logging/log/CategoryLog.java b/libraries/logging/src/main/java/org/apache/polygene/library/logging/log/CategoryLog.java index 844d961..257dc25 100644 --- a/libraries/logging/src/main/java/org/apache/polygene/library/logging/log/CategoryLog.java +++ b/libraries/logging/src/main/java/org/apache/polygene/library/logging/log/CategoryLog.java @@ -19,7 +19,6 @@ */ package org.apache.polygene.library.logging.log; -import java.io.Serializable; import org.apache.polygene.api.concern.Concerns; import org.apache.polygene.api.mixin.Mixins; @@ -29,27 +28,27 @@ public interface CategoryLog { void info( String category, String message ); - void info( String category, String message, Serializable param1 ); + void info( String category, String message, Object param1 ); - void info( String category, String message, Serializable param1, Serializable param2 ); + void info( String category, String message, Object param1, Object param2 ); - void info( String category, String message, Serializable... params ); + void info( String category, String message, Object... params ); void warning( String category, String message ); - void warning( String category, String message, Serializable param1 ); + void warning( String category, String message, Object param1 ); - void warning( String category, String message, Serializable param1, Serializable param2 ); + void warning( String category, String message, Object param1, Object param2 ); - void warning( String category, String message, Serializable... params ); + void warning( String category, String message, Object... params ); void error( String category, String message ); - void error( String category, String message, Serializable param1 ); + void error( String category, String message, Object param1 ); - void error( String category, String message, Serializable param1, Serializable param2 ); + void error( String category, String message, Object param1, Object param2 ); - void error( String category, String message, Serializable... params ); + void error( String category, String message, Object... params ); } http://git-wip-us.apache.org/repos/asf/polygene-java/blob/931c2eeb/libraries/logging/src/main/java/org/apache/polygene/library/logging/log/CategoryLogConcern.java ---------------------------------------------------------------------- diff --git a/libraries/logging/src/main/java/org/apache/polygene/library/logging/log/CategoryLogConcern.java b/libraries/logging/src/main/java/org/apache/polygene/library/logging/log/CategoryLogConcern.java index 440dbc3..5fe20d2 100644 --- a/libraries/logging/src/main/java/org/apache/polygene/library/logging/log/CategoryLogConcern.java +++ b/libraries/logging/src/main/java/org/apache/polygene/library/logging/log/CategoryLogConcern.java @@ -19,7 +19,6 @@ */ package org.apache.polygene.library.logging.log; -import java.io.Serializable; import org.apache.polygene.api.PolygeneAPI; import org.apache.polygene.api.common.Optional; import org.apache.polygene.api.composite.Composite; @@ -51,7 +50,7 @@ public final class CategoryLogConcern } @Override - public void info( String category, String message, Serializable param1 ) + public void info( String category, String message, Object param1 ) { if( loggingService == null ) { @@ -61,7 +60,7 @@ public final class CategoryLogConcern } @Override - public void info( String category, String message, Serializable param1, Serializable param2 ) + public void info( String category, String message, Object param1, Object param2 ) { if( loggingService == null ) { @@ -71,7 +70,7 @@ public final class CategoryLogConcern } @Override - public void info( String category, String message, Serializable... params ) + public void info( String category, String message, Object... params ) { if( loggingService == null ) { @@ -91,7 +90,7 @@ public final class CategoryLogConcern } @Override - public void warning( String category, String message, Serializable param1 ) + public void warning( String category, String message, Object param1 ) { if( loggingService == null ) { @@ -101,7 +100,7 @@ public final class CategoryLogConcern } @Override - public void warning( String category, String message, Serializable param1, Serializable param2 ) + public void warning( String category, String message, Object param1, Object param2 ) { if( loggingService == null ) { @@ -111,7 +110,7 @@ public final class CategoryLogConcern } @Override - public void warning( String category, String message, Serializable... params ) + public void warning( String category, String message, Object... params ) { if( loggingService == null ) { @@ -131,7 +130,7 @@ public final class CategoryLogConcern } @Override - public void error( String category, String message, Serializable param1 ) + public void error( String category, String message, Object param1 ) { if( loggingService == null ) { @@ -141,7 +140,7 @@ public final class CategoryLogConcern } @Override - public void error( String category, String message, Serializable param1, Serializable param2 ) + public void error( String category, String message, Object param1, Object param2 ) { if( loggingService == null ) { @@ -151,7 +150,7 @@ public final class CategoryLogConcern } @Override - public void error( String category, String message, Serializable... params ) + public void error( String category, String message, Object... params ) { if( loggingService == null ) { http://git-wip-us.apache.org/repos/asf/polygene-java/blob/931c2eeb/libraries/logging/src/main/java/org/apache/polygene/library/logging/log/CategoryLogMixin.java ---------------------------------------------------------------------- diff --git a/libraries/logging/src/main/java/org/apache/polygene/library/logging/log/CategoryLogMixin.java b/libraries/logging/src/main/java/org/apache/polygene/library/logging/log/CategoryLogMixin.java index 061c6d1..a8a2171 100644 --- a/libraries/logging/src/main/java/org/apache/polygene/library/logging/log/CategoryLogMixin.java +++ b/libraries/logging/src/main/java/org/apache/polygene/library/logging/log/CategoryLogMixin.java @@ -20,8 +20,6 @@ package org.apache.polygene.library.logging.log; -import java.io.Serializable; - public class CategoryLogMixin implements CategoryLog { @@ -31,17 +29,17 @@ public class CategoryLogMixin } @Override - public void info( String category, String message, Serializable param1 ) + public void info( String category, String message, Object param1 ) { } @Override - public void info( String category, String message, Serializable param1, Serializable param2 ) + public void info( String category, String message, Object param1, Object param2 ) { } @Override - public void info( String category, String message, Serializable... params ) + public void info( String category, String message, Object... params ) { } @@ -51,17 +49,17 @@ public class CategoryLogMixin } @Override - public void warning( String category, String message, Serializable param1 ) + public void warning( String category, String message, Object param1 ) { } @Override - public void warning( String category, String message, Serializable param1, Serializable param2 ) + public void warning( String category, String message, Object param1, Object param2 ) { } @Override - public void warning( String category, String message, Serializable... params ) + public void warning( String category, String message, Object... params ) { } @@ -71,17 +69,17 @@ public class CategoryLogMixin } @Override - public void error( String category, String message, Serializable param1 ) + public void error( String category, String message, Object param1 ) { } @Override - public void error( String category, String message, Serializable param1, Serializable param2 ) + public void error( String category, String message, Object param1, Object param2 ) { } @Override - public void error( String category, String message, Serializable... params ) + public void error( String category, String message, Object... params ) { } } http://git-wip-us.apache.org/repos/asf/polygene-java/blob/931c2eeb/libraries/logging/src/main/java/org/apache/polygene/library/logging/log/SimpleLog.java ---------------------------------------------------------------------- diff --git a/libraries/logging/src/main/java/org/apache/polygene/library/logging/log/SimpleLog.java b/libraries/logging/src/main/java/org/apache/polygene/library/logging/log/SimpleLog.java index 7e33fdd..c3738b8 100644 --- a/libraries/logging/src/main/java/org/apache/polygene/library/logging/log/SimpleLog.java +++ b/libraries/logging/src/main/java/org/apache/polygene/library/logging/log/SimpleLog.java @@ -19,7 +19,6 @@ */ package org.apache.polygene.library.logging.log; -import java.io.Serializable; import org.apache.polygene.api.concern.Concerns; @Concerns( { SimpleLogConcern.class } ) @@ -27,27 +26,27 @@ public interface SimpleLog { void info( String message ); - void info( String message, Serializable param1 ); + void info( String message, Object param1 ); - void info( String message, Serializable param1, Serializable param2 ); + void info( String message, Object param1, Object param2 ); - void info( String message, Serializable... params ); + void info( String message, Object... params ); void warning( String message ); - void warning( String message, Serializable param1 ); + void warning( String message, Object param1 ); - void warning( String message, Serializable param1, Serializable param2 ); + void warning( String message, Object param1, Object param2 ); - void warning( String message, Serializable... params ); + void warning( String message, Object... params ); void error( String message ); - void error( String message, Serializable param1 ); + void error( String message, Object param1 ); - void error( String message, Serializable param1, Serializable param2 ); + void error( String message, Object param1, Object param2 ); - void error( String message, Serializable... params ); + void error( String message, Object... params ); } http://git-wip-us.apache.org/repos/asf/polygene-java/blob/931c2eeb/libraries/logging/src/main/java/org/apache/polygene/library/logging/log/SimpleLogConcern.java ---------------------------------------------------------------------- diff --git a/libraries/logging/src/main/java/org/apache/polygene/library/logging/log/SimpleLogConcern.java b/libraries/logging/src/main/java/org/apache/polygene/library/logging/log/SimpleLogConcern.java index 0b4f4c4..0b6601a 100644 --- a/libraries/logging/src/main/java/org/apache/polygene/library/logging/log/SimpleLogConcern.java +++ b/libraries/logging/src/main/java/org/apache/polygene/library/logging/log/SimpleLogConcern.java @@ -19,7 +19,6 @@ */ package org.apache.polygene.library.logging.log; -import java.io.Serializable; import org.apache.polygene.api.PolygeneAPI; import org.apache.polygene.api.common.Optional; import org.apache.polygene.api.composite.Composite; @@ -57,7 +56,7 @@ public final class SimpleLogConcern } @Override - public void info( String message, Serializable param1 ) + public void info( String message, Object param1 ) { if( loggingService == null ) { @@ -67,7 +66,7 @@ public final class SimpleLogConcern } @Override - public void info( String message, Serializable param1, Serializable param2 ) + public void info( String message, Object param1, Object param2 ) { if( loggingService == null ) { @@ -77,7 +76,7 @@ public final class SimpleLogConcern } @Override - public void info( String message, Serializable... params ) + public void info( String message, Object... params ) { if( loggingService == null ) { @@ -97,7 +96,7 @@ public final class SimpleLogConcern } @Override - public void warning( String message, Serializable param1 ) + public void warning( String message, Object param1 ) { if( loggingService == null ) { @@ -107,7 +106,7 @@ public final class SimpleLogConcern } @Override - public void warning( String message, Serializable param1, Serializable param2 ) + public void warning( String message, Object param1, Object param2 ) { if( loggingService == null ) { @@ -117,7 +116,7 @@ public final class SimpleLogConcern } @Override - public void warning( String message, Serializable... params ) + public void warning( String message, Object... params ) { if( loggingService == null ) { @@ -137,7 +136,7 @@ public final class SimpleLogConcern } @Override - public void error( String message, Serializable param1 ) + public void error( String message, Object param1 ) { if( loggingService == null ) { @@ -147,7 +146,7 @@ public final class SimpleLogConcern } @Override - public void error( String message, Serializable param1, Serializable param2 ) + public void error( String message, Object param1, Object param2 ) { if( loggingService == null ) { @@ -157,7 +156,7 @@ public final class SimpleLogConcern } @Override - public void error( String message, Serializable... params ) + public void error( String message, Object... params ) { if( loggingService == null ) { http://git-wip-us.apache.org/repos/asf/polygene-java/blob/931c2eeb/libraries/logging/src/main/java/org/apache/polygene/library/logging/log/StandardLog.java ---------------------------------------------------------------------- diff --git a/libraries/logging/src/main/java/org/apache/polygene/library/logging/log/StandardLog.java b/libraries/logging/src/main/java/org/apache/polygene/library/logging/log/StandardLog.java index 8d9db8b..24654c8 100644 --- a/libraries/logging/src/main/java/org/apache/polygene/library/logging/log/StandardLog.java +++ b/libraries/logging/src/main/java/org/apache/polygene/library/logging/log/StandardLog.java @@ -19,7 +19,6 @@ */ package org.apache.polygene.library.logging.log; -import java.io.Serializable; import org.apache.polygene.api.concern.Concerns; @Concerns( StandardLogConcern.class ) @@ -27,10 +26,10 @@ public interface StandardLog { void log( LogType type, String category, String message ); - void log( LogType type, String category, String message, Serializable param1 ); + void log( LogType type, String category, String message, Object param1 ); - void log( LogType type, String category, String message, Serializable param1, Serializable param2 ); + void log( LogType type, String category, String message, Object param1, Object param2 ); - void log( LogType type, String category, String message, Serializable... params ); + void log( LogType type, String category, String message, Object... params ); } http://git-wip-us.apache.org/repos/asf/polygene-java/blob/931c2eeb/libraries/logging/src/main/java/org/apache/polygene/library/logging/log/StandardLogConcern.java ---------------------------------------------------------------------- diff --git a/libraries/logging/src/main/java/org/apache/polygene/library/logging/log/StandardLogConcern.java b/libraries/logging/src/main/java/org/apache/polygene/library/logging/log/StandardLogConcern.java index a1c3556..5000216 100644 --- a/libraries/logging/src/main/java/org/apache/polygene/library/logging/log/StandardLogConcern.java +++ b/libraries/logging/src/main/java/org/apache/polygene/library/logging/log/StandardLogConcern.java @@ -20,7 +20,6 @@ package org.apache.polygene.library.logging.log; -import java.io.Serializable; import org.apache.polygene.api.PolygeneAPI; import org.apache.polygene.api.common.Optional; import org.apache.polygene.api.composite.Composite; @@ -47,7 +46,7 @@ public class StandardLogConcern } @Override - public void log( LogType type, String category, String message, Serializable param1 ) + public void log( LogType type, String category, String message, Object param1 ) { if( loggingService == null ) { @@ -57,7 +56,7 @@ public class StandardLogConcern } @Override - public void log( LogType type, String category, String message, Serializable param1, Serializable param2 ) + public void log( LogType type, String category, String message, Object param1, Object param2 ) { if( loggingService == null ) { @@ -67,7 +66,7 @@ public class StandardLogConcern } @Override - public void log( LogType type, String category, String message, Serializable... params ) + public void log( LogType type, String category, String message, Object... params ) { if( loggingService == null ) { http://git-wip-us.apache.org/repos/asf/polygene-java/blob/931c2eeb/libraries/logging/src/main/java/org/apache/polygene/library/logging/log/records/LogRecord.java ---------------------------------------------------------------------- diff --git a/libraries/logging/src/main/java/org/apache/polygene/library/logging/log/records/LogRecord.java b/libraries/logging/src/main/java/org/apache/polygene/library/logging/log/records/LogRecord.java index cc2dad3..0df27ed 100644 --- a/libraries/logging/src/main/java/org/apache/polygene/library/logging/log/records/LogRecord.java +++ b/libraries/logging/src/main/java/org/apache/polygene/library/logging/log/records/LogRecord.java @@ -19,7 +19,6 @@ */ package org.apache.polygene.library.logging.log.records; -import java.io.Serializable; import java.time.Instant; import java.util.List; import org.apache.polygene.api.property.Property; @@ -39,5 +38,5 @@ public interface LogRecord Property<Instant> time(); - Property<List<Serializable>> parameters(); + Property<List<Object>> parameters(); } http://git-wip-us.apache.org/repos/asf/polygene-java/blob/931c2eeb/libraries/logging/src/main/java/org/apache/polygene/library/logging/log/service/LoggingService.java ---------------------------------------------------------------------- diff --git a/libraries/logging/src/main/java/org/apache/polygene/library/logging/log/service/LoggingService.java b/libraries/logging/src/main/java/org/apache/polygene/library/logging/log/service/LoggingService.java index 1deda96..5072f55 100644 --- a/libraries/logging/src/main/java/org/apache/polygene/library/logging/log/service/LoggingService.java +++ b/libraries/logging/src/main/java/org/apache/polygene/library/logging/log/service/LoggingService.java @@ -20,11 +20,10 @@ package org.apache.polygene.library.logging.log.service; -import java.io.Serializable; import org.apache.polygene.api.composite.Composite; import org.apache.polygene.library.logging.log.LogType; public interface LoggingService { - void log( LogType type, Composite composite, String category, String message, Serializable... params ); + void log( LogType type, Composite composite, String category, String message, Object... params ); } http://git-wip-us.apache.org/repos/asf/polygene-java/blob/931c2eeb/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 af3c122..797e2e9 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 @@ -20,7 +20,6 @@ package org.apache.polygene.library.logging.log.service; -import java.io.Serializable; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -52,7 +51,7 @@ public abstract class LoggingServiceMixin UnitOfWork uow = uowf.newUnitOfWork(); try { - List<Serializable> paramsList = new ArrayList<Serializable>(); + List<Object> paramsList = new ArrayList<Object>(); createLogRecord( uow, type, composite, category, message, paramsList ); uow.complete(); } @@ -66,12 +65,12 @@ public abstract class LoggingServiceMixin } } - public void log( LogType type, Composite composite, String category, String message, Serializable param1 ) + public void log( LogType type, Composite composite, String category, String message, Object param1 ) { UnitOfWork uow = uowf.newUnitOfWork(); try { - List<Serializable> paramsList = new ArrayList<Serializable>(); + List<Object> paramsList = new ArrayList<Object>(); paramsList.add( param1 ); createLogRecord( uow, type, composite, category, message, paramsList ); uow.complete(); @@ -86,12 +85,12 @@ public abstract class LoggingServiceMixin } } - public void log( LogType type, Composite composite, String category, String message, Serializable param1, Serializable param2 ) + public void log( LogType type, Composite composite, String category, String message, Object param1, Object param2 ) { UnitOfWork uow = uowf.newUnitOfWork(); try { - List<Serializable> paramsList = new ArrayList<Serializable>(); + List<Object> paramsList = new ArrayList<Object>(); paramsList.add( param1 ); paramsList.add( param2 ); createLogRecord( uow, type, composite, category, message, paramsList ); @@ -108,12 +107,12 @@ public abstract class LoggingServiceMixin } @Override - public void log( LogType type, Composite composite, String category, String message, Serializable... params ) + public void log( LogType type, Composite composite, String category, String message, Object... params ) { UnitOfWork uow = uowf.newUnitOfWork(); try { - List<Serializable> paramsList = new ArrayList<Serializable>( Arrays.asList( params ) ); + List<Object> paramsList = new ArrayList<Object>( Arrays.asList( params ) ); createLogRecord( uow, type, composite, category, message, paramsList ); uow.complete(); } @@ -127,7 +126,7 @@ public abstract class LoggingServiceMixin } } - private void createLogRecord( UnitOfWork uow, LogType type, Composite composite, String category, String message, List<Serializable> params ) + private void createLogRecord( UnitOfWork uow, LogType type, Composite composite, String category, String message, List<Object> params ) { if( composite instanceof ServiceComposite ) { @@ -156,7 +155,7 @@ public abstract class LoggingServiceMixin } private void setStandardStuff( LogType type, Composite composite, String category, String message, - LogRecord state, List<Serializable> params ) + LogRecord state, List<Object> params ) { state.logtype().set( type ); state.time().set( SystemTime.now() ); http://git-wip-us.apache.org/repos/asf/polygene-java/blob/931c2eeb/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/PolygeneServerServlet.java ---------------------------------------------------------------------- diff --git a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/PolygeneServerServlet.java b/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/PolygeneServerServlet.java index 27080d8..ce5cf03 100644 --- a/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/PolygeneServerServlet.java +++ b/libraries/restlet/src/main/java/org/apache/polygene/library/restlet/PolygeneServerServlet.java @@ -20,7 +20,6 @@ package org.apache.polygene.library.restlet; import javax.servlet.Servlet; - import org.apache.polygene.api.injection.scope.Structure; import org.apache.polygene.api.mixin.Mixins; import org.apache.polygene.api.structure.Module; @@ -36,8 +35,6 @@ public interface PolygeneServerServlet extends Servlet class Mixin extends ServerServlet { - private static final long serialVersionUID = 1L; - @Structure private Module module;
