Fix local compilation errors.

opencadc · Feb 20, 2024 · fab300f · fab300f
1 parent 258a431
commit fab300f
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/cadc-conesearch/src/main/java/org/opencadc/conesearch/ConeParameterValidator.java b/cadc-conesearch/src/main/java/org/opencadc/conesearch/ConeParameterValidator.java
@@ -76,6 +76,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * Validator for Cone Search parameters.
@@ -85,6 +86,9 @@ public class ConeParameterValidator extends CommonParamValidator {
     public static final String RA_PARAM = "RA";
     public static final String DEC_PARAM = "DEC";
     public static final String SR_PARAM = "SR";
+
+    public static final String MAXREC = "MAXREC";
+
     static final int MIN_VERB_VALUE = 1;
     static final int MID_VERB_VALUE = 2;
     static final int MAX_VERB_VALUE = 3;
@@ -126,6 +130,17 @@ public int validateVERB(final Map<String, List<String>> parameters) {
         }
     }
 
+    int getMaxRec(final Map<String, List<String>> parameters, final int defaultValue, final int maxValue) {
+        return validateInteger(ConeParameterValidator.MAXREC, parameters).stream().filter(i -> i > maxValue)
+                                                                         .findFirst().orElse(defaultValue);
+    }
+
+    private List<Integer> validateInteger(final String verbParam, final Map<String, List<String>> parameters,
+                                          final List<Integer> validValues) {
+        return super.validateInteger(verbParam, parameters).stream().filter(validValues::contains)
+                    .collect(Collectors.toList());
+    }
+
     private String getFirstParameter(final String key, final Map<String, List<String>> requestParameters) {
         final List<String> values = requestParameters.get(key);
         return (values == null || values.isEmpty()) ? null : values.get(0);

diff --git a/cadc-conesearch/src/main/java/org/opencadc/conesearch/TAPQueryGenerator.java b/cadc-conesearch/src/main/java/org/opencadc/conesearch/TAPQueryGenerator.java
@@ -69,7 +69,6 @@
 package org.opencadc.conesearch;
 
 import ca.nrc.cadc.dali.Circle;
-import ca.nrc.cadc.dali.tables.votable.VOTableWriter;
 import ca.nrc.cadc.util.StringUtil;
 
 import java.util.HashMap;
@@ -139,7 +138,7 @@ public Map<String, Object> getParameterMap() {
 
         // Obtain and, if necessary, provide a default RESPONSEFORMAT.
         queryParameterMap.put(ConeParameterValidator.RESPONSEFORMAT,
-                              coneParameterValidator.getResponseFormat(parameters, VOTableWriter.CONTENT_TYPE));
+                              coneParameterValidator.getResponseFormat(parameters));
 
         // Obtain and validate the VERB (verbosity) output.
         final int outputVerbosity = coneParameterValidator.validateVERB(parameters);