You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2018/10/16 16:30:38 UTC
[cxf] branch master updated (dcb401e -> 3bacad3)
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git.
from dcb401e Merge pull request #460 from gyoetam/ClientPolicyCalculator-fix
new dda4173 Rationalizing some code in the cdi systests
new f5c0cc7 Attempting to reproduce the issue in CXF-7834
new 3bacad3 Updating weld
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
parent/pom.xml | 2 +-
.../jaxrs/cdi/AbstractBookStoreCdiTest.java} | 40 +++++++-----------
.../cxf/systest/jaxrs/cdi/BookStoreFeed.java | 28 +++++++++++--
.../systest/jaxrs/cdi/jetty/JettyEmbeddedTest.java | 46 +--------------------
.../cxf/systest/jaxrs/cdi/jetty/JettyWarTest.java | 47 +---------------------
.../systest/jaxrs/cdi/tomcat/TomcatWarTest.java | 46 +--------------------
6 files changed, 46 insertions(+), 163 deletions(-)
copy systests/cdi/{cdi-owb/cdi-producers-owb/src/test/java/org/apache/cxf/systest/jaxrs/cdi/tomcat/TomcatWarTest.java => cdi-weld/cdi-producers-weld/src/test/java/org/apache/cxf/systest/jaxrs/cdi/AbstractBookStoreCdiTest.java} (73%)
[cxf] 02/03: Attempting to reproduce the issue in CXF-7834
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit f5c0cc7d46aaf65105eb1014ccfe69e8c69b0edb
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Tue Oct 16 16:46:45 2018 +0100
Attempting to reproduce the issue in CXF-7834
---
.../jaxrs/cdi/AbstractBookStoreCdiTest.java | 12 ++++++++++
.../cxf/systest/jaxrs/cdi/BookStoreFeed.java | 28 ++++++++++++++++++----
2 files changed, 36 insertions(+), 4 deletions(-)
diff --git a/systests/cdi/cdi-weld/cdi-producers-weld/src/test/java/org/apache/cxf/systest/jaxrs/cdi/AbstractBookStoreCdiTest.java b/systests/cdi/cdi-weld/cdi-producers-weld/src/test/java/org/apache/cxf/systest/jaxrs/cdi/AbstractBookStoreCdiTest.java
index c5616a2..ceb4a86 100644
--- a/systests/cdi/cdi-weld/cdi-producers-weld/src/test/java/org/apache/cxf/systest/jaxrs/cdi/AbstractBookStoreCdiTest.java
+++ b/systests/cdi/cdi-weld/cdi-producers-weld/src/test/java/org/apache/cxf/systest/jaxrs/cdi/AbstractBookStoreCdiTest.java
@@ -65,4 +65,16 @@ public abstract class AbstractBookStoreCdiTest extends AbstractCdiSingleAppTest
assertEquals(Response.Status.CREATED.getStatusCode(), r.getStatus());
}
+ @Test
+ public void testQueryParameter() {
+ Response r =
+ createWebClient(getBasePath() + "/books/param", "text/plain").query("fieldValue", "queryParam").get();
+ assertEquals("queryParam", r.readEntity(String.class));
+ assertEquals(Response.Status.OK.getStatusCode(), r.getStatus());
+
+ r = createWebClient(getBasePath() + "/books/param2", "text/plain").query("fieldValue2", "queryParam").get();
+ assertEquals("queryParam", r.readEntity(String.class));
+ assertEquals(Response.Status.OK.getStatusCode(), r.getStatus());
+ }
+
}
diff --git a/systests/cdi/cdi-weld/cdi-producers-weld/src/test/java/org/apache/cxf/systest/jaxrs/cdi/BookStoreFeed.java b/systests/cdi/cdi-weld/cdi-producers-weld/src/test/java/org/apache/cxf/systest/jaxrs/cdi/BookStoreFeed.java
index 89f0d52..b0c345f 100644
--- a/systests/cdi/cdi-weld/cdi-producers-weld/src/test/java/org/apache/cxf/systest/jaxrs/cdi/BookStoreFeed.java
+++ b/systests/cdi/cdi-weld/cdi-producers-weld/src/test/java/org/apache/cxf/systest/jaxrs/cdi/BookStoreFeed.java
@@ -23,6 +23,8 @@ import javax.validation.constraints.NotNull;
import javax.ws.rs.GET;
import javax.ws.rs.Path;
import javax.ws.rs.Produces;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.core.Response;
import org.apache.abdera.model.Feed;
import org.apache.abdera.parser.stax.FOMEntry;
@@ -33,24 +35,42 @@ import org.apache.cxf.systests.cdi.base.BookStoreService;
@Path("/bookstore/")
public class BookStoreFeed {
private final BookStoreService service;
-
+
+ @QueryParam("fieldValue")
+ private String fieldValue;
+
public BookStoreFeed(BookStoreService service) {
this.service = service;
}
-
+
@GET
@Path("/books/feed")
@NotNull @Valid
@Produces("application/atom+xml")
public Feed getBooks() {
final FOMFeed feed = new FOMFeed();
-
+
for (final Book book: service.all()) {
final FOMEntry entry = new FOMEntry();
entry.addLink("/bookstore/books/" + book.getId());
feed.addEntry(entry);
}
-
+
return feed;
}
+
+ @GET
+ @Path("/books/param")
+ @Produces("text/plain")
+ public Response getFieldParam() {
+ return Response.ok().entity(fieldValue).build();
+ }
+
+ @GET
+ @Path("/books/param2")
+ @Produces("text/plain")
+ public Response getFieldParam2(@QueryParam("fieldValue2") String fieldValue2) {
+ return Response.ok().entity(fieldValue2).build();
+ }
+
}
[cxf] 01/03: Rationalizing some code in the cdi systests
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit dda4173d77d9fa278d9eca005549a55226b72ef9
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Tue Oct 16 16:30:57 2018 +0100
Rationalizing some code in the cdi systests
---
...tWarTest.java => AbstractBookStoreCdiTest.java} | 35 +++-------------
.../systest/jaxrs/cdi/jetty/JettyEmbeddedTest.java | 46 +--------------------
.../cxf/systest/jaxrs/cdi/jetty/JettyWarTest.java | 47 +---------------------
.../systest/jaxrs/cdi/tomcat/TomcatWarTest.java | 46 +--------------------
4 files changed, 11 insertions(+), 163 deletions(-)
diff --git a/systests/cdi/cdi-weld/cdi-producers-weld/src/test/java/org/apache/cxf/systest/jaxrs/cdi/tomcat/TomcatWarTest.java b/systests/cdi/cdi-weld/cdi-producers-weld/src/test/java/org/apache/cxf/systest/jaxrs/cdi/AbstractBookStoreCdiTest.java
similarity index 68%
copy from systests/cdi/cdi-weld/cdi-producers-weld/src/test/java/org/apache/cxf/systest/jaxrs/cdi/tomcat/TomcatWarTest.java
copy to systests/cdi/cdi-weld/cdi-producers-weld/src/test/java/org/apache/cxf/systest/jaxrs/cdi/AbstractBookStoreCdiTest.java
index f47b154..c5616a2 100644
--- a/systests/cdi/cdi-weld/cdi-producers-weld/src/test/java/org/apache/cxf/systest/jaxrs/cdi/tomcat/TomcatWarTest.java
+++ b/systests/cdi/cdi-weld/cdi-producers-weld/src/test/java/org/apache/cxf/systest/jaxrs/cdi/AbstractBookStoreCdiTest.java
@@ -16,38 +16,18 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.cxf.systest.jaxrs.cdi.tomcat;
+package org.apache.cxf.systest.jaxrs.cdi;
import java.util.UUID;
import javax.ws.rs.core.Form;
import javax.ws.rs.core.Response;
-import org.apache.cxf.jaxrs.model.AbstractResourceInfo;
import org.apache.cxf.systests.cdi.base.AbstractCdiSingleAppTest;
-import org.apache.cxf.systests.cdi.base.tomcat.AbstractTomcatServer;
-import org.jboss.weld.environment.Container;
-import org.jboss.weld.environment.tomcat.TomcatContainer;
-import org.junit.BeforeClass;
import org.junit.Test;
-public class TomcatWarTest extends AbstractCdiSingleAppTest {
- public static class EmbeddedTomcatServer extends AbstractTomcatServer {
- public static final int PORT = allocatePortAsInt(EmbeddedTomcatServer.class);
-
- public EmbeddedTomcatServer() {
- super("/jaxrs_cdi", "/", PORT);
- }
- }
-
- @BeforeClass
- public static void startServers() throws Exception {
- AbstractResourceInfo.clearAllMaps();
- System.setProperty(Container.class.getName(), TomcatContainer.class.getName());
- assertTrue("server did not launch correctly", launchServer(EmbeddedTomcatServer.class, true));
- createStaticBus();
- }
+public abstract class AbstractBookStoreCdiTest extends AbstractCdiSingleAppTest {
@Test
public void testAddOneBookWithValidation() {
@@ -58,14 +38,14 @@ public class TomcatWarTest extends AbstractCdiSingleAppTest {
.param("id", id));
assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), r.getStatus());
}
-
+
@Test
public void testResponseHasBeenReceivedWhenQueringAllBookAsAtomFeed() {
Response r = createWebClient(getBasePath() + "/books/feed", "application/atom+xml").get();
assertEquals(Response.Status.OK.getStatusCode(), r.getStatus());
assertEquals("application/atom+xml", r.getMediaType().toString());
}
-
+
@Test
public void testBookHasBeenValidatedWhenPostedAsAtomFeed() {
Response r = createWebClient(getBasePath() + "/books/feed", "application/atom+xml").post(
@@ -74,7 +54,7 @@ public class TomcatWarTest extends AbstractCdiSingleAppTest {
assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), r.getStatus());
}
-
+
@Test
public void testBookHasBeenCreatedWhenPostedAsAtomFeed() {
Response r = createWebClient(getBasePath() + "/books/feed", "application/atom+xml").post(
@@ -85,9 +65,4 @@ public class TomcatWarTest extends AbstractCdiSingleAppTest {
assertEquals(Response.Status.CREATED.getStatusCode(), r.getStatus());
}
- @Override
- protected int getPort() {
- return EmbeddedTomcatServer.PORT;
- }
-
}
diff --git a/systests/cdi/cdi-weld/cdi-producers-weld/src/test/java/org/apache/cxf/systest/jaxrs/cdi/jetty/JettyEmbeddedTest.java b/systests/cdi/cdi-weld/cdi-producers-weld/src/test/java/org/apache/cxf/systest/jaxrs/cdi/jetty/JettyEmbeddedTest.java
index d6545a4..0d9fb81 100644
--- a/systests/cdi/cdi-weld/cdi-producers-weld/src/test/java/org/apache/cxf/systest/jaxrs/cdi/jetty/JettyEmbeddedTest.java
+++ b/systests/cdi/cdi-weld/cdi-producers-weld/src/test/java/org/apache/cxf/systest/jaxrs/cdi/jetty/JettyEmbeddedTest.java
@@ -18,22 +18,16 @@
*/
package org.apache.cxf.systest.jaxrs.cdi.jetty;
-import java.util.UUID;
-
-import javax.ws.rs.core.Form;
-import javax.ws.rs.core.Response;
-
import org.apache.cxf.jaxrs.model.AbstractResourceInfo;
-import org.apache.cxf.systests.cdi.base.AbstractCdiSingleAppTest;
+import org.apache.cxf.systest.jaxrs.cdi.AbstractBookStoreCdiTest;
import org.apache.cxf.systests.cdi.base.jetty.AbstractJettyServer;
import org.jboss.weld.environment.Container;
import org.jboss.weld.environment.jetty.JettyContainer;
import org.jboss.weld.environment.servlet.Listener;
import org.junit.BeforeClass;
-import org.junit.Test;
-public class JettyEmbeddedTest extends AbstractCdiSingleAppTest {
+public class JettyEmbeddedTest extends AbstractBookStoreCdiTest {
public static class EmbeddedJettyServer extends AbstractJettyServer {
public static final int PORT = allocatePortAsInt(EmbeddedJettyServer.class);
@@ -50,42 +44,6 @@ public class JettyEmbeddedTest extends AbstractCdiSingleAppTest {
createStaticBus();
}
- @Test
- public void testAddOneBookWithValidation() {
- final String id = UUID.randomUUID().toString();
-
- Response r = createWebClient(getBasePath() + "/books").post(
- new Form()
- .param("id", id));
- assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), r.getStatus());
- }
-
- @Test
- public void testResponseHasBeenReceivedWhenQueringAllBookAsAtomFeed() {
- Response r = createWebClient(getBasePath() + "/books/feed", "application/atom+xml").get();
- assertEquals(Response.Status.OK.getStatusCode(), r.getStatus());
- assertEquals("application/atom+xml", r.getMediaType().toString());
- }
-
- @Test
- public void testBookHasBeenValidatedWhenPostedAsAtomFeed() {
- Response r = createWebClient(getBasePath() + "/books/feed", "application/atom+xml").post(
- new Form()
- .param("name", "Book 1234"));
-
- assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), r.getStatus());
- }
-
- @Test
- public void testBookHasBeenCreatedWhenPostedAsAtomFeed() {
- Response r = createWebClient(getBasePath() + "/books/feed", "application/atom+xml").post(
- new Form()
- .param("id", "1234")
- .param("name", "Book 1234"));
-
- assertEquals(Response.Status.CREATED.getStatusCode(), r.getStatus());
- }
-
@Override
protected int getPort() {
return EmbeddedJettyServer.PORT;
diff --git a/systests/cdi/cdi-weld/cdi-producers-weld/src/test/java/org/apache/cxf/systest/jaxrs/cdi/jetty/JettyWarTest.java b/systests/cdi/cdi-weld/cdi-producers-weld/src/test/java/org/apache/cxf/systest/jaxrs/cdi/jetty/JettyWarTest.java
index ab15677..b288169 100644
--- a/systests/cdi/cdi-weld/cdi-producers-weld/src/test/java/org/apache/cxf/systest/jaxrs/cdi/jetty/JettyWarTest.java
+++ b/systests/cdi/cdi-weld/cdi-producers-weld/src/test/java/org/apache/cxf/systest/jaxrs/cdi/jetty/JettyWarTest.java
@@ -18,13 +18,8 @@
*/
package org.apache.cxf.systest.jaxrs.cdi.jetty;
-import java.util.UUID;
-
-import javax.ws.rs.core.Form;
-import javax.ws.rs.core.Response;
-
import org.apache.cxf.jaxrs.model.AbstractResourceInfo;
-import org.apache.cxf.systests.cdi.base.AbstractCdiSingleAppTest;
+import org.apache.cxf.systest.jaxrs.cdi.AbstractBookStoreCdiTest;
import org.apache.cxf.systests.cdi.base.jetty.AbstractJettyServer;
import org.jboss.weld.environment.Container;
import org.jboss.weld.environment.jetty.JettyContainer;
@@ -32,9 +27,8 @@ import org.jboss.weld.environment.servlet.Listener;
import org.junit.BeforeClass;
import org.junit.Ignore;
-import org.junit.Test;
-public class JettyWarTest extends AbstractCdiSingleAppTest {
+public class JettyWarTest extends AbstractBookStoreCdiTest {
@Ignore
public static class EmbeddedJettyServer extends AbstractJettyServer {
public static final int PORT = allocatePortAsInt(EmbeddedJettyServer.class);
@@ -51,44 +45,7 @@ public class JettyWarTest extends AbstractCdiSingleAppTest {
assertTrue("server did not launch correctly", launchServer(EmbeddedJettyServer.class, true));
createStaticBus();
}
-
- @Test
- public void testAddOneBookWithValidation() {
- final String id = UUID.randomUUID().toString();
-
- Response r = createWebClient(getBasePath() + "/books").post(
- new Form()
- .param("id", id));
- assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), r.getStatus());
- }
-
- @Test
- public void testResponseHasBeenReceivedWhenQueringAllBookAsAtomFeed() {
- Response r = createWebClient(getBasePath() + "/books/feed", "application/atom+xml").get();
- assertEquals(Response.Status.OK.getStatusCode(), r.getStatus());
- assertEquals("application/atom+xml", r.getMediaType().toString());
- }
-
- @Test
- public void testBookHasBeenValidatedWhenPostedAsAtomFeed() {
- Response r = createWebClient(getBasePath() + "/books/feed", "application/atom+xml").post(
- new Form()
- .param("name", "Book 1234"));
-
- assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), r.getStatus());
- }
-
- @Test
- public void testBookHasBeenCreatedWhenPostedAsAtomFeed() {
- Response r = createWebClient(getBasePath() + "/books/feed", "application/atom+xml").post(
- new Form()
- .param("id", "1234")
- .param("name", "Book 1234"));
-
- assertEquals(Response.Status.CREATED.getStatusCode(), r.getStatus());
- }
- @Override
protected int getPort() {
return EmbeddedJettyServer.PORT;
}
diff --git a/systests/cdi/cdi-weld/cdi-producers-weld/src/test/java/org/apache/cxf/systest/jaxrs/cdi/tomcat/TomcatWarTest.java b/systests/cdi/cdi-weld/cdi-producers-weld/src/test/java/org/apache/cxf/systest/jaxrs/cdi/tomcat/TomcatWarTest.java
index f47b154..a36f002 100644
--- a/systests/cdi/cdi-weld/cdi-producers-weld/src/test/java/org/apache/cxf/systest/jaxrs/cdi/tomcat/TomcatWarTest.java
+++ b/systests/cdi/cdi-weld/cdi-producers-weld/src/test/java/org/apache/cxf/systest/jaxrs/cdi/tomcat/TomcatWarTest.java
@@ -18,21 +18,15 @@
*/
package org.apache.cxf.systest.jaxrs.cdi.tomcat;
-import java.util.UUID;
-
-import javax.ws.rs.core.Form;
-import javax.ws.rs.core.Response;
-
import org.apache.cxf.jaxrs.model.AbstractResourceInfo;
-import org.apache.cxf.systests.cdi.base.AbstractCdiSingleAppTest;
+import org.apache.cxf.systest.jaxrs.cdi.AbstractBookStoreCdiTest;
import org.apache.cxf.systests.cdi.base.tomcat.AbstractTomcatServer;
import org.jboss.weld.environment.Container;
import org.jboss.weld.environment.tomcat.TomcatContainer;
import org.junit.BeforeClass;
-import org.junit.Test;
-public class TomcatWarTest extends AbstractCdiSingleAppTest {
+public class TomcatWarTest extends AbstractBookStoreCdiTest {
public static class EmbeddedTomcatServer extends AbstractTomcatServer {
public static final int PORT = allocatePortAsInt(EmbeddedTomcatServer.class);
@@ -49,42 +43,6 @@ public class TomcatWarTest extends AbstractCdiSingleAppTest {
createStaticBus();
}
- @Test
- public void testAddOneBookWithValidation() {
- final String id = UUID.randomUUID().toString();
-
- Response r = createWebClient(getBasePath() + "/books").post(
- new Form()
- .param("id", id));
- assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), r.getStatus());
- }
-
- @Test
- public void testResponseHasBeenReceivedWhenQueringAllBookAsAtomFeed() {
- Response r = createWebClient(getBasePath() + "/books/feed", "application/atom+xml").get();
- assertEquals(Response.Status.OK.getStatusCode(), r.getStatus());
- assertEquals("application/atom+xml", r.getMediaType().toString());
- }
-
- @Test
- public void testBookHasBeenValidatedWhenPostedAsAtomFeed() {
- Response r = createWebClient(getBasePath() + "/books/feed", "application/atom+xml").post(
- new Form()
- .param("name", "Book 1234"));
-
- assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), r.getStatus());
- }
-
- @Test
- public void testBookHasBeenCreatedWhenPostedAsAtomFeed() {
- Response r = createWebClient(getBasePath() + "/books/feed", "application/atom+xml").post(
- new Form()
- .param("id", "1234")
- .param("name", "Book 1234"));
-
- assertEquals(Response.Status.CREATED.getStatusCode(), r.getStatus());
- }
-
@Override
protected int getPort() {
return EmbeddedTomcatServer.PORT;
[cxf] 03/03: Updating weld
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 3bacad35e53d71c904838e9b825096010e927c37
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Tue Oct 16 17:30:24 2018 +0100
Updating weld
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index c8ed17f..a2fecb4 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -185,7 +185,7 @@
<cxf.cdi.api.version>1.2</cxf.cdi.api.version>
<cxf.cda.api.osgi.range>[1.1,2)</cxf.cda.api.osgi.range>
<cxf.json.api.version>1.0</cxf.json.api.version>
- <cxf.jboss.weld.version>2.4.0.Final</cxf.jboss.weld.version>
+ <cxf.jboss.weld.version>2.4.8.Final</cxf.jboss.weld.version>
<cxf.jboss.logging.version>3.3.0.Final</cxf.jboss.logging.version>
<cxf.osgi.validation.api.version>1.1.0</cxf.osgi.validation.api.version>
<cxf.hibernate.validator.version>5.2.3.Final</cxf.hibernate.validator.version>