From 746c5aa87bfad28147bf0a3f883d79673b0d822c Mon Sep 17 00:00:00 2001 From: Phil Clay Date: Fri, 25 Jun 2021 18:32:45 -0700 Subject: [PATCH] Remove deprecated writeVersionAsString Use writeVersionAsInteger with opposite value instead --- .../logback/LogstashAccessFormatter.java | 18 ------------------ .../logstash/logback/LogstashFormatter.java | 18 ------------------ .../composite/LogstashVersionJsonProvider.java | 15 --------------- .../logback/encoder/LogstashAccessEncoder.java | 15 --------------- .../logback/encoder/LogstashEncoder.java | 16 ---------------- .../logback/layout/LogstashAccessLayout.java | 16 ---------------- .../logback/layout/LogstashLayout.java | 16 ---------------- 7 files changed, 114 deletions(-) diff --git a/src/main/java/net/logstash/logback/LogstashAccessFormatter.java b/src/main/java/net/logstash/logback/LogstashAccessFormatter.java index a49141b5..363cbb83 100644 --- a/src/main/java/net/logstash/logback/LogstashAccessFormatter.java +++ b/src/main/java/net/logstash/logback/LogstashAccessFormatter.java @@ -272,24 +272,6 @@ public void setVersion(String version) { this.versionProvider.setVersion(version); } - - /** - * @deprecated Use {@link #isWriteVersionAsInteger()} - * @return true if the version should be written as a string - */ - @Deprecated - public boolean isWriteVersionAsString() { - return this.versionProvider.isWriteAsString(); - } - /** - * @deprecated Use {@link #setWriteVersionAsInteger(boolean)} - * @param writeVersionAsString true if the version should be written as a string - */ - @Deprecated - public void setWriteVersionAsString(boolean writeVersionAsString) { - this.versionProvider.setWriteAsString(writeVersionAsString); - } - public boolean isWriteVersionAsInteger() { return this.versionProvider.isWriteAsInteger(); } diff --git a/src/main/java/net/logstash/logback/LogstashFormatter.java b/src/main/java/net/logstash/logback/LogstashFormatter.java index 6f578b76..52ea95f2 100644 --- a/src/main/java/net/logstash/logback/LogstashFormatter.java +++ b/src/main/java/net/logstash/logback/LogstashFormatter.java @@ -330,24 +330,6 @@ public void setVersion(String version) { this.versionProvider.setVersion(version); } - - /** - * @deprecated Use {@link #isWriteVersionAsInteger()} - * @return true if the version should be written as a string - */ - @Deprecated - public boolean isWriteVersionAsString() { - return this.versionProvider.isWriteAsString(); - } - /** - * @deprecated Use {@link #setWriteVersionAsInteger(boolean)} - * @param writeVersionAsString true if the version should be written as a string - */ - @Deprecated - public void setWriteVersionAsString(boolean writeVersionAsString) { - this.versionProvider.setWriteAsString(writeVersionAsString); - } - public boolean isWriteVersionAsInteger() { return this.versionProvider.isWriteAsInteger(); } diff --git a/src/main/java/net/logstash/logback/composite/LogstashVersionJsonProvider.java b/src/main/java/net/logstash/logback/composite/LogstashVersionJsonProvider.java index 0ffc4d45..2f668c7b 100644 --- a/src/main/java/net/logstash/logback/composite/LogstashVersionJsonProvider.java +++ b/src/main/java/net/logstash/logback/composite/LogstashVersionJsonProvider.java @@ -76,21 +76,6 @@ public void setVersion(String version) { } } - /** - * @deprecated Use {@link #isWriteAsInteger()} - */ - @Deprecated - public boolean isWriteAsString() { - return !isWriteAsInteger(); - } - /** - * @deprecated Use {@link #setWriteAsInteger(boolean)} - */ - @Deprecated - public void setWriteAsString(boolean writeAsString) { - setWriteAsInteger(!writeAsString); - } - public boolean isWriteAsInteger() { return writeAsInteger; } diff --git a/src/main/java/net/logstash/logback/encoder/LogstashAccessEncoder.java b/src/main/java/net/logstash/logback/encoder/LogstashAccessEncoder.java index 337a7fe7..cce3d475 100644 --- a/src/main/java/net/logstash/logback/encoder/LogstashAccessEncoder.java +++ b/src/main/java/net/logstash/logback/encoder/LogstashAccessEncoder.java @@ -121,21 +121,6 @@ public void setVersion(String version) { getFormatter().setVersion(version); } - /** - * @deprecated Use {@link #isWriteVersionAsInteger()} - */ - @Deprecated - public boolean isWriteVersionAsString() { - return getFormatter().isWriteVersionAsString(); - } - /** - * @deprecated Use {@link #setWriteVersionAsInteger(boolean)} - */ - @Deprecated - public void setWriteVersionAsString(boolean writeVersionAsString) { - getFormatter().setWriteVersionAsString(writeVersionAsString); - } - public boolean isWriteVersionAsInteger() { return getFormatter().isWriteVersionAsInteger(); } diff --git a/src/main/java/net/logstash/logback/encoder/LogstashEncoder.java b/src/main/java/net/logstash/logback/encoder/LogstashEncoder.java index 007e8cac..a212226c 100644 --- a/src/main/java/net/logstash/logback/encoder/LogstashEncoder.java +++ b/src/main/java/net/logstash/logback/encoder/LogstashEncoder.java @@ -178,22 +178,6 @@ public void setVersion(String version) { getFormatter().setVersion(version); } - - /** - * @deprecated Use {@link #isWriteVersionAsInteger()} - */ - @Deprecated - public boolean isWriteVersionAsString() { - return getFormatter().isWriteVersionAsString(); - } - /** - * @deprecated Use {@link #setWriteVersionAsInteger(boolean)} - */ - @Deprecated - public void setWriteVersionAsString(boolean writeVersionAsString) { - getFormatter().setWriteVersionAsString(writeVersionAsString); - } - public boolean isWriteVersionAsInteger() { return getFormatter().isWriteVersionAsInteger(); } diff --git a/src/main/java/net/logstash/logback/layout/LogstashAccessLayout.java b/src/main/java/net/logstash/logback/layout/LogstashAccessLayout.java index 5c12d5e1..42ff8f80 100644 --- a/src/main/java/net/logstash/logback/layout/LogstashAccessLayout.java +++ b/src/main/java/net/logstash/logback/layout/LogstashAccessLayout.java @@ -121,22 +121,6 @@ public void setVersion(String version) { getFormatter().setVersion(version); } - - /** - * @deprecated Use {@link #isWriteVersionAsInteger()} - */ - @Deprecated - public boolean isWriteVersionAsString() { - return getFormatter().isWriteVersionAsString(); - } - /** - * @deprecated Use {@link #setWriteVersionAsInteger(boolean)} - */ - @Deprecated - public void setWriteVersionAsString(boolean writeVersionAsString) { - getFormatter().setWriteVersionAsString(writeVersionAsString); - } - public boolean isWriteVersionAsInteger() { return getFormatter().isWriteVersionAsInteger(); } diff --git a/src/main/java/net/logstash/logback/layout/LogstashLayout.java b/src/main/java/net/logstash/logback/layout/LogstashLayout.java index 5a577f27..41f7021b 100644 --- a/src/main/java/net/logstash/logback/layout/LogstashLayout.java +++ b/src/main/java/net/logstash/logback/layout/LogstashLayout.java @@ -175,22 +175,6 @@ public void setVersion(String version) { getFormatter().setVersion(version); } - - /** - * @deprecated Use {@link #isWriteVersionAsInteger()} - */ - @Deprecated - public boolean isWriteVersionAsString() { - return getFormatter().isWriteVersionAsString(); - } - /** - * @deprecated Use {@link #setWriteVersionAsInteger(boolean)} - */ - @Deprecated - public void setWriteVersionAsString(boolean writeVersionAsString) { - getFormatter().setWriteVersionAsString(writeVersionAsString); - } - public boolean isWriteVersionAsInteger() { return getFormatter().isWriteVersionAsInteger(); }