Revert "Servicenow Code refactor"

src/e2e-test/java/io/cdap/plugin/servicenowsink/actions/ServiceNowSinkPropertiesPageActions.java

@@ -50,15 +50,15 @@ public class ServiceNowSinkPropertiesPageActions {
   private static Gson gson = new Gson();
 
   public static void getRecordFromServiceNowTable(String query, String tableName)
-    throws OAuthProblemException, OAuthSystemException, IOException {
+    throws OAuthProblemException, OAuthSystemException {
     config = new ServiceNowSourceConfig(
       "", "", "", "", "",
       System.getenv("SERVICE_NOW_CLIENT_ID"),
       System.getenv("SERVICE_NOW_CLIENT_SECRET"),
       System.getenv("SERVICE_NOW_REST_API_ENDPOINT"),
       System.getenv("SERVICE_NOW_USERNAME"),
       System.getenv("SERVICE_NOW_PASSWORD"),
-      "", "", "", null);
+      "", "", "");
 
     ServiceNowTableAPIClientImpl tableAPIClient = new ServiceNowTableAPIClientImpl(config.getConnection());
     responseFromServiceNowTable = tableAPIClient.getRecordFromServiceNowTable(tableName, query);

src/e2e-test/java/io/cdap/plugin/tests/hooks/TestSetupHooks.java

@@ -58,7 +58,7 @@ public static void initializeServiceNowSourceConfig() {
       System.getenv("SERVICE_NOW_REST_API_ENDPOINT"),
       System.getenv("SERVICE_NOW_USERNAME"),
       System.getenv("SERVICE_NOW_PASSWORD"),
-      "", "", "", null);
+      "", "", "");
   }
 
   @Before(order = 2, value = "@SN_PRODUCT_CATALOG_ITEM")

src/main/java/io/cdap/plugin/servicenow/apiclient/ServiceNowTableAPIClientImpl.java

@@ -267,22 +267,12 @@ public SchemaResponse parseSchemaResponse(String responseBody) {
    */
   public Schema fetchTableSchema(String tableName)
       throws OAuthProblemException, OAuthSystemException, IOException {
-    return fetchTableSchema(tableName, getAccessToken());
-  }
-
-  /**
-   * Fetches the table schema from ServiceNow
-   *
-   * @param tableName ServiceNow table name for which schema is getting fetched
-   * @param accessToken Access Token to use
-   * @return schema for given ServiceNow table
-   */
-  public Schema fetchTableSchema(String tableName, String accessToken) throws IOException {
     ServiceNowTableAPIRequestBuilder requestBuilder = new ServiceNowTableAPIRequestBuilder(
       this.conf.getRestApiEndpoint(), tableName, true)
       .setExcludeReferenceLink(true);
 
     RestAPIResponse apiResponse;
+    String accessToken = getAccessToken();
     requestBuilder.setAuthHeader(accessToken);
     apiResponse = executeGet(requestBuilder.build());
     SchemaResponse response = parseSchemaResponse(apiResponse.getResponseBody());
@@ -307,24 +297,13 @@ public Schema fetchTableSchema(String tableName, String accessToken) throws IOEx
    */
   public int getTableRecordCount(String tableName)
       throws OAuthProblemException, OAuthSystemException, IOException {
-    return getTableRecordCount(tableName, getAccessToken());
-  }
-
-  /**
-   * Get the total number of records in the table
-   *
-   * @param tableName ServiceNow table name for which record count is fetched.
-   * @param accessToken Access Token for the call
-   * @return the table record count
-   * @throws IOException
-   */
-  public int getTableRecordCount(String tableName, String accessToken) throws IOException {
     ServiceNowTableAPIRequestBuilder requestBuilder = new ServiceNowTableAPIRequestBuilder(
       this.conf.getRestApiEndpoint(), tableName, false)
       .setExcludeReferenceLink(true)
       .setDisplayValue(SourceValueType.SHOW_DISPLAY_VALUE)
       .setLimit(1);
     RestAPIResponse apiResponse = null;
+    String accessToken = getAccessToken();
     requestBuilder.setResponseHeaders(ServiceNowConstants.HEADER_NAME_TOTAL_COUNT);
     requestBuilder.setAuthHeader(accessToken);
     apiResponse = executeGet(requestBuilder.build());

src/main/java/io/cdap/plugin/servicenow/connector/ServiceNowConnector.java

@@ -89,26 +89,12 @@ public void test(ConnectorContext connectorContext) throws ValidationException {
 
   @Override
   public BrowseDetail browse(ConnectorContext connectorContext, BrowseRequest browseRequest) throws IOException {
-    ServiceNowTableAPIClientImpl serviceNowTableAPIClient = new ServiceNowTableAPIClientImpl(config);
-    try {
-      String accessToken = serviceNowTableAPIClient.getAccessToken();
-      return browse(connectorContext, accessToken);
-    } catch (OAuthSystemException | OAuthProblemException e) {
-      throw new IOException(e);
-    }
-  }
-
-  /**
-   * Browse Details for the given AccessToken.
-   */
-  public BrowseDetail browse(ConnectorContext connectorContext,
-                             String accessToken) throws IOException {
     int count = 0;
     FailureCollector collector = connectorContext.getFailureCollector();
     config.validateCredentialsFields(collector);
     collector.getOrThrowException();
     BrowseDetail.Builder browseDetailBuilder = BrowseDetail.builder();
-    Table[] table = listTables(accessToken).getResult();
+    Table[] table = listTables().getResult();
     for (int i = 0; i < table.length; i++) {
       String name = table[i].getName();
       String label = table[i].getLabel();
@@ -122,16 +108,23 @@ public BrowseDetail browse(ConnectorContext connectorContext,
     return browseDetailBuilder.setTotalCount(count).build();
   }
 
+
   /**
    * @return the list of tables.
    */
-  private TableList listTables(String accessToken) throws IOException {
+  private TableList listTables() throws IOException {
     ServiceNowTableAPIRequestBuilder requestBuilder = new ServiceNowTableAPIRequestBuilder(
       config.getRestApiEndpoint(), OBJECT_TABLE_LIST, false);
+    String accessToken = null;
+    ServiceNowTableAPIClientImpl serviceNowTableAPIClient = new ServiceNowTableAPIClientImpl(config);
+    try {
+      accessToken = serviceNowTableAPIClient.getAccessToken();
+    } catch (OAuthSystemException | OAuthProblemException e) {
+      throw new IOException(e);
+    }
     requestBuilder.setAuthHeader(accessToken);
     requestBuilder.setAcceptHeader(MediaType.APPLICATION_JSON);
     requestBuilder.setContentTypeHeader(MediaType.APPLICATION_JSON);
-    ServiceNowTableAPIClientImpl serviceNowTableAPIClient = new ServiceNowTableAPIClientImpl(config);
     RestAPIResponse apiResponse = serviceNowTableAPIClient.executeGet(requestBuilder.build());
     return GSON.fromJson(apiResponse.getResponseBody(), TableList.class);
   }

src/main/java/io/cdap/plugin/servicenow/source/ServiceNowRecordReader.java

@@ -20,12 +20,15 @@
 import io.cdap.cdap.api.data.schema.Schema;
 import io.cdap.plugin.servicenow.apiclient.ServiceNowTableAPIClientImpl;
 import io.cdap.plugin.servicenow.connector.ServiceNowRecordConverter;
-import io.cdap.plugin.servicenow.util.ServiceNowTableInfo;
+import io.cdap.plugin.servicenow.util.ServiceNowConstants;
 import io.cdap.plugin.servicenow.util.SourceQueryMode;
 import org.apache.hadoop.mapreduce.InputSplit;
 import org.apache.hadoop.mapreduce.TaskAttemptContext;
+import org.apache.oltu.oauth2.common.exception.OAuthProblemException;
+import org.apache.oltu.oauth2.common.exception.OAuthSystemException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
@@ -45,20 +48,23 @@ public ServiceNowRecordReader(ServiceNowSourceConfig pluginConf) {
 
   @Override
   public void initialize(InputSplit split, TaskAttemptContext context) {
-    initialize(split);
-    fetchAndInitializeSchema(new ServiceNowJobConfiguration(context.getConfiguration()).getTableInfos(), tableName);
+    this.split = (ServiceNowInputSplit) split;
+    this.pos = 0;
+    restApi = new ServiceNowTableAPIClientImpl(pluginConf.getConnection());
+    tableName = ((ServiceNowInputSplit) split).getTableName();
+    tableNameField = pluginConf.getTableNameField();
+    fetchSchema(restApi);
   }
 
   /**
-   * Initialize with only the provided split and given schema
+   * Initialize with only the provided split.
    * This method should not be called directly from the code,
    * as Hadoop runtime initialize internally during execution.
    *
    * @param split Split to read by the current reader.
    */
-  public void initialize(InputSplit split, Schema schema) {
-    initialize(split);
-    initializeSchema(tableName, schema);
+  public void initialize(InputSplit split) {
+    initialize(split, null);
   }
 
   @Override
@@ -112,36 +118,20 @@ private void fetchData() throws IOException {
     iterator = results.iterator();
   }
 
-  protected void initialize(InputSplit split) {
-    this.split = (ServiceNowInputSplit) split;
-    this.pos = 0;
-    restApi = new ServiceNowTableAPIClientImpl(pluginConf.getConnection());
-    tableName = ((ServiceNowInputSplit) split).getTableName();
-    tableNameField = pluginConf.getTableNameField();
-  }
-
-  /**
-   * Fetches the schema of the given tableName from the tableInfos and initialize schema using it.
-   *
-   * @param tableInfos List of TableInfo objects containing TableName, RecordCount and Schema.
-   * @param tableName Table Name to initialize this reader for.
-   */
-  private void fetchAndInitializeSchema(List<ServiceNowTableInfo> tableInfos, String tableName) {
-    Schema tempSchema = tableInfos.stream()
-        .filter((tableInfo) -> tableInfo.getTableName().equalsIgnoreCase(tableName))
-        .findFirst().get().getSchema();
-
-    initializeSchema(tableName, tempSchema);
-  }
+  private void fetchSchema(ServiceNowTableAPIClientImpl restApi) {
+    try {
+      Schema tempSchema = restApi.fetchTableSchema(tableName);
+      tableFields = tempSchema.getFields();
+      List<Schema.Field> schemaFields = new ArrayList<>(tableFields);
 
-  private void initializeSchema(String tableName, Schema schema) {
-    tableFields = schema.getFields();
-    List<Schema.Field> schemaFields = new ArrayList<>(tableFields);
+      if (pluginConf.getQueryMode() == SourceQueryMode.REPORTING) {
+        schemaFields.add(Schema.Field.of(tableNameField, Schema.of(Schema.Type.STRING)));
+      }
 
-    if (pluginConf.getQueryMode() == SourceQueryMode.REPORTING) {
-      schemaFields.add(Schema.Field.of(tableNameField, Schema.of(Schema.Type.STRING)));
+      schema = Schema.recordOf(tableName, schemaFields);
+    } catch (OAuthProblemException | OAuthSystemException | IOException e) {
+      throw new RuntimeException(e);
     }
-
-    this.schema = Schema.recordOf(tableName, schemaFields);
   }
+
 }

src/test/java/io/cdap/plugin/servicenow/sink/ServiceNowSinkConfigTest.java

@@ -318,7 +318,7 @@ public void testValidateSchema() throws Exception {
     Mockito.when(httpClient.execute(Mockito.any())).thenReturn(httpResponse);
     PowerMockito.when(RestAPIResponse.parse(httpResponse, null)).thenReturn(response);
     Mockito.when(restApi.executeGet(Mockito.any(RestAPIRequest.class))).thenReturn(restAPIResponse);
-    Mockito.when(restApi.fetchTableSchema(Mockito.anyString(), Mockito.any(FailureCollector.class))).thenReturn(schema);
+    Mockito.when(restApi.fetchTableSchema(Mockito.anyString(), Mockito.any())).thenReturn(schema);
     Mockito.when(restApi.parseSchemaResponse(restAPIResponse.getResponseBody()))
       .thenReturn(schemaResponse);
     try {

src/test/java/io/cdap/plugin/servicenow/source/ServiceNowRecordReaderTest.java

@@ -187,7 +187,7 @@ public void testFetchData() throws Exception {
                                                         serviceNowSourceConfig.getPageSize())).thenReturn(results);
     Mockito.when(restApi.fetchTableSchema(tableName))
       .thenReturn(Schema.recordOf(Schema.Field.of("calendar_integration", Schema.of(Schema.Type.STRING))));
-    serviceNowRecordReader.initialize(split);
+    serviceNowRecordReader.initialize(split, null);
     Assert.assertTrue(serviceNowRecordReader.nextKeyValue());
   }
 
@@ -241,7 +241,7 @@ public void testFetchDataReportingMode() throws Exception {
                                                         serviceNowSourceConfig.getPageSize())).thenReturn(results);
     Mockito.when(restApi.fetchTableSchema(tableName))
       .thenReturn(Schema.recordOf(Schema.Field.of("calendar_integration", Schema.of(Schema.Type.STRING))));
-    serviceNowRecordReader.initialize(split);
+    serviceNowRecordReader.initialize(split, null);
     Assert.assertTrue(serviceNowRecordReader.nextKeyValue());
   }
 
@@ -276,7 +276,7 @@ public void testFetchDataOnInvalidTable() throws Exception {
     response.setResult(results);
     Mockito.when(restApi.fetchTableSchema(tableName))
       .thenReturn(Schema.recordOf(Schema.Field.of("calendar_integration", Schema.of(Schema.Type.STRING))));
-    serviceNowRecordReader.initialize(split);
+    serviceNowRecordReader.initialize(split, null);
     Assert.assertFalse(serviceNowRecordReader.nextKeyValue());
   }
 }