diff --git a/.classpath b/.classpath index 5e8a55f..edc78db 100644 --- a/.classpath +++ b/.classpath @@ -8,13 +8,14 @@ + - - + + diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs index 4f67541..f5935fa 100644 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/.settings/org.eclipse.jdt.core.prefs @@ -20,9 +20,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary= org.eclipse.jdt.core.compiler.annotation.nullanalysis=enabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -129,10 +129,11 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=error org.eclipse.jdt.core.compiler.problem.unusedWarningToken=error org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=error -org.eclipse.jdt.core.compiler.release=disabled -org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=21 org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false +org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 @@ -140,19 +141,22 @@ org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_c org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_assignment=0 -org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16 org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 org.eclipse.jdt.core.formatter.alignment_for_expressions_in_for_loop_header=0 +org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16 org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 +org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16 org.eclipse.jdt.core.formatter.alignment_for_parameterized_type_references=0 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80 org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16 org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 @@ -241,11 +245,12 @@ org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert @@ -276,6 +281,8 @@ org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert +org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert @@ -300,13 +307,17 @@ org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert +org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert @@ -354,6 +365,8 @@ org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do no org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert +org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert @@ -390,9 +403,12 @@ org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not inser org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert +org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert +org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert @@ -428,9 +444,13 @@ org.eclipse.jdt.core.formatter.tabulation.char=space org.eclipse.jdt.core.formatter.tabulation.size=4 org.eclipse.jdt.core.formatter.use_on_off_tags=false org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false +org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true org.eclipse.jdt.core.formatter.wrap_before_assignment_operator=false -org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true +org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true org.eclipse.jdt.core.formatter.wrap_before_conditional_operator=true +org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true +org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true +org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true org.eclipse.jdt.core.javaFormatter=org.eclipse.jdt.core.defaultJavaFormatter diff --git a/pom.xml b/pom.xml index 16b1ece..c55d0c7 100644 --- a/pom.xml +++ b/pom.xml @@ -42,8 +42,8 @@ UTF-8 - 1.8 - 1.8 + 21 + 21 MIT diff --git a/src/main/java/org/eclipse/tracecompass/trace_event_logger/LogUtils.java b/src/main/java/org/eclipse/tracecompass/trace_event_logger/LogUtils.java index 41bf936..1cb4598 100644 --- a/src/main/java/org/eclipse/tracecompass/trace_event_logger/LogUtils.java +++ b/src/main/java/org/eclipse/tracecompass/trace_event_logger/LogUtils.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2024 Ericsson + * Copyright (c) 2024, 2025 Ericsson * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the “Software”), to deal @@ -112,9 +112,9 @@ * * This class is not intended to be instantiated by clients. It * is a helper class. - + * @author Matthew Khouzam - * + * */ public final class LogUtils { @@ -231,7 +231,7 @@ public ScopeLog(Logger log, Level level, String label, Object... args) { fTime = System.nanoTime(); fLogger = log; fLevel = level; - fThreadId = Thread.currentThread().getId(); + fThreadId = Thread.currentThread().threadId(); fLabel = label; char phase = 'B'; validateArgs(args); @@ -471,7 +471,7 @@ private FlowScopeLog(Logger log, Level level, String label, String category, int fLevel = level; fCategory = category; fLabel = label; - fThreadId = Thread.currentThread().getId(); + fThreadId = Thread.currentThread().threadId(); char phaseB = 'B'; validateArgs(args); Supplier msgSupplier = () -> { @@ -590,7 +590,7 @@ public void close() { */ public static int traceObjectCreation(Logger logger, Level level, Object item) { long time = System.nanoTime(); - long threadId = Thread.currentThread().getId(); + long threadId = Thread.currentThread().threadId(); int identityHashCode = System.identityHashCode(item); char phase = 'N'; Supplier msgSupplier = () -> { @@ -621,7 +621,7 @@ public static int traceObjectCreation(Logger logger, Level level, Object item) { */ public static void traceObjectDestruction(Logger logger, Level level, Object item) { long time = System.nanoTime(); - long threadId = Thread.currentThread().getId(); + long threadId = Thread.currentThread().threadId(); char phase = 'D'; Supplier msgSupplier = () -> { StringBuilder sb = new StringBuilder(); @@ -651,7 +651,7 @@ public static void traceObjectDestruction(Logger logger, Level level, Object ite */ public static void traceObjectDestruction(Logger logger, Level level, Object item, int uniqueId) { long time = System.nanoTime(); - long threadId = Thread.currentThread().getId(); + long threadId = Thread.currentThread().threadId(); char phase = 'D'; Supplier msgSupplier = () -> { StringBuilder sb = new StringBuilder(); @@ -684,7 +684,7 @@ public static void traceObjectDestruction(Logger logger, Level level, Object ite */ public static void traceAsyncStart(Logger logger, Level level, String name, String category, int id, Object... args) { long time = System.nanoTime(); - long threadId = Thread.currentThread().getId(); + long threadId = Thread.currentThread().threadId(); char phase = 'b'; validateArgs(args); Supplier msgSupplier = () -> { @@ -719,7 +719,7 @@ public static void traceAsyncStart(Logger logger, Level level, String name, Stri */ public static void traceAsyncNested(Logger logger, Level level, String name, String category, int id, Object... args) { long time = System.nanoTime(); - long threadId = Thread.currentThread().getId(); + long threadId = Thread.currentThread().threadId(); char phase = 'n'; validateArgs(args); Supplier msgSupplier = () -> { @@ -754,7 +754,7 @@ public static void traceAsyncNested(Logger logger, Level level, String name, Str */ public static void traceAsyncEnd(Logger logger, Level level, String name, String category, int id, Object... args) { long time = System.nanoTime(); - long threadId = Thread.currentThread().getId(); + long threadId = Thread.currentThread().threadId(); char phase = 'e'; validateArgs(args); Supplier msgSupplier = () -> { @@ -788,7 +788,7 @@ public static void traceAsyncEnd(Logger logger, Level level, String name, String */ public static void traceInstant(Logger logger, Level level, String name, Object... args) { long time = System.nanoTime(); - long threadId = Thread.currentThread().getId(); + long threadId = Thread.currentThread().threadId(); char phase = 'i'; validateArgs(args); Supplier msgSupplier = () -> { @@ -816,7 +816,7 @@ public static void traceInstant(Logger logger, Level level, String name, Object. */ public static void traceCounter(Logger logger, Level level, String name, Object... args) { long time = System.nanoTime(); - long threadId = Thread.currentThread().getId(); + long threadId = Thread.currentThread().threadId(); char phase = 'C'; validateArgs(args); Supplier msgSupplier = () -> { @@ -848,7 +848,7 @@ public static void traceCounter(Logger logger, Level level, String name, Object. */ public static void traceMarker(Logger logger, Level level, String name, long duration, Object... args) { long time = System.nanoTime(); - long threadId = Thread.currentThread().getId(); + long threadId = Thread.currentThread().threadId(); char phase = 'R'; validateArgs(args); Supplier msgSupplier = () -> { diff --git a/src/test/java/org/eclipse/tracecompass/trace_event_logger/OldLogUtils.java b/src/test/java/org/eclipse/tracecompass/trace_event_logger/OldLogUtils.java index 0686677..0a25641 100644 --- a/src/test/java/org/eclipse/tracecompass/trace_event_logger/OldLogUtils.java +++ b/src/test/java/org/eclipse/tracecompass/trace_event_logger/OldLogUtils.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2024 Ericsson + * Copyright (c) 2024, 2025 Ericsson * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the “Software”), to deal @@ -194,7 +194,7 @@ public ScopeLog(Logger log, Level level, String label, Object... args) { fTime = System.nanoTime(); fLogger = log; fLevel = level; - fThreadId = Thread.currentThread().getId(); + fThreadId = Thread.currentThread().threadId(); fLabel = label; char phase = 'B'; Supplier msgSupplier = () -> { @@ -435,7 +435,7 @@ private FlowScopeLog(Logger log, Level level, String label, String category, int fLogger = log; fLevel = level; fCategory = category; - fThreadId = Thread.currentThread().getId(); + fThreadId = Thread.currentThread().threadId(); char phaseB = 'B'; Supplier msgSupplier = () -> { StringBuilder sb = new StringBuilder(); @@ -552,7 +552,7 @@ public void close() { */ public static int traceObjectCreation(Logger logger, Level level, Object item) { long time = System.nanoTime(); - long threadId = Thread.currentThread().getId(); + long threadId = Thread.currentThread().threadId(); int identityHashCode = System.identityHashCode(item); char phase = 'N'; Supplier msgSupplier = () -> { @@ -583,7 +583,7 @@ public static int traceObjectCreation(Logger logger, Level level, Object item) { */ public static void traceObjectDestruction(Logger logger, Level level, Object item) { long time = System.nanoTime(); - long threadId = Thread.currentThread().getId(); + long threadId = Thread.currentThread().threadId(); char phase = 'D'; Supplier msgSupplier = () -> { StringBuilder sb = new StringBuilder(); @@ -613,7 +613,7 @@ public static void traceObjectDestruction(Logger logger, Level level, Object ite */ public static void traceObjectDestruction(Logger logger, Level level, Object item, int uniqueId) { long time = System.nanoTime(); - long threadId = Thread.currentThread().getId(); + long threadId = Thread.currentThread().threadId(); char phase = 'D'; Supplier msgSupplier = () -> { StringBuilder sb = new StringBuilder(); @@ -647,7 +647,7 @@ public static void traceObjectDestruction(Logger logger, Level level, Object ite public static void traceAsyncStart(Logger logger, Level level, String name, String category, int id, Object... args) { long time = System.nanoTime(); - long threadId = Thread.currentThread().getId(); + long threadId = Thread.currentThread().threadId(); char phase = 'b'; Supplier msgSupplier = () -> { StringBuilder sb = new StringBuilder(); @@ -682,7 +682,7 @@ public static void traceAsyncStart(Logger logger, Level level, String name, Stri public static void traceAsyncNested(Logger logger, Level level, String name, String category, int id, Object... args) { long time = System.nanoTime(); - long threadId = Thread.currentThread().getId(); + long threadId = Thread.currentThread().threadId(); char phase = 'n'; Supplier msgSupplier = () -> { StringBuilder sb = new StringBuilder(); @@ -716,7 +716,7 @@ public static void traceAsyncNested(Logger logger, Level level, String name, Str */ public static void traceAsyncEnd(Logger logger, Level level, String name, String category, int id, Object... args) { long time = System.nanoTime(); - long threadId = Thread.currentThread().getId(); + long threadId = Thread.currentThread().threadId(); char phase = 'e'; Supplier msgSupplier = () -> { StringBuilder sb = new StringBuilder(); @@ -749,7 +749,7 @@ public static void traceAsyncEnd(Logger logger, Level level, String name, String */ public static void traceInstant(Logger logger, Level level, String name, Object... args) { long time = System.nanoTime(); - long threadId = Thread.currentThread().getId(); + long threadId = Thread.currentThread().threadId(); char phase = 'i'; Supplier msgSupplier = () -> { StringBuilder sb = new StringBuilder(); @@ -776,7 +776,7 @@ public static void traceInstant(Logger logger, Level level, String name, Object. */ public static void traceCounter(Logger logger, Level level, String name, Object... args) { long time = System.nanoTime(); - long threadId = Thread.currentThread().getId(); + long threadId = Thread.currentThread().threadId(); char phase = 'C'; Supplier msgSupplier = () -> { StringBuilder sb = new StringBuilder(); @@ -807,7 +807,7 @@ public static void traceCounter(Logger logger, Level level, String name, Object. */ public static void traceMarker(Logger logger, Level level, String name, long duration, Object... args) { long time = System.nanoTime(); - long threadId = Thread.currentThread().getId(); + long threadId = Thread.currentThread().threadId(); char phase = 'R'; Supplier msgSupplier = () -> { StringBuilder sb = new StringBuilder();