Skip to content

(PLUGIN-174) Made host, port, database macro-enabled #79

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
bdmogal merged 1 commit into from
Jul 18, 2020
Merged

(PLUGIN-174) Made host, port, database macro-enabled #79

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
4 changes: 4 additions & 0 deletions ...ase-commons/src/main/java/io/cdap/plugin/db/batch/config/DBSpecificQueryActionConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
package io.cdap.plugin.db.batch.config;

import io.cdap.cdap.api.annotation.Description;
import io.cdap.cdap.api.annotation.Macro;
import io.cdap.cdap.api.annotation.Name;
import io.cdap.plugin.db.batch.action.QueryActionConfig;

Expand All @@ -27,14 +28,17 @@
public abstract class DBSpecificQueryActionConfig extends QueryActionConfig {
@Name(HOST)
@Description("Database host")
@Macro
public String host;

@Name(PORT)
@Description("Specific database port")
@Macro
public Integer port;

@Name(DATABASE)
@Description("Database name to connect to")
@Macro
public String database;

}
4 changes: 4 additions & 0 deletions database-commons/src/main/java/io/cdap/plugin/db/batch/config/DBSpecificQueryConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
package io.cdap.plugin.db.batch.config;

import io.cdap.cdap.api.annotation.Description;
import io.cdap.cdap.api.annotation.Macro;
import io.cdap.cdap.api.annotation.Name;
import io.cdap.plugin.db.batch.action.QueryConfig;

Expand All @@ -27,13 +28,16 @@
public abstract class DBSpecificQueryConfig extends QueryConfig {
@Name(HOST)
@Description("Database host")
@Macro
public String host;

@Name(PORT)
@Description("Specific database port")
@Macro
public Integer port;

@Name(DATABASE)
@Description("Database name to connect to")
@Macro
public String database;
}
4 changes: 4 additions & 0 deletions database-commons/src/main/java/io/cdap/plugin/db/batch/config/DBSpecificSinkConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
package io.cdap.plugin.db.batch.config;

import io.cdap.cdap.api.annotation.Description;
import io.cdap.cdap.api.annotation.Macro;
import io.cdap.cdap.api.annotation.Name;
import io.cdap.plugin.db.batch.sink.AbstractDBSink;

Expand All @@ -27,13 +28,16 @@
public abstract class DBSpecificSinkConfig extends AbstractDBSink.DBSinkConfig {
@Name(HOST)
@Description("Database host")
@Macro
public String host;

@Name(PORT)
@Description("Specific database port")
@Macro
public Integer port;

@Name(DATABASE)
@Description("Database name to connect to")
@Macro
public String database;
}
4 changes: 4 additions & 0 deletions database-commons/src/main/java/io/cdap/plugin/db/batch/config/DBSpecificSourceConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
package io.cdap.plugin.db.batch.config;

import io.cdap.cdap.api.annotation.Description;
import io.cdap.cdap.api.annotation.Macro;
import io.cdap.cdap.api.annotation.Name;
import io.cdap.plugin.db.batch.source.AbstractDBSource;

Expand All @@ -27,13 +28,16 @@
public abstract class DBSpecificSourceConfig extends AbstractDBSource.DBSourceConfig {
@Name(HOST)
@Description("Database host")
@Macro
public String host;

@Name(PORT)
@Description("Specific database port")
@Macro
public Integer port;

@Name(DATABASE)
@Description("Database name to connect to")
@Macro
public String database;
}
9 changes: 8 additions & 1 deletion database-commons/src/main/java/io/cdap/plugin/db/batch/source/AbstractDBSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,14 @@ public void configurePipeline(PipelineConfigurer pipelineConfigurer) {
sourceConfig.validate(collector);
if (sourceConfig.getSchema() != null) {
stageConfigurer.setOutputSchema(sourceConfig.getSchema());
} else if (!sourceConfig.containsMacro(DBSourceConfig.IMPORT_QUERY)) {
return;
}
if (!sourceConfig.containsMacro(ConnectionConfig.HOST) &&
!sourceConfig.containsMacro(ConnectionConfig.PORT) &&
!sourceConfig.containsMacro(ConnectionConfig.USER) &&
!sourceConfig.containsMacro(ConnectionConfig.PASSWORD) &&
!sourceConfig.containsMacro(DBSourceConfig.DATABASE) &&
!sourceConfig.containsMacro(DBSourceConfig.IMPORT_QUERY)) {
try {
stageConfigurer.setOutputSchema(getSchema(driverClass));
} catch (IllegalAccessException | InstantiationException e) {
Expand Down