Skip to content

Commit f736ae5

Browse files
committed
Added validation for MediaFormats
1 parent 669a2b6 commit f736ae5

File tree

5 files changed

+31
-15
lines changed

5 files changed

+31
-15
lines changed

extractor/src/main/java/org/schabi/newpipe/extractor/streamdata/format/AbstractMediaFormat.java

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
import java.util.Objects;
44

5+
import javax.annotation.Nonnull;
6+
57
public abstract class AbstractMediaFormat implements MediaFormat {
68
private final int id;
79
private final String name;
@@ -10,31 +12,34 @@ public abstract class AbstractMediaFormat implements MediaFormat {
1012

1113
protected AbstractMediaFormat(
1214
final int id,
13-
final String name,
14-
final String suffix,
15-
final String mimeType
15+
@Nonnull final String name,
16+
@Nonnull final String suffix,
17+
@Nonnull final String mimeType
1618
) {
1719
this.id = id;
18-
this.name = name;
19-
this.suffix = suffix;
20-
this.mimeType = mimeType;
20+
this.name = Objects.requireNonNull(name);
21+
this.suffix = Objects.requireNonNull(suffix);
22+
this.mimeType = Objects.requireNonNull(mimeType);
2123
}
2224

2325
@Override
2426
public int id() {
2527
return id;
2628
}
2729

30+
@Nonnull
2831
@Override
2932
public String name() {
3033
return name;
3134
}
3235

36+
@Nonnull
3337
@Override
3438
public String suffix() {
3539
return suffix;
3640
}
3741

42+
@Nonnull
3843
@Override
3944
public String mimeType() {
4045
return mimeType;

extractor/src/main/java/org/schabi/newpipe/extractor/streamdata/format/AudioMediaFormat.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
package org.schabi.newpipe.extractor.streamdata.format;
22

3+
import javax.annotation.Nonnull;
4+
35
public class AudioMediaFormat extends AbstractMediaFormat {
46
public AudioMediaFormat(
57
final int id,
6-
final String name,
7-
final String suffix,
8-
final String mimeType
8+
@Nonnull final String name,
9+
@Nonnull final String suffix,
10+
@Nonnull final String mimeType
911
) {
1012
super(id, name, suffix, mimeType);
1113
}
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,17 @@
11
package org.schabi.newpipe.extractor.streamdata.format;
22

3+
import javax.annotation.Nonnull;
4+
35
public interface MediaFormat {
46

57
int id();
68

9+
@Nonnull
710
String name();
811

12+
@Nonnull
913
String suffix();
1014

15+
@Nonnull
1116
String mimeType();
1217
}

extractor/src/main/java/org/schabi/newpipe/extractor/streamdata/format/SubtitleMediaFormat.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
package org.schabi.newpipe.extractor.streamdata.format;
22

3+
import javax.annotation.Nonnull;
4+
35
public class SubtitleMediaFormat extends AbstractMediaFormat {
46
public SubtitleMediaFormat(
57
final int id,
6-
final String name,
7-
final String suffix,
8-
final String mimeType
8+
@Nonnull final String name,
9+
@Nonnull final String suffix,
10+
@Nonnull final String mimeType
911
) {
1012
super(id, name, suffix, mimeType);
1113
}

extractor/src/main/java/org/schabi/newpipe/extractor/streamdata/format/VideoAudioMediaFormat.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
package org.schabi.newpipe.extractor.streamdata.format;
22

3+
import javax.annotation.Nonnull;
4+
35
public class VideoAudioMediaFormat extends AbstractMediaFormat {
46
public VideoAudioMediaFormat(
57
final int id,
6-
final String name,
7-
final String suffix,
8-
final String mimeType
8+
@Nonnull final String name,
9+
@Nonnull final String suffix,
10+
@Nonnull final String mimeType
911
) {
1012
super(id, name, suffix, mimeType);
1113
}

0 commit comments

Comments
 (0)