Merge branch 'OY-4836' into MERGE__OY-4799__OY-4780__OY-4797__OK-415__OY-4836

Author: msiukola

src/main/scala/fi/vm/sade/hakurekisteri/integration/hakemus/HakemusService.scala

@@ -30,7 +30,12 @@ import fi.vm.sade.hakurekisteri.integration.kouta.{
   KoutaInternalHakukohde
 }
 import fi.vm.sade.hakurekisteri.integration.organisaatio.{Organisaatio, OrganisaatioActorRef}
-import fi.vm.sade.hakurekisteri.integration.{OphUrlProperties, ServiceConfig, VirkailijaRestClient}
+import fi.vm.sade.hakurekisteri.integration.{
+  ExecutorUtil,
+  OphUrlProperties,
+  ServiceConfig,
+  VirkailijaRestClient
+}
 import fi.vm.sade.hakurekisteri.rest.support.{HakurekisteriJsonSupport, Query}
 import fi.vm.sade.properties.OphProperties
 import org.joda.time.{DateTimeZone, LocalDate}
@@ -42,8 +47,7 @@ import java.text.SimpleDateFormat
 import java.util.Date
 import java.util.concurrent.TimeUnit
 import scala.compat.Platform
-import scala.concurrent.ExecutionContext.Implicits.global
-import scala.concurrent.Future
+import scala.concurrent.{ExecutionContext, Future}
 import scala.concurrent.duration._
 import scala.util.{Failure, Success, Try}
 
@@ -192,6 +196,11 @@ class HakemusService(
 )(implicit val system: ActorSystem)
     extends IHakemusService {
 
+  implicit val ec: ExecutionContext = ExecutorUtil.createExecutor(
+    config.integrations.asyncOperationThreadPoolSize,
+    getClass.getSimpleName
+  )
+
   case class SearchParams(
     aoOids: Seq[String] = null,
     asId: String = null,

src/main/scala/fi/vm/sade/hakurekisteri/integration/henkilo/oppijaNumeroRekisteri.scala

@@ -3,7 +3,7 @@ package fi.vm.sade.hakurekisteri.integration.henkilo
 import akka.actor.ActorSystem
 import akka.event.Logging
 import fi.vm.sade.hakurekisteri.Config
-import fi.vm.sade.hakurekisteri.integration.VirkailijaRestClient
+import fi.vm.sade.hakurekisteri.integration.{ExecutorUtil, VirkailijaRestClient}
 import fi.vm.sade.hakurekisteri.integration.hakemus.HakemusHenkilotiedot
 import fi.vm.sade.hakurekisteri.integration.mocks.HenkiloMock
 import org.apache.commons.httpclient.HttpStatus
@@ -12,8 +12,7 @@ import org.json4s.{DefaultFormats, _}
 import support.PersonAliasesProvider
 
 import scala.collection.Iterator
-import scala.concurrent.ExecutionContext.Implicits.global
-import scala.concurrent.Future
+import scala.concurrent.{ExecutionContext, Future}
 import scala.util.{Failure, Success}
 
 /**
@@ -64,6 +63,11 @@ class OppijaNumeroRekisteri(client: VirkailijaRestClient, val system: ActorSyste
     extends IOppijaNumeroRekisteri {
   private val logger = Logging.getLogger(system, this)
 
+  implicit val ec: ExecutionContext = ExecutorUtil.createExecutor(
+    config.integrations.asyncOperationThreadPoolSize,
+    getClass.getSimpleName
+  )
+
   def fetchInBatches(henkiloOids: Set[String], batchSize: Int) = {
     val started = System.currentTimeMillis()
     val batches = henkiloOids.grouped(batchSize).zipWithIndex.toList