(logging-log4j2) branch 2.x updated: Make deprecated final

[pkarwasz]

This is an automated email from the ASF dual-hosted git repository.

pkarwasz pushed a commit to branch 2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git


The following commit(s) were added to refs/heads/2.x by this push:
     new 1de79b91a2 Make deprecated  final
1de79b91a2 is described below

commit 1de79b91a222b56ca9cff9a376c1cd95ce405f59
Author: Piotr P. Karwasz <piotr.git...@karwasz.org>
AuthorDate: Thu Nov 16 09:36:49 2023 +0100

    Make deprecated  final
---
 .../java/org/apache/logging/log4j/message/StructuredDataId.java     | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git 
a/log4j-api/src/main/java/org/apache/logging/log4j/message/StructuredDataId.java
 
b/log4j-api/src/main/java/org/apache/logging/log4j/message/StructuredDataId.java
index f2068d2650..d4bfb91cb1 100644
--- 
a/log4j-api/src/main/java/org/apache/logging/log4j/message/StructuredDataId.java
+++ 
b/log4j-api/src/main/java/org/apache/logging/log4j/message/StructuredDataId.java
@@ -18,6 +18,7 @@ package org.apache.logging.log4j.message;
 
 import java.io.Serializable;
 
+import aQute.bnd.annotation.baseline.BaselineIgnore;
 import com.google.errorprone.annotations.InlineMe;
 import org.apache.logging.log4j.util.StringBuilderFormattable;
 import org.apache.logging.log4j.util.Strings;
@@ -252,7 +253,10 @@ public class StructuredDataId implements Serializable, 
StringBuilderFormattable
      * @deprecated Use {@link StructuredDataId#makeId(String, String)} instead
      */
     @Deprecated
-    public StructuredDataId makeId(final String defaultId, final int 
anEnterpriseNumber) {
+    // This method should have been `final` from the start, we don't expect 
anyone to override it.
+    @BaselineIgnore("2.22.0")
+    @InlineMe(replacement = "this.makeId(defaultId, 
String.valueOf(anEnterpriseNumber))")
+    public final StructuredDataId makeId(final String defaultId, final int 
anEnterpriseNumber) {
         return makeId(defaultId, String.valueOf(anEnterpriseNumber));
     }