Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

INCOPLETE LPD-42278 Changes needed in rest builder #6177

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

INCOPLETE LPD-42278 Changes needed in rest builder #6177

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
16b8f5c
LPD-42278 Change in RestBuilder to autogenerate the implementation of…
marco-leo Jan 29, 2025
40779e3
LPD-42278 Example of autogenerated method
marco-leo Jan 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion ...om/liferay/object/admin/rest/internal/resource/v1_0/BaseObjectDefinitionResourceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
import com.liferay.portal.vulcan.batch.engine.VulcanBatchEngineTaskItemDelegate;
import com.liferay.portal.vulcan.batch.engine.resource.VulcanBatchEngineExportTaskResource;
import com.liferay.portal.vulcan.batch.engine.resource.VulcanBatchEngineImportTaskResource;
import com.liferay.portal.vulcan.crud.VulcanCRUDItemDelegate;
import com.liferay.portal.vulcan.pagination.Page;
import com.liferay.portal.vulcan.pagination.Pagination;
import com.liferay.portal.vulcan.resource.EntityModelResource;
Expand Down Expand Up @@ -68,7 +69,8 @@
@javax.ws.rs.Path("/v1.0")
public abstract class BaseObjectDefinitionResourceImpl
implements EntityModelResource, ObjectDefinitionResource,
VulcanBatchEngineTaskItemDelegate<ObjectDefinition> {
VulcanBatchEngineTaskItemDelegate<ObjectDefinition>,
VulcanCRUDItemDelegate<ObjectDefinition> {

/**
* Invoke this method with the command line:
Expand Down Expand Up @@ -420,6 +422,16 @@ public Response deleteObjectDefinitionBatch(
).build();
}

@Override
public ObjectDefinition getItem(Long itemId) throws Exception {
return getObjectDefinition(itemId);
}

@Override
public String getResourcePath() {
return "/object-admin";
}

/**
* Invoke this method with the command line:
*
Expand Down
1 change: 1 addition & 0 deletions ...dmin-rest-impl/src/main/resources/OSGI-INF/liferay/rest/v1_0/object-definition.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ batch.engine.entity.class.name=com.liferay.object.admin.rest.dto.v1_0.ObjectDefi
batch.engine.task.item.delegate=true
batch.planner.export.enabled=true
batch.planner.import.enabled=true
crud.item.delegate=true
entity.class.name=com.liferay.object.admin.rest.dto.v1_0.ObjectDefinition
osgi.jaxrs.application.select=(osgi.jaxrs.name=Liferay.Object.Admin.REST)
osgi.jaxrs.resource=true
25 changes: 23 additions & 2 deletions .../main/resources/com/liferay/portal/tools/rest/builder/dependencies/base_resource_impl.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ import com.liferay.portal.vulcan.accept.language.AcceptLanguage;
import com.liferay.portal.vulcan.batch.engine.VulcanBatchEngineTaskItemDelegate;
import com.liferay.portal.vulcan.batch.engine.resource.VulcanBatchEngineExportTaskResource;
import com.liferay.portal.vulcan.batch.engine.resource.VulcanBatchEngineImportTaskResource;
import com.liferay.portal.vulcan.crud.VulcanCRUDItemDelegate;
import com.liferay.portal.vulcan.multipart.MultipartBody;
import com.liferay.portal.vulcan.pagination.Page;
import com.liferay.portal.vulcan.pagination.Pagination;
Expand Down Expand Up @@ -111,13 +112,16 @@ public abstract class Base${schemaName}ResourceImpl
javaDataType = freeMarkerTool.getJavaDataType(configYAML, openAPIYAML, schemaName)!""
javaMethodSignatures = freeMarkerTool.getResourceJavaMethodSignatures(configYAML, openAPIYAML, schemaName)
generateBatch = freeMarkerTool.generateBatch(configYAML, javaDataType, javaMethodSignatures, schemaName)
generateCRUD = false
/>

<#if generateBatch>
, EntityModelResource, VulcanBatchEngineTaskItemDelegate<${javaDataType}>
</#if>

{
<#if generateCRUD>
, VulcanCRUDItemDelegate<${javaDataType}>
</#if>
{

<#assign
generateGetPermissionCheckerMethods = false
Expand Down Expand Up @@ -175,6 +179,23 @@ public abstract class Base${schemaName}ResourceImpl
<#assign putByERCBatchJavaMethodSignature = javaMethodSignature />
</#if>

<#if generateCRUD && stringUtil.equals(javaMethodSignature.methodName, "get" + schemaName)>
<#assign getByIdJavaMethodSignature = javaMethodSignature />
@Override
public ${schemaName} getItem(Long itemId) throws Exception {
<#if getByIdJavaMethodSignature??>
return ${javaMethodSignature.methodName}(itemId);
<#else>
return null;
</#if>
}

@Override
public String getResourcePath() {
return "${configYAML.application.baseURI}";
}
</#if>

<#if configYAML.application??>
/**
* ${freeMarkerTool.getRESTMethodJavadoc(configYAML, javaMethodSignature, openAPIYAML)}
Expand Down
4 changes: 4 additions & 0 deletions ...lder/src/main/resources/com/liferay/portal/tools/rest/builder/dependencies/properties.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ api.version=${openAPIYAML.info.version}
javaDataType = freeMarkerTool.getJavaDataType(configYAML, openAPIYAML, schemaName)!""
javaMethodSignatures = freeMarkerTool.getResourceJavaMethodSignatures(configYAML, openAPIYAML, schemaName)
generateBatch = freeMarkerTool.generateBatch(configYAML, javaDataType, javaMethodSignatures, schemaName)
generateCRUD = false
/>
<#if stringUtil.equals(schemaName, "openapi")>
openapi.resource=true
Expand All @@ -19,6 +20,9 @@ batch.engine.task.item.delegate=true
batch.planner.export.enabled=${freeMarkerTool.hasReadVulcanBatchImplementation(javaMethodSignatures)?c}
batch.planner.import.enabled=${freeMarkerTool.getVulcanBatchImplementationCreateStrategies(javaMethodSignatures, freeMarkerTool.getDTOProperties(configYAML, openAPIYAML, schema, allSchemas))?has_content?c}
</#if>
<#if generateCRUD>
crud.item.delegate=true
</#if>
<#if javaDataType?has_content>
entity.class.name=${javaDataType}
</#if>
Expand Down