gCubeSystem
/
ckan-util-library
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed overrided method 

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/ckan-util-library@169478 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Luca Frosini 2018-06-27 10:47:07 +00:00
parent a0079b089f
commit ec617551e3
2 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.classpath
View File

@ -15,7 +15,6 @@
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="org.eclipse.jst.component.nondependency" value=""/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="com.google.gwt.eclipse.core.GWT_CONTAINER"/>

27
src/main/java/org/gcube/datacatalogue/ckanutillibrary/server/ExtendCkanClient.java
View File

@ -6,9 +6,9 @@ package org.gcube.datacatalogue.ckanutillibrary.server;
import javax.annotation.Nullable;
import org.apache.http.HttpHost;
import org.apache.http.client.fluent.Request;
import eu.trentorise.opendata.jackan.CheckedCkanClient;
import eu.trentorise.opendata.jackan.internal.org.apache.http.client.fluent.Request;
/**
@ -23,7 +23,7 @@ public class ExtendCkanClient extends CheckedCkanClient{
private String catalogueURL;
private String ckanToken;
private HttpHost proxy = null; //never used
private int timeout = 120000; //in milliseconds
private int extendTimeout = 120000; //in milliseconds
/**
@ -34,6 +34,7 @@ public class ExtendCkanClient extends CheckedCkanClient{
public ExtendCkanClient(String catalogueURL) {
super(catalogueURL);
this.catalogueURL = catalogueURL;
}
/**
@ -59,7 +60,7 @@ public class ExtendCkanClient extends CheckedCkanClient{
super(catalogueURL, ckanToken);
this.catalogueURL = catalogueURL;
this.ckanToken = ckanToken;
this.timeout = timeout;
this.extendTimeout = timeout;
}
@ -69,20 +70,16 @@ public class ExtendCkanClient extends CheckedCkanClient{
* @param request the request
* @return the request
*/
@Override
protected Request configureRequest(Request request) {
if (ckanToken != null) {
request.addHeader("Authorization", ckanToken);
}
if (proxy != null) {
request.viaProxy(proxy);
}
request.socketTimeout(this.timeout)
.connectTimeout(this.timeout);
request = super.configureRequest(request);
request.socketTimeout(this.extendTimeout)
.connectTimeout(this.extendTimeout);
return request;
}
/**
* Gets the catalogue url.
*
@ -99,6 +96,7 @@ public class ExtendCkanClient extends CheckedCkanClient{
*
* @return the ckanToken
*/
@Override
public String getCkanToken() {
return ckanToken;
@ -110,9 +108,10 @@ public class ExtendCkanClient extends CheckedCkanClient{
* @return the timeout
*/
public int getTimeout() {
return timeout;
return extendTimeout;
}
}