chore: auto update client extensions samples

lgdd · Jan 31, 2025 · 314ec88 · 314ec88
1 parent 5ae299b
commit 314ec88
Show file tree

Hide file tree

Showing 24 changed files with 26 additions and 43 deletions.
diff --git a/...ent-extensions-samples/git/objects/pack/pack-f8074070651e2d3b3568ec24d86ddad8e06cdfbd.idx b/...ent-extensions-samples/git/objects/pack/pack-f8074070651e2d3b3568ec24d86ddad8e06cdfbd.idx
diff --git a/...nt-extensions-samples/git/objects/pack/pack-f8074070651e2d3b3568ec24d86ddad8e06cdfbd.pack b/...nt-extensions-samples/git/objects/pack/pack-f8074070651e2d3b3568ec24d86ddad8e06cdfbd.pack
diff --git a/...ent-extensions-samples/git/objects/pack/pack-f8074070651e2d3b3568ec24d86ddad8e06cdfbd.rev b/...ent-extensions-samples/git/objects/pack/pack-f8074070651e2d3b3568ec24d86ddad8e06cdfbd.rev
diff --git a/...sion/liferay-client-extensions-samples/liferay-sample-commerce-checkout-step/build.gradle b/...sion/liferay-client-extensions-samples/liferay-sample-commerce-checkout-step/build.gradle
@@ -20,7 +20,7 @@ apply plugin: "java-library"
 apply plugin: "org.springframework.boot"
 
 dependencies {
-	implementation group: "com.liferay", name: "com.liferay.client.extension.util.spring.boot", version: "latest.release"
+	implementation group: "com.liferay", name: "com.liferay.client.extension.util.spring.boot3", version: "latest.release"
 	implementation group: "com.liferay", name: "com.liferay.petra.string", version: "5.3.4"
 	implementation group: "com.liferay", name: "org.apache.commons.logging", version: "1.2.LIFERAY-PATCHED-2"
 	implementation group: "org.json", name: "json", version: "20231013"

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,7 +5,7 @@
 
 package com.liferay.sample;
 
-import com.liferay.client.extension.util.spring.boot.BaseRestController;
+import com.liferay.client.extension.util.spring.boot3.BaseRestController;
 
 import org.json.JSONObject;
 

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,7 +5,7 @@
 
 package com.liferay.sample;
 
-import com.liferay.client.extension.util.spring.boot.BaseRestController;
+import com.liferay.client.extension.util.spring.boot3.BaseRestController;
 
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;

diff --git a/...-commerce-checkout-step/src/main/java/com/liferay/sample/SampleSpringBootApplication.java b/...-commerce-checkout-step/src/main/java/com/liferay/sample/SampleSpringBootApplication.java
@@ -5,7 +5,7 @@
 
 package com.liferay.sample;
 
-import com.liferay.client.extension.util.spring.boot.ClientExtensionUtilSpringBootComponentScan;
+import com.liferay.client.extension.util.spring.boot3.ClientExtensionUtilSpringBootComponentScan;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;

diff --git a/...iferay-client-extensions-samples/liferay-sample-commerce-payment-integration/build.gradle b/...iferay-client-extensions-samples/liferay-sample-commerce-payment-integration/build.gradle
@@ -20,7 +20,7 @@ apply plugin: "java-library"
 apply plugin: "org.springframework.boot"
 
 dependencies {
-	implementation group: "com.liferay", name: "com.liferay.client.extension.util.spring.boot", version: "latest.release"
+	implementation group: "com.liferay", name: "com.liferay.client.extension.util.spring.boot3", version: "latest.release"
 	implementation group: "com.liferay", name: "org.apache.commons.logging", version: "1.2.LIFERAY-PATCHED-2"
 	implementation group: "org.json", name: "json", version: "20231013"
 	implementation group: "org.springframework.boot", name: "spring-boot-starter-oauth2-resource-server", version: "2.7.18"

diff --git a/...rce-payment-integration/src/main/java/com/liferay/sample/SampleSpringBootApplication.java b/...rce-payment-integration/src/main/java/com/liferay/sample/SampleSpringBootApplication.java
@@ -5,7 +5,7 @@
 
 package com.liferay.sample;
 
-import com.liferay.client.extension.util.spring.boot.ClientExtensionUtilSpringBootComponentScan;
+import com.liferay.client.extension.util.spring.boot3.ClientExtensionUtilSpringBootComponentScan;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;

diff --git a/...on/liferay-client-extensions-samples/liferay-sample-commerce-shipping-engine/build.gradle b/...on/liferay-client-extensions-samples/liferay-sample-commerce-shipping-engine/build.gradle
@@ -20,7 +20,7 @@ apply plugin: "java-library"
 apply plugin: "org.springframework.boot"
 
 dependencies {
-	implementation group: "com.liferay", name: "com.liferay.client.extension.util.spring.boot", version: "latest.release"
+	implementation group: "com.liferay", name: "com.liferay.client.extension.util.spring.boot3", version: "latest.release"
 	implementation group: "com.liferay", name: "org.apache.commons.logging", version: "1.2.LIFERAY-PATCHED-2"
 	implementation group: "org.json", name: "json", version: "20231013"
 	implementation group: "org.springframework.boot", name: "spring-boot-starter-oauth2-resource-server", version: "2.7.18"

diff --git a/...ommerce-shipping-engine/src/main/java/com/liferay/sample/SampleSpringBootApplication.java b/...ommerce-shipping-engine/src/main/java/com/liferay/sample/SampleSpringBootApplication.java
@@ -5,7 +5,7 @@
 
 package com.liferay.sample;
 
-import com.liferay.client.extension.util.spring.boot.ClientExtensionUtilSpringBootComponentScan;
+import com.liferay.client.extension.util.spring.boot3.ClientExtensionUtilSpringBootComponentScan;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;

diff --git a/...l/client_extension/liferay-client-extensions-samples/liferay-sample-etc-cron/build.gradle b/...l/client_extension/liferay-client-extensions-samples/liferay-sample-etc-cron/build.gradle
@@ -27,7 +27,7 @@ bootRun {
 }
 
 dependencies {
-	implementation group: "com.liferay", name: "com.liferay.client.extension.util.spring.boot", version: "latest.release"
+	implementation group: "com.liferay", name: "com.liferay.client.extension.util.spring.boot3", version: "latest.release"
 	implementation group: "com.liferay", name: "com.liferay.headless.admin.user.client", version: "latest.release"
 	implementation group: "com.liferay", name: "com.liferay.headless.delivery.client", version: "latest.release"
 	implementation group: "com.liferay", name: "com.liferay.petra.string", version: "latest.release"

diff --git a/...les/liferay-sample-etc-cron/src/main/java/com/liferay/sample/SampleCommandLineRunner.java b/...les/liferay-sample-etc-cron/src/main/java/com/liferay/sample/SampleCommandLineRunner.java
@@ -5,7 +5,7 @@
 
 package com.liferay.sample;
 
-import com.liferay.client.extension.util.spring.boot.LiferayOAuth2AccessTokenManager;
+import com.liferay.client.extension.util.spring.boot3.LiferayOAuth2AccessTokenManager;
 import com.liferay.headless.admin.user.client.dto.v1_0.Site;
 import com.liferay.headless.admin.user.client.resource.v1_0.SiteResource;
 import com.liferay.headless.delivery.client.dto.v1_0.MessageBoardThread;

diff --git a/...liferay-sample-etc-cron/src/main/java/com/liferay/sample/SampleSpringBootApplication.java b/...liferay-sample-etc-cron/src/main/java/com/liferay/sample/SampleSpringBootApplication.java
@@ -5,7 +5,7 @@
 
 package com.liferay.sample;
 
-import com.liferay.client.extension.util.spring.boot.ClientExtensionUtilSpringBootComponentScan;
+import com.liferay.client.extension.util.spring.boot3.ClientExtensionUtilSpringBootComponentScan;
 
 import org.springframework.boot.WebApplicationType;
 import org.springframework.boot.autoconfigure.SpringBootApplication;

diff --git a/...t_extension/liferay-client-extensions-samples/liferay-sample-etc-spring-boot/build.gradle b/...t_extension/liferay-client-extensions-samples/liferay-sample-etc-spring-boot/build.gradle
@@ -20,7 +20,7 @@ apply plugin: "java-library"
 apply plugin: "org.springframework.boot"
 
 dependencies {
-	implementation group: "com.liferay", name: "com.liferay.client.extension.util.spring.boot", version: "latest.release"
+	implementation group: "com.liferay", name: "com.liferay.client.extension.util.spring.boot3", version: "latest.release"
 	implementation group: "com.liferay", name: "com.liferay.petra.string", version: "latest.release"
 	implementation group: "com.liferay", name: "org.apache.commons.logging", version: "1.2.LIFERAY-PATCHED-2"
 	implementation group: "net.datafaker", name: "datafaker", version: "1.9.0"

diff --git a/...iferay-sample-etc-spring-boot/src/main/java/com/liferay/sample/DadJokeRestController.java b/...iferay-sample-etc-spring-boot/src/main/java/com/liferay/sample/DadJokeRestController.java
@@ -5,7 +5,7 @@
 
 package com.liferay.sample;
 
-import com.liferay.client.extension.util.spring.boot.BaseRestController;
+import com.liferay.client.extension.util.spring.boot3.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,7 +5,7 @@
 
 package com.liferay.sample;
 
-import com.liferay.client.extension.util.spring.boot.BaseRestController;
+import com.liferay.client.extension.util.spring.boot3.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,7 +5,7 @@
 
 package com.liferay.sample;
 
-import com.liferay.client.extension.util.spring.boot.BaseRestController;
+import com.liferay.client.extension.util.spring.boot3.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,22 +5,18 @@
 
 package com.liferay.sample;
 
-import com.liferay.client.extension.util.spring.boot.BaseRestController;
-import com.liferay.petra.string.StringBundler;
+import com.liferay.client.extension.util.spring.boot3.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 Raymond Augé
@@ -45,28 +41,15 @@ public ResponseEntity<String> post(
 		}
 
 		return new ResponseEntity<>(
-			WebClient.create(
-				StringBundler.concat(
-					lxcDXPServerProtocol, "://", lxcDXPMainDomain,
-					"/o/headless-admin-user/v1.0/user-accounts/",
-					modelDTOAccountJSONObject.getLong("id"))
-			).patch(
-			).accept(
-				MediaType.APPLICATION_JSON
-			).contentType(
-				MediaType.APPLICATION_JSON
-			).bodyValue(
+			patch(
+				"Bearer " + jwt.getTokenValue(),
 				new JSONObject(
 				).put(
 					"alternateName",
 					modelDTOAccountJSONObject.getString("givenName")
-				).toString()
-			).header(
-				HttpHeaders.AUTHORIZATION, "Bearer " + jwt.getTokenValue()
-			).retrieve(
-			).bodyToMono(
-				String.class
-			).block(),
+				).toString(),
+				"/o/headless-admin-user/v1.0/user-accounts/" +
+					modelDTOAccountJSONObject.getLong("id")),
 			HttpStatus.OK);
 	}
 

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,7 +5,7 @@
 
 package com.liferay.sample;
 
-import com.liferay.client.extension.util.spring.boot.BaseRestController;
+import com.liferay.client.extension.util.spring.boot3.BaseRestController;
 
 import java.util.Collections;
 import java.util.HashMap;

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,7 +5,7 @@
 
 package com.liferay.sample;
 
-import com.liferay.client.extension.util.spring.boot.BaseRestController;
+import com.liferay.client.extension.util.spring.boot3.BaseRestController;
 
 import java.util.Objects;
 

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,7 +5,7 @@
 
 package com.liferay.sample;
 
-import com.liferay.client.extension.util.spring.boot.BaseRestController;
+import com.liferay.client.extension.util.spring.boot3.BaseRestController;
 
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;

diff --git a/...-sample-etc-spring-boot/src/main/java/com/liferay/sample/SampleSpringBootApplication.java b/...-sample-etc-spring-boot/src/main/java/com/liferay/sample/SampleSpringBootApplication.java
@@ -5,7 +5,7 @@
 
 package com.liferay.sample;
 
-import com.liferay.client.extension.util.spring.boot.ClientExtensionUtilSpringBootComponentScan;
+import com.liferay.client.extension.util.spring.boot3.ClientExtensionUtilSpringBootComponentScan;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;

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,7 +5,7 @@
 
 package com.liferay.sample;
 
-import com.liferay.client.extension.util.spring.boot.BaseRestController;
+import com.liferay.client.extension.util.spring.boot3.BaseRestController;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;