vo: trim line responses from UWS services

For single-line responses like the output from the {jobs}/(job-id)/phase
UWS endpoint, add a switch to trim trailing whitespace from the result.
The GACS TAP service was returning phases like "COMPLETED\r\n" which
didn't match "COMPLETED" that I was looking for.  I don't know whether
this trailing whitespace is strictly legal, but I posted a message
on the GWS mailing list to find out, with no response, so give GACS
the benefit of the doubt for now.

ttools/src/main/uk/ac/starlink/ttools/taplint/JobStage.java

@@ -812,14 +812,19 @@ private void checkDateTime( URL url, String txt ) {
          */
         private String readTextContent( URL url, boolean mustExist ) {
             byte[] buf = readContent( url, "text/plain", mustExist );
+            if ( buf == null ) {
+                return null;
+            }
+            final String txt;
             try {
-                return buf == null ? null : new String( buf, "UTF-8" );
+                txt = new String( buf, "UTF-8" );
             }
             catch ( UnsupportedEncodingException e ) {
                 reporter_.report( FixedCode.F_UTF8,
                                   "Unknown encoding UTF-8??", e );
                 return null;
             }
+            return UwsJob.TRIM_TEXT ? txt.trim() : txt;
         }
 
         /**

vo/src/main/uk/ac/starlink/vo/UwsJob.java

@@ -46,6 +46,16 @@ public class UwsJob {
     /** Chunk size for HTTP transfer encoding; if <=0, don't chunk. */
     public static int HTTP_CHUNK_SIZE = 1024 * 1024;
 
+    /**
+     * Whether to trim whitespace from line text responses (like job/phase).
+     * I'm not sure whether (trailing) whitespace is permitted in service
+     * responses in this context, but the ESAC GACS service appends "\r\n"
+     * to its phase endpoint result.
+     * I asked (17-Sep-2014) on the grid@ivoa.net mailing list what's the
+     * right answer, but no response, so accept trailing whitespace for now.
+     */
+    public static boolean TRIM_TEXT = true;
+
     /**
      * Constructor.
      *
@@ -171,6 +181,9 @@ public void readPhase() throws IOException {
         }
         in.close();
         String phase = sbuf.toString();
+        if ( TRIM_TEXT ) {
+            phase = phase.trim();
+        }
         logger_.info( phaseUrl + " phase: " + phase );
         phase_ = phase;
         phaseTime_ = System.currentTimeMillis();