diff --git a/providers/jettison/pom.xml b/providers/jettison/pom.xml
index af89bdab085..51c6727caa9 100755
--- a/providers/jettison/pom.xml
+++ b/providers/jettison/pom.xml
@@ -37,12 +37,6 @@
org.jboss.spec.javax.servlet
jboss-servlet-api_3.1_spec
-
- org.jboss.resteasy
- tjws
- ${project.version}
- test
-
org.jboss.logging
diff --git a/providers/jettison/src/test/java/org/jboss/resteasy/test/i18n/TestMessagesAbstract.java b/providers/jettison/src/test/java/org/jboss/resteasy/test/i18n/TestMessagesAbstract.java
index 486bb530dec..9d97db08379 100644
--- a/providers/jettison/src/test/java/org/jboss/resteasy/test/i18n/TestMessagesAbstract.java
+++ b/providers/jettison/src/test/java/org/jboss/resteasy/test/i18n/TestMessagesAbstract.java
@@ -1,14 +1,12 @@
package org.jboss.resteasy.test.i18n;
-import java.util.Locale;
-
-import javax.ws.rs.core.MediaType;
-
-import org.junit.Assert;
-
import org.jboss.resteasy.plugins.providers.jaxb.json.i18n.Messages;
+import org.junit.Assert;
import org.junit.Test;
+import javax.ws.rs.core.MediaType;
+import java.util.Locale;
+
/**
*
* @author Ron Sigal
diff --git a/providers/jettison/src/test/java/org/jboss/resteasy/test/i18n/TestMessagesParent.java b/providers/jettison/src/test/java/org/jboss/resteasy/test/i18n/TestMessagesParent.java
index 15a53993963..f7ef600ab10 100644
--- a/providers/jettison/src/test/java/org/jboss/resteasy/test/i18n/TestMessagesParent.java
+++ b/providers/jettison/src/test/java/org/jboss/resteasy/test/i18n/TestMessagesParent.java
@@ -1,12 +1,12 @@
package org.jboss.resteasy.test.i18n;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+
import java.io.InputStream;
import java.util.Locale;
import java.util.Properties;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-
/**
*
* @author Ron Sigal
diff --git a/providers/jettison/src/test/java/org/jboss/resteasy/test/providers/jaxb/regression/resteasy175/Kunde.java b/providers/jettison/src/test/java/org/jboss/resteasy/test/providers/jaxb/regression/resteasy175/Kunde.java
deleted file mode 100644
index e62e2c41d3e..00000000000
--- a/providers/jettison/src/test/java/org/jboss/resteasy/test/providers/jaxb/regression/resteasy175/Kunde.java
+++ /dev/null
@@ -1,219 +0,0 @@
-package org.jboss.resteasy.test.providers.jaxb.regression.resteasy175;
-
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlTransient;
-import java.text.DateFormat;
-import java.text.ParseException;
-import java.util.Date;
-import java.util.GregorianCalendar;
-import java.util.Locale;
-
-import static java.util.Calendar.YEAR;
-import static javax.xml.bind.annotation.XmlAccessType.FIELD;
-
-
-@XmlRootElement
-@XmlAccessorType(FIELD)
-public class Kunde implements java.io.Serializable
-{
- private static final long serialVersionUID = 8488010636885492122L;
-
- @XmlAttribute(name = "id", required = true)
- protected Long id = null;
-
- @XmlElement(required = true)
- protected String nachname = "";
-
- protected String vorname = "";
-
- @XmlAttribute(required = true)
- protected String kundennr = "NnVn-001";
-
- protected Date seit = null;
-
- @XmlTransient
- protected int anzJahre;
-
- protected String details;
-
- @XmlTransient
- protected Date erzeugt = null;
-
- @XmlTransient
- protected Date aktualisiert = null;
-
- public Kunde()
- {
- super();
- }
-
- public Long getId()
- {
- return id;
- }
-
- public void setId(Long id)
- {
- this.id = id;
- }
-
- public String getNachname()
- {
- return nachname;
- }
-
- public void setNachname(String nachname)
- {
- this.nachname = nachname;
- }
-
- public String getVorname()
- {
- return vorname;
- }
-
- public void setVorname(String vorname)
- {
- this.vorname = vorname;
- }
-
- public Date getSeit()
- {
- return seit;
- }
-
- public void setSeit(Date seit)
- {
- this.seit = seit;
- }
-
- public int getAnzJahre()
- {
- final GregorianCalendar now = new GregorianCalendar();
- final GregorianCalendar seitCal = new GregorianCalendar();
- Date temp = seit;
- if (temp == null)
- temp = new Date();
- seitCal.setTime(temp);
-
- anzJahre = now.get(YEAR) - seitCal.get(YEAR);
-
- return anzJahre;
- }
-
- // Parameter, z.B. DateFormat.MEDIUM, Locale.GERMANY
- // MEDIUM fuer Format dd.MM.yyyy
- public String getSeitAsString(int style, Locale locale)
- {
- Date temp = seit;
- if (temp == null)
- temp = new Date();
- final DateFormat f = DateFormat.getDateInstance(style, locale);
- return f.format(temp);
- }
-
- // Parameter, z.B. DateFormat.MEDIUM, Locale.GERMANY
- // MEDIUM fuer Format dd.MM.yyyy
- public void setSeit(String seit, int style, Locale locale)
- {
- final DateFormat f = DateFormat.getDateInstance(style, locale);
- try
- {
- this.seit = f.parse(seit);
- }
- catch (ParseException e)
- {
- throw new RuntimeException(e);
- }
- }
-
- public String getDetails()
- {
- return details;
- }
-
- public void setDetails(String details)
- {
- this.details = details;
- }
-
- public Date getAktualisiert()
- {
- return aktualisiert;
- }
-
- public void setAktualisiert(Date aktualisiert)
- {
- this.aktualisiert = aktualisiert;
- }
-
- public Date getErzeugt()
- {
- return erzeugt;
- }
-
- public void setErzeugt(Date erzeugt)
- {
- this.erzeugt = erzeugt;
- }
-
- @Override
- public String toString()
- {
- return "id=" + id +
- ", nachname=" + nachname + ", vorname=" + vorname +
- ", nr=" + kundennr +
- ", seit=" + getSeitAsString(DateFormat.MEDIUM, Locale.GERMANY) +
- ", anzJahre=" + getAnzJahre() +
- ", erzeugt=" + erzeugt +
- ", aktualisiert=" + aktualisiert;
- }
-
- @Override
- public int hashCode()
- {
- final int PRIME = 31;
- int result = 1;
- result = PRIME * result + ((nachname == null) ? 0 : nachname.hashCode());
- result = PRIME * result + ((seit == null) ? 0 : seit.hashCode());
- result = PRIME * result + ((vorname == null) ? 0 : vorname.hashCode());
- return result;
- }
-
- @Override
- public boolean equals(Object obj)
- {
- if (this == obj)
- return true;
- if (obj == null)
- return false;
- if (getClass() != obj.getClass())
- return false;
- final Kunde other = (Kunde) obj;
- if (nachname == null)
- {
- if (other.nachname != null)
- return false;
- }
- else if (!nachname.equals(other.nachname))
- return false;
- if (seit == null)
- {
- if (other.seit != null)
- return false;
- }
- else if (!seit.equals(other.seit))
- return false;
- if (vorname == null)
- {
- if (other.vorname != null)
- return false;
- }
- else if (!vorname.equals(other.vorname))
- return false;
- return true;
- }
-}
\ No newline at end of file
diff --git a/providers/jettison/src/test/java/org/jboss/resteasy/test/providers/jaxb/regression/resteasy175/KundeList.java b/providers/jettison/src/test/java/org/jboss/resteasy/test/providers/jaxb/regression/resteasy175/KundeList.java
deleted file mode 100644
index 617dc8943fe..00000000000
--- a/providers/jettison/src/test/java/org/jboss/resteasy/test/providers/jaxb/regression/resteasy175/KundeList.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package org.jboss.resteasy.test.providers.jaxb.regression.resteasy175;
-
-import javax.xml.bind.annotation.XmlElementRef;
-import javax.xml.bind.annotation.XmlRootElement;
-import java.util.Collection;
-
-@XmlRootElement(name = "kunden")
-public class KundeList
-{
- @XmlElementRef
- public Collection kunden;
-
- public KundeList()
- {
- }
-
- public KundeList(Collection kunden)
- {
- this.kunden = kunden;
- }
-}
diff --git a/providers/jettison/src/test/java/org/jboss/resteasy/test/providers/jaxb/regression/resteasy175/KundeTest.java b/providers/jettison/src/test/java/org/jboss/resteasy/test/providers/jaxb/regression/resteasy175/KundeTest.java
deleted file mode 100644
index 1ceccd001d7..00000000000
--- a/providers/jettison/src/test/java/org/jboss/resteasy/test/providers/jaxb/regression/resteasy175/KundeTest.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package org.jboss.resteasy.test.providers.jaxb.regression.resteasy175;
-
-import org.jboss.resteasy.test.BaseResourceTest;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
-import static org.jboss.resteasy.test.TestPortProvider.generateURL;
-
-import javax.ws.rs.client.ClientBuilder;
-import javax.ws.rs.core.Response;
-
-/**
- * @author Bill Burke
- * @version $Revision: 1 $
- */
-public class KundeTest extends BaseResourceTest
-{
- @Before
- public void setUp() throws Exception
- {
- dispatcher.getRegistry().addPerRequestResource(KundenverwaltungResource.class);
- }
-
- @Test
- public void testKunde() throws Exception
- {
- Response response = ClientBuilder.newClient().target(generateURL("/kundenverwaltung/kunden")).request().get();
- Assert.assertEquals(200, response.getStatus());
- response.close();
- }
-
-}
diff --git a/providers/jettison/src/test/java/org/jboss/resteasy/test/providers/jaxb/regression/resteasy175/KundenverwaltungResource.java b/providers/jettison/src/test/java/org/jboss/resteasy/test/providers/jaxb/regression/resteasy175/KundenverwaltungResource.java
deleted file mode 100644
index b63212ef67e..00000000000
--- a/providers/jettison/src/test/java/org/jboss/resteasy/test/providers/jaxb/regression/resteasy175/KundenverwaltungResource.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package org.jboss.resteasy.test.providers.jaxb.regression.resteasy175;
-
-import org.jboss.resteasy.annotations.providers.jaxb.json.Mapped;
-import org.jboss.resteasy.annotations.providers.jaxb.json.XmlNsMap;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
-import static javax.ws.rs.core.MediaType.APPLICATION_XML;
-
-
-@Path("/kundenverwaltung")
-@Produces(APPLICATION_XML)
-@Consumes(APPLICATION_XML)
-public class KundenverwaltungResource
-{
- /**
- * Beispiel mit JSON
- * Funktioniert nicht mit RESTEASY: https://jira.jboss.org/jira/browse/RESTEASY-175
- */
- @GET
- @Path("/kunden")
- @Produces(APPLICATION_JSON)
- @Mapped(namespaceMap = {
- @XmlNsMap(namespace = "http://hska.de/kundenverwaltung", jsonName = "kunden")
- })
- public KundeList findKundenJSON()
- {
-
- final List kunden = new ArrayList(4);
- for (int i = 0; i < 4; i++)
- {
- final Kunde k = new Kunde();
- k.setId(Long.valueOf(i));
- k.setNachname("Lastname" + i);
- k.setSeit(new Date());
-
- kunden.add(k);
- }
-
- // Konvertierung in eigene List-Klasse wg. Wurzelelement
- final KundeList kundeList = new KundeList(kunden);
-
- return kundeList;
- }
-}
diff --git a/providers/jettison/src/test/java/org/jboss/resteasy/test/providers/jaxb/regression/resteasy175/package-info.java b/providers/jettison/src/test/java/org/jboss/resteasy/test/providers/jaxb/regression/resteasy175/package-info.java
deleted file mode 100644
index 9b5616901d2..00000000000
--- a/providers/jettison/src/test/java/org/jboss/resteasy/test/providers/jaxb/regression/resteasy175/package-info.java
+++ /dev/null
@@ -1,4 +0,0 @@
-/**
- * RESTful Web Service für Kunden mittels JAX-RS und JAXB.
- */
-@javax.xml.bind.annotation.XmlSchema(namespace = "http://hska.de/kundenverwaltung") package org.jboss.resteasy.test.providers.jaxb.regression.resteasy175;
diff --git a/providers/jettison/src/test/java/org/jboss/resteasy/test/xml/TestJAXB.java b/providers/jettison/src/test/java/org/jboss/resteasy/test/xml/TestJAXB.java
deleted file mode 100644
index 314de23bb32..00000000000
--- a/providers/jettison/src/test/java/org/jboss/resteasy/test/xml/TestJAXB.java
+++ /dev/null
@@ -1,170 +0,0 @@
-package org.jboss.resteasy.test.xml;
-
-import org.apache.http.client.HttpClient;
-import org.apache.http.impl.client.DefaultHttpClient;
-import org.jboss.resteasy.annotations.providers.jaxb.json.Mapped;
-import org.jboss.resteasy.client.jaxrs.ResteasyClientBuilder;
-import org.jboss.resteasy.client.jaxrs.ResteasyWebTarget;
-import org.jboss.resteasy.client.jaxrs.engines.ApacheHttpClient4Engine;
-import org.jboss.resteasy.core.Dispatcher;
-import org.jboss.resteasy.plugins.providers.jaxb.json.BadgerContext;
-import org.jboss.resteasy.plugins.providers.jaxb.json.JettisonMappedContext;
-import org.jboss.resteasy.plugins.server.resourcefactory.POJOResourceFactory;
-import org.jboss.resteasy.test.EmbeddedContainer;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import java.io.StringReader;
-import java.io.StringWriter;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-
-import static org.jboss.resteasy.test.TestPortProvider.generateBaseUrl;
-
-/**
- * Simple smoke test
- *
- * @author Bill Burke
- * @version $Revision: 1 $
- */
-public class TestJAXB
-{
-
- private static Dispatcher dispatcher;
-
- @BeforeClass
- public static void before() throws Exception
- {
- dispatcher = EmbeddedContainer.start().getDispatcher();
- }
-
- @AfterClass
- public static void after() throws Exception
- {
- EmbeddedContainer.stop();
- }
-
- @Test
- public void testNoDefaultsResource() throws Exception
- {
- POJOResourceFactory noDefaults = new POJOResourceFactory(BookStore.class);
- dispatcher.getRegistry().addResourceFactory(noDefaults);
-
- HttpClient httpClient = new DefaultHttpClient();
- ApacheHttpClient4Engine engine = new ApacheHttpClient4Engine(httpClient);
- ResteasyWebTarget target = new ResteasyClientBuilder().httpEngine(engine).build().target(generateBaseUrl());
- BookStoreClient client = target.proxy(BookStoreClient.class);
-
- Book book = client.getBookByISBN("596529260");
- Assert.assertNotNull(book);
- Assert.assertEquals("RESTful Web Services", book.getTitle());
-
- // TJWS does not support chunk encodings well so I need to kill kept
- // alive connections
- httpClient.getConnectionManager().closeIdleConnections(0, TimeUnit.MILLISECONDS);
-
- book = new Book("Bill Burke", "666", "EJB 3.0");
- client.addBook(book);
- book = new Book("Bill Burke", "3434", "JBoss Workbook");
- client.addBookJson(book);
- // TJWS does not support chunk encodings so I need to kill kept alive
- // connections
- httpClient.getConnectionManager().closeIdleConnections(0, TimeUnit.MILLISECONDS);
- book = client.getBookByISBN("666");
- Assert.assertEquals("Bill Burke", book.getAuthor());
- book = client.getBookByISBNJson("3434");
- Assert.assertEquals("Bill Burke", book.getAuthor());
- Assert.assertEquals("JBoss Workbook", book.getTitle());
- httpClient.getConnectionManager().closeIdleConnections(0, TimeUnit.MILLISECONDS);
- }
-
- @XmlRootElement
- public static class Library
- {
- private String name;
- private List books;
-
- @XmlAttribute
- public String getName()
- {
- return name;
- }
-
- public void setName(String name)
- {
- this.name = name;
- }
-
- @XmlElement(name = "registered-books")
- public List getBooks()
- {
- return books;
- }
-
- public void setBooks(List books)
- {
- this.books = books;
- }
- }
-
- @Test
- @Mapped(attributesAsElements = {"title"})
- public void testJSON() throws Exception
- {
- {
- Mapped mapped = TestJAXB.class.getMethod("testJSON").getAnnotation(Mapped.class);
- JettisonMappedContext context = new JettisonMappedContext(mapped, Book.class);
- StringWriter writer = new StringWriter();
- context.createMarshaller().marshal(new Book("Bill Burke", "666", "EJB 3.0"), writer);
- System.out.println("Mapped: ");
- String val = writer.toString();
- System.out.println(val);
-
- // test Mapped attributeAsElement
- Assert.assertTrue(val.indexOf("@title") == -1);
- }
- {
- BadgerContext context = new BadgerContext(Book.class);
- StringWriter writer = new StringWriter();
- context.createMarshaller().marshal(new Book("Bill Burke", "666", "EJB 3.0"), writer);
- System.out.println("Badger: ");
- System.out.println(writer.toString());
- }
- Library library = new Library();
- ArrayList books = new ArrayList();
- books.add(new Book("Bill Burke", "555", "JBoss Workbook"));
- books.add(new Book("Bill Burke", "666", "EJB 3.0"));
- library.setName("BPL");
- library.setBooks(books);
-
- {
- BadgerContext context = new BadgerContext(Library.class);
- StringWriter writer = new StringWriter();
- context.createMarshaller().marshal(library, writer);
- System.out.println("Badger: ");
- String s = writer.toString();
- System.out.println(s);
- Library lib = (Library) context.createUnmarshaller().unmarshal(new StringReader(s));
- Assert.assertEquals(lib.getName(), "BPL");
- Assert.assertEquals(lib.getBooks().size(), 2);
- }
- {
- JettisonMappedContext context = new JettisonMappedContext(Library.class);
- StringWriter writer = new StringWriter();
- context.createMarshaller().marshal(library, writer);
- System.out.println("Mapped: ");
- String s = writer.toString();
- System.out.println(s);
- Library lib = (Library) context.createUnmarshaller().unmarshal(new StringReader(s));
- Assert.assertEquals(lib.getName(), "BPL");
- Assert.assertEquals(lib.getBooks().size(), 2);
- }
- }
-
-}
\ No newline at end of file
diff --git a/providers/jettison/src/test/java/org/jboss/resteasy/test/xxe/TestXXE.java b/providers/jettison/src/test/java/org/jboss/resteasy/test/xxe/TestXXE.java
deleted file mode 100644
index 78b304a52ec..00000000000
--- a/providers/jettison/src/test/java/org/jboss/resteasy/test/xxe/TestXXE.java
+++ /dev/null
@@ -1,484 +0,0 @@
-package org.jboss.resteasy.test.xxe;
-
-import org.junit.Assert;
-import org.jboss.resteasy.core.Dispatcher;
-import org.jboss.resteasy.spi.ResteasyDeployment;
-import org.jboss.resteasy.test.EmbeddedContainer;
-import org.junit.After;
-import org.junit.Test;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.client.Client;
-import javax.ws.rs.client.ClientBuilder;
-import javax.ws.rs.client.Entity;
-import javax.ws.rs.client.Invocation.Builder;
-import javax.ws.rs.core.GenericEntity;
-import javax.ws.rs.core.GenericType;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import static org.jboss.resteasy.test.TestPortProvider.generateURL;
-
-/**
- * Unit tests for RESTEASY-647.
- *
- * Idea for test comes from Tim McCune:
- * http://jersey.576304.n2.nabble.com/Jersey-vulnerable-to-XXE-attack-td3214584.html
- *
- * @author Ron Sigal
- * @date Feb 25, 2012
- */
-public class TestXXE
-{
- protected static ResteasyDeployment deployment;
- protected static Dispatcher dispatcher;
- protected static Client client;
-
- @Path("/")
- public static class MovieResource
- {
- @POST
- @Path("xmlRootElement")
- @Consumes({"application/*+json","application/json"})
- public String addFavoriteMovie(FavoriteMovieXmlRootElement movie)
- {
- System.out.println("MovieResource(xmlRootElment): title = " + movie.getTitle());
- return movie.getTitle();
- }
-
- @POST
- @Path("xmlType")
- @Consumes({"application/*+json","application/json"})
- public String addFavoriteMovie(FavoriteMovieXmlType movie)
- {
- System.out.println("MovieResource(xmlType): title = " + movie.getTitle());
- return movie.getTitle();
- }
-
- @POST
- @Path("JAXBElement")
- @Consumes({"application/*+json","application/json"})
- public String addFavoriteMovie(JAXBElement value)
- {
- System.out.println("MovieResource(JAXBElement): title = " + value.getValue().getTitle());
- return value.getValue().getTitle();
- }
-
- @POST
- @Path("list")
- @Consumes({"application/*+json","application/json"})
- public String addFavoriteMovie(List list)
- {
- String titles = "";
- Iterator it = list.iterator();
- while (it.hasNext())
- {
- String title = it.next().getTitle();
- System.out.println("MovieResource(list): title = " + title);
- titles += title;
- }
- return titles;
- }
-
- @POST
- @Path("set")
- @Consumes({"application/*+json","application/json"})
- public String addFavoriteMovie(Set set)
- {
- String titles = "";
- Iterator it = set.iterator();
- while (it.hasNext())
- {
- String title = it.next().getTitle();
- System.out.println("MovieResource(list): title = " + title);
- titles += title;
- }
- return titles;
- }
-
- @POST
- @Path("array")
- @Consumes({"application/*+json","application/json"})
- public String addFavoriteMovie(FavoriteMovieXmlRootElement[] array)
- {
- String titles = "";
- for (int i = 0; i < array.length; i++)
- {
- String title = array[i].getTitle();
- System.out.println("MovieResource(list): title = " + title);
- titles += title;
- }
- return titles;
- }
-
- @POST
- @Path("map")
- @Consumes({"application/*+json","application/json"})
- public String addFavoriteMovie(Map map)
- {
- String titles = "";
- Iterator it = map.keySet().iterator();
- while (it.hasNext())
- {
- String title = map.get(it.next()).getTitle();
- System.out.println("MovieResource(map): title = " + title);
- titles += title;
- }
- return titles;
- }
- }
-
- @XmlRootElement
- public static class FavoriteMovieXmlRootElement {
- private String _title;
- public String getTitle() {
- return _title;
- }
- public void setTitle(String title) {
- _title = title;
- }
- }
-
- public static void before(String expandEntityReferences) throws Exception
- {
- Hashtable initParams = new Hashtable();
- Hashtable contextParams = new Hashtable();
- contextParams.put("resteasy.document.expand.entity.references", expandEntityReferences);
- deployment = EmbeddedContainer.start(initParams, contextParams);
- dispatcher = deployment.getDispatcher();
- deployment.getRegistry().addPerRequestResource(MovieResource.class);
- client = ClientBuilder.newClient();
- }
-
- public static void before() throws Exception
- {
- deployment = EmbeddedContainer.start();
- dispatcher = deployment.getDispatcher();
- deployment.getRegistry().addPerRequestResource(MovieResource.class);
- client = ClientBuilder.newClient();
- }
-
- @After
- public void after() throws Exception
- {
- client.close();
- EmbeddedContainer.stop();
- dispatcher = null;
- deployment = null;
- }
-
- @Test
- public void testXmlRootElementDefault() throws Exception
- {
- before();
- FavoriteMovieXmlRootElement m = new FavoriteMovieXmlRootElement();
- m.setTitle("&xxe");
- Builder request = client.target(generateURL("/xmlRootElement")).request();
- Response response = request.post(Entity.entity(m, "application/*+json"));
- Assert.assertEquals(200, response.getStatus());
- String entity = response.readEntity(String.class);
- System.out.println("Result: " + entity);
- Assert.assertTrue(entity.indexOf("xx:xx:xx:xx:xx:xx:xx") < 0);
- }
-
- @Test
- public void testXmlRootElementWithoutExpansion() throws Exception
- {
- before("false");
- FavoriteMovieXmlRootElement m = new FavoriteMovieXmlRootElement();
- m.setTitle("&xxe");
- Builder request = client.target(generateURL("/xmlRootElement")).request();
- Response response = request.post(Entity.entity(m, "application/*+json"));
- Assert.assertEquals(200, response.getStatus());
- String entity = response.readEntity(String.class);
- System.out.println("Result: " + entity);
- Assert.assertTrue(entity.indexOf("xx:xx:xx:xx:xx:xx:xx") < 0);
- }
-
- @Test
- public void testXmlRootElementWithExpansion() throws Exception
- {
- before("true");
- FavoriteMovieXmlRootElement m = new FavoriteMovieXmlRootElement();
- m.setTitle("&xxe");
- Builder request = client.target(generateURL("/xmlRootElement")).request();
- Response response = request.post(Entity.entity(m, "application/*+json"));
- Assert.assertEquals(200, response.getStatus());
- String entity = response.readEntity(String.class);
- Assert.assertTrue(entity.indexOf("xx:xx:xx:xx:xx:xx:xx") < 0);
- }
-
- @Test
- public void testXmlTypeDefault() throws Exception
- {
- before();
- FavoriteMovieXmlType m = new FavoriteMovieXmlType();
- m.setTitle("&xxe");
- Builder request = client.target(generateURL("/xmlType")).request();
- Response response = request.post(Entity.entity(m, "application/*+json"));
- Assert.assertEquals(200, response.getStatus());
- String entity = response.readEntity(String.class);
- System.out.println("Result: " + entity);
- Assert.assertTrue(entity.indexOf("xx:xx:xx:xx:xx:xx:xx") < 0);
- }
-
- @Test
- public void testXmlTypeWithoutExpansion() throws Exception
- {
- before("false");
- FavoriteMovieXmlType m = new FavoriteMovieXmlType();
- m.setTitle("&xxe");
- Builder request = client.target(generateURL("/xmlType")).request();
- Response response = request.post(Entity.entity(m, "application/*+json"));
- Assert.assertEquals(200, response.getStatus());
- String entity = response.readEntity(String.class);
- System.out.println("Result: " + entity);
- Assert.assertTrue(entity.indexOf("xx:xx:xx:xx:xx:xx:xx") < 0);
- }
-
- @Test
- public void testXmlTypeWithExpansion() throws Exception
- {
- before("true");
- FavoriteMovieXmlType m = new FavoriteMovieXmlType();
- m.setTitle("&xxe");
- Builder request = client.target(generateURL("/xmlType")).request();
- Response response = request.post(Entity.entity(m, "application/*+json"));
- Assert.assertEquals(200, response.getStatus());
- String entity = response.readEntity(String.class);
- System.out.println("result: " + entity);
- Assert.assertTrue(entity.indexOf("xx:xx:xx:xx:xx:xx:xx") < 0);
- }
-
- @Test
- public void testJAXBElementDefault() throws Exception
- {
- before();
- FavoriteMovieXmlType m = new FavoriteMovieXmlType();
- m.setTitle("&xxe");
- Builder request = client.target(generateURL("/JAXBElement")).request();
- Response response = request.post(Entity.entity(m, "application/*+json"));
- Assert.assertEquals(200, response.getStatus());
- String entity = response.readEntity(String.class);
- Assert.assertTrue(entity.indexOf("xx:xx:xx:xx:xx:xx:xx") < 0);
- }
-
- @Test
- public void testJAXBElementWithoutExpansion() throws Exception
- {
- before("false");
- FavoriteMovieXmlType m = new FavoriteMovieXmlType();
- m.setTitle("&xxe");
- Builder request = client.target(generateURL("/JAXBElement")).request();
- Response response = request.post(Entity.entity(m, "application/*+json"));
- Assert.assertEquals(200, response.getStatus());
- String entity = response.readEntity(String.class);
- Assert.assertTrue(entity.indexOf("xx:xx:xx:xx:xx:xx:xx") < 0);
- }
-
- @Test
- public void testJAXBElementWithExpansion() throws Exception
- {
- before("true");
- FavoriteMovieXmlType m = new FavoriteMovieXmlType();
- m.setTitle("&xxe");
- Builder request = client.target(generateURL("/JAXBElement")).request();
- Response response = request.post(Entity.entity(m, "application/*+json"));
- Assert.assertEquals(200, response.getStatus());
- String entity = response.readEntity(String.class);
- Assert.assertTrue(entity.indexOf("xx:xx:xx:xx:xx:xx:xx") < 0);
- }
-
- @Test
- public void testListDefault() throws Exception
- {
- doListTest(null);
- }
-
- @Test
- public void testListWithoutExpansion() throws Exception
- {
- doListTest(false);
- }
-
- @Test
- public void testListWithExpansion() throws Exception
- {
- doListTest(true);
- }
-
- @Test
- public void testSetDefault() throws Exception
- {
- doSetTest(null);
- }
-
- @Test
- public void testSetWithoutExpansion() throws Exception
- {
- doSetTest(false);
- }
-
- @Test
- public void testSetWithExpansion() throws Exception
- {
- doSetTest(true);
- }
-
- @Test
- public void testArrayDefault() throws Exception
- {
- doArrayTest(null);
- }
-
- @Test
- public void testArrayWithoutExpansion() throws Exception
- {
- doArrayTest(false);
- }
-
- @Test
- public void testArrayWithExpansion() throws Exception
- {
- doArrayTest(true);
- }
-
- @Test
- public void testMapDefault() throws Exception
- {
- doMapTest(null);
- }
-
- @Test
- public void testMapWithoutExpansion() throws Exception
- {
- doMapTest(false);
- }
-
- @Test
- public void testMapWithExpansion() throws Exception
- {
- doMapTest(true);
- }
-
- void doListTest(Boolean expand) throws Exception
- {
- if (expand == null)
- {
- before();
- expand = false;
- }
- else
- {
- before(Boolean.toString(expand));
- }
- List list = new ArrayList();
- FavoriteMovieXmlRootElement m1 = new FavoriteMovieXmlRootElement();
- m1.setTitle("&xxe");
- list.add(m1);
- FavoriteMovieXmlRootElement m2 = new FavoriteMovieXmlRootElement();
- m2.setTitle("Le Regle de Jeu");
- list.add(m2);
- Builder request = client.target(generateURL("/list")).request();
- GenericType> type = new GenericType>() {};
- GenericEntity> genericEntity = new GenericEntity>(list, type.getType());
- Entity>> entity = Entity.entity(genericEntity, MediaType.APPLICATION_JSON_TYPE);
- Response response = request.post(entity);
- Assert.assertEquals(200, response.getStatus());
- String result = response.readEntity(String.class);
- Assert.assertTrue(result.indexOf("xx:xx:xx:xx:xx:xx:xx") < 0);
- }
-
- void doSetTest(Boolean expand) throws Exception
- {
- if (expand == null)
- {
- before();
- expand = false;
- }
- else
- {
- before(Boolean.toString(expand));
- }
- Set set = new HashSet();
- FavoriteMovieXmlRootElement m1 = new FavoriteMovieXmlRootElement();
- m1.setTitle("&xxe");
- set.add(m1);
- FavoriteMovieXmlRootElement m2 = new FavoriteMovieXmlRootElement();
- m2.setTitle("Le Regle de Jeu");
- set.add(m2);
- GenericType> type = new GenericType>() {};
- GenericEntity> genericEntity = new GenericEntity>(set, type.getType());
- Entity>> entity = Entity.entity(genericEntity, MediaType.APPLICATION_JSON_TYPE);
- Builder request = client.target(generateURL("/set")).request();
- Response response = request.post(entity);
- Assert.assertEquals(200, response.getStatus());
- String result = response.readEntity(String.class);
- Assert.assertTrue(result.indexOf("xx:xx:xx:xx:xx:xx:xx") < 0);
- }
-
- void doArrayTest(Boolean expand) throws Exception
- {
- if (expand == null)
- {
- before();
- expand = false;
- }
- else
- {
- before(Boolean.toString(expand));
- }
- FavoriteMovieXmlRootElement[] array = new FavoriteMovieXmlRootElement[2];
- FavoriteMovieXmlRootElement m1 = new FavoriteMovieXmlRootElement();
- m1.setTitle("&xxe");
- array[0] = m1;
- FavoriteMovieXmlRootElement m2 = new FavoriteMovieXmlRootElement();
- m2.setTitle("Le Regle de Jeu");
- array[1] = m2;
- Builder request = client.target(generateURL("/array")).request();
- Response response = request.post(Entity.entity(array, MediaType.APPLICATION_JSON_TYPE));
- Assert.assertEquals(200, response.getStatus());
- String entity = response.readEntity(String.class);
- Assert.assertTrue(entity.indexOf("xx:xx:xx:xx:xx:xx:xx") < 0);
- }
-
- void doMapTest(Boolean expand) throws Exception
- {
- if (expand == null)
- {
- before();
- expand = false;
- }
- else
- {
- before(Boolean.toString(expand));
- }
- Map map = new HashMap();
- FavoriteMovieXmlRootElement m = new FavoriteMovieXmlRootElement();
- m.setTitle("&xxe");
- map.put("american", m);
- m = new FavoriteMovieXmlRootElement();
- m.setTitle("La Regle de Jeu");
- map.put("french", m);
- GenericType> type = new GenericType