Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
开发团队
Flowable Engine
提交
47bac4ff
F
Flowable Engine
项目概览
开发团队
/
Flowable Engine
通知
9
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
F
Flowable Engine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
47bac4ff
编写于
4月 07, 2014
作者:
T
Tijs Rademakers
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Increased DB id size + added REST API create process instance response test
上级
36f44575
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
19 addition
and
4 deletion
+19
-4
modules/activiti-engine/src/main/java/org/activiti/engine/ProcessEngineConfiguration.java
.../java/org/activiti/engine/ProcessEngineConfiguration.java
+1
-1
modules/activiti-rest/src/main/java/org/activiti/rest/service/api/RestResponseFactory.java
...va/org/activiti/rest/service/api/RestResponseFactory.java
+3
-2
modules/activiti-rest/src/main/java/org/activiti/rest/service/api/runtime/process/ProcessInstanceResource.java
.../service/api/runtime/process/ProcessInstanceResource.java
+1
-1
modules/activiti-rest/src/main/java/org/activiti/rest/service/api/runtime/process/ProcessInstanceResponse.java
.../service/api/runtime/process/ProcessInstanceResponse.java
+9
-0
modules/activiti-rest/src/test/java/org/activiti/rest/service/api/runtime/ProcessInstanceCollectionResourceTest.java
...ce/api/runtime/ProcessInstanceCollectionResourceTest.java
+5
-0
未找到文件。
modules/activiti-engine/src/main/java/org/activiti/engine/ProcessEngineConfiguration.java
浏览文件 @
47bac4ff
...
...
@@ -96,7 +96,7 @@ public abstract class ProcessEngineConfiguration implements EngineServices {
public
static
final
String
NO_TENANT_ID
=
""
;
protected
String
processEngineName
=
ProcessEngines
.
NAME_DEFAULT
;
protected
int
idBlockSize
=
1
00
;
protected
int
idBlockSize
=
25
00
;
protected
String
history
=
HistoryLevel
.
AUDIT
.
getKey
();
protected
boolean
jobExecutorActivate
;
...
...
modules/activiti-rest/src/main/java/org/activiti/rest/service/api/RestResponseFactory.java
浏览文件 @
47bac4ff
...
...
@@ -59,10 +59,10 @@ import org.activiti.rest.service.api.engine.variable.IntegerRestVariableConverte
import
org.activiti.rest.service.api.engine.variable.LongRestVariableConverter
;
import
org.activiti.rest.service.api.engine.variable.QueryVariable
;
import
org.activiti.rest.service.api.engine.variable.RestVariable
;
import
org.activiti.rest.service.api.engine.variable.RestVariable.RestVariableScope
;
import
org.activiti.rest.service.api.engine.variable.RestVariableConverter
;
import
org.activiti.rest.service.api.engine.variable.ShortRestVariableConverter
;
import
org.activiti.rest.service.api.engine.variable.StringRestVariableConverter
;
import
org.activiti.rest.service.api.engine.variable.RestVariable.RestVariableScope
;
import
org.activiti.rest.service.api.form.FormDataResponse
;
import
org.activiti.rest.service.api.form.RestEnumFormProperty
;
import
org.activiti.rest.service.api.form.RestFormProperty
;
...
...
@@ -79,10 +79,10 @@ import org.activiti.rest.service.api.identity.UserResponse;
import
org.activiti.rest.service.api.management.JobResponse
;
import
org.activiti.rest.service.api.management.TableResponse
;
import
org.activiti.rest.service.api.repository.DeploymentResourceResponse
;
import
org.activiti.rest.service.api.repository.DeploymentResourceResponse.DeploymentResourceType
;
import
org.activiti.rest.service.api.repository.DeploymentResponse
;
import
org.activiti.rest.service.api.repository.ModelResponse
;
import
org.activiti.rest.service.api.repository.ProcessDefinitionResponse
;
import
org.activiti.rest.service.api.repository.DeploymentResourceResponse.DeploymentResourceType
;
import
org.activiti.rest.service.api.runtime.process.ExecutionResponse
;
import
org.activiti.rest.service.api.runtime.process.ProcessInstanceResponse
;
import
org.activiti.rest.service.api.runtime.task.TaskResponse
;
...
...
@@ -430,6 +430,7 @@ public class RestResponseFactory {
result
.
setId
(
processInstance
.
getId
());
result
.
setProcessDefinitionId
(
processInstance
.
getProcessDefinitionId
());
result
.
setProcessDefinitionUrl
(
securedResource
.
createFullResourceUrl
(
RestUrls
.
URL_PROCESS_DEFINITION
,
processInstance
.
getProcessDefinitionId
()));
result
.
setEnded
(
processInstance
.
isEnded
());
result
.
setSuspended
(
processInstance
.
isSuspended
());
result
.
setUrl
(
securedResource
.
createFullResourceUrl
(
RestUrls
.
URL_PROCESS_INSTANCE
,
processInstance
.
getId
()));
result
.
setTenantId
(
processInstance
.
getTenantId
());
...
...
modules/activiti-rest/src/main/java/org/activiti/rest/service/api/runtime/process/ProcessInstanceResource.java
浏览文件 @
47bac4ff
...
...
@@ -87,7 +87,7 @@ public class ProcessInstanceResource extends SecuredResource {
}
ActivitiUtil
.
getRuntimeService
().
suspendProcessInstanceById
(
processInstance
.
getId
());
ProcessInstanceResponse
response
=
getApplication
(
ActivitiRestServicesApplication
.
class
).
getRestResponseFactory
()
ProcessInstanceResponse
response
=
getApplication
(
ActivitiRestServicesApplication
.
class
).
getRestResponseFactory
()
.
createProcessInstanceResponse
(
this
,
processInstance
);
// No need to re-fetch the instance, just alter the suspended state of the result-object
...
...
modules/activiti-rest/src/main/java/org/activiti/rest/service/api/runtime/process/ProcessInstanceResponse.java
浏览文件 @
47bac4ff
...
...
@@ -26,6 +26,7 @@ public class ProcessInstanceResponse {
protected
String
url
;
protected
String
businessKey
;
protected
boolean
suspended
;
protected
boolean
ended
;
protected
String
processDefinitionId
;
protected
String
processDefinitionUrl
;
protected
String
activityId
;
...
...
@@ -64,6 +65,14 @@ public class ProcessInstanceResponse {
this
.
suspended
=
suspended
;
}
public
boolean
isEnded
()
{
return
ended
;
}
public
void
setEnded
(
boolean
ended
)
{
this
.
ended
=
ended
;
}
public
String
getProcessDefinitionId
()
{
return
processDefinitionId
;
}
...
...
modules/activiti-rest/src/test/java/org/activiti/rest/service/api/runtime/ProcessInstanceCollectionResourceTest.java
浏览文件 @
47bac4ff
...
...
@@ -298,6 +298,11 @@ public class ProcessInstanceCollectionResourceTest extends BaseRestTestCase {
client
.
post
(
requestNode
);
assertEquals
(
Status
.
SUCCESS_CREATED
,
client
.
getResponse
().
getStatus
());
JsonNode
responseNode
=
objectMapper
.
readTree
(
client
.
getResponseEntity
().
getStream
());
assertEquals
(
"processTask"
,
responseNode
.
get
(
"activityId"
).
asText
());
assertEquals
(
false
,
responseNode
.
get
(
"ended"
).
asBoolean
());
ProcessInstance
processInstance
=
runtimeService
.
createProcessInstanceQuery
().
singleResult
();
assertNotNull
(
processInstance
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录