This is an automated email from the ASF dual-hosted git repository.
vavrtom pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git
The following commit(s) were added to refs/heads/main by this push:
new d5f43419fe QPID-8653: [Broker-J] Code cleanup: collection type
arguments, collection factory methods, lambdas (#206)
d5f43419fe is described below
commit d5f43419fe6e93ef697d417bc77949703f0b47c0
Author: Daniil Kirilyuk <[email protected]>
AuthorDate: Mon Aug 7 12:52:02 2023 +0200
QPID-8653: [Broker-J] Code cleanup: collection type arguments, collection
factory methods, lambdas (#206)
---
.../model/ConfiguredObjectFactoryGenerator.java | 2 +-
.../ConfiguredObjectRegistrationGenerator.java | 1 -
.../ManagedAttributeValueTypeValidator.java | 2 +-
.../src/main/java/org/apache/qpid/server/Main.java | 56 ++++++++++------------
4 files changed, 27 insertions(+), 34 deletions(-)
diff --git
a/broker-codegen/src/main/java/org/apache/qpid/server/model/ConfiguredObjectFactoryGenerator.java
b/broker-codegen/src/main/java/org/apache/qpid/server/model/ConfiguredObjectFactoryGenerator.java
index 23cb37169c..7d7db641a3 100644
---
a/broker-codegen/src/main/java/org/apache/qpid/server/model/ConfiguredObjectFactoryGenerator.java
+++
b/broker-codegen/src/main/java/org/apache/qpid/server/model/ConfiguredObjectFactoryGenerator.java
@@ -178,7 +178,7 @@ public class ConfiguredObjectFactoryGenerator extends
AbstractProcessor
pw.println(" }");
pw.println();
- generateAccessCheckedMethods(childClassSimpleName, classElement,
pw, new HashSet<TypeElement>(), new HashSet<String>());
+ generateAccessCheckedMethods(childClassSimpleName, classElement,
pw, new HashSet<>(), new HashSet<>());
pw.println("}");
diff --git
a/broker-codegen/src/main/java/org/apache/qpid/server/model/ConfiguredObjectRegistrationGenerator.java
b/broker-codegen/src/main/java/org/apache/qpid/server/model/ConfiguredObjectRegistrationGenerator.java
index 008d780128..1a407848d0 100644
---
a/broker-codegen/src/main/java/org/apache/qpid/server/model/ConfiguredObjectRegistrationGenerator.java
+++
b/broker-codegen/src/main/java/org/apache/qpid/server/model/ConfiguredObjectRegistrationGenerator.java
@@ -23,7 +23,6 @@ package org.apache.qpid.server.model;
import java.io.IOException;
import java.io.OutputStreamWriter;
import java.io.PrintWriter;
-import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
diff --git
a/broker-codegen/src/main/java/org/apache/qpid/server/model/validation/ManagedAttributeValueTypeValidator.java
b/broker-codegen/src/main/java/org/apache/qpid/server/model/validation/ManagedAttributeValueTypeValidator.java
index c0272ebd3c..7b68edf178 100644
---
a/broker-codegen/src/main/java/org/apache/qpid/server/model/validation/ManagedAttributeValueTypeValidator.java
+++
b/broker-codegen/src/main/java/org/apache/qpid/server/model/validation/ManagedAttributeValueTypeValidator.java
@@ -86,7 +86,7 @@ public class ManagedAttributeValueTypeValidator extends
AbstractProcessor
private void checkAllMethodsAreAccessors(final Element e, final boolean
isAbstract)
{
- checkAllMethodsAreAccessors(e, new HashSet<Element>(), isAbstract);
+ checkAllMethodsAreAccessors(e, new HashSet<>(), isAbstract);
}
private void checkAllMethodsAreAccessors(final Element e, Set<Element>
checked, final boolean isAbstract)
diff --git a/broker/src/main/java/org/apache/qpid/server/Main.java
b/broker/src/main/java/org/apache/qpid/server/Main.java
index 11490212fa..c2ed6fa3c6 100644
--- a/broker/src/main/java/org/apache/qpid/server/Main.java
+++ b/broker/src/main/java/org/apache/qpid/server/Main.java
@@ -461,40 +461,34 @@ public class Main
if(handler == null)
{
- handler =
- new Thread.UncaughtExceptionHandler()
+ handler = (thread, exception) ->
+ {
+ boolean continueOnError =
Boolean.getBoolean("qpid.broker.exceptionHandler.continue");
+ try
+ {
+
System.err.println("########################################################################");
+ System.err.println("#");
+ System.err.print("# Unhandled Exception ");
+ System.err.print(exception.toString());
+ System.err.print(" in Thread ");
+ System.err.println(thread.getName());
+ System.err.println("#");
+ System.err.println(continueOnError ? "# Forced to continue
by JVM setting 'qpid.broker.exceptionHandler.continue'" : "# Exiting");
+ System.err.println("#");
+
System.err.println("########################################################################");
+ exception.printStackTrace(System.err);
+
+ Logger logger =
LoggerFactory.getLogger("org.apache.qpid.server.Main");
+ logger.error("Uncaught exception, " + (continueOnError ?
"continuing." : "shutting down."), exception);
+ }
+ finally
{
- @Override
- public void uncaughtException(final Thread t, final
Throwable e)
+ if (!continueOnError)
{
- boolean continueOnError =
Boolean.getBoolean("qpid.broker.exceptionHandler.continue");
- try
- {
-
System.err.println("########################################################################");
- System.err.println("#");
- System.err.print("# Unhandled Exception ");
- System.err.print(e.toString());
- System.err.print(" in Thread ");
- System.err.println(t.getName());
- System.err.println("#");
- System.err.println(continueOnError ? "# Forced to
continue by JVM setting 'qpid.broker.exceptionHandler.continue'" : "# Exiting");
- System.err.println("#");
-
System.err.println("########################################################################");
- e.printStackTrace(System.err);
-
- Logger logger =
LoggerFactory.getLogger("org.apache.qpid.server.Main");
- logger.error("Uncaught exception, " +
(continueOnError ? "continuing." : "shutting down."), e);
- }
- finally
- {
- if (!continueOnError)
- {
- Runtime.getRuntime().halt(1);
- }
- }
-
+ Runtime.getRuntime().halt(1);
}
- };
+ }
+ };
Thread.setDefaultUncaughtExceptionHandler(handler);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
