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.

Sign up for GitHub

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

HCX-1007 : Flink upgrade from 1.15.2 to 1.18.1, HCX-1008 : Upgrading the Java version of pipeline jobs from 11 to 17. #623

Open
wants to merge 7 commits into
base: sprint-56
Choose a base branch
from
Open

HCX-1007 : Flink upgrade from 1.15.2 to 1.18.1, HCX-1008 : Upgrading the Java version of pipeline jobs from 11 to 17. #623

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
657629b
fix : flink version update
KrutikaPhirangi Mar 4, 2024
821c1b7
Update Dockerfile
KrutikaPhirangi Mar 7, 2024
2532bed
update test
KrutikaPhirangi Mar 7, 2024
30d6732
update
KrutikaPhirangi Mar 7, 2024
3656ea5
update
KrutikaPhirangi Mar 7, 2024
4a07c5d
Update
KrutikaPhirangi Mar 12, 2024
0068793
Update MapSerde.scala
KrutikaPhirangi Mar 13, 2024
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
10 changes: 5 additions & 5 deletions hcx-pipeline-jobs/claims-job/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,20 +40,20 @@
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-streaming-java_${scala.maj.version}</artifactId>
<artifactId>flink-streaming-java</artifactId>
<version>${flink.version}</version>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-clients_${scala.maj.version}</artifactId>
<artifactId>flink-clients</artifactId>
<version>${flink.version}</version>
</dependency>

<!-- Add connector dependencies here. They must be in the default scope (compile). -->
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-connector-kafka_${scala.maj.version}</artifactId>
<version>${flink.version}</version>
<artifactId>flink-connector-kafka</artifactId>
<version>3.0.1-1.18</version>
</dependency>
<dependency>
<groupId>org.swasth</groupId>
Expand Down Expand Up @@ -89,7 +89,7 @@
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-streaming-java_2.12</artifactId>
<artifactId>flink-streaming-java</artifactId>
<version>${flink.version}</version>
<scope>test</scope>
<classifier>tests</classifier>
Expand Down
10 changes: 5 additions & 5 deletions hcx-pipeline-jobs/communication-job/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,20 +40,20 @@
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-streaming-java_${scala.maj.version}</artifactId>
<artifactId>flink-streaming-java</artifactId>
<version>${flink.version}</version>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-clients_${scala.maj.version}</artifactId>
<artifactId>flink-clients</artifactId>
<version>${flink.version}</version>
</dependency>

<!-- Add connector dependencies here. They must be in the default scope (compile). -->
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-connector-kafka_${scala.maj.version}</artifactId>
<version>${flink.version}</version>
<artifactId>flink-connector-kafka</artifactId>
<version>3.0.1-1.18</version>
</dependency>
<dependency>
<groupId>org.swasth</groupId>
Expand Down Expand Up @@ -89,7 +89,7 @@
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-streaming-java_2.12</artifactId>
<artifactId>flink-streaming-java</artifactId>
<version>${flink.version}</version>
<scope>test</scope>
<classifier>tests</classifier>
Expand Down
8 changes: 4 additions & 4 deletions hcx-pipeline-jobs/composite-search-job/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,13 +69,13 @@
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-test-utils_2.12</artifactId>
<artifactId>flink-test-utils</artifactId>
<version>${flink.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-runtime_2.12</artifactId>
<artifactId>flink-runtime</artifactId>
<version>${flink.version}</version>
<scope>test</scope>
<classifier>tests</classifier>
Expand All @@ -100,7 +100,7 @@
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-streaming-java_2.12</artifactId>
<artifactId>flink-streaming-java</artifactId>
<version>${flink.version}</version>
<scope>test</scope>
<classifier>tests</classifier>
Expand All @@ -119,7 +119,7 @@
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-clients_${scala.maj.version}</artifactId>
<artifactId>flink-clients</artifactId>
<version>${flink.version}</version>
</dependency>
<!-- <dependency>-->
Expand Down
13 changes: 9 additions & 4 deletions hcx-pipeline-jobs/core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-connector-kafka_${scala.maj.version}</artifactId>
<version>${flink.version}</version>
<artifactId>flink-connector-kafka</artifactId>
<version>3.0.1-1.18</version>
</dependency>
<dependency>
<groupId>org.apache.kafka</groupId>
Expand Down Expand Up @@ -94,12 +94,12 @@
<dependency>
<groupId>org.apache.kafka</groupId>
<artifactId>kafka_${scala.maj.version}</artifactId>
<version>2.8.0</version>
<version>${kafka.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-test-utils_2.12</artifactId>
<artifactId>flink-test-utils</artifactId>
<version>${flink.version}</version>
<scope>test</scope>
</dependency>
Expand Down Expand Up @@ -138,6 +138,11 @@
<artifactId>elasticsearch-rest-high-level-client</artifactId>
<version>7.2.1</version>
</dependency>
<dependency>
<groupId>com.typesafe</groupId>
<artifactId>config</artifactId>
<version>1.4.2</version>
</dependency>
</dependencies>

<build>
Expand Down
11 changes: 5 additions & 6 deletions hcx-pipeline-jobs/core/src/main/scala/org/swasth/dp/core/cache/DataCache.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
package org.swasth.dp.core.cache

import java.util
import com.google.gson.Gson
import org.slf4j.LoggerFactory
import org.swasth.dp.core.job.BaseJobConfig
import org.swasth.dp.core.util.Constants
import redis.clients.jedis.Jedis
import redis.clients.jedis.exceptions.{JedisConnectionException, JedisException}

import java.util
import scala.collection.JavaConverters._
import scala.collection.mutable
import scala.collection.mutable.Map
Expand Down Expand Up @@ -43,10 +42,10 @@ class DataCache(val config: BaseJobConfig, val redisConnect: RedisConnect, val d
redisValue.length > 0 && redisValue.startsWith("[")
}

def isObject(value: String) = {
val redisValue = value.trim
redisValue.length > 0 && redisValue.startsWith("{")
}
def isObject(value: String) = {
val redisValue = value.trim
redisValue.length > 0 && redisValue.startsWith("{")
}

def convertToComplexDataTypes(data: mutable.Map[String, String]): mutable.Map[String, AnyRef] = {
val result = mutable.Map[String, AnyRef]()
Expand Down
Loading
Loading