From 17feca141956e0bfdc4ff548db055cdef7f94701 Mon Sep 17 00:00:00 2001 From: Claus Nagel Date: Sun, 9 Feb 2025 20:18:45 +0100 Subject: [PATCH] avoid duplicate error log messages --- .../org/citydb/cli/ExecutionException.java | 1 - .../org/citydb/cli/util/CommandHelper.java | 7 ++++++- .../org/citydb/cli/application.properties | 20 ------------------- .../org/citydb/config/ConfigException.java | 1 - .../citydb/database/DatabaseException.java | 1 - .../adapter/DatabaseAdapterException.java | 1 - .../database/geometry/GeometryException.java | 1 - .../database/schema/SchemaException.java | 1 - .../org/citydb/database/srs/SrsException.java | 1 - .../citygml/builder/ModelBuildException.java | 1 - .../serializer/ModelSerializeException.java | 1 - .../org/citydb/io/IOAdapterException.java | 1 - .../org/citydb/io/reader/ReadException.java | 1 - .../io/reader/filter/FilterException.java | 1 - .../io/validator/ValidateException.java | 1 - .../org/citydb/io/writer/WriteException.java | 1 - .../operation/deleter/DeleteException.java | 1 - .../operation/exporter/ExportException.java | 1 - .../operation/importer/ImportException.java | 1 - .../org/citydb/plugin/PluginException.java | 1 - .../query/builder/QueryBuildException.java | 1 - .../builder/schema/SchemaPathException.java | 1 - .../filter/encoding/FilterParseException.java | 1 - .../org/citydb/util/csv/IdListException.java | 1 - .../citydb/util/tiling/TilingException.java | 1 - 25 files changed, 6 insertions(+), 44 deletions(-) diff --git a/citydb-cli/src/main/java/org/citydb/cli/ExecutionException.java b/citydb-cli/src/main/java/org/citydb/cli/ExecutionException.java index 060c68d3..61dcb587 100644 --- a/citydb-cli/src/main/java/org/citydb/cli/ExecutionException.java +++ b/citydb-cli/src/main/java/org/citydb/cli/ExecutionException.java @@ -24,7 +24,6 @@ public class ExecutionException extends Exception { public ExecutionException() { - super(); } public ExecutionException(String message) { diff --git a/citydb-cli/src/main/java/org/citydb/cli/util/CommandHelper.java b/citydb-cli/src/main/java/org/citydb/cli/util/CommandHelper.java index b7497956..c11fc8a8 100644 --- a/citydb-cli/src/main/java/org/citydb/cli/util/CommandHelper.java +++ b/citydb-cli/src/main/java/org/citydb/cli/util/CommandHelper.java @@ -191,7 +191,12 @@ public synchronized void logException(String message, Throwable e) { Level level = LoggerManager.getInstance().logConsole().getLogLevel(); if (level.isMoreSpecificThan(Level.INFO)) { while (e != null) { - logger.error(e); + String cause = logger.getMessageFactory().newMessage(e).getFormattedMessage(); + if (!cause.equals(message)) { + logger.error(e); + } + + message = cause; e = e.getCause(); } } diff --git a/citydb-cli/src/main/resources/org/citydb/cli/application.properties b/citydb-cli/src/main/resources/org/citydb/cli/application.properties index 994408ea..1786406e 100644 --- a/citydb-cli/src/main/resources/org/citydb/cli/application.properties +++ b/citydb-cli/src/main/resources/org/citydb/cli/application.properties @@ -1,23 +1,3 @@ -# -# citydb-tool - Command-line tool for the 3D City Database -# https://www.3dcitydb.org/ -# -# Copyright 2022-2024 -# virtualcitysystems GmbH, Germany -# https://vc.systems/ -# -# 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 the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# name=@name@ version=@version@ copyrightYear=@copyrightYear@ diff --git a/citydb-config/src/main/java/org/citydb/config/ConfigException.java b/citydb-config/src/main/java/org/citydb/config/ConfigException.java index 6ce1383f..41857299 100644 --- a/citydb-config/src/main/java/org/citydb/config/ConfigException.java +++ b/citydb-config/src/main/java/org/citydb/config/ConfigException.java @@ -24,7 +24,6 @@ public class ConfigException extends Exception { public ConfigException() { - super(); } public ConfigException(String message) { diff --git a/citydb-database/src/main/java/org/citydb/database/DatabaseException.java b/citydb-database/src/main/java/org/citydb/database/DatabaseException.java index 7fdc8d06..62674075 100644 --- a/citydb-database/src/main/java/org/citydb/database/DatabaseException.java +++ b/citydb-database/src/main/java/org/citydb/database/DatabaseException.java @@ -24,7 +24,6 @@ public class DatabaseException extends Exception { public DatabaseException() { - super(); } public DatabaseException(String message) { diff --git a/citydb-database/src/main/java/org/citydb/database/adapter/DatabaseAdapterException.java b/citydb-database/src/main/java/org/citydb/database/adapter/DatabaseAdapterException.java index c066e249..43e8f8f4 100644 --- a/citydb-database/src/main/java/org/citydb/database/adapter/DatabaseAdapterException.java +++ b/citydb-database/src/main/java/org/citydb/database/adapter/DatabaseAdapterException.java @@ -24,7 +24,6 @@ public class DatabaseAdapterException extends Exception { public DatabaseAdapterException() { - super(); } public DatabaseAdapterException(String message) { diff --git a/citydb-database/src/main/java/org/citydb/database/geometry/GeometryException.java b/citydb-database/src/main/java/org/citydb/database/geometry/GeometryException.java index f7f87355..8d77b736 100644 --- a/citydb-database/src/main/java/org/citydb/database/geometry/GeometryException.java +++ b/citydb-database/src/main/java/org/citydb/database/geometry/GeometryException.java @@ -24,7 +24,6 @@ public class GeometryException extends Exception { public GeometryException() { - super(); } public GeometryException(String message) { diff --git a/citydb-database/src/main/java/org/citydb/database/schema/SchemaException.java b/citydb-database/src/main/java/org/citydb/database/schema/SchemaException.java index 3e1ee421..716f03e6 100644 --- a/citydb-database/src/main/java/org/citydb/database/schema/SchemaException.java +++ b/citydb-database/src/main/java/org/citydb/database/schema/SchemaException.java @@ -24,7 +24,6 @@ public class SchemaException extends Exception { public SchemaException() { - super(); } public SchemaException(String message) { diff --git a/citydb-database/src/main/java/org/citydb/database/srs/SrsException.java b/citydb-database/src/main/java/org/citydb/database/srs/SrsException.java index 5bad7e33..92bf8899 100644 --- a/citydb-database/src/main/java/org/citydb/database/srs/SrsException.java +++ b/citydb-database/src/main/java/org/citydb/database/srs/SrsException.java @@ -24,7 +24,6 @@ public class SrsException extends Exception { public SrsException() { - super(); } public SrsException(String message) { diff --git a/citydb-io-citygml/src/main/java/org/citydb/io/citygml/builder/ModelBuildException.java b/citydb-io-citygml/src/main/java/org/citydb/io/citygml/builder/ModelBuildException.java index 40a1fd19..6054eb8d 100644 --- a/citydb-io-citygml/src/main/java/org/citydb/io/citygml/builder/ModelBuildException.java +++ b/citydb-io-citygml/src/main/java/org/citydb/io/citygml/builder/ModelBuildException.java @@ -24,7 +24,6 @@ public class ModelBuildException extends Exception { public ModelBuildException() { - super(); } public ModelBuildException(String message) { diff --git a/citydb-io-citygml/src/main/java/org/citydb/io/citygml/serializer/ModelSerializeException.java b/citydb-io-citygml/src/main/java/org/citydb/io/citygml/serializer/ModelSerializeException.java index 0f7618d0..1e33f9c1 100644 --- a/citydb-io-citygml/src/main/java/org/citydb/io/citygml/serializer/ModelSerializeException.java +++ b/citydb-io-citygml/src/main/java/org/citydb/io/citygml/serializer/ModelSerializeException.java @@ -24,7 +24,6 @@ public class ModelSerializeException extends Exception { public ModelSerializeException() { - super(); } public ModelSerializeException(String message) { diff --git a/citydb-io/src/main/java/org/citydb/io/IOAdapterException.java b/citydb-io/src/main/java/org/citydb/io/IOAdapterException.java index 3082de89..5ea6bc50 100644 --- a/citydb-io/src/main/java/org/citydb/io/IOAdapterException.java +++ b/citydb-io/src/main/java/org/citydb/io/IOAdapterException.java @@ -24,7 +24,6 @@ public class IOAdapterException extends Exception { public IOAdapterException() { - super(); } public IOAdapterException(String message) { diff --git a/citydb-io/src/main/java/org/citydb/io/reader/ReadException.java b/citydb-io/src/main/java/org/citydb/io/reader/ReadException.java index 2f321304..2b2ba21b 100644 --- a/citydb-io/src/main/java/org/citydb/io/reader/ReadException.java +++ b/citydb-io/src/main/java/org/citydb/io/reader/ReadException.java @@ -24,7 +24,6 @@ public class ReadException extends Exception { public ReadException() { - super(); } public ReadException(String message) { diff --git a/citydb-io/src/main/java/org/citydb/io/reader/filter/FilterException.java b/citydb-io/src/main/java/org/citydb/io/reader/filter/FilterException.java index 66b6c276..0a5d1385 100644 --- a/citydb-io/src/main/java/org/citydb/io/reader/filter/FilterException.java +++ b/citydb-io/src/main/java/org/citydb/io/reader/filter/FilterException.java @@ -24,7 +24,6 @@ public class FilterException extends Exception { public FilterException() { - super(); } public FilterException(String message) { diff --git a/citydb-io/src/main/java/org/citydb/io/validator/ValidateException.java b/citydb-io/src/main/java/org/citydb/io/validator/ValidateException.java index 8f0a6d47..654940be 100644 --- a/citydb-io/src/main/java/org/citydb/io/validator/ValidateException.java +++ b/citydb-io/src/main/java/org/citydb/io/validator/ValidateException.java @@ -24,7 +24,6 @@ public class ValidateException extends Exception { public ValidateException() { - super(); } public ValidateException(String message) { diff --git a/citydb-io/src/main/java/org/citydb/io/writer/WriteException.java b/citydb-io/src/main/java/org/citydb/io/writer/WriteException.java index 0b99fdfa..16c4bf4a 100644 --- a/citydb-io/src/main/java/org/citydb/io/writer/WriteException.java +++ b/citydb-io/src/main/java/org/citydb/io/writer/WriteException.java @@ -24,7 +24,6 @@ public class WriteException extends Exception { public WriteException() { - super(); } public WriteException(String message) { diff --git a/citydb-operation/src/main/java/org/citydb/operation/deleter/DeleteException.java b/citydb-operation/src/main/java/org/citydb/operation/deleter/DeleteException.java index da36819e..446b0f5f 100644 --- a/citydb-operation/src/main/java/org/citydb/operation/deleter/DeleteException.java +++ b/citydb-operation/src/main/java/org/citydb/operation/deleter/DeleteException.java @@ -24,7 +24,6 @@ public class DeleteException extends Exception { public DeleteException() { - super(); } public DeleteException(String message) { diff --git a/citydb-operation/src/main/java/org/citydb/operation/exporter/ExportException.java b/citydb-operation/src/main/java/org/citydb/operation/exporter/ExportException.java index b2e92564..fa6a9852 100644 --- a/citydb-operation/src/main/java/org/citydb/operation/exporter/ExportException.java +++ b/citydb-operation/src/main/java/org/citydb/operation/exporter/ExportException.java @@ -24,7 +24,6 @@ public class ExportException extends Exception { public ExportException() { - super(); } public ExportException(String message) { diff --git a/citydb-operation/src/main/java/org/citydb/operation/importer/ImportException.java b/citydb-operation/src/main/java/org/citydb/operation/importer/ImportException.java index 414248b1..7a768d67 100644 --- a/citydb-operation/src/main/java/org/citydb/operation/importer/ImportException.java +++ b/citydb-operation/src/main/java/org/citydb/operation/importer/ImportException.java @@ -24,7 +24,6 @@ public class ImportException extends Exception { public ImportException() { - super(); } public ImportException(String message) { diff --git a/citydb-plugin/src/main/java/org/citydb/plugin/PluginException.java b/citydb-plugin/src/main/java/org/citydb/plugin/PluginException.java index cb7a2340..50cda8af 100644 --- a/citydb-plugin/src/main/java/org/citydb/plugin/PluginException.java +++ b/citydb-plugin/src/main/java/org/citydb/plugin/PluginException.java @@ -24,7 +24,6 @@ public class PluginException extends Exception { public PluginException() { - super(); } public PluginException(String message) { diff --git a/citydb-query/src/main/java/org/citydb/query/builder/QueryBuildException.java b/citydb-query/src/main/java/org/citydb/query/builder/QueryBuildException.java index 251eca01..dbf376e2 100644 --- a/citydb-query/src/main/java/org/citydb/query/builder/QueryBuildException.java +++ b/citydb-query/src/main/java/org/citydb/query/builder/QueryBuildException.java @@ -24,7 +24,6 @@ public class QueryBuildException extends Exception { public QueryBuildException() { - super(); } public QueryBuildException(String message) { diff --git a/citydb-query/src/main/java/org/citydb/query/builder/schema/SchemaPathException.java b/citydb-query/src/main/java/org/citydb/query/builder/schema/SchemaPathException.java index 3b0fa12b..668cd5a0 100644 --- a/citydb-query/src/main/java/org/citydb/query/builder/schema/SchemaPathException.java +++ b/citydb-query/src/main/java/org/citydb/query/builder/schema/SchemaPathException.java @@ -24,7 +24,6 @@ public class SchemaPathException extends Exception { public SchemaPathException() { - super(); } public SchemaPathException(String message) { diff --git a/citydb-query/src/main/java/org/citydb/query/filter/encoding/FilterParseException.java b/citydb-query/src/main/java/org/citydb/query/filter/encoding/FilterParseException.java index 273869f9..37da109c 100644 --- a/citydb-query/src/main/java/org/citydb/query/filter/encoding/FilterParseException.java +++ b/citydb-query/src/main/java/org/citydb/query/filter/encoding/FilterParseException.java @@ -24,7 +24,6 @@ public class FilterParseException extends Exception { public FilterParseException() { - super(); } public FilterParseException(String message) { diff --git a/citydb-util/src/main/java/org/citydb/util/csv/IdListException.java b/citydb-util/src/main/java/org/citydb/util/csv/IdListException.java index 044fd328..56f929e7 100644 --- a/citydb-util/src/main/java/org/citydb/util/csv/IdListException.java +++ b/citydb-util/src/main/java/org/citydb/util/csv/IdListException.java @@ -24,7 +24,6 @@ public class IdListException extends Exception { public IdListException() { - super(); } public IdListException(String message) { diff --git a/citydb-util/src/main/java/org/citydb/util/tiling/TilingException.java b/citydb-util/src/main/java/org/citydb/util/tiling/TilingException.java index 59b70242..fede75e7 100644 --- a/citydb-util/src/main/java/org/citydb/util/tiling/TilingException.java +++ b/citydb-util/src/main/java/org/citydb/util/tiling/TilingException.java @@ -24,7 +24,6 @@ public class TilingException extends Exception { public TilingException() { - super(); } public TilingException(String message) {