HTTP-99 address review feedback

Signed-off-by: davidradl <david_radley@uk.ibm.com>

Author: davidradl

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

@@ -50,12 +50,13 @@ public void lookupQueryInfoTestStr() {
                                 + "= false` "
                                 + "was called before this test execution.")
                 .isFalse();
-
+        // GIVEN
         this.config.setString("lookup-request.format", CustomJsonFormatFactory.IDENTIFIER);
         this.config.setString(
                 String.format("lookup-request.format.%s.%s", CustomJsonFormatFactory.IDENTIFIER,
                         CustomJsonFormatFactory.REQUIRED_OPTION), "optionValue");
         this.config.set(REQUEST_QUERY_PARAM_FIELDS, List.of("key1"));
+        // WHEN/THEN
         // with sync
         createUsingFactory(false);
         // with async
@@ -64,8 +65,10 @@ public void lookupQueryInfoTestStr() {
 
     @Test
     public void lookupQueryInfoTestRequiredConfig() {
+        //GIVEN
         GenericJsonAndUrlQueryCreatorFactory genericJsonAndUrlQueryCreatorFactory =
                 new GenericJsonAndUrlQueryCreatorFactory();
+        // WHEN/THEN
         assertThrows(RuntimeException.class, () -> {
             genericJsonAndUrlQueryCreatorFactory.createLookupQueryCreator(config,
                     null,
@@ -74,6 +77,7 @@ public void lookupQueryInfoTestRequiredConfig() {
     }
 
     private void createUsingFactory(boolean async) {
+        // GIVEN
         this.config.setBoolean(HttpLookupConnectorOptions.ASYNC_POLLING, async);
         LookupRow lookupRow= new LookupRow()
                 .addLookupEntry(
@@ -95,7 +99,7 @@ private void createUsingFactory(boolean async) {
         GenericRowData lookupRowData = GenericRowData.of(
                 StringData.fromString("val1")
         );
-
+        // WHEN/THEN
         LookupQueryInfo lookupQueryInfo = lookupQueryCreator.createLookupQuery(lookupRowData);
         assertThat(CustomJsonFormatFactory.requiredOptionsWereUsed).isTrue();
         assertThat(lookupQueryInfo.hasLookupQuery()).isTrue();
@@ -104,7 +108,9 @@ private void createUsingFactory(boolean async) {
     }
     @Test
     void optionsTests() {
+        // GIVEN
         GenericJsonAndUrlQueryCreatorFactory factory = new GenericJsonAndUrlQueryCreatorFactory();
+        // WHEN/THEN
         assertThat(factory.requiredOptions()).isEmpty();
         assertThat(factory.optionalOptions()).contains(REQUEST_QUERY_PARAM_FIELDS);
         assertThat(factory.optionalOptions()).contains(REQUEST_BODY_FIELDS);

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

@@ -64,7 +64,7 @@ public void createLookupQueryTestStrAllOps(String operation) {
                                         resolvedSchema)
                         );
         var createdQuery = universalJsonQueryCreator.createLookupQuery(ROWDATA);
-        // THEN
+        // WHEN/THEN
         if (operation.equals("GET")) {
             validateCreatedQueryForGet(createdQuery);
         } else {
@@ -126,6 +126,7 @@ private static void validateCreatedQueryForPutAndPost(LookupQueryInfo createdQue
 
     @Test
     public void createLookupQueryTest() {
+        // GIVEN
         List<String> query_params = List.of("key1", "key2");
         String operation = "GET";
         final String key1 = "key1";
@@ -147,18 +148,16 @@ public void createLookupQueryTest() {
         DataType dataType = row(List.of(
                 DataTypes.FIELD(key1, DataTypes.STRING()),
                 DataTypes.FIELD(key2, DataTypes.STRING())
-        ));;
+        ));
         ResolvedSchema resolvedSchema = ResolvedSchema.of(
                 Column.physical(key1, DataTypes.STRING()),
                 Column.physical(key2, DataTypes.STRING()));
         Configuration config = new Configuration();
         config.set(GenericJsonAndUrlQueryCreatorFactory.REQUEST_QUERY_PARAM_FIELDS, query_params);
         config.set(GenericJsonAndUrlQueryCreatorFactory.REQUEST_URL_MAP, url_params);
         config.setString(LOOKUP_METHOD, operation);
-        // GIVEN
-
         lookupRow.setLookupPhysicalRowDataType(dataType);
-
+        // WHEN
         GenericJsonAndUrlQueryCreator genericJsonAndUrlQueryCreator =
                 (GenericJsonAndUrlQueryCreator) new GenericJsonAndUrlQueryCreatorFactory()
                         .createLookupQueryCreator(