Renamed methods in BundlesService.class

Author: TanyaEf

src/integration-test/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/bundles/BundlesServiceIT.java

@@ -34,7 +34,7 @@ public void should_return_all_bundles_for_default_locale() {
         final JSONObject bundles = session
                 .bundlesService()
                 .forLocale(null)
-                .bundles()
+                .bundle()
                 .getEntity();
 
         // Then
@@ -49,7 +49,7 @@ public void should_return_all_bundles_for_specified_locale() {
         final JSONObject bundles = session
                 .bundlesService()
                 .forLocale("de")
-                .bundles()
+                .bundle()
                 .getEntity();
 
         // Then
@@ -64,7 +64,7 @@ public void should_return__bundle_by_name_for_specified_locale() {
         final JSONObject bundle = session
                 .bundlesService()
                 .forLocale("de")
-                .bundles("jasperserver_messages")
+                .bundle("jasperserver_messages")
                 .getEntity();
 
         // Then
@@ -79,7 +79,7 @@ public void should_return__bundle_by_name_for_default_locale() {
         final JSONObject bundle = session
                 .bundlesService()
                 .forLocale(null)
-                .bundles("jasperserver_messages")
+                .bundle("jasperserver_messages")
                 .getEntity();
 
         // Then

src/main/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/bundles/BundlesService.java

@@ -22,15 +22,13 @@
 package com.jaspersoft.jasperserver.jaxrs.client.apiadapters.bundles;
 
 import com.jaspersoft.jasperserver.jaxrs.client.apiadapters.AbstractAdapter;
-import com.jaspersoft.jasperserver.jaxrs.client.apiadapters.settings.SingleSettingsAdapter;
 import com.jaspersoft.jasperserver.jaxrs.client.core.JerseyRequest;
 import com.jaspersoft.jasperserver.jaxrs.client.core.SessionStorage;
 import com.jaspersoft.jasperserver.jaxrs.client.core.exceptions.handling.DefaultErrorHandler;
 import com.jaspersoft.jasperserver.jaxrs.client.core.operationresult.OperationResult;
-import org.codehaus.jettison.json.JSONObject;
-
-import javax.ws.rs.core.MediaType;
 import java.util.Locale;
+import javax.ws.rs.core.MediaType;
+import org.codehaus.jettison.json.JSONObject;
 
 
 public class BundlesService extends AbstractAdapter {
@@ -49,11 +47,11 @@ public BundlesService forLocale(String locale) {
         return this;
     }
 
-    public OperationResult<JSONObject> bundles() {
+    public OperationResult<JSONObject> bundle() {
         return buildBundleRequest("/bundles").addParam("expanded", "true").get();
     }
 
-    public OperationResult<JSONObject> bundles(String name) {
+    public OperationResult<JSONObject> bundle(String name) {
         return buildBundleRequest("/bundles", name).get();
     }
 

src/test/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/bundles/BundlesServiceTest.java

@@ -2,28 +2,30 @@
 
 import com.jaspersoft.jasperserver.jaxrs.client.apiadapters.serverInfo.ServerInfoService;
 import com.jaspersoft.jasperserver.jaxrs.client.core.JerseyRequest;
-import com.jaspersoft.jasperserver.jaxrs.client.core.RequestBuilder;
 import com.jaspersoft.jasperserver.jaxrs.client.core.SessionStorage;
 import com.jaspersoft.jasperserver.jaxrs.client.core.exceptions.handling.DefaultErrorHandler;
 import com.jaspersoft.jasperserver.jaxrs.client.core.operationresult.OperationResult;
+import java.util.Locale;
+import javax.ws.rs.core.MediaType;
 import org.codehaus.jettison.json.JSONObject;
 import org.mockito.Mock;
 import org.mockito.internal.util.reflection.Whitebox;
-import org.powermock.api.mockito.PowerMockito;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.testng.PowerMockTestCase;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
-import javax.ws.rs.core.MediaType;
-
-import java.util.Locale;
-
-import static org.mockito.Matchers.*;
-import static org.mockito.Mockito.*;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Matchers.isA;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 import static org.mockito.MockitoAnnotations.initMocks;
 import static org.powermock.api.mockito.PowerMockito.mockStatic;
-import static org.powermock.api.mockito.PowerMockito.verifyPrivate;
 import static org.powermock.api.mockito.PowerMockito.verifyStatic;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertSame;
@@ -60,7 +62,7 @@ public void should_return_proper_bundles_for_default_locale() throws Exception {
         doReturn(requestMock).when(requestMock).setAccept(anyString());
         doReturn(operationResultMock).when(requestMock).get();
         //when
-        OperationResult<JSONObject> bundles = service.forLocale(null).bundles();
+        OperationResult<JSONObject> bundles = service.forLocale(null).bundle();
         //then
         assertSame(bundles, operationResultMock);
         verify(requestMock).setAccept(MediaType.APPLICATION_JSON);
@@ -84,7 +86,7 @@ public void should_return_proper_bundles_for_locale() throws Exception {
         doReturn(requestMock).when(requestMock).setAccept(anyString());
         doReturn(operationResultMock).when(requestMock).get();
         //when
-        OperationResult<JSONObject> bundles = service.forLocale("de").bundles();
+        OperationResult<JSONObject> bundles = service.forLocale("de").bundle();
         //then
         assertSame(bundles, operationResultMock);
         verify(requestMock).setAccept(MediaType.APPLICATION_JSON);
@@ -106,7 +108,7 @@ public void should_return_proper_bundles_by_name_for_locale() throws Exception {
         doReturn(requestMock).when(requestMock).setAccept(anyString());
         doReturn(operationResultMock).when(requestMock).get();
         //when
-        OperationResult<JSONObject> bundles = service.forLocale("de").bundles("jasperserver_messages");
+        OperationResult<JSONObject> bundles = service.forLocale("de").bundle("jasperserver_messages");
         //then
         assertSame(bundles, operationResultMock);
         verify(requestMock).setAccept(MediaType.APPLICATION_JSON);
@@ -126,7 +128,7 @@ public void should_return_proper_bundles_by_name_for_default_locale() throws Exc
         doReturn(requestMock).when(requestMock).setAccept(anyString());
         doReturn(operationResultMock).when(requestMock).get();
         //when
-        OperationResult<JSONObject> bundles = service.forLocale(null).bundles("jasperserver_messages");
+        OperationResult<JSONObject> bundles = service.forLocale(null).bundle("jasperserver_messages");
         //then
         assertSame(bundles, operationResultMock);
         verify(requestMock).setAccept(MediaType.APPLICATION_JSON);