Updated BundlesService, InputControlsService

Author: TanyaEf

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

@@ -49,7 +49,9 @@ public BundlesService forLocale(String locale) {
     }
 
     public BundlesService forLocale(Locale locale) {
-        this.locale = locale;
+        if (locale != null) {
+            this.locale = locale;
+        }
         return this;
     }
 
@@ -65,7 +67,10 @@ private JerseyRequest<Map<String, String>> buildBundleRequest(String bundleName)
         JerseyRequest<Map<String, String>> request =
                 JerseyRequest.buildRequest(sessionStorage, new GenericType<Map<String, String>>() {
                 }, new String[]{"/bundles", bundleName}, new DefaultErrorHandler());
-        request.setAccept(MediaType.APPLICATION_JSON).addHeader("Accept-Language", locale.toString().replace('_', '-'));
+        request.setAccept(MediaType.APPLICATION_JSON);
+        if (!"".equals(this.locale.getLanguage())) {
+            request.addHeader("Accept-Language", locale.toString().replace('_', '-'));
+        }
         return request;
     }
 
@@ -80,5 +85,4 @@ private JerseyRequest<Map<String, Map<String, String>>> buildBundlesRequest() {
         }
         return request;
     }
-
 }

src/main/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/inputControls/InputControlsAdapter.java

@@ -20,9 +20,6 @@ public class InputControlsAdapter extends AbstractAdapter{
 
     public InputControlsAdapter container(String uri) {
         this.containerUri = uri;
-        if (containerUri == null) {
-            throw new MandatoryParameterNotFoundException("Uri of container should be specified");
-        }
         return  this;
     }
 
@@ -49,6 +46,9 @@ public OperationResult<ReportInputControlsListWrapper> reorder(List<ReportInputC
     }
 
     private JerseyRequest<ReportInputControlsListWrapper> buildRequest(){
+        if (containerUri == null) {
+            throw new MandatoryParameterNotFoundException("Uri of container should be specified");
+        }
         JerseyRequest<ReportInputControlsListWrapper> request = JerseyRequest.buildRequest(sessionStorage,
                 ReportInputControlsListWrapper.class,
                 new String[]{"/reports", containerUri, "/inputControls"},

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

@@ -214,13 +214,22 @@ public void should_not_invoke_adding_language_by_empty_locale() throws Exception
         }), eq(new String[]{"/bundles", "jasperserver_messages"}), any(DefaultErrorHandler.class));
     }
 
+    @Test
+    public void should_set_default_locale_if_string_locale_is_null() throws Exception {
+        //given
+        Locale defaultLocale = Locale.getDefault();
+        //when
+        service.forLocale((String) null);
+        //then
+        assertEquals(defaultLocale, Whitebox.getInternalState(service, "locale"));
+    }
 
     @Test
-    public void should_set_default_locale() throws Exception {
+    public void should_set_default_locale_if_instance_locale_is_null() throws Exception {
         //given
         Locale defaultLocale = Locale.getDefault();
         //when
-        service.forLocale((String)null);
+        service.forLocale((Locale)null);
         //then
         assertEquals(defaultLocale, Whitebox.getInternalState(service, "locale"));
     }

src/test/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/inputControls/InputControlsAdapterTest.java

@@ -59,7 +59,7 @@ public void before() {
     @Test(expectedExceptions = MandatoryParameterNotFoundException.class)
     public void should_throw_an_exception_when_uri_is_null() {
         // When
-        new InputControlsAdapter(sessionStorageMock).container(null);
+        new InputControlsAdapter(sessionStorageMock).container(null).get();
         // Then
         // should be thrown an exception
     }