Changeset 6045

Timestamp:

02/25/15 08:21:43 (9 years ago)

Author:

Twan Goosen

Message:

Replaced a number of deprecated method calls

Location:

vlo/trunk/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/service

Files:

• handle/impl/HandleRestApiClient.java (modified) (2 diffs)
• solr/impl/AutoCompleteServiceImpl.java (modified) (2 diffs)

vlo/trunk/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/service/handle/impl/HandleRestApiClient.java

@@ -24 +24 @@
 import eu.clarin.cmdi.vlo.service.handle.HandleClient;
 import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
 import org.apache.wicket.ajax.json.JSONArray;
 import org.apache.wicket.ajax.json.JSONException;
@@ -80 +81 @@
                     .get(ClientResponse.class);
 
-            if (response.getClientResponseStatus() != ClientResponse.Status.OK) {
-                logger.error("Unexpected response status {} for {}", response.getClientResponseStatus(), requestUrl);
+            if (Response.Status.OK.getStatusCode() != response.getStatus()) {
+                final Response.StatusType statusInfo = response.getStatusInfo();
+                logger.error("Unexpected response status {} - {} for {}", statusInfo.getStatusCode(), statusInfo.getReasonPhrase(), requestUrl);
             } else {
                 final String responseString = response.getEntity(String.class);

vlo/trunk/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/service/solr/impl/AutoCompleteServiceImpl.java

@@ -1 +1 @@
 package eu.clarin.cmdi.vlo.service.solr.impl;
 
-import com.google.common.collect.Iterators;
 import eu.clarin.cmdi.vlo.service.solr.AutoCompleteService;
 import eu.clarin.cmdi.vlo.config.VloConfig;
+import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
@@ -50 +50 @@
         }
 
-        return Iterators.emptyIterator();
+        return  Collections.emptyIterator();
     }
 }