Merge pull request #155 from aodn/bugs/5916-missing-enum

Fix missing enum, refactor test to follow correct naming

indexer/src/main/java/au/org/aodn/esindexer/model/GeoNetworkField.java

@@ -6,5 +6,5 @@
 public enum GeoNetworkField {
  creation,
  revision,
- ;
+ publication,
 }

indexer/src/main/java/au/org/aodn/esindexer/service/IndexerServiceImpl.java

@@ -482,10 +482,10 @@ public BulkResponse executeBulk(BulkRequest.Builder bulkRequest, Callback callba
  }
  }
 
- protected BulkResponse reduceResponse(BulkResponse in) {
+ protected static BulkResponse reduceResponse(BulkResponse in) {
  List<BulkResponseItem> errors = in.items()
  .stream()
- .filter(p -> p.status() != HttpStatus.CREATED.value() || p.status() != HttpStatus.OK.value())
+ .filter(p -> !(p.status() == HttpStatus.CREATED.value() || p.status() == HttpStatus.OK.value()))
  .toList();
 
  return errors.isEmpty() ?

indexer/src/test/java/au/org/aodn/esindexer/service/GeoNetworkServiceTests.java → indexer/src/test/java/au/org/aodn/esindexer/service/GeoNetworkServiceIT.java

@@ -36,7 +36,7 @@
 @ActiveProfiles("test")
 @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
-public class GeoNetworkServiceTests extends BaseTestClass {
+public class GeoNetworkServiceIT extends BaseTestClass {
  // Must use the impl to access protected method for testing
  @Autowired
  protected GeoNetworkServiceImpl geoNetworkService;

indexer/src/test/java/au/org/aodn/esindexer/service/IndexerServiceTests.java → indexer/src/test/java/au/org/aodn/esindexer/service/IndexerServiceIT.java

@@ -3,6 +3,8 @@
 import au.org.aodn.esindexer.BaseTestClass;
 import au.org.aodn.esindexer.configuration.GeoNetworkSearchTestConfig;
 import co.elastic.clients.elasticsearch.ElasticsearchClient;
+import co.elastic.clients.elasticsearch.core.BulkResponse;
+import co.elastic.clients.elasticsearch.core.bulk.BulkResponseItem;
 import co.elastic.clients.elasticsearch.core.search.Hit;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -15,6 +17,7 @@
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.http.HttpStatus;
 import org.springframework.test.context.ActiveProfiles;
 
 import java.io.IOException;
@@ -26,7 +29,7 @@
 @ActiveProfiles("test")
 @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
-public class IndexerServiceTests extends BaseTestClass {
+public class IndexerServiceIT extends BaseTestClass {
 
  @Autowired
  protected GeoNetworkServiceImpl geoNetworkService;
@@ -250,7 +253,7 @@ public void verifyThumbnailLinkNullAdbbdedOnIndex() throws IOException {
  String test = String.valueOf(Objects.requireNonNull(objectNodeHit.source()));
  String expected = indexerObjectMapper.readTree(expectedData).toPrettyString();
  String actual = indexerObjectMapper.readTree(test).toPrettyString();
-logger.info("{}", actual);
+
  JSONAssert.assertEquals(expected, actual, JSONCompareMode.STRICT);
  } catch (JSONException e) {
  throw new RuntimeException(e);

indexer/src/test/java/au/org/aodn/esindexer/service/IndexerServiceTest.java

@@ -0,0 +1,58 @@
+package au.org.aodn.esindexer.service;
+
+import co.elastic.clients.elasticsearch._types.ErrorCause;
+import co.elastic.clients.elasticsearch.core.BulkResponse;
+import co.elastic.clients.elasticsearch.core.bulk.BulkResponseItem;
+import co.elastic.clients.elasticsearch.core.bulk.OperationType;
+import lombok.extern.slf4j.Slf4j;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.springframework.http.HttpStatus;
+
+/**
+ * Unit test that do not require other dependent software running goes here
+ */
+@Slf4j
+public class IndexerServiceTest {
+ /**
+ * Verify this function, it should only return error if items contains status no CREATED or OK
+ */
+ @Test
+ public void verifyReduceResponse() {
+ BulkResponse bulkResponse = BulkResponse.of(b ->
+ b.items(
+ BulkResponseItem.of(i -> i
+ .status(HttpStatus.CREATED.value())
+ .operationType(OperationType.Create)
+ .index("A")
+ ),
+ BulkResponseItem.of(i -> i
+ .status(HttpStatus.OK.value())
+ .operationType(OperationType.Update)
+ .index("A")
+ ))
+ .errors(false).took(1)
+ );
+
+ bulkResponse = IndexerServiceImpl.reduceResponse(bulkResponse);
+ Assertions.assertFalse(bulkResponse.errors(), "Should not contain error");
+
+ bulkResponse = BulkResponse.of(b ->
+ b.items(
+ BulkResponseItem.of(i -> i
+ .status(HttpStatus.CREATED.value())
+ .operationType(OperationType.Create)
+ .index("B")
+ ),
+ BulkResponseItem.of(i -> i
+ .status(HttpStatus.NOT_EXTENDED.value())
+ .operationType(OperationType.Index)
+ .index("B")
+ ))
+ .errors(false).took(1)
+ );
+
+ bulkResponse = IndexerServiceImpl.reduceResponse(bulkResponse);
+ Assertions.assertTrue(bulkResponse.errors(), "Should contain error");
+ }
+}

indexer/src/test/java/au/org/aodn/esindexer/service/RankingServiceTests.java → indexer/src/test/java/au/org/aodn/esindexer/service/RankingServiceIT.java

@@ -1,12 +1,9 @@
 package au.org.aodn.esindexer.service;
 
 import au.org.aodn.esindexer.BaseTestClass;
-import au.org.aodn.esindexer.utils.SummariesUtils;
 import au.org.aodn.stac.model.*;
 import org.junit.jupiter.api.*;
-import org.mockito.InjectMocks;
 import org.mockito.Mockito;
-import org.mockito.Spy;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.test.context.SpringBootTest;
@@ -16,15 +13,14 @@
 import static org.mockito.Mockito.*;
 
 import java.io.IOException;
-import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 @ActiveProfiles("test")
 @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
-class RankingServiceTests extends BaseTestClass {
+class RankingServiceIT extends BaseTestClass {
 
  @Value("${elasticsearch.index.name}")
  protected String INDEX_NAME;

indexer/src/test/java/au/org/aodn/esindexer/service/StacCollectionMapperServiceTests.java → indexer/src/test/java/au/org/aodn/esindexer/service/StacCollectionMapperServiceTest.java

@@ -13,14 +13,12 @@
 import co.elastic.clients.elasticsearch.core.search.TotalHits;
 import co.elastic.clients.json.JsonData;
 import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import jakarta.xml.bind.JAXBException;
 import lombok.extern.slf4j.Slf4j;
 import org.json.JSONException;
 import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
@@ -47,7 +45,7 @@
  */
 @Slf4j
 @SpringBootTest(classes = {StacCollectionMapperServiceImpl.class})
-public class StacCollectionMapperServiceTests {
+public class StacCollectionMapperServiceTest {
 
  protected ObjectMapper objectMapper = new ObjectMapper();
  protected JaxbUtils<MDMetadataType> jaxbUtils = new JaxbUtils<>(MDMetadataType.class);
@@ -88,7 +86,7 @@ protected void verify(String expected) throws JsonProcessingException, JSONExcep
  );
  }
 
- public StacCollectionMapperServiceTests() throws JAXBException {
+ public StacCollectionMapperServiceTest() throws JAXBException {
  GeometryUtils.setExecutorService(Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors()));
  GeometryUtils.init();
  }
@@ -397,6 +395,19 @@ public void verifyNonNodedIntersectionsWorks() throws IOException, JSONException
  String expected = readResourceFile("classpath:canned/sample_non_noded_intersections_stac.json");
  indexerService.indexMetadata(xml);
 
+ verify(expected);
+ }
+ /**
+ * There is a missing enum publication, this case is check if we works after fix
+ * @throws IOException - Not expect to throw
+ * @throws JSONException - Not expect to throw
+ */
+ @Test
+ public void verifyNoMissingGeonetworkFieldEnum() throws IOException, JSONException {
+ String xml = readResourceFile("classpath:canned/sample_geoenum_publication.xml");
+ String expected = readResourceFile("classpath:canned/sample_geoenum_publication_stac.json");
+ indexerService.indexMetadata(xml);
+
  verify(expected);
  }
 }

indexer/src/test/java/au/org/aodn/esindexer/service/VocabServiceTest.java → indexer/src/test/java/au/org/aodn/esindexer/service/VocabServiceIT.java

@@ -31,7 +31,7 @@
 @ActiveProfiles("test")
 @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
-public class VocabServiceTest extends BaseTestClass {
+public class VocabServiceIT extends BaseTestClass {
 
  @Autowired
  VocabService vocabService;