|o|qbwkEa-}H9o}kY1@SkpEiQ|n)qHJhux%C1J
zKXsRLa1tbI6+zqV~9DxW3NQ}Wife?^ML$}T-8y8QJMDHYb3OJplE?!z4us4NOG
zVH3JM=A#Pw-mIVs)j2yI+cRlAOEiG>5}6h;$1kG--u1n^9!AK#NnqP&R3+RPzKbx@
zpjLR_tPlmpkGV6u-~5*5&Z9-%jLxMPNCTLc5{9T8|1zjH4@kG+H;9-ET8iF-T@9MsX_~6vJ8pwlu4@b?9mCm6UDeefE-AWf`xzy>3o8
zb(tePYzgggSG|4hz3J!r%+wBxZFg=uihmDNby{vCF9_gZM_5EpcQ69yG0$@gmIbv6
zjz6D~-({KNS&-m*vQq&m6D+HU|Iu(^yfUBRb1vwWyIWWu#N)Q=747-TEi=1GOir2r
zBaFF5v(MzVx$o<|NUQKVf?Z=hhd-f|sMeNwohP8-k(dx2e?=hQHB>%LpnaZrb{Fqq
zdsySl9PJbs0k%6!`jbxfM~0_}MjDtz(C%gK*-20ZQ{5`{#-99Z2pl
zk#?J5#-i5wt*FfnmdHZF3za5&l3}SSCUo08wltE{j#;Pm-cW(bF;8@;BTqX+V+pXi
zu0hqZe?C`fILUA8giL%_RQr$+A=1QS(+4q!*kvjIfFWTgPga7yyr(7ivyO{C+d9sI
zBOvnKI^1|2ZshTbOAawcwS(_qaFY$DR0yj)X%|B%F#fR-e$mXkbfiLMWd!B$(q~!D
zckN>Sd0Crb_`FwOIXKWTWz~m&^EoQk%}L!gq}5N+TAnY|MKAPxdo?(~vQ*&`xEN_E
z?9EbhiUjKwyF4i97JC~JomTA~kN5X$wDLN-aM+fo#9!K(*YQhsQAY0Ke%&thU$GG2
zYFAdYDONe#AY;%|JtgFsseI#oo7ukBFADf}d28ht_L&K}mj)OQywq}q+4-_lv_n~{
zS$5j}@lp0IdU;b%j<-E_@5RIeKy$T}!b!>LjA@FxpSYT>4nCBcMx@yN@}FXi13GLT
zxz;w-^58sD&8>SL78KDBqEHV6TcU@3Z!G>NgaesKz}1pPc?VZb;DtQUS+Ad2iXi`D
z{;JlP%i6hX?@TtdY~1L}Y>dLMmNNwklV6q;tJa>@N`6pC!|wofp=8B&Q}*ov1EQ)a
zXHSTWqS5;bVg>plaRDubO4|bpkVN+SXRjbTdhLsczgxK;nCeO#sjlxpv1%XW>nE
zao~fk><080wdIjH<-lfx+f&QJaD&ypuc|3vf`LY@PhS5=ZI&vff`zF96>Y%V>ASyA
z?*;lP&|nc&=-)J0+Zw3kUfO2KJ>$&Z5{TYV-?pvBrRuDCiA;%x5H!6k-$<-$3@Z^#3sTrtl1-p1SbN&A#~bM9^#KlRp#B(#Kd*X{D}u|s5c0`0LGtsU3UsC%vd(5TP=8QdA#(aE88HHwbYOi
z9vg+bCi7ht#?7INw$dL3c1W|(!jQiLAKzfV6uci(?uY5reyTlyadM1{E3xh8<6I>#
zE!{C4r+^V^T9DDHW`f*HgEM(4VRIL+2Q%4^oFecl)^ZeGvcQ*`YLS$s2xl-}>%9GO
zZC+Pkz6X23e0>y8Ddc|}@=};osXH1rIKjN>65pl35C;v%o^Li}uPnQjT<7>cDio?#q`Gh(7PZO0TR@HjoH5x6CNj#$yVHC`E5WyOrrQdDv)KbS1(AzPg
zD}VpknKnA7!=F#M9ov@AzHI--g&GpKUf7f#$Ll
zGoSU>b+UgLTpi5d`>@@*s>bwW@Uj>BdCfWdbPN*N;qjF}G>oQ409ME&8Z)btaGPgl
z8vQbbFKCfJ|Ga%aZ|w3SNp3$`-Ty+7G&_9w@8-w5dQYB#qMpoOChCVTii%P%CkbCV
zNpPE5V)0U2sz(`vb49+P1)OPiMjKDCL;5se8x1Y#&>HfAWuzMHBv)5FuA6dqcdZ)#
z03ro!;0tIiW^pf}zl(aH6tq$LQ?TeuuV$BeYaihNN{
zO8pZf^?C7p`pY1UZ8qN62&X{j6hVAv6N!8|A`CgdX0G0&oTbe_>HlV+yf7WnHrh@t?0CK
Date: Thu, 20 Jun 2024 09:49:03 +0200
Subject: [PATCH 07/11] improve code: use replace variable
---
.../basisdatenservice/configuration/ClientConfiguration.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/wls-basisdaten-service/src/main/java/de/muenchen/oss/wahllokalsystem/basisdatenservice/configuration/ClientConfiguration.java b/wls-basisdaten-service/src/main/java/de/muenchen/oss/wahllokalsystem/basisdatenservice/configuration/ClientConfiguration.java
index e6cc9c434..6cb9b0548 100644
--- a/wls-basisdaten-service/src/main/java/de/muenchen/oss/wahllokalsystem/basisdatenservice/configuration/ClientConfiguration.java
+++ b/wls-basisdaten-service/src/main/java/de/muenchen/oss/wahllokalsystem/basisdatenservice/configuration/ClientConfiguration.java
@@ -29,11 +29,10 @@ public RestTemplate restTemplate(final WlsResponseErrorHandler wlsResponseErrorH
return execution.execute(request, body);
}
- if (!(authentication.getCredentials() instanceof AbstractOAuth2Token)) {
+ if (!(authentication.getCredentials() instanceof AbstractOAuth2Token token)) {
return execution.execute(request, body);
}
- val token = (AbstractOAuth2Token) authentication.getCredentials();
request.getHeaders().setBearerAuth(token.getTokenValue());
return execution.execute(request, body);
});
From 51e8aef63b2652036e4110a42520d9f481e4c887 Mon Sep 17 00:00:00 2001
From: MrSebastian <13592751+MrSebastian@users.noreply.github.com>
Date: Mon, 1 Jul 2024 12:21:24 +0200
Subject: [PATCH 08/11] change client and model package
---
docs/src/guides/how-to-create-client-from-open-api-json.md | 4 ++--
wls-basisdaten-service/pom.xml | 4 ++--
.../configuration/BasePathConfiguration.java | 2 +-
.../wahllokalsystem/basisdatenservice/rest/DemoClient.java | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/docs/src/guides/how-to-create-client-from-open-api-json.md b/docs/src/guides/how-to-create-client-from-open-api-json.md
index c931efb71..e9ccb177d 100644
--- a/docs/src/guides/how-to-create-client-from-open-api-json.md
+++ b/docs/src/guides/how-to-create-client-from-open-api-json.md
@@ -49,9 +49,9 @@ Für jeden zu erzeugenden Client mus ein `execution`-Element definiert werden.
- de.muenchen.oss.wahllokalsystem.basisdatenservice.clients.eai.api
+ ${groupId}.basisdatenservice.eai.aou.client
- de.muenchen.oss.wahllokalsystem.basisdatenservice.clients.eai.model
+ ${groupId}.basisdatenservice.eai.aou.model
false
diff --git a/wls-basisdaten-service/pom.xml b/wls-basisdaten-service/pom.xml
index 7cb0910dd..c679cb63a 100644
--- a/wls-basisdaten-service/pom.xml
+++ b/wls-basisdaten-service/pom.xml
@@ -353,8 +353,8 @@
java
resttemplate
- de.muenchen.oss.wahllokalsystem.basisdatenservice.clients.eai.api
- de.muenchen.oss.wahllokalsystem.basisdatenservice.clients.eai.model
+ ${groupId}.basisdatenservice.eai.aou.client
+ ${groupId}.basisdatenservice.eai.aou.model
false
false
diff --git a/wls-basisdaten-service/src/main/java/de/muenchen/oss/wahllokalsystem/basisdatenservice/configuration/BasePathConfiguration.java b/wls-basisdaten-service/src/main/java/de/muenchen/oss/wahllokalsystem/basisdatenservice/configuration/BasePathConfiguration.java
index a833679d6..b158469b9 100644
--- a/wls-basisdaten-service/src/main/java/de/muenchen/oss/wahllokalsystem/basisdatenservice/configuration/BasePathConfiguration.java
+++ b/wls-basisdaten-service/src/main/java/de/muenchen/oss/wahllokalsystem/basisdatenservice/configuration/BasePathConfiguration.java
@@ -1,6 +1,6 @@
package de.muenchen.oss.wahllokalsystem.basisdatenservice.configuration;
-import de.muenchen.oss.wahllokalsystem.basisdatenservice.clients.eai.ApiClient;
+import de.muenchen.oss.wahllokalsystem.basisdatenservice.eai.aou.ApiClient;
import jakarta.annotation.PostConstruct;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Value;
diff --git a/wls-basisdaten-service/src/main/java/de/muenchen/oss/wahllokalsystem/basisdatenservice/rest/DemoClient.java b/wls-basisdaten-service/src/main/java/de/muenchen/oss/wahllokalsystem/basisdatenservice/rest/DemoClient.java
index da508a950..2a10352b4 100644
--- a/wls-basisdaten-service/src/main/java/de/muenchen/oss/wahllokalsystem/basisdatenservice/rest/DemoClient.java
+++ b/wls-basisdaten-service/src/main/java/de/muenchen/oss/wahllokalsystem/basisdatenservice/rest/DemoClient.java
@@ -1,6 +1,6 @@
package de.muenchen.oss.wahllokalsystem.basisdatenservice.rest;
-import de.muenchen.oss.wahllokalsystem.basisdatenservice.clients.eai.api.WahlvorschlagControllerApi;
+import de.muenchen.oss.wahllokalsystem.basisdatenservice.eai.aou.client.WahlvorschlagControllerApi;
import lombok.RequiredArgsConstructor;
import lombok.val;
import org.springframework.stereotype.Component;
From f7ccbbb5e64ef469db9d91e4e9792d206a8f1b60 Mon Sep 17 00:00:00 2001
From: MrSebastian <13592751+MrSebastian@users.noreply.github.com>
Date: Mon, 1 Jul 2024 12:24:17 +0200
Subject: [PATCH 09/11] wrap rest template code in configuration class
---
...how-to-create-client-from-open-api-json.md | 45 ++++++++++---------
1 file changed, 25 insertions(+), 20 deletions(-)
diff --git a/docs/src/guides/how-to-create-client-from-open-api-json.md b/docs/src/guides/how-to-create-client-from-open-api-json.md
index e9ccb177d..17ccf9fc2 100644
--- a/docs/src/guides/how-to-create-client-from-open-api-json.md
+++ b/docs/src/guides/how-to-create-client-from-open-api-json.md
@@ -118,29 +118,34 @@ Damit der generierte Client verwendet werden kann, muss dem Spring-Context noch
```java
-@Bean
-public RestTemplate restTemplate(final WlsResponseErrorHandler wlsResponseErrorHandler) {
- val restTemplate = new RestTemplate();
-
- /* definieren des Errorhandlers für Antworten vom externen Service */
- restTemplate.setErrorHandler(wlsResponseErrorHandler);
- /* Ergänzen eines Interceptors um den Bearer-Token an den nächsten Service weiter zu geben */
- restTemplate.getInterceptors().add((request, body, execution) -> {
- Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
- if (authentication == null) {
- return execution.execute(request, body);
- }
-
- if (!(authentication.getCredentials() instanceof AbstractOAuth2Token)) {
+@Configuration
+public class ClientConfiguration {
+
+ @Bean
+ public RestTemplate restTemplate(final WlsResponseErrorHandler wlsResponseErrorHandler) {
+ val restTemplate = new RestTemplate();
+
+ /* definieren des Errorhandlers für Antworten vom externen Service */
+ restTemplate.setErrorHandler(wlsResponseErrorHandler);
+ /* Ergänzen eines Interceptors um den Bearer-Token an den nächsten Service weiter zu geben */
+ restTemplate.getInterceptors().add((request, body, execution) -> {
+ Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
+ if (authentication == null) {
+ return execution.execute(request, body);
+ }
+
+ if (!(authentication.getCredentials() instanceof AbstractOAuth2Token)) {
+ return execution.execute(request, body);
+ }
+
+ val token = (AbstractOAuth2Token) authentication.getCredentials();
+ request.getHeaders().setBearerAuth(token.getTokenValue());
return execution.execute(request, body);
- }
+ });
- val token = (AbstractOAuth2Token) authentication.getCredentials();
- request.getHeaders().setBearerAuth(token.getTokenValue());
- return execution.execute(request, body);
- });
+ return restTemplate;
+ }
- return restTemplate;
}
```
From 6c9f541e92acc987931eb7adcc61877e4b18767d Mon Sep 17 00:00:00 2001
From: MrSebastian <13592751+MrSebastian@users.noreply.github.com>
Date: Mon, 1 Jul 2024 12:24:50 +0200
Subject: [PATCH 10/11] wrap wslResponseErrorHandler code in configuration
class
---
.../how-to-create-client-from-open-api-json.md | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/docs/src/guides/how-to-create-client-from-open-api-json.md b/docs/src/guides/how-to-create-client-from-open-api-json.md
index 17ccf9fc2..67a245b46 100644
--- a/docs/src/guides/how-to-create-client-from-open-api-json.md
+++ b/docs/src/guides/how-to-create-client-from-open-api-json.md
@@ -153,10 +153,16 @@ Wie zu erkennen ist, wird für das RestTemplate ein ErrorHandler benötigt, wobe
aus `wls-common:exception` verwenden. Eine entsprechende Bean muss ebenfalls noch dem Spring-Context hinzugefügt werden:
```java
+@Configuration
+public class ClientConfiguration {
+
+ //other configurations like the restTemplate bean factory method
-@Bean
-public WlsResponseErrorHandler wlsResponseErrorHandler(final ObjectMapper objectMapper) {
- return new WlsResponseErrorHandler(objectMapper);
+ @Bean
+ public WlsResponseErrorHandler wlsResponseErrorHandler(final ObjectMapper objectMapper) {
+ return new WlsResponseErrorHandler(objectMapper);
+ }
+
}
```
From 0fb04b642cee5a2b9467b67ed0fddb74d25f59b4 Mon Sep 17 00:00:00 2001
From: MrSebastian <13592751+MrSebastian@users.noreply.github.com>
Date: Mon, 1 Jul 2024 12:26:28 +0200
Subject: [PATCH 11/11] add hint that error will occur
---
wls-basisdaten-service/src/test/resources/demo.http | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/wls-basisdaten-service/src/test/resources/demo.http b/wls-basisdaten-service/src/test/resources/demo.http
index 0c014406f..ebca281b3 100644
--- a/wls-basisdaten-service/src/test/resources/demo.http
+++ b/wls-basisdaten-service/src/test/resources/demo.http
@@ -17,6 +17,6 @@ username = wls_all
GET http://kubernetes.docker.internal:8100/auth/realms/wls_realm/protocol/openid-connect/userinfo
Authorization: {{ token_type }} {{ auth_token }}
-### Demo für client zu EAI
+### Demo für client zu EAI - will result in 500 als long as eai is not implemented (not implemented yet)
GET http://localhost:39151/demo
Authorization: {{ token_type }} {{ auth_token }}
\ No newline at end of file