chore: auto update samples

lgdd · Nov 11, 2024 · 29c6b0f · 29c6b0f
1 parent a4e2d74
commit 29c6b0f
Show file tree

Hide file tree

Showing 13 changed files with 31 additions and 196 deletions.
diff --git a/...-sample-commerce-checkout-step/src/main/java/com/liferay/sample/ActionRestController.java b/...-sample-commerce-checkout-step/src/main/java/com/liferay/sample/ActionRestController.java
@@ -5,21 +5,18 @@
 
 package com.liferay.sample;
 
-import com.liferay.petra.string.StringBundler;
+import com.liferay.client.extension.util.spring.boot.BaseRestController;
 
 import org.json.JSONObject;
 
-import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.security.oauth2.jwt.Jwt;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.reactive.function.client.WebClient;
 
 /**
  * @author Andrea Sbarra
@@ -35,27 +32,14 @@ public ResponseEntity<String> post(
 		JSONObject jsonObject = new JSONObject(json);
 
 		return new ResponseEntity<>(
-			WebClient.create(
-				StringBundler.concat(
-					lxcDXPServerProtocol, "://", lxcDXPMainDomain,
-					"/o/headless-commerce-delivery-cart/v1.0/carts/",
-					jsonObject.getLong("commerceOrderId"))
-			).patch(
-			).accept(
-				MediaType.APPLICATION_JSON
-			).contentType(
-				MediaType.APPLICATION_JSON
-			).bodyValue(
+			patch(
+				"Bearer " + jwt.getTokenValue(),
 				new JSONObject(
 				).put(
 					"purchaseOrderNumber", jsonObject.getString("pon")
-				).toString()
-			).header(
-				HttpHeaders.AUTHORIZATION, "Bearer " + jwt.getTokenValue()
-			).retrieve(
-			).bodyToMono(
-				String.class
-			).block(),
+				).toString(),
+				"/o/headless-commerce-delivery-cart/v1.0/carts/" +
+					jsonObject.getLong("commerceOrderId")),
 			HttpStatus.OK);
 	}
 

diff --git a/...ay-sample-commerce-checkout-step/src/main/java/com/liferay/sample/BaseRestController.java b/...ay-sample-commerce-checkout-step/src/main/java/com/liferay/sample/BaseRestController.java
diff --git a/...y-sample-commerce-checkout-step/src/main/java/com/liferay/sample/ReadyRestController.java b/...y-sample-commerce-checkout-step/src/main/java/com/liferay/sample/ReadyRestController.java
@@ -5,6 +5,8 @@
 
 package com.liferay.sample;
 
+import com.liferay.client.extension.util.spring.boot.BaseRestController;
+
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;

diff --git a/liferay-sample-etc-spring-boot/src/main/java/com/liferay/sample/BaseRestController.java b/liferay-sample-etc-spring-boot/src/main/java/com/liferay/sample/BaseRestController.java
diff --git a/liferay-sample-etc-spring-boot/src/main/java/com/liferay/sample/DadJokeRestController.java b/liferay-sample-etc-spring-boot/src/main/java/com/liferay/sample/DadJokeRestController.java
@@ -5,6 +5,8 @@
 
 package com.liferay.sample;
 
+import com.liferay.client.extension.util.spring.boot.BaseRestController;
+
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 

diff --git a/...ple-etc-spring-boot/src/main/java/com/liferay/sample/NotificationType1RestController.java b/...ple-etc-spring-boot/src/main/java/com/liferay/sample/NotificationType1RestController.java
@@ -5,6 +5,8 @@
 
 package com.liferay.sample;
 
+import com.liferay.client.extension.util.spring.boot.BaseRestController;
+
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 

diff --git a/...-sample-etc-spring-boot/src/main/java/com/liferay/sample/ObjectAction1RestController.java b/...-sample-etc-spring-boot/src/main/java/com/liferay/sample/ObjectAction1RestController.java
@@ -5,6 +5,8 @@
 
 package com.liferay.sample;
 
+import com.liferay.client.extension.util.spring.boot.BaseRestController;
+
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 

diff --git a/...-sample-etc-spring-boot/src/main/java/com/liferay/sample/ObjectAction2RestController.java b/...-sample-etc-spring-boot/src/main/java/com/liferay/sample/ObjectAction2RestController.java
@@ -5,6 +5,7 @@
 
 package com.liferay.sample;
 
+import com.liferay.client.extension.util.spring.boot.BaseRestController;
 import com.liferay.petra.string.StringBundler;
 
 import org.json.JSONObject;

diff --git a/...e-etc-spring-boot/src/main/java/com/liferay/sample/ObjectEntryManager1RestController.java b/...e-etc-spring-boot/src/main/java/com/liferay/sample/ObjectEntryManager1RestController.java
@@ -5,6 +5,8 @@
 
 package com.liferay.sample;
 
+import com.liferay.client.extension.util.spring.boot.BaseRestController;
+
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;

diff --git a/...etc-spring-boot/src/main/java/com/liferay/sample/ObjectValidationRule1RestController.java b/...etc-spring-boot/src/main/java/com/liferay/sample/ObjectValidationRule1RestController.java
@@ -5,6 +5,8 @@
 
 package com.liferay.sample;
 
+import com.liferay.client.extension.util.spring.boot.BaseRestController;
+
 import java.util.Objects;
 
 import org.apache.commons.logging.Log;

diff --git a/liferay-sample-etc-spring-boot/src/main/java/com/liferay/sample/ReadyRestController.java b/liferay-sample-etc-spring-boot/src/main/java/com/liferay/sample/ReadyRestController.java
@@ -5,6 +5,8 @@
 
 package com.liferay.sample;
 
+import com.liferay.client.extension.util.spring.boot.BaseRestController;
+
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;

diff --git a/...ample-etc-spring-boot/src/main/java/com/liferay/sample/WorkflowAction1RestController.java b/...ample-etc-spring-boot/src/main/java/com/liferay/sample/WorkflowAction1RestController.java
@@ -5,25 +5,21 @@
 
 package com.liferay.sample;
 
+import com.liferay.client.extension.util.spring.boot.BaseRestController;
+
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 import org.json.JSONObject;
 
-import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.security.oauth2.jwt.Jwt;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.reactive.function.client.WebClient;
-import org.springframework.web.reactive.function.client.WebClientResponseException;
-
-import reactor.core.publisher.Mono;
 
 /**
  * @author Raymond Augé
@@ -41,48 +37,16 @@ public ResponseEntity<String> post(
 
 		log(jwt, _log, json);
 
-		WebClient.Builder builder = WebClient.builder();
-
-		WebClient webClient = builder.baseUrl(
-			lxcDXPServerProtocol + "://" + lxcDXPMainDomain
-		).defaultHeader(
-			HttpHeaders.ACCEPT, MediaType.APPLICATION_JSON_VALUE
-		).defaultHeader(
-			HttpHeaders.AUTHORIZATION, "Bearer " + jwt.getTokenValue()
-		).defaultHeader(
-			HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE
-		).build();
-
 		JSONObject jsonObject = new JSONObject(json);
 
-		webClient.post(
-		).uri(
-			jsonObject.getString("transitionURL")
-		).bodyValue(
-			"{\"transitionName\": \"approve\"}"
-		).exchangeToMono(
-			clientResponse -> {
-				HttpStatus httpStatus = clientResponse.statusCode();
-
-				if (httpStatus.is2xxSuccessful()) {
-					return clientResponse.bodyToMono(String.class);
-				}
-				else if (httpStatus.is4xxClientError()) {
-					return Mono.just(httpStatus.getReasonPhrase());
-				}
-
-				Mono<WebClientResponseException> mono =
-					clientResponse.createException();
+		String response = post(
+			"Bearer " + jwt.getTokenValue(),
+			"{\"transitionName\": \"approve\"}",
+			jsonObject.getString("transitionURL"));
 
-				return mono.flatMap(Mono::error);
-			}
-		).doOnNext(
-			output -> {
-				if (_log.isInfoEnabled()) {
-					_log.info("Output: " + output);
-				}
-			}
-		).subscribe();
+		if (_log.isInfoEnabled()) {
+			_log.info("Output: " + response);
+		}
 
 		return new ResponseEntity<>(json, HttpStatus.OK);
 	}

diff --git a/liferay-sample-site-initializer/client-extension.yaml b/liferay-sample-site-initializer/client-extension.yaml
@@ -7,7 +7,7 @@ liferay-sample-site-initializer:
 liferay-sample-site-initializer-oauth-application-headless-server:
     .serviceAddress: localhost:8080
     .serviceScheme: http
-    name: Liferay Sample OAuth Application Headless Server
+    name: Liferay Sample Site Initializer OAuth Application Headless Server
     scopes:
         - Liferay.Headless.Site.everything
     type: oAuthApplicationHeadlessServer