Resolving conflicts in temporary branches

Author: TanyaEf

Vagrantfile

@@ -0,0 +1,33 @@
+#
+#   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/>.
+#
+
+Vagrant.configure(2) do |config|
+
+	config.vm.box = "JasperSoft/JasperServer6.1.0"
+	config.vm.box_check_update = false
+	config.ssh.pty = true
+
+	config.vm.network "forwarded_port", guest: 8080, host: 8090
+	config.vm.network "forwarded_port", guest: 5432, host: 5430
+
+	config.vm.provision "shell", inline: "su vagrant -l -c '/bin/sh /home/vagrant/jasperreports-server-cp-6.1.0/ctlscript.sh start'"
+
+end

pom.xml

@@ -153,8 +153,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.1</version>
                 <configuration>
-                    <source>1.7</source>
-                    <target>1.7</target>
+                    <source>1.6</source>
+                    <target>1.6</target>
                 </configuration>
             </plugin>
             <plugin>

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

@@ -20,18 +20,19 @@ public class UsersServiceIT {
 
     @BeforeMethod
     public void before() {
-        config = new RestClientConfiguration("http://localhost:4444/jasperserver-pro");
-        config.setAcceptMimeType(MimeType.JSON);
-        config.setContentMimeType(MimeType.JSON);
-        config.setJrsVersion(JRSVersion.v6_0_1);
-        client = new JasperserverRestClient(config);
+
+        RestClientConfiguration cfg = new RestClientConfiguration("http://localhost:4444/jasperserver-pro");
+        JasperserverRestClient client = new JasperserverRestClient(cfg);
+
         session = client.authenticate("superuser", "superuser");
     }
 
     @Test
     public void shouldReturnAllUsers() {
 
+
          //When
+
         List<ClientUser> users = session
                 .usersService()
                 .allUsers()
@@ -55,6 +56,7 @@ public void should_return_list_users_by_role() {
                 .getUserList();
 
         //Then
+
         Assert.assertTrue(users.size() > 3);
     }
 

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

@@ -1,17 +1,18 @@
 package com.jaspersoft.jasperserver.jaxrs.client.apiadapters.resources;
 
-import com.jaspersoft.jasperserver.dto.resources.ClientFolder;
-import com.jaspersoft.jasperserver.dto.resources.ClientResource;
-import com.jaspersoft.jasperserver.jaxrs.client.core.*;
-import junit.framework.Assert;
+import com.jaspersoft.jasperserver.jaxrs.client.core.JRSVersion;
+import com.jaspersoft.jasperserver.jaxrs.client.core.JasperserverRestClient;
+import com.jaspersoft.jasperserver.jaxrs.client.core.MimeType;
+import com.jaspersoft.jasperserver.jaxrs.client.core.RestClientConfiguration;
+import com.jaspersoft.jasperserver.jaxrs.client.core.Session;
+import java.io.ByteArrayInputStream;
+import java.util.concurrent.TimeUnit;
+import javax.ws.rs.core.Response;
+import org.testng.Assert;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
-import javax.ws.rs.core.Response;
-import java.io.ByteArrayInputStream;
-import java.util.concurrent.TimeUnit;
-
 /**
  * @author Alexander Krasnyanskiy
  */

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

@@ -1,15 +1,26 @@
 package com.jaspersoft.jasperserver.jaxrs.client.apiadapters.settings;
 
-import com.jaspersoft.jasperserver.jaxrs.client.core.*;
-import com.jaspersoft.jasperserver.jaxrs.client.dto.settings.*;
+import com.jaspersoft.jasperserver.jaxrs.client.core.AnonymousSession;
+import com.jaspersoft.jasperserver.jaxrs.client.core.JRSVersion;
+import com.jaspersoft.jasperserver.jaxrs.client.core.JasperserverRestClient;
+import com.jaspersoft.jasperserver.jaxrs.client.core.MimeType;
+import com.jaspersoft.jasperserver.jaxrs.client.core.RestClientConfiguration;
+import com.jaspersoft.jasperserver.jaxrs.client.dto.settings.AwsSettings;
+import com.jaspersoft.jasperserver.jaxrs.client.dto.settings.DashboardSettings;
+import com.jaspersoft.jasperserver.jaxrs.client.dto.settings.DataSourcePatternsSettings;
+import com.jaspersoft.jasperserver.jaxrs.client.dto.settings.DateTimeSettings;
+import com.jaspersoft.jasperserver.jaxrs.client.dto.settings.DecimalFormatSymbolsSettings;
+import com.jaspersoft.jasperserver.jaxrs.client.dto.settings.GlobalConfigurationSettings;
+import com.jaspersoft.jasperserver.jaxrs.client.dto.settings.InputControlsSettings;
+import com.jaspersoft.jasperserver.jaxrs.client.dto.settings.RequestSettings;
+import com.jaspersoft.jasperserver.jaxrs.client.dto.settings.UserTimeZone;
+import java.util.List;
+import java.util.Map;
+import javax.ws.rs.core.GenericType;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
-import javax.ws.rs.core.GenericType;
-import java.util.List;
-import java.util.Map;
-
 import static junit.framework.Assert.assertFalse;
 import static junit.framework.Assert.assertNotNull;
 import static junit.framework.Assert.assertSame;

src/integration-test/resoursec/daracouese_resp.json

@@ -42,7 +42,7 @@ public Session authenticate(String username, String password) {
         AuthenticationCredentials credentials = new AuthenticationCredentials(username, password);
         SessionStorage sessionStorage = new SessionStorage(configuration, credentials);
         login(sessionStorage);
-        return  new Session(sessionStorage);
+        return new Session(sessionStorage);
     }
 
     public AnonymousSession getAnonymousSession() {

src/integration-test/resoursec/global_settings_resp.json

@@ -28,19 +28,16 @@
 import com.jaspersoft.jasperserver.jaxrs.client.core.operationresult.OperationResultFactory;
 import com.jaspersoft.jasperserver.jaxrs.client.core.operationresult.OperationResultFactoryImpl;
 import com.jaspersoft.jasperserver.jaxrs.client.providers.CustomRepresentationTypeProvider;
-import org.glassfish.jersey.media.multipart.internal.MultiPartWriter;
-
+import java.util.List;
+import java.util.Map;
 import javax.ws.rs.client.Entity;
 import javax.ws.rs.client.Invocation;
 import javax.ws.rs.client.WebTarget;
-
-import javax.ws.rs.core.*;
+import javax.ws.rs.core.GenericType;
 import javax.ws.rs.core.MultivaluedHashMap;
 import javax.ws.rs.core.MultivaluedMap;
 import javax.ws.rs.core.Response;
-
-import java.util.List;
-import java.util.Map;
+import org.glassfish.jersey.media.multipart.internal.MultiPartWriter;
 
 import static com.jaspersoft.jasperserver.jaxrs.client.core.MimeType.JSON;
 import static javax.ws.rs.core.MediaType.APPLICATION_JSON;

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

@@ -34,7 +34,6 @@
 import com.jaspersoft.jasperserver.jaxrs.client.apiadapters.resources.ResourcesService;
 import com.jaspersoft.jasperserver.jaxrs.client.apiadapters.thumbnails.ThumbnailsService;
 import com.jaspersoft.jasperserver.jaxrs.client.core.exceptions.handling.DefaultErrorHandler;
-
 import javax.ws.rs.client.WebTarget;
 import javax.ws.rs.core.Response;