From 1b92c44b482fd0b4fac3399e72b2cd2bd0436ae4 Mon Sep 17 00:00:00 2001
From: Robert Butora <robert.butora@gmail.com>
Date: Tue, 26 Mar 2024 13:34:54 -0400
Subject: [PATCH] merges Parser into Coord and removes Parse class
---
.../src/main/java/vlkb/common/Coord.java | 37 ++++++++++++++++---
.../src/main/java/vlkb/common/Parser.java | 36 ------------------
2 files changed, 32 insertions(+), 41 deletions(-)
delete mode 100644 data-discovery/src/main/java/vlkb/common/Parser.java
diff --git a/data-discovery/src/main/java/vlkb/common/Coord.java b/data-discovery/src/main/java/vlkb/common/Coord.java
index 0159ddb..2e2db1f 100644
--- a/data-discovery/src/main/java/vlkb/common/Coord.java
+++ b/data-discovery/src/main/java/vlkb/common/Coord.java
@@ -48,12 +48,12 @@ class Coord
Coord coord = null;
- pubdid = Parser.getFirstString(params, "ID");
- String[] circle = Parser.getFirstStringArray(params,"CIRCLE", " ", 3);
- String[] vel = Parser.getFirstStringArray(params,"BAND", " ", 2);
+ pubdid = getFirstString(params, "ID");
+ String[] circle = getFirstStringArray(params,"CIRCLE", " ", 3);
+ String[] vel = getFirstStringArray(params,"BAND", " ", 2);
- String skySystem = Parser.getFirstString(params, "skysystem"); // FIXME add sanity checks / use enum
+ String skySystem = getFirstString(params, "skysystem"); // FIXME add sanity checks / use enum
if(skySystem == null) skySystem = "ICRS";
this.skySystem = skySystem;
@@ -65,7 +65,7 @@ class Coord
this.shape = "CIRCLE";
- String specSystem = Parser.getFirstString(params, "specsystem");
+ String specSystem = getFirstString(params, "specsystem");
if(specSystem == null) specSystem = "2"; // 2=WAVE BARY
if( (vel != null) && (vel.length >= 2) )
{
@@ -349,6 +349,33 @@ class Coord
return sb.toString();
}
+ String getFirstString(Map<String, String[]> params, String key)
+ {
+ String[] values = params.get(key);
+ if (values == null) return null;
+
+ if (values.length < 1)
+ throw new IllegalArgumentException(key + " has no valid value");
+ else
+ return values[0];// FIXME if values[0] is null -> canot distinguish from key not found
+ }
+
+
+ String[] getFirstStringArray(Map<String, String[]> params, String key, String separator, int arrayLength)
+ {
+ String array = getFirstString(params, key);
+ if (array == null) return null;
+
+ String[] stringArray = array.split(separator);
+
+ if(stringArray.length != arrayLength)
+ throw new IllegalArgumentException(
+ key + " parameter has incorrect number of elements ("
+ + stringArray.length + " vs " + arrayLength + ") or incorrect separator used");
+
+ return stringArray;
+ }
+
diff --git a/data-discovery/src/main/java/vlkb/common/Parser.java b/data-discovery/src/main/java/vlkb/common/Parser.java
deleted file mode 100644
index 882d995..0000000
--- a/data-discovery/src/main/java/vlkb/common/Parser.java
+++ /dev/null
@@ -1,36 +0,0 @@
-
-import java.util.Map;
-
-
-class Parser
-{
-
- static String getFirstString(Map<String, String[]> params, String key)
- {
- String[] values = params.get(key);
- if (values == null) return null;
-
- if (values.length < 1)
- throw new IllegalArgumentException(key + " has no valid value");
- else
- return values[0];// FIXME if values[0] is null -> canot distinguish from key not found
- }
-
-
- static String[] getFirstStringArray(Map<String, String[]> params, String key, String separator, int arrayLength)
- {
- String array = getFirstString(params, key);
- if (array == null) return null;
-
- String[] stringArray = array.split(separator);
-
- if(stringArray.length != arrayLength)
- throw new IllegalArgumentException(
- key + " parameter has incorrect number of elements ("
- + stringArray.length + " vs " + arrayLength + ") or incorrect separator used");
-
- return stringArray;
- }
-
-
-}
--
GitLab