Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 2 additions & 8 deletions src/main/java/emissary/core/BaseDataObject.java
Original file line number Diff line number Diff line change
Expand Up @@ -1136,20 +1136,14 @@ public void setFileType(@Nullable final String v) {
}

@Override
@Deprecated
public boolean setFileTypeIfEmpty(final String v, final String[] empties) {
if (isFileTypeEmpty(empties)) {
public boolean setFileTypeIfEmpty(final String v) {
if (isFileTypeEmpty(this.emptyFileTypes)) {
setFileType(v);
return true;
}
return false;
}

@Override
public boolean setFileTypeIfEmpty(final String v) {
return setFileTypeIfEmpty(v, this.emptyFileTypes);
}

@Override
public boolean isFileTypeEmpty() {
return isFileTypeEmpty(this.emptyFileTypes);
Expand Down
12 changes: 0 additions & 12 deletions src/main/java/emissary/core/IBaseDataObject.java
Original file line number Diff line number Diff line change
Expand Up @@ -486,18 +486,6 @@ default String getParameterAsConcatString(final String key, final String sep) {
*/
void setFileType(String arg1);

/**
* Set FILETYPE parameter iff empty.
*
* @param arg1 the value of the filetype to set
* @param arg2 the list of things caller considers equal to being empty
* @return true if it was empty and set
* @deprecated Use {@link #setFileType(String)} instead.
*/
@Deprecated
@SuppressWarnings("AvoidObjectArrays")
boolean setFileTypeIfEmpty(String arg1, String[] arg2);

/**
* Set FILETYPE parameter iff empty using the built-in definition of empty
*
Expand Down
4 changes: 0 additions & 4 deletions src/test/java/emissary/core/BaseDataObjectTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -567,10 +567,6 @@ void testFontEncoding() {
void testFileTypeIsEmpty() {
this.b.setFileType(Form.UNKNOWN);
assertTrue(this.b.isFileTypeEmpty(), "Unknown form must count as empty");
this.b.setFileType("BAR");
final String[] fakeEmpties = {Form.UNKNOWN, "FOO", "BAR"};
assertTrue(this.b.setFileTypeIfEmpty("BAZ", fakeEmpties), "Unknown form must count as empty when passing in list");
assertEquals("BAZ", this.b.getFileType(), "Failed to use supplied list of empty forms " + Arrays.asList(fakeEmpties));

this.b.setFileType("TEST-UNWRAPPED");
assertTrue(this.b.setFileTypeIfEmpty("ZAZ"), "Unknown form must count as empty when passing in list");
Expand Down
Loading