JAL-4236 don’t look for headers in JalviewJS

[jalview.git] / src / jalview / fts / service / uniprot / UniProtFTSRestClient.java

diff --git a/src/jalview/fts/service/uniprot/UniProtFTSRestClient.java b/src/jalview/fts/service/uniprot/UniProtFTSRestClient.java
index 1827293..f5e98bd 100644 (file)
--- a/src/jalview/fts/service/uniprot/UniProtFTSRestClient.java
+++ b/src/jalview/fts/service/uniprot/UniProtFTSRestClient.java
@@ -21,7 +21,6 @@
 
 package jalview.fts.service.uniprot;
 
-import java.lang.invoke.MethodHandles;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.ArrayList;
@@ -80,7 +79,7 @@ public class UniProtFTSRestClient extends FTSRestClient
   private static final String USER_AGENT = ChannelProperties
           .getProperty("app_name", "Jalview") + " "
           + Cache.getDefault("VERSION", "Unknown") + " "
-          + MethodHandles.lookup().lookupClass() + " help@jalview.org";
+          + UniProtFTSRestClient.class.toString() + " help@jalview.org";
 
   static
   {
@@ -219,7 +218,7 @@ public class UniProtFTSRestClient extends FTSRestClient
               .getEntity(String.class);
       // Make redundant objects eligible for garbage collection to conserve
       // memory
-      // System.out.println(">>>>> response : "
+      // jalview.bin.Console.outPrintln(">>>>> response : "
       // + uniProtTabDelimittedResponseString);
       if (clientResponse.getStatus() != 200)
       {
@@ -228,18 +227,22 @@ public class UniProtFTSRestClient extends FTSRestClient
         throw new Exception(errorMessage);
 
       }
-      // new Uniprot API is not including a "X-Total-Results" header when there
-      // are 0 results
-      List<String> resultsHeaders = clientResponse.getHeaders()
-              .get("X-Total-Results");
       int xTotalResults = 0;
       if (Platform.isJS())
       {
         xTotalResults = 1;
       }
-      else if (resultsHeaders != null && resultsHeaders.size() >= 1)
+      else
       {
-        xTotalResults = Integer.valueOf(resultsHeaders.get(0));
+        // new Uniprot API is not including a "X-Total-Results" header when
+        // there
+        // are 0 results
+        List<String> resultsHeaders = clientResponse.getHeaders()
+                .get("X-Total-Results");
+        if (resultsHeaders != null && resultsHeaders.size() >= 1)
+        {
+          xTotalResults = Integer.valueOf(resultsHeaders.get(0));
+        }
       }
       clientResponse = null;
       client = null;
@@ -307,7 +310,7 @@ public class UniProtFTSRestClient extends FTSRestClient
           firstRow = false;
           continue;
         }
-        // System.out.println(dataRow);
+        // jalview.bin.Console.outPrintln(dataRow);
         result.add(getFTSData(dataRow, uniprotRestRequest));
       }
       searchResult.setNumberOfItemsFound(xTotalResults);
@@ -389,7 +392,7 @@ public class UniProtFTSRestClient extends FTSRestClient
           } catch (Exception e)
           {
             e.printStackTrace();
-            System.out.println("offending value:" + fieldData);
+            jalview.bin.Console.outPrintln("offending value:" + fieldData);
           }
         }
       } catch (Exception e)