Merge pull request #96 from bwsw/CSEN-92

CSEN-92 The return type of Request child methods was changed to 'Unit'

src/it/scala/com/bwsw/cloudstack/entities/TestEntities.scala

@@ -60,7 +60,9 @@ trait TestEntities {
 
   val retrievedZoneId: UUID = {
     val zoneDao = new ZoneDao(executor, mapper)
-    val zoneFindRequest = new ZoneFindRequest().withAvailableFlag(true)
+    val zoneFindRequest = new ZoneFindRequest()
+    zoneFindRequest.withAvailableFlag(true)
+
     zoneDao.find(zoneFindRequest).head.id
   }
 

src/it/scala/com/bwsw/cloudstack/entities/dao/AccountDaoIntegrationTestSuite.scala

@@ -31,7 +31,9 @@ class AccountDaoIntegrationTestSuite extends FlatSpec with TestEntities {
   val secondAccountId = UUID.randomUUID()
 
   it should "retrieve accounts after their creation" in {
-    val firstFindRequest = new AccountFindRequest().withId(firstAccountId)
+    val firstFindRequest = new AccountFindRequest()
+    firstFindRequest.withId(firstAccountId)
+
     val initAccounts = accountDao.find(firstFindRequest)
 
     assert(initAccounts.isEmpty)
@@ -45,10 +47,14 @@ class AccountDaoIntegrationTestSuite extends FlatSpec with TestEntities {
       username = s"username $firstAccountId"
     )
 
-    val firstAccountCreateRequest = new AccountCreateRequest(firstAccountCreationSettings).withId(firstAccountId)
+    val firstAccountCreateRequest = new AccountCreateRequest(firstAccountCreationSettings)
+    firstAccountCreateRequest.withId(firstAccountId)
+
     accountDao.create(firstAccountCreateRequest)
 
-    val secondFindRequest = new AccountFindRequest().withId(firstAccountId)
+    val secondFindRequest = new AccountFindRequest()
+    secondFindRequest.withId(firstAccountId)
+
     val updatedAccounts = accountDao.find(secondFindRequest)
     assert(updatedAccounts.size == 1 && updatedAccounts.head.id == firstAccountId)
 
@@ -61,7 +67,9 @@ class AccountDaoIntegrationTestSuite extends FlatSpec with TestEntities {
       username = s"username $secondAccountId"
     )
 
-    val secondAccountCreateRequest = new AccountCreateRequest(secondAccountCreationSettings).withId(secondAccountId).withRole(1)
+    val secondAccountCreateRequest = new AccountCreateRequest(secondAccountCreationSettings)
+    secondAccountCreateRequest.withId(secondAccountId)
+    secondAccountCreateRequest.withRole(1)
 
     accountDao.create(secondAccountCreateRequest)
 

src/it/scala/com/bwsw/cloudstack/entities/dao/TagDaoIntegrationTestSuite.scala

@@ -60,7 +60,9 @@ class TagDaoIntegrationTestSuite extends FlatSpec with TestEntities {
       password = "passwd",
       username = s"username $id"
     )
-    val userCreateRequest = new UserCreateRequest(userCreationSettings).withId(id)
+    val userCreateRequest = new UserCreateRequest(userCreationSettings)
+    userCreateRequest.withId(id)
+
     userDao.create(userCreateRequest)
   }
 
@@ -75,7 +77,9 @@ class TagDaoIntegrationTestSuite extends FlatSpec with TestEntities {
       password = "passwd",
       username = s"username $id"
     )
-    val accountCreateRequest = new AccountCreateRequest(accountCreationSettings).withId(id).withName(name)
+    val accountCreateRequest = new AccountCreateRequest(accountCreationSettings)
+    accountCreateRequest.withId(id)
+    accountCreateRequest.withName(name)
 
     domainId match {
       case Some(x) => accountCreateRequest.withDomain(x)
@@ -105,10 +109,14 @@ class TagDaoIntegrationTestSuite extends FlatSpec with TestEntities {
       templateId,
       zoneId
     )
-    val vmCreateRequest = new VmCreateRequest(vmCreationSettings).withDomainAccount(firstAccountName, domainId)
+    val vmCreateRequest = new VmCreateRequest(vmCreationSettings)
+    vmCreateRequest.withDomainAccount(firstAccountName, domainId)
+
     vmDao.create(vmCreateRequest)
 
-    val findByAccountNameRequest = new VmFindRequest().withAccountName(firstAccountName)
+    val findByAccountNameRequest = new VmFindRequest()
+    findByAccountNameRequest.withAccountName(firstAccountName)
+
     vmDao.find(findByAccountNameRequest).head.id
   }
 
@@ -118,7 +126,10 @@ class TagDaoIntegrationTestSuite extends FlatSpec with TestEntities {
     val thirdTag = Tag("key3", "value3")
 
     val tagDao = new TagDao(executor, mapper)
-    val findRequest = new TagFindRequest().withResource(resourceId).withResourceType(tagType)
+    val findRequest = new TagFindRequest()
+    findRequest.withResource(resourceId)
+    findRequest.withResourceType(tagType)
+
     assert(tagDao.find(findRequest).isEmpty)
 
     val firstCreateTagRequest = new TagCreateRequest(TagCreateRequest.Settings(

src/it/scala/com/bwsw/cloudstack/entities/dao/UserDaoIntegrationTestSuite.scala

@@ -30,7 +30,9 @@ class UserDaoIntegrationTestSuite extends FlatSpec with TestEntities {
   val secondUserId = UUID.randomUUID()
 
   it should "retrieve users after their creation" in {
-    val firstFindRequest = new UserFindRequest().withId(firstUserId)
+    val firstFindRequest = new UserFindRequest()
+    firstFindRequest.withId(firstUserId)
+
     val initUsers = userDao.find(firstFindRequest)
 
     assert(initUsers.isEmpty)
@@ -43,10 +45,14 @@ class UserDaoIntegrationTestSuite extends FlatSpec with TestEntities {
       password = "passwd",
       username = s"username $firstUserId"
     )
-    val firstUserCreateRequest = new UserCreateRequest(firstUserCreationSettings).withId(firstUserId)
+    val firstUserCreateRequest = new UserCreateRequest(firstUserCreationSettings)
+    firstUserCreateRequest.withId(firstUserId)
+
     userDao.create(firstUserCreateRequest)
 
-    val secondFindRequest = new UserFindRequest().withId(firstUserId)
+    val secondFindRequest = new UserFindRequest()
+    secondFindRequest.withId(firstUserId)
+
     val updatedUsers = userDao.find(secondFindRequest)
     assert(updatedUsers.size == 1 && updatedUsers.head.id == firstUserId)
 
@@ -59,7 +65,8 @@ class UserDaoIntegrationTestSuite extends FlatSpec with TestEntities {
       username = s"username $secondUserId"
     )
 
-    val secondUserCreateRequest = new UserCreateRequest(secondUserCreationSettings).withId(secondUserId)
+    val secondUserCreateRequest = new UserCreateRequest(secondUserCreationSettings)
+    secondUserCreateRequest.withId(secondUserId)
 
     userDao.create(secondUserCreateRequest)
 

src/it/scala/com/bwsw/cloudstack/entities/dao/VmDaoIntegrationTestSuite.scala

@@ -38,7 +38,9 @@ class VmDaoIntegrationTestSuite extends FlatSpec with TestEntities {
     createAccountWithName(accountDao, firstAccountName, domainId)
     createAccountWithName(accountDao, secondAccountName, domainId)
 
-    val findByAccountNameRequest = new VmFindRequest().withAccountName(firstAccountName)
+    val findByAccountNameRequest = new VmFindRequest()
+    findByAccountNameRequest.withAccountName(firstAccountName)
+
     assert(vmDao.find(findByAccountNameRequest).isEmpty)
 
     val serviceOfferingId = retrievedServiceOfferingId
@@ -50,13 +52,17 @@ class VmDaoIntegrationTestSuite extends FlatSpec with TestEntities {
       templateId,
       zoneId
     )
-    val firstVmCreateRequest = new VmCreateRequest(vmCreationSettings).withDomainAccount(firstAccountName, domainId)
+    val firstVmCreateRequest = new VmCreateRequest(vmCreationSettings)
+    firstVmCreateRequest.withDomainAccount(firstAccountName, domainId)
+
     vmDao.create(firstVmCreateRequest)
 
     val vmsAfterCreation = vmDao.find(findByAccountNameRequest)
     assert(vmsAfterCreation.size == 1 && vmsAfterCreation.head.accountName == firstAccountName)
 
-    val secondVmCreateRequest = new VmCreateRequest(vmCreationSettings).withDomainAccount(secondAccountName, domainId)
+    val secondVmCreateRequest = new VmCreateRequest(vmCreationSettings)
+    secondVmCreateRequest.withDomainAccount(secondAccountName, domainId)
+
     vmDao.create(secondVmCreateRequest)
 
     val findRequest = new VmFindRequest
@@ -76,8 +82,9 @@ class VmDaoIntegrationTestSuite extends FlatSpec with TestEntities {
     )
 
     val firstAccountCreateRequest = new AccountCreateRequest(firstAccountCreationSettings)
-      .withName(name)
-      .withDomain(domainId)
+    firstAccountCreateRequest.withName(name)
+    firstAccountCreateRequest.withDomain(domainId)
+
     accountDao.create(firstAccountCreateRequest)
   }
 }

src/it/scala/com/bwsw/cloudstack/entities/events/AccountEventsRetrievingTest.scala

@@ -41,7 +41,8 @@ class AccountEventsRetrievingTest extends FlatSpec with TestEntities with Before
     username = s"username $accountId"
   )
 
-  val accountCreateRequest = new AccountCreateRequest(accountCreationSettings).withId(accountId)
+  val accountCreateRequest = new AccountCreateRequest(accountCreationSettings)
+  accountCreateRequest.withId(accountId)
   val accountDeleteRequest = new AccountDeleteRequest(accountId)
 
   val consumer = new Consumer(kafkaEndpoint, kafkaTopic)

src/it/scala/com/bwsw/cloudstack/entities/events/UserEventsRetrievingTest.scala

@@ -40,7 +40,8 @@ class UserEventsRetrievingTest extends FlatSpec with TestEntities with BeforeAnd
     username = s"username $userId"
   )
 
-  val userCreateRequest = new UserCreateRequest(userCreationSettings).withId(userId)
+  val userCreateRequest = new UserCreateRequest(userCreationSettings)
+  userCreateRequest.withId(userId)
 
   val consumer = new Consumer(kafkaEndpoint, kafkaTopic)
   consumer.assignToEnd()

src/it/scala/com/bwsw/cloudstack/entities/requests/account/AccountCreateRequestIntegrationTestSuite.scala

@@ -73,13 +73,13 @@ class AccountCreateRequestIntegrationTestSuite extends FlatSpec with TestEntitie
     )
 
     val accountCreateRequest = new AccountCreateRequest(accountCreateSettings)
-      .withId(accountId)
-      .withName(accountName)
-      .withDomain(newDomainId)
-      .withRole(accountRole._1)
-      .withNetworkDomain(networkDomain)
-      .withTimeZone(timeZone)
-      .withUserId(userId)
+    accountCreateRequest.withId(accountId)
+    accountCreateRequest.withName(accountName)
+    accountCreateRequest.withDomain(newDomainId)
+    accountCreateRequest.withRole(accountRole._1)
+    accountCreateRequest.withNetworkDomain(networkDomain)
+    accountCreateRequest.withTimeZone(timeZone)
+    accountCreateRequest.withUserId(userId)
 
     val actualAccount = mapper.deserialize[AccountCreateResponse](executor.executeRequest(accountCreateRequest.getRequest)).accountEntity.account
 

src/it/scala/com/bwsw/cloudstack/entities/requests/account/AccountFindRequestIntegrationTestSuite.scala

@@ -40,22 +40,26 @@ class AccountFindRequestIntegrationTestSuite extends FlatSpec with TestEntities
   it should "throw ApacheCloudStackClientRequestRuntimeException with status code 431" +
     " if entity with a specified value of id parameter does not exist" in {
     val accountId = UUID.randomUUID()
-    val accountFindRequest = new AccountFindRequest().withId(accountId)
+    val accountFindRequest = new AccountFindRequest()
+    accountFindRequest.withId(accountId)
 
     assert(tryExecuteRequest(accountFindRequest))
   }
 
   it should "throw ApacheCloudStackClientRequestRuntimeException with status code 431" +
     " if entity with a specified value of domain parameter does not exist" in {
     val domainId = UUID.randomUUID()
-    val accountFindRequest = new AccountFindRequest().withDomain(domainId)
+    val accountFindRequest = new AccountFindRequest()
+    accountFindRequest.withDomain(domainId)
 
     assert(tryExecuteRequest(accountFindRequest))
   }
 
   it should "return an empty list of accounts if entity with a specified value of name parameter does not exist" in {
     val name = UUID.randomUUID().toString
-    val accountFindRequest = new AccountFindRequest().withName(name)
+    val accountFindRequest = new AccountFindRequest()
+    accountFindRequest.withName(name)
+
     val response = mapper.deserialize[AccountFindResponse](executor.executeRequest(accountFindRequest.getRequest))
 
     assert(response.entityList.entities.isEmpty)

src/it/scala/com/bwsw/cloudstack/entities/requests/tag/TagCreateRequestIntegrationTestSuite.scala

@@ -46,8 +46,10 @@ class TagCreateRequestIntegrationTestSuite extends fixture.FlatSpec with TestEnt
       password = "passwd",
       username = s"username $userId"
     )
-    val userCreateRequest = new UserCreateRequest(userCreationSettings).withId(userId).getRequest
-    mapper.deserialize[UserCreateResponse](executor.executeRequest(userCreateRequest))
+    val userCreateRequest = new UserCreateRequest(userCreationSettings)
+    userCreateRequest.withId(userId)
+
+    mapper.deserialize[UserCreateResponse](executor.executeRequest(userCreateRequest.getRequest))
 
     val theFixture = FixtureParam(resourceIds)
 
@@ -85,8 +87,10 @@ class TagCreateRequestIntegrationTestSuite extends fixture.FlatSpec with TestEnt
   }
 
   private def checkTagCreation(settings: TagCreateRequest.Settings, expectedTags: List[Tag]): Unit = {
-    val tagFindRequest = new TagFindRequest().withResource(settings.resourceIds.head).getRequest
-    val tags = mapper.deserialize[TagTestFindResponse](executor.executeRequest(tagFindRequest)).tags.maybeTags
+    val tagFindRequest = new TagFindRequest()
+    tagFindRequest.withResource(settings.resourceIds.head)
+
+    val tags = mapper.deserialize[TagTestFindResponse](executor.executeRequest(tagFindRequest.getRequest)).tags.maybeTags
 
     assert(
       tags.isDefined &&

src/it/scala/com/bwsw/cloudstack/entities/requests/tag/TagFindRequestIntegrationTestSuite.scala

@@ -40,45 +40,51 @@ class TagFindRequestIntegrationTestSuite extends FlatSpec with TestEntities {
 
   it should "return an empty list of tags if entity with a specified value of resource parameter does not exist" in {
     val resourceId = UUID.randomUUID()
-    val tagFindRequest = new TagFindRequest().withResource(resourceId)
+    val tagFindRequest = new TagFindRequest()
+    tagFindRequest.withResource(resourceId)
 
     checkEmptyResponse(tagFindRequest)
   }
 
   it should "throw ApacheCloudStackClientRequestRuntimeException with status code 431" +
     " if entity with a specified value of domain parameter does not exist" in {
     val domainId = UUID.randomUUID()
-    val tagFindRequest = new TagFindRequest().withDomain(domainId)
+    val tagFindRequest = new TagFindRequest()
+    tagFindRequest.withDomain(domainId)
 
     tryExecuteRequest(tagFindRequest)
   }
 
   it should "throw ApacheCloudStackClientRequestRuntimeException with status code 431" +
     " if entity with a specified value of account name parameter does not exist" in {
     val accountName = UUID.randomUUID().toString
-    val tagFindRequest = new TagFindRequest().withAccountName(accountName)
+    val tagFindRequest = new TagFindRequest()
+    tagFindRequest.withAccountName(accountName)
 
     tryExecuteRequest(tagFindRequest)
   }
 
   it should "return an empty list of tags if entity with a specified value of key parameter does not exist" in {
     val key = UUID.randomUUID().toString
-    val tagFindRequest = new TagFindRequest().withKey(key)
+    val tagFindRequest = new TagFindRequest()
+    tagFindRequest.withKey(key)
 
     checkEmptyResponse(tagFindRequest)
   }
 
   it should "return an empty list of tags if entity with a specified value of value parameter does not exist" in {
     val value = UUID.randomUUID().toString
-    val tagFindRequest = new TagFindRequest().withValue(value)
+    val tagFindRequest = new TagFindRequest()
+    tagFindRequest.withValue(value)
 
     checkEmptyResponse(tagFindRequest)
   }
 
   it should "return an empty list of tags if entity with a specified value of resource type parameter does not exist" in {
     case object IncorrectTagType extends TagType(UUID.randomUUID().toString)
 
-    val tagFindRequest = new TagFindRequest().withResourceType(IncorrectTagType)
+    val tagFindRequest = new TagFindRequest()
+    tagFindRequest.withResourceType(IncorrectTagType)
 
     checkEmptyResponse(tagFindRequest)
   }

src/it/scala/com/bwsw/cloudstack/entities/requests/user/UserCreateRequestIntegrationTestSuite.scala

@@ -63,16 +63,17 @@ class UserCreateRequestIntegrationTestSuite extends FlatSpec with TestEntities {
     val domainCreateRequest = new DomainCreateRequest(domainName).getRequest
     val newDomainId = mapper.deserialize[DomainCreateResponse](executor.executeRequest(domainCreateRequest)).domainEntity.domain.id
 
-    val accountCreateRequest = new AccountCreateRequest(
-      Settings(
-        _type = AccountCreateRequest.User,
-        email = "e@e",
-        firstName = "fn",
-        lastName = "ln",
-        password = "password",
-        username = "username"
-      )
-    ).withName(accountName).withDomain(newDomainId).withId(accountId)
+    val accountCreateRequest = new AccountCreateRequest(Settings(
+      _type = AccountCreateRequest.User,
+      email = "e@e",
+      firstName = "fn",
+      lastName = "ln",
+      password = "password",
+      username = "username"
+    ))
+    accountCreateRequest.withName(accountName)
+    accountCreateRequest.withDomain(newDomainId)
+    accountCreateRequest.withId(accountId)
 
     executor.executeRequest(accountCreateRequest.getRequest)
 
@@ -84,7 +85,10 @@ class UserCreateRequestIntegrationTestSuite extends FlatSpec with TestEntities {
       password = password,
       username = userName
     )
-    val userCreateRequest = new UserCreateRequest(settings).withId(userId).withDomain(newDomainId).withTimeZone(timeZone)
+    val userCreateRequest = new UserCreateRequest(settings)
+    userCreateRequest.withId(userId)
+    userCreateRequest.withDomain(newDomainId)
+    userCreateRequest.withTimeZone(timeZone)
 
     val expectedUser = User(
       id = userId,