RAIN-1175: Merging data-upload service into master branch (#17)

egovernments · Jul 6, 2020 · efd2727 · efd2727
1 parent d89e66f
commit efd2727
Show file tree

Hide file tree

Showing 18 changed files with 331 additions and 405 deletions.
diff --git a/data-upload/pom.xml b/data-upload/pom.xml
@@ -70,6 +70,11 @@
             <version>1.0.1-SNAPSHOT</version>
         </dependency>
 
+        <dependency>
+            <groupId>com.jayway.jsonpath</groupId>
+            <artifactId>json-path</artifactId>
+            <version>2.4.0</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-csv</artifactId>

diff --git a/data-upload/src/main/java/egov/dataupload/config/DatauploadConfiguration.java b/data-upload/src/main/java/egov/dataupload/config/DatauploadConfiguration.java
@@ -56,7 +56,7 @@ public Map<String, DataUploadConfig> init(){
                 for(Mapping mapping : config.getMappings()){
                     for(Step step : mapping.getSteps()){
                         Mustache mustache = mf.compile(new StringReader(step.getBody()), step.getId());
-                        step.setBodyTemplate(mustache);
+                        step.setMustacheTemplate(mustache);
                     }
                 }
                 dataUploadConfigs.put(config.getService(), config);

diff --git a/data-upload/src/main/java/egov/dataupload/models/Mapping.java b/data-upload/src/main/java/egov/dataupload/models/Mapping.java
@@ -17,11 +17,12 @@ public class Mapping {
 
     @JsonProperty("version")
     private String version = null;
-
-
+
     @JsonProperty("description")
     private String description = null;
 
+    @JsonProperty("headers")
+    private List<String> headers = null;
 
     @JsonProperty("steps")
     private List<Step> steps = null;

diff --git a/data-upload/src/main/java/egov/dataupload/models/Step.java b/data-upload/src/main/java/egov/dataupload/models/Step.java
@@ -23,5 +23,5 @@ public class Step {
     private String body = null;
 
     @JsonIgnore
-    private Mustache bodyTemplate = null;
+    private Mustache mustacheTemplate = null;
 }
diff --git a/data-upload/src/main/java/egov/dataupload/models/user/CreateUserRequest.java b/data-upload/src/main/java/egov/dataupload/models/user/CreateUserRequest.java
diff --git a/data-upload/src/main/java/egov/dataupload/models/user/User.java b/data-upload/src/main/java/egov/dataupload/models/user/User.java
diff --git a/data-upload/src/main/java/egov/dataupload/models/user/UserDetailResponse.java b/data-upload/src/main/java/egov/dataupload/models/user/UserDetailResponse.java
diff --git a/data-upload/src/main/java/egov/dataupload/models/user/UserSearchRequest.java b/data-upload/src/main/java/egov/dataupload/models/user/UserSearchRequest.java
diff --git a/data-upload/src/main/java/egov/dataupload/repository/ServiceRequestRepository.java b/data-upload/src/main/java/egov/dataupload/repository/ServiceRequestRepository.java
@@ -34,7 +34,6 @@ public JsonNode fetchResult(String uri, String requestJson) {
 		JsonNode response = null;
 		log.info("URI: "+uri);
 		try {
-			log.info("Request: "+requestJson);
 			HttpHeaders headers = new HttpHeaders();
 			headers.setContentType(MediaType.APPLICATION_JSON);