Skip to content
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.

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

[BEAM-14048] [CdapIO] Add ConfigWrapper for building CDAP PluginConfigs #17051

Merged
merged 23 commits into from
May 5, 2022
Merged
Show file tree
Hide file tree
Changes from 20 commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
78dd87b
[BEAM-14048] Add ConfigWrapper for building CDAP PluginConfigs
Amar3tto Mar 9, 2022
30b9e38
[BEAM-14048] Fix checkstyle
Amar3tto Mar 11, 2022
9e5e6d6
[BEAM-14048] Fix warnings
Amar3tto Mar 11, 2022
2d414f4
[BEAM-14048] Fix warnings
Amar3tto Mar 15, 2022
d35acb8
[BEAM-14048] Fix warning
Amar3tto Mar 15, 2022
b7e0fca
[BEAM-14048] Fix warning
Amar3tto Mar 15, 2022
3252395
[BEAM-14048] Remove unused dependencies
Amar3tto Mar 15, 2022
f9e5675
[BEAM-14048] Add needed dependencies
Amar3tto Mar 15, 2022
65a5442
[BEAM-14048] Fix spotless
Amar3tto Mar 15, 2022
00aef64
[BEAM-14048] Fix typo
Amar3tto Mar 15, 2022
d10b84b
[BEAM-14048] Use fori instead of stream
Amar3tto Mar 16, 2022
2f9686d
[BEAM-14048] Suppress warning
Amar3tto Mar 16, 2022
119d2cc
[BEAM-14048] Add used undeclared artifacts
Amar3tto Mar 16, 2022
1f63d65
[BEAM-14048] Change dependencies to test
Amar3tto Mar 16, 2022
0645c7b
[BEAM-14048] Refactoring
Amar3tto Mar 22, 2022
44125f0
Merge branch 'apache:master' into BEAM-14048-cdap-config
AKosolapov Mar 23, 2022
8ba78c9
[BEAM-14048] Use CDAP InstantiatorFactory for creating config objects
Amar3tto Mar 30, 2022
970fe79
[BEAM-14048] Suppress warning
Amar3tto Mar 30, 2022
d7d2042
Update maven repo
elizaveta-lomteva Apr 18, 2022
129cffe
Update build.gradle
elizaveta-lomteva Apr 18, 2022
f440da9
[BEAM-14048] Use ServiceNow CDAP dependency from Maven central
Amar3tto May 4, 2022
7c0028c
Merge remote-tracking branch 'origin/BEAM-14048-cdap-config' into BEA…
Amar3tto May 4, 2022
9df1c75
[BEAM-14048] Set macroFields
Amar3tto May 4, 2022
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
Original file line number Diff line number Diff line change
Expand Up @@ -451,6 +451,7 @@ class BeamModulePlugin implements Plugin<Project> {
def aws_java_sdk_version = "1.12.135"
def aws_java_sdk2_version = "2.17.127"
def cassandra_driver_version = "3.10.2"
def cdap_version = "6.5.1"
def checkerframework_version = "3.10.0"
def classgraph_version = "4.8.104"
def errorprone_version = "2.10.0"
Expand Down Expand Up @@ -535,6 +536,9 @@ class BeamModulePlugin implements Plugin<Project> {
bigdataoss_util : "com.google.cloud.bigdataoss:util:$google_cloud_bigdataoss_version",
cassandra_driver_core : "com.datastax.cassandra:cassandra-driver-core:$cassandra_driver_version",
cassandra_driver_mapping : "com.datastax.cassandra:cassandra-driver-mapping:$cassandra_driver_version",
cdap_api : "io.cdap.cdap:cdap-api:$cdap_version",
cdap_common : "io.cdap.cdap:cdap-common:$cdap_version",
cdap_etl_api : "io.cdap.cdap:cdap-etl-api:$cdap_version",
checker_qual : "org.checkerframework:checker-qual:$checkerframework_version",
classgraph : "io.github.classgraph:classgraph:$classgraph_version",
commons_codec : "commons-codec:commons-codec:1.15",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@
<suppress id="ForbidNonVendoredGuava" files=".*zetasql.*ExpressionConverter\.java" />
<suppress id="ForbidNonVendoredGuava" files=".*zetasql.*BeamZetaSqlCatalog\.java" />
<suppress id="ForbidNonVendoredGuava" files=".*pubsublite.*BufferingPullSubscriberTest\.java" />
<suppress id="ForbidNonVendoredGuava" files=".*cdap.*PluginConfigInstantiationUtils\.java" />

<!-- gRPC/protobuf exceptions -->
<!-- Non-vendored gRPC/protobuf imports are allowed for files that depend on libraries that expose gRPC/protobuf in its public API -->
Expand Down
1 change: 1 addition & 0 deletions sdks/java/io/cdap/OWNERS
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# See the OWNERS docs at https://s.apache.org/beam-owners
58 changes: 58 additions & 0 deletions sdks/java/io/cdap/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* License); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an AS IS BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

plugins {
id 'java'
id 'org.apache.beam.module'
}

applyJavaNature(
exportJavadoc: false,
automaticModuleName: 'org.apache.beam.sdk.io.cdap',
)
provideIntegrationTestingDependencies()
enableJavaPerformanceTesting()

description = "Apache Beam :: CDAP :: Java"
ext.summary = """Apache Beam SDK provides a simple, Java-based
interface for integration with CDAP plugins."""

/** Define the list of runners which execute a precommit test.
* Some runners are run from separate projects, see the preCommit task below
* for details.
*/

allprojects {
repositories {
maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' }
chamikaramj marked this conversation as resolved.
Show resolved Hide resolved
}
}

dependencies {
implementation library.java.guava
implementation library.java.cdap_api
implementation library.java.cdap_common
implementation library.java.jackson_core
implementation library.java.jackson_databind
implementation library.java.slf4j_api
implementation project(path: ":sdks:java:core", configuration: "shadow")
testImplementation "io.cdap.plugin:salesforce-plugins:1.5.0-SNAPSHOT"
testImplementation library.java.cdap_etl_api
testImplementation library.java.vendored_guava_26_0_jre
testImplementation library.java.junit
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.beam.sdk.io.cdap;

import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import io.cdap.cdap.api.plugin.PluginConfig;
import java.io.File;
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

/** Class for building {@link PluginConfig} object of the specific class {@param <T>}. */
public class ConfigWrapper<T extends PluginConfig> {

private static final Logger LOG = LoggerFactory.getLogger(ConfigWrapper.class);

@Nullable private Map<String, Object> paramsMap = null;
private final Class<T> configClass;

public ConfigWrapper(Class<T> configClass) {
this.configClass = configClass;
}

public ConfigWrapper<T> fromJsonString(String jsonString) throws IOException {
TypeReference<HashMap<String, Object>> typeRef =
new TypeReference<HashMap<String, Object>>() {};
try {
paramsMap = new ObjectMapper().readValue(jsonString, typeRef);
} catch (IOException e) {
LOG.error("Can not read json string to params map", e);
chamikaramj marked this conversation as resolved.
Show resolved Hide resolved
throw e;
}
return this;
}

public ConfigWrapper<T> fromJsonFile(File jsonFile) throws IOException {
TypeReference<HashMap<String, Object>> typeRef =
new TypeReference<HashMap<String, Object>>() {};
try {
paramsMap = new ObjectMapper().readValue(jsonFile, typeRef);
} catch (IOException e) {
LOG.error("Can not read json file to params map", e);
chamikaramj marked this conversation as resolved.
Show resolved Hide resolved
throw e;
}
return this;
}

public ConfigWrapper<T> withParams(Map<String, Object> paramsMap) {
this.paramsMap = new HashMap<>(paramsMap);
return this;
}

public ConfigWrapper<T> setParam(String paramName, Object param) {
getParamsMap().put(paramName, param);
return this;
}

public @Nullable T build() {
return PluginConfigInstantiationUtils.getPluginConfig(getParamsMap(), configClass);
}

private @Nonnull Map<String, Object> getParamsMap() {
if (paramsMap == null) {
paramsMap = new HashMap<>();
}
return paramsMap;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,91 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.beam.sdk.io.cdap;

import com.google.common.reflect.TypeToken;
import io.cdap.cdap.api.annotation.Name;
import io.cdap.cdap.api.plugin.PluginConfig;
import io.cdap.cdap.common.lang.InstantiatorFactory;
import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import javax.annotation.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

/** Class for getting any filled {@link PluginConfig} configuration object. */
@SuppressWarnings({"assignment.type.incompatible", "UnstableApiUsage", "return.type.incompatible"})
public class PluginConfigInstantiationUtils {

private static final Logger LOG = LoggerFactory.getLogger(PluginConfigInstantiationUtils.class);

/**
* Method for instantiating {@link PluginConfig} object of specific class {@param configClass}.
* After instantiating, it will go over all {@link Field}s with the {@link Name} annotation and
* set the appropriate parameter values from the {@param params} map for them.
*
* @param params map of config fields, where key is the name of the field, value must be String or
chamikaramj marked this conversation as resolved.
Show resolved Hide resolved
* boxed primitive
* @return Config object for given map of arguments and configuration class
*/
static @Nullable <T extends PluginConfig> T getPluginConfig(
Map<String, Object> params, Class<T> configClass) {
chamikaramj marked this conversation as resolved.
Show resolved Hide resolved
// Validate configClass
if (configClass == null) {
throw new IllegalArgumentException("Config class must be not null!");
}
List<Field> allFields = new ArrayList<>();
Class<?> currClass = configClass;
while (currClass != null && !currClass.equals(Object.class)) {
allFields.addAll(
Arrays.stream(currClass.getDeclaredFields())
.filter(
f -> !Modifier.isStatic(f.getModifiers()) && f.isAnnotationPresent(Name.class))
.collect(Collectors.toList()));
currClass = currClass.getSuperclass();
}
InstantiatorFactory instantiatorFactory = new InstantiatorFactory(false);

T config = instantiatorFactory.get(TypeToken.of(configClass)).create();

if (config != null) {
for (Field field : allFields) {
field.setAccessible(true);

Class<?> fieldType = field.getType();

Name declaredAnnotation = field.getDeclaredAnnotation(Name.class);
Object fieldValue =
declaredAnnotation != null ? params.get(declaredAnnotation.value()) : null;

if (fieldValue != null && fieldType.equals(fieldValue.getClass())) {
try {
field.set(config, fieldValue);
} catch (IllegalAccessException e) {
LOG.error("Can not set a field with value {}", fieldValue);
}
}
}
}
return config;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

/** Transforms for reading and writing from CDAP. */
@Experimental(Kind.SOURCE_SINK)
package org.apache.beam.sdk.io.cdap;

import org.apache.beam.sdk.annotations.Experimental;
import org.apache.beam.sdk.annotations.Experimental.Kind;
Loading