Test

Parvatam · Parvatam · commit f41ba6d157ab · 2019-05-01T16:16:11.000-04:00
diff --git a/src/main/java/com/example/Main.java b/src/main/java/com/example/Main.java
@@ -24,16 +24,21 @@
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.annotation.Bean;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.client.RestTemplate;
 
 import javax.sql.DataSource;
 import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
+import java.text.MessageFormat;
 import java.util.ArrayList;
-import java.util.List;
 import java.util.Map;
 
 @Controller
@@ -43,6 +48,9 @@ public class Main {
   @Value("${spring.datasource.url}")
   private String dbUrl;
 
+  @Value("${test-app.url}")
+  private String testUrl;
+
   @Autowired
   private DataSource dataSource;
 
@@ -76,7 +84,6 @@ String db(Map<String, Object> model) {
     }
   }
 
-  //Save a account to the postgres DB
   @RequestMapping(value = "/account")
   public @ResponseBody
   Result saveSfContact(@RequestParam(name = "name") String name, @RequestParam(name = "id")String id) {
@@ -95,6 +102,15 @@ Result saveSfContact(@RequestParam(name = "name") String name, @RequestParam(nam
     return result;
   }
 
+  @RequestMapping(value = "/get-account")
+  public @ResponseBody
+  Result getSfContact(@RequestParam(name = "name") String name, @RequestParam(name = "id")String id) {
+    RestTemplate restTemplate = new RestTemplate();
+    String formattedQuoteUrl = MessageFormat.format(testUrl, name, id);
+    ResponseEntity<Result> result = restTemplate.getForEntity(formattedQuoteUrl, Result.class);
+    return result.getBody();
+  }
+
   @Bean
   public DataSource dataSource() throws SQLException {
     if (dbUrl == null || dbUrl.isEmpty()) {
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
@@ -9,3 +9,4 @@ logging.level.org.springframework=INFO
 spring.profiles.active=production
 
 server.port=${PORT:5000}
+test-app.url=https://af-app.herokuapp.com/account?name={0}&id={1}

Original file line number	Diff line number	Diff line change
`@@ -9,3 +9,4 @@ logging.level.org.springframework=INFO`
`9`	`9`	`spring.profiles.active=production`
`10`	`10`
`11`	`11`	`server.port=${PORT:5000}`
	`12`	`+test-app.url=https://af-app.herokuapp.com/account?name={0}&id={1}`