-
Notifications
You must be signed in to change notification settings - Fork 79
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #720 from Sunbird-Knowlg/release-5.4.1
Merge Release 5.4.1 into 5.5.0
- Loading branch information
Showing
12 changed files
with
209 additions
and
19 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
57 changes: 57 additions & 0 deletions
57
...c/main/scala/org/sunbird/job/qrimagegenerator/functions/QRCodeIndexImageUrlFunction.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,57 @@ | ||
package org.sunbird.job.qrimagegenerator.functions | ||
|
||
import org.apache.flink.api.common.typeinfo.TypeInformation | ||
import org.apache.flink.configuration.Configuration | ||
import org.apache.flink.streaming.api.functions.ProcessFunction | ||
import org.slf4j.LoggerFactory | ||
import org.sunbird.job.exception.InvalidEventException | ||
import org.sunbird.job.qrimagegenerator.domain.Event | ||
import org.sunbird.job.qrimagegenerator.task.QRCodeImageGeneratorConfig | ||
import org.sunbird.job.qrimagegenerator.util.QRCodeImageGeneratorUtil | ||
import org.sunbird.job.util.{CassandraUtil, CloudStorageUtil, ElasticSearchUtil, ScalaJsonUtil} | ||
import org.sunbird.job.{BaseProcessFunction, Metrics} | ||
|
||
import scala.collection.mutable | ||
|
||
class QRCodeIndexImageUrlFunction(config: QRCodeImageGeneratorConfig, | ||
@transient var cassandraUtil: CassandraUtil = null, | ||
@transient var cloudStorageUtil: CloudStorageUtil = null, | ||
@transient var esUtil: ElasticSearchUtil = null, | ||
@transient var qRCodeImageGeneratorUtil: QRCodeImageGeneratorUtil = null) | ||
(implicit val stringTypeInfo: TypeInformation[String]) extends BaseProcessFunction[Event, String](config) { | ||
|
||
private val logger = LoggerFactory.getLogger(classOf[QRCodeIndexImageUrlFunction]) | ||
|
||
override def open(parameters: Configuration): Unit = { | ||
cassandraUtil = new CassandraUtil(config.cassandraHost, config.cassandraPort, config) | ||
esUtil = new ElasticSearchUtil(config.esConnectionInfo, config.dialcodeExternalIndex, config.dialcodeExternalIndexType) | ||
qRCodeImageGeneratorUtil = new QRCodeImageGeneratorUtil(config, cassandraUtil, cloudStorageUtil, esUtil) | ||
super.open(parameters) | ||
} | ||
|
||
override def close(): Unit = { | ||
cassandraUtil.close() | ||
super.close() | ||
} | ||
|
||
override def metricsList(): List[String] = { | ||
List() | ||
} | ||
|
||
@throws(classOf[InvalidEventException]) | ||
override def processElement(event: Event, | ||
context: ProcessFunction[Event, String]#Context, | ||
metrics: Metrics): Unit = { | ||
event.dialCodes.foreach { dialcode => | ||
try { | ||
val text = dialcode("text").asInstanceOf[String] | ||
qRCodeImageGeneratorUtil.indexImageInDocument(text)(esUtil, cassandraUtil) | ||
} catch { | ||
case e: Exception => e.printStackTrace() | ||
throw new InvalidEventException(e.getMessage) | ||
} | ||
} | ||
|
||
} | ||
|
||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -28,4 +28,5 @@ qr.image { | |
imageFormat="png" | ||
bottomMargin=0 | ||
margin=1 | ||
indexImageUrl = false | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.