Merge branch 'master' into bugFix

Author: TanyaEf

src/integration-test/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/authority/users/UsersServiceIT.java

@@ -1,14 +1,15 @@
 package com.jaspersoft.jasperserver.jaxrs.client.apiadapters.authority.users;
 
 import com.jaspersoft.jasperserver.dto.authority.ClientUser;
-import com.jaspersoft.jasperserver.jaxrs.client.core.*;
+import com.jaspersoft.jasperserver.jaxrs.client.core.JasperserverRestClient;
+import com.jaspersoft.jasperserver.jaxrs.client.core.RestClientConfiguration;
+import com.jaspersoft.jasperserver.jaxrs.client.core.Session;
+import java.util.List;
 import org.testng.Assert;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
-import java.util.List;
-
 /**
  * @author Alexander Krasnyanskiy
  */

src/integration-test/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/reporting/ReportingServiceIT.java

@@ -10,6 +10,7 @@
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
+
 /**
  * @author Alex Krasnyanskiy
  * @author Tetiana Iefimenko

src/integration-test/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/resources/ResourcesServiceIT.java

@@ -15,6 +15,7 @@
 
 /**
  * @author Alexander Krasnyanskiy
+ * @author tetiana Iefimenko
  */
 public class ResourcesServiceIT {
 

src/test/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/settings/SettingsServiceTest.java

@@ -1,8 +1,6 @@
 package com.jaspersoft.jasperserver.jaxrs.client.apiadapters.settings;
 
-import com.jaspersoft.jasperserver.jaxrs.client.core.JerseyRequest;
 import com.jaspersoft.jasperserver.jaxrs.client.core.SessionStorage;
-import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.testng.PowerMockTestCase;
 import org.testng.annotations.Test;
 
@@ -12,13 +10,13 @@
 /**
  * @author Tetiana Iefimenko
  */
-@PrepareForTest({JerseyRequest.class})
-public class SettingsServiceTest extends PowerMockTestCase {
 
-    private SettingsService service =  new SettingsService(mock(SessionStorage.class));
+public class SettingsServiceTest extends PowerMockTestCase {
 
     @Test
     public void should_return_proper_settings_adapter() throws Exception {
+        //given
+        SettingsService service =  new SettingsService(mock(SessionStorage.class));
         //when
         SingleSettingsAdapter retrieved = service.settings();
         //then