You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2017/07/28 16:15:14 UTC
[1/6] cxf git commit: [CXF-7447] Add doPrivs to avoid
AccessControlExceptions
Repository: cxf
Updated Branches:
refs/heads/3.1.x-fixes d1a1cc523 -> 9bbf7417e
[CXF-7447] Add doPrivs to avoid AccessControlExceptions
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/e70b0043
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/e70b0043
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/e70b0043
Branch: refs/heads/3.1.x-fixes
Commit: e70b0043c8ca2ef9edb00a5af682ec3604c82bb8
Parents: d1a1cc5
Author: Andy McCright <j....@gmail.com>
Authored: Mon Jul 17 15:10:19 2017 -0500
Committer: Daniel Kulp <dk...@apache.org>
Committed: Fri Jul 28 12:08:34 2017 -0400
----------------------------------------------------------------------
.../org/apache/cxf/jaxrs/provider/ProviderCache.java | 9 +++++++++
.../cxf/transport/http/URLConnectionHTTPConduit.java | 15 ++++++++++++++-
2 files changed, 23 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/e70b0043/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderCache.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderCache.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderCache.java
index 15fdd03..6d66b89 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderCache.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ProviderCache.java
@@ -19,6 +19,8 @@
package org.apache.cxf.jaxrs.provider;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
import java.util.Collections;
import java.util.List;
import java.util.Map;
@@ -33,6 +35,13 @@ import org.apache.cxf.jaxrs.model.ProviderInfo;
public class ProviderCache {
private static final int MAX_PROVIDER_CACHE_SIZE =
Integer.getInteger("org.apache.cxf.jaxrs.max_provider_cache_size", 100);
+ private static final int MAX_PROVIDER_CACHE_SIZE =
+ AccessController.doPrivileged(new PrivilegedAction<Integer>() {
+ @Override
+ public Integer run() {
+ return Integer.getInteger("org.apache.cxf.jaxrs.max_provider_cache_size", 100);
+ } }).intValue();
+
private final Map<String, List<ProviderInfo<MessageBodyReader<?>>>>
readerProviderCache = new ConcurrentHashMap<String, List<ProviderInfo<MessageBodyReader<?>>>>();
http://git-wip-us.apache.org/repos/asf/cxf/blob/e70b0043/rt/transports/http/src/main/java/org/apache/cxf/transport/http/URLConnectionHTTPConduit.java
----------------------------------------------------------------------
diff --git a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/URLConnectionHTTPConduit.java b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/URLConnectionHTTPConduit.java
index 450ee9c..cf44c39 100644
--- a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/URLConnectionHTTPConduit.java
+++ b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/URLConnectionHTTPConduit.java
@@ -371,7 +371,20 @@ public class URLConnectionHTTPConduit extends HTTPConduit {
}
}
protected int getResponseCode() throws IOException {
- return connection.getResponseCode();
+ try {
+ return AccessController.doPrivileged(new PrivilegedExceptionAction<Integer>() {
+
+ @Override
+ public Integer run() throws IOException {
+ return connection.getResponseCode();
+ } });
+ } catch (PrivilegedActionException e) {
+ Throwable t = e.getCause();
+ if (t instanceof IOException) {
+ throw (IOException) t;
+ }
+ throw new RuntimeException(t);
+ }
}
protected String getResponseMessage() throws IOException {
Object o = this.outMessage.getContextualProperty(SET_REASON_PHRASE_NOT_NULL);
[4/6] cxf git commit: CXF-7453 check subCodes only in case of SOAP
1.2 This closes #296
Posted by dk...@apache.org.
CXF-7453 check subCodes only in case of SOAP 1.2
This closes #296
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/6df3eaf4
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/6df3eaf4
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/6df3eaf4
Branch: refs/heads/3.1.x-fixes
Commit: 6df3eaf43e4b2cdbc8dcfb2b8fa080c7f96ec38b
Parents: 55c2f0e
Author: Ivo Studensky <is...@redhat.com>
Authored: Tue Jul 25 16:04:34 2017 +0200
Committer: Daniel Kulp <dk...@apache.org>
Committed: Fri Jul 28 12:13:57 2017 -0400
----------------------------------------------------------------------
.../interceptors/WebFaultOutInterceptor.java | 28 +++++++++++---------
1 file changed, 16 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/6df3eaf4/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WebFaultOutInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WebFaultOutInterceptor.java b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WebFaultOutInterceptor.java
index 49e94ed..c68d544 100644
--- a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WebFaultOutInterceptor.java
+++ b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WebFaultOutInterceptor.java
@@ -35,6 +35,7 @@ import javax.xml.ws.soap.SOAPFaultException;
import org.apache.cxf.annotations.SchemaValidation.SchemaValidationType;
import org.apache.cxf.binding.soap.SoapFault;
+import org.apache.cxf.binding.soap.SoapVersion;
import org.apache.cxf.common.classloader.ClassLoaderUtils;
import org.apache.cxf.common.i18n.BundleUtils;
import org.apache.cxf.common.logging.LogUtils;
@@ -99,20 +100,23 @@ public class WebFaultOutInterceptor extends FaultOutInterceptor {
sf = (SOAPFaultException)thr.getCause();
}
if (sf != null) {
- if (f instanceof SoapFault) {
- for (Iterator<QName> it = CastUtils.cast(sf.getFault().getFaultSubcodes()); it.hasNext();) {
- ((SoapFault) f).addSubCode(it.next());
+ SoapVersion soapVersion = (SoapVersion)message.get(SoapVersion.class.getName());
+ if (soapVersion != null && soapVersion.getVersion() != 1.1) {
+ if (f instanceof SoapFault) {
+ for (Iterator<QName> it = CastUtils.cast(sf.getFault().getFaultSubcodes()); it.hasNext();) {
+ ((SoapFault) f).addSubCode(it.next());
+ }
}
- }
- if (sf.getFault().getFaultReasonLocales().hasNext()) {
- Locale lang = (Locale) sf.getFault()
- .getFaultReasonLocales().next();
- String convertedLang = lang.getLanguage();
- String country = lang.getCountry();
- if (country.length() > 0) {
- convertedLang = convertedLang + '-' + country;
+ if (sf.getFault().getFaultReasonLocales().hasNext()) {
+ Locale lang = (Locale) sf.getFault()
+ .getFaultReasonLocales().next();
+ String convertedLang = lang.getLanguage();
+ String country = lang.getCountry();
+ if (country.length() > 0) {
+ convertedLang = convertedLang + '-' + country;
+ }
+ f.setLang(convertedLang);
}
- f.setLang(convertedLang);
}
message.setContent(Exception.class, f);
}
[2/6] cxf git commit: re-enabled integration test
Posted by dk...@apache.org.
re-enabled integration test
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/f7df387f
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/f7df387f
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/f7df387f
Branch: refs/heads/3.1.x-fixes
Commit: f7df387f599b9f01e31ea2dc19dba843868640c0
Parents: e70b004
Author: Dennis Kieselhorst <de...@apache.org>
Authored: Mon Jul 24 13:42:20 2017 +0200
Committer: Daniel Kulp <dk...@apache.org>
Committed: Fri Jul 28 12:09:13 2017 -0400
----------------------------------------------------------------------
systests/wsdl_maven/codegen/pom.xml | 54 ++++++++++----------
.../wsdl_maven/codegen/src/it/cxf-4004/pom.xml | 7 ++-
.../wsdl_maven/codegen/src/it/it-parent/pom.xml | 1 +
3 files changed, 33 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/f7df387f/systests/wsdl_maven/codegen/pom.xml
----------------------------------------------------------------------
diff --git a/systests/wsdl_maven/codegen/pom.xml b/systests/wsdl_maven/codegen/pom.xml
index cb4d197..7be42fd 100644
--- a/systests/wsdl_maven/codegen/pom.xml
+++ b/systests/wsdl_maven/codegen/pom.xml
@@ -102,34 +102,32 @@
</execution>
</executions>
</plugin>
- <!--
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-invoker-plugin</artifactId>
- <version>1.5</version>
- <configuration>
- <projectsDirectory>src/it</projectsDirectory>
- <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
- <preBuildHookScript>setup</preBuildHookScript>
- <postBuildHookScript>verify</postBuildHookScript>
- <localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
- <settingsFile>src/it/settings.xml</settingsFile>
- <pomIncludes>
- <pomInclude>*/pom.xml</pomInclude>
- </pomIncludes>
- </configuration>
- <executions>
- <execution>
- <id>integration-test</id>
- <goals>
- <goal>install</goal>
- <goal>integration-test</goal>
- <goal>verify</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-invoker-plugin</artifactId>
+ <version>3.0.0</version>
+ <configuration>
+ <projectsDirectory>src/it</projectsDirectory>
+ <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
+ <preBuildHookScript>setup</preBuildHookScript>
+ <postBuildHookScript>verify</postBuildHookScript>
+ <localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
+ <settingsFile>src/it/settings.xml</settingsFile>
+ <pomIncludes>
+ <pomInclude>*/pom.xml</pomInclude>
+ </pomIncludes>
+ </configuration>
+ <executions>
+ <execution>
+ <id>integration-test</id>
+ <goals>
+ <goal>install</goal>
+ <goal>integration-test</goal>
+ <goal>verify</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
<dependencies>
http://git-wip-us.apache.org/repos/asf/cxf/blob/f7df387f/systests/wsdl_maven/codegen/src/it/cxf-4004/pom.xml
----------------------------------------------------------------------
diff --git a/systests/wsdl_maven/codegen/src/it/cxf-4004/pom.xml b/systests/wsdl_maven/codegen/src/it/cxf-4004/pom.xml
index b867edc..53b0ae5 100644
--- a/systests/wsdl_maven/codegen/src/it/cxf-4004/pom.xml
+++ b/systests/wsdl_maven/codegen/src/it/cxf-4004/pom.xml
@@ -35,7 +35,7 @@
<dependency>
<groupId>org.apache.cxf.xjcplugins</groupId>
<artifactId>cxf-xjc-ts</artifactId>
- <version>2.4.0</version>
+ <version>${cxf.xjc-utils.version}</version>
</dependency>
<dependency>
<groupId>net.java.dev.jaxb2-commons</groupId>
@@ -80,5 +80,10 @@
<artifactId>cxf-rt-transports-http</artifactId>
<version>${cxf.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.cxf.xjc-utils</groupId>
+ <artifactId>cxf-xjc-runtime</artifactId>
+ <version>${cxf.xjc-utils.version}</version>
+ </dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/cxf/blob/f7df387f/systests/wsdl_maven/codegen/src/it/it-parent/pom.xml
----------------------------------------------------------------------
diff --git a/systests/wsdl_maven/codegen/src/it/it-parent/pom.xml b/systests/wsdl_maven/codegen/src/it/it-parent/pom.xml
index 7a49413..3184606 100644
--- a/systests/wsdl_maven/codegen/src/it/it-parent/pom.xml
+++ b/systests/wsdl_maven/codegen/src/it/it-parent/pom.xml
@@ -25,6 +25,7 @@
<packaging>pom</packaging>
<properties>
<cxf.version>@project.version@</cxf.version>
+ <cxf.xjc-utils.version>3.1.0</cxf.xjc-utils.version>
</properties>
<build>
<pluginManagement>
[5/6] cxf git commit: Remove some irrelevant final modifiers to make
newer PMD happy
Posted by dk...@apache.org.
Remove some irrelevant final modifiers to make newer PMD happy
# Conflicts:
# tools/corba/src/main/generated/org/apache/cxf/tools/corba/processors/idl/IDLLexer.java
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/4f99ceee
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/4f99ceee
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/4f99ceee
Branch: refs/heads/3.1.x-fixes
Commit: 4f99ceeea89b2ce55f5bfe64dd164b3a919b52a1
Parents: 6df3eaf
Author: Daniel Kulp <dk...@apache.org>
Authored: Fri Jul 28 11:56:36 2017 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Fri Jul 28 12:15:03 2017 -0400
----------------------------------------------------------------------
.../tools/corba/processors/idl/IDLLexer.java | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/4f99ceee/tools/corba/src/main/generated/org/apache/cxf/tools/corba/processors/idl/IDLLexer.java
----------------------------------------------------------------------
diff --git a/tools/corba/src/main/generated/org/apache/cxf/tools/corba/processors/idl/IDLLexer.java b/tools/corba/src/main/generated/org/apache/cxf/tools/corba/processors/idl/IDLLexer.java
index 7498df2..0aaaf0a 100644
--- a/tools/corba/src/main/generated/org/apache/cxf/tools/corba/processors/idl/IDLLexer.java
+++ b/tools/corba/src/main/generated/org/apache/cxf/tools/corba/processors/idl/IDLLexer.java
@@ -1881,15 +1881,15 @@ tryAgain:
}
_returnToken = _token;
}
-
-
- private static final long[] mk_tokenSet_0() {
+
+
+ private static long[] mk_tokenSet_0() {
long[] data = new long[1025];
data[1]=576460743847706622L;
return data;
}
public static final BitSet _tokenSet_0 = new BitSet(mk_tokenSet_0());
- private static final long[] mk_tokenSet_1() {
+ private static long[] mk_tokenSet_1() {
long[] data = new long[2048];
data[0]=-1025L;
for (int i = 1; i<=1022; i++) { data[i]=-1L; }
@@ -1897,7 +1897,7 @@ tryAgain:
return data;
}
public static final BitSet _tokenSet_1 = new BitSet(mk_tokenSet_1());
- private static final long[] mk_tokenSet_2() {
+ private static long[] mk_tokenSet_2() {
long[] data = new long[2048];
data[0]=-140737488355329L;
for (int i = 1; i<=1022; i++) { data[i]=-1L; }
@@ -1905,7 +1905,7 @@ tryAgain:
return data;
}
public static final BitSet _tokenSet_2 = new BitSet(mk_tokenSet_2());
- private static final long[] mk_tokenSet_3() {
+ private static long[] mk_tokenSet_3() {
long[] data = new long[2048];
data[0]=-145135534867457L;
for (int i = 1; i<=1022; i++) { data[i]=-1L; }
@@ -1913,7 +1913,7 @@ tryAgain:
return data;
}
public static final BitSet _tokenSet_3 = new BitSet(mk_tokenSet_3());
- private static final long[] mk_tokenSet_4() {
+ private static long[] mk_tokenSet_4() {
long[] data = new long[2048];
data[0]=-4398046512129L;
for (int i = 1; i<=1022; i++) { data[i]=-1L; }
@@ -1921,7 +1921,7 @@ tryAgain:
return data;
}
public static final BitSet _tokenSet_4 = new BitSet(mk_tokenSet_4());
- private static final long[] mk_tokenSet_5() {
+ private static long[] mk_tokenSet_5() {
long[] data = new long[2048];
data[0]=-549755813889L;
data[1]=-268435457L;
@@ -1930,14 +1930,14 @@ tryAgain:
return data;
}
public static final BitSet _tokenSet_5 = new BitSet(mk_tokenSet_5());
- private static final long[] mk_tokenSet_6() {
+ private static long[] mk_tokenSet_6() {
long[] data = new long[1025];
data[0]=287948901175001088L;
data[1]=541165879422L;
return data;
}
public static final BitSet _tokenSet_6 = new BitSet(mk_tokenSet_6());
- private static final long[] mk_tokenSet_7() {
+ private static long[] mk_tokenSet_7() {
long[] data = new long[2048];
data[0]=-17179869185L;
data[1]=-268435457L;
[3/6] cxf git commit: Fix a bunch of eclipse warnings
Posted by dk...@apache.org.
Fix a bunch of eclipse warnings
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/55c2f0e9
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/55c2f0e9
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/55c2f0e9
Branch: refs/heads/3.1.x-fixes
Commit: 55c2f0e9f1c53501ab7078c2d0b9adaa3d67f1ab
Parents: f7df387
Author: Daniel Kulp <dk...@apache.org>
Authored: Wed Jul 26 13:45:49 2017 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Fri Jul 28 12:13:21 2017 -0400
----------------------------------------------------------------------
.../cxf/jaxrs/impl/AsyncResponseImpl.java | 3 +-
.../jaxrs/interceptor/JAXRSOutInterceptor.java | 3 +-
.../apache/cxf/jaxrs/impl/ResponseImplTest.java | 43 ++++++++++----------
3 files changed, 26 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/55c2f0e9/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/AsyncResponseImpl.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/AsyncResponseImpl.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/AsyncResponseImpl.java
index f1606c9..f4395d8 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/AsyncResponseImpl.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/AsyncResponseImpl.java
@@ -269,7 +269,8 @@ public class AsyncResponseImpl implements AsyncResponse, ContinuationCallback {
return false;
}
}
-
+
+ @SuppressWarnings("resource") // Response that is built here shouldn't be closed here
public Object getResponseObject() {
Object obj = cont.getObject();
if (!(obj instanceof Response) && !(obj instanceof Throwable)) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/55c2f0e9/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSOutInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSOutInterceptor.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSOutInterceptor.java
index 9ee4c7d..7adbdbb 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSOutInterceptor.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSOutInterceptor.java
@@ -87,7 +87,8 @@ public class JAXRSOutInterceptor extends AbstractOutDatabindingInterceptor {
}
-
+
+ @SuppressWarnings("resource") // Response shouldn't be closed here
private void processResponse(ServerProviderFactory providerFactory, Message message) {
if (isResponseAlreadyHandled(message)) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/55c2f0e9/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/ResponseImplTest.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/ResponseImplTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/ResponseImplTest.java
index 72d90d5..915a3b6 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/ResponseImplTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/ResponseImplTest.java
@@ -65,6 +65,7 @@ import org.junit.Assert;
import org.junit.Test;
+@SuppressWarnings("resource") // Responses built in this test don't need to be closed
public class ResponseImplTest extends Assert {
@Test
@@ -391,27 +392,27 @@ public class ResponseImplTest extends Assert {
@Test
public void testGetLinksNoRel() {
- ResponseImpl ri = new ResponseImpl(200);
- MetadataMap<String, Object> meta = new MetadataMap<String, Object>();
- ri.addMetadata(meta);
-
- Set<Link> links = ri.getLinks();
- assertTrue(links.isEmpty());
-
- meta.add(HttpHeaders.LINK, "<http://next>");
- meta.add(HttpHeaders.LINK, "<http://prev>");
-
- assertFalse(ri.hasLink("next"));
- Link next = ri.getLink("next");
- assertNull(next);
- assertFalse(ri.hasLink("prev"));
- Link prev = ri.getLink("prev");
- assertNull(prev);
-
- links = ri.getLinks();
- assertTrue(links.contains(Link.fromUri("http://next").build()));
- assertTrue(links.contains(Link.fromUri("http://prev").build()));
-
+ try (ResponseImpl ri = new ResponseImpl(200)) {
+ MetadataMap<String, Object> meta = new MetadataMap<String, Object>();
+ ri.addMetadata(meta);
+
+ Set<Link> links = ri.getLinks();
+ assertTrue(links.isEmpty());
+
+ meta.add(HttpHeaders.LINK, "<http://next>");
+ meta.add(HttpHeaders.LINK, "<http://prev>");
+
+ assertFalse(ri.hasLink("next"));
+ Link next = ri.getLink("next");
+ assertNull(next);
+ assertFalse(ri.hasLink("prev"));
+ Link prev = ri.getLink("prev");
+ assertNull(prev);
+
+ links = ri.getLinks();
+ assertTrue(links.contains(Link.fromUri("http://next").build()));
+ assertTrue(links.contains(Link.fromUri("http://prev").build()));
+ }
}
public static class StringBean {
[6/6] cxf git commit: Recording .gitmergeinfo Changes
Posted by dk...@apache.org.
Recording .gitmergeinfo Changes
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/9bbf7417
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/9bbf7417
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/9bbf7417
Branch: refs/heads/3.1.x-fixes
Commit: 9bbf7417eb6841a4518920876bd5b7dc6692609f
Parents: 4f99cee
Author: Daniel Kulp <dk...@apache.org>
Authored: Fri Jul 28 12:15:03 2017 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Fri Jul 28 12:15:03 2017 -0400
----------------------------------------------------------------------
.gitmergeinfo | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/9bbf7417/.gitmergeinfo
----------------------------------------------------------------------
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 3f7bf89..2d6364d 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -45,6 +45,7 @@ B 16672c10cf0a7bcfeeb946fd352e50fb72bda991
B 16931d7ae0cbb38e987923bf604cd403c1caee7f
B 180d0fcc5e0d061f339e1a3cb32ec53a3ab32b97
B 183a2a4022b912a6c32c1d3e268982b2f78f7631
+B 18720623e9d86e68566346981cebaefc7995d910
B 189756a8ff668d39d59cb7ff1658ed40d70ec12b
B 189b6643d30eab4d79a0f7722c9277e76e92a1fd
B 1ae4d6dee70587b048c0dcded9cd0b2855c2e225
@@ -70,6 +71,7 @@ B 269e96752b11aeb3e911da76bd3074d768860968
B 26f43025348e101e981e3f64ecc3ddf483ad7fb3
B 27bba67eb336ac27eb1dbf75e6fdcff03320687f
B 27c37bffde998b284f5fa635c49b608cc72e7b43
+B 29b273dcc2aae9f67f9a886105245c3652b34594
B 2d1da35c001514fd37bd74180c1fdaa11e2e7b00
B 2e06ad9a423af0b51905ab87184097a7c7c936bd
B 2e6e9debe0449fdffaa33142185ed712ebec6a22
@@ -77,6 +79,7 @@ B 2fb1ccf60f1ba4e9d70f8c2a6329fa1a65e6a352
B 304c62a11b8dbe000cdfb5de857619703bca79f7
B 30a0754ebe160d75867bc2558612d555b88c8595
B 30fab03d70e5655130e6a1ab3081f3563c40cd48
+B 3182059e061eea359593d2e8241daf7cd27edae9
B 32d044afbe9c6bf4fd4ef829a71af3d1d949315e
B 333632ee013b26b6ed15d05818971d83927bd43d
B 337742ff1215b34643c8c35d8a1a9c4d5238d743
@@ -111,6 +114,7 @@ B 4427f7790e522144baa325e5b5c051885e9dc706
B 443fe6b1b69eacb6fe03e6e523ddf11ee38b7472
B 4446dbb0796fc214a6e070d46650f5ef1e860293
B 447f2dac6e160b5cd495558ca8855ed481396c63
+B 44b04b36d31d519d76812a66a96feae5a4814728
B 44b4f1b51b569ddd7d49cf48d7ab825b7dc798e4
B 44c608c205fd2fdac2f2fed9557c2c39730a44d6
B 45bc2219b761e671973acf297e0f37a1b8934c6c
@@ -140,6 +144,7 @@ B 540a1255be34c047c094f53461925d46c3ed058b
B 54910695917fb63a11982a8dc96a3b4d088963c5
B 54b71171e89bb1be7d169ac91bb626c9c1ca293b
B 54e7c58d5449d5f91879674598fe1b1ee339a272
+B 550df751b7d7dcdda1a92a22d80890c573be9998
B 553329cd35e14013fbf727b392cf40374f399ba3
B 56dab42caaf27e3bedf08cbb419d3644aeccb7af
B 573405dd523139bb935339b89c28f849676da727
@@ -188,11 +193,14 @@ B 6e01fcffa1e64f38b69a7cae9b2a7236d7ec330d
B 6e7b79f6a8b6523b2248937275d92918e5682aa2
B 6fcdc7e9eec2414a40bd3161cf237ef182e313a6
B 702389744199001e6c35e602ffb197ebaaf84838
+B 706eacc5ae12e1c95085d2f8602c632c921e849e
B 707fa4f3c3f3aa40979e57468a9ac3eb3102a71f
+B 7263bb6f9e9025c31cd5bcab1f270805587a6a6d
B 73d1f886ae5265131e8664ee952ffd1cdc82f71a
B 741c9e349e7e48d3fe278ba8d8f17dd6bf4c4370
B 7463f091dcf08fb4bbfe58c261dda6bd1900460c
B 746cd3c0b850702e5b3601d18ce81652a1f3441f
+B 74b975e88c799e8d62ba319b4b5a0bb91ae7d269
B 762093f79fb799e3912ce572213f1a46eb02867c
B 76877054e1a86220fe1a546acde9a12e7c63e10b
B 76d165c9f7d76de1e333eded6106fa0cc186131b
@@ -201,6 +209,7 @@ B 77c3f51dcb1f02c8799f4e09676c0697e76a0756
B 77e0ffed1a647a159d7b249071de87c049803885
B 782cd824775c353c034d10821b271da2ecf50e13
B 79244372958dc1a9e382db4e1740e248bc8e2538
+B 79b00e8ff8584f431df4311b614ed843feea1f04
B 7a5e2690c36914ba481570c811f23d6e6b80bc07
B 7b7629682d15345518e66d46e575bf1ac334cf00
B 7c191d4d590a5ef621a0dd5adfff59512c91daf3
@@ -210,7 +219,9 @@ B 7e2b6f21b7c9d3e922bf93c31af3c5be896509bb
B 7eb2d58faacb2dd57c1eddea99c59a8b17807faf
B 7f07dac41850cd4e858892d655babe343232cd32
B 7f4a24d037c06f76770e969ad7e2a47f4687a33a
+B 7fa9a0a0acf9b395590a2bd03853cc55dc79036d
B 7fab6245608119634271e580166120b9c55dce48
+B 7facb09bd371501dbde438fcef82dfb4a0d98f6f
B 7fc957efa3a193a5f2ae178b8a608717ce4c5b26
B 7fcd84b1f82a203917a5269a2c0c10a0d5b6f877
B 811daf375e496e42ac9002aaf59f1eb2c1301942
@@ -254,6 +265,7 @@ B 9cc3f37d15778604463d03e609e09b46bd2b7b5c
B 9cffee539adc2abd5eaf198e16fde082ca4b3e92
B 9f39272a5f92c8bc27a8d3adc4da89f0eb30a54b
B 9f82ccd9d9a6f7db5b555c4040c41faf177f8e0b
+B a055d7bd3ce27c5501fbf9a22961fd7599aa5634
B a05d75086453fa18ca4f4733f7cc8819693c786b
B a219766354d6aee53c7f7a4da91f434af552b437
B a261507ebd3104b1a00298801ec9815ed1e7a728
@@ -262,6 +274,7 @@ B a38da9e8f15fb158bf0982c61750ef48e5814792
B a4167fb84baa1834bbe86be8a749c385f1af8c82
B a4b794b55b1ea258e9168a58f05794f37aeeb049
B a4b98454d147437ff71b92355d60e8bd48d56448
+B a7126b66417fd51cbe42f850a5cf8abd6b7e9e02
B a7362dfaf2141cb4f303f81bbb94c6df81be75cb
B a81534d6655e046e7d316e6de38095fe3f4949cb
B a93cbfd994c34000f27911c5aab6638b60d61ff7
@@ -275,6 +288,7 @@ B ae83629e6291538e72d300fb35d7f6df7cf064a1
B aed1b1d45ea12b1b1a7f083f756c27ed914ad9b7
B aeeb4df2e5c4133164014e15ebf221a2dcd02eec
B aeecef53263cd1d595d991654f0a783a10adfdcb
+B af8a95bf93b4273822395e3e7d96d462fe9820f2
B afdf9361f1c3ce49c8440a5f2615bde2bb42c684
B b2c10cc6c18a6e6589d258436303c46b3f682f7e
B b3c49a34cd86a1966f79aed10c2df54adbdf7c5b
@@ -294,6 +308,7 @@ B bcacbef8c3aa0e40e2cf560c6d0922edb4b641fb
B bcb96eb5cbdfcd473da2ef64709ec0dc541d3609
B bceee342b32f3704ca75176d06067f90c6d3fbdc
B bd24e7efd7f8f4258e8fde99eb63e007378048f0
+B bd6852d25e33d8226ca54f2f07dcb17fe5c10c75
B bd8aff6652eef048513571b96c703f4333f24dfb
B bd95151baf5368295db6bf9798d106d89f2f8a60
B be6190da7b0a05c505c99668270c993cd94a0eb2
@@ -333,6 +348,7 @@ B ced98c6e937bd93f92dac9043fa0406c696bfd84
B cf11aa95ed031018b1b76512d0c6004bb3448058
B cf3f537d210c979dc3b3f49e08ebad5f0c02993c
B cf9ab27a843df4532d9bd78209aebcafee2ffffc
+B cfdd0d36c31d119d5846ccfdd623ab072c8a7682
B d017d3cf4165e9d8fa849e29669cece562f55253
B d05916a301a0b1fd80085cea9e74ea82ca2845be
B d0dd55e901a83c1a4a014552a7da58f3899cd638
@@ -355,6 +371,7 @@ B dd81c1eb76d853f735b2265a18653ab862298468
B de61a48bf953950e16d67038247903b747c4e7ae
B de675431040a434c2bd1ef66667472fb4a49a9ab
B dfc84b0fac84e001069800b32f01529d50339cdb
+B dffa0df6ce47291364baecbfe78cb131d20be6b7
B e14d803ff84be7c59dd7c2321f1090231967d45c
B e18b4fb7d5f4f585eea1a2637c5158cd6e0c61af
B e1a5b307ca62fd05b23eb421b7a10c6d2b4b9a60
@@ -403,6 +420,7 @@ B f2f8b95ad823b38aa68e7a2071eac0b5b637b2aa
B f2fe6260e87fc71e43075730bee99cf564d2711a
B f34a8146bbfd1d5fdc80adb373f56c9862f3e159
B f3bb66deb0757478a33e0c3609428e7450cf3edb
+B f45612c0a60b63c5cfe7e190c54254e8a77c5e2a
B f4d0b2152036c6e57f82d762464f6c96907e0a37
B f51d7557791a6d3ae0bcf7f81ceda30a2c0029d3
B f66dea949bdc3f136084115aca4e514bad426380
@@ -441,6 +459,7 @@ M 0b7b18333591d6bb8e0bfcf324bbdefaa8cce21d
M 0c307b67340dcafd75a1fd40ce003869ddd4594b
M 0e5fd5a54cb271ba494e7e30b45d4228b33364a9
M 0eef86f37288f71fd96506fb2ac7fa27169d1e43
+M 0fbd966c8495f4beccf6719eb1e6efd06eb00971
M 10d34e1a812ab2a709376f008c738de68c8720cf
M 10ed38c6d1f74f75ae231e8b91b7198b4e162ab3
M 11637433df089a638e173d1ef57441e7456cf2ea
@@ -495,6 +514,7 @@ M 39c772a0764b323f98ab58e00345f4fca924c425
M 3a1fa0b23f1778594b6339dfcfbc90dcc43a87d4
M 3b7587395586f59d0fe9427038dd2d891fbe223d
M 3b967cf6d9c67bebb6e0705a3fdede4d2a6b1015
+M 3b9898a0c05d35b59de11d4563eea55abd52262c
M 3bbfc22e182ffea8c98ba8f84b4f55abfce353e7
M 3be9aac26a003ef43995054da875ffd5fa5a2eb4
M 3d02791f001faf35ea585ce67d3f4564f5c25c1b
@@ -589,6 +609,7 @@ M 8aebfa30047f32e3a6b4feb7ffdd89208ec4f435
M 8b5ad0005d5e42bb51a90c6773aae12c5022f78b
M 8b78d8c82accc1f0beca55eef8d5bce87c7af792
M 8c6401b76ca76010e7e169656fd2f5fae6f3245a
+M 8c7b7bb3a6b86632d73da57b6567dd9bb4157f31
M 8dadf3defb43d13169943b191204be93da63c88b
M 8dbc8cbfa532706ec138c3580543d38ee5c34daf
M 8e131133c8566a124605cb06e0b6db98fddb5972
@@ -605,6 +626,7 @@ M 939a75d9d3dbfbe37ead5ca41e5e53727dc40b40
M 93b07cfd3c39f6eb62ec1f428174811a87307ba2
M 94060fc026b3b7214337c9fcfce71c06f0fb4444
M 955fd4b7fee79642934a828b7758ce14f783364a
+M 974c9d346ca9229d60a4d176b892f5920b994668
M 97b20f61bbf7054076c8cdf609beb8a7047105b8
M 998ce1e5df26773dc96d130b9b55c7d6eec746e7
M 99f6eb63fa7da2a29ea9d28f1c55c5cb90a09222
@@ -633,11 +655,13 @@ M a876d164c96acc9d08855e9fc6c5fd4ed281845f
M a89ca98653b95bcd2ab5cadbe9a419a4cec4893a
M a93f0d9ad891865cc635a961cb890c2031177e5b
M a9fe8470ce9522f08c298e58f76636c48d57b7a4
+M ab123c0826a168842ae6e451058551b65d470e6f
M abcc137cb9b27e0da0b4270a18ac2a32df1e9990
M ad18f5aef28eb82d613b3f4226b2ddae19b6415f
M ad200706d0ea914987930a64d2f5c14336a0c641
M ae1842229fbc354e57ca3ca6797e8c9462dfc2ce
M ae3ae2a25109375cc82114d15078f04e8c5353c5
+M afc6bd28815c961fe1b14c1cb8e3eacf13431f80
M b0a79aa7b48da6acdc6da1169abd690ecf914ca8
M b12d8a04f280d39e62a18fa4a8f7946c27f06d75
M b1c6125f50b294b0e2ebc927671e2ff53b5001bf
@@ -692,6 +716,7 @@ M e00b84269aa8112bf4073b69b58f933fda3ab497
M e0ace3dc71a45a9bee6223e550f2ad869581c12d
M e0bbfe4a0c8a17c2335d08aec558c98fdebbf07d
M e0ed46f9f99ac1ec3e0925b3e5666e0b7a69af53
+M e4328f8a24dab900448f2e0832b24e729df84f28
M e4cb2ea437185caa28b95a2344ffa8aa0ba516b7
M e578ea946aa13177adef98727e3e4606652ffc76
M e6d42f6d6684feb46fc0bfbc0520ed13f0f002aa