working no coverage

Signed-off-by: davidradl <[email protected]>

Author: davidradl

src/main/java/com/getindata/connectors/http/HttpStatusCodeValidationFailedException.java

@@ -1,11 +1,12 @@
 package com.getindata.connectors.http;
 
+import java.io.IOException;
 import java.net.http.HttpResponse;
 
 import lombok.Getter;
 
 @Getter
-public class HttpStatusCodeValidationFailedException extends Exception {
+public class HttpStatusCodeValidationFailedException extends IOException {
     private final HttpResponse<?> response;
 
     public HttpStatusCodeValidationFailedException(String message, HttpResponse<?> response) {

src/main/java/com/getindata/connectors/http/internal/retry/HttpClientWithRetry.java

@@ -57,7 +57,7 @@ public <T> HttpResponse<T> send(
                         "Incorrect response code: " + response.statusCode(), response);
             }
             return response;
-        } catch (IOException | InterruptedException | HttpStatusCodeValidationFailedException e) {
+        } catch (IOException | InterruptedException e) {
             throw e;    //re-throw without wrapping
         } catch (Throwable t) {
             throw new RuntimeException("Unexpected exception", t);

src/main/java/com/getindata/connectors/http/internal/table/lookup/HttpLookupTableSource.java

@@ -126,7 +126,7 @@ protected LookupRuntimeProvider getLookupRuntimeProvider(LookupRow lookupRow,
                                                                      pollingClientFactory) {
         MetadataConverter[] metadataConverters={};
         if (this.metadataKeys != null) {
-            this.metadataKeys.stream()
+            metadataConverters = this.metadataKeys.stream()
                     .map(
                         k ->
                                     Stream.of(HttpLookupTableSource.ReadableMetadata.values())

src/main/java/com/getindata/connectors/http/internal/table/lookup/HttpTableLookupFunction.java

@@ -81,22 +81,25 @@ public void open(FunctionContext context) throws Exception {
     public Collection<RowData> lookup(RowData keyRow) {
         localHttpCallCounter.incrementAndGet();
         List<RowData> outputList = new ArrayList<>();
-        // TODO turn into a constant?
         final int metadataArity = metadataConverters.length;
         try {
             Collection<RowData> httpCollector = client.pull(keyRow);
-            if (httpCollector.size() != 1) {
-                throw new RuntimeException("Expected 1 row data got " + httpCollector.size());
-            }
-            GenericRowData physicalRow = (GenericRowData) httpCollector.iterator().next();
-            final int physicalArity = physicalRow.getArity();
-            final GenericRowData producedRow =
+            // When there are no metadata columns or we have no results then
+            // return what the client pulls.
+            if (this.fail_job_on_error || httpCollector.size() == 0) {
+                localHttpCallCounter.incrementAndGet();
+                return httpCollector;
+            } else {
+                GenericRowData physicalRow = (GenericRowData) httpCollector.iterator().next();
+                final int physicalArity = physicalRow.getArity();
+                final GenericRowData producedRow =
                     new GenericRowData(physicalRow.getRowKind(), physicalArity + metadataArity);
-            // We need to copy in the physical row into the producedRow
-            for (int pos = 0; pos < physicalArity; pos++) {
-                producedRow.setField(pos, physicalRow.getField(pos));
+                // We need to copy in the physical row into the producedRow
+                for (int pos = 0; pos < physicalArity; pos++) {
+                    producedRow.setField(pos, physicalRow.getField(pos));
+                }
+                outputList.add(producedRow);
             }
-            outputList.add(producedRow);
         } catch (Exception e) {
             if (this.fail_job_on_error) throw e;
             Throwable cause =e.getCause();

src/test/java/com/getindata/connectors/http/internal/table/lookup/AsyncHttpTableLookupFunctionTest.java

@@ -79,7 +79,7 @@ void shouldEvaluateInAsyncWay() throws InterruptedException {
         assertThat(latch.await(3, TimeUnit.SECONDS))
             .withFailMessage(
                 "Future complete in AsyncHttpTableLookupFunction was not called"
-                    + " for at lest one event.")
+                    + " for at least one event.")
             .isEqualTo(true);
 
         assertThat(result.size()).isEqualTo(rowKeys.length);
@@ -120,7 +120,7 @@ void shouldHandleExceptionOnOneThread() throws InterruptedException {
         assertThat(latch.await(3, TimeUnit.SECONDS))
             .withFailMessage(
                 "Future complete in AsyncHttpTableLookupFunction was not called"
-                    + " for at lest one event.")
+                    + " for at least one event.")
             .isEqualTo(true);
 
         assertThat(wasException).isTrue();
@@ -159,13 +159,13 @@ void shouldHandleEmptyCollectionResult() throws InterruptedException {
         assertThat(latch.await(3, TimeUnit.SECONDS))
             .withFailMessage(
                 "Future complete in AsyncHttpTableLookupFunction was not called"
-                    + " for at lest one event.")
+                    + " for at least one event.")
             .isEqualTo(true);
 
         assertThat(completeCount.get())
             .withFailMessage(
                 "Future complete in AsyncHttpTableLookupFunction was not called"
-                    + " for at lest one event.")
+                    + " for at least one event.")
             .isEqualTo(rowKeys.length);
 
         // -1 since one will have one empty result.

src/test/java/com/getindata/connectors/http/internal/table/lookup/HttpLookupTableSourceITCaseTest.java

@@ -9,6 +9,7 @@
 import java.util.SortedSet;
 import java.util.TreeSet;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
 
 import com.github.tomakehurst.wiremock.WireMockServer;
 import com.github.tomakehurst.wiremock.client.MappingBuilder;
@@ -44,6 +45,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertAll;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 @Slf4j
 class HttpLookupTableSourceITCaseTest {
@@ -208,7 +210,7 @@ void testHttpLookupJoinWithMetadata(String methodName) throws Exception {
         SortedSet<Row> rows = testLookupJoinWithMetadata(lookupTableWithMetadata, 4);
 
         // THEN
-        assertEnrichedRows(rows);
+        assertEnrichedRowsWithMetadata(rows);
     }
 
     @Test
@@ -238,13 +240,7 @@ void testHttpLookupJoinNoDataFromEndpoint() {
                 + ")";
 
         // WHEN/THEN
-        //assertThrows(TimeoutException.class, () -> testLookupJoin(lookupTable, 4));
-        try {
-            testLookupJoin(lookupTable, 4);
-        } catch (Exception e) {
-            e.printStackTrace();
-            throw new RuntimeException("aaabbbb",e);
-        }
+        assertThrows(TimeoutException.class, () -> testLookupJoin(lookupTable, 4));
     }
 
     @Test
@@ -1035,24 +1031,32 @@ private void createLookupAndSourceTables(String lookupTable, int maxRows) {
         tEnv.executeSql(sourceTable);
         tEnv.executeSql(lookupTable);
     }
-
     private void assertEnrichedRows(Collection<Row> collectedRows) {
+        assertEnrichedRows(collectedRows, 6);
+    }
+
+    private void assertEnrichedRowsWithMetadata(Collection<Row> collectedRows) {
+        assertEnrichedRows(collectedRows, 9);
+    }
+
+    private void assertEnrichedRows(Collection<Row> collectedRows, int rowArity) {
         // validate every row and its column.
         assertAll(() -> {
                 assertThat(collectedRows.size()).isEqualTo(4);
                 int intElement = 0;
                 for (Row row : collectedRows) {
                     intElement++;
-                    assertThat(row.getArity()).isEqualTo(6);
-
-                    // "id" nad "id2" columns should be different for every row.
+                    assertThat(row.getArity()).isEqualTo(rowArity);
+                    // "id" and "id2" columns should be different for every row.
                     assertThat(row.getField("id")).isEqualTo(String.valueOf(intElement));
                     assertThat(row.getField("id2")).isEqualTo(String.valueOf(intElement + 1));
 
                     assertThat(row.getField("uuid"))
                         .isEqualTo("fbb68a46-80a9-46da-9d40-314b5287079c");
                     assertThat(row.getField("isActive")).isEqualTo(true);
                     assertThat(row.getField("balance")).isEqualTo("$1,729.34");
+                    // We don't need to assert on the metadata values since they're not part of the test
+                    // but we could add assertions here if needed
                 }
             }
         );

src/test/java/com/getindata/connectors/http/internal/table/lookup/TestHttpTableLookupFunction.java renamed to src/test/java/com/getindata/connectors/http/internal/table/lookup/HttpTableLookupFunctionTest.java

@@ -5,17 +5,19 @@
 import org.apache.flink.configuration.Configuration;
 import org.apache.flink.configuration.ReadableConfig;
 import org.jetbrains.annotations.NotNull;
+import org.junit.jupiter.api.Test;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import static com.getindata.connectors.http.internal.table.lookup.HttpLookupConnectorOptions.SOURCE_LOOKUP_FAIL_JOB_ON_ERROR;
 
-public class TestHttpTableLookupFunction {
-
+public class HttpTableLookupFunctionTest {
+    @Test
     void testconstructor() {
         assertThat(getHttpTableLookupFunction(null).getFail_job_on_error()).isTrue();
         assertThat(getHttpTableLookupFunction(true).getFail_job_on_error()).isTrue();
         assertThat(getHttpTableLookupFunction(false).getFail_job_on_error()).isFalse();
     }
+    @Test
     private static @NotNull HttpTableLookupFunction getHttpTableLookupFunction(Boolean flag) {
         ReadableConfig readableConfig;
         if (flag == null ) {
@@ -37,4 +39,5 @@ void testconstructor() {
                 null);
         return httpTableLookupFunction;
     }
+
 }