From e7f98f46b48a1f0b5f4cb422dfe084bdf13f2b51 Mon Sep 17 00:00:00 2001 From: Kay-Uwe Janssen Date: Sun, 10 Jun 2018 09:09:29 +0200 Subject: [PATCH 01/12] Remove `trace` overload with three arguments --- .../main/java/org/androidannotations/logger/Logger.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/logger/Logger.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/logger/Logger.java index 6d4cde0ccb..8825172535 100644 --- a/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/logger/Logger.java +++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/logger/Logger.java @@ -1,5 +1,6 @@ /** * Copyright (C) 2010-2016 eBusiness Information, Excilys Group + * Copyright (C) 2016-2018 the AndroidAnnotations project * * Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of @@ -29,11 +30,7 @@ public Logger(LoggerContext loggerContext, String name) { } public void trace(String message, Object... args) { - trace(message, null, args); - } - - public void trace(String message, Element element, Object... args) { - log(Level.TRACE, message, element, null, null, args); + log(Level.TRACE, message, null, null, null, args); } public void debug(String message, Object... args) { From f918dff80247c8c2c75a8c8b15031dc9849be98a Mon Sep 17 00:00:00 2001 From: Kay-Uwe Janssen Date: Sun, 10 Jun 2018 09:10:31 +0200 Subject: [PATCH 02/12] Remove `debug` overload with three arguments --- .../src/main/java/org/androidannotations/logger/Logger.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/logger/Logger.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/logger/Logger.java index 8825172535..4290f4668f 100644 --- a/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/logger/Logger.java +++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/logger/Logger.java @@ -34,11 +34,7 @@ public void trace(String message, Object... args) { } public void debug(String message, Object... args) { - debug(message, null, args); - } - - public void debug(String message, Element element, Object... args) { - log(Level.DEBUG, message, element, null, null, args); + log(Level.DEBUG, message, null, null, null, args); } public void info(String message, Object... args) { From 84a44312ffb6eb359d4c9461cd90b375da7d8ba4 Mon Sep 17 00:00:00 2001 From: Kay-Uwe Janssen Date: Sun, 10 Jun 2018 09:11:54 +0200 Subject: [PATCH 03/12] Remove `info` overload with three arguments --- .../src/main/java/org/androidannotations/logger/Logger.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/logger/Logger.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/logger/Logger.java index 4290f4668f..98823baa7a 100644 --- a/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/logger/Logger.java +++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/logger/Logger.java @@ -38,11 +38,7 @@ public void debug(String message, Object... args) { } public void info(String message, Object... args) { - info(message, null, args); - } - - public void info(String message, Element element, Object... args) { - log(Level.INFO, message, element, null, null, args); + log(Level.INFO, message, null, null, null, args); } public void warn(String message, Object... args) { From 045c7b9802225ee52afc110e92e4fc96aae822a6 Mon Sep 17 00:00:00 2001 From: Kay-Uwe Janssen Date: Sun, 10 Jun 2018 09:13:03 +0200 Subject: [PATCH 04/12] Remove unused `warn` overload --- .../src/main/java/org/androidannotations/logger/Logger.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/logger/Logger.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/logger/Logger.java index 98823baa7a..fbd2b475bf 100644 --- a/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/logger/Logger.java +++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/logger/Logger.java @@ -45,10 +45,6 @@ public void warn(String message, Object... args) { warn(message, null, null, args); } - public void warn(String message, Throwable thr, Object... args) { - warn(message, null, thr, args); - } - public void warn(String message, Element element, Object... args) { warn(message, element, null, args); } From 5bec24fb90567a0a5463fc13e587449197e5362a Mon Sep 17 00:00:00 2001 From: Kay-Uwe Janssen Date: Sun, 10 Jun 2018 09:21:28 +0200 Subject: [PATCH 05/12] Remove `trace` overload with three arguments --- .../internal/process/ModelValidator.java | 2 +- .../java/org/androidannotations/logger/Logger.java | 10 +++------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/process/ModelValidator.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/process/ModelValidator.java index 30b9ecbda3..28d4f7e44d 100644 --- a/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/process/ModelValidator.java +++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/process/ModelValidator.java @@ -81,7 +81,7 @@ public AnnotationElements validate(AnnotationElements extractedModel, Annotation if (elementValidation.isValid()) { validatedAnnotatedElements.add(annotatedElement); } else { - LOGGER.warn("Element {} invalidated by {}", annotatedElement, annotatedElement, validatorSimpleName); + LOGGER.warn(annotatedElement, "Element {} invalidated by {}", annotatedElement, validatorSimpleName); } } } diff --git a/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/logger/Logger.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/logger/Logger.java index fbd2b475bf..a133467376 100644 --- a/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/logger/Logger.java +++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/logger/Logger.java @@ -42,15 +42,11 @@ public void info(String message, Object... args) { } public void warn(String message, Object... args) { - warn(message, null, null, args); + warn(null, message, args); } - public void warn(String message, Element element, Object... args) { - warn(message, element, null, args); - } - - public void warn(String message, Element element, Throwable thr, Object... args) { - log(Level.WARN, message, element, null, thr, args); + public void warn(Element element, String message, Object... args) { + log(Level.WARN, message, element, null, null, args); } public void warn(String message, Element element, AnnotationMirror annotationMirror) { From 94a4371903e94b880aea369c5c8f8221c0ba477f Mon Sep 17 00:00:00 2001 From: Kay-Uwe Janssen Date: Sun, 10 Jun 2018 09:23:17 +0200 Subject: [PATCH 06/12] Move `message` argument to last position --- .../org/androidannotations/internal/process/ModelValidator.java | 2 +- .../src/main/java/org/androidannotations/logger/Logger.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/process/ModelValidator.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/process/ModelValidator.java index 28d4f7e44d..820046f7ed 100644 --- a/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/process/ModelValidator.java +++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/process/ModelValidator.java @@ -75,7 +75,7 @@ public AnnotationElements validate(AnnotationElements extractedModel, Annotation } for (String warning : elementValidation.getWarnings()) { - LOGGER.warn(warning, elementValidation.getElement(), annotationMirror); + LOGGER.warn(elementValidation.getElement(), annotationMirror, warning); } if (elementValidation.isValid()) { diff --git a/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/logger/Logger.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/logger/Logger.java index a133467376..6812be5bc2 100644 --- a/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/logger/Logger.java +++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/logger/Logger.java @@ -49,7 +49,7 @@ public void warn(Element element, String message, Object... args) { log(Level.WARN, message, element, null, null, args); } - public void warn(String message, Element element, AnnotationMirror annotationMirror) { + public void warn(Element element, AnnotationMirror annotationMirror, String message) { log(Level.WARN, message, element, annotationMirror, null); } From aebfdb5a44eae5711023bc8cece7ff8d6c6e6c9f Mon Sep 17 00:00:00 2001 From: Kay-Uwe Janssen Date: Sun, 10 Jun 2018 09:24:38 +0200 Subject: [PATCH 07/12] Add missing placeholder for second argument --- .../internal/generation/SourceCodeWriter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/generation/SourceCodeWriter.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/generation/SourceCodeWriter.java index ec71ed6e8e..09e81fe74b 100644 --- a/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/generation/SourceCodeWriter.java +++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/generation/SourceCodeWriter.java @@ -70,7 +70,7 @@ public OutputStream openBinary(JPackage pkg, String fileName) throws IOException return sourceFile.openOutputStream(); } catch (FilerException e) { - LOGGER.error("Could not generate source file for {}", qualifiedClassName, e.getMessage()); + LOGGER.error("Could not generate source file for {} due to error: {}", qualifiedClassName, e.getMessage()); /* * This exception is expected, when some files are created twice. We * cannot delete existing files, unless using a dirty hack. Files a From f94b666853fc7549ad0a9e627fedc786e7bff145 Mon Sep 17 00:00:00 2001 From: Kay-Uwe Janssen Date: Sun, 10 Jun 2018 09:25:16 +0200 Subject: [PATCH 08/12] Move `element` argument infront of the `message` --- .../androidannotations/internal/AndroidAnnotationProcessor.java | 2 +- .../org/androidannotations/internal/process/ModelProcessor.java | 2 +- .../src/main/java/org/androidannotations/logger/Logger.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/AndroidAnnotationProcessor.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/AndroidAnnotationProcessor.java index fa39694b8f..fb5cee5940 100644 --- a/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/AndroidAnnotationProcessor.java +++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/AndroidAnnotationProcessor.java @@ -246,7 +246,7 @@ private void handleException(Set annotations, RoundEnviro Iterator iterator = annotations.iterator(); if (iterator.hasNext()) { Element element = roundEnv.getElementsAnnotatedWith(iterator.next()).iterator().next(); - LOGGER.error("Something went wrong: {}", element, errorMessage); + LOGGER.error(element, "Something went wrong: {}", errorMessage); } else { LOGGER.error("Something went wrong: {}", errorMessage); } diff --git a/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/process/ModelProcessor.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/process/ModelProcessor.java index 6c32c6af14..c6a26c0479 100644 --- a/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/process/ModelProcessor.java +++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/process/ModelProcessor.java @@ -197,7 +197,7 @@ private boolean generateElements(AnnotationElements validatedModel, ProcessHolde if (validatedElements.contains(enclosingElement)) { isElementRemaining = true; } else { - LOGGER.error("Enclosing element {} has not been successfully validated", annotatedElement, enclosingElement); + LOGGER.error(annotatedElement, "Enclosing element {} has not been successfully validated", enclosingElement); } } else { GeneratedClassHolder generatedClassHolder = generatingAnnotationHandler.createGeneratedClassHolder(environment, typeElement); diff --git a/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/logger/Logger.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/logger/Logger.java index 6812be5bc2..085e18c5d1 100644 --- a/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/logger/Logger.java +++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/logger/Logger.java @@ -57,7 +57,7 @@ public void error(String message, Object... args) { error(message, null, null, args); } - public void error(String message, Element element, Object... args) { + public void error(Element element, String message, Object... args) { error(message, element, null, args); } From 4ddc09a665a8ed18deeda19b3bd77a80044ddd97 Mon Sep 17 00:00:00 2001 From: Kay-Uwe Janssen Date: Sun, 10 Jun 2018 09:25:56 +0200 Subject: [PATCH 09/12] Move `thr` argument infront of the `message` --- .../androidannotations/internal/AndroidAnnotationProcessor.java | 2 +- .../src/main/java/org/androidannotations/logger/Logger.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/AndroidAnnotationProcessor.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/AndroidAnnotationProcessor.java index fb5cee5940..cf0a91b80d 100644 --- a/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/AndroidAnnotationProcessor.java +++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/AndroidAnnotationProcessor.java @@ -91,7 +91,7 @@ public synchronized void init(ProcessingEnvironment processingEnv) { plugins.add(0, corePlugin); androidAnnotationsEnv.setPlugins(plugins); } catch (Exception e) { - LOGGER.error("Can't load plugins", e); + LOGGER.error(e, "Can't load plugins"); } } diff --git a/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/logger/Logger.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/logger/Logger.java index 085e18c5d1..39e5671cb5 100644 --- a/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/logger/Logger.java +++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/logger/Logger.java @@ -61,7 +61,7 @@ public void error(Element element, String message, Object... args) { error(message, element, null, args); } - public void error(String message, Throwable thr, Object... args) { + public void error(Throwable thr, String message, Object... args) { error(message, null, thr, args); } From a90b1fda902946b9b486557f4dc0a3e821dbc74b Mon Sep 17 00:00:00 2001 From: Kay-Uwe Janssen Date: Sun, 10 Jun 2018 09:27:02 +0200 Subject: [PATCH 10/12] Move `element` and `thr` arguments infront of the `message` --- .../main/java/org/androidannotations/logger/Logger.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/logger/Logger.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/logger/Logger.java index 39e5671cb5..773def31d9 100644 --- a/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/logger/Logger.java +++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/logger/Logger.java @@ -54,18 +54,18 @@ public void warn(Element element, AnnotationMirror annotationMirror, String mess } public void error(String message, Object... args) { - error(message, null, null, args); + error(null, null, message, args); } public void error(Element element, String message, Object... args) { - error(message, element, null, args); + error(element, null, message, args); } public void error(Throwable thr, String message, Object... args) { - error(message, null, thr, args); + error(null, thr, message, args); } - public void error(String message, Element element, Throwable thr, Object... args) { + public void error(Element element, Throwable thr, String message, Object... args) { log(Level.ERROR, message, element, null, thr, args); } From 69b08649c669b96d200b4e751dc314d71fca78e5 Mon Sep 17 00:00:00 2001 From: Kay-Uwe Janssen Date: Sun, 10 Jun 2018 09:27:50 +0200 Subject: [PATCH 11/12] Move `message` argument to last position --- .../org/androidannotations/internal/process/ModelValidator.java | 2 +- .../src/main/java/org/androidannotations/logger/Logger.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/process/ModelValidator.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/process/ModelValidator.java index 820046f7ed..43c2ccfd9e 100644 --- a/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/process/ModelValidator.java +++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/process/ModelValidator.java @@ -71,7 +71,7 @@ public AnnotationElements validate(AnnotationElements extractedModel, Annotation AnnotationMirror annotationMirror = elementValidation.getAnnotationMirror(); for (ElementValidation.Error error : elementValidation.getErrors()) { - LOGGER.error(error.getMessage(), error.getElement(), annotationMirror); + LOGGER.error(error.getElement(), annotationMirror, error.getMessage()); } for (String warning : elementValidation.getWarnings()) { diff --git a/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/logger/Logger.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/logger/Logger.java index 773def31d9..f94cabfe91 100644 --- a/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/logger/Logger.java +++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/logger/Logger.java @@ -69,7 +69,7 @@ public void error(Element element, Throwable thr, String message, Object... args log(Level.ERROR, message, element, null, thr, args); } - public void error(String message, Element element, AnnotationMirror annotationMirror) { + public void error(Element element, AnnotationMirror annotationMirror, String message) { log(Level.ERROR, message, element, annotationMirror, null); } From cb03084bab7190e2ced9ec61e97879d3f1eb6a8b Mon Sep 17 00:00:00 2001 From: Kay-Uwe Janssen Date: Sun, 10 Jun 2018 09:28:18 +0200 Subject: [PATCH 12/12] Make `log` message private --- .../src/main/java/org/androidannotations/logger/Logger.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/logger/Logger.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/logger/Logger.java index f94cabfe91..9cbd039d57 100644 --- a/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/logger/Logger.java +++ b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/logger/Logger.java @@ -77,7 +77,7 @@ public boolean isLoggable(Level level) { return level.isGreaterOrEquals(loggerContext.getCurrentLevel()); } - public void log(Level level, String message, Element element, AnnotationMirror annotationMirror, Throwable thr, Object... args) { + private void log(Level level, String message, Element element, AnnotationMirror annotationMirror, Throwable thr, Object... args) { if (!isLoggable(level)) { return; }