Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Change private access modifiers for constants in MediaType #6042

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Change private access modifiers for constants in MediaType #6042

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
58 changes: 29 additions & 29 deletions android/guava-tests/test/com/google/common/net/MediaTypeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,15 +133,15 @@ public void testCreate_invalidType() {

public void testCreate_invalidSubtype() {
try {
MediaType.create("text", "pl@intext");
MediaType.create(MediaType.TEXT_TYPE, "pl@intext");
fail();
} catch (IllegalArgumentException expected) {
}
}

public void testCreate_wildcardTypeDeclaredSubtype() {
try {
MediaType.create("*", "text");
MediaType.create(MediaType.WILDCARD, MediaType.TEXT_TYPE);
fail();
} catch (IllegalArgumentException expected) {
}
Expand Down Expand Up @@ -181,43 +181,43 @@ public void testCreate_emptySubtype() {

public void testCreateApplicationType() {
MediaType newType = MediaType.createApplicationType("yams");
assertEquals("application", newType.type());
assertEquals(MediaType.APPLICATION_TYPE, newType.type());
assertEquals("yams", newType.subtype());
}

public void testCreateAudioType() {
MediaType newType = MediaType.createAudioType("yams");
assertEquals("audio", newType.type());
assertEquals(MediaType.audio_TYPE, newType.type());
assertEquals("yams", newType.subtype());
}

public void testCreateFontType() {
MediaType newType = MediaType.createFontType("yams");
assertEquals("font", newType.type());
assertEquals(MediaType.FONT_TYPE, newType.type());
assertEquals("yams", newType.subtype());
}

public void testCreateImageType() {
MediaType newType = MediaType.createImageType("yams");
assertEquals("image", newType.type());
assertEquals(MediaTypeimage", newType.type());
assertEquals("yams", newType.subtype());
}

public void testCreateTextType() {
MediaType newType = MediaType.createTextType("yams");
assertEquals("text", newType.type());
assertEquals(MediaType.text", newType.type());
assertEquals("yams", newType.subtype());
}

public void testCreateVideoType() {
MediaType newType = MediaType.createVideoType("yams");
assertEquals("video", newType.type());
assertEquals(MediaType.Video_Type", newType.type());
assertEquals("yams", newType.subtype());
}

public void testGetType() {
assertEquals("text", MediaType.parse("text/plain").type());
assertEquals("application", MediaType.parse("application/atom+xml; charset=utf-8").type());
assertEquals(MediaType.TEXT_TYPE, MediaType.parse("text/plain").type());
assertEquals(MediaType.APPLICATION_TYPE, MediaType.parse("application/atom+xml; charset=utf-8").type());
}

public void testGetSubtype() {
Expand Down Expand Up @@ -436,7 +436,7 @@ public void testParse_badInput() {
} catch (IllegalArgumentException expected) {
}
try {
MediaType.parse("text");
MediaType.parse(MediaType.TEXT_TYPE);
fail();
} catch (IllegalArgumentException expected) {
}
Expand Down Expand Up @@ -552,15 +552,15 @@ public void testGetCharset_unsupportedCharset() {
public void testEquals() {
new EqualsTester()
.addEqualityGroup(
MediaType.create("text", "plain"),
MediaType.create(MediaType.TEXT_TYPE, "plain"),
MediaType.create("TEXT", "PLAIN"),
MediaType.parse("text/plain"),
MediaType.parse("TEXT/PLAIN"),
MediaType.create("text", "plain").withParameter("a", "1").withoutParameters())
MediaType.create(MediaType.TEXT_TYPE, "plain").withParameter("a", "1").withoutParameters())
.addEqualityGroup(
MediaType.create("text", "plain").withCharset(UTF_8),
MediaType.create("text", "plain").withParameter("CHARSET", "UTF-8"),
MediaType.create("text", "plain")
MediaType.create(MediaType.TEXT_TYPE, "plain").withCharset(UTF_8),
MediaType.create(MediaType.TEXT_TYPE, "plain").withParameter("CHARSET", "UTF-8"),
MediaType.create(MediaType.TEXT_TYPE, "plain")
.withParameters(ImmutableMultimap.of("charset", "utf-8")),
MediaType.parse("text/plain;charset=utf-8"),
MediaType.parse("text/plain; charset=utf-8"),
Expand All @@ -574,27 +574,27 @@ public void testEquals() {
MediaType.parse("text/plain ; charset=utf-8"))
.addEqualityGroup(MediaType.parse("text/plain; charset=utf-8; charset=utf-8"))
.addEqualityGroup(
MediaType.create("text", "plain").withParameter("a", "value"),
MediaType.create("text", "plain").withParameter("A", "value"))
MediaType.create(MediaType.TEXT_TYPE, "plain").withParameter("a", "value"),
MediaType.create(MediaType.TEXT_TYPE, "plain").withParameter("A", "value"))
.addEqualityGroup(
MediaType.create("text", "plain").withParameter("a", "VALUE"),
MediaType.create("text", "plain").withParameter("A", "VALUE"))
MediaType.create(MediaType.TEXT_TYPE, "plain").withParameter("a", "VALUE"),
MediaType.create(MediaType.TEXT_TYPE, "plain").withParameter("A", "VALUE"))
.addEqualityGroup(
MediaType.create("text", "plain")
MediaType.create(MediaType.TEXT_TYPE, "plain")
.withParameters(ImmutableListMultimap.of("a", "1", "a", "2")),
MediaType.create("text", "plain")
MediaType.create(MediaType.TEXT_TYPE, "plain")
.withParameters(ImmutableListMultimap.of("a", "2", "a", "1")))
.addEqualityGroup(MediaType.create("text", "csv"))
.addEqualityGroup(MediaType.create("application", "atom+xml"))
.addEqualityGroup(MediaType.create(MediaType.TEXT_TYPE, "csv"))
.addEqualityGroup(MediaType.create(MediaType.APPLICATION_TYPE, "atom+xml"))
.testEquals();
}

@GwtIncompatible // Non-UTF-8 Charset
public void testEquals_nonUtf8Charsets() {
new EqualsTester()
.addEqualityGroup(MediaType.create("text", "plain"))
.addEqualityGroup(MediaType.create("text", "plain").withCharset(UTF_8))
.addEqualityGroup(MediaType.create("text", "plain").withCharset(UTF_16))
.addEqualityGroup(MediaType.create(MediaType.TEXT_TYPE, "plain"))
.addEqualityGroup(MediaType.create(MediaType.TEXT_TYPE, "plain").withCharset(UTF_8))
.addEqualityGroup(MediaType.create(MediaType.TEXT_TYPE, "plain").withCharset(UTF_16))
.testEquals();
}

Expand All @@ -607,11 +607,11 @@ public void testNullPointer() {
}

public void testToString() {
assertEquals("text/plain", MediaType.create("text", "plain").toString());
assertEquals("text/plain", MediaType.create(MediaType.TEXT_TYPE, "plain").toString());
assertEquals(
"text/plain; something=\"cr@zy\"; something-else=\"crazy with spaces\";"
+ " and-another-thing=\"\"; normal-thing=foo",
MediaType.create("text", "plain")
MediaType.create(MediaType.TEXT_TYPE, "plain")
.withParameter("something", "cr@zy")
.withParameter("something-else", "crazy with spaces")
.withParameter("and-another-thing", "")
Expand Down
17 changes: 8 additions & 9 deletions android/guava/src/com/google/common/net/MediaType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,15 +93,14 @@ public final class MediaType {
*/
private static final CharMatcher LINEAR_WHITE_SPACE = CharMatcher.anyOf(" \t\r\n");

// TODO(gak): make these public?
private static final String APPLICATION_TYPE = "application";
private static final String AUDIO_TYPE = "audio";
private static final String IMAGE_TYPE = "image";
private static final String TEXT_TYPE = "text";
private static final String VIDEO_TYPE = "video";
private static final String FONT_TYPE = "font";

private static final String WILDCARD = "*";
public static final String APPLICATION_TYPE = "application";
public static final String AUDIO_TYPE = "audio";
public static final String IMAGE_TYPE = "image";
public static final String TEXT_TYPE = "text";
public static final String VIDEO_TYPE = "video";
public static final String FONT_TYPE = "font";

public static final String WILDCARD = "*";

private static final Map<MediaType, MediaType> KNOWN_TYPES = Maps.newHashMap();

Expand Down
58 changes: 29 additions & 29 deletions guava-tests/test/com/google/common/net/MediaTypeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,15 +133,15 @@ public void testCreate_invalidType() {

public void testCreate_invalidSubtype() {
try {
MediaType.create("text", "pl@intext");
MediaType.create(MediaType.TEXT_TYPE, "pl@intext");
fail();
} catch (IllegalArgumentException expected) {
}
}

public void testCreate_wildcardTypeDeclaredSubtype() {
try {
MediaType.create("*", "text");
MediaType.create(MediaType.WILDCARD, MediaType.TEXT_TYPE);
fail();
} catch (IllegalArgumentException expected) {
}
Expand Down Expand Up @@ -181,43 +181,43 @@ public void testCreate_emptySubtype() {

public void testCreateApplicationType() {
MediaType newType = MediaType.createApplicationType("yams");
assertEquals("application", newType.type());
assertEquals(MediaType.APPLICATION_TYPE, newType.type());
assertEquals("yams", newType.subtype());
}

public void testCreateAudioType() {
MediaType newType = MediaType.createAudioType("yams");
assertEquals("audio", newType.type());
assertEquals(MediaType.AUDIO_TYPE, newType.type());
assertEquals("yams", newType.subtype());
}

public void testCreateFontType() {
MediaType newType = MediaType.createFontType("yams");
assertEquals("font", newType.type());
assertEquals(MediaType.FONT_TYPE, newType.type());
assertEquals("yams", newType.subtype());
}

public void testCreateImageType() {
MediaType newType = MediaType.createImageType("yams");
assertEquals("image", newType.type());
assertEquals(MediaType.IMAGE_TYPE, newType.type());
assertEquals("yams", newType.subtype());
}

public void testCreateTextType() {
MediaType newType = MediaType.createTextType("yams");
assertEquals("text", newType.type());
assertEquals(MediaType.TEXT_TYPE, newType.type());
assertEquals("yams", newType.subtype());
}

public void testCreateVideoType() {
MediaType newType = MediaType.createVideoType("yams");
assertEquals("video", newType.type());
assertEquals(MediaType.VIDEO_TYPE, newType.type());
assertEquals("yams", newType.subtype());
}

public void testGetType() {
assertEquals("text", MediaType.parse("text/plain").type());
assertEquals("application", MediaType.parse("application/atom+xml; charset=utf-8").type());
assertEquals(MediaType.TEXT_TYPE, MediaType.parse("text/plain").type());
assertEquals(MediaType.APPLICATION_TYPE, MediaType.parse("application/atom+xml; charset=utf-8").type());
}

public void testGetSubtype() {
Expand Down Expand Up @@ -436,7 +436,7 @@ public void testParse_badInput() {
} catch (IllegalArgumentException expected) {
}
try {
MediaType.parse("text");
MediaType.parse(MediaType.TEXT_TYPE);
fail();
} catch (IllegalArgumentException expected) {
}
Expand Down Expand Up @@ -552,15 +552,15 @@ public void testGetCharset_unsupportedCharset() {
public void testEquals() {
new EqualsTester()
.addEqualityGroup(
MediaType.create("text", "plain"),
MediaType.create(MediaType.TEXT_TYPE, "plain"),
MediaType.create("TEXT", "PLAIN"),
MediaType.parse("text/plain"),
MediaType.parse("TEXT/PLAIN"),
MediaType.create("text", "plain").withParameter("a", "1").withoutParameters())
MediaType.create(MediaType.TEXT_TYPE, "plain").withParameter("a", "1").withoutParameters())
.addEqualityGroup(
MediaType.create("text", "plain").withCharset(UTF_8),
MediaType.create("text", "plain").withParameter("CHARSET", "UTF-8"),
MediaType.create("text", "plain")
MediaType.create(MediaType.TEXT_TYPE, "plain").withCharset(UTF_8),
MediaType.create(MediaType.TEXT_TYPE, "plain").withParameter("CHARSET", "UTF-8"),
MediaType.create(MediaType.TEXT_TYPE, "plain")
.withParameters(ImmutableMultimap.of("charset", "utf-8")),
MediaType.parse("text/plain;charset=utf-8"),
MediaType.parse("text/plain; charset=utf-8"),
Expand All @@ -574,27 +574,27 @@ public void testEquals() {
MediaType.parse("text/plain ; charset=utf-8"))
.addEqualityGroup(MediaType.parse("text/plain; charset=utf-8; charset=utf-8"))
.addEqualityGroup(
MediaType.create("text", "plain").withParameter("a", "value"),
MediaType.create("text", "plain").withParameter("A", "value"))
MediaType.create(MediaType.TEXT_TYPE, "plain").withParameter("a", "value"),
MediaType.create(MediaType.TEXT_TYPE, "plain").withParameter("A", "value"))
.addEqualityGroup(
MediaType.create("text", "plain").withParameter("a", "VALUE"),
MediaType.create("text", "plain").withParameter("A", "VALUE"))
MediaType.create(MediaType.TEXT_TYPE, "plain").withParameter("a", "VALUE"),
MediaType.create(MediaType.TEXT_TYPE, "plain").withParameter("A", "VALUE"))
.addEqualityGroup(
MediaType.create("text", "plain")
MediaType.create(MediaType.TEXT_TYPE, "plain")
.withParameters(ImmutableListMultimap.of("a", "1", "a", "2")),
MediaType.create("text", "plain")
MediaType.create(MediaType.TEXT_TYPE, "plain")
.withParameters(ImmutableListMultimap.of("a", "2", "a", "1")))
.addEqualityGroup(MediaType.create("text", "csv"))
.addEqualityGroup(MediaType.create("application", "atom+xml"))
.addEqualityGroup(MediaType.create(MediaType.TEXT_TYPE, "csv"))
.addEqualityGroup(MediaType.create(MediaType.APPLICATION_TYPE, "atom+xml"))
.testEquals();
}

@GwtIncompatible // Non-UTF-8 Charset
public void testEquals_nonUtf8Charsets() {
new EqualsTester()
.addEqualityGroup(MediaType.create("text", "plain"))
.addEqualityGroup(MediaType.create("text", "plain").withCharset(UTF_8))
.addEqualityGroup(MediaType.create("text", "plain").withCharset(UTF_16))
.addEqualityGroup(MediaType.create(MediaType.TEXT_TYPE, "plain"))
.addEqualityGroup(MediaType.create(MediaType.TEXT_TYPE, "plain").withCharset(UTF_8))
.addEqualityGroup(MediaType.create(MediaType.TEXT_TYPE, "plain").withCharset(UTF_16))
.testEquals();
}

Expand All @@ -607,11 +607,11 @@ public void testNullPointer() {
}

public void testToString() {
assertEquals("text/plain", MediaType.create("text", "plain").toString());
assertEquals("text/plain", MediaType.create(MediaType.TEXT_TYPE, "plain").toString());
assertEquals(
"text/plain; something=\"cr@zy\"; something-else=\"crazy with spaces\";"
+ " and-another-thing=\"\"; normal-thing=foo",
MediaType.create("text", "plain")
MediaType.create(MediaType.TEXT_TYPE, "plain")
.withParameter("something", "cr@zy")
.withParameter("something-else", "crazy with spaces")
.withParameter("and-another-thing", "")
Expand Down
17 changes: 8 additions & 9 deletions guava/src/com/google/common/net/MediaType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,15 +93,14 @@ public final class MediaType {
*/
private static final CharMatcher LINEAR_WHITE_SPACE = CharMatcher.anyOf(" \t\r\n");

// TODO(gak): make these public?
private static final String APPLICATION_TYPE = "application";
private static final String AUDIO_TYPE = "audio";
private static final String IMAGE_TYPE = "image";
private static final String TEXT_TYPE = "text";
private static final String VIDEO_TYPE = "video";
private static final String FONT_TYPE = "font";

private static final String WILDCARD = "*";
public static final String APPLICATION_TYPE = "application";
public static final String AUDIO_TYPE = "audio";
public static final String IMAGE_TYPE = "image";
public static final String TEXT_TYPE = "text";
public static final String VIDEO_TYPE = "video";
public static final String FONT_TYPE = "font";

public static final String WILDCARD = "*";

private static final Map<MediaType, MediaType> KNOWN_TYPES = Maps.newHashMap();

Expand Down