Skip to content

Commit aa7431f

Browse files
authored
Merge pull request #544 from logstash/remove_writeVersionAsString
Remove deprecated writeVersionAsString
2 parents c653de7 + 746c5aa commit aa7431f

7 files changed

Lines changed: 0 additions & 114 deletions

File tree

src/main/java/net/logstash/logback/LogstashAccessFormatter.java

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -272,24 +272,6 @@ public void setVersion(String version) {
272272
this.versionProvider.setVersion(version);
273273
}
274274

275-
276-
/**
277-
* @deprecated Use {@link #isWriteVersionAsInteger()}
278-
* @return true if the version should be written as a string
279-
*/
280-
@Deprecated
281-
public boolean isWriteVersionAsString() {
282-
return this.versionProvider.isWriteAsString();
283-
}
284-
/**
285-
* @deprecated Use {@link #setWriteVersionAsInteger(boolean)}
286-
* @param writeVersionAsString true if the version should be written as a string
287-
*/
288-
@Deprecated
289-
public void setWriteVersionAsString(boolean writeVersionAsString) {
290-
this.versionProvider.setWriteAsString(writeVersionAsString);
291-
}
292-
293275
public boolean isWriteVersionAsInteger() {
294276
return this.versionProvider.isWriteAsInteger();
295277
}

src/main/java/net/logstash/logback/LogstashFormatter.java

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -330,24 +330,6 @@ public void setVersion(String version) {
330330
this.versionProvider.setVersion(version);
331331
}
332332

333-
334-
/**
335-
* @deprecated Use {@link #isWriteVersionAsInteger()}
336-
* @return true if the version should be written as a string
337-
*/
338-
@Deprecated
339-
public boolean isWriteVersionAsString() {
340-
return this.versionProvider.isWriteAsString();
341-
}
342-
/**
343-
* @deprecated Use {@link #setWriteVersionAsInteger(boolean)}
344-
* @param writeVersionAsString true if the version should be written as a string
345-
*/
346-
@Deprecated
347-
public void setWriteVersionAsString(boolean writeVersionAsString) {
348-
this.versionProvider.setWriteAsString(writeVersionAsString);
349-
}
350-
351333
public boolean isWriteVersionAsInteger() {
352334
return this.versionProvider.isWriteAsInteger();
353335
}

src/main/java/net/logstash/logback/composite/LogstashVersionJsonProvider.java

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -76,21 +76,6 @@ public void setVersion(String version) {
7676
}
7777
}
7878

79-
/**
80-
* @deprecated Use {@link #isWriteAsInteger()}
81-
*/
82-
@Deprecated
83-
public boolean isWriteAsString() {
84-
return !isWriteAsInteger();
85-
}
86-
/**
87-
* @deprecated Use {@link #setWriteAsInteger(boolean)}
88-
*/
89-
@Deprecated
90-
public void setWriteAsString(boolean writeAsString) {
91-
setWriteAsInteger(!writeAsString);
92-
}
93-
9479
public boolean isWriteAsInteger() {
9580
return writeAsInteger;
9681
}

src/main/java/net/logstash/logback/encoder/LogstashAccessEncoder.java

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -121,21 +121,6 @@ public void setVersion(String version) {
121121
getFormatter().setVersion(version);
122122
}
123123

124-
/**
125-
* @deprecated Use {@link #isWriteVersionAsInteger()}
126-
*/
127-
@Deprecated
128-
public boolean isWriteVersionAsString() {
129-
return getFormatter().isWriteVersionAsString();
130-
}
131-
/**
132-
* @deprecated Use {@link #setWriteVersionAsInteger(boolean)}
133-
*/
134-
@Deprecated
135-
public void setWriteVersionAsString(boolean writeVersionAsString) {
136-
getFormatter().setWriteVersionAsString(writeVersionAsString);
137-
}
138-
139124
public boolean isWriteVersionAsInteger() {
140125
return getFormatter().isWriteVersionAsInteger();
141126
}

src/main/java/net/logstash/logback/encoder/LogstashEncoder.java

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -178,22 +178,6 @@ public void setVersion(String version) {
178178
getFormatter().setVersion(version);
179179
}
180180

181-
182-
/**
183-
* @deprecated Use {@link #isWriteVersionAsInteger()}
184-
*/
185-
@Deprecated
186-
public boolean isWriteVersionAsString() {
187-
return getFormatter().isWriteVersionAsString();
188-
}
189-
/**
190-
* @deprecated Use {@link #setWriteVersionAsInteger(boolean)}
191-
*/
192-
@Deprecated
193-
public void setWriteVersionAsString(boolean writeVersionAsString) {
194-
getFormatter().setWriteVersionAsString(writeVersionAsString);
195-
}
196-
197181
public boolean isWriteVersionAsInteger() {
198182
return getFormatter().isWriteVersionAsInteger();
199183
}

src/main/java/net/logstash/logback/layout/LogstashAccessLayout.java

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -121,22 +121,6 @@ public void setVersion(String version) {
121121
getFormatter().setVersion(version);
122122
}
123123

124-
125-
/**
126-
* @deprecated Use {@link #isWriteVersionAsInteger()}
127-
*/
128-
@Deprecated
129-
public boolean isWriteVersionAsString() {
130-
return getFormatter().isWriteVersionAsString();
131-
}
132-
/**
133-
* @deprecated Use {@link #setWriteVersionAsInteger(boolean)}
134-
*/
135-
@Deprecated
136-
public void setWriteVersionAsString(boolean writeVersionAsString) {
137-
getFormatter().setWriteVersionAsString(writeVersionAsString);
138-
}
139-
140124
public boolean isWriteVersionAsInteger() {
141125
return getFormatter().isWriteVersionAsInteger();
142126
}

src/main/java/net/logstash/logback/layout/LogstashLayout.java

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -175,22 +175,6 @@ public void setVersion(String version) {
175175
getFormatter().setVersion(version);
176176
}
177177

178-
179-
/**
180-
* @deprecated Use {@link #isWriteVersionAsInteger()}
181-
*/
182-
@Deprecated
183-
public boolean isWriteVersionAsString() {
184-
return getFormatter().isWriteVersionAsString();
185-
}
186-
/**
187-
* @deprecated Use {@link #setWriteVersionAsInteger(boolean)}
188-
*/
189-
@Deprecated
190-
public void setWriteVersionAsString(boolean writeVersionAsString) {
191-
getFormatter().setWriteVersionAsString(writeVersionAsString);
192-
}
193-
194178
public boolean isWriteVersionAsInteger() {
195179
return getFormatter().isWriteVersionAsInteger();
196180
}

0 commit comments

Comments
 (0)