Merge pull request #7904 from Stypox/fix-raw-use-of-parameterized-class

Solve Java warning "Raw use of parameterized class"
This commit is contained in:
litetex 2022-02-26 16:14:23 +01:00 committed by GitHub
commit 5be40f62f3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
15 changed files with 85 additions and 89 deletions

View file

@ -8,7 +8,7 @@ import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment;
import com.grack.nanojson.JsonObject;
import com.grack.nanojson.JsonSink;
import com.grack.nanojson.JsonStringWriter;
import org.schabi.newpipe.R;
import org.schabi.newpipe.database.LocalItem.LocalItemType;
@ -132,7 +132,7 @@ public abstract class Tab {
// JSON Handling
//////////////////////////////////////////////////////////////////////////*/
public void writeJsonOn(final JsonSink jsonSink) {
public void writeJsonOn(final JsonStringWriter jsonSink) {
jsonSink.object();
jsonSink.value(JSON_TAB_ID_KEY, getTabId());
@ -141,7 +141,7 @@ public abstract class Tab {
jsonSink.end();
}
protected void writeDataToJson(final JsonSink writerSink) {
protected void writeDataToJson(final JsonStringWriter writerSink) {
// No-op
}
@ -355,7 +355,7 @@ public abstract class Tab {
}
@Override
protected void writeDataToJson(final JsonSink writerSink) {
protected void writeDataToJson(final JsonStringWriter writerSink) {
writerSink.value(JSON_KIOSK_SERVICE_ID_KEY, kioskServiceId)
.value(JSON_KIOSK_ID_KEY, kioskId);
}
@ -437,7 +437,7 @@ public abstract class Tab {
}
@Override
protected void writeDataToJson(final JsonSink writerSink) {
protected void writeDataToJson(final JsonStringWriter writerSink) {
writerSink.value(JSON_CHANNEL_SERVICE_ID_KEY, channelServiceId)
.value(JSON_CHANNEL_URL_KEY, channelUrl)
.value(JSON_CHANNEL_NAME_KEY, channelName);
@ -584,7 +584,7 @@ public abstract class Tab {
}
@Override
protected void writeDataToJson(final JsonSink writerSink) {
protected void writeDataToJson(final JsonStringWriter writerSink) {
writerSink.value(JSON_PLAYLIST_SERVICE_ID_KEY, playlistServiceId)
.value(JSON_PLAYLIST_URL_KEY, playlistUrl)
.value(JSON_PLAYLIST_NAME_KEY, playlistName)