2478: JobTracker tracks all operations not just jobs

core/store/src/main/java/uk/gov/gchq/gaffer/store/Store.java

@@ -384,17 +384,9 @@ public void execute(final Operation operation, final Context context) throws Ope
     public <O> O execute(final Output<O> operation, final Context context) throws OperationException {
         return execute(OperationChain.wrap(operation), context);
     }
-
     protected <O> O execute(final OperationChain<O> operation, final Context context) throws OperationException {
-        try {
-            addOrUpdateJobDetail(operation, context, null, JobStatus.RUNNING);
-            final O result = (O) handleOperation(operation, context);
-            addOrUpdateJobDetail(operation, context, null, JobStatus.FINISHED);
-            return result;
-        } catch (final Throwable t) {
-            addOrUpdateJobDetail(operation, context, t.getMessage(), JobStatus.FAILED);
-            throw t;
-        }
+        final O result = (O) handleOperation(operation, context);
+        return result;
     }
 
     /**
@@ -978,21 +970,19 @@ public OperationHandler<Operation> getOperationHandler(final Class<? extends Ope
         return operationHandlers.get(opClass);
     }
 
-    private JobDetail addOrUpdateJobDetail(final OperationChain<?> operationChain, final Context context,
-                                           final String msg, final JobStatus jobStatus) {
+    private JobDetail addOrUpdateJobDetail(final OperationChain<?> operationChain, final Context context, final String msg, final JobStatus jobStatus) {
         final JobDetail newJobDetail = new JobDetail(context.getJobId(), context.getUser(), operationChain, jobStatus, msg);
         if (nonNull(jobTracker)) {
             final JobDetail oldJobDetail = jobTracker.getJob(newJobDetail.getJobId(), context.getUser());
             if (newJobDetail.getStatus().equals(JobStatus.SCHEDULED_PARENT)) {
                 newJobDetail.setRepeat(null);
                 newJobDetail.setSerialisedOperationChain(operationChain);
             }
-
-            if (isNull(oldJobDetail)) {
+            if (null == oldJobDetail) {
                 jobTracker.addOrUpdateJob(newJobDetail, context.getUser());
             } else {
                 jobTracker.addOrUpdateJob(new JobDetail(oldJobDetail, newJobDetail), context
-                        .getUser());
+                .getUser());
             }
         }
         return newJobDetail;

core/store/src/test/java/uk/gov/gchq/gaffer/store/StoreTest.java

@@ -274,14 +274,14 @@ public void shouldExecuteOperationWhenJobTrackerCacheIsBroken(@Mock final StoreP
         store.initialise("graphId", createSchemaMock(), storeProperties);
 
         // When
-        store.execute(addElements, context);
-
+        store.executeJob(addElements, context);
+        
         // Then
         verify(addElementsHandler).doOperation(addElements, context, store);
         verify(mockICacheService, Mockito.atLeast(1)).getCache(any());
         verify(mockICache, Mockito.atLeast(1)).put(any(), any());
-    }
-
+    };
+    
     @Test
     public void shouldCreateStoreWithSpecificCaches() throws SchemaException, StoreException {
         // Given

rest-api/core-rest/src/test/java/uk/gov/gchq/gaffer/rest/service/v2/OperationServiceV2IT.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2021 Crown Copyright
+ * Copyright 2015-2024 Crown Copyright
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -106,24 +106,6 @@ public void shouldPropagateStatusInformationContainedInOperationExceptionsThrown
         assertEquals(SERVICE_UNAVAILABLE.getStatusCode(), response.getStatus());
     }
 
-    @Test
-    public void shouldReturnSameJobIdInHeaderAsGetAllJobDetailsOperation() throws IOException {
-        // Given
-        final Graph graph = new Graph.Builder()
-                .config(StreamUtil.graphConfig(this.getClass()))
-                .storeProperties(StreamUtil.STORE_PROPERTIES)
-                .addSchema(new Schema())
-                .build();
-
-        client.reinitialiseGraph(graph);
-
-        // When
-        final Response response = client.executeOperation(new GetAllJobDetails());
-
-        // Then
-        assertTrue(response.readEntity(String.class).contains(response.getHeaderString("job-id")));
-    }
-
     @Test
     public void shouldReturnAllOperationsAsOperationDetails() throws IOException, ClassNotFoundException {
         // Given

rest-api/spring-rest/src/test/java/uk/gov/gchq/gaffer/rest/integration/controller/OperationControllerIT.java

@@ -23,7 +23,6 @@
 import org.springframework.http.ResponseEntity;
 import org.springframework.util.LinkedMultiValueMap;
 
-import uk.gov.gchq.gaffer.cache.impl.HashMapCacheService;
 import uk.gov.gchq.gaffer.commonutil.StreamUtil;
 import uk.gov.gchq.gaffer.core.exception.Error;
 import uk.gov.gchq.gaffer.data.element.Entity;
@@ -161,37 +160,6 @@ public void shouldPropagateStatusInformationContainedInOperationExceptionsThrown
         assertEquals(SERVICE_UNAVAILABLE.getStatusCode(), response.getStatusCode().value());
     }
 
-    @Test
-    public void shouldReturnSameJobIdInHeaderAsGetAllJobDetailsOperation() throws IOException {
-        // Given
-        StoreProperties properties = new MapStoreProperties();
-        properties.setJobTrackerEnabled(true);
-        properties.setDefaultCacheServiceClass(HashMapCacheService.class.getName());
-
-        Graph graph = new Graph.Builder()
-                .config(StreamUtil.graphConfig(this.getClass()))
-                .storeProperties(properties)
-                .addSchema(new Schema())
-                .build();
-
-        when(getGraphFactory().getGraph()).thenReturn(graph);
-
-        // When
-        final ResponseEntity<Set> response = post("/graph/operations/execute",
-                new GetAllJobDetails(),
-                Set.class);
-
-        // Then
-        try {
-            assertTrue(response.getBody().toString().contains(response.getHeaders().get("job-id").get(0)));
-        } catch (final AssertionError e) {
-            System.out.println("Job ID was not found in the Header");
-            System.out.println("Header was: " + response.getHeaders().get("job-id"));
-            System.out.println("Body was: " + response.getBody());
-            throw e;
-        }
-    }
-
     @Test
     public void shouldCorrectlyStreamExecuteChunked() throws Exception {
         // Given