From 9d645aa74e1ae88850a5b275f51b31eda12284b6 Mon Sep 17 00:00:00 2001 From: Bhooshan Mogal Date: Fri, 10 Nov 2017 13:12:55 -0800 Subject: [PATCH 1/4] update icons and version --- icons/CobolRecordConverter-transform.png | Bin 0 -> 3957 bytes pom.xml | 104 +++----------------- widgets/CobolRecordConverter-transform.json | 5 +- 3 files changed, 18 insertions(+), 91 deletions(-) create mode 100644 icons/CobolRecordConverter-transform.png diff --git a/icons/CobolRecordConverter-transform.png b/icons/CobolRecordConverter-transform.png new file mode 100644 index 0000000000000000000000000000000000000000..53558492adbc46a5516aba90c8a1506c9d87815b GIT binary patch literal 3957 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 literal 0 HcmV?d00001 diff --git a/pom.xml b/pom.xml index bba9d09..a5873c4 100644 --- a/pom.xml +++ b/pom.xml @@ -4,31 +4,17 @@ co.cask cobol-to-avro-transform jar - 1.0-SNAPSHOT + 1.0.0 + Cobol to Avro Transform + 1.7.7 - 4.1.0 + 4.3.1 18.0 3.0.7 0.4.2 1.2.3 UTF-8 - - - widgets - docs - - - [3.3.0,10.0.0-SNAPSHOT) - - - - system:cdap-etl-batch, - system:cdap-data-pipeline, - system:cdap-data-streams - - ${project.basedir} @@ -98,81 +84,21 @@ - org.apache.maven.plugins - maven-antrun-plugin - 1.7 + co.cask + cdap-maven-plugin + 1.0.0-SNAPSHOT + + + system:cdap-data-pipeline[4.0.0,5.0.0-SNAPSHOT) + system:cdap-data-streams[4.0.0,5.0.0-SNAPSHOT) + + create-artifact-config prepare-package - - - - - - run + create-plugin-json @@ -214,4 +140,4 @@ - \ No newline at end of file + diff --git a/widgets/CobolRecordConverter-transform.json b/widgets/CobolRecordConverter-transform.json index 66a1525..14db757 100644 --- a/widgets/CobolRecordConverter-transform.json +++ b/widgets/CobolRecordConverter-transform.json @@ -1,7 +1,8 @@ { "metadata": { - "spec-version": "1.0" + "spec-version": "1.5" }, + "display-name": "COBOL to Avro Converter", "configuration-groups": [ { "label": "COBOL to Avro Record Converter Configuration", @@ -80,4 +81,4 @@ } } ] -} \ No newline at end of file +} From 74b6b379c89e1e720cbaabf7c06c210ddb279b22 Mon Sep 17 00:00:00 2001 From: anew Date: Mon, 15 Apr 2019 17:51:25 -0700 Subject: [PATCH 2/4] v1.1.0 for package rename, update to cdap6 --- README.md | 2 +- pom.xml | 41 +++++++++++++------ .../plugin/cobol}/CobolRecordConverter.java | 39 +++++++++--------- .../cdap/plugin}/cobol/CopybookReader.java | 10 ++--- .../cdap/plugin}/common/AvroConverter.java | 8 ++-- .../plugin}/common/LocationByteSource.java | 4 +- .../plugin}/common/LocationCharSource.java | 4 +- .../cdap/plugin}/common/StreamByteSource.java | 4 +- .../cdap/plugin}/common/StreamCharSource.java | 4 +- .../cdap/plugin}/cobol/SimpleTest.java | 14 +++---- src/test/resources/logback-test.xml | 2 +- 11 files changed, 74 insertions(+), 58 deletions(-) rename src/main/java/{co/cask/plugin => io/cdap/plugin/cobol}/CobolRecordConverter.java (85%) rename src/main/java/{co/cask => io/cdap/plugin}/cobol/CopybookReader.java (97%) rename src/main/java/{co/cask => io/cdap/plugin}/common/AvroConverter.java (98%) rename src/main/java/{co/cask => io/cdap/plugin}/common/LocationByteSource.java (93%) rename src/main/java/{co/cask => io/cdap/plugin}/common/LocationCharSource.java (94%) rename src/main/java/{co/cask => io/cdap/plugin}/common/StreamByteSource.java (93%) rename src/main/java/{co/cask => io/cdap/plugin}/common/StreamCharSource.java (93%) rename src/test/java/{co/cask => io/cdap/plugin}/cobol/SimpleTest.java (85%) diff --git a/README.md b/README.md index 151fc8d..8556a7f 100644 --- a/README.md +++ b/README.md @@ -68,7 +68,7 @@ CDAP Slack Channel: http://cdap-users.herokuapp.com/ ## License and Trademarks -Copyright © 2017 Cask Data, Inc. +Copyright © 2017-2019 Cask Data, Inc. Licensed 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 diff --git a/pom.xml b/pom.xml index a5873c4..24227bd 100644 --- a/pom.xml +++ b/pom.xml @@ -1,7 +1,24 @@ + + + 4.0.0 - co.cask + io.cdap.plugin cobol-to-avro-transform jar 1.0.0 @@ -9,24 +26,24 @@ 1.7.7 - 4.3.1 + 6.0.0-SNAPSHOT 18.0 3.0.7 0.4.2 1.2.3 UTF-8 - - ${project.basedir} + system:cdap-data-streams[6.0.0-SNAPSHOT,7.0.0-SNAPSHOT) + system:cdap-data-pipeline[6.0.0-SNAPSHOT,7.0.0-SNAPSHOT) - co.cask.cdap + io.cdap.cdap cdap-api ${cdap.version} - co.cask.cdap + io.cdap.cdap cdap-etl-api ${cdap.version} @@ -75,7 +92,7 @@ test - co.cask.cdap + io.cdap.cdap cdap-formats ${cdap.version} @@ -84,13 +101,13 @@ - co.cask + io.cdap cdap-maven-plugin - 1.0.0-SNAPSHOT + 1.1.0 - system:cdap-data-pipeline[4.0.0,5.0.0-SNAPSHOT) - system:cdap-data-streams[4.0.0,5.0.0-SNAPSHOT) + ${data.pipeline.parent} + ${data.stream.parent} @@ -120,7 +137,7 @@ <_exportcontents> - co.cask.*; + io.cdap.plugin.*; com.google.common.*; com.legstar.* diff --git a/src/main/java/co/cask/plugin/CobolRecordConverter.java b/src/main/java/io/cdap/plugin/cobol/CobolRecordConverter.java similarity index 85% rename from src/main/java/co/cask/plugin/CobolRecordConverter.java rename to src/main/java/io/cdap/plugin/cobol/CobolRecordConverter.java index 3f675ac..d1598e7 100644 --- a/src/main/java/co/cask/plugin/CobolRecordConverter.java +++ b/src/main/java/io/cdap/plugin/cobol/CobolRecordConverter.java @@ -1,5 +1,5 @@ /* - * Copyright © 2017 Cask Data, Inc. + * Copyright © 2017-2019 Cask Data, Inc. * * Licensed 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 @@ -14,25 +14,24 @@ * the License. */ -package co.cask.plugin; - -import co.cask.cdap.api.annotation.Description; -import co.cask.cdap.api.annotation.Macro; -import co.cask.cdap.api.annotation.Name; -import co.cask.cdap.api.annotation.Plugin; -import co.cask.cdap.api.data.format.StructuredRecord; -import co.cask.cdap.api.plugin.EndpointPluginContext; -import co.cask.cdap.api.plugin.PluginConfig; -import co.cask.cdap.etl.api.Emitter; -import co.cask.cdap.etl.api.Transform; -import co.cask.cdap.etl.api.TransformContext; -import co.cask.cdap.format.StructuredRecordStringConverter; -import co.cask.cobol.CopybookReader; -import co.cask.common.AvroConverter; -import co.cask.common.StreamByteSource; -import co.cask.common.StreamCharSource; +package io.cdap.plugin.cobol; + import com.legstar.avro.cob2avro.io.AbstractZosDatumReader; import com.legstar.cob2xsd.Cob2XsdConfig; +import io.cdap.cdap.api.annotation.Description; +import io.cdap.cdap.api.annotation.Macro; +import io.cdap.cdap.api.annotation.Name; +import io.cdap.cdap.api.annotation.Plugin; +import io.cdap.cdap.api.data.format.StructuredRecord; +import io.cdap.cdap.api.plugin.EndpointPluginContext; +import io.cdap.cdap.api.plugin.PluginConfig; +import io.cdap.cdap.etl.api.Emitter; +import io.cdap.cdap.etl.api.Transform; +import io.cdap.cdap.etl.api.TransformContext; +import io.cdap.cdap.format.StructuredRecordStringConverter; +import io.cdap.plugin.common.AvroConverter; +import io.cdap.plugin.common.StreamByteSource; +import io.cdap.plugin.common.StreamCharSource; import org.apache.avro.Schema; import org.apache.avro.generic.GenericRecord; import org.slf4j.Logger; @@ -61,7 +60,7 @@ public CobolRecordConverter(Config config) { private CopybookReader copybookReader; private Schema avroSchema; - private co.cask.cdap.api.data.schema.Schema schema; + private io.cdap.cdap.api.data.schema.Schema schema; @Override public void initialize(TransformContext context) throws Exception { @@ -107,7 +106,7 @@ private String getCodeFormat() { * @throws IOException if there are any errors converting schema */ @javax.ws.rs.Path("outputSchema") - public co.cask.cdap.api.data.schema.Schema getSchema(GetSchemaRequest request, + public io.cdap.cdap.api.data.schema.Schema getSchema(GetSchemaRequest request, EndpointPluginContext pluginContext) throws IOException { Properties properties = new Properties(); properties.setProperty(Cob2XsdConfig.CODE_FORMAT, request.getCodeFormat()); diff --git a/src/main/java/co/cask/cobol/CopybookReader.java b/src/main/java/io/cdap/plugin/cobol/CopybookReader.java similarity index 97% rename from src/main/java/co/cask/cobol/CopybookReader.java rename to src/main/java/io/cdap/plugin/cobol/CopybookReader.java index 74f296e..406c58a 100644 --- a/src/main/java/co/cask/cobol/CopybookReader.java +++ b/src/main/java/io/cdap/plugin/cobol/CopybookReader.java @@ -1,5 +1,5 @@ /* - * Copyright © 2017 Cask Data, Inc. + * Copyright © 2017-2019 Cask Data, Inc. * * Licensed 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 @@ -14,7 +14,7 @@ * the License. */ -package co.cask.cobol; +package io.cdap.plugin.cobol; import com.github.jknack.handlebars.Handlebars; import com.github.jknack.handlebars.Template; @@ -75,13 +75,13 @@ public CopybookReader(CharSource copybookSource, Properties cobolConfig) throws // Generate XML schema from the copybook XmlSchema xmlSchema = new XmlSchemaCollection().read( - cob2xsd.emitXsd(cobolDataItems, "co.cask.cobol").getSchemaDocument()); + cob2xsd.emitXsd(cobolDataItems, "io.cdap.plugin.cobol").getSchemaDocument()); // Convert XML schema to Avro schema Schema avroSchema = translate(xmlSchema); // Generate the CobolType classes ClassLoader - this.cobolTypeClassLoader = createCobolTypesClassLoader(xmlSchema, "co.cask.cobol"); + this.cobolTypeClassLoader = createCobolTypesClassLoader(xmlSchema, "io.cdap.plugin.cobol"); this.avroSchema = avroSchema; } catch (RecognizerException e) { throw new IOException("Failed to parse cobol copybook: " + System.lineSeparator() @@ -170,7 +170,7 @@ private List parseCopybook(Cob2Xsd cob2xsd, Reader reader) throws */ private Schema translate(XmlSchema xmlSchema) throws Xsd2AvroTranslatorException { Xsd2AvroTranslator avroTranslator = new Xsd2AvroTranslator(); - return new Schema.Parser().parse(avroTranslator.translate(xmlSchema, "co.cask.cobol", "schema")); + return new Schema.Parser().parse(avroTranslator.translate(xmlSchema, "io.cdap.plugin.cobol", "schema")); } /** diff --git a/src/main/java/co/cask/common/AvroConverter.java b/src/main/java/io/cdap/plugin/common/AvroConverter.java similarity index 98% rename from src/main/java/co/cask/common/AvroConverter.java rename to src/main/java/io/cdap/plugin/common/AvroConverter.java index a265d83..db4ea7f 100644 --- a/src/main/java/co/cask/common/AvroConverter.java +++ b/src/main/java/io/cdap/plugin/common/AvroConverter.java @@ -1,5 +1,5 @@ /* - * Copyright © 2017 Cask Data, Inc. + * Copyright © 2017-2019 Cask Data, Inc. * * Licensed 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 @@ -14,13 +14,13 @@ * the License. */ -package co.cask.common; +package io.cdap.plugin.common; -import co.cask.cdap.api.data.format.StructuredRecord; -import co.cask.cdap.api.data.schema.Schema; import com.google.common.base.Function; import com.google.common.base.Preconditions; import com.google.common.collect.Iterables; +import io.cdap.cdap.api.data.format.StructuredRecord; +import io.cdap.cdap.api.data.schema.Schema; import org.apache.avro.generic.GenericArray; import org.apache.avro.generic.GenericEnumSymbol; import org.apache.avro.generic.GenericFixed; diff --git a/src/main/java/co/cask/common/LocationByteSource.java b/src/main/java/io/cdap/plugin/common/LocationByteSource.java similarity index 93% rename from src/main/java/co/cask/common/LocationByteSource.java rename to src/main/java/io/cdap/plugin/common/LocationByteSource.java index 84c9430..6a41ffc 100644 --- a/src/main/java/co/cask/common/LocationByteSource.java +++ b/src/main/java/io/cdap/plugin/common/LocationByteSource.java @@ -1,5 +1,5 @@ /* - * Copyright © 2017 Cask Data, Inc. + * Copyright © 2017-2019 Cask Data, Inc. * * Licensed 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 @@ -14,7 +14,7 @@ * the License. */ -package co.cask.common; +package io.cdap.plugin.common; import com.google.common.io.ByteSource; import org.apache.twill.filesystem.Location; diff --git a/src/main/java/co/cask/common/LocationCharSource.java b/src/main/java/io/cdap/plugin/common/LocationCharSource.java similarity index 94% rename from src/main/java/co/cask/common/LocationCharSource.java rename to src/main/java/io/cdap/plugin/common/LocationCharSource.java index 27b9572..8a814d6 100644 --- a/src/main/java/co/cask/common/LocationCharSource.java +++ b/src/main/java/io/cdap/plugin/common/LocationCharSource.java @@ -1,5 +1,5 @@ /* - * Copyright © 2017 Cask Data, Inc. + * Copyright © 2017-2019 Cask Data, Inc. * * Licensed 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 @@ -14,7 +14,7 @@ * the License. */ -package co.cask.common; +package io.cdap.plugin.common; import com.google.common.io.CharSource; import org.apache.twill.filesystem.Location; diff --git a/src/main/java/co/cask/common/StreamByteSource.java b/src/main/java/io/cdap/plugin/common/StreamByteSource.java similarity index 93% rename from src/main/java/co/cask/common/StreamByteSource.java rename to src/main/java/io/cdap/plugin/common/StreamByteSource.java index 6189584..8eb8858 100644 --- a/src/main/java/co/cask/common/StreamByteSource.java +++ b/src/main/java/io/cdap/plugin/common/StreamByteSource.java @@ -1,5 +1,5 @@ /* - * Copyright © 2017 Cask Data, Inc. + * Copyright © 2017-2019 Cask Data, Inc. * * Licensed 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 @@ -14,7 +14,7 @@ * the License. */ -package co.cask.common; +package io.cdap.plugin.common; import com.google.common.io.ByteSource; diff --git a/src/main/java/co/cask/common/StreamCharSource.java b/src/main/java/io/cdap/plugin/common/StreamCharSource.java similarity index 93% rename from src/main/java/co/cask/common/StreamCharSource.java rename to src/main/java/io/cdap/plugin/common/StreamCharSource.java index 195a006..7ecaf3e 100644 --- a/src/main/java/co/cask/common/StreamCharSource.java +++ b/src/main/java/io/cdap/plugin/common/StreamCharSource.java @@ -1,5 +1,5 @@ /* - * Copyright © 2017 Cask Data, Inc. + * Copyright © 2017-2019 Cask Data, Inc. * * Licensed 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 @@ -14,7 +14,7 @@ * the License. */ -package co.cask.common; +package io.cdap.plugin.common; import com.google.common.io.CharSource; diff --git a/src/test/java/co/cask/cobol/SimpleTest.java b/src/test/java/io/cdap/plugin/cobol/SimpleTest.java similarity index 85% rename from src/test/java/co/cask/cobol/SimpleTest.java rename to src/test/java/io/cdap/plugin/cobol/SimpleTest.java index 9883510..d2e1b45 100644 --- a/src/test/java/co/cask/cobol/SimpleTest.java +++ b/src/test/java/io/cdap/plugin/cobol/SimpleTest.java @@ -1,5 +1,5 @@ /* - * Copyright © 2017 Cask Data, Inc. + * Copyright © 2017-2019 Cask Data, Inc. * * Licensed 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 @@ -14,14 +14,14 @@ * the License. */ -package co.cask.cobol; +package io.cdap.plugin.cobol; -import co.cask.cdap.api.data.format.StructuredRecord; -import co.cask.cdap.api.data.schema.Schema; -import co.cask.cdap.format.StructuredRecordStringConverter; -import co.cask.common.AvroConverter; import com.google.common.io.Resources; import com.legstar.avro.cob2avro.io.AbstractZosDatumReader; +import io.cdap.cdap.api.data.format.StructuredRecord; +import io.cdap.cdap.api.data.schema.Schema; +import io.cdap.cdap.format.StructuredRecordStringConverter; +import io.cdap.plugin.common.AvroConverter; import org.apache.avro.generic.GenericRecord; import org.junit.Assert; import org.junit.ClassRule; @@ -63,7 +63,7 @@ public void test() throws Exception { copybookReader.createRecordReader(Resources.asByteSource(dataURL), "IBM01140", true)) { for (GenericRecord record : reader) { StructuredRecord structuredRecord = AvroConverter.fromAvroRecord(record, schema); - LOG.info(StructuredRecordStringConverter.toJsonString(structuredRecord)); + LOG.trace(StructuredRecordStringConverter.toJsonString(structuredRecord)); } } } diff --git a/src/test/resources/logback-test.xml b/src/test/resources/logback-test.xml index b3e2101..818825d 100644 --- a/src/test/resources/logback-test.xml +++ b/src/test/resources/logback-test.xml @@ -24,7 +24,7 @@ - + From 5017e2ebe2d3f62e0463f17a295129cfa73fa70f Mon Sep 17 00:00:00 2001 From: anew Date: Tue, 16 Apr 2019 09:41:19 -0700 Subject: [PATCH 3/4] actually bump to 1.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 24227bd..68182b4 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ io.cdap.plugin cobol-to-avro-transform jar - 1.0.0 + 1.1.0 Cobol to Avro Transform From 535e79fb348a44d8ab9cb3562d7fbe61beac60ff Mon Sep 17 00:00:00 2001 From: anew Date: Tue, 16 Apr 2019 10:16:37 -0700 Subject: [PATCH 4/4] bump develop to 1.2.0-SNAPSHOT --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 68182b4..d309125 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ io.cdap.plugin cobol-to-avro-transform jar - 1.1.0 + 1.2.0-SNAPSHOT Cobol to Avro Transform