Skip to content

Commit

Permalink
Merge pull request #80 from data-integrations/PLUGIN-681
Browse files Browse the repository at this point in the history
Fix streaming config validation with crendentials are specified as ma…
  • Loading branch information
rmstar authored May 1, 2021
2 parents 12af3e6 + 57957f4 commit ef8721a
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
6 changes: 3 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<!-- version properties -->
<avro.version>1.7.7</avro.version>
<cdap.version>6.4.0-SNAPSHOT</cdap.version>
<cdap.version>6.4.0</cdap.version>
<junit.version>4.12</junit.version>
<commons.io.version>2.6</commons.io.version>
<commons.lang.version>2.6</commons.lang.version>
Expand Down Expand Up @@ -443,8 +443,8 @@
Plugins use the new macro substitution that supports object, which is introduced in 6.4.0.
The cdap API version that this project depends on is still 6.2.0 since there is no new API needed.
-->
<parent>system:cdap-data-pipeline[6.4.0-SNAPSHOT,7.0.0-SNAPSHOT)</parent>
<parent>system:cdap-data-streams[6.4.0-SNAPSHOT,7.0.0-SNAPSHOT)</parent>
<parent>system:cdap-data-pipeline[6.4.0,7.0.0-SNAPSHOT)</parent>
<parent>system:cdap-data-streams[6.4.0,7.0.0-SNAPSHOT)</parent>
</cdapArtifacts>
</configuration>
<executions>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,8 @@ public void configurePipeline(PipelineConfigurer pipelineConfigurer) {

if (!Strings.isNullOrEmpty(query)
&& !config.containsMacro(SalesforceStreamingSourceConfig.PROPERTY_PUSH_TOPIC_QUERY)
&& !config.containsMacro(SalesforceStreamingSourceConfig.PROPERTY_SOBJECT_NAME)) {
&& !config.containsMacro(SalesforceStreamingSourceConfig.PROPERTY_SOBJECT_NAME)
&& config.canAttemptToEstablishConnection()) {

Schema schema = SalesforceSchemaUtil.getSchema(config.getAuthenticatorCredentials(),
SObjectDescriptor.fromQuery(query));
Expand Down

0 comments on commit ef8721a

Please sign in to comment.