Rename PFB processor to something more generic

hms-dbmi · Oct 22, 2024 · 5250867 · 5250867
1 parent 6e8a1a6
commit 5250867
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 10 deletions.
diff --git a/...villach/hpds/processing/PfbProcessor.java → .../processing/MultiValueQueryProcessor.java b/...villach/hpds/processing/PfbProcessor.java → .../processing/MultiValueQueryProcessor.java
@@ -13,20 +13,19 @@
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 @Component
-public class PfbProcessor implements HpdsProcessor {
+public class MultiValueQueryProcessor implements HpdsProcessor {
 
     public static final String PATIENT_ID_FIELD_NAME = "patient_id";
     private final int ID_BATCH_SIZE;
     private final AbstractProcessor abstractProcessor;
 
-    private Logger log = LoggerFactory.getLogger(PfbProcessor.class);
+    private Logger log = LoggerFactory.getLogger(MultiValueQueryProcessor.class);
 
 
     @Autowired
-    public PfbProcessor(AbstractProcessor abstractProcessor) {
+    public MultiValueQueryProcessor(AbstractProcessor abstractProcessor) {
         this.abstractProcessor = abstractProcessor;
         ID_BATCH_SIZE = Integer.parseInt(System.getProperty("ID_BATCH_SIZE", "1000"));
     }

diff --git a/service/src/main/java/edu/harvard/hms/dbmi/avillach/hpds/service/QueryService.java b/service/src/main/java/edu/harvard/hms/dbmi/avillach/hpds/service/QueryService.java
@@ -15,8 +15,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.collect.ImmutableMap;
-
 import edu.harvard.dbmi.avillach.util.UUIDv5;
 import edu.harvard.hms.dbmi.avillach.hpds.data.query.Query;
 import edu.harvard.hms.dbmi.avillach.hpds.processing.*;
@@ -48,7 +46,7 @@ public class QueryService {
 	private final QueryProcessor queryProcessor;
 	private final TimeseriesProcessor timeseriesProcessor;
 	private final CountProcessor countProcessor;
-	private final PfbProcessor pfbProcessor;
+	private final MultiValueQueryProcessor multiValueQueryProcessor;
 
 	HashMap<String, AsyncResult> results = new HashMap<>();
 
@@ -58,15 +56,15 @@ public QueryService (AbstractProcessor abstractProcessor,
 						 QueryProcessor queryProcessor,
 						 TimeseriesProcessor timeseriesProcessor,
 						 CountProcessor countProcessor,
-						 PfbProcessor pfbProcessor,
+						 MultiValueQueryProcessor multiValueQueryProcessor,
 						 @Value("${SMALL_JOB_LIMIT}") Integer smallJobLimit,
 						 @Value("${SMALL_TASK_THREADS}") Integer smallTaskThreads,
 						 @Value("${LARGE_TASK_THREADS}") Integer largeTaskThreads) {
 		this.abstractProcessor = abstractProcessor;
 		this.queryProcessor = queryProcessor;
 		this.timeseriesProcessor = timeseriesProcessor;
 		this.countProcessor = countProcessor;
-		this.pfbProcessor = pfbProcessor;
+		this.multiValueQueryProcessor = multiValueQueryProcessor;
 
 		SMALL_JOB_LIMIT = smallJobLimit;
 		SMALL_TASK_THREADS = smallTaskThreads;
@@ -129,7 +127,7 @@ private AsyncResult initializeResult(Query query) throws IOException {
 				break;
 			case DATAFRAME_PFB:
 			case DATAFRAME:
-				p = pfbProcessor;
+				p = multiValueQueryProcessor;
 				break;
 			default :
 				throw new RuntimeException("UNSUPPORTED RESULT TYPE");