Skip to content

Commit 62019fb

Browse files
author
TanyaEf
committed
Resolving conflicts
2 parents 36d411f + 12f1457 commit 62019fb

File tree

81 files changed

+2179
-1115
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

81 files changed

+2179
-1115
lines changed

‎README.md‎

Lines changed: 144 additions & 24 deletions
Large diffs are not rendered by default.

‎Vagrant/Vagrantfile‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
Vagrant.configure(2) do |config|
2+
3+
config.vm.box = "ubuntu/trusty64"
4+
config.vm.box_check_update = false
5+
6+
config.vm.network "forwarded_port", guest: 8080, host: 8090
7+
config.vm.network "forwarded_port", guest: 5432, host: 5430
8+
9+
config.vm.provider "virtualbox" do |vb|
10+
vb.gui = true
11+
vb.memory = "2048"
12+
end
13+
14+
config.ssh.shell = "bash -c 'BASH_ENV=/etc/profile exec bash'"
15+
16+
config.vm.provision :shell do |sh|
17+
sh.path = "bootstrap.sh"
18+
end
19+
end

‎Vagrant/bootstrap.sh‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
#!/usr/bin/env bash
2+
3+
sudo apt-get update
4+
5+
sudo apt-get install python-software-properties
6+
sudo add-apt-repository ppa:webupd8team/java
7+
sudo apt-get update
8+
9+
sudo echo oracle-java7-installer shared/accepted-oracle-license-v1-1 select true | \
10+
sudo /usr/bin/debconf-set-selections
11+
sudo apt-get install oracle-java7-installer -y
12+
sudo apt-get install oracle-java7-set-default
13+
14+
yes | sudo apt-get install python-pip python-dev build-essential python-setuptools
15+
sudo pip install --upgrade pip
16+
sudo pip install --upgrade virtualenv
17+
sudo pip install paramiko PyYAML Jinja2 httplib2 six
18+
19+
if [ $(dpkg-query -W -f='${Status}' ansible 2>/dev/null | grep -c "ok installed") -eq 0 ];
20+
then
21+
echo "Add APT repositories"
22+
export DEBIAN_FRONTEND=noninteractive
23+
apt-get install -qq software-properties-common &> /dev/null || exit 1
24+
apt-add-repository ppa:ansible/ansible &> /dev/null || exit 1
25+
26+
apt-get update -qq
27+
28+
echo "Installing Ansible"
29+
apt-get install -qq ansible &> /dev/null || exit 1
30+
echo "Ansible installed"
31+
fi
32+
33+
sudo apt-get install unzip
34+
35+
echo "Running Ansible"
36+
bash -c "ansible-playbook /vagrant/playbook.yml --connection=local"

‎Vagrant/playbook.yml‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
---
2+
- hosts: localhost
3+
remote_user: vagrant
4+
tasks:
5+
- name: download Jasper Server
6+
get_url:
7+
url=http://sourceforge.net/projects/jasperserver/files/JasperServer/JasperReports%20Server%20Community%20Edition%206.1.0/jasperreports-server-cp-6.1.0-linux-x64-installer.run
8+
dest=/home/vagrant/jasperreports-server-cp-6.1.0-linux-x64-installer.run
9+
mode=755
10+
- name: setup Jasper Server
11+
shell: printf '\n\n\n\ny\n\n/home/vagrant/jrs/\n\nn\nn\n' | ./jasperreports-server-cp-6.1.0-linux-x64-installer.run
12+
args:
13+
chdir: /home/vagrant/
14+
creates: /home/vagrant/jrs/
15+
- name: run Jasper Server
16+
command: sh /home/vagrant/jrs/ctlscript.sh start
17+
sudo: yes
18+
- name: download jrsh
19+
get_url:
20+
url=http://github.com/Jaspersoft/jrsh/archive/master.zip
21+
dest=/home/vagrant/master.zip
22+
mode=755
23+
- name: setup jrsh
24+
unarchive:
25+
src=/home/vagrant/master.zip
26+
dest=/home/vagrant/
27+
copy=no

‎Vagrantfile‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
#
2+
# Copyright (C) 2005 - 2014 Jaspersoft Corporation. All rights reserved.
3+
# http://www.jaspersoft.com.
4+
#
5+
# Unless you have purchased a commercial license agreement from Jaspersoft,
6+
# the following license terms apply:
7+
#
8+
# This program is free software: you can redistribute it and/or modify
9+
# it under the terms of the GNU Affero General Public License as
10+
# published by the Free Software Foundation, either version 3 of the
11+
# License, or (at your option) any later version.
12+
#
13+
# This program is distributed in the hope that it will be useful,
14+
# but WITHOUT ANY WARRANTY; without even the implied warranty of
15+
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16+
# GNU Affero General Public License for more details.
17+
#
18+
# You should have received a copy of the GNU Affero General Public License
19+
# along with this program.&nbsp; If not, see <http://www.gnu.org/licenses/>.
20+
#
21+
22+
Vagrant.configure(2) do |config|
23+
24+
config.vm.box = "JasperSoft/JasperServer6.1.0"
25+
config.vm.box_check_update = true
26+
config.ssh.pty = true
27+
28+
config.vm.network "forwarded_port", guest: 8080, host: 8090
29+
config.vm.network "forwarded_port", guest: 5432, host: 5430
30+
31+
config.vm.provision "shell", inline: "/bin/sh /home/vagrant/jrs/ctlscript.sh start"
32+
33+
end

‎pom.xml‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
<groupId>com.jaspersoft</groupId>
99
<artifactId>jrs-rest-java-client</artifactId>
10-
<version>6.0.4</version>
10+
<version>6.0.7</version>
1111
<name>REST client for JasperReports server</name>
1212
<url>http://github.com/Jaspersoft/jrs-rest-java-client</url>
1313

@@ -149,11 +149,18 @@
149149
<artifactId>slf4j-api</artifactId>
150150
<version>1.7.12</version>
151151
</dependency>
152+
152153
<dependency>
153154
<groupId>org.slf4j</groupId>
154-
<artifactId>slf4j-simple</artifactId>
155+
<artifactId>slf4j-log4j12</artifactId>
155156
<version>1.7.12</version>
156157
</dependency>
158+
<dependency>
159+
<groupId>log4j</groupId>
160+
<artifactId>log4j</artifactId>
161+
<version>1.2.17</version>
162+
</dependency>
163+
157164
<dependency>
158165
<groupId>org.slf4j</groupId>
159166
<artifactId>jul-to-slf4j</artifactId>
@@ -169,8 +176,8 @@
169176
<artifactId>maven-compiler-plugin</artifactId>
170177
<version>3.1</version>
171178
<configuration>
172-
<source>1.7</source>
173-
<target>1.7</target>
179+
<source>1.6</source>
180+
<target>1.6</target>
174181
</configuration>
175182
</plugin>
176183
<plugin>

‎src/integration-test/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/attributes/ServerAttributesServiceIT.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.jaspersoft.jasperserver.jaxrs.client.apiadapters.attributes;
22

3-
import com.jaspersoft.jasperserver.jaxrs.client.core.JRSVersion;
3+
import com.jaspersoft.jasperserver.jaxrs.client.core.enums.JRSVersion;
44
import com.jaspersoft.jasperserver.jaxrs.client.core.JasperserverRestClient;
5-
import com.jaspersoft.jasperserver.jaxrs.client.core.MimeType;
5+
import com.jaspersoft.jasperserver.jaxrs.client.core.enums.MimeType;
66
import com.jaspersoft.jasperserver.jaxrs.client.core.RestClientConfiguration;
77
import com.jaspersoft.jasperserver.jaxrs.client.core.Session;
88
import com.jaspersoft.jasperserver.jaxrs.client.core.operationresult.NullEntityOperationResult;

‎src/integration-test/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/authority/organizations/OrganizationsServiceIT.java‎

Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
1+
package com.jaspersoft.jasperserver.jaxrs.client.apiadapters.authority.organizations;
2+
3+
import com.jaspersoft.jasperserver.jaxrs.client.core.JasperserverRestClient;
4+
import com.jaspersoft.jasperserver.jaxrs.client.core.RestClientConfiguration;
5+
import com.jaspersoft.jasperserver.jaxrs.client.core.Session;
6+
import com.jaspersoft.jasperserver.jaxrs.client.core.enums.JRSVersion;
7+
import com.jaspersoft.jasperserver.jaxrs.client.core.enums.MimeType;
8+
import com.jaspersoft.jasperserver.jaxrs.client.core.operationresult.OperationResult;
9+
import com.jaspersoft.jasperserver.jaxrs.client.dto.attributes.ClientTenantAttribute;
10+
import com.jaspersoft.jasperserver.jaxrs.client.dto.attributes.TenantAttributesListWrapper;
11+
import java.util.Arrays;
12+
import org.testng.annotations.AfterMethod;
13+
import org.testng.annotations.BeforeMethod;
14+
import org.testng.annotations.Test;
15+
16+
import static org.testng.AssertJUnit.assertNotNull;
17+
18+
/**
19+
* @author Tetiana Iefimenko
20+
*/
21+
public class OrganizationsServiceIT {
22+
23+
24+
private RestClientConfiguration config;
25+
private JasperserverRestClient client;
26+
private Session session;
27+
28+
@BeforeMethod
29+
public void before() {
30+
config = new RestClientConfiguration("http://localhost:4444/jasperserver-pro");
31+
config.setAcceptMimeType(MimeType.JSON);
32+
config.setContentMimeType(MimeType.JSON);
33+
config.setJrsVersion(JRSVersion.v6_0_1);
34+
config.setLogHttp(true);
35+
config.setLogHttpEntity(true);
36+
client = new JasperserverRestClient(config);
37+
38+
session = client.authenticate("superuser", "superuser");
39+
}
40+
41+
42+
@Test
43+
public void should_create_tenant_attributes() {
44+
45+
TenantAttributesListWrapper attributes = new TenantAttributesListWrapper();
46+
attributes.setAttributes(Arrays.asList(
47+
new ClientTenantAttribute("number_of_employees", "1000+"),
48+
new ClientTenantAttribute("number_of_units", "29"),
49+
new ClientTenantAttribute("country_code", "FR")));
50+
51+
OperationResult<TenantAttributesListWrapper> retrieved = session
52+
.organizationsService()
53+
.organization("myOrg1")
54+
.attributes()
55+
.createOrUpdate(attributes);
56+
57+
assertNotNull(retrieved);
58+
59+
}
60+
61+
@Test(dependsOnMethods = "should_create_tenant_attributes")
62+
public void should_return_tenant_attributes() {
63+
64+
65+
OperationResult<TenantAttributesListWrapper> result3 = session
66+
.organizationsService()
67+
.organization("myOrg1")
68+
.attributes()
69+
.get();
70+
71+
TenantAttributesListWrapper result = result3.getEntity();
72+
assertNotNull(result3);
73+
assertNotNull(result);
74+
75+
}
76+
77+
@AfterMethod
78+
public void after() {
79+
session.logout();
80+
}
81+
82+
}

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

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
11
package com.jaspersoft.jasperserver.jaxrs.client.apiadapters.authority.users;
22

33
import com.jaspersoft.jasperserver.dto.authority.ClientUser;
4-
import com.jaspersoft.jasperserver.jaxrs.client.core.*;
4+
import com.jaspersoft.jasperserver.jaxrs.client.core.JasperserverRestClient;
5+
import com.jaspersoft.jasperserver.jaxrs.client.core.RestClientConfiguration;
6+
import com.jaspersoft.jasperserver.jaxrs.client.core.Session;
7+
import com.jaspersoft.jasperserver.jaxrs.client.core.enums.JRSVersion;
8+
import com.jaspersoft.jasperserver.jaxrs.client.core.enums.MimeType;
9+
import java.util.List;
510
import org.testng.Assert;
611
import org.testng.annotations.AfterMethod;
712
import org.testng.annotations.BeforeMethod;
813
import org.testng.annotations.Test;
914

10-
import java.util.List;
11-
1215
/**
1316
* @author Alexander Krasnyanskiy
1417
*/
@@ -24,15 +27,19 @@ public void before() {
2427
config.setAcceptMimeType(MimeType.JSON);
2528
config.setContentMimeType(MimeType.JSON);
2629
config.setJrsVersion(JRSVersion.v6_0_1);
27-
config.setAuthenticationType(AuthenticationType.REST);
30+
config.setLogHttp(true);
31+
2832
client = new JasperserverRestClient(config);
33+
2934
session = client.authenticate("superuser", "superuser");
3035
}
3136

3237
@Test
3338
public void shouldReturnAllUsers() {
3439

40+
3541
//When
42+
3643
List<ClientUser> users = session
3744
.usersService()
3845
.allUsers()
@@ -56,6 +63,7 @@ public void should_return_list_users_by_role() {
5663
.getUserList();
5764

5865
//Then
66+
5967
Assert.assertTrue(users.size() > 3);
6068
}
6169

0 commit comments

Comments
 (0)