Merge pull request #544 from logstash/remove_writeVersionAsString

Remove deprecated writeVersionAsString
logfellow · Jun 26, 2021 · aa7431f · aa7431f
2 parents c653de7 + 746c5aa
commit aa7431f
Show file tree

Hide file tree

Showing 7 changed files with 0 additions and 114 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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();
     }