SpringCloud/spring-cloud-task
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SCT-72 Remove externalExecutionID & StatusCode

Browse Source 
Will add these back when and if they are needed.

resolves spring-cloud/spring-cloud-task#72
This commit is contained in:
Glenn Renfro
2016-01-25 14:24:21 -05:00
committed by Thomas Risberg
parent 20b5e046ae
commit 2efa75ff16
16 changed files with 55 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-cloud-task-core/src/main/java/org/springframework/cloud/task/listener/TaskLifecycleListener.java
View File

@@ -160,8 +160,8 @@ public class TaskLifecycleListener implements ApplicationListener<ApplicationEve
}
this.taskExecution = new TaskExecution(this.taskRepository.getNextExecutionId(),
0, this.taskNameResolver.getTaskName(), new Date(), null, null, null,
args, null);
0, this.taskNameResolver.getTaskName(), new Date(), null, null,
args);
this.taskRepository.createTaskExecution(this.taskExecution);
}

35
spring-cloud-task-core/src/main/java/org/springframework/cloud/task/repository/TaskExecution.java
View File

@@ -34,11 +34,6 @@ public class TaskExecution {
*/
private long executionId;
/**
* Id provided by an external system for the given task execution.
*/
private String externalExecutionID;
/**
* The recorded exit code for the task.
*/
@@ -59,11 +54,6 @@ public class TaskExecution {
*/
private Date endTime;
/**
* TBD.
*/
private String statusCode;
/**
* Message returned from the task or stacktrace.parameters.
*/
@@ -79,17 +69,14 @@ public class TaskExecution {
}
public TaskExecution(long executionId, int exitCode, String taskName,
Date startTime, Date endTime, String statusCode,
String exitMessage, List<String> parameters,
String externalExecutionID) {
Date startTime, Date endTime,
String exitMessage, List<String> parameters) {
Assert.notNull(parameters, "parameters must not be null");
Assert.notNull(startTime, "startTime must not be null");
this.executionId = executionId;
this.externalExecutionID = externalExecutionID;
this.exitCode = exitCode;
this.taskName = taskName;
this.statusCode = statusCode;
this.exitMessage = exitMessage;
this.parameters = parameters;
setStartTime(startTime);
@@ -132,14 +119,6 @@ public class TaskExecution {
this.endTime = (endTime != null) ? (Date)endTime.clone() : null;
}
public String getStatusCode() {
return statusCode;
}
public void setStatusCode(String statusCode) {
this.statusCode = statusCode;
}
public String getExitMessage() {
return exitMessage;
}
@@ -156,24 +135,14 @@ public class TaskExecution {
this.parameters = parameters;
}
public String getExternalExecutionID() {
return externalExecutionID;
}
public void setExternalExecutionID(String externalExecutionID) {
this.externalExecutionID = externalExecutionID;
}
@Override
public String toString() {
return "TaskExecution{" +
"executionId=" + executionId +
", externalExecutionID='" + externalExecutionID + '\'' +
", exitCode=" + exitCode +
", taskName='" + taskName + '\'' +
", startTime=" + startTime +
", endTime=" + endTime +
", statusCode='" + statusCode + '\'' +
", exitMessage='" + exitMessage + '\'' +
", parameters=" + parameters +
'}';

35
spring-cloud-task-core/src/main/java/org/springframework/cloud/task/repository/dao/JdbcTaskExecutionDao.java
View File

@@ -51,9 +51,9 @@ import org.springframework.util.StringUtils;
public class JdbcTaskExecutionDao implements TaskExecutionDao {
public static final String SELECT_CLAUSE = "TASK_EXECUTION_ID, TASK_EXTERNAL_EXECUTION_ID, "
public static final String SELECT_CLAUSE = "TASK_EXECUTION_ID, "
+ "START_TIME, END_TIME, TASK_NAME, EXIT_CODE, "
+ "EXIT_MESSAGE, LAST_UPDATED, STATUS_CODE ";
+ "EXIT_MESSAGE, LAST_UPDATED ";
public static final String FROM_CLAUSE = "%PREFIX%EXECUTION";
@@ -63,9 +63,9 @@ public class JdbcTaskExecutionDao implements TaskExecutionDao {
public static final String TASK_NAME_WHERE_CLAUSE = "where TASK_NAME = ? ";
private static final String SAVE_TASK_EXECUTION = "INSERT into %PREFIX%EXECUTION"
+ "(TASK_EXECUTION_ID, TASK_EXTERNAL_EXECUTION_ID, START_TIME, END_TIME, "
+ "TASK_NAME, EXIT_CODE, EXIT_MESSAGE, LAST_UPDATED, STATUS_CODE)"
+ "values (?, ?, ?, ?, ?, ?, ?, ?, ?)";
+ "(TASK_EXECUTION_ID, START_TIME, END_TIME, "
+ "TASK_NAME, EXIT_CODE, EXIT_MESSAGE, LAST_UPDATED)"
+ "values (?, ?, ?, ?, ?, ?, ?)";
private static final String CREATE_TASK_PARAMETER = "INSERT into "
+ "%PREFIX%EXECUTION_PARAMS(TASK_EXECUTION_ID, TASK_PARAM ) values (?, ?)";
@@ -75,12 +75,12 @@ public class JdbcTaskExecutionDao implements TaskExecutionDao {
private static final String UPDATE_TASK_EXECUTION = "UPDATE %PREFIX%EXECUTION set "
+ "START_TIME = ?, END_TIME = ?, TASK_NAME = ?, EXIT_CODE = ?, "
+ "EXIT_MESSAGE = ?, LAST_UPDATED = ?, STATUS_CODE = ?, "
+ "TASK_EXTERNAL_EXECUTION_ID = ? where TASK_EXECUTION_ID = ?";
+ "EXIT_MESSAGE = ?, LAST_UPDATED = ? "
+ "where TASK_EXECUTION_ID = ?";
private static final String GET_EXECUTION_BY_ID = "SELECT TASK_EXECUTION_ID, " +
"START_TIME, END_TIME, TASK_NAME, EXIT_CODE, "
+ "EXIT_MESSAGE, LAST_UPDATED, STATUS_CODE, TASK_EXTERNAL_EXECUTION_ID "
+ "EXIT_MESSAGE, LAST_UPDATED "
+ "from %PREFIX%EXECUTION where TASK_EXECUTION_ID = ?";
private static final String FIND_PARAMS_FROM_ID = "SELECT TASK_EXECUTION_ID, "
@@ -121,17 +121,14 @@ public class JdbcTaskExecutionDao implements TaskExecutionDao {
@Override
public void saveTaskExecution(TaskExecution taskExecution) {
Object[] parameters = new Object[]{ taskExecution.getExecutionId(),
taskExecution.getExternalExecutionID(),
taskExecution.getStartTime(), taskExecution.getEndTime(),
taskExecution.getTaskName(), taskExecution.getExitCode(),
taskExecution.getExitMessage(), new Date(),
taskExecution.getStatusCode() };
taskExecution.getExitMessage(), new Date()};
jdbcTemplate.update(
getQuery(SAVE_TASK_EXECUTION),
parameters,
new int[]{ Types.BIGINT, Types.VARCHAR, Types.TIMESTAMP, Types.TIMESTAMP,
Types.VARCHAR, Types.INTEGER, Types.VARCHAR, Types.TIMESTAMP,
Types.VARCHAR });
new int[]{ Types.BIGINT, Types.TIMESTAMP, Types.TIMESTAMP,
Types.VARCHAR, Types.INTEGER, Types.VARCHAR, Types.TIMESTAMP });
insertTaskParameters(taskExecution.getExecutionId(), taskExecution.getParameters());
}
@@ -146,14 +143,12 @@ public class JdbcTaskExecutionDao implements TaskExecutionDao {
Object[] parameters = new Object[]{ taskExecution.getStartTime(), taskExecution.getEndTime(),
taskExecution.getTaskName(), taskExecution.getExitCode(),
taskExecution.getExitMessage(), new Date(), taskExecution.getStatusCode(),
taskExecution.getExternalExecutionID(), taskExecution.getExecutionId()};
taskExecution.getExitMessage(), new Date(), taskExecution.getExecutionId()};
jdbcTemplate.update(
getQuery(UPDATE_TASK_EXECUTION),
parameters,
new int[]{ Types.TIMESTAMP, Types.TIMESTAMP, Types.VARCHAR, Types.INTEGER,
Types.VARCHAR, Types.TIMESTAMP, Types.VARCHAR, Types.VARCHAR,
Types.BIGINT});
Types.VARCHAR, Types.TIMESTAMP, Types.BIGINT});
}
/**
@@ -333,10 +328,8 @@ public class JdbcTaskExecutionDao implements TaskExecutionDao {
rs.getString("TASK_NAME"),
rs.getTimestamp("START_TIME"),
rs.getTimestamp("END_TIME"),
rs.getString("STATUS_CODE"),
rs.getString("EXIT_MESSAGE"),
getTaskParameters(id),
rs.getString("TASK_EXTERNAL_EXECUTION_ID"));
getTaskParameters(id));
return taskExecution;
}
}

12
spring-cloud-task-core/src/main/java/org/springframework/cloud/task/repository/support/SimpleTaskRepository.java
View File

@@ -31,8 +31,6 @@ public class SimpleTaskRepository implements TaskRepository {
public static final int MAX_EXIT_MESSAGE_SIZE = 2500;
public static final int MAX_TASK_NAME_SIZE = 100;
public static final int MAX_STATUS_CODE_SIZE = 10;
public static final int MAX_EXTERNAL_EXECUTION_ID_SIZE = 100;
private final static Logger logger = LoggerFactory.getLogger(SimpleTaskRepository.class);
@@ -83,16 +81,6 @@ public class SimpleTaskRepository implements TaskRepository {
throw new IllegalArgumentException("TaskName length exceeds "
+ MAX_TASK_NAME_SIZE + " characters");
}
if (taskExecution.getStatusCode() != null &&
taskExecution.getStatusCode().length() > MAX_STATUS_CODE_SIZE) {
throw new IllegalArgumentException("StatusCode length exceeds "
+ MAX_STATUS_CODE_SIZE + " characters");
}
if (taskExecution.getExternalExecutionID() != null &&
taskExecution.getExternalExecutionID().length() > MAX_EXTERNAL_EXECUTION_ID_SIZE) {
throw new IllegalArgumentException("externalExecutionID length exceeds "
+ MAX_EXTERNAL_EXECUTION_ID_SIZE + " characters");
}
//Trim the exit message
if(taskExecution.getExitMessage() != null &&
taskExecution.getExitMessage().length() > MAX_EXIT_MESSAGE_SIZE){

4
spring-cloud-task-core/src/main/resources/org/springframework/cloud/task/schema-h2.sql
View File

@@ -1,14 +1,12 @@
CREATE TABLE TASK_EXECUTION (
TASK_EXECUTION_ID BIGINT NOT NULL PRIMARY KEY ,
TASK_EXTERNAL_EXECUTION_ID VARCHAR(100) ,
START_TIME TIMESTAMP DEFAULT NULL ,
END_TIME TIMESTAMP DEFAULT NULL ,
TASK_NAME VARCHAR(100) ,
EXIT_CODE INTEGER ,
EXIT_MESSAGE VARCHAR(2500) ,
LAST_UPDATED TIMESTAMP ,
STATUS_CODE VARCHAR(10)
LAST_UPDATED TIMESTAMP
);
CREATE TABLE TASK_EXECUTION_PARAMS (

4
spring-cloud-task-core/src/main/resources/org/springframework/cloud/task/schema-hsqldb.sql
View File

@@ -1,14 +1,12 @@
CREATE TABLE TASK_EXECUTION (
TASK_EXECUTION_ID BIGINT NOT NULL PRIMARY KEY ,
TASK_EXTERNAL_EXECUTION_ID VARCHAR(100) ,
START_TIME TIMESTAMP DEFAULT NULL ,
END_TIME TIMESTAMP DEFAULT NULL ,
TASK_NAME VARCHAR(100) ,
EXIT_CODE INTEGER ,
EXIT_MESSAGE VARCHAR(2500) ,
LAST_UPDATED TIMESTAMP ,
STATUS_CODE VARCHAR(10)
LAST_UPDATED TIMESTAMP
);
CREATE TABLE TASK_EXECUTION_PARAMS (

4
spring-cloud-task-core/src/main/resources/org/springframework/cloud/task/schema-mysql.sql
View File

@@ -1,14 +1,12 @@
CREATE TABLE TASK_EXECUTION (
TASK_EXECUTION_ID BIGINT NOT NULL PRIMARY KEY ,
TASK_EXTERNAL_EXECUTION_ID VARCHAR(100),
START_TIME DATETIME DEFAULT NULL ,
END_TIME DATETIME DEFAULT NULL ,
TASK_NAME VARCHAR(100) ,
EXIT_CODE INTEGER ,
EXIT_MESSAGE VARCHAR(2500) ,
LAST_UPDATED TIMESTAMP ,
STATUS_CODE VARCHAR(10)
LAST_UPDATED TIMESTAMP
) ENGINE=InnoDB;
CREATE TABLE TASK_EXECUTION_PARAMS (

4
spring-cloud-task-core/src/main/resources/org/springframework/cloud/task/schema-oracle10g.sql
View File

@@ -1,14 +1,12 @@
CREATE TABLE TASK_EXECUTION (
TASK_EXECUTION_ID NUMBER NOT NULL PRIMARY KEY ,
TASK_EXTERNAL_EXECUTION_ID VARCHAR2(100),
START_TIME TIMESTAMP DEFAULT NULL ,
END_TIME TIMESTAMP DEFAULT NULL ,
TASK_NAME VARCHAR2(100) ,
EXIT_CODE INTEGER ,
EXIT_MESSAGE VARCHAR2(2500) ,
LAST_UPDATED TIMESTAMP ,
STATUS_CODE VARCHAR2(10)
LAST_UPDATED TIMESTAMP
);
CREATE TABLE TASK_EXECUTION_PARAMS (

4
spring-cloud-task-core/src/main/resources/org/springframework/cloud/task/schema-postgresql.sql
View File

@@ -1,14 +1,12 @@
CREATE TABLE TASK_EXECUTION (
TASK_EXECUTION_ID BIGINT NOT NULL PRIMARY KEY ,
TASK_EXTERNAL_EXECUTION_ID VARCHAR(100) ,
START_TIME TIMESTAMP DEFAULT NULL ,
END_TIME TIMESTAMP DEFAULT NULL ,
TASK_NAME VARCHAR(100) ,
EXIT_CODE INTEGER ,
EXIT_MESSAGE VARCHAR(2500) ,
LAST_UPDATED TIMESTAMP ,
STATUS_CODE VARCHAR(10)
LAST_UPDATED TIMESTAMP
);
CREATE TABLE TASK_EXECUTION_PARAMS (