From 2efa75ff16ee17141febd7b4304faa1700f0cbb9 Mon Sep 17 00:00:00 2001 From: Glenn Renfro Date: Mon, 25 Jan 2016 14:24:21 -0500 Subject: [PATCH] SCT-72 Remove externalExecutionID & StatusCode Will add these back when and if they are needed. resolves spring-cloud/spring-cloud-task#72 --- .../task/listener/TaskLifecycleListener.java | 4 +-- .../cloud/task/repository/TaskExecution.java | 35 ++----------------- .../repository/dao/JdbcTaskExecutionDao.java | 35 ++++++++----------- .../support/SimpleTaskRepository.java | 12 ------- .../springframework/cloud/task/schema-h2.sql | 4 +-- .../cloud/task/schema-hsqldb.sql | 4 +-- .../cloud/task/schema-mysql.sql | 4 +-- .../cloud/task/schema-oracle10g.sql | 4 +-- .../cloud/task/schema-postgresql.sql | 4 +-- .../listener/TaskLifecycleListenerTests.java | 2 -- .../FindAllPagingQueryProviderTests.java | 26 +++++++------- .../WhereClausePagingQueryProviderTests.java | 26 +++++++------- .../support/SimpleTaskExplorerTests.java | 2 +- .../SimpleTaskRepositoryJdbcTests.java | 15 -------- .../cloud/task/util/TestDBUtils.java | 4 +-- .../cloud/task/util/TestVerifierUtils.java | 26 +++----------- 16 files changed, 55 insertions(+), 152 deletions(-) diff --git a/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/listener/TaskLifecycleListener.java b/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/listener/TaskLifecycleListener.java index ae2be9ef..ea8730f1 100644 --- a/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/listener/TaskLifecycleListener.java +++ b/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/listener/TaskLifecycleListener.java @@ -160,8 +160,8 @@ public class TaskLifecycleListener implements ApplicationListener parameters, - String externalExecutionID) { + Date startTime, Date endTime, + String exitMessage, List 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 + '}'; diff --git a/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/repository/dao/JdbcTaskExecutionDao.java b/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/repository/dao/JdbcTaskExecutionDao.java index a4ed693e..90b85fa9 100644 --- a/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/repository/dao/JdbcTaskExecutionDao.java +++ b/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/repository/dao/JdbcTaskExecutionDao.java @@ -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; } } diff --git a/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/repository/support/SimpleTaskRepository.java b/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/repository/support/SimpleTaskRepository.java index c263ad60..9fe74b21 100644 --- a/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/repository/support/SimpleTaskRepository.java +++ b/spring-cloud-task-core/src/main/java/org/springframework/cloud/task/repository/support/SimpleTaskRepository.java @@ -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){ diff --git a/spring-cloud-task-core/src/main/resources/org/springframework/cloud/task/schema-h2.sql b/spring-cloud-task-core/src/main/resources/org/springframework/cloud/task/schema-h2.sql index 096c241a..eb94a6cc 100644 --- a/spring-cloud-task-core/src/main/resources/org/springframework/cloud/task/schema-h2.sql +++ b/spring-cloud-task-core/src/main/resources/org/springframework/cloud/task/schema-h2.sql @@ -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 ( diff --git a/spring-cloud-task-core/src/main/resources/org/springframework/cloud/task/schema-hsqldb.sql b/spring-cloud-task-core/src/main/resources/org/springframework/cloud/task/schema-hsqldb.sql index b89557ed..37c7abe2 100644 --- a/spring-cloud-task-core/src/main/resources/org/springframework/cloud/task/schema-hsqldb.sql +++ b/spring-cloud-task-core/src/main/resources/org/springframework/cloud/task/schema-hsqldb.sql @@ -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 ( diff --git a/spring-cloud-task-core/src/main/resources/org/springframework/cloud/task/schema-mysql.sql b/spring-cloud-task-core/src/main/resources/org/springframework/cloud/task/schema-mysql.sql index f9f28cb4..abcb033f 100644 --- a/spring-cloud-task-core/src/main/resources/org/springframework/cloud/task/schema-mysql.sql +++ b/spring-cloud-task-core/src/main/resources/org/springframework/cloud/task/schema-mysql.sql @@ -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 ( diff --git a/spring-cloud-task-core/src/main/resources/org/springframework/cloud/task/schema-oracle10g.sql b/spring-cloud-task-core/src/main/resources/org/springframework/cloud/task/schema-oracle10g.sql index 5fe68416..690f8ae7 100644 --- a/spring-cloud-task-core/src/main/resources/org/springframework/cloud/task/schema-oracle10g.sql +++ b/spring-cloud-task-core/src/main/resources/org/springframework/cloud/task/schema-oracle10g.sql @@ -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 ( diff --git a/spring-cloud-task-core/src/main/resources/org/springframework/cloud/task/schema-postgresql.sql b/spring-cloud-task-core/src/main/resources/org/springframework/cloud/task/schema-postgresql.sql index 8f883026..9c01284b 100644 --- a/spring-cloud-task-core/src/main/resources/org/springframework/cloud/task/schema-postgresql.sql +++ b/spring-cloud-task-core/src/main/resources/org/springframework/cloud/task/schema-postgresql.sql @@ -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 ( diff --git a/spring-cloud-task-core/src/test/java/org/springframework/cloud/task/listener/TaskLifecycleListenerTests.java b/spring-cloud-task-core/src/test/java/org/springframework/cloud/task/listener/TaskLifecycleListenerTests.java index ecc5b065..1f5bd266 100644 --- a/spring-cloud-task-core/src/test/java/org/springframework/cloud/task/listener/TaskLifecycleListenerTests.java +++ b/spring-cloud-task-core/src/test/java/org/springframework/cloud/task/listener/TaskLifecycleListenerTests.java @@ -142,8 +142,6 @@ public class TaskLifecycleListenerTests { assertNull(taskExecution.getEndTime()); } - assertNull(taskExecution.getExternalExecutionID()); - assertNull(taskExecution.getStatusCode()); assertEquals("testTask", taskExecution.getTaskName()); } diff --git a/spring-cloud-task-core/src/test/java/org/springframework/cloud/task/repository/database/support/FindAllPagingQueryProviderTests.java b/spring-cloud-task-core/src/test/java/org/springframework/cloud/task/repository/database/support/FindAllPagingQueryProviderTests.java index 8ad3cf41..eb570b6e 100644 --- a/spring-cloud-task-core/src/test/java/org/springframework/cloud/task/repository/database/support/FindAllPagingQueryProviderTests.java +++ b/spring-cloud-task-core/src/test/java/org/springframework/cloud/task/repository/database/support/FindAllPagingQueryProviderTests.java @@ -41,25 +41,25 @@ public class FindAllPagingQueryProviderTests { @Parameterized.Parameters public static Collection data() { return Arrays.asList(new Object[][]{ - {"Oracle", "SELECT TASK_EXECUTION_ID, TASK_EXTERNAL_EXECUTION_ID, START_TIME, END_TIME, TASK_NAME, " - + "EXIT_CODE, EXIT_MESSAGE, LAST_UPDATED, STATUS_CODE FROM " - + "(SELECT TASK_EXECUTION_ID, TASK_EXTERNAL_EXECUTION_ID, START_TIME, END_TIME, TASK_NAME, " - + "EXIT_CODE, EXIT_MESSAGE, LAST_UPDATED, STATUS_CODE, ROWNUM as " - + "TMP_ROW_NUM FROM (SELECT TASK_EXECUTION_ID, TASK_EXTERNAL_EXECUTION_ID, START_TIME, " - + "END_TIME, TASK_NAME, EXIT_CODE, EXIT_MESSAGE, LAST_UPDATED, " - + "STATUS_CODE FROM %PREFIX%EXECUTION ORDER BY START_TIME DESC, " + {"Oracle", "SELECT TASK_EXECUTION_ID, START_TIME, END_TIME, TASK_NAME, " + + "EXIT_CODE, EXIT_MESSAGE, LAST_UPDATED FROM " + + "(SELECT TASK_EXECUTION_ID, START_TIME, END_TIME, TASK_NAME, " + + "EXIT_CODE, EXIT_MESSAGE, LAST_UPDATED, ROWNUM as " + + "TMP_ROW_NUM FROM (SELECT TASK_EXECUTION_ID, START_TIME, " + + "END_TIME, TASK_NAME, EXIT_CODE, EXIT_MESSAGE, LAST_UPDATED " + + "FROM %PREFIX%EXECUTION ORDER BY START_TIME DESC, " + "TASK_EXECUTION_ID DESC)) WHERE TMP_ROW_NUM >= 1 AND " + "TMP_ROW_NUM < 11"}, - {"HSQL Database Engine","SELECT LIMIT 0 10 TASK_EXECUTION_ID, TASK_EXTERNAL_EXECUTION_ID, " + {"HSQL Database Engine","SELECT LIMIT 0 10 TASK_EXECUTION_ID, " + "START_TIME, END_TIME, TASK_NAME, EXIT_CODE, EXIT_MESSAGE, " - + "LAST_UPDATED, STATUS_CODE FROM %PREFIX%EXECUTION ORDER BY " + + "LAST_UPDATED FROM %PREFIX%EXECUTION ORDER BY " + "START_TIME DESC, TASK_EXECUTION_ID DESC"}, - {"PostgreSQL","SELECT TASK_EXECUTION_ID, TASK_EXTERNAL_EXECUTION_ID, START_TIME, END_TIME, " - + "TASK_NAME, EXIT_CODE, EXIT_MESSAGE, LAST_UPDATED, STATUS_CODE " + {"PostgreSQL","SELECT TASK_EXECUTION_ID, START_TIME, END_TIME, " + + "TASK_NAME, EXIT_CODE, EXIT_MESSAGE, LAST_UPDATED " + "FROM %PREFIX%EXECUTION ORDER BY START_TIME DESC, " + "TASK_EXECUTION_ID DESC LIMIT 10 OFFSET 0"}, - {"MySQL","SELECT TASK_EXECUTION_ID, TASK_EXTERNAL_EXECUTION_ID, START_TIME, END_TIME, TASK_NAME, " - + "EXIT_CODE, EXIT_MESSAGE, LAST_UPDATED, STATUS_CODE FROM " + {"MySQL","SELECT TASK_EXECUTION_ID, START_TIME, END_TIME, TASK_NAME, " + + "EXIT_CODE, EXIT_MESSAGE, LAST_UPDATED FROM " + "%PREFIX%EXECUTION ORDER BY START_TIME DESC, " + "TASK_EXECUTION_ID DESC LIMIT 0, 10"} }); diff --git a/spring-cloud-task-core/src/test/java/org/springframework/cloud/task/repository/database/support/WhereClausePagingQueryProviderTests.java b/spring-cloud-task-core/src/test/java/org/springframework/cloud/task/repository/database/support/WhereClausePagingQueryProviderTests.java index 797d08e2..06d421ca 100644 --- a/spring-cloud-task-core/src/test/java/org/springframework/cloud/task/repository/database/support/WhereClausePagingQueryProviderTests.java +++ b/spring-cloud-task-core/src/test/java/org/springframework/cloud/task/repository/database/support/WhereClausePagingQueryProviderTests.java @@ -42,28 +42,28 @@ public class WhereClausePagingQueryProviderTests { @Parameterized.Parameters public static Collection data() { return Arrays.asList(new Object[][]{ - {"Oracle", "SELECT TASK_EXECUTION_ID, TASK_EXTERNAL_EXECUTION_ID, START_TIME, END_TIME, TASK_NAME, " - + "EXIT_CODE, EXIT_MESSAGE, LAST_UPDATED, STATUS_CODE FROM " - + "(SELECT TASK_EXECUTION_ID, TASK_EXTERNAL_EXECUTION_ID, START_TIME, END_TIME, TASK_NAME, " - + "EXIT_CODE, EXIT_MESSAGE, LAST_UPDATED, STATUS_CODE, ROWNUM as " - + "TMP_ROW_NUM FROM (SELECT TASK_EXECUTION_ID, TASK_EXTERNAL_EXECUTION_ID, START_TIME, " - + "END_TIME, TASK_NAME, EXIT_CODE, EXIT_MESSAGE, LAST_UPDATED, " - + "STATUS_CODE FROM %PREFIX%EXECUTION " + {"Oracle", "SELECT TASK_EXECUTION_ID, START_TIME, END_TIME, TASK_NAME, " + + "EXIT_CODE, EXIT_MESSAGE, LAST_UPDATED FROM " + + "(SELECT TASK_EXECUTION_ID, START_TIME, END_TIME, TASK_NAME, " + + "EXIT_CODE, EXIT_MESSAGE, LAST_UPDATED, ROWNUM as " + + "TMP_ROW_NUM FROM (SELECT TASK_EXECUTION_ID, START_TIME, " + + "END_TIME, TASK_NAME, EXIT_CODE, EXIT_MESSAGE, LAST_UPDATED " + + "FROM %PREFIX%EXECUTION " + "WHERE TASK_EXECUTION_ID = '0000' ORDER BY START_TIME DESC, " + "TASK_EXECUTION_ID DESC)) WHERE TMP_ROW_NUM >= 1 AND " + "TMP_ROW_NUM < 11"}, {"HSQL Database Engine","SELECT LIMIT 0 10 TASK_EXECUTION_ID, " - + "TASK_EXTERNAL_EXECUTION_ID, START_TIME, END_TIME, TASK_NAME, EXIT_CODE, EXIT_MESSAGE, " - + "LAST_UPDATED, STATUS_CODE FROM %PREFIX%EXECUTION " + + "START_TIME, END_TIME, TASK_NAME, EXIT_CODE, EXIT_MESSAGE, " + + "LAST_UPDATED FROM %PREFIX%EXECUTION " + "WHERE TASK_EXECUTION_ID = '0000' ORDER BY " + "START_TIME DESC, TASK_EXECUTION_ID DESC"}, - {"PostgreSQL","SELECT TASK_EXECUTION_ID, TASK_EXTERNAL_EXECUTION_ID, START_TIME, END_TIME, " - + "TASK_NAME, EXIT_CODE, EXIT_MESSAGE, LAST_UPDATED, STATUS_CODE " + {"PostgreSQL","SELECT TASK_EXECUTION_ID, START_TIME, END_TIME, " + + "TASK_NAME, EXIT_CODE, EXIT_MESSAGE, LAST_UPDATED " + "FROM %PREFIX%EXECUTION WHERE TASK_EXECUTION_ID = '0000' " + "ORDER BY START_TIME DESC, " + "TASK_EXECUTION_ID DESC LIMIT 10 OFFSET 0"}, - {"MySQL","SELECT TASK_EXECUTION_ID, TASK_EXTERNAL_EXECUTION_ID, START_TIME, END_TIME, TASK_NAME, " - + "EXIT_CODE, EXIT_MESSAGE, LAST_UPDATED, STATUS_CODE FROM " + {"MySQL","SELECT TASK_EXECUTION_ID, START_TIME, END_TIME, TASK_NAME, " + + "EXIT_CODE, EXIT_MESSAGE, LAST_UPDATED FROM " + "%PREFIX%EXECUTION WHERE TASK_EXECUTION_ID = '0000' " + "ORDER BY START_TIME DESC, " + "TASK_EXECUTION_ID DESC LIMIT 0, 10"} diff --git a/spring-cloud-task-core/src/test/java/org/springframework/cloud/task/repository/support/SimpleTaskExplorerTests.java b/spring-cloud-task-core/src/test/java/org/springframework/cloud/task/repository/support/SimpleTaskExplorerTests.java index 29c47bb1..d7f5b642 100644 --- a/spring-cloud-task-core/src/test/java/org/springframework/cloud/task/repository/support/SimpleTaskExplorerTests.java +++ b/spring-cloud-task-core/src/test/java/org/springframework/cloud/task/repository/support/SimpleTaskExplorerTests.java @@ -175,7 +175,7 @@ public class SimpleTaskExplorerTests { } for (; i < (COMPLETE_COUNT + TEST_COUNT); i++) { - TaskExecution expectedTaskExecution = new TaskExecution(i, 0, TASK_NAME, new Date(), null, null, null, new ArrayList(0), null); + TaskExecution expectedTaskExecution = new TaskExecution(i, 0, TASK_NAME, new Date(), null, null, new ArrayList(0)); dao.saveTaskExecution(expectedTaskExecution); expectedResults.put(expectedTaskExecution.getExecutionId(), expectedTaskExecution); } diff --git a/spring-cloud-task-core/src/test/java/org/springframework/cloud/task/repository/support/SimpleTaskRepositoryJdbcTests.java b/spring-cloud-task-core/src/test/java/org/springframework/cloud/task/repository/support/SimpleTaskRepositoryJdbcTests.java index f212b163..d34bf9cc 100644 --- a/spring-cloud-task-core/src/test/java/org/springframework/cloud/task/repository/support/SimpleTaskRepositoryJdbcTests.java +++ b/spring-cloud-task-core/src/test/java/org/springframework/cloud/task/repository/support/SimpleTaskRepositoryJdbcTests.java @@ -107,20 +107,5 @@ public class SimpleTaskRepositoryJdbcTests { expectedTaskExecution.setTaskName(new String(new char[SimpleTaskRepository.MAX_TASK_NAME_SIZE+1])); taskRepository.createTaskExecution(expectedTaskExecution); } - - @Test(expected=IllegalArgumentException.class) - public void testCreateTaskExecutionNoParamMaxStatus(){ - TaskExecution expectedTaskExecution = TestVerifierUtils.createSampleTaskExecutionNoParam(); - expectedTaskExecution.setStatusCode(new String(new char[SimpleTaskRepository.MAX_STATUS_CODE_SIZE+1])); - taskRepository.createTaskExecution(expectedTaskExecution); - } - - @Test(expected=IllegalArgumentException.class) - public void testCreateTaskExecutionNoParamMaxExternalExecutionId(){ - TaskExecution expectedTaskExecution = TestVerifierUtils.createSampleTaskExecutionNoParam(); - expectedTaskExecution.setExternalExecutionID( - new String(new char[SimpleTaskRepository.MAX_EXTERNAL_EXECUTION_ID_SIZE+1])); - taskRepository.createTaskExecution(expectedTaskExecution); - } } diff --git a/spring-cloud-task-core/src/test/java/org/springframework/cloud/task/util/TestDBUtils.java b/spring-cloud-task-core/src/test/java/org/springframework/cloud/task/util/TestDBUtils.java index 0d22a006..6f130479 100644 --- a/spring-cloud-task-core/src/test/java/org/springframework/cloud/task/util/TestDBUtils.java +++ b/spring-cloud-task-core/src/test/java/org/springframework/cloud/task/util/TestDBUtils.java @@ -73,10 +73,8 @@ public class TestDBUtils { rs.getString("TASK_NAME"), rs.getTimestamp("START_TIME"), rs.getTimestamp("END_TIME"), - rs.getString("STATUS_CODE"), rs.getString("EXIT_MESSAGE"), - new ArrayList(0), - rs.getString("TASK_EXTERNAL_EXECUTION_ID")); + new ArrayList(0)); return taskExecution; } }); diff --git a/spring-cloud-task-core/src/test/java/org/springframework/cloud/task/util/TestVerifierUtils.java b/spring-cloud-task-core/src/test/java/org/springframework/cloud/task/util/TestVerifierUtils.java index bef46b63..b6a4d48c 100644 --- a/spring-cloud-task-core/src/test/java/org/springframework/cloud/task/util/TestVerifierUtils.java +++ b/spring-cloud-task-core/src/test/java/org/springframework/cloud/task/util/TestVerifierUtils.java @@ -87,14 +87,11 @@ public class TestVerifierUtils { int exitCode = randomGenerator.nextInt(); Date startTime = new Date(); Date endTime = new Date(); - String externalTaskExecutionID = UUID.randomUUID().toString(); String taskName = UUID.randomUUID().toString(); String exitMessage = UUID.randomUUID().toString(); - String statusCode = UUID.randomUUID().toString().substring(0, 9); return new TaskExecution(executionId, exitCode, taskName, - startTime, endTime, statusCode, - exitMessage, new ArrayList(), externalTaskExecutionID); + startTime, endTime, exitMessage, new ArrayList()); } /** @@ -108,14 +105,11 @@ public class TestVerifierUtils { Date startTime = new Date(); Date endTime = new Date(); long executionId = randomGenerator.nextLong(); - String externalTaskExecutionID = UUID.randomUUID().toString(); String taskName = UUID.randomUUID().toString(); String exitMessage = UUID.randomUUID().toString(); - String statusCode = UUID.randomUUID().toString().substring(0, 9); return new TaskExecution(executionId, exitCode, taskName, - startTime, endTime, statusCode, - exitMessage, new ArrayList(), externalTaskExecutionID); + startTime, endTime, exitMessage, new ArrayList()); } /** @@ -128,17 +122,14 @@ public class TestVerifierUtils { int exitCode = randomGenerator.nextInt(); Date startTime = new Date(); Date endTime = new Date(); - String externalExecutionId = UUID.randomUUID().toString(); String taskName = UUID.randomUUID().toString(); String exitMessage = UUID.randomUUID().toString(); - String statusCode = UUID.randomUUID().toString().substring(0, 9); List params = new ArrayList<>(PARAM_SIZE); for (int i = 0 ; i < PARAM_SIZE ; i++){ params.add(UUID.randomUUID().toString()); } return new TaskExecution(executionId, exitCode, taskName, - startTime, endTime, statusCode, - exitMessage, params, externalExecutionId); + startTime, endTime, exitMessage, params); } /** @@ -152,17 +143,14 @@ public class TestVerifierUtils { long executionId = randomGenerator.nextLong(); Date startTime = new Date(); Date endTime = new Date(); - String externalExecutionId = UUID.randomUUID().toString(); String taskName = UUID.randomUUID().toString(); String exitMessage = UUID.randomUUID().toString(); - String statusCode = UUID.randomUUID().toString().substring(0, 9); List params = new ArrayList<>(PARAM_SIZE); for (int i = 0 ; i < PARAM_SIZE ; i++){ params.add(UUID.randomUUID().toString()); } return new TaskExecution(executionId, exitCode, taskName, - startTime, endTime, statusCode, - exitMessage, params, externalExecutionId); + startTime, endTime, exitMessage, params); } /** @@ -175,9 +163,6 @@ public class TestVerifierUtils { TaskExecution actualTaskExecution) { assertEquals("taskExecutionId must be equal", expectedTaskExecution.getExecutionId(), actualTaskExecution.getExecutionId()); - assertEquals("taskExternalExecutionId must be equal", - expectedTaskExecution.getExternalExecutionID(), - actualTaskExecution.getExternalExecutionID()); assertEquals("startTime must be equal", expectedTaskExecution.getStartTime(), actualTaskExecution.getStartTime()); @@ -193,9 +178,6 @@ public class TestVerifierUtils { assertEquals("exitMessage must be equal", expectedTaskExecution.getExitMessage(), actualTaskExecution.getExitMessage()); - assertEquals("statusCode must be equal", - expectedTaskExecution.getStatusCode(), - actualTaskExecution.getStatusCode()); if (expectedTaskExecution.getParameters() != null) { assertNotNull("parameters should not be null", actualTaskExecution.getParameters());