Fix typos and remove unused imports while updating VS Code Workspace …

README.md

@@ -1,6 +1,6 @@
 # EHR FHIR Server
 
-This subproject hosts a HAPI FHIR server that is based on the now-deprecated [hapi-fhir-jpaserver-example](https://github.com/jamesagnew/hapi-fhir/tree/master/hapi-fhir-jpaserver-example). The new repo is found [here](https://github.com/hapifhir/hapi-fhir-jpaserver-starter).
+This sub-project hosts a HAPI FHIR server that is based on the now-deprecated [hapi-fhir-jpaserver-example](https://github.com/jamesagnew/hapi-fhir/tree/master/hapi-fhir-jpaserver-example). The new repo is found [here](https://github.com/hapifhir/hapi-fhir-jpaserver-starter).
 
 ## Running the server
 

bundlefile/HypoxemiaPatientBundle.json

@@ -203,7 +203,7 @@
 				],
 				"address": {
 					"line": [
-						"773  Wiseman Street"
+						"773 Wiseman Street"
 					],
 					"city": "Knoxville",
 					"state": "Tennessee",

dockerRunnerDev.sh

@@ -21,18 +21,18 @@ echo "loading data into test-ehr..."
 gradle loadData
 
 # Continuous Load Data command whenever fhirResourcesToLoad directory changes
-reources_modify_time=$(stat -c %Y fhirResourcesToLoad)
+resources_modify_time=$(stat -c %Y fhirResourcesToLoad)
 while sleep 1
 do
-    new_reources_modify_time=$(stat -c %Y fhirResourcesToLoad)
+    new_resources_modify_time=$(stat -c %Y fhirResourcesToLoad)
 
-    if [[ "$reources_modify_time" != "$new_reources_modify_time" ]] 
+    if [[ "$resources_modify_time" != "$new_resources_modify_time" ]] 
     then
         echo "loading data into test-ehr..."
         gradle loadData
     fi
 
-    reources_modify_time=$new_reources_modify_time
+    resources_modify_time=$new_resources_modify_time
 
 done ) & LOAD_DATA_PID=$!
 

fhirResourcesToLoad/medication_turalio.json

@@ -31,7 +31,7 @@
             {
               "system": "http://snomed.info/sct",
               "code": "2183126",
-              "display": "Product containing only turaliio"
+              "display": "Product containing only turalio"
             }
           ]
         },

fhirResourcesToLoad/rems_smith_medicationstatement_turalio.json

@@ -30,7 +30,7 @@
                     {
                       "system": "http://snomed.info/sct",
                       "code": "2183126",
-                      "display": "Product containing only turaliio"
+                      "display": "Product containing only turalio"
                     }
                   ]
                 },

fhirResourcesToLoad/rems_snow_medicationstatement_turalio.json

@@ -30,7 +30,7 @@
                     {
                       "system": "http://snomed.info/sct",
                       "code": "2183126",
-                      "display": "Product containing only turaliio"
+                      "display": "Product containing only turalio"
                     }
                   ]
                 },

src/main/java/ca/uhn/fhir/jpa/starter/BaseJpaRestfulServer.java

@@ -224,7 +224,7 @@ protected void initialize() throws ServletException {
     setPagingProvider(databaseBackedPagingProvider);
 
     /*
-     * This interceptor formats the output using nice colourful
+     * This interceptor formats the output using nice colorful
      * HTML output when the request is detected to come from a
      * browser.
      */
@@ -419,7 +419,7 @@ protected void initialize() throws ServletException {
   private ServerConformanceR4 createConformance(RestfulServer theRestfulServer, IFhirSystemDao<Bundle, Meta> theSystemDao, DaoConfig theDaoConfig, ISearchParamRegistry theSearchParamRegistry, IValidationSupport theValidationSupport){
      ServerConformanceR4 con = new ServerConformanceR4(theRestfulServer, theSystemDao,
             theDaoConfig, theSearchParamRegistry, theValidationSupport);
-    // this isnt autowiring so force it.
+    // this isn't autowiring so force it.
     myApplicationContext.getAutowireCapableBeanFactory().autowireBean(con);
     return con;
   }

src/main/java/ca/uhn/fhir/jpa/starter/JettyConfiguration.java

@@ -14,7 +14,6 @@
 import org.eclipse.jetty.io.ByteBufferOutputStream;
 import org.eclipse.jetty.server.Dispatcher;
 import org.eclipse.jetty.server.Request;
-import org.eclipse.jetty.server.handler.AbstractHandler;
 import org.eclipse.jetty.server.handler.ErrorHandler;
 import org.eclipse.jetty.util.StringUtil;
 

src/main/java/org/hl7/codex/rems/script/Message.java

@@ -1,14 +1,11 @@
 package org.hl7.codex.rems.script;
 
-//import java.io.Serializable;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlElement;
 
 @XmlRootElement(name="Message")
-//public class Message implements Serializable {
 public class Message {
     protected Header header; 
-    //protected Body body;
 
     @XmlElement(name="Header")
         public Header getHeader() {
@@ -17,14 +14,4 @@ public Header getHeader() {
     public void setHeader(Header header) {
         this.header = header;
     }
-
-    /*
-    @XmlElement(name="Body")
-    public Body getBody() {
-        return body;
-    }
-    public void setBody(Body body) {
-        this.body = body;
-    }
-    */
 }

src/main/java/org/hl7/codex/rems/script/NcpdpScriptController.java

@@ -26,9 +26,6 @@ public class NcpdpScriptController {
 
     private static final String APPLICATION_XML = "application/xml";
 
-    @Autowired
-    private org.springframework.core.env.Environment environment;
-
     @Autowired
     private JpaRestfulServer jpaRestfulServer;
 
@@ -59,7 +56,7 @@ public RxFillStatusMessage getScriptResponse(@RequestBody RxFillMessage payload)
         RequestDetails requestDetails = new SystemRequestDetails();
         requestDetails.setRequestId(header.getPrescriberOrderNumber());
 
-        // retrieve the MedicationRequeest
+        // retrieve the MedicationRequest
         MedicationRequest medicationRequest = null;
         try {
             medicationRequest = medicationRequestDao.read(id, requestDetails);

src/main/java/org/hl7/davinci/ehrserver/authproxy/AuthProxy.java

@@ -62,7 +62,7 @@ public void getAuth(@RequestParam Map<String, String> reqParamValue, HttpServlet
    * passed in by the request to associate the request with a launch id, and uses that launch id
    * to append extra parameters to the token response.
    * @param body - Custom object to serialize the incoming request body
-   * @return - returns the custom built reponse
+   * @return - returns the custom built response
    */
   @PostMapping(value = "/token",  consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE)
   public ResponseEntity<TokenResponse> getToken(TokenRequest body) {

src/main/java/org/hl7/davinci/ehrserver/authproxy/PayloadDAO.java

@@ -1,19 +1,12 @@
 package org.hl7.davinci.ehrserver.authproxy;
 
-import org.hl7.davinci.ehrserver.requestgenerator.database.Key;
-
 public interface PayloadDAO {
 
   public void createPayload(Payload payload);
 
-
-  // create a new user record in the users table
-//  public void create(String launchId, String launchUrl, String patientId, String template, String request);
-
   // get a user with the passed id
   public Payload getPayload(String id);
 
-
   // update launch id to be a code
   public void updateCode(String launchId, String code);
 

src/main/java/org/hl7/davinci/ehrserver/authproxy/PayloadMapper.java

@@ -1,6 +1,5 @@
 package org.hl7.davinci.ehrserver.authproxy;
 
-import org.hl7.davinci.ehrserver.requestgenerator.database.Key;
 import org.springframework.jdbc.core.RowMapper;
 
 import java.sql.ResultSet;

src/main/java/org/hl7/davinci/ehrserver/interceptor/QuestionnaireResponseSearchParameterInterceptor.java

@@ -3,10 +3,6 @@
 import org.hl7.fhir.r4.model.Enumerations.PublicationStatus;
 import org.hl7.fhir.r4.model.Enumerations.SearchParamType;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import org.hl7.fhir.r4.model.Enumeration;
 import org.hl7.fhir.r4.model.SearchParameter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

src/main/java/org/hl7/davinci/ehrserver/requestgenerator/database/KeyDAO.java

@@ -1,13 +1,11 @@
 package org.hl7.davinci.ehrserver.requestgenerator.database;
 
-import javax.sql.DataSource;
 import java.util.List;
 
 public interface KeyDAO {
 
   public void createKey(Key key);
 
-
   // create a new user record in the users table
   public void create(String id, String e, String n, String kty);