Skip to content
This repository has been archived by the owner on May 26, 2020. It is now read-only.

Commit

Permalink
Fix swagger specification for Alfresco MediaType (#209)
Browse files Browse the repository at this point in the history 
Remove [DomainObject]Resource classes as they are not bringing any value and this allows the reuse of common swagger
configuration defined in common repository.

Refs Activiti/Activiti#2588
  • Loading branch information
@erdemedeiros @ryandawsonuk
erdemedeiros authored and ryandawsonuk committed Mar 18, 2019
1 parent 055b54e commit 2ced287
Show file tree
Hide file tree
Showing 23 changed files with 165 additions and 210 deletions.
30 changes: 0 additions & 30 deletions .../src/main/java/org/activiti/cloud/services/query/resources/ProcessDefinitionResource.java
View file

This file was deleted.

30 changes: 0 additions & 30 deletions ...st/src/main/java/org/activiti/cloud/services/query/resources/ProcessInstanceResource.java
View file

This file was deleted.

32 changes: 0 additions & 32 deletions ...es-query-rest/src/main/java/org/activiti/cloud/services/query/resources/TaskResource.java
View file

This file was deleted.

30 changes: 0 additions & 30 deletions ...uery-rest/src/main/java/org/activiti/cloud/services/query/resources/VariableResource.java
View file

This file was deleted.

7 changes: 4 additions & 3 deletions ...rc/main/java/org/activiti/cloud/services/query/rest/ProcessDefinitionAdminController.java
View file
Expand Up @@ -18,15 +18,16 @@

import com.querydsl.core.types.Predicate;
import org.activiti.cloud.alfresco.data.domain.AlfrescoPagedResourcesAssembler;
import org.activiti.cloud.api.process.model.CloudProcessDefinition;
import org.activiti.cloud.services.query.app.repository.ProcessDefinitionRepository;
import org.activiti.cloud.services.query.model.ProcessDefinitionEntity;
import org.activiti.cloud.services.query.resources.ProcessDefinitionResource;
import org.activiti.cloud.services.query.rest.assembler.ProcessDefinitionResourceAssembler;
import org.springframework.data.domain.Pageable;
import org.springframework.data.querydsl.binding.QuerydslPredicate;
import org.springframework.hateoas.ExposesResourceFor;
import org.springframework.hateoas.MediaTypes;
import org.springframework.hateoas.PagedResources;
import org.springframework.hateoas.Resource;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
Expand Down Expand Up @@ -57,8 +58,8 @@ public ProcessDefinitionAdminController(ProcessDefinitionRepository repository,
}

@GetMapping
public PagedResources<ProcessDefinitionResource> findAll(@QuerydslPredicate(root = ProcessDefinitionEntity.class) Predicate predicate,
Pageable pageable) {
public PagedResources<Resource<CloudProcessDefinition>> findAll(@QuerydslPredicate(root = ProcessDefinitionEntity.class) Predicate predicate,
Pageable pageable) {
return pagedResourcesAssembler.toResource(pageable,
repository.findAll(predicate,
pageable),
Expand Down
7 changes: 4 additions & 3 deletions ...est/src/main/java/org/activiti/cloud/services/query/rest/ProcessDefinitionController.java
View file
Expand Up @@ -18,9 +18,9 @@

import com.querydsl.core.types.Predicate;
import org.activiti.cloud.alfresco.data.domain.AlfrescoPagedResourcesAssembler;
import org.activiti.cloud.api.process.model.CloudProcessDefinition;
import org.activiti.cloud.services.query.app.repository.ProcessDefinitionRepository;
import org.activiti.cloud.services.query.model.ProcessDefinitionEntity;
import org.activiti.cloud.services.query.resources.ProcessDefinitionResource;
import org.activiti.cloud.services.query.rest.assembler.ProcessDefinitionResourceAssembler;
import org.activiti.cloud.services.security.ProcessDefinitionRestrictionService;
import org.activiti.core.common.spring.security.policies.SecurityPolicyAccess;
Expand All @@ -29,6 +29,7 @@
import org.springframework.hateoas.ExposesResourceFor;
import org.springframework.hateoas.MediaTypes;
import org.springframework.hateoas.PagedResources;
import org.springframework.hateoas.Resource;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
Expand Down Expand Up @@ -63,8 +64,8 @@ public ProcessDefinitionController(ProcessDefinitionRepository repository,
}

@GetMapping
public PagedResources<ProcessDefinitionResource> findAll(@QuerydslPredicate(root = ProcessDefinitionEntity.class) Predicate predicate,
Pageable pageable) {
public PagedResources<Resource<CloudProcessDefinition>> findAll(@QuerydslPredicate(root = ProcessDefinitionEntity.class) Predicate predicate,
Pageable pageable) {
Predicate extendedPredicate = processDefinitionRestrictionService.restrictProcessDefinitionQuery(predicate,
SecurityPolicyAccess.READ);
return pagedResourcesAssembler.toResource(pageable,
Expand Down
9 changes: 5 additions & 4 deletions .../src/main/java/org/activiti/cloud/services/query/rest/ProcessInstanceAdminController.java
View file
Expand Up @@ -18,17 +18,18 @@

import com.querydsl.core.types.Predicate;
import org.activiti.cloud.alfresco.data.domain.AlfrescoPagedResourcesAssembler;
import org.activiti.cloud.api.process.model.CloudProcessInstance;
import org.activiti.cloud.services.query.app.repository.EntityFinder;
import org.activiti.cloud.services.query.app.repository.ProcessInstanceRepository;
import org.activiti.cloud.services.query.model.ProcessInstanceEntity;
import org.activiti.cloud.services.query.resources.ProcessInstanceResource;
import org.activiti.cloud.services.query.rest.assembler.ProcessInstanceResourceAssembler;
import org.activiti.cloud.services.security.ActivitiForbiddenException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Pageable;
import org.springframework.data.querydsl.binding.QuerydslPredicate;
import org.springframework.hateoas.MediaTypes;
import org.springframework.hateoas.PagedResources;
import org.springframework.hateoas.Resource;
import org.springframework.http.HttpStatus;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.ExceptionHandler;
Expand Down Expand Up @@ -79,8 +80,8 @@ public ProcessInstanceAdminController(ProcessInstanceRepository processInstanceR
}

@RequestMapping(method = RequestMethod.GET)
public PagedResources<ProcessInstanceResource> findAll(@QuerydslPredicate(root = ProcessInstanceEntity.class) Predicate predicate,
Pageable pageable) {
public PagedResources<Resource<CloudProcessInstance>> findAll(@QuerydslPredicate(root = ProcessInstanceEntity.class) Predicate predicate,
Pageable pageable) {


return pagedResourcesAssembler.toResource(pageable,
Expand All @@ -91,7 +92,7 @@ public PagedResources<ProcessInstanceResource> findAll(@QuerydslPredicate(root =


@RequestMapping(value = "/{processInstanceId}", method = RequestMethod.GET)
public ProcessInstanceResource findById(@PathVariable String processInstanceId) {
public Resource<CloudProcessInstance> findById(@PathVariable String processInstanceId) {

ProcessInstanceEntity processInstanceEntity = entityFinder.findById(processInstanceRepository,
processInstanceId,
Expand Down
11 changes: 6 additions & 5 deletions ...-rest/src/main/java/org/activiti/cloud/services/query/rest/ProcessInstanceController.java
View file
Expand Up @@ -20,11 +20,11 @@
import com.querydsl.core.types.dsl.BooleanExpression;
import org.activiti.api.runtime.shared.security.SecurityManager;
import org.activiti.cloud.alfresco.data.domain.AlfrescoPagedResourcesAssembler;
import org.activiti.cloud.api.process.model.CloudProcessInstance;
import org.activiti.cloud.services.query.app.repository.EntityFinder;
import org.activiti.cloud.services.query.app.repository.ProcessInstanceRepository;
import org.activiti.cloud.services.query.model.ProcessInstanceEntity;
import org.activiti.cloud.services.query.model.QProcessInstanceEntity;
import org.activiti.cloud.services.query.resources.ProcessInstanceResource;
import org.activiti.cloud.services.query.rest.assembler.ProcessInstanceResourceAssembler;
import org.activiti.cloud.services.security.ActivitiForbiddenException;
import org.activiti.cloud.services.security.ProcessInstanceRestrictionService;
Expand All @@ -37,6 +37,7 @@
import org.springframework.data.querydsl.binding.QuerydslPredicate;
import org.springframework.hateoas.MediaTypes;
import org.springframework.hateoas.PagedResources;
import org.springframework.hateoas.Resource;
import org.springframework.http.HttpStatus;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.ExceptionHandler;
Expand Down Expand Up @@ -101,8 +102,8 @@ public ProcessInstanceController(ProcessInstanceRepository processInstanceReposi
}

@RequestMapping(method = RequestMethod.GET)
public PagedResources<ProcessInstanceResource> findAll(@QuerydslPredicate(root = ProcessInstanceEntity.class) Predicate predicate,
Pageable pageable) {
public PagedResources<Resource<CloudProcessInstance>> findAll(@QuerydslPredicate(root = ProcessInstanceEntity.class) Predicate predicate,
Pageable pageable) {

predicate = processInstanceRestrictionService.restrictProcessInstanceQuery(predicate,
SecurityPolicyAccess.READ);
Expand All @@ -114,7 +115,7 @@ public PagedResources<ProcessInstanceResource> findAll(@QuerydslPredicate(root =
}

@RequestMapping(value = "/{processInstanceId}", method = RequestMethod.GET)
public ProcessInstanceResource findById(@PathVariable String processInstanceId) {
public Resource<CloudProcessInstance> findById(@PathVariable String processInstanceId) {

ProcessInstanceEntity processInstanceEntity = entityFinder.findById(processInstanceRepository,
processInstanceId,
Expand All @@ -131,7 +132,7 @@ public ProcessInstanceResource findById(@PathVariable String processInstanceId)


@RequestMapping(value = "/{processInstanceId}/subprocesses", method = RequestMethod.GET)
public PagedResources<ProcessInstanceResource> subprocesses(@PathVariable String processInstanceId,
public PagedResources<Resource<CloudProcessInstance>> subprocesses(@PathVariable String processInstanceId,
@QuerydslPredicate(root = ProcessInstanceEntity.class) Predicate predicate,
Pageable pageable) {

Expand Down
7 changes: 4 additions & 3 deletions .../src/main/java/org/activiti/cloud/services/query/rest/ProcessInstanceTasksController.java
View file
Expand Up @@ -17,16 +17,17 @@
package org.activiti.cloud.services.query.rest;

import org.activiti.cloud.alfresco.data.domain.AlfrescoPagedResourcesAssembler;
import org.activiti.cloud.api.task.model.CloudTask;
import org.activiti.cloud.services.query.app.repository.TaskRepository;
import org.activiti.cloud.services.query.model.QTaskEntity;
import org.activiti.cloud.services.query.model.TaskEntity;
import org.activiti.cloud.services.query.resources.TaskResource;
import org.activiti.cloud.services.query.rest.assembler.TaskResourceAssembler;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.hateoas.MediaTypes;
import org.springframework.hateoas.PagedResources;
import org.springframework.hateoas.Resource;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
Expand Down Expand Up @@ -58,8 +59,8 @@ public ProcessInstanceTasksController(TaskRepository taskRepository,
}

@RequestMapping(value = "/tasks", method = RequestMethod.GET)
public PagedResources<TaskResource> getTasks(@PathVariable String processInstanceId,
Pageable pageable) {
public PagedResources<Resource<CloudTask>> getTasks(@PathVariable String processInstanceId,
Pageable pageable) {
Page<TaskEntity> page = taskRepository.findAll(QTaskEntity.taskEntity.processInstanceId.eq(processInstanceId),
pageable);
return pagedResourcesAssembler.toResource(pageable,
Expand Down
9 changes: 5 additions & 4 deletions ...n/java/org/activiti/cloud/services/query/rest/ProcessInstanceVariableAdminController.java
View file
Expand Up @@ -19,16 +19,17 @@
import com.querydsl.core.types.Predicate;
import com.querydsl.core.types.dsl.BooleanExpression;
import org.activiti.cloud.alfresco.data.domain.AlfrescoPagedResourcesAssembler;
import org.activiti.cloud.api.model.shared.CloudVariableInstance;
import org.activiti.cloud.services.query.app.repository.VariableRepository;
import org.activiti.cloud.services.query.model.ProcessVariableEntity;
import org.activiti.cloud.services.query.model.QProcessVariableEntity;
import org.activiti.cloud.services.query.resources.VariableResource;
import org.activiti.cloud.services.query.rest.assembler.ProcessInstanceVariableResourceAssembler;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Pageable;
import org.springframework.data.querydsl.binding.QuerydslPredicate;
import org.springframework.hateoas.MediaTypes;
import org.springframework.hateoas.PagedResources;
import org.springframework.hateoas.Resource;
import org.springframework.http.HttpStatus;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.ExceptionHandler;
Expand Down Expand Up @@ -69,9 +70,9 @@ public String handleAppException(IllegalStateException ex) {
}

@RequestMapping(method = RequestMethod.GET)
public PagedResources<VariableResource> getVariables(@PathVariable String processInstanceId,
@QuerydslPredicate(root = ProcessVariableEntity.class) Predicate predicate,
Pageable pageable) {
public PagedResources<Resource<CloudVariableInstance>> getVariables(@PathVariable String processInstanceId,
@QuerydslPredicate(root = ProcessVariableEntity.class) Predicate predicate,
Pageable pageable) {

QProcessVariableEntity variable = QProcessVariableEntity.processVariableEntity;
BooleanExpression expression = variable.processInstanceId.eq(processInstanceId);
Expand Down
9 changes: 5 additions & 4 deletions ...c/main/java/org/activiti/cloud/services/query/rest/ProcessInstanceVariableController.java
View file
Expand Up @@ -19,17 +19,18 @@
import com.querydsl.core.types.Predicate;
import com.querydsl.core.types.dsl.BooleanExpression;
import org.activiti.cloud.alfresco.data.domain.AlfrescoPagedResourcesAssembler;
import org.activiti.cloud.api.model.shared.CloudVariableInstance;
import org.activiti.cloud.services.query.app.repository.VariableRepository;
import org.activiti.cloud.services.query.model.ProcessVariableEntity;
import org.activiti.cloud.services.query.model.QProcessVariableEntity;
import org.activiti.cloud.services.query.resources.VariableResource;
import org.activiti.cloud.services.query.rest.assembler.ProcessInstanceVariableResourceAssembler;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.data.querydsl.binding.QuerydslPredicate;
import org.springframework.hateoas.MediaTypes;
import org.springframework.hateoas.PagedResources;
import org.springframework.hateoas.Resource;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
Expand Down Expand Up @@ -61,9 +62,9 @@ public ProcessInstanceVariableController(ProcessInstanceVariableResourceAssemble
}

@RequestMapping(value = "/variables", method = RequestMethod.GET)
public PagedResources<VariableResource> getVariables(@PathVariable String processInstanceId,
@QuerydslPredicate(root = ProcessVariableEntity.class) Predicate predicate,
Pageable pageable) {
public PagedResources<Resource<CloudVariableInstance>> getVariables(@PathVariable String processInstanceId,
@QuerydslPredicate(root = ProcessVariableEntity.class) Predicate predicate,
Pageable pageable) {

QProcessVariableEntity variable = QProcessVariableEntity.processVariableEntity;
BooleanExpression expression = variable.processInstanceId.eq(processInstanceId);
Expand Down

0 comments on commit 2ced287

Please sign in to comment.