LPD-73100 SF

Author: ling-alan-huang

modules/apps/portal-vulcan/portal-vulcan-api/src/main/java/com/liferay/portal/vulcan/util/ActionUtil.java

@@ -285,15 +285,13 @@ else if ((id != null) &&
 			() -> {
 				UriBuilder uriBuilder = uriBuilderSupplier.get();
 
-				if (clazz.getSuperclass(
-					).isAnnotationPresent(
-						Path.class
-					)) {
+				Class<?> superClass = clazz.getSuperclass();
 
-					uriBuilder = uriBuilder.path(clazz.getSuperclass());
+				if (superClass.isAnnotationPresent(Path.class)) {
+					uriBuilder = uriBuilder.path(superClass);
 				}
 
-				uriBuilder = uriBuilder.path(clazz.getSuperclass(), methodName);
+				uriBuilder = uriBuilder.path(superClass, methodName);
 
 				if (parameterId != null) {
 					uriBuilder = uriBuilder.resolveTemplates(

modules/apps/portal-vulcan/portal-vulcan-impl/src/main/java/com/liferay/portal/vulcan/internal/openapi/contributor/FilterableFieldsOpenAPIContributor.java

@@ -25,6 +25,7 @@
 import com.liferay.portal.vulcan.openapi.contributor.OpenAPIContributor;
 import com.liferay.portal.vulcan.resource.EntityModelResource;
 
+import io.swagger.v3.oas.models.Components;
 import io.swagger.v3.oas.models.OpenAPI;
 import io.swagger.v3.oas.models.Operation;
 import io.swagger.v3.oas.models.PathItem;
@@ -61,12 +62,13 @@ public class FilterableFieldsOpenAPIContributor implements OpenAPIContributor {
 	public void contribute(OpenAPI openAPI, OpenAPIContext openAPIContext)
 		throws Exception {
 
-		if ((openAPIContext == null) || (openAPI.getComponents() == null)) {
+		Components components = openAPI.getComponents();
+
+		if ((components == null) || (openAPIContext == null)) {
 			return;
 		}
 
-		Map<String, Schema> schemas = openAPI.getComponents(
-		).getSchemas();
+		Map<String, Schema> schemas = components.getSchemas();
 
 		if (MapUtil.isEmpty(schemas)) {
 			return;

modules/apps/portal-vulcan/portal-vulcan-impl/src/main/java/com/liferay/portal/vulcan/internal/resource/OpenAPIResourceImpl.java

@@ -150,11 +150,10 @@ public Response getOpenAPI(
 
 	@Override
 	public Map<String, Schema> getSchemas(Class<?> entityClass) {
+		ModelConverters modelConverters = ModelConverters.getInstance();
+
 		return new HashMap<>(
-			ModelConverters.getInstance(
-			).readAll(
-				new AnnotatedType(entityClass)
-			));
+			modelConverters.readAll(new AnnotatedType(entityClass)));
 	}
 
 	@Override

modules/apps/portal-vulcan/portal-vulcan-test/src/testIntegration/java/com/liferay/portal/vulcan/internal/jaxrs/exception/mapper/test/ExceptionMapperTest.java

@@ -134,8 +134,11 @@ public void testPrincipalExceptionReturnForbidden() throws Exception {
 				null, "/test-vulcan/testPrincipalException2",
 				HashMapBuilder.put(
 					"Accept-Language",
-					LocaleUtil.getDefault(
-					).toLanguageTag()
+					() -> {
+						Locale defaultLocale = LocaleUtil.getDefault();
+
+						return defaultLocale.toLanguageTag();
+					}
 				).build(),
 				Http.Method.POST
 			).getString(