Skip to content

Commit eea0048

Browse files
author
TanyaEf
committed
Renamed vars
1 parent f4f69cf commit eea0048

File tree

5 files changed

+21
-18
lines changed

5 files changed

+21
-18
lines changed

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import com.jaspersoft.jasperserver.jaxrs.client.core.JasperserverRestClient;
55
import com.jaspersoft.jasperserver.jaxrs.client.core.RestClientConfiguration;
66
import com.jaspersoft.jasperserver.jaxrs.client.core.Session;
7-
import com.jaspersoft.jasperserver.jaxrs.client.core.enums.AuthenticationType;
87
import com.jaspersoft.jasperserver.jaxrs.client.core.enums.JRSVersion;
98
import com.jaspersoft.jasperserver.jaxrs.client.core.enums.MimeType;
109
import java.util.List;
@@ -28,7 +27,7 @@ public void before() {
2827
config.setAcceptMimeType(MimeType.JSON);
2928
config.setContentMimeType(MimeType.JSON);
3029
config.setJrsVersion(JRSVersion.v6_0_1);
31-
config.setIsJerseyRequestLogged(true);
30+
config.setLogHttp(true);
3231
// config.setIsJSonEntitieLogged(true);
3332
client = new JasperserverRestClient(config);
3433

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public void before() {
4141
config.setAcceptMimeType(MimeType.JSON);
4242
config.setContentMimeType(MimeType.JSON);
4343
config.setJrsVersion(JRSVersion.v6_0_0);
44-
config.setIsJerseyRequestLogged(true);
44+
config.setLogHttp(true);
4545
config.setIsJSonEntitieLogged(true);
4646
client = new JasperserverRestClient(config);
4747
session = client.getAnonymousSession();

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

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,8 @@ public class RestClientConfiguration {
4949
private JRSVersion jrsVersion = JRSVersion.v5_5_0;
5050
private AuthenticationType authenticationType = AuthenticationType.SPRING;
5151
private Boolean restrictedHttpMethods = false;
52-
53-
private Boolean isJerseyRequestLogged = false;
54-
55-
private Boolean isJSonEntitieLogged = false;
56-
52+
private Boolean logHttp = false;
53+
private Boolean logHttpEntity = false;
5754
private TrustManager[] trustManagers;
5855
private Integer connectionTimeout;
5956
private Integer readTimeout;
@@ -155,20 +152,20 @@ public void setRestrictedHttpMethods(Boolean restrictedHttpMethods) {
155152
this.restrictedHttpMethods = restrictedHttpMethods;
156153
}
157154

158-
public Boolean getIsJerseyRequestLogged() {
159-
return isJerseyRequestLogged;
155+
public Boolean getLogHttp() {
156+
return logHttp;
160157
}
161158

162-
public void setIsJerseyRequestLogged(Boolean isJerseyRequestLogged) {
163-
this.isJerseyRequestLogged = isJerseyRequestLogged;
159+
public void setLogHttp(Boolean logHttp) {
160+
this.logHttp = logHttp;
164161
}
165162

166-
public Boolean getIsJSonEntitieLogged() {
167-
return isJSonEntitieLogged;
163+
public Boolean getLogHttpEntity() {
164+
return logHttpEntity;
168165
}
169166

170-
public void setIsJSonEntitieLogged(Boolean isJSonEntitieLogged) {
171-
this.isJSonEntitieLogged = isJSonEntitieLogged;
167+
public void setLogHttpEntity(Boolean logHttpEntity) {
168+
this.logHttpEntity = logHttpEntity;
172169
}
173170

174171
public static RestClientConfiguration loadConfiguration(String path) {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ private void init() {
100100
rootTarget = client.target(configuration.getJasperReportsServerUrl());
101101
rootTarget.register(JacksonFeature.class);
102102
rootTarget.register(provider);
103-
if (configuration.getIsJerseyRequestLogged()) {
103+
if (configuration.getLogHttp()) {
104104
rootTarget.register(initLoggingFilter());
105105
}
106106
}
@@ -111,7 +111,7 @@ private LoggingFilter initLoggingFilter() {
111111
SLF4JBridgeHandler.install();
112112

113113
return new LoggingFilter(logger,
114-
configuration.getIsJSonEntityLogged());
114+
configuration.getLogHttpEntity());
115115
}
116116

117117

src/test/java/com/jaspersoft/jasperserver/jaxrs/client/core/RestClientConfigurationTest.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -218,5 +218,12 @@ public void should_return_trusted_manager() throws Exception {
218218
X509Certificate[] retrieved = ((X509TrustManager) managers[0]).getAcceptedIssuers();
219219

220220
Assert.assertNull(retrieved);
221+
}
222+
223+
@Test
224+
public void should_return_defaul_value_of_() throws Exception {
225+
226+
227+
221228
}
222229
}

0 commit comments

Comments
 (0)