Project

General

Profile

« Previous | Next » 

Revision 08059fd5

Added by Andreas Kohlbecker almost 8 years ago

modernizing HttpClient usage in isServiceAvailable() method

View differences:

cdmlib-commons/src/main/java/eu/etaxonomy/cdm/common/UriUtils.java
43 43
import org.apache.http.StatusLine;
44 44
import org.apache.http.client.ClientProtocolException;
45 45
import org.apache.http.client.HttpClient;
46
import org.apache.http.client.config.RequestConfig;
46 47
import org.apache.http.client.methods.HttpGet;
47
import org.apache.http.client.methods.HttpHead;
48 48
import org.apache.http.client.methods.HttpPost;
49 49
import org.apache.http.client.methods.HttpUriRequest;
50 50
import org.apache.http.client.utils.URIBuilder;
51 51
import org.apache.http.client.utils.URLEncodedUtils;
52 52
import org.apache.http.conn.scheme.Scheme;
53 53
import org.apache.http.conn.ssl.SSLSocketFactory;
54
import org.apache.http.impl.client.CloseableHttpClient;
54 55
import org.apache.http.impl.client.DefaultHttpClient;
55
import org.apache.http.params.HttpConnectionParams;
56
import org.apache.http.impl.client.HttpClients;
56 57
import org.apache.log4j.Logger;
57 58

  
58 59
/**
......
369 370
        }
370 371

  
371 372
        //Http
372
        HttpClient  client = new DefaultHttpClient();
373
        CloseableHttpClient httpclient = HttpClients.createDefault();
374
        HttpGet httpget = new HttpGet(serviceUri);
375

  
376

  
373 377
        if(timeout!=null){
374
            HttpConnectionParams.setConnectionTimeout(client.getParams(), timeout);
378

  
379
            RequestConfig requestConfig = RequestConfig.custom()
380
                    .setSocketTimeout(timeout)
381
                    .setConnectTimeout(timeout)
382
                    .setConnectionRequestTimeout(timeout)
383
                    .build();
384
            httpget.setConfig(requestConfig);
375 385
        }
376
        HttpUriRequest request = new HttpHead(serviceUri);
377 386

  
378 387
        try {
379 388
            // Execute the request
380
            HttpResponse response = client.execute(request);
389
            HttpResponse response = httpclient.execute(httpget);
381 390
            // Examine the response status
382 391
            if (logger.isDebugEnabled()){
383 392
                logger.debug(response.getStatusLine());

Also available in: Unified diff