From 5cc364404c3ba1cf0e03c86863aace74df948bf9 Mon Sep 17 00:00:00 2001 From: Bartolomeo Sorrentino Date: Tue, 23 Apr 2019 17:36:10 +0200 Subject: [PATCH] modernize code --- .../bsc/processor/BaseAbstractProcessor.java | 241 ++++++------------ 1 file changed, 72 insertions(+), 169 deletions(-) diff --git a/utils/src/main/java/org/bsc/processor/BaseAbstractProcessor.java b/utils/src/main/java/org/bsc/processor/BaseAbstractProcessor.java index 1084906..aadd8a6 100644 --- a/utils/src/main/java/org/bsc/processor/BaseAbstractProcessor.java +++ b/utils/src/main/java/org/bsc/processor/BaseAbstractProcessor.java @@ -5,11 +5,19 @@ package org.bsc.processor; -import java.io.FileNotFoundException; import java.io.IOException; +import java.nio.file.Path; +import java.util.Collections; +import java.util.Optional; +import java.util.function.Predicate; +import java.util.stream.Collector; +import java.util.stream.Stream; import javax.annotation.processing.AbstractProcessor; import javax.annotation.processing.Filer; +import javax.annotation.processing.RoundEnvironment; +import javax.lang.model.element.AnnotationMirror; +import javax.lang.model.element.AnnotationValue; import javax.lang.model.element.Element; import javax.lang.model.element.ElementKind; import javax.lang.model.element.TypeElement; @@ -17,182 +25,101 @@ import javax.tools.FileObject; import javax.tools.StandardLocation; - -import java.util.Collections; -import java.util.regex.Matcher; -import java.util.regex.Pattern; -import javax.annotation.processing.RoundEnvironment; -import javax.tools.JavaFileManager; - - /** * * @author bsorrentino * * */ -//@SupportedSourceVersion(SourceVersion.RELEASE_6) public abstract class BaseAbstractProcessor extends AbstractProcessor { - protected void info( String msg ) { - processingEnv.getMessager().printMessage(Kind.NOTE, msg ); + protected void info(String fmt, Object... args) { + final String msg = java.lang.String.format(fmt, (Object[]) args); + processingEnv.getMessager().printMessage(Kind.NOTE, msg); } - protected void warn( String msg ) { - //logger.warning(msg); - processingEnv.getMessager().printMessage(Kind.WARNING, msg ); + protected void warn(String fmt, Object... args) { + final String msg = java.lang.String.format(fmt, (Object[]) args); + processingEnv.getMessager().printMessage(Kind.WARNING, msg); } - protected void warn( String msg, Throwable t ) { - //logger.log(Level.WARNING, msg, t ); - processingEnv.getMessager().printMessage(Kind.WARNING, msg ); + protected void warn(String msg, Throwable t) { + processingEnv.getMessager().printMessage(Kind.WARNING, msg); t.printStackTrace(System.err); } - protected void error( String msg ) { - //logger.severe(msg); - processingEnv.getMessager().printMessage(Kind.ERROR, msg ); + protected void error(String fmt, Object... args) { + final String msg = java.lang.String.format(fmt, (Object[]) args); + processingEnv.getMessager().printMessage(Kind.ERROR, msg); } - protected void error( String msg, Throwable t ) { - //logger.log(Level.SEVERE, msg, t ); - processingEnv.getMessager().printMessage(Kind.ERROR, msg ); + protected void error(String msg, Throwable t) { + processingEnv.getMessager().printMessage(Kind.ERROR, msg); t.printStackTrace(System.err); } - - final Pattern p = Pattern.compile("(.*)[\\.]((?:\\w+)\\.gwt\\.xml)"); + /** * - * @param fqn * @return */ - protected java.net.URL getResourceFromClassPath( String fqn ) - { - return getResourceFromClassPath(fqn, getClass().getClassLoader()); + protected java.util.Map getOptions() { + return Optional.ofNullable(processingEnv.getOptions()) + .orElseGet( () -> Collections.emptyMap() ); } - - /** - * - * @param fqn - * @param cl - * @return - */ - protected java.net.URL getResourceFromClassPath( String fqn, ClassLoader cl ) - { - if( fqn == null ) { - throw new IllegalArgumentException( "fqn is null!"); - } - if( cl == null ) { - throw new IllegalArgumentException( "class loader is null!"); - } - - Matcher m = p.matcher(fqn); - - if( !m.matches() ) { - throw new IllegalArgumentException(String.format("parameter '%s' doesn't contain a valid fqn", fqn)); - } - - final String packageName = m.group(1); - final String resource = m.group(2); - - info( String.format("packageName=[%s]\nresource=[%s]\n", packageName, resource)); - final String res; - if( packageName==null || packageName.isEmpty() ) { - res = resource; - } - else { - res = packageName.replace('.', '/').concat("/").concat(resource); - } - - final java.net.URL url = cl.getResource( res ); - - return url; - - - } - /** * + * @param filter + * @return */ - public static interface Predicate { - - /** - * - * @param source - * @param elements - * @return - */ - boolean execute( TypeElement source, java.util.Set elements ); - } - - - protected void getElementsAnnotatedWith( - java.util.Set annotations, - RoundEnvironment roundEnv, - Predicate p ) + public Stream elementStreamFromAnnotations( + java.util.Set annotations, + RoundEnvironment roundEnv, + Predicate filter ) { if( annotations == null ) { - throw new IllegalArgumentException( "parameter annotations is null!"); + throw new IllegalArgumentException( "annotations is null!"); } if( roundEnv == null ) { - throw new IllegalArgumentException( "parameter RoundEnvironment is null!"); + throw new IllegalArgumentException( "roundEnv is null!"); } - if( p == null ) { - throw new IllegalArgumentException( "paraemeter Predicate is null!"); - } - - for( TypeElement te : annotations ) { - - final java.util.Set elems = - roundEnv.getElementsAnnotatedWith(te); - - if( !p.execute(te, elems) ) { - break; - } + if( filter == null ) { + throw new IllegalArgumentException( "filter is null!"); } + + return annotations.stream() + .filter( filter ) + .flatMap((e) -> roundEnv.getElementsAnnotatedWith(e).stream() ); + } + /** * - * @param location - * @return + * @param am + * @param supplier + * @return */ - protected FileObject getResourceFormLocation( - final JavaFileManager.Location location, - final String packageName, - final String resource ) throws FileNotFoundException,IOException - { - if( location == null ) { - throw new IllegalArgumentException( "location is null!"); - } - if( packageName == null ) { - throw new IllegalArgumentException( "packageName loader is null!"); - } - if( resource == null ) { - throw new IllegalArgumentException( "resource loader is null!"); - } - - final Filer filer = processingEnv.getFiler(); - - FileObject f = filer.getResource( - location, - packageName, - resource); + protected > R toMapObject( AnnotationMirror am, java.util.function.Supplier supplier ) { + + final Collector, R, R> c = + Collector.of( + supplier, + ( map, entry ) -> + map.put( entry.getKey().getSimpleName().toString(), entry.getValue().getValue()), + ( v1, v2 ) -> v1 + ); + + final R result = am.getElementValues() + .entrySet() + .stream() + .collect( c ); + + return result; + + } - java.io.InputStream is = f.openInputStream(); - if( is==null ) { - warn( String.format("resource [%s] not found!", resource) ); - return null; - } - - is.close(); - - return f; - } - - /** * * @param subfolder subfolder @@ -201,21 +128,22 @@ protected FileObject getResourceFormLocation( * @throws IOException */ protected FileObject createSourceOutputFile( - String subfolder, - String filePath ) throws IOException + Path subfolder, + Path filePath ) throws IOException { final Filer filer = processingEnv.getFiler(); - Element e = null; + final Element e = null; FileObject res = filer.createResource( StandardLocation.SOURCE_OUTPUT, - subfolder, - filePath, + subfolder.toString(), + filePath.toString(), e); return res; } + /** * * @param e @@ -224,45 +152,20 @@ protected FileObject createSourceOutputFile( */ protected Class getClassFromElement( Element e ) throws ClassNotFoundException { - if( null==e ) throw new IllegalArgumentException("e is null!"); + if( null==e ) throw new IllegalArgumentException("e is null!"); + if( ElementKind.CLASS!=e.getKind() ) { throw new IllegalArgumentException( String.format("element [%s] is not a class!", e)); } TypeElement te = (TypeElement) e; - info( String.format("loading class [%s]", te.getQualifiedName().toString())); + info( "loading class [%s]", te.getQualifiedName().toString()); return Class.forName(te.getQualifiedName().toString()); } - /** - * - * @return com.sun.source.util.Trees - */ - /* - protected com.sun.source.util.Trees newTreesInstance() { - - return com.sun.source.util.Trees.instance(processingEnv); - - }; - */ - - /** - * - * @return - */ - protected java.util.Map getOptions() - { - java.util.Map optionMap = processingEnv.getOptions(); - - if(optionMap==null) { - optionMap = Collections.emptyMap(); - } - return optionMap ; - } - /** * * @param typeElement