root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Find the last plus for suffix MediaType 

Issue: SPR-15795
This commit is contained in:
Rossen Stoyanchev 2017-07-25 10:45:59 +02:00
parent 7e232f989b
commit d7a7b08b08
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
spring-core/src/main/java/org/springframework/util/MimeType.java
View File

@ -320,13 +320,13 @@ public class MimeType implements Comparable<MimeType>, Serializable {
} }
if (this.isWildcardSubtype()) { if (this.isWildcardSubtype()) {
// wildcard with suffix, e.g. application/*+xml // wildcard with suffix, e.g. application/*+xml
int thisPlusIdx = getSubtype().indexOf('+'); int thisPlusIdx = getSubtype().lastIndexOf('+');
if (thisPlusIdx == -1) { if (thisPlusIdx == -1) {
return true; return true;
} }
else { else {
// application/*+xml includes application/soap+xml // application/*+xml includes application/soap+xml
int otherPlusIdx = other.getSubtype().indexOf('+'); int otherPlusIdx = other.getSubtype().lastIndexOf('+');
if (otherPlusIdx != -1) { if (otherPlusIdx != -1) {
String thisSubtypeNoSuffix = getSubtype().substring(0, thisPlusIdx); String thisSubtypeNoSuffix = getSubtype().substring(0, thisPlusIdx);
String thisSubtypeSuffix = getSubtype().substring(thisPlusIdx + 1); String thisSubtypeSuffix = getSubtype().substring(thisPlusIdx + 1);
@ -364,8 +364,8 @@ public class MimeType implements Comparable<MimeType>, Serializable {
// wildcard with suffix? e.g. application/*+xml // wildcard with suffix? e.g. application/*+xml
if (this.isWildcardSubtype() || other.isWildcardSubtype()) { if (this.isWildcardSubtype() || other.isWildcardSubtype()) {
int thisPlusIdx = getSubtype().indexOf('+'); int thisPlusIdx = getSubtype().lastIndexOf('+');
int otherPlusIdx = other.getSubtype().indexOf('+'); int otherPlusIdx = other.getSubtype().lastIndexOf('+');
if (thisPlusIdx == -1 && otherPlusIdx == -1) { if (thisPlusIdx == -1 && otherPlusIdx == -1) {
return true; return true;

16
spring-core/src/test/java/org/springframework/util/MimeTypeTests.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2016 the original author or authors. * Copyright 2002-2017 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -27,8 +27,12 @@ import org.junit.Test;
import org.springframework.core.convert.ConversionService; import org.springframework.core.convert.ConversionService;
import org.springframework.core.convert.support.DefaultConversionService; import org.springframework.core.convert.support.DefaultConversionService;
import static java.util.Collections.*; import static java.util.Collections.singletonMap;
import static org.junit.Assert.*; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
/** /**
* Unit tests for {@link MimeType}. * Unit tests for {@link MimeType}.
@ -122,12 +126,15 @@ public class MimeTypeTests {
MimeType applicationSoapXml = new MimeType("application", "soap+xml"); MimeType applicationSoapXml = new MimeType("application", "soap+xml");
MimeType applicationWildcardXml = new MimeType("application", "*+xml"); MimeType applicationWildcardXml = new MimeType("application", "*+xml");
MimeType suffixXml = new MimeType("application", "x.y+z+xml"); // SPR-15795
assertTrue(applicationSoapXml.includes(applicationSoapXml)); assertTrue(applicationSoapXml.includes(applicationSoapXml));
assertTrue(applicationWildcardXml.includes(applicationWildcardXml)); assertTrue(applicationWildcardXml.includes(applicationWildcardXml));
assertTrue(applicationWildcardXml.includes(suffixXml));
assertTrue(applicationWildcardXml.includes(applicationSoapXml)); assertTrue(applicationWildcardXml.includes(applicationSoapXml));
assertFalse(applicationSoapXml.includes(applicationWildcardXml)); assertFalse(applicationSoapXml.includes(applicationWildcardXml));
assertFalse(suffixXml.includes(applicationWildcardXml));
assertFalse(applicationWildcardXml.includes(MimeTypeUtils.APPLICATION_JSON)); assertFalse(applicationWildcardXml.includes(MimeTypeUtils.APPLICATION_JSON));
} }
@ -149,12 +156,15 @@ public class MimeTypeTests {
MimeType applicationSoapXml = new MimeType("application", "soap+xml"); MimeType applicationSoapXml = new MimeType("application", "soap+xml");
MimeType applicationWildcardXml = new MimeType("application", "*+xml"); MimeType applicationWildcardXml = new MimeType("application", "*+xml");
MimeType suffixXml = new MimeType("application", "x.y+z+xml"); // SPR-15795
assertTrue(applicationSoapXml.isCompatibleWith(applicationSoapXml)); assertTrue(applicationSoapXml.isCompatibleWith(applicationSoapXml));
assertTrue(applicationWildcardXml.isCompatibleWith(applicationWildcardXml)); assertTrue(applicationWildcardXml.isCompatibleWith(applicationWildcardXml));
assertTrue(applicationWildcardXml.isCompatibleWith(suffixXml));
assertTrue(applicationWildcardXml.isCompatibleWith(applicationSoapXml)); assertTrue(applicationWildcardXml.isCompatibleWith(applicationSoapXml));
assertTrue(applicationSoapXml.isCompatibleWith(applicationWildcardXml)); assertTrue(applicationSoapXml.isCompatibleWith(applicationWildcardXml));
assertTrue(suffixXml.isCompatibleWith(applicationWildcardXml));
assertFalse(applicationWildcardXml.isCompatibleWith(MimeTypeUtils.APPLICATION_JSON)); assertFalse(applicationWildcardXml.isCompatibleWith(MimeTypeUtils.APPLICATION_JSON));
} }