done with non relational queries

pom.xml

@@ -18,6 +18,11 @@
 
 	<dependencies>	
 		<dependency>
+    <groupId>com.googlecode.json-simple</groupId>
+    <artifactId>json-simple</artifactId>
+    <version>1.1.1</version>
+</dependency>
+		<dependency>
     		<groupId>edu.stanford.nlp</groupId>
     		<artifactId>stanford-corenlp</artifactId>
     		<version>3.8.0</version>
@@ -65,7 +70,11 @@
     		<groupId>com.google.code.gson</groupId>
     		<artifactId>gson</artifactId>
     	</dependency>
-		</dependencies>
+  <dependency>
+			<groupId>org.apache.tomcat.embed</groupId>
+			<artifactId>tomcat-embed-jasper</artifactId>
+		</dependency>
+	</dependencies>
 
 	<build>
 		<plugins>

src/main/java/org/ncr/nlidb/NlidbApplication.java

@@ -3,6 +3,7 @@
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.domain.EntityScan;
+import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 
@@ -12,6 +13,11 @@
 @EnableJpaRepositories("org.ncr.nlp.repository")
 */
 public class NlidbApplication {
+	/*protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
+        return application.sources(NlidbApplication.class);
+    }
+*/
+
 
 	public static void main(String[] args) {
 		SpringApplication.run(NlidbApplication.class, args);

src/main/java/org/ncr/nlidb/controller/HomeController.java

@@ -29,11 +29,11 @@ public class HomeController
 	@Autowired
 	private StopWord stopWord;
 
-	@RequestMapping(value="/submitQuery",method=RequestMethod.GET)
-	public String obtainResults(@RequestParam("name")String name,ModelAndView model) throws InvalidFormatException, IOException
+	@RequestMapping(value="/submitQuery",method=RequestMethod.POST)
+	public String obtainResults(@RequestParam("name")String name,Model model) throws InvalidFormatException, IOException
 	{
 
-		model.setViewName("querySubmit.jsp");
+		//model.setViewName("querySubmit.jsp");
 		//for tokenisation of the input string
 		String[] tokens=serviceProvider.getTokens(name);
 
@@ -69,7 +69,7 @@ public String obtainResults(@RequestParam("name")String name,ModelAndView model)
 		{
 			if(stopWord.isStopWord(lemmas.get(i))==true)
 			{
-				//System.out.println("hi "+lemmas.get(i));
+				System.out.println(lemmas.get(i)+"    "+tags.get(i));
 				lemmas.remove(lemmas.get(i));
 				tags.remove(tags.get(i));
 				i--;
@@ -79,7 +79,9 @@ public String obtainResults(@RequestParam("name")String name,ModelAndView model)
 		{
 			System.out.println(lemmas.get(i)+" "+tags.get(i));
 		}
-		return serviceProvider.getResults(lemmas, tags);
+		String jsonContent= serviceProvider.getResults(lemmas, tags);
+		model.addAttribute("jsonContent",jsonContent);
+		return "index";
 
 
 	}

src/main/java/org/ncr/nlidb/model/AtmTerminal.java

@@ -12,6 +12,7 @@ public class AtmTerminal {
 	@Id
 	private int terminalId;
 	private String terminalLocation;
+	private String terminalStatus;
 
 	@Column(name="terminal_id")
 	public int getTerminalId() {
@@ -22,7 +23,12 @@ public int getTerminalId() {
 	public String getTerminalLocation() {
 		return terminalLocation;
 	}
-
+
+	@Column(name="terminal_status",nullable=false,unique=true)
+	public String getTerminalStatus() {
+		return terminalStatus;
+	}
+
 	@Override
 	public String toString() {
 		return "AtmTerminal [terminalId=" + terminalId + ", terminalLocation=" + terminalLocation + "]";

src/main/java/org/ncr/nlidb/model/CardDetails.java

@@ -1,6 +1,5 @@
 package org.ncr.nlidb.model;
 
-import java.sql.Date;
 
 import javax.persistence.*;
 import javax.persistence.Column;
@@ -12,8 +11,7 @@
 import javax.persistence.ManyToOne;
 import javax.persistence.OneToOne;
 import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
+
 
 @Entity
 @Table(name="card_details")
@@ -26,8 +24,7 @@ public class CardDetails {
        @GeneratedValue(strategy = GenerationType.AUTO)
 	   private int cardId;
 	   private String cardNumber;
-	   private String cardHolderName;
-	   private Date expiryDate;
+	   private String cardExpiryDate;
 		private String cardStatus;
 		private int productId;
 		private int accountId;
@@ -52,18 +49,10 @@ public String getCardNumber() {
 		}
 
 
-		@Column(name="card_holder_name",nullable=false)
-		public String getCardHolderName() {
-			return cardHolderName;
-		}
-
 
-
-		@Temporal(TemporalType.DATE)
 		@Column(name="card_expiry_date",nullable=false)
-
-		public Date getExpiryDate() {
-			return expiryDate;
+		public String getExpiryDate() {
+			return cardExpiryDate;
 		}
 
 
@@ -88,8 +77,8 @@ public int getAccountID() {
 
 	@Override
 		public String toString() {
-			return "CardDetails [CardID=" + cardId + ", CardNumber=" + cardNumber + ", CardHolderName=" + cardHolderName
-					+ ", ExpiryDate=" + expiryDate + ", CardStatus=" + cardStatus + ", ProductID=" + productId
+			return "CardDetails [CardID=" + cardId + ", CardNumber=" + cardNumber
+					+ ", ExpiryDate=" + cardExpiryDate + ", CardStatus=" + cardStatus + ", ProductID=" + productId
 					+ ", AccountID=" + accountId + "]";
 		}
 

src/main/java/org/ncr/nlidb/model/Product.java

@@ -11,21 +11,21 @@ public class Product {
 
 	@Id
 	private int productId;
-	private int productDescription;
-	private int productCode;
+	private String productDescription;
+	private String productCode;
 
 	@Column(name="product_id")
 	public int getProductId() {
 		return productId;
 	}
 
 	@Column(name="product_description",nullable=false)
-	public int getDescription() {
+	public String getDescription() {
 		return productDescription;
 	}
 
 	@Column(name="product_code",nullable=false)
-	public int getCode() {
+	public String getCode() {
 		return productCode;
 	}
 

src/main/java/org/ncr/nlidb/model/TransactionDetails.java

@@ -1,6 +1,6 @@
 package org.ncr.nlidb.model;
 
-import java.time.LocalDateTime;
+
 import javax.persistence.*;
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -20,7 +20,7 @@ public class TransactionDetails {
 	private int transactionId;
 	private String transactionStatus;
 	private String transactionResponseCode;
-	private LocalDateTime transactionDateTime;
+	private String transactionDate;
 	private int transactionAmount;
 	private int cardId;
 	private int terminalId;
@@ -50,9 +50,9 @@ public String getTransactionStatus() {
 public String getTransactionResponseCode() {
 	return transactionResponseCode;
 }
-@Column(name="transaction_date_time",nullable=false)
-public LocalDateTime getTrasactionDateTime() {
-	return transactionDateTime;
+@Column(name="transaction_date",nullable=false)
+public String getTransactionDate() {
+	return transactionDate;
 }
 @Column(name="transaction_amount",nullable=false)
 public int getTransactionAmount() {
@@ -70,7 +70,7 @@ public int getTerminalID() {
 @Override
 public String toString() {
 	return "transactionDetails [TransactionID=" + transactionId + ", TransactionStatus=" + transactionStatus
-			+ ", TransactionResponseCode=" + transactionResponseCode + ", TrasactionDateTime=" + transactionDateTime
+			+ ", TransactionResponseCode=" + transactionResponseCode + ", TrasactionDateTime=" + transactionDate
 			+ ", TransactionAmount=" + transactionAmount + ", CardID=" + cardId + ", TerminalID=" + terminalId + "]";
 }	
 

src/main/java/org/ncr/nlidb/repository/AccountDetailsRepository.java

@@ -7,5 +7,5 @@
 @Repository
 public interface AccountDetailsRepository extends JpaRepository<AccountDetails,Long>,AccountDetailsRepositoryCustom
 {
-
+	
 }

src/main/java/org/ncr/nlidb/repository/TransactionDetailsRepository.java

@@ -3,6 +3,6 @@
 import org.ncr.nlidb.model.TransactionDetails;
 import org.springframework.data.jpa.repository.JpaRepository;
 
-public interface TransactionDetailsRepository extends JpaRepository<TransactionDetails,Long>{
+public interface TransactionDetailsRepository extends JpaRepository<TransactionDetails,Long>,TransactionDetailsRepositoryCustom{
 
 }