Merge pull request #7 from blueapron/update-to-1.0

Upgrade to Kafka 1.0, improve legacy_name usability
blueapron · Mar 29, 2018 · cd2fe32 · cd2fe32
2 parents 433be31 + d12e5f2
commit cd2fe32
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -152,5 +152,6 @@ Create the JAR:
 mvn clean package
 ```
 
-Copy the JAR to `/usr/share/java/kafka-serde-tools` on your local Kafka Connect instance to make the 
+Copy the JAR with dependencies (`kafka-connect-protobuf-converter-*-jar-with-dependencies.jar`) to 
+`/usr/share/java/kafka-serde-tools` on your local Kafka Connect instance to make the 
 converter available in Kafka Connect.
diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
     <groupId>com.blueapron</groupId>
     <artifactId>kafka-connect-protobuf-converter</artifactId>
     <packaging>jar</packaging>
-    <version>1.3.0</version>
+    <version>2.0.0</version>
 
     <properties>
         <protobuf.version>3.4.0</protobuf.version>
@@ -18,7 +18,7 @@
         <dependency>
             <groupId>org.apache.kafka</groupId>
             <artifactId>connect-api</artifactId>
-            <version>0.10.2.1</version>
+            <version>1.0.0</version>
         </dependency>
         <dependency>
             <groupId>com.google.protobuf</groupId>
@@ -61,6 +61,24 @@
                     <target>1.8</target>
                 </configuration>
             </plugin>
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <version>3.1.0</version>
+                <configuration>
+                    <descriptorRefs>
+                        <descriptorRef>jar-with-dependencies</descriptorRef>
+                    </descriptorRefs>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>make-assembly</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/src/main/java/com/blueapron/connect/protobuf/ProtobufData.java b/src/main/java/com/blueapron/connect/protobuf/ProtobufData.java
@@ -68,7 +68,7 @@ private String getProtoMapKey(String descriptorContainingTypeName, String connec
   private String getConnectFieldName(Descriptors.FieldDescriptor descriptor) {
     String name = descriptor.getName();
     for (Map.Entry<Descriptors.FieldDescriptor, Object> option: descriptor.getOptions().getAllFields().entrySet()) {
-      if (option.getKey().getFullName().equalsIgnoreCase(this.legacyName)) {
+      if (option.getKey().getName().equalsIgnoreCase(this.legacyName)) {
         name = option.getValue().toString();
       }
     }