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

MediaRange: Correctly handle LWS #239

Merged
merged 1 commit into from
May 24, 2022
+22 −11
Merged

MediaRange: Correctly handle LWS #239

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
21 changes: 16 additions & 5 deletions tcases-openapi-test/src/main/java/org/cornutum/tcases/openapi/test/MediaRange.java
View file
Original file line number Diff line number Diff line change
@@ -69,8 +69,8 @@ private MediaRange( String text)
.filter( param -> param.length == 2)
.collect(
toMap(
param -> param[0],
param -> param[1],
param -> param[0].trim(),
param -> param[1].trim(),
(v1,v2) -> v1,
LinkedHashMap::new));
}
@@ -179,15 +179,26 @@ public String toString()
baseType( type_, subtype_, suffix_)
+
Optional.ofNullable( parameters_)
.map( params -> params.entrySet().stream().map( param -> String.format( ";%s=%s", param.getKey(), param.getValue())).collect( joining()))
.map( params -> params.entrySet().stream().map( param -> String.format( "; %s=%s", param.getKey(), param.getValue())).collect( joining()))
.orElse( "");
}

private final String type_;
private final String subtype_;
private final String suffix_;
private final Map<String,String> parameters_;

private static final Pattern mediaRange_ = Pattern.compile( "([^\\s/]+)/([^\\s+;]+)(?:\\+([^\\s;]+))?((?:;[^\\s;=]+=(?:[^\\s\";=]+|\"(?:[^\\\"]|\\\\.)*\"))+)?");

private static final String DELIM = "\\h()<>@,;:\\\\\"/\\[\\]?={}";
private static final String TOKEN = String.format( "[^%s]+", DELIM);
private static final String STOKEN = String.format( "[^%s\\+]+", DELIM);
private static final String QSTRING = "\"(?:[^\\\"]|\\\\.)*\"";
private static final String LWS = "\\h*";

private static final String MEDIA_RANGE =
String.format(
"%s(%s)/(%s)(?:\\+(%s))?((?:%s;%s%s%s=%s(?:%s|%s)%s)+)?",
LWS, TOKEN, STOKEN, STOKEN, LWS, LWS, TOKEN, LWS, LWS, TOKEN, QSTRING, LWS);

private static final Pattern mediaRange_ = Pattern.compile( MEDIA_RANGE);
private static final Pattern quotedChar_ = Pattern.compile( "\\\\(.)");
}
12 changes: 6 additions & 6 deletions tcases-openapi-test/src/test/java/org/cornutum/tcases/openapi/test/MediaRangeTest.java
View file
Original file line number Diff line number Diff line change
@@ -49,7 +49,7 @@ public void Of_0()
assertEquals( "Subtype", "svg", mediaRange.subtype());
assertEquals( "Suffix", "xml", mediaRange.suffix());
assertEquals( "Parameters", params().put( "height", "1024").put( "width", "768").build(), mediaRange.parameters());
assertEquals( "String", definition, mediaRange.toString());
assertEquals( "String", "image/svg+xml; height=1024; width=768", mediaRange.toString());
}

/**
@@ -107,7 +107,7 @@ public void Of_1()
public void Of_2()
{
// Given...
String definition = "*/*+json;version=1.0.0";
String definition = "*/*+json ; version = 1.0.0 ";

// When...
MediaRange mediaRange = MediaRange.of( definition);
@@ -117,7 +117,7 @@ public void Of_2()
assertEquals( "Subtype", "*", mediaRange.subtype());
assertEquals( "Suffix", "json", mediaRange.suffix());
assertEquals( "Parameters", params().put( "version", "1.0.0").build(), mediaRange.parameters());
assertEquals( "String", definition, mediaRange.toString());
assertEquals( "String", "*/*+json; version=1.0.0", mediaRange.toString());
}

/**
@@ -141,7 +141,7 @@ public void Of_2()
public void Of_3()
{
// Given...
String definition = "*/*;level=0;version=\"1.2.3\"";
String definition = " */* ;level=0 ;version=\"1.2.3\"";

// When...
MediaRange mediaRange = MediaRange.of( definition);
@@ -151,7 +151,7 @@ public void Of_3()
assertEquals( "Subtype", "*", mediaRange.subtype());
assertEquals( "Suffix", null, mediaRange.suffix());
assertEquals( "Parameters", params().put( "level", "0").put( "version", "1.2.3").build(), mediaRange.parameters());
assertEquals( "String", definition, mediaRange.toString());
assertEquals( "String", "*/*; level=0; version=\"1.2.3\"", mediaRange.toString());
}

/**
@@ -185,7 +185,7 @@ public void Of_4()
assertEquals( "Subtype", "plain", mediaRange.subtype());
assertEquals( "Suffix", null, mediaRange.suffix());
assertEquals( "Parameters", params().put( "lang", "American (Standard) English").build(), mediaRange.parameters());
assertEquals( "String", definition, mediaRange.toString());
assertEquals( "String", "text/plain; lang=\"American \\(Standard\\) English\"", mediaRange.toString());
}

/**