Changeset 35246 for gs3-extensions

Timestamp:

2021-08-04T10:16:02+12:00 (3 years ago)

Author:

davidb

Message:

Cleanup old asynchronous code and fix string comparison

File:

• gs3-extensions/atea-nlp-tools/trunk/src/koreromaori-proxy/src/main/java/org/atea/nlptools/koreromaoriinterface/services/ReoTuhituhiApiService.java (modified) (7 diffs)

gs3-extensions/atea-nlp-tools/trunk/src/koreromaori-proxy/src/main/java/org/atea/nlptools/koreromaoriinterface/services/ReoTuhituhiApiService.java

@@ -2 +2 @@
 
 import java.io.InputStream;
-import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.Queue;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Future;
 
 import com.google.gson.Gson;
@@ -27 +22 @@
     private static final Logger logger = LogManager.getLogger(ReoTuhituhiApiService.class);
 
-    private final ExecutorService threadPool;
     private final Gson jsonSerialiser;
     private final String apiEndpoint;
@@ -37 +31 @@
         this.apiEndpoint = apiEndpoint;
         this.apiKey = apiKey;
-
-        threadPool = java.util.concurrent.Executors.newFixedThreadPool(3);
     }
 
@@ -52 +44 @@
         throws HttpRequestException, JsonSyntaxException, Exception
     {
-        Queue<Future<AudioFilePart>> apiCalls = new LinkedList<Future<AudioFilePart>>();
-
-        // Queue each transcription request up asynchronously
-        for (AudioFilePart part : audioFileParts)
-        {
-            //Callable<TranscriptionResult> transcriptionTask = getTranscriptionCallable(audioStream);
-            //apiCalls.add(threadPool.submit(transcriptionTask));
-            //logger.debug("Adding transcription task to thread pool.");
-        }
-
-        List<AudioFilePart> apiResults = new ArrayList<AudioFilePart>(apiCalls.size());
+        List<AudioFilePart> apiResults = new LinkedList<AudioFilePart>();
         
         for (AudioFilePart part : audioFileParts)
@@ -71 +53 @@
             apiResults.add(part);
         }
-
-        // Wait on the result of each call
-        // TODO: Implement proper timeout here
-        // while (!apiCalls.isEmpty())
-        // {
-        //     apiResults.add(apiCalls.remove().get());
-        //     logger.debug("API call has completed.");
-        // }
 
         return apiResults;
@@ -114 +88 @@
 
         // Check that the content type is valid
-        if (request.contentType() != "application/json")
+        if (!request.contentType().equals("application/json"))
         {
             logger.error
             (
-                "The Reo Tuhituhi API returned an invalid content type {}. Provided content was {}",
+                "The Reo Tuhituhi API returned an invalid content type of {}. Provided content was {}",
                 request.contentType(),
                 request.body()
@@ -130 +104 @@
         return res;
     }
-
-    private Callable<AudioFilePart> getTranscriptionCallable(final AudioFilePart part)
-    {
-        return new Callable<AudioFilePart>()
-        {
-            @Override
-            public AudioFilePart call()
-                throws Exception
-            {
-                TranscriptionResult res = getTranscription(part.dataStream);
-                part.setTranscriptionResult(res);
-                return part;
-            }
-        };
-    }
 }