Repository: polygene-java Updated Branches: refs/heads/develop 0cf199bc0 -> f3890ed75
Refine InvalidCompositeException Clear the ThreadLocal to prevent hard to track errors Fix typos in method names Fix usages of Collectors.joining() Remove unused imports Reformat lines > 120 Project: http://git-wip-us.apache.org/repos/asf/polygene-java/repo Commit: http://git-wip-us.apache.org/repos/asf/polygene-java/commit/f3890ed7 Tree: http://git-wip-us.apache.org/repos/asf/polygene-java/tree/f3890ed7 Diff: http://git-wip-us.apache.org/repos/asf/polygene-java/diff/f3890ed7 Branch: refs/heads/develop Commit: f3890ed7530146bc7d19bd557ced992503f896e1 Parents: 0cf199b Author: Paul Merlin <[email protected]> Authored: Sat Apr 8 17:22:04 2017 +0200 Committer: Paul Merlin <[email protected]> Committed: Sat Apr 8 17:22:04 2017 +0200 ---------------------------------------------------------------------- .../composite/InvalidCompositeException.java | 30 +++++++++++++------- .../bootstrap/AssemblyReportException.java | 11 +++---- .../bootstrap/CompositeAssemblyImpl.java | 6 ++-- .../runtime/composite/CompositeModel.java | 5 ++-- .../runtime/composite/ConstructorsModel.java | 4 +-- .../TypedModifierInvocationHandler.java | 3 -- 6 files changed, 32 insertions(+), 27 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/polygene-java/blob/f3890ed7/core/api/src/main/java/org/apache/polygene/api/composite/InvalidCompositeException.java ---------------------------------------------------------------------- diff --git a/core/api/src/main/java/org/apache/polygene/api/composite/InvalidCompositeException.java b/core/api/src/main/java/org/apache/polygene/api/composite/InvalidCompositeException.java index 4f8b3e3..c7657b3 100644 --- a/core/api/src/main/java/org/apache/polygene/api/composite/InvalidCompositeException.java +++ b/core/api/src/main/java/org/apache/polygene/api/composite/InvalidCompositeException.java @@ -27,7 +27,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; -import org.apache.polygene.api.structure.Module; import org.apache.polygene.api.structure.ModuleDescriptor; /** @@ -44,9 +43,12 @@ public class InvalidCompositeException extends RuntimeException private Member member; private List<Class<?>> types; - public static void handleInvalidCompsiteType( String message, ModuleDescriptor module, Class<?> primaryType, Class<?> fragmentClass, Type valueType, Member member, List<Class<?>> types ) + public static void handleInvalidCompositeType( String message, ModuleDescriptor module, Class<?> primaryType, + Class<?> fragmentClass, Type valueType, Member member, + List<Class<?>> types ) { - InvalidCompositeException exception = new InvalidCompositeException( message, module, primaryType, fragmentClass, valueType, member, types ); + InvalidCompositeException exception = new InvalidCompositeException( message, module, primaryType, + fragmentClass, valueType, member, types ); if( aggregateProblems ) { report.get().add( exception ); @@ -55,7 +57,8 @@ public class InvalidCompositeException extends RuntimeException throw exception; } - private InvalidCompositeException( String message, ModuleDescriptor module, Class<?> primaryType, Class<?> fragmentClass, Type valueType, Member member, List<Class<?>> types ) + private InvalidCompositeException( String message, ModuleDescriptor module, Class<?> primaryType, + Class<?> fragmentClass, Type valueType, Member member, List<Class<?>> types ) { super( message ); this.module = module; @@ -75,7 +78,8 @@ public class InvalidCompositeException extends RuntimeException String message = super.getMessage() == null ? "" : " message: " + super.getMessage() + "\n"; String fragment = fragmentClass == null ? "" : " fragmentClass: " + fragmentClass.getName() + "\n"; String valueType = this.valueType == null ? "" : " valueType: " + this.valueType.getTypeName() + "\n"; - String module = this.module == null ? "" : " layer: " + this.module.layer().name() + "\n module: " + this.module.name() + "\n"; + String module = this.module == null ? "" : " layer: " + this.module.layer().name() + "\n module: " + + this.module.name() + "\n"; return message + module + primary + fragment + methodName + valueType + typeNames; } @@ -101,7 +105,9 @@ public class InvalidCompositeException extends RuntimeException if( member instanceof Method ) { Method method = (Method) member; - String parameters = Arrays.stream( method.getParameters() ).map( p -> p.getType().getSimpleName() + " " + p.getName() ).collect( Collectors.joining( ", ", "(", ")" ) ); + String parameters = Arrays.stream( method.getParameters() ) + .map( p -> p.getType().getSimpleName() + " " + p.getName() ) + .collect( Collectors.joining( ", ", "(", ")" ) ); return " method: " + method.getReturnType().getSimpleName() + " " + method.getName() + parameters + "\n"; } if( member instanceof Field ) @@ -116,11 +122,13 @@ public class InvalidCompositeException extends RuntimeException { if( report.get().size() > 0 ) { - return "\nComposition Problems Report:\n" - + report.get().stream() - .map( Throwable::getMessage ) - .map( m -> m + "\n--\n" ) - .collect( Collectors.joining( "" ) ); + String reportText = "\nComposition Problems Report:\n" + + report.get().stream() + .map( Throwable::getMessage ) + .map( m -> m + "\n--\n" ) + .collect( Collectors.joining() ); + report.set( new ArrayList<>() ); + return reportText; } aggregateProblems = false; return null; http://git-wip-us.apache.org/repos/asf/polygene-java/blob/f3890ed7/core/bootstrap/src/main/java/org/apache/polygene/bootstrap/AssemblyReportException.java ---------------------------------------------------------------------- diff --git a/core/bootstrap/src/main/java/org/apache/polygene/bootstrap/AssemblyReportException.java b/core/bootstrap/src/main/java/org/apache/polygene/bootstrap/AssemblyReportException.java index e4139bd..f3c933c 100644 --- a/core/bootstrap/src/main/java/org/apache/polygene/bootstrap/AssemblyReportException.java +++ b/core/bootstrap/src/main/java/org/apache/polygene/bootstrap/AssemblyReportException.java @@ -52,7 +52,7 @@ public class AssemblyReportException extends AssemblyException return message + problems.stream() .map( this::composeMessage ) .map( m -> m + "\n--\n" ) - .collect( Collectors.joining( "" ) ); + .collect( Collectors.joining() ); } public void attacheModelReport( String modelReport ) @@ -70,11 +70,12 @@ public class AssemblyReportException extends AssemblyException } else { - StringBuilder indent = new StringBuilder( ); - while( exception != null ){ + StringBuilder indent = new StringBuilder(); + while( exception != null ) + { indent = indent.append( " " ); - ps.println(indent.toString() + exception.getMessage()); - ps.println("---"); + ps.println( indent.toString() + exception.getMessage() ); + ps.println( "---" ); exception = exception.getCause(); } } http://git-wip-us.apache.org/repos/asf/polygene-java/blob/f3890ed7/core/runtime/src/main/java/org/apache/polygene/runtime/bootstrap/CompositeAssemblyImpl.java ---------------------------------------------------------------------- diff --git a/core/runtime/src/main/java/org/apache/polygene/runtime/bootstrap/CompositeAssemblyImpl.java b/core/runtime/src/main/java/org/apache/polygene/runtime/bootstrap/CompositeAssemblyImpl.java index 33b16b9..2c75e21 100644 --- a/core/runtime/src/main/java/org/apache/polygene/runtime/bootstrap/CompositeAssemblyImpl.java +++ b/core/runtime/src/main/java/org/apache/polygene/runtime/bootstrap/CompositeAssemblyImpl.java @@ -98,7 +98,7 @@ import org.apache.polygene.runtime.property.PropertiesModel; import org.apache.polygene.runtime.property.PropertyModel; import static java.util.stream.Stream.concat; -import static org.apache.polygene.api.composite.InvalidCompositeException.handleInvalidCompsiteType; +import static org.apache.polygene.api.composite.InvalidCompositeException.handleInvalidCompositeType; import static org.apache.polygene.api.util.Annotations.isType; import static org.apache.polygene.api.util.Annotations.typeHasAnnotation; import static org.apache.polygene.api.util.Classes.classHierarchy; @@ -330,7 +330,7 @@ public abstract class CompositeAssemblyImpl return implementMethodWithClass( method, mixinClass ); } - handleInvalidCompsiteType( "No implementation found for method ", null, null, null, null, method, types ); + handleInvalidCompositeType( "No implementation found for method ", null, null, null, null, method, types ); return null; } @@ -611,7 +611,7 @@ public abstract class CompositeAssemblyImpl } else { - handleInvalidCompsiteType( "Cannot find implementation of constraint @", null, annotationType, null, valueType, (Member) accessor, types ); + handleInvalidCompositeType( "Cannot find implementation of constraint @", null, annotationType, null, valueType, (Member) accessor, types ); } } return new ValueConstraintsModel( constraintModels, name, optional ); http://git-wip-us.apache.org/repos/asf/polygene-java/blob/f3890ed7/core/runtime/src/main/java/org/apache/polygene/runtime/composite/CompositeModel.java ---------------------------------------------------------------------- diff --git a/core/runtime/src/main/java/org/apache/polygene/runtime/composite/CompositeModel.java b/core/runtime/src/main/java/org/apache/polygene/runtime/composite/CompositeModel.java index 5c2c91f..56659de 100644 --- a/core/runtime/src/main/java/org/apache/polygene/runtime/composite/CompositeModel.java +++ b/core/runtime/src/main/java/org/apache/polygene/runtime/composite/CompositeModel.java @@ -32,7 +32,6 @@ import org.apache.polygene.api.common.MetaInfo; import org.apache.polygene.api.common.Visibility; import org.apache.polygene.api.composite.Composite; import org.apache.polygene.api.composite.CompositeDescriptor; -import org.apache.polygene.api.composite.InvalidCompositeException; import org.apache.polygene.api.structure.ModuleDescriptor; import org.apache.polygene.api.util.HierarchicalVisitor; import org.apache.polygene.api.util.VisitableHierarchy; @@ -40,7 +39,7 @@ import org.apache.polygene.runtime.injection.Dependencies; import org.apache.polygene.runtime.injection.DependencyModel; import static java.lang.reflect.Proxy.newProxyInstance; -import static org.apache.polygene.api.composite.InvalidCompositeException.handleInvalidCompsiteType; +import static org.apache.polygene.api.composite.InvalidCompositeException.handleInvalidCompositeType; /** * JAVADOC @@ -88,7 +87,7 @@ public abstract class CompositeModel } catch( ClassNotFoundException | NoSuchMethodException e ) { - handleInvalidCompsiteType( e.getMessage(), module, mainType, null, null, null, types ); + handleInvalidCompositeType( e.getMessage(), module, mainType, null, null, null, types ); } primaryType = mixinTypes() .reduce( null, ( primary, type ) -> http://git-wip-us.apache.org/repos/asf/polygene-java/blob/f3890ed7/core/runtime/src/main/java/org/apache/polygene/runtime/composite/ConstructorsModel.java ---------------------------------------------------------------------- diff --git a/core/runtime/src/main/java/org/apache/polygene/runtime/composite/ConstructorsModel.java b/core/runtime/src/main/java/org/apache/polygene/runtime/composite/ConstructorsModel.java index 750a019..e41d40c 100644 --- a/core/runtime/src/main/java/org/apache/polygene/runtime/composite/ConstructorsModel.java +++ b/core/runtime/src/main/java/org/apache/polygene/runtime/composite/ConstructorsModel.java @@ -48,7 +48,7 @@ import org.apache.polygene.runtime.injection.ParameterizedTypeInstance; import org.apache.polygene.runtime.model.Binder; import org.apache.polygene.runtime.model.Resolution; -import static org.apache.polygene.api.composite.InvalidCompositeException.handleInvalidCompsiteType; +import static org.apache.polygene.api.composite.InvalidCompositeException.handleInvalidCompositeType; import static org.apache.polygene.api.util.Annotations.typeHasAnnotation; /** @@ -104,7 +104,7 @@ public final class ConstructorsModel { return; } - handleInvalidCompsiteType( "Inner classes can not be used. Use static nested classes instead.", null, null, fragmentClass, null, null, null ); + handleInvalidCompositeType( "Inner classes can not be used. Use static nested classes instead.", null, null, fragmentClass, null, null, null ); } @Override http://git-wip-us.apache.org/repos/asf/polygene-java/blob/f3890ed7/core/runtime/src/main/java/org/apache/polygene/runtime/composite/TypedModifierInvocationHandler.java ---------------------------------------------------------------------- diff --git a/core/runtime/src/main/java/org/apache/polygene/runtime/composite/TypedModifierInvocationHandler.java b/core/runtime/src/main/java/org/apache/polygene/runtime/composite/TypedModifierInvocationHandler.java index d147134..7d96abf 100644 --- a/core/runtime/src/main/java/org/apache/polygene/runtime/composite/TypedModifierInvocationHandler.java +++ b/core/runtime/src/main/java/org/apache/polygene/runtime/composite/TypedModifierInvocationHandler.java @@ -21,9 +21,6 @@ package org.apache.polygene.runtime.composite; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -import org.apache.polygene.api.composite.InvalidCompositeException; - -import static org.apache.polygene.api.composite.InvalidCompositeException.handleInvalidCompsiteType; /** * JAVADOC
