REST service can now handle parameters that require any converter

Conner Ward · Conner Ward · commit 6b653d8cebb8 · 2018-07-17T17:24:38.000-04:00
diff --git a/services/rest/pom.xml b/services/rest/pom.xml
@@ -134,11 +134,6 @@
    			<version>1.9.5</version>
    			<scope>test</scope>
 		</dependency>
-		<dependency>
-			<groupId>mil.nga.giat</groupId>
-			<artifactId>geowave-adapter-vector</artifactId>
-			<version>${project.version}</version>
-		</dependency>
 	</dependencies>
 	<profiles>
 		<profile>
diff --git a/services/rest/src/main/java/mil/nga/giat/geowave/service/rest/GeoWaveOperationServiceWrapper.java b/services/rest/src/main/java/mil/nga/giat/geowave/service/rest/GeoWaveOperationServiceWrapper.java
@@ -2,6 +2,7 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.lang.reflect.Field;
 import java.util.Arrays;
 import java.util.List;
 import java.util.UUID;
@@ -30,7 +31,10 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.beust.jcommander.IStringConverter;
+import com.beust.jcommander.Parameter;
 import com.beust.jcommander.ParameterException;
+import com.beust.jcommander.converters.NoConverter;
 
 import mil.nga.giat.geowave.core.cli.api.OperationParams;
 import mil.nga.giat.geowave.core.cli.api.ServiceEnabledCommand;
@@ -40,14 +44,13 @@
 import mil.nga.giat.geowave.core.cli.operations.config.options.ConfigOptions;
 import mil.nga.giat.geowave.core.cli.parser.ManualOperationParams;
 import mil.nga.giat.geowave.service.rest.exceptions.MissingArgumentException;
+import mil.nga.giat.geowave.service.rest.field.ParameterRestFieldValue;
 import mil.nga.giat.geowave.service.rest.field.RequestParameters;
 import mil.nga.giat.geowave.service.rest.field.RequestParametersForm;
 import mil.nga.giat.geowave.service.rest.field.RequestParametersJson;
 import mil.nga.giat.geowave.service.rest.field.RestFieldFactory;
 import mil.nga.giat.geowave.service.rest.field.RestFieldValue;
 import mil.nga.giat.geowave.service.rest.operations.RestOperationStatusMessage;
-import mil.nga.giat.geowave.adapter.vector.ingest.CQLFilterOptionProvider;
-import mil.nga.giat.geowave.adapter.vector.ingest.CQLFilterOptionProvider.ConvertCQLStrToFilterConverter;
 
 public class GeoWaveOperationServiceWrapper<T> extends
 		ServerResource
@@ -231,8 +234,14 @@ else if (Enum.class.isAssignableFrom(type)) {
 								(Class<Enum>) type,
 								strValue.toUpperCase());
 					}
-					else if (CQLFilterOptionProvider.FilterParameter.class.isAssignableFrom(type)) {
-						objValue = new ConvertCQLStrToFilterConverter().convert(strValue);
+					else if (ParameterRestFieldValue.class.isAssignableFrom(f.getClass())) {
+						Field field = ((ParameterRestFieldValue) f).getField();		
+						if (field.isAnnotationPresent(Parameter.class)){
+							Class<? extends IStringConverter<?>> converter = field.getAnnotation(Parameter.class).converter();
+							if (converter != NoConverter.class) {
+								objValue = converter.newInstance().convert(strValue);
+							}
+						}
 					}
 					else {
 						throw new RuntimeException(
diff --git a/services/rest/src/main/java/mil/nga/giat/geowave/service/rest/field/ParameterRestField.java b/services/rest/src/main/java/mil/nga/giat/geowave/service/rest/field/ParameterRestField.java
@@ -36,4 +36,8 @@ public String getDescription() {
 	public boolean isRequired() {
 		return parameter.required();
 	}
+	
+	public Field getField() {
+		return this.field;
+	}
 }
diff --git a/services/rest/src/main/java/mil/nga/giat/geowave/service/rest/field/ParameterRestFieldValue.java b/services/rest/src/main/java/mil/nga/giat/geowave/service/rest/field/ParameterRestFieldValue.java
@@ -33,5 +33,9 @@ public void setValue(
 				instance,
 				value);
 	}
+	
+	public Field getField() {
+		return super.getField();
+	}
 
 }
diff --git a/test/src/test/java/mil/nga/giat/geowave/test/services/IngestIT.java b/test/src/test/java/mil/nga/giat/geowave/test/services/IngestIT.java
@@ -262,11 +262,7 @@ public void listplugins() {
 	}
 
 	/**
-	 * Currently no matter what the input, a 201 is returned from localToGW. The
-	 * only way to tell if failed or not based on input is through the
-	 * baseServiceClient.
-	 * 
-	 * I also think that all ingest commands (except for listplugins()) should
+	 * I think that all ingest commands (except for listplugins()) should
 	 * return a 202 status instead of a 201, especially since all errors are
 	 * discovered by the baseServiceClient and not the ingestServiceClient.
 	 * Nothing is created directly from the ingestClient call as it simply kicks

Original file line number	Diff line number	Diff line change
`@@ -36,4 +36,8 @@ public String getDescription() {`
`36`	`36`	`public boolean isRequired() {`
`37`	`37`	`return parameter.required();`
`38`	`38`	`}`
	`39`	`+`
	`40`	`+ public Field getField() {`
	`41`	`+ return this.field;`
	`42`	`+ }`
`39`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,5 +33,9 @@ public void setValue(`
`33`	`33`	`instance,`
`34`	`34`	`value);`
`35`	`35`	`}`
	`36`	`+`
	`37`	`+ public Field getField() {`
	`38`	`+ return super.getField();`
	`39`	`+ }`
`36`	`40`
`37`	`41`	`}`