pabloem commented on code in PR #24271:
URL: https://github.com/apache/beam/pull/24271#discussion_r1027178961
##########
buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy:
##########
@@ -678,6 +680,8 @@ class BeamModulePlugin implements Plugin<Project> {
joda_time :
"joda-time:joda-time:2.10.10",
jsonassert :
"org.skyscreamer:jsonassert:1.5.0",
jsr305 :
"com.google.code.findbugs:jsr305:$jsr305_version",
+ json_org :
"org.json:json:${json_org_version}",
Review Comment:
ok removed the version thanks!
##########
sdks/java/core/src/main/java/org/apache/beam/sdk/schemas/utils/JsonUtils.java:
##########
@@ -73,6 +78,77 @@ public String apply(Row input) {
};
}
+ public static Schema beamSchemaFromJsonSchema(String jsonSchemaStr) {
+ org.everit.json.schema.ObjectSchema jsonSchema =
jsonSchemaFromString(jsonSchemaStr);
+ return beamSchemaFromJsonSchema(jsonSchema);
+ }
+
+ private static Schema
beamSchemaFromJsonSchema(org.everit.json.schema.ObjectSchema jsonSchema) {
+ Schema.Builder beamSchemaBuilder = Schema.builder();
+ for (String propertyName : jsonSchema.getPropertySchemas().keySet()) {
+ org.everit.json.schema.Schema propertySchema =
+ jsonSchema.getPropertySchemas().get(propertyName);
+ if (propertySchema == null) {
+ throw new IllegalArgumentException("Unable to parse schema " +
jsonSchema.toString());
+ }
+ if
(propertySchema.getClass().equals(org.everit.json.schema.ObjectSchema.class)) {
Review Comment:
oops : ) - fixed
##########
sdks/java/core/src/main/java/org/apache/beam/sdk/schemas/utils/JsonUtils.java:
##########
@@ -73,6 +78,77 @@ public String apply(Row input) {
};
}
+ public static Schema beamSchemaFromJsonSchema(String jsonSchemaStr) {
+ org.everit.json.schema.ObjectSchema jsonSchema =
jsonSchemaFromString(jsonSchemaStr);
+ return beamSchemaFromJsonSchema(jsonSchema);
+ }
+
+ private static Schema
beamSchemaFromJsonSchema(org.everit.json.schema.ObjectSchema jsonSchema) {
+ Schema.Builder beamSchemaBuilder = Schema.builder();
+ for (String propertyName : jsonSchema.getPropertySchemas().keySet()) {
+ org.everit.json.schema.Schema propertySchema =
+ jsonSchema.getPropertySchemas().get(propertyName);
+ if (propertySchema == null) {
+ throw new IllegalArgumentException("Unable to parse schema " +
jsonSchema.toString());
+ }
+ if
(propertySchema.getClass().equals(org.everit.json.schema.ObjectSchema.class)) {
+ beamSchemaBuilder =
+ beamSchemaBuilder.addField(
+ Schema.Field.of(propertyName,
beamTypeFromJsonSchemaType(propertySchema)));
+ } else if
(propertySchema.getClass().equals(org.everit.json.schema.ArraySchema.class)) {
+ beamSchemaBuilder =
+ beamSchemaBuilder.addField(
+ Schema.Field.of(
+ propertyName,
+ Schema.FieldType.array(
+ beamTypeFromJsonSchemaType(
Review Comment:
I've fixed this and added a test.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
