Skip to content

[PLUGIN-1902] Changes done for schema backward compatibility along with metadata API addition for DTS #110

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vikasrathee-cs merged 1 commit into from
Aug 21, 2025
Merged

[PLUGIN-1902] Changes done for schema backward compatibility along with metadata API addition for DTS #110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...-test/java/io/cdap/plugin/servicenowsink/actions/ServiceNowSinkPropertiesPageActions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ public static void getRecordFromServiceNowTable(String query, String tableName)
System.getenv("SERVICE_NOW_PASSWORD"),
"", "", "", null);

ServiceNowTableAPIClientImpl tableAPIClient = new ServiceNowTableAPIClientImpl(config.getConnection());
ServiceNowTableAPIClientImpl tableAPIClient = new ServiceNowTableAPIClientImpl(config.getConnection(), true);
responseFromServiceNowTable = tableAPIClient.getRecordFromServiceNowTable(tableName, query);
}

Expand Down
14 changes: 7 additions & 7 deletions src/e2e-test/java/io/cdap/plugin/tests/hooks/TestSetupHooks.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ public static void initializeServiceNowSourceConfig() {
@Before(order = 2, value = "@SN_PRODUCT_CATALOG_ITEM")
public static void createRecordInProductCatalogItemTable() throws IOException, ServiceNowAPIException {
BeforeActions.scenario.write("Create new record in Product Catalog Item table");
ServiceNowTableAPIClientImpl tableAPIClient = new ServiceNowTableAPIClientImpl(config.getConnection());
ServiceNowTableAPIClientImpl tableAPIClient = new ServiceNowTableAPIClientImpl(config.getConnection(), true);
String uniqueId = "TestProductCatalogItem" + RandomStringUtils.randomAlphanumeric(10);
String recordDetails = "{'name':'" + uniqueId + "','price':'2500'}";
StringEntity entity = new StringEntity(recordDetails);
Expand All @@ -76,7 +76,7 @@ public static void createRecordInProductCatalogItemTable() throws IOException, S
public static void createRecordInReceivingSlipLineTable()
throws IOException, ServiceNowAPIException {
BeforeActions.scenario.write("Create new record in Receiving Slip Line table");
ServiceNowTableAPIClientImpl tableAPIClient = new ServiceNowTableAPIClientImpl(config.getConnection());
ServiceNowTableAPIClientImpl tableAPIClient = new ServiceNowTableAPIClientImpl(config.getConnection(), true);
String uniqueId = "TestReceivingSlipLine" + RandomStringUtils.randomAlphanumeric(10);
String recordDetails = "{'number':'" + uniqueId + "'}";
StringEntity entity = new StringEntity(recordDetails);
Expand All @@ -88,7 +88,7 @@ public static void createRecordInReceivingSlipLineTable()
public static void createRecordInDateTimeTable()
throws IOException, ServiceNowAPIException {
BeforeActions.scenario.write("Create new record in Date time table");
ServiceNowTableAPIClientImpl tableAPIClient = new ServiceNowTableAPIClientImpl(config.getConnection());
ServiceNowTableAPIClientImpl tableAPIClient = new ServiceNowTableAPIClientImpl(config.getConnection(), false);
String recordDetails = "{'u_date': '2025-05-28 15:07'," +
" 'u_datetime1': '28.05.2025 03:07:56 PM'," +
" 'u_datetime2': '28.05.2025 03.07.56 PM'," +
Expand All @@ -110,7 +110,7 @@ public static void createRecordInDateTimeTable()

@After(order = 2, value = "@SN_DATE_TIME_TABLE")
public static void deleteRecord() throws ServiceNowAPIException, IOException {
ServiceNowTableAPIClientImpl tableAPIClient = new ServiceNowTableAPIClientImpl(config.getConnection());
ServiceNowTableAPIClientImpl tableAPIClient = new ServiceNowTableAPIClientImpl(config.getConnection(), false);
tableAPIClient.deleteRecordFromServiceNowTable(TablesInTableMode.DATE_TIME_TABLE.value, TestSetupHooks.systemId);
BeforeActions.scenario.write("Record in Date time table: " + systemId + " deleted successfully");
}
Expand All @@ -119,7 +119,7 @@ public static void deleteRecord() throws ServiceNowAPIException, IOException {
public static void updateRecordInAgentAssistRecommendationTable()
throws IOException, ServiceNowAPIException {
BeforeActions.scenario.write("Create new record in Agent Assist Recommendation table");
ServiceNowTableAPIClientImpl tableAPIClient = new ServiceNowTableAPIClientImpl(config.getConnection());
ServiceNowTableAPIClientImpl tableAPIClient = new ServiceNowTableAPIClientImpl(config.getConnection(), true);
String uniqueId = "TestAgentAssist" + RandomStringUtils.randomAlphanumeric(10);
String recordDetails = "{'active':'false','name':'" + uniqueId + "'}";
StringEntity entity = new StringEntity(recordDetails);
Expand All @@ -130,7 +130,7 @@ public static void updateRecordInAgentAssistRecommendationTable()
public static void updateRecordInAgentVendorCatalogItem()
throws IOException, ServiceNowAPIException {
BeforeActions.scenario.write("Create new record in Vendor Catalog Item table");
ServiceNowTableAPIClientImpl tableAPIClient = new ServiceNowTableAPIClientImpl(config.getConnection());
ServiceNowTableAPIClientImpl tableAPIClient = new ServiceNowTableAPIClientImpl(config.getConnection(), true);
String uniqueId = "TestVendorCatalog" + RandomStringUtils.randomAlphanumeric(10);
String recordDetails = "{'out_of_stock':'false','product_id':'" + uniqueId + "'}";
StringEntity entity = new StringEntity(recordDetails);
Expand All @@ -140,7 +140,7 @@ public static void updateRecordInAgentVendorCatalogItem()
@Before(order = 2, value = "@SN_UPDATE_SERVICE_OFFERING")
public static void updateRecordInServiceOffering() throws IOException, ServiceNowAPIException {
BeforeActions.scenario.write("Create new record in Service Offering table");
ServiceNowTableAPIClientImpl tableAPIClient = new ServiceNowTableAPIClientImpl(config.getConnection());
ServiceNowTableAPIClientImpl tableAPIClient = new ServiceNowTableAPIClientImpl(config.getConnection(), true);
String uniqueId = "TestServiceOffering" + RandomStringUtils.randomAlphanumeric(10);
String recordDetails = "{'purchase_date':'2022-05-28','end_date':'2022-06-05 15:00:00'," +
" 'start_date':'2022-05-25 15:00:00','number':'" + uniqueId + "'}";
Expand Down
16 changes: 9 additions & 7 deletions src/main/java/io/cdap/plugin/servicenow/ServiceNowBaseConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,10 @@
import io.cdap.plugin.servicenow.connector.ServiceNowConnectorConfig;
import io.cdap.plugin.servicenow.restapi.RestAPIResponse;
import io.cdap.plugin.servicenow.source.ServiceNowSourceConfig;
import io.cdap.plugin.servicenow.util.SchemaType;
import io.cdap.plugin.servicenow.util.ServiceNowConstants;
import io.cdap.plugin.servicenow.util.SourceValueType;
import org.apache.http.HttpStatus;
import org.apache.oltu.oauth2.common.exception.OAuthProblemException;
import org.apache.oltu.oauth2.common.exception.OAuthSystemException;

import java.io.IOException;
import javax.annotation.Nullable;

/**
Expand All @@ -58,6 +55,11 @@ public ServiceNowBaseConfig(String clientId, String clientSecret, String restApi
this.connection = new ServiceNowConnectorConfig(clientId, clientSecret, restApiEndpoint, user, password);
}

@Nullable
public Boolean getUseConnection() {
return useConnection;
}

@Nullable
public ServiceNowConnectorConfig getConnection() {
return connection;
Expand All @@ -83,7 +85,7 @@ public void validateCredentials(FailureCollector collector) {
@VisibleForTesting
public void validateServiceNowConnection(FailureCollector collector) {
try {
ServiceNowTableAPIClientImpl restApi = new ServiceNowTableAPIClientImpl(connection);
ServiceNowTableAPIClientImpl restApi = new ServiceNowTableAPIClientImpl(connection, useConnection);
restApi.getAccessToken();
} catch (Exception e) {
collector.addFailure("Unable to connect to ServiceNow Instance.",
Expand Down Expand Up @@ -123,13 +125,13 @@ public void validateTable(String tableName, SourceValueType valueType, FailureCo
String tableField) {
// Call API to fetch first record from the table
ServiceNowTableAPIRequestBuilder requestBuilder = new ServiceNowTableAPIRequestBuilder(
connection.getRestApiEndpoint(), tableName, false)
connection.getRestApiEndpoint(), tableName, false, SchemaType.SCHEMA_API_BASED)
.setExcludeReferenceLink(true)
.setDisplayValue(valueType)
.setLimit(1);

RestAPIResponse apiResponse = null;
ServiceNowTableAPIClientImpl serviceNowTableAPIClient = new ServiceNowTableAPIClientImpl(connection);
ServiceNowTableAPIClientImpl serviceNowTableAPIClient = new ServiceNowTableAPIClientImpl(connection, useConnection);
try {
String accessToken = serviceNowTableAPIClient.getAccessToken();
requestBuilder.setAuthHeader(accessToken);
Expand Down
Loading
Loading