house keeping

Author: pfichtner

.github/workflows/build.yml

@@ -27,5 +27,5 @@ jobs:
       env:
         CENTRAL_OSSRH_USERNAME: ${{ secrets.CENTRAL_OSSRH_USERNAME }}
         CENTRAL_OSSRH_PASSWORD: ${{ secrets.CENTRAL_OSSRH_PASSWORD }}
-      run: ./mvnw -B package
+      run: ./mvnw -B test
 #     run: ./mvnw -B deploy -s settings.xml

jmolecules-bytebuddy/src/main/java/org/jmolecules/bytebuddy/ClassWorld.java

@@ -26,10 +26,9 @@ class ClassWorld {
 	private final ClassFileLocator locator;
 
 	boolean isAvailable(String name) {
-
 		try {
 			return locator.locate(name).isResolved();
-		} catch (IOException o_O) {
+		} catch (IOException e) {
 			return false;
 		}
 	}

jmolecules-bytebuddy/src/main/java/org/jmolecules/bytebuddy/JMoleculesPlugin.java

@@ -54,7 +54,6 @@ public JMoleculesPlugin(File outputFolder) {
 
 	@Override
 	public void onPreprocess(TypeDescription typeDescription, ClassFileLocator classFileLocator) {
-
 		if (!configuration.include(typeDescription)) {
 			return;
 		}
@@ -88,7 +87,6 @@ public boolean matches(TypeDescription target) {
 	@Override
 	@SuppressWarnings({ "unchecked", "rawtypes" })
 	public Builder<?> apply(Builder<?> builder, TypeDescription typeDescription, ClassFileLocator classFileLocator) {
-
 		return delegates.get(typeDescription).stream().reduce(builder,
 				(it, plugin) -> (Builder) plugin.apply(it, typeDescription, classFileLocator), (left, right) -> right);
 	}

jmolecules-bytebuddy/src/main/java/org/jmolecules/bytebuddy/JMoleculesType.java

@@ -34,7 +34,6 @@ class JMoleculesType {
 	 * @param type must not be {@literal null}.
 	 */
 	JMoleculesType(TypeDescription type) {
-
 		if (type == null) {
 			throw new IllegalArgumentException("TypeDescription must not be null!");
 		}

jmolecules-bytebuddy/src/main/java/org/jmolecules/bytebuddy/LoggingPlugin.java

@@ -26,10 +26,6 @@
  */
 public interface LoggingPlugin extends Plugin {
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.io.Closeable#close()
-	 */
 	@Override
 	public default void close() throws IOException {
 		PluginLogger.INSTANCE.flush();

jmolecules-bytebuddy/src/main/java/org/jmolecules/bytebuddy/PluginLogger.java

@@ -46,7 +46,6 @@ enum PluginLogger {
 	 * @return will never be {@literal null}.
 	 */
 	public Log getLog(TypeDescription description, String name) {
-
 		if (description == null) {
 			throw new IllegalArgumentException("TypeDescription must not be null!");
 		}
@@ -56,20 +55,16 @@ public Log getLog(TypeDescription description, String name) {
 		}
 
 		Set<LogEntry> moduleLogs = logs.computeIfAbsent(description.getName(), it -> new TreeSet<>());
-
 		return (message, parameters) -> moduleLogs.add(new LogEntry(name, message, parameters));
 	}
 
 	public void flush() {
-
 		try {
-
 			if (!logs.isEmpty()) {
 				log.info("");
 			}
 
 			logs.forEach((description, moduleLogs) -> {
-
 				if (moduleLogs.isEmpty()) {
 					return;
 				}
@@ -107,10 +102,6 @@ private static class LogEntry implements Comparable<LogEntry> {
 		String message;
 		Object[] parameters;
 
-		/*
-		 * (non-Javadoc)
-		 * @see java.lang.Comparable#compareTo(java.lang.Object)
-		 */
 		@Override
 		public int compareTo(LogEntry o) {
 
@@ -125,4 +116,5 @@ private String getExpandedMessage() {
 			return String.format(message.replace("{}", "%s"), parameters);
 		}
 	}
+
 }

jmolecules-bytebuddy/src/main/java/org/jmolecules/bytebuddy/PluginUtils.java

@@ -58,7 +58,6 @@ class PluginUtils {
 	 * @return result of the check.
 	 */
 	static boolean isAnnotatedWith(TypeDescription type, Class<?> annotationType) {
-
 		return type.getDeclaredAnnotations() //
 				.asTypeList() //
 				.stream() //
@@ -100,9 +99,7 @@ static Builder<?> mapAnnotationOrInterfaces(Builder<?> builder, TypeDescription
 			Map<Class<?>, Class<? extends Annotation>> mappings, Log log) {
 
 		for (Entry<Class<?>, Class<? extends Annotation>> entry : mappings.entrySet()) {
-
 			Class<?> source = entry.getKey();
-
 			if (source.isAnnotation() ? isAnnotatedWith(type, source) : type.isAssignableTo(source)) {
 				builder = addAnnotationIfMissing(entry.getValue(), builder, type, log);
 			}
@@ -235,9 +232,7 @@ public T get() {
 	 * @return output for the log.
 	 */
 	static String toLog(FieldDescription field) {
-
 		TypeDefinition type = field.getDeclaringType();
-
 		return abbreviate(type).concat(".").concat(field.getName());
 	}
 
@@ -248,10 +243,9 @@ static String toLog(FieldDescription field) {
 	 * @param consumer must not be {@literal null}.
 	 */
 	static void ifTypePresent(String fullyQualifiedTypeName, Consumer<Class<?>> consumer) {
-
 		try {
 			consumer.accept(PluginUtils.class.getClassLoader().loadClass(fullyQualifiedTypeName));
-		} catch (ClassNotFoundException o_O) {}
+		} catch (ClassNotFoundException e) {}
 	}
 
 	/**
@@ -262,11 +256,10 @@ static void ifTypePresent(String fullyQualifiedTypeName, Consumer<Class<?>> cons
 	 */
 	@SuppressWarnings("unchecked")
 	static void ifAnnotationTypePresent(String fullyQualifiedTypeName, Consumer<Class<? extends Annotation>> consumer) {
-
 		try {
 			consumer
 					.accept((Class<? extends Annotation>) PluginUtils.class.getClassLoader().loadClass(fullyQualifiedTypeName));
-		} catch (ClassNotFoundException o_O) {}
+		} catch (ClassNotFoundException e) {}
 	}
 
 	/**
@@ -286,7 +279,6 @@ static boolean isCglibProxyType(TypeDefinition definition) {
 	 * @return since 0.26
 	 */
 	static MethodDefinition<?> markGenerated(MethodDefinition<?> method) {
-
 		return getGeneratedTypeAnnotation(ElementType.METHOD)
 				.<MethodDefinition<?>> map(method::annotateMethod)
 				.orElse(method);
@@ -301,7 +293,6 @@ static MethodDefinition<?> markGenerated(MethodDefinition<?> method) {
 	 * @since 0.26
 	 */
 	static Builder<?> markGenerated(Builder<?> builder, Log log) {
-
 		return getGeneratedTypeAnnotation(ElementType.TYPE)
 				.map(it -> {
 
@@ -316,34 +307,27 @@ static Builder<?> markGenerated(Builder<?> builder, Log log) {
 
 	private static Builder<?> addAnnotationIfMissing(Class<? extends Annotation> annotation, Builder<?> builder,
 			TypeDescription type, Log log) {
-
 		if (isAnnotatedWith(type, annotation)) {
 			log.info("Not adding @{}, already present.", PluginUtils.abbreviate(annotation));
 			return builder;
 		}
 
 		log.info("Adding @{}.", PluginUtils.abbreviate(annotation));
-
 		return builder.annotateType(getAnnotation(annotation));
 	}
 
 	private static String getPackageName(String fullyQualifiedTypeName) {
-
 		int lastDotIndex = fullyQualifiedTypeName.lastIndexOf('.');
-
 		return lastDotIndex == -1 ? fullyQualifiedTypeName : fullyQualifiedTypeName.substring(0, lastDotIndex);
 	}
 
 	private static String getShortName(String fullyQualifiedTypeName) {
-
 		int lastDotIndex = fullyQualifiedTypeName.lastIndexOf('.');
-
 		return lastDotIndex == -1 ? fullyQualifiedTypeName
 				: fullyQualifiedTypeName.substring(lastDotIndex, fullyQualifiedTypeName.length());
 	}
 
 	private static Optional<AnnotationDescription> getGeneratedTypeAnnotation(ElementType type) {
-
 		return Types.AT_GENERATED.stream()
 				.filter(it -> hasTarget(it, type))
 				.findFirst()
@@ -354,9 +338,8 @@ private static Optional<AnnotationDescription> getGeneratedTypeAnnotation(Elemen
 	}
 
 	private static boolean hasTarget(Class<? extends Annotation> type, ElementType target) {
-
 		Target annotation = type.getAnnotation(Target.class);
-
 		return annotation != null && Arrays.asList(annotation.value()).contains(target);
 	}
+
 }