Parameter updates

hapi-fhir-cli/hapi-fhir-cli-app/pom.xml

@@ -17,6 +17,12 @@
 
 	<dependencies>
 
+		<dependency>
+			<groupId>ca.uhn.hapi.fhir</groupId>
+			<artifactId>hapi-fhir-cli-api</artifactId>
+			<version>${project.version}</version>
+			<type>jar</type>
+		</dependency>
 		<dependency>
 			<groupId>ca.uhn.hapi.fhir</groupId>
 			<artifactId>hapi-fhir-cli-jpaserver</artifactId>

hapi-fhir-dist/src/assembly/hapi-fhir-cli.xml

@@ -19,7 +19,7 @@
 			</includes>
 		</fileSet>
 		<fileSet>
-			<directory>${project.basedir}/../hapi-fhir-cli/hapi-fhir-cli-app/src/main/script</directory>
+			<directory>${project.basedir}/../hapi-fhir-cli/hapi-fhir-cli-api/src/main/script</directory>
 			<outputDirectory>/</outputDirectory>
 			<includes>
 				<include>hapi-fhir-cli</include>

hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/method/OperationParameter.java

@@ -1,5 +1,35 @@
 package ca.uhn.fhir.rest.server.method;
 
+import ca.uhn.fhir.context.*;
+import ca.uhn.fhir.context.BaseRuntimeChildDefinition.IAccessor;
+import ca.uhn.fhir.i18n.HapiLocalizer;
+import ca.uhn.fhir.model.api.IDatatype;
+import ca.uhn.fhir.model.api.IQueryParameterAnd;
+import ca.uhn.fhir.model.api.IQueryParameterOr;
+import ca.uhn.fhir.model.api.IQueryParameterType;
+import ca.uhn.fhir.rest.annotation.OperationParam;
+import ca.uhn.fhir.rest.api.QualifiedParamList;
+import ca.uhn.fhir.rest.api.RequestTypeEnum;
+import ca.uhn.fhir.rest.api.ValidationModeEnum;
+import ca.uhn.fhir.rest.api.server.RequestDetails;
+import ca.uhn.fhir.rest.param.BaseAndListParam;
+import ca.uhn.fhir.rest.param.DateRangeParam;
+import ca.uhn.fhir.rest.param.binder.CollectionBinder;
+import ca.uhn.fhir.rest.server.exceptions.InternalErrorException;
+import ca.uhn.fhir.rest.server.exceptions.InvalidRequestException;
+import ca.uhn.fhir.rest.server.exceptions.MethodNotAllowedException;
+import ca.uhn.fhir.util.FhirTerser;
+import ca.uhn.fhir.util.ReflectionUtil;
+import org.apache.commons.lang3.Validate;
+import org.hl7.fhir.instance.model.api.IBase;
+import org.hl7.fhir.instance.model.api.IBaseDatatype;
+import org.hl7.fhir.instance.model.api.IBaseResource;
+import org.hl7.fhir.instance.model.api.IPrimitiveType;
+
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.util.*;
+
 import static org.apache.commons.lang3.StringUtils.isNotBlank;
 
 /*
@@ -22,43 +52,20 @@ import static org.apache.commons.lang3.StringUtils.isNotBlank;
  * #L%
  */
 
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.util.*;
-
-import org.apache.commons.lang3.Validate;
-import org.hl7.fhir.instance.model.api.*;
-
-import ca.uhn.fhir.context.*;
-import ca.uhn.fhir.context.BaseRuntimeChildDefinition.IAccessor;
-import ca.uhn.fhir.i18n.HapiLocalizer;
-import ca.uhn.fhir.model.api.*;
-import ca.uhn.fhir.rest.annotation.OperationParam;
-import ca.uhn.fhir.rest.api.*;
-import ca.uhn.fhir.rest.api.server.RequestDetails;
-import ca.uhn.fhir.rest.param.*;
-import ca.uhn.fhir.rest.param.binder.CollectionBinder;
-import ca.uhn.fhir.rest.server.exceptions.*;
-import ca.uhn.fhir.util.FhirTerser;
-import ca.uhn.fhir.util.ReflectionUtil;
-
 public class OperationParameter implements IParameter {
 
+	static final String REQUEST_CONTENTS_USERDATA_KEY = OperationParam.class.getName() + "_PARSED_RESOURCE";
 	@SuppressWarnings("unchecked")
 	private static final Class<? extends IQueryParameterType>[] COMPOSITE_TYPES = new Class[0];
-
-	static final String REQUEST_CONTENTS_USERDATA_KEY = OperationParam.class.getName() + "_PARSED_RESOURCE";
-
-	private boolean myAllowGet;
-
 	private final FhirContext myContext;
+	private final String myName;
+	private final String myOperationName;
+	private boolean myAllowGet;
 	private IOperationParamConverter myConverter;
 	@SuppressWarnings("rawtypes")
 	private Class<? extends Collection> myInnerCollectionType;
 	private int myMax;
 	private int myMin;
-	private final String myName;
-	private final String myOperationName;
 	private Class<?> myParameterType;
 	private String myParamType;
 	private SearchParameter mySearchParameterBinding;
@@ -75,7 +82,7 @@ public class OperationParameter implements IParameter {
 		myContext = theCtx;
 	}
 
-	@SuppressWarnings({ "rawtypes", "unchecked" })
+	@SuppressWarnings({"rawtypes", "unchecked"})
 	private void addValueToList(List<Object> matchingParamValues, Object values) {
 		if (values != null) {
 			if (BaseAndListParam.class.isAssignableFrom(myParameterType) && matchingParamValues.size() > 0) {
@@ -147,8 +154,8 @@ public class OperationParameter implements IParameter {
 		//@formatter:off
 		boolean isSearchParam =
 			IQueryParameterType.class.isAssignableFrom(myParameterType) ||
-			IQueryParameterOr.class.isAssignableFrom(myParameterType) ||
+				IQueryParameterOr.class.isAssignableFrom(myParameterType) ||
-			IQueryParameterAnd.class.isAssignableFrom(myParameterType); 
+				IQueryParameterAnd.class.isAssignableFrom(myParameterType);
 		//@formatter:off
 
 		/*
@@ -356,6 +363,13 @@ public class OperationParameter implements IParameter {
 			if (myConverter != null) {
 				nextValue = myConverter.incomingServer(nextValue);
 			}
+			if (myParameterType.equals(String.class)) {
+				if (nextValue instanceof IPrimitiveType<?>) {
+					IPrimitiveType<?> source = (IPrimitiveType<?>) nextValue;
+					theMatchingParamValues.add(source.getValueAsString());
+					continue;
+				}
+			}
 			if (!myParameterType.isAssignableFrom(nextValue.getClass())) {
 				Class<? extends IBaseDatatype> sourceType = (Class<? extends IBaseDatatype>) nextValue.getClass();
 				Class<? extends IBaseDatatype> targetType = (Class<? extends IBaseDatatype>) myParameterType;

hapi-fhir-structures-r4/src/test/java/ca/uhn/fhir/rest/server/OperationServerR4Test.java

@@ -338,6 +338,29 @@ public class OperationServerR4Test {
 		assertEquals("RET1", resp.getParameter().get(0).getName());
 	}
 
+	@Test
+	public void testOperationOnServerWithRawString() throws Exception {
+		Parameters p = new Parameters();
+		p.addParameter().setName("PARAM1").setValue(new StringType("PARAM1val"));
+		p.addParameter().setName("PARAM2").setResource(new Patient().setActive(true));
+		String inParamsStr = ourCtx.newXmlParser().encodeResourceToString(p);
+
+		HttpPost httpPost = new HttpPost("http://localhost:" + ourPort + "/$OP_SERVER_WITH_RAW_STRING");
+		httpPost.setEntity(new StringEntity(inParamsStr, ContentType.create(Constants.CT_FHIR_XML, "UTF-8")));
+		HttpResponse status = ourClient.execute(httpPost);
+
+		assertEquals(200, status.getStatusLine().getStatusCode());
+		String response = IOUtils.toString(status.getEntity().getContent(), StandardCharsets.UTF_8);
+		IOUtils.closeQuietly(status.getEntity().getContent());
+
+		assertEquals("PARAM1val", ourLastParam1.getValue());
+		assertEquals(true, ourLastParam2.getActive());
+		assertEquals("$OP_SERVER", ourLastMethod);
+
+		Parameters resp = ourCtx.newXmlParser().parseResource(Parameters.class, response);
+		assertEquals("RET1", resp.getParameter().get(0).getName());
+	}
+
 	@Test
 	public void testOperationOnType() throws Exception {
 		Parameters p = new Parameters();
@@ -763,6 +786,23 @@ public class OperationServerR4Test {
 			return retVal;
 		}
 
+		//@formatter:off
+		@Operation(name="$OP_SERVER_WITH_RAW_STRING")
+		public Parameters opServer(
+			@OperationParam(name="PARAM1") String theParam1,
+			@OperationParam(name="PARAM2") Patient theParam2
+		) {
+			//@formatter:on
+
+			ourLastMethod = "$OP_SERVER";
+			ourLastParam1 = new StringType(theParam1);
+			ourLastParam2 = theParam2;
+
+			Parameters retVal = new Parameters();
+			retVal.addParameter().setName("RET1").setValue(new StringType("RETVAL1"));
+			return retVal;
+		}
+
 		//@formatter:off
 		@Operation(name="$OP_SERVER_LIST_PARAM")
 		public Parameters opServerListParam(

src/changes/changes.xml

@@ -127,6 +127,11 @@
 				Fix a bug in the DSTU2 QuestionnaireResponseValidator which prevented validation
 				on groups with only one question. Thanks David Gileadi for the pull request!
 			</action>
+			<action type="add">
+				Operation methods on a plain server may now use parameters
+				of type String (i.e. plain Java strings), and any FHIR primitive
+				datatype will be automatically coerced into a String.
+			</action>
 		</release>
 		<release version="3.3.0" date="2018-03-29">
 			<action type="add">