You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by er...@apache.org on 2020/06/26 02:50:52 UTC
[lucene-solr] branch branch_8x updated: LUCENE-9389: Enhance gradle
logging calls validation: eliminate getMessage()
This is an automated email from the ASF dual-hosted git repository.
erick pushed a commit to branch branch_8x
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
The following commit(s) were added to refs/heads/branch_8x by this push:
new 040b418 LUCENE-9389: Enhance gradle logging calls validation: eliminate getMessage()
040b418 is described below
commit 040b41883d6869fb2cd36172ecd1e769129af355
Author: Erick Erickson <Er...@gmail.com>
AuthorDate: Thu Jun 25 22:38:49 2020 -0400
LUCENE-9389: Enhance gradle logging calls validation: eliminate getMessage()
---
lucene/CHANGES.txt | 2 ++
lucene/luke/src/java/org/apache/lucene/luke/app/IndexHandler.java | 2 +-
.../components/dialog/documents/AddDocumentDialogFactory.java | 4 ++--
.../components/dialog/menubar/CheckIndexDialogFactory.java | 2 +-
.../desktop/components/dialog/menubar/OpenIndexDialogFactory.java | 2 +-
.../org/apache/lucene/luke/app/desktop/util/ExceptionHandler.java | 4 ++--
.../src/java/org/apache/lucene/luke/models/util/IndexUtils.java | 8 ++++----
7 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index 6dfe6a2..f78e0fe 100644
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@@ -185,6 +185,8 @@ Build
* LUCENE-9380: Fix auxiliary class warnings in Lucene (Erick Erickson)
+* LUCENE-9389: Enhance gradle logging calls validation: eliminate getMessage() (Andras Salamon via Erick Erickson)
+
======================= Lucene 8.5.2 =======================
Bug Fixes
diff --git a/lucene/luke/src/java/org/apache/lucene/luke/app/IndexHandler.java b/lucene/luke/src/java/org/apache/lucene/luke/app/IndexHandler.java
index 17e4070..885c34a 100644
--- a/lucene/luke/src/java/org/apache/lucene/luke/app/IndexHandler.java
+++ b/lucene/luke/src/java/org/apache/lucene/luke/app/IndexHandler.java
@@ -68,7 +68,7 @@ public final class IndexHandler extends AbstractHandler<IndexObserver> {
try {
reader = IndexUtils.openIndex(indexPath, dirImpl);
} catch (Exception e) {
- log.error(e.getMessage(), e);
+ log.error("Error opening index", e);
throw new LukeException(MessageUtils.getLocalizedMessage("openindex.message.index_path_invalid", indexPath), e);
}
diff --git a/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/components/dialog/documents/AddDocumentDialogFactory.java b/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/components/dialog/documents/AddDocumentDialogFactory.java
index 1b9508f..906f80c9 100644
--- a/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/components/dialog/documents/AddDocumentDialogFactory.java
+++ b/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/components/dialog/documents/AddDocumentDialogFactory.java
@@ -357,10 +357,10 @@ public final class AddDocumentDialogFactory implements DialogOpener.DialogFactor
doc.add(toIndexableField(nf));
}
} catch (NumberFormatException ex) {
- log.error(ex.getMessage(), e);
+ log.error("Error converting field value", e);
throw new LukeException("Invalid value: " + ex.getMessage(), ex);
} catch (Exception ex) {
- log.error(ex.getMessage(), e);
+ log.error("Error converting field value", e);
throw new LukeException(ex.getMessage(), ex);
}
diff --git a/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/components/dialog/menubar/CheckIndexDialogFactory.java b/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/components/dialog/menubar/CheckIndexDialogFactory.java
index 3928ba6..453bd4d 100644
--- a/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/components/dialog/menubar/CheckIndexDialogFactory.java
+++ b/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/components/dialog/menubar/CheckIndexDialogFactory.java
@@ -300,7 +300,7 @@ public final class CheckIndexDialogFactory implements DialogOpener.DialogFactory
}
status = st;
} catch (Exception e) {
- log.error(e.getMessage(), e);
+ log.error("Error checking index", e);
statusLbl.setText(MessageUtils.getLocalizedMessage("message.error.unknown"));
}
}
diff --git a/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/components/dialog/menubar/OpenIndexDialogFactory.java b/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/components/dialog/menubar/OpenIndexDialogFactory.java
index 782827d..7dfe3c8 100644
--- a/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/components/dialog/menubar/OpenIndexDialogFactory.java
+++ b/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/components/dialog/menubar/OpenIndexDialogFactory.java
@@ -352,7 +352,7 @@ public final class OpenIndexDialogFactory implements DialogOpener.DialogFactory
JOptionPane.showMessageDialog(dialog, message, "Invalid index path", JOptionPane.ERROR_MESSAGE);
} catch (Throwable cause) {
JOptionPane.showMessageDialog(dialog, MessageUtils.getLocalizedMessage("message.error.unknown"), "Unknown Error", JOptionPane.ERROR_MESSAGE);
- log.error(cause.getMessage(), cause);
+ log.error("Error opening index or directory", cause);
}
}
diff --git a/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/util/ExceptionHandler.java b/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/util/ExceptionHandler.java
index b989748..60a4bd1 100644
--- a/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/util/ExceptionHandler.java
+++ b/lucene/luke/src/java/org/apache/lucene/luke/app/desktop/util/ExceptionHandler.java
@@ -33,10 +33,10 @@ public final class ExceptionHandler {
if (t instanceof LukeException) {
Throwable cause = t.getCause();
String message = (cause == null) ? t.getMessage() : t.getMessage() + " " + cause.getMessage();
- log.warn(t.getMessage(), t);
+ log.warn("Uncaught LukeException", t);
messageBroker.showStatusMessage(message);
} else {
- log.error(t.getMessage(), t);
+ log.error("Uncaught Exception", t);
messageBroker.showUnknownErrorMessage();
}
}
diff --git a/lucene/luke/src/java/org/apache/lucene/luke/models/util/IndexUtils.java b/lucene/luke/src/java/org/apache/lucene/luke/models/util/IndexUtils.java
index 9b98e92..1304635 100644
--- a/lucene/luke/src/java/org/apache/lucene/luke/models/util/IndexUtils.java
+++ b/lucene/luke/src/java/org/apache/lucene/luke/models/util/IndexUtils.java
@@ -83,7 +83,7 @@ public final class IndexUtils {
DirectoryReader dr = DirectoryReader.open(dir);
readers.add(dr);
} catch (IOException e) {
- log.warn(e.getMessage(), e);
+ log.warn("Error opening directory", e);
}
return FileVisitResult.CONTINUE;
}
@@ -142,7 +142,7 @@ public final class IndexUtils {
dir = (Directory) constr.newInstance(path, null);
}
} catch (Exception e) {
- log.warn(e.getMessage(), e);
+ log.warn("Invalid directory implementation class: {}", dirImpl, e);
throw new IllegalArgumentException("Invalid directory implementation class: " + dirImpl);
}
}
@@ -161,7 +161,7 @@ public final class IndexUtils {
log.info("Directory successfully closed.");
}
} catch (IOException e) {
- log.error(e.getMessage(), e);
+ log.error("Error closing directory", e);
}
}
@@ -182,7 +182,7 @@ public final class IndexUtils {
}
}
} catch (IOException e) {
- log.error(e.getMessage(), e);
+ log.error("Error closing index reader", e);
}
}