Merge branch 'develop'

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)
-                .bundle()
+                .AllBundles()
                 .getEntity();
 
         // Then
@@ -49,7 +49,7 @@ public void should_return_all_bundles_for_specified_locale() {
         final JSONObject bundles = session
                 .bundlesService()
                 .forLocale("de")
-                .bundle()
+                .AllBundles()
                 .getEntity();
 
         // Then

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

@@ -47,7 +47,7 @@ public BundlesService forLocale(String locale) {
         return this;
     }
 
-    public OperationResult<JSONObject> bundle() {
+    public OperationResult<JSONObject> AllBundles() {
         return buildBundleRequest("/bundles").addParam("expanded", "true").get();
     }
 

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

@@ -62,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).bundle();
+        OperationResult<JSONObject> bundles = service.forLocale(null).AllBundles();
         //then
         assertSame(bundles, operationResultMock);
         verify(requestMock).setAccept(MediaType.APPLICATION_JSON);
@@ -86,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").bundle();
+        OperationResult<JSONObject> bundles = service.forLocale("de").AllBundles();
         //then
         assertSame(bundles, operationResultMock);
         verify(requestMock).setAccept(MediaType.APPLICATION_JSON);