Skip to content

4.8.36 scala version upgrade #205

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

Open
Sahil-tarento wants to merge 5 commits into
base: cbrelease-4.8.37
Choose a base branch
from
Open

4.8.36 scala version upgrade #205

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
922df3a
Cbrelease 4.8.35 (#199)
ramyaranganathan-1775 Apr 17, 2026
8386521
Cbrelease 4.8.35 (#200)
ramyaranganathan-1775 Apr 20, 2026
8de727a
Cbrelease 4.8.35 (#201)
ramyaranganathan-1775 Apr 21, 2026
4f23394
Cbrelease 4.8.35 (#202)
ramyaranganathan-1775 Apr 21, 2026
c2d8539
scala version upgrade - search service & taxonomy service (#204)
ramyaranganathan-1775 May 4, 2026
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
2 changes: 1 addition & 1 deletion .github/pull_request_template.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Please describe the tests that you ran to verify your changes in the below check
- [ ] Ran Test B

**Test Configuration**:
* Software versions: Java 11, scala-2.11, play-2.7.2
* Software versions: Java 11, scala-2.12, play-2.7.9
* Hardware versions: 2 CPU/ 4GB RAM

### Checklist:
Expand Down
2 changes: 1 addition & 1 deletion .github/pull_request_template.md.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Please describe the tests that you ran to verify your changes in the below check
- [ ] Ran Test B

**Test Configuration**:
* Software versions: Java 11, scala-2.11, play-2.7.2
* Software versions: Java 11, scala-2.12, play-2.7.9
* Hardware versions:

### Checklist:
Expand Down
2 changes: 1 addition & 1 deletion assessment-api/assessment-actors/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
<version>4.4.0</version>
<version>4.8.1</version>
<configuration>
<scalaVersion>${scala.version}</scalaVersion>
<checkMultipleScalaVersions>false</checkMultipleScalaVersions>
Expand Down
6 changes: 3 additions & 3 deletions assessment-api/assessment-actors/src/test/scala/org/sunbird/actors/BaseSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@ package org.sunbird.actors

import java.util
import java.util.concurrent.TimeUnit

import akka.actor.{ActorSystem, Props}
import akka.testkit.TestKit
import org.scalatest.{FlatSpec, Matchers}
import org.scalatest.flatspec.AnyFlatSpec
import org.scalatest.matchers.should.Matchers
import org.sunbird.common.dto.{Request, Response}
import org.sunbird.graph.OntologyEngineContext
import org.sunbird.graph.dac.model.Node

import scala.concurrent.duration.FiniteDuration

class BaseSpec extends FlatSpec with Matchers {
class BaseSpec extends AnyFlatSpec with Matchers {
val system = ActorSystem.create("system")

def testUnknownOperation(props: Props, request: Request)(implicit oec: OntologyEngineContext) = {
Expand Down
27 changes: 14 additions & 13 deletions assessment-api/assessment-actors/src/test/scala/org/sunbird/actors/QuestionActorTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import org.sunbird.graph.{GraphService, OntologyEngineContext}
import org.sunbird.kafka.client.KafkaClient

import scala.collection.JavaConversions._
import scala.collection.JavaConverters
import scala.collection.JavaConverters._
import scala.concurrent.Future
import scala.concurrent.ExecutionContext.Implicits.global
Expand All @@ -35,7 +36,7 @@ class QuestionActorTest extends BaseSpec with MockFactory {

val request = getQuestionRequest()
request.getContext.put("identifier", "do1234")
request.putAll(mapAsJavaMap(Map("channel"-> "in.ekstep","name" -> "New Content", "code" -> "1234", "mimeType"-> "application/vnd.sunbird.question", "primaryCategory" -> "Multiple Choice Question", "visibility" -> "Default")))
request.putAll(JavaConverters.mapAsJavaMap(Map("channel"-> "in.ekstep","name" -> "New Content", "code" -> "1234", "mimeType"-> "application/vnd.sunbird.question", "primaryCategory" -> "Multiple Choice Question", "visibility" -> "Default")))
request.setOperation("createQuestion")
val response = callActor(request, Props(new QuestionActor()))
assert("successful".equals(response.getParams.getStatus))
Expand All @@ -49,7 +50,7 @@ class QuestionActorTest extends BaseSpec with MockFactory {
(graphDB.getNodeByUniqueId(_: String, _: String, _: Boolean, _: Request)).expects(*, *, *, *).returns(Future(node))
val request = getQuestionRequest()
request.getContext.put("identifier", "do1234")
request.putAll(mapAsJavaMap(Map("identifier" -> "do_1234", "fields" -> "")))
request.putAll(JavaConverters.mapAsJavaMap(Map("identifier" -> "do_1234", "fields" -> "")))
request.setOperation("readQuestion")
val response = callActor(request, Props(new QuestionActor()))
assert("successful".equals(response.getParams.getStatus))
Expand All @@ -70,7 +71,7 @@ class QuestionActorTest extends BaseSpec with MockFactory {
val request = getQuestionRequest()
request.getContext.put("identifier","do1234")
request.getRequest.put("channel", "abc-123")
request.putAll(mapAsJavaMap(Map("identifier" -> "do_1234", "fields" -> "")))
request.putAll(JavaConverters.mapAsJavaMap(Map("identifier" -> "do_1234", "fields" -> "")))
request.setOperation("readPrivateQuestion")
val response = callActor(request, Props(new QuestionActor()))
assert("successful".equals(response.getParams.getStatus))
Expand All @@ -81,7 +82,7 @@ class QuestionActorTest extends BaseSpec with MockFactory {
val graphDB = mock[GraphService]
val request = getQuestionRequest()
request.getContext.put("identifier","do1234")
request.putAll(mapAsJavaMap(Map("identifier" -> "do_1234", "fields" -> "")))
request.putAll(JavaConverters.mapAsJavaMap(Map("identifier" -> "do_1234", "fields" -> "")))
request.setOperation("readPrivateQuestion")
val response = callActor(request, Props(new QuestionActor()))
assert(response.getResponseCode == ResponseCode.CLIENT_ERROR)
Expand All @@ -104,7 +105,7 @@ class QuestionActorTest extends BaseSpec with MockFactory {
val request = getQuestionRequest()
request.getContext.put("identifier","do1234")
request.getRequest.put("channel", "abc")
request.putAll(mapAsJavaMap(Map("identifier" -> "do_1234", "fields" -> "")))
request.putAll(JavaConverters.mapAsJavaMap(Map("identifier" -> "do_1234", "fields" -> "")))
request.setOperation("readPrivateQuestion")
val response = callActor(request, Props(new QuestionActor()))
assert(response.getResponseCode == ResponseCode.CLIENT_ERROR)
Expand All @@ -125,7 +126,7 @@ class QuestionActorTest extends BaseSpec with MockFactory {
(graphDB.getNodeByUniqueId(_: String, _: String, _: Boolean, _: Request)).expects(*, *, *, *).returns(Future(node))
val request = getQuestionRequest()
request.getContext.put("identifier", "do1234")
request.putAll(mapAsJavaMap(Map("identifier" -> "do_1234", "fields" -> "")))
request.putAll(JavaConverters.mapAsJavaMap(Map("identifier" -> "do_1234", "fields" -> "")))
request.setOperation("readQuestion")
val response = callActor(request, Props(new QuestionActor()))
assert(response.getResponseCode == ResponseCode.CLIENT_ERROR)
Expand All @@ -145,7 +146,7 @@ class QuestionActorTest extends BaseSpec with MockFactory {

val request = getQuestionRequest()
request.getContext.put("identifier", "do1234")
request.putAll(mapAsJavaMap(Map( "versionKey" -> "1234", "description" -> "updated desc")))
request.putAll(JavaConverters.mapAsJavaMap(Map( "versionKey" -> "1234", "description" -> "updated desc")))
request.setOperation("updateQuestion")
val response = callActor(request, Props(new QuestionActor()))
assert("successful".equals(response.getParams.getStatus))
Expand All @@ -165,7 +166,7 @@ class QuestionActorTest extends BaseSpec with MockFactory {

val request = getQuestionRequest()
request.getContext.put("identifier", "do1234")
request.putAll(mapAsJavaMap(Map( "versionKey" -> "1234", "description" -> "updated desc")))
request.putAll(JavaConverters.mapAsJavaMap(Map( "versionKey" -> "1234", "description" -> "updated desc")))
request.setOperation("reviewQuestion")
val response = callActor(request, Props(new QuestionActor()))
assert("successful".equals(response.getParams.getStatus))
Expand All @@ -181,7 +182,7 @@ class QuestionActorTest extends BaseSpec with MockFactory {
(graphDB.updateNodes(_: String, _: util.List[String], _: util.HashMap[String, AnyRef])).expects(*, *, *).returns(Future(new util.HashMap[String, Node]))
val request = getQuestionRequest()
request.getContext.put("identifier", "do1234")
request.putAll(mapAsJavaMap(Map( "versionKey" -> "1234", "description" -> "updated desc")))
request.putAll(JavaConverters.mapAsJavaMap(Map( "versionKey" -> "1234", "description" -> "updated desc")))
request.setOperation("retireQuestion")
val response = callActor(request, Props(new QuestionActor()))
assert("successful".equals(response.getParams.getStatus))
Expand All @@ -199,7 +200,7 @@ class QuestionActorTest extends BaseSpec with MockFactory {
(kfClient.send(_:String, _:String)).expects(*,*).once()
val request = getQuestionRequest()
request.getContext.put("identifier", "do1234")
request.putAll(mapAsJavaMap(Map( "versionKey" -> "1234", "description" -> "updated desc")))
request.putAll(JavaConverters.mapAsJavaMap(Map( "versionKey" -> "1234", "description" -> "updated desc")))
request.setOperation("publishQuestion")
val response = callActor(request, Props(new QuestionActor()))
assert("successful".equals(response.getParams.getStatus))
Expand Down Expand Up @@ -252,7 +253,7 @@ class QuestionActorTest extends BaseSpec with MockFactory {
(graphDB.getNodeProperty(_: String, _: String, _: String)).expects(*, *, *).returns(Future(new Property("versionKey", new org.neo4j.driver.internal.value.StringValue("1234"))))
val request = getQuestionRequest()
request.getContext.put("identifier", "test_id")
request.putAll(mapAsJavaMap(Map("versionKey" -> "1234", "description" -> "updated desc")))
request.putAll(JavaConverters.mapAsJavaMap(Map("versionKey" -> "1234", "description" -> "updated desc")))
request.setOperation("systemUpdateQuestion")
val response = callActor(request, Props(new QuestionActor()))
assert("successful".equals(response.getParams.getStatus))
Expand Down Expand Up @@ -309,7 +310,7 @@ class QuestionActorTest extends BaseSpec with MockFactory {

val request = getQuestionRequest()
request.getContext.put("identifier", "do1234")
request.putAll(mapAsJavaMap(Map( "versionKey" -> "1234", "description" -> "updated description","rejectComment" -> "Rejected for testing")))
request.putAll(JavaConverters.mapAsJavaMap(Map( "versionKey" -> "1234", "description" -> "updated description","rejectComment" -> "Rejected for testing")))
request.setOperation("rejectQuestion")
val response = callActor(request, Props(new QuestionActor()))
assert("successful".equals(response.getParams.getStatus))
Expand All @@ -335,7 +336,7 @@ class QuestionActorTest extends BaseSpec with MockFactory {
node.setNodeType("DATA_NODE")
node.setObjectType("ObjectCategoryDefinition")
node.setGraphId("domain")
node.setMetadata(mapAsJavaMap(
node.setMetadata(JavaConverters.mapAsJavaMap(
ScalaJsonUtils.deserialize[Map[String,AnyRef]]("{\n \"objectCategoryDefinition\": {\n \"name\": \"Learning Resource\",\n \"description\": \"Content Playlist\",\n \"categoryId\": \"obj-cat:practice_question_set\",\n \"targetObjectType\": \"Content\",\n \"objectMetadata\": {\n \"config\": {},\n \"schema\": {\n \"required\": [\n \"author\",\n \"copyright\",\n \"license\",\n \"audience\"\n ],\n \"properties\": {\n \"audience\": {\n \"type\": \"array\",\n \"items\": {\n \"type\": \"string\",\n \"enum\": [\n \"Student\",\n \"Teacher\"\n ]\n },\n \"default\": [\n \"Student\"\n ]\n },\n \"mimeType\": {\n \"type\": \"string\",\n \"enum\": [\n \"application/pdf\"\n ]\n }\n }\n }\n }\n }\n }")))
node
}
Expand Down
Loading