diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 5a663f3..6dae373 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -13,7 +13,7 @@
-
+
diff --git a/MoviesClient/MoviesClient.iml b/MoviesClient/MoviesClient.iml
index e4f6abb..497a166 100644
--- a/MoviesClient/MoviesClient.iml
+++ b/MoviesClient/MoviesClient.iml
@@ -10,11 +10,12 @@
-
+
+
@@ -22,9 +23,6 @@
-
-
-
@@ -59,5 +57,44 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/MoviesClient/pom.xml b/MoviesClient/pom.xml
index 8bb3b29..0ea6337 100644
--- a/MoviesClient/pom.xml
+++ b/MoviesClient/pom.xml
@@ -24,6 +24,24 @@
jaxws-ri
pom
+
+
+ org.jboss.resteasy
+ resteasy-client
+ 4.3.1.Final
+
+
+
+ org.jboss.resteasy
+ resteasy-jaxb-provider
+ 4.3.1.Final
+
+
+
+ org.jboss.resteasy
+ resteasy-jackson2-provider
+ 4.3.1.Final
+
@@ -85,8 +103,8 @@
org.apache.maven.plugins
maven-compiler-plugin
- 9
- 9
+ 10
+ 10
diff --git a/MoviesClient/src/main/java/at.technikumwien.movies/MovieResourceClient.java b/MoviesClient/src/main/java/at.technikumwien.movies/MovieResourceClient.java
new file mode 100644
index 0000000..3db7937
--- /dev/null
+++ b/MoviesClient/src/main/java/at.technikumwien.movies/MovieResourceClient.java
@@ -0,0 +1,31 @@
+package at.technikumwien.movies;
+
+import at.technikumwien.movies.generated.Movie;
+
+import javax.ws.rs.client.ClientBuilder;
+import javax.ws.rs.client.Entity;
+import javax.ws.rs.core.GenericType;
+import javax.ws.rs.core.MediaType;
+import java.util.List;
+
+public class MovieResourceClient {
+ public static void main(String[] args) {
+ var target = ClientBuilder.newClient().target("http://localhost:8080/movieservice/resources/movie");
+
+ //var response = target.request().post(Entity.json(new Movie()));
+ //System.out.println(response.getLocation());
+
+ List allMovies = target
+ .request(MediaType.APPLICATION_XML)
+ .get(new GenericType>() {}); // Solution for List.class
+
+ allMovies.forEach(System.out::println);
+
+ var movie = target.path("/{id}")
+ .resolveTemplate("id", 1) // Useful for pre-defining templates
+ .request(MediaType.APPLICATION_JSON)
+ .get(Movie.class);
+
+ System.out.println(movie);
+ }
+}
diff --git a/MoviesClient/src/main/java/at.technikumwien.movies/MoviesWebServiceClient.java b/MoviesClient/src/main/java/at.technikumwien.movies/MoviesWebServiceClient.java
index c998691..50e7664 100644
--- a/MoviesClient/src/main/java/at.technikumwien.movies/MoviesWebServiceClient.java
+++ b/MoviesClient/src/main/java/at.technikumwien.movies/MoviesWebServiceClient.java
@@ -2,6 +2,7 @@ package at.technikumwien.movies;
import at.technikumwien.movies.generated.Movie;
+import at.technikumwien.movies.generated.MoviesWebService;
import at.technikumwien.movies.generated.MoviesWebService_Service;
import javax.xml.ws.Service;
@@ -10,11 +11,11 @@ import java.util.List;
public class MoviesWebServiceClient {
public static void main(String[] args) throws Exception {
MoviesWebService_Service service = new MoviesWebService_Service();
- at.technikumwien.movies.generated.MoviesWebService port = service.getMoviesWebServicePort();
+ MoviesWebService port = service.getMoviesWebServicePort();
// TODO: Move to a better place
- // Import movies
+ // Import moviess
List movies = XmlHelper.xmlToMovies("movietest.xml");
port.importMovies(movies);
diff --git a/MoviesClient/src/main/java/at.technikumwien.movies/XmlHelper.java b/MoviesClient/src/main/java/at.technikumwien.movies/XmlHelper.java
index 7e136c4..4ccad46 100644
--- a/MoviesClient/src/main/java/at.technikumwien.movies/XmlHelper.java
+++ b/MoviesClient/src/main/java/at.technikumwien.movies/XmlHelper.java
@@ -1,12 +1,14 @@
package at.technikumwien.movies;
+import at.technikumwien.movies.generated.Movie;
+
import javax.xml.bind.*;
import javax.xml.transform.stream.StreamSource;
import java.io.File;
import java.util.List;
public class XmlHelper {
- public static void moviesToXml(List movies, String filename) throws Exception {
+ public static void moviesToXml(List movies, String filename) throws Exception {
MovieList movieList = new MovieList(movies);
JAXBContext jaxbContext = JAXBContext.newInstance(MovieList.class);
@@ -20,7 +22,7 @@ public class XmlHelper {
marshaller.marshal(movieList, new File(filename));
}
- public static List xmlToMovies(String filename) throws JAXBException {
+ public static List xmlToMovies(String filename) throws JAXBException {
JAXBContext jaxbContext = JAXBContext.newInstance(MovieList.class);
Unmarshaller unmarshaller = jaxbContext.createUnmarshaller();