Add updateContainerUnqueue method + upgrade h2 lib

downloadschemascript.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-version=1.25.2
+version=1.29.0
 fname=ispyb-database-${version}.tar.gz
 
 cd target/test-classes

pom.xml

@@ -182,7 +182,7 @@
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
-            <version>1.4.196</version>
+            <version>2.1.210</version>
             <scope>test</scope>
         </dependency>
         <dependency>

src/main/java/uk/ac/diamond/ispyb/api/IspybPlateApi.java

@@ -34,6 +34,8 @@ public interface IspybPlateApi extends Closeable {
 
 	void finishContainer(String barcode) throws SQLException;
 
+	void updateContainerUnqueue(String barcode) throws SQLException;
+
 	List<ContainerLSQueueEntry> retrieveContainerLSQueue(String beamline) throws SQLException;
 
         List<ContainerForBeamlineAndStatusEntry> retrieveContainersOnBeamlineWithStatus(String beamline, ContainerStatus status) throws SQLException;

src/main/java/uk/ac/diamond/ispyb/dao/IspybPlateDAO.java

@@ -60,6 +60,11 @@ public void finishContainer(String barcode) throws SQLException {
 		templateWrapper.updateIspyb("finish_container", map(BARCODE, barcode));
 	}
 
+	@Override
+	public void updateContainerUnqueue(String barcode) throws SQLException {
+		templateWrapper.updateIspyb("update_container_unqueue", map(BARCODE, barcode));
+	}
+
 	@Override
 	public List<ContainerLSQueueEntry> retrieveContainerLSQueue(String beamline) throws SQLException {
 		return templateWrapper.callIspybForListBeans("retrieve_container_ls_queue", ContainerLSQueueEntry.class, map(BEAMLINE, beamline));

src/test/java/uk/ac/diamond/ispyb/test/PlateIntegrationTest.java

@@ -268,6 +268,16 @@ public void testRetrieveContainerQueueWithMostRecentCompletedTimestamp() throws
 		assertThat(timestamp.isPresent(), is(true));
 	}
 
+	@Test
+	public void testUpdateContainerUnqueue() throws SQLException, IOException, InterruptedException {
+		Optional<Date> date= helper.execute(api -> {
+			api.updateContainerUnqueue("test_plate3");
+			return api.retrieveContainerQueueTimestamp("test_plate3");
+		});
+
+		assertThat(date.isPresent(), is(false));
+	}
+
 	@Test
 	public void testUpsertRetrieveSleeves() throws IOException, SQLException{
 		List<Sleeve> sleeves = helper.execute(api -> {