From 5316cb48d040cad4e84ee6057acee61772fd7df2 Mon Sep 17 00:00:00 2001
From: Kai Moritz <kai@juplo.de>
Date: Sun, 14 Mar 2021 10:15:01 +0100
Subject: [PATCH] WIP

---
 .../out}/RemoteUsersServiceConsumer.java      |  6 +--
 .../{adapter => adapters/out}/UserDTO.java    |  2 +-
 .../demos/pwreset/domain/{ => api}/User.java  |  2 +-
 .../domain/{ => api}/UsersService.java        |  2 +-
 pwreset/src/main/resources/templates/400.html | 15 ++++++
 .../src/main/resources/templates/error.html   | 51 +++++++++++++++++++
 .../src/main/resources/templates/home.html    | 25 +++++++++
 .../src/main/resources/templates/layout.html  | 20 ++++++++
 .../out}/RemoteUsersServiceConsumerIT.java    |  4 +-
 9 files changed, 119 insertions(+), 8 deletions(-)
 rename pwreset/src/main/java/de/juplo/demos/pwreset/{adapter => adapters/out}/RemoteUsersServiceConsumer.java (87%)
 rename pwreset/src/main/java/de/juplo/demos/pwreset/{adapter => adapters/out}/UserDTO.java (70%)
 rename pwreset/src/main/java/de/juplo/demos/pwreset/domain/{ => api}/User.java (77%)
 rename pwreset/src/main/java/de/juplo/demos/pwreset/domain/{ => api}/UsersService.java (72%)
 create mode 100644 pwreset/src/main/resources/templates/400.html
 create mode 100644 pwreset/src/main/resources/templates/error.html
 create mode 100644 pwreset/src/main/resources/templates/home.html
 create mode 100644 pwreset/src/main/resources/templates/layout.html
 rename pwreset/src/test/java/de/juplo/demos/pwreset/{adapter => adapters/out}/RemoteUsersServiceConsumerIT.java (96%)

diff --git a/pwreset/src/main/java/de/juplo/demos/pwreset/adapter/RemoteUsersServiceConsumer.java b/pwreset/src/main/java/de/juplo/demos/pwreset/adapters/out/RemoteUsersServiceConsumer.java
similarity index 87%
rename from pwreset/src/main/java/de/juplo/demos/pwreset/adapter/RemoteUsersServiceConsumer.java
rename to pwreset/src/main/java/de/juplo/demos/pwreset/adapters/out/RemoteUsersServiceConsumer.java
index 27fdc8f..eb1492f 100644
--- a/pwreset/src/main/java/de/juplo/demos/pwreset/adapter/RemoteUsersServiceConsumer.java
+++ b/pwreset/src/main/java/de/juplo/demos/pwreset/adapters/out/RemoteUsersServiceConsumer.java
@@ -1,7 +1,7 @@
-package de.juplo.demos.pwreset.adapter;
+package de.juplo.demos.pwreset.adapters.out;
 
-import de.juplo.demos.pwreset.domain.User;
-import de.juplo.demos.pwreset.domain.UsersService;
+import de.juplo.demos.pwreset.domain.api.User;
+import de.juplo.demos.pwreset.domain.api.UsersService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
diff --git a/pwreset/src/main/java/de/juplo/demos/pwreset/adapter/UserDTO.java b/pwreset/src/main/java/de/juplo/demos/pwreset/adapters/out/UserDTO.java
similarity index 70%
rename from pwreset/src/main/java/de/juplo/demos/pwreset/adapter/UserDTO.java
rename to pwreset/src/main/java/de/juplo/demos/pwreset/adapters/out/UserDTO.java
index 4f6bd38..640df61 100644
--- a/pwreset/src/main/java/de/juplo/demos/pwreset/adapter/UserDTO.java
+++ b/pwreset/src/main/java/de/juplo/demos/pwreset/adapters/out/UserDTO.java
@@ -1,4 +1,4 @@
-package de.juplo.demos.pwreset.adapter;
+package de.juplo.demos.pwreset.adapters.out;
 
 import lombok.Setter;
 
diff --git a/pwreset/src/main/java/de/juplo/demos/pwreset/domain/User.java b/pwreset/src/main/java/de/juplo/demos/pwreset/domain/api/User.java
similarity index 77%
rename from pwreset/src/main/java/de/juplo/demos/pwreset/domain/User.java
rename to pwreset/src/main/java/de/juplo/demos/pwreset/domain/api/User.java
index 3d970bd..9b7f913 100644
--- a/pwreset/src/main/java/de/juplo/demos/pwreset/domain/User.java
+++ b/pwreset/src/main/java/de/juplo/demos/pwreset/domain/api/User.java
@@ -1,4 +1,4 @@
-package de.juplo.demos.pwreset.domain;
+package de.juplo.demos.pwreset.domain.api;
 
 import lombok.Builder;
 import lombok.Data;
diff --git a/pwreset/src/main/java/de/juplo/demos/pwreset/domain/UsersService.java b/pwreset/src/main/java/de/juplo/demos/pwreset/domain/api/UsersService.java
similarity index 72%
rename from pwreset/src/main/java/de/juplo/demos/pwreset/domain/UsersService.java
rename to pwreset/src/main/java/de/juplo/demos/pwreset/domain/api/UsersService.java
index 0a07a1f..0580bd5 100644
--- a/pwreset/src/main/java/de/juplo/demos/pwreset/domain/UsersService.java
+++ b/pwreset/src/main/java/de/juplo/demos/pwreset/domain/api/UsersService.java
@@ -1,4 +1,4 @@
-package de.juplo.demos.pwreset.domain;
+package de.juplo.demos.pwreset.domain.api;
 
 import java.util.Optional;
 
diff --git a/pwreset/src/main/resources/templates/400.html b/pwreset/src/main/resources/templates/400.html
new file mode 100644
index 0000000..36ba0c0
--- /dev/null
+++ b/pwreset/src/main/resources/templates/400.html
@@ -0,0 +1,15 @@
+<!DOCTYPE HTML>
+<html xmlns:th="http://www.thymeleaf.org" th:replace="~{layout :: pagelayout(~{:: title}, ~{:: h1}, ~{:: div.card-text})}">
+  <head>
+    <title th:text="'400: ' + ${exception.getClass().getSimpleName()}">Testing Exception-Handling - Template for 400</title>
+    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/css/bootstrap.min.css">
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+  </head>
+  <body>
+    <h1 th:text="'400: ' + ${exception.getClass().getSimpleName()}">Template for 400</h1>
+    <div class="card-text table">
+      <p><strong th:text="'Catched exception: ' + ${exception}">EXCEPTION</strong></p>
+      <p><a href="#" th:href="@{/}" class="btn btn-primary">Back to HOME</a></p>
+    </div>
+  </body>
+</html>
diff --git a/pwreset/src/main/resources/templates/error.html b/pwreset/src/main/resources/templates/error.html
new file mode 100644
index 0000000..a5e8149
--- /dev/null
+++ b/pwreset/src/main/resources/templates/error.html
@@ -0,0 +1,51 @@
+<!doctype html>
+<html xmlns:th="http://www.thymeleaf.org" th:replace="~{layout :: pagelayout(~{:: title}, ~{:: h1}, ~{:: table.card-text})}">
+  <head>
+    <title th:text="|${status}: ${error}">XXX: ERROR</title>
+    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/css/bootstrap.min.css">
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+  </head>
+  <body>
+    <h1 th:text="|${status}: ${error}">XXX: ERROR</h1>
+      <table class="card-text table">
+        <tbody>
+          <tr class="border-top-0">
+            <th scope="row">Status</th>
+            <td th:text="${status}">ERROR.STATUS</td>
+          </tr>
+          <tr>
+            <th scope="row">Error</th>
+            <td th:text="${error}">ERROR.ERROR</td>
+          </tr>
+          <tr th:if="!${#strings.isEmpty(message)}">
+            <th scope="row">Message</th>
+            <td th:text="${message}">ERROR.MESSAGE</td>
+          </tr>
+          <tr th:if="!${#strings.isEmpty(requestId)}">
+            <th class="text-nowrap" scope="row">Request-ID</th>
+            <td th:text="${requestId}">ERROR.REQUEST_ID</td>
+          </tr>
+          <tr>
+            <th scope="row">Timstamp</th>
+            <td th:text="${timestamp}">ERROR.TIMESTAMP</td>
+          </tr>
+          <tr th:if="!${#strings.isEmpty(path)}">
+            <th scope="row">Path</th>
+            <td th:text="${path}">ERROR.PATH</td>
+          </tr>
+          <!--/**-->
+          <tr th:if="!${#strings.isEmpty(trace)}">
+            <th scope="row">Trace</th>
+            <td>
+              <div class="overflow-hidden">
+                <pre class="overflow-hidden" th:text="${trace}">ERROR.TRACE</pre>
+              </div>
+            </td>
+          </tr>
+          <!--**/-->
+        </tbody>
+      </table>
+      <p><a href="#" th:href="@{/}" class="btn btn-primary">Back to HOME</a>
+    </div>
+  </body>
+</html>
diff --git a/pwreset/src/main/resources/templates/home.html b/pwreset/src/main/resources/templates/home.html
new file mode 100644
index 0000000..cb75a1d
--- /dev/null
+++ b/pwreset/src/main/resources/templates/home.html
@@ -0,0 +1,25 @@
+<!DOCTYPE HTML>
+<html xmlns:th="http://www.thymeleaf.org" th:replace="~{layout :: pagelayout(~{:: title}, ~{:: h1}, ~{:: div.card-text})}">
+  <head>
+    <title>Home</title>
+    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/css/bootstrap.min.css">
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+  </head>
+  <body>
+    <h1>Home</h1>
+    <div class="card-text">
+      <ul>
+        <li th:each="site : ${sites}">
+          <a href="#" th:href="'/' + ${site}" th:text="${site}">SITE</a>
+        </li>
+      </ul>
+    </div>
+    <div class="card-text">
+      <p>
+        <em>
+          This page links to the pages, that are served by the dynamically created beans.
+        </em>
+      </p>
+    </div>
+  </body>
+</html>
diff --git a/pwreset/src/main/resources/templates/layout.html b/pwreset/src/main/resources/templates/layout.html
new file mode 100644
index 0000000..3ad68ed
--- /dev/null
+++ b/pwreset/src/main/resources/templates/layout.html
@@ -0,0 +1,20 @@
+<!doctype html>
+<html lang="en" xmlns:th="http://www.thymeleaf.org" th:fragment="pagelayout(title,header,body)">
+  <head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+    <title th:replace="${title}">TITLE</title>
+    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/css/bootstrap.min.css" th:href="@{/webjars/bootstrap/4.5.2/css/bootstrap.min.css}">
+  </head>
+  <body>
+    <nav class="navbar navbar-dark bg-primary navbar-expand navbar-dark flex-column">
+      <h2 class="navbar-brand">Demo: Creating Multiple Beans In Spring-Boot Pogrammatically</h2>
+    </nav>
+    <main class="container mt-5">
+      <div id="content" class="card">
+        <div class="card-header"><h1 th:replace="${header}">HEADER</h1></div>
+        <div class="card-body"><div th:replace="${body}">BODY</div></div>
+      </div>
+    </main>
+  </body>
+</html>
diff --git a/pwreset/src/test/java/de/juplo/demos/pwreset/adapter/RemoteUsersServiceConsumerIT.java b/pwreset/src/test/java/de/juplo/demos/pwreset/adapters/out/RemoteUsersServiceConsumerIT.java
similarity index 96%
rename from pwreset/src/test/java/de/juplo/demos/pwreset/adapter/RemoteUsersServiceConsumerIT.java
rename to pwreset/src/test/java/de/juplo/demos/pwreset/adapters/out/RemoteUsersServiceConsumerIT.java
index fb784ad..3724a65 100644
--- a/pwreset/src/test/java/de/juplo/demos/pwreset/adapter/RemoteUsersServiceConsumerIT.java
+++ b/pwreset/src/test/java/de/juplo/demos/pwreset/adapters/out/RemoteUsersServiceConsumerIT.java
@@ -1,4 +1,4 @@
-package de.juplo.demos.pwreset.adapter;
+package de.juplo.demos.pwreset.adapters.out;
 
 import au.com.dius.pact.consumer.MockServer;
 import au.com.dius.pact.consumer.dsl.PactDslWithProvider;
@@ -6,7 +6,7 @@ import au.com.dius.pact.consumer.junit5.PactConsumerTestExt;
 import au.com.dius.pact.consumer.junit5.PactTestFor;
 import au.com.dius.pact.core.model.RequestResponsePact;
 import au.com.dius.pact.core.model.annotations.Pact;
-import de.juplo.demos.pwreset.domain.User;
+import de.juplo.demos.pwreset.domain.api.User;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.boot.web.client.RestTemplateBuilder;
-- 
2.20.1