Merge pull request #109 from TanyaEf/master

Added BundlesService support

Author: yaroslav-kovalchyk

README.md

@@ -109,13 +109,14 @@ Table of Contents
 12. [Thumbnail Search Service](#thumbnail-search-service).
 13. [Query executor service](#queryexecutor-service).
 14. [REST Server Information](#rest-server-information).
-15. [Exception handling](#exception-handling).
-16. [Asynchronous API](#asynchronous-api).
-17. [Getting serialized content from response](#getting-serialized-content-from-response).
-18. [Switching between JSON and XML](#switching-between-json-and-xml).
-19. [Possible issues](#possible-issues).
-20. [Maven dependency to add jasperserver-rest-client to your app](#maven-dependency-to-add-jasperserver-rest-client-to-your-app).
-21. [License](#license).
+15. [Bundles service](#bundles-service).
+16. [Exception handling](#exception-handling).
+17. [Asynchronous API](#asynchronous-api).
+18. [Getting serialized content from response](#getting-serialized-content-from-response).
+19. [Switching between JSON and XML](#switching-between-json-and-xml).
+20. [Possible issues](#possible-issues).
+21. [Maven dependency to add jasperserver-rest-client to your app](#maven-dependency-to-add-jasperserver-rest-client-to-your-app).
+22. [License](#license).
 
 Introduction
 -------------
@@ -1542,7 +1543,24 @@ OperationResult<String> result = client
 
 String edition = result.getEntity();
 ```
-
+###Bundles service
+Use bundles service to get bundles of internalization properties for particular or default user’s locale as JSON. To get all bundles for particular locale(foe example, "de") use the code below:
+```java
+final JSONObject bundles = session
+        .bundlesService()
+        .forLocale("de")
+        .allBundles()
+        .getEntity();
+```
+If you pass `null` in `.forLocale()` method, you will get bundles for your default locale.
+To get bundle by name you should specified locale in `.forLocale()` method and name of the bundle in `.bundles()` method:
+```java
+final JSONObject bundle = session
+        .bundlesService()
+        .forLocale("en_US")
+        .bundle("jasperserver_messages")
+        .getEntity();
+```
 ###Exception handling
 You can customize exception handling for each endpoint. To do this you need to pass `com.jaspersoft.jasperserver.jaxrs.client.core.exceptions.handling.ErrorHandler` implementation to `JerseyRequestBuilder.buildRequest()` factory method.
 

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

@@ -0,0 +1,89 @@
+package com.jaspersoft.jasperserver.jaxrs.client.apiadapters.bundles;
+
+import com.jaspersoft.jasperserver.jaxrs.client.core.*;
+import org.codehaus.jettison.json.JSONObject;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+import static junit.framework.Assert.assertFalse;
+import static junit.framework.Assert.assertNotNull;
+
+/**
+ * @author Tetiana Iefimenko
+ */
+public class BundlesServiceIT {
+
+    private RestClientConfiguration config;
+    private JasperserverRestClient client;
+    private AnonymousSession session;
+
+    @BeforeMethod
+    public void before() {
+        config = new RestClientConfiguration("http://localhost:4444/jasperserver-pro");
+        config.setAcceptMimeType(MimeType.JSON);
+        config.setContentMimeType(MimeType.JSON);
+        config.setJrsVersion(JRSVersion.v6_1_0);
+        client = new JasperserverRestClient(config);
+        session = client.getAnonymousSession();
+    }
+
+     @Test
+    public void should_return_all_bundles_for_default_locale() {
+
+       // When
+        final JSONObject bundles = session
+                .bundlesService()
+                .forLocale(null)
+                .allBundles()
+                .getEntity();
+
+        // Then
+        assertNotNull(bundles);
+        assertFalse(bundles.has("jasperserver_messages"));
+    }
+
+    @Test
+    public void should_return_all_bundles_for_specified_locale() {
+
+       // When
+        final JSONObject bundles = session
+                .bundlesService()
+                .forLocale("de")
+                .allBundles()
+                .getEntity();
+
+        // Then
+        assertNotNull(bundles);
+        assertFalse(bundles.has("jasperserver_messages"));
+    }
+
+    @Test
+    public void should_return__bundle_by_name_for_specified_locale() {
+
+        // When
+        final JSONObject bundle = session
+                .bundlesService()
+                .forLocale("de")
+                .bundle("jasperserver_messages")
+                .getEntity();
+
+        // Then
+        assertNotNull(bundle);
+        assertFalse(bundle.has("jsp.JSErrorPage.errorTrace"));
+    }
+
+    @Test
+    public void should_return__bundle_by_name_for_default_locale() {
+
+        // When
+        final JSONObject bundle = session
+                .bundlesService()
+                .forLocale(null)
+                .bundle("jasperserver_messages")
+                .getEntity();
+
+        // Then
+        assertNotNull(bundle);
+        assertFalse(bundle.has("jsp.JSErrorPage.errorTrace"));
+    }
+}

src/integration-test/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/settings/SettingsServiceIT.java

@@ -27,7 +27,6 @@
 import static junit.framework.Assert.assertTrue;
 
 /**
- * @author
  * @author Tetiana Iefimenko
  * */
 public class SettingsServiceIT {

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

@@ -0,0 +1,67 @@
+/*
+ * Copyright (C) 2005 - 2014 Jaspersoft Corporation. All rights  reserved.
+ * http://www.jaspersoft.com.
+ *
+ * Unless you have purchased  a commercial license agreement from Jaspersoft,
+ * the following license terms  apply:
+ *
+ * This program is free software: you can redistribute it and/or  modify
+ * it under the terms of the GNU Affero General Public License  as
+ * published by the Free Software Foundation, either version 3 of  the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero  General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public  License
+ * along with this program.&nbsp; If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.jaspersoft.jasperserver.jaxrs.client.apiadapters.bundles;
+
+import com.jaspersoft.jasperserver.jaxrs.client.apiadapters.AbstractAdapter;
+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 java.util.Locale;
+import javax.ws.rs.core.MediaType;
+import org.codehaus.jettison.json.JSONObject;
+
+
+public class BundlesService extends AbstractAdapter {
+
+    private Locale locale;
+
+    public BundlesService(SessionStorage sessionStorage) {
+        super(sessionStorage);
+        this.locale = Locale.getDefault();
+    }
+
+    public BundlesService forLocale(String locale) {
+        if (locale != null) {
+            this.locale = new Locale(locale);
+        }
+        return this;
+    }
+
+    public OperationResult<JSONObject> allBundles() {
+        return buildBundleRequest("/bundles").addParam("expanded", "true").get();
+    }
+
+    public OperationResult<JSONObject> bundle(String name) {
+        return buildBundleRequest("/bundles", name).get();
+    }
+
+    private JerseyRequest<JSONObject> buildBundleRequest(String... path) {
+        JerseyRequest<JSONObject> request =
+                JerseyRequest.buildRequest(sessionStorage, JSONObject.class, path, new DefaultErrorHandler());
+        request.setAccept(MediaType.APPLICATION_JSON).addHeader("Accept-Language", locale.toString().replace('_', '-'));
+        return request;
+    }
+
+
+
+}

src/main/java/com/jaspersoft/jasperserver/jaxrs/client/core/AnonymousSession.java

@@ -1,6 +1,7 @@
 package com.jaspersoft.jasperserver.jaxrs.client.core;
 
 import com.jaspersoft.jasperserver.jaxrs.client.apiadapters.AbstractAdapter;
+import com.jaspersoft.jasperserver.jaxrs.client.apiadapters.bundles.BundlesService;
 import com.jaspersoft.jasperserver.jaxrs.client.apiadapters.serverInfo.ServerInfoService;
 import com.jaspersoft.jasperserver.jaxrs.client.apiadapters.settings.SettingsService;
 
@@ -34,4 +35,6 @@ public ServerInfoService serverInfoService() {
     public SettingsService settingsService() {
         return getService(SettingsService.class);
     }
+
+    public BundlesService bundlesService() {return  getService(BundlesService.class);}
 }

src/main/java/com/jaspersoft/jasperserver/jaxrs/client/core/JRSVersion.java

@@ -31,5 +31,6 @@ public enum JRSVersion implements Comparable<JRSVersion> {
     v5_5_0,
     v5_6_1,
     v6_0_0,
-    v6_0_1
+    v6_0_1,
+    v6_1_0;
 }

src/main/java/com/jaspersoft/jasperserver/jaxrs/client/core/JerseyRequest.java

@@ -43,10 +43,6 @@
 import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
 import static javax.ws.rs.core.MediaType.APPLICATION_XML;
 
-/**
- * @author
- * @author Tetiana Iefimenko
- * */
 public class JerseyRequest<ResponseType> implements RequestBuilder<ResponseType> {
     private static final int GET = 0;
     private static final int DELETE = 1;
@@ -247,35 +243,4 @@ public RequestBuilder<ResponseType> setHeaders(MultivaluedMap<String, String> he
         return this;
     }
 
-
-    /**
-     * getters/setters block
-     */
-    protected OperationResultFactory getOperationResultFactory() {
-        return operationResultFactory;
-    }
-
-    protected Class<ResponseType> getResponseClass() {
-        return responseClass;
-    }
-
-    protected ErrorHandler getErrorHandler() {
-        return errorHandler;
-    }
-
-    protected MultivaluedMap<String, String> getHeaders() {
-        return headers;
-    }
-
-    protected WebTarget getUsersWebTarget() {
-        return usersWebTarget;
-    }
-
-    protected String getContentType() {
-        return contentType;
-    }
-
-    protected String getAcceptType() {
-        return acceptType;
-    }
 }

src/main/java/com/jaspersoft/jasperserver/jaxrs/client/core/Session.java

@@ -37,10 +37,7 @@
 import javax.ws.rs.client.WebTarget;
 import javax.ws.rs.core.Response;
 
-/**
- * @author
- * @author Tetiana Iefimenko
- * */
+
 public class Session extends AnonymousSession{
 
     public Session(SessionStorage sessionStorage) {