Fix deserializer.open() NPE by moving invocation to all cases

jeffxiang · jeffxiang · commit 8c478c00b9c7 · 2024-02-23T13:29:59.000-05:00
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.pinterest.psc</groupId>
     <artifactId>psc-java-oss</artifactId>
-    <version>3.1.2</version>
+    <version>3.1.3-RC1</version>
     <packaging>pom</packaging>
     <name>psc-java-oss</name>
     <modules>
diff --git a/psc-common/pom.xml b/psc-common/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>psc-java-oss</artifactId>
         <groupId>com.pinterest.psc</groupId>
-        <version>3.1.2</version>
+        <version>3.1.3-RC1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/psc-examples/pom.xml b/psc-examples/pom.xml
@@ -5,13 +5,13 @@
     <parent>
         <artifactId>psc-java-oss</artifactId>
         <groupId>com.pinterest.psc</groupId>
-        <version>3.1.2</version>
+        <version>3.1.3-RC1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>psc-examples</artifactId>
-    <version>3.1.2</version>
+    <version>3.1.3-RC1</version>
     <name>psc-examples</name>
 
     <properties>
diff --git a/psc-flink-logging/pom.xml b/psc-flink-logging/pom.xml
@@ -5,13 +5,13 @@
     <parent>
         <artifactId>psc-java-oss</artifactId>
         <groupId>com.pinterest.psc</groupId>
-        <version>3.1.2</version>
+        <version>3.1.3-RC1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>psc-flink-logging</artifactId>
-    <version>3.1.2</version>
+    <version>3.1.3-RC1</version>
 
     <dependencies>
         <dependency>
diff --git a/psc-flink/pom.xml b/psc-flink/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.pinterest.psc</groupId>
         <artifactId>psc-java-oss</artifactId>
-        <version>3.1.2</version>
+        <version>3.1.3-RC1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>psc-flink</artifactId>
diff --git a/psc-flink/src/main/java/com/pinterest/flink/streaming/connectors/psc/FlinkPscConsumerBase.java b/psc-flink/src/main/java/com/pinterest/flink/streaming/connectors/psc/FlinkPscConsumerBase.java
@@ -752,11 +752,10 @@ public void open(Configuration configuration) throws Exception {
                 LOG.info("Consumer subtask {} initially has no partitions to read from.",
                         getRuntimeContext().getIndexOfThisSubtask());
             }
-
-            this.deserializer.open(RuntimeContextInitializationContextAdapters.deserializationAdapter(this.getRuntimeContext(), (metricGroup) -> {
-                return metricGroup.addGroup("user");
-            }));
         }
+        this.deserializer.open(RuntimeContextInitializationContextAdapters.deserializationAdapter(this.getRuntimeContext(), (metricGroup) -> {
+            return metricGroup.addGroup("user");
+        }));
     }
 
     @Override
diff --git a/psc-integration-test/pom.xml b/psc-integration-test/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>psc-java-oss</artifactId>
         <groupId>com.pinterest.psc</groupId>
-        <version>3.1.2</version>
+        <version>3.1.3-RC1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/psc-logging/pom.xml b/psc-logging/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>psc-java-oss</artifactId>
         <groupId>com.pinterest.psc</groupId>
-        <version>3.1.2</version>
+        <version>3.1.3-RC1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/psc/pom.xml b/psc/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>psc-java-oss</artifactId>
         <groupId>com.pinterest.psc</groupId>
-        <version>3.1.2</version>
+        <version>3.1.3-RC1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

Original file line number	Diff line number	Diff line change
`@@ -752,11 +752,10 @@ public void open(Configuration configuration) throws Exception {`
`752`	`752`	`LOG.info("Consumer subtask {} initially has no partitions to read from.",`
`753`	`753`	`getRuntimeContext().getIndexOfThisSubtask());`
`754`	`754`	`}`
`755`		`-`
`756`		`- this.deserializer.open(RuntimeContextInitializationContextAdapters.deserializationAdapter(this.getRuntimeContext(), (metricGroup) -> {`
`757`		`- return metricGroup.addGroup("user");`
`758`		`- }));`
`759`	`755`	`}`
	`756`	`+ this.deserializer.open(RuntimeContextInitializationContextAdapters.deserializationAdapter(this.getRuntimeContext(), (metricGroup) -> {`
	`757`	`+ return metricGroup.addGroup("user");`
	`758`	`+ }));`
`760`	`759`	`}`
`761`	`760`
`762`	`761`	`@Override`