From 522e22d610241db416306ccbf18094caeb5fb222 Mon Sep 17 00:00:00 2001
From: Emmanuel Bruno <emmanuel.bruno@univ-tln.fr>
Date: Wed, 7 Apr 2021 12:18:27 +0200
Subject: [PATCH] fixes client to english API.3
---
queries/sample-requests.rest | 2 +-
.../bruno/samples/jaxrs/client/BiblioClient.java | 12 ++++++------
.../univtln/bruno/samples/jaxrs/model/Library.java | 4 ++--
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/queries/sample-requests.rest b/queries/sample-requests.rest
index 37e8f6a..dd57266 100644
--- a/queries/sample-requests.rest
+++ b/queries/sample-requests.rest
@@ -87,7 +87,7 @@ biblio-demo-header-1: myvalue
biblio-demo-header-2: anothervalue
### Authorization by token, part 1. Retrieve and save token with Basic Authentication
-# TOKEN=$(curl -v --user "john.doe@nowhere.com:admin" "http://localhost:9998/myapp/biblio/login")
+# TOKEN=$(curl -v --user "john.doe@nowhere.com:admin" "http://localhost:9998/mylibrary/setup/login")
GET http://localhost:9998/mylibrary/setup/login
Authorization: Basic john.doe@nowhere.com admin
diff --git a/src/main/java/fr/univtln/bruno/samples/jaxrs/client/BiblioClient.java b/src/main/java/fr/univtln/bruno/samples/jaxrs/client/BiblioClient.java
index 79295d9..1abf958 100644
--- a/src/main/java/fr/univtln/bruno/samples/jaxrs/client/BiblioClient.java
+++ b/src/main/java/fr/univtln/bruno/samples/jaxrs/client/BiblioClient.java
@@ -17,20 +17,20 @@ public class BiblioClient {
public static void main(String[] args) {
// create the rest client
Client client = ClientBuilder.newClient();
- WebTarget webResource = client.target("http://localhost:9998/myapp");
+ WebTarget webResource = client.target("http://localhost:9998/mylibrary");
//Send a put with a String as response
- String responseInitAsString = webResource.path("biblio/init")
+ String responseInitAsString = webResource.path("library/init")
.request().put(Entity.entity("", MediaType.TEXT_PLAIN), String.class);
log.info(responseInitAsString);
//Send a get and parse the response as a String
- String responseAuteursAsJsonString = webResource.path("biblio/authors")
+ String responseAuteursAsJsonString = webResource.path("authors")
.request().get(String.class);
log.info(responseAuteursAsJsonString);
//Idem but the result is deserialised to an instance of Auteur
- Author author = webResource.path("biblio/authors/1")
+ Author author = webResource.path("authors/1")
.request()
.get(Author.class);
log.info(author.toString());
@@ -38,7 +38,7 @@ public class BiblioClient {
//Log in to get the token with basci authentication
String email = "john.doe@nowhere.com";
String passwd = "admin";
- String token = webResource.path("biblio/login")
+ String token = webResource.path("setup/login")
.request()
.accept(MediaType.TEXT_PLAIN)
.header("Authorization", "Basic " + java.util.Base64.getEncoder().encodeToString((email + ":" + passwd).getBytes()))
@@ -46,7 +46,7 @@ public class BiblioClient {
if (!token.isBlank()) {
log.info("token received.");
//We access a JWT protected URL with the token
- String result = webResource.path("biblio/secured")
+ String result = webResource.path("setup/secured")
.request()
.header("Authorization", "Bearer " + token)
.get(String.class);
diff --git a/src/main/java/fr/univtln/bruno/samples/jaxrs/model/Library.java b/src/main/java/fr/univtln/bruno/samples/jaxrs/model/Library.java
index 599c932..80916f5 100644
--- a/src/main/java/fr/univtln/bruno/samples/jaxrs/model/Library.java
+++ b/src/main/java/fr/univtln/bruno/samples/jaxrs/model/Library.java
@@ -240,7 +240,7 @@ public class Library {
//Because getter are generated by lombok
@XmlAccessorType(XmlAccessType.FIELD)
@EqualsAndHashCode(onlyExplicitlyIncluded = true)
- @ToString
+ @ToString(exclude = "books")
public static class Author implements Serializable {
@EqualsAndHashCode.Include
@XmlTransient
@@ -279,7 +279,7 @@ public class Library {
@XmlAccessorType(XmlAccessType.FIELD)
@EqualsAndHashCode(onlyExplicitlyIncluded = true)
- @ToString
+ @ToString(exclude = "authors")
public static class Book implements Serializable {
@EqualsAndHashCode.Include
@XmlTransient
--
GitLab