some update

Author: pugsh

imanager-common-web/src/main/java/com/imanager/common/web/constants/WebConstants.java

@@ -19,6 +19,8 @@ public class WebConstants {
 
 	public static final String RESPONSE_DATE_FORMAT = "yyyy-MM-dd HH:mm:ss";
 
+	public static final String INPUT_VALIDATION_ERR = "Invalid input data specified";
+	
 	private WebConstants() {
 	}
 }

imanager-common/src/main/resources/config/app-config.xml

@@ -11,7 +11,8 @@
 	<context:property-placeholder
 		location="classpath*:/imanager/app-props.properties" />
 
-	<mongo:mongo-client host="${mongo.host}" port="${mongo.port}" />
+	<mongo:mongo-client host="${mongo.host}" port="${mongo.port}">
+	</mongo:mongo-client>
 	<mongo:db-factory dbname="${mongo.db}" mongo-ref="mongo" />
 	<!-- define default mongo converter -->
 	<mongo:mapping-converter id="converter" />

imanager-service/src/main/java/com/imanager/service/dao/IBaseDAO.java

@@ -19,6 +19,6 @@ public interface IBaseDAO {
 
 	public void update(BaseDocument document) throws SequenceException;
 
-	public void delete(Class<?> documentClass, String keyName, Integer... deleteIds) throws SequenceException;
+	public boolean delete(Class<?> documentClass, String keyName, Integer... deleteIds) throws Exception;
 
 }

imanager-service/src/main/java/com/imanager/service/dao/impl/BaseDAOImpl.java

@@ -5,16 +5,12 @@
 import java.io.Serializable;
 import java.util.List;
 
-import javax.annotation.PostConstruct;
-
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.mongodb.core.FindAndModifyOptions;
 import org.springframework.data.mongodb.core.MongoOperations;
-import org.springframework.data.mongodb.core.MongoTemplate;
-import org.springframework.data.mongodb.core.WriteResultChecking;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.data.mongodb.core.query.Update;
 import org.springframework.stereotype.Repository;
@@ -28,18 +24,14 @@
 import com.imanager.service.model.BaseDocument;
 import com.imanager.service.model.Customer;
 import com.imanager.service.model.Sequence;
+import com.mongodb.WriteResult;
 
 @Repository
 public class BaseDAOImpl implements IBaseDAO {
 
 	@Autowired
 	private MongoOperations mongoOperation;
 
-	@PostConstruct
-	private void setWriteResultChecking() {
-		((MongoTemplate) mongoOperation).setWriteResultChecking(WriteResultChecking.EXCEPTION);
-	}
-
 	@Override
 	public BaseDocument findById(DocumentFilter<? extends Serializable> filter) throws Exception {
 		if (filter == null || StringUtils.isEmpty(filter.getSearchProperty())) {
@@ -106,9 +98,13 @@ public void update(BaseDocument document) throws SequenceException {
 	}
 
 	@Override
-	public void delete(Class<?> documentClass, String keyName, Integer... deleteIds) throws SequenceException {
+	public boolean delete(Class<?> documentClass, String keyName, Integer... deleteIds) throws Exception {
 		Query query = new Query(where(keyName).in((Object[]) deleteIds));
-		mongoOperation.remove(query, documentClass);
+		WriteResult writeResult = mongoOperation.remove(query, documentClass);
+		if (writeResult != null && writeResult.getN() > 0) {
+			return true;
+		}
+		return false;
 	}
 
 	private Long getNextSequenceId(String key) throws SequenceException {

imanager-service/src/main/java/com/imanager/service/model/Address.java

@@ -1,9 +1,6 @@
 package com.imanager.service.model;
 
-import org.springframework.data.mongodb.core.mapping.Document;
-
-@Document(collection = "addresses")
-public class Address extends BaseDocument {
+public class Address {
 
 	private String street;
 	private String city;
@@ -47,19 +44,4 @@ public String toString() {
 		return "Address [street=" + street + ", city=" + city + ", state=" + state + ", pin=" + pin + "]";
 	}
 
-	@Override
-	public String getKeyName() {
-		return null;
-	}
-
-	@Override
-	public Long getKeyValue() {
-		return null;
-	}
-
-	@Override
-	public void setKeyValue(Long value) {
-
-	}
-
 }

imanager-service/src/main/java/com/imanager/service/model/Customer.java

@@ -1,7 +1,6 @@
 package com.imanager.service.model;
 
 import org.springframework.data.mongodb.core.index.Indexed;
-import org.springframework.data.mongodb.core.mapping.DBRef;
 import org.springframework.data.mongodb.core.mapping.Document;
 
 import com.imanager.service.constants.ServiceConstants;
@@ -13,7 +12,6 @@ public class Customer extends BaseDocument {
 	private Long customerId;
 	private String customerName;
 	private String contact;
-	@DBRef(lazy = true)
 	private Address address;
 
 	public Long getCustomerId() {

imanager-service/src/main/java/com/imanager/service/model/Item.java

@@ -1,8 +1,11 @@
 package com.imanager.service.model;
 
+import org.springframework.data.mongodb.core.mapping.DBRef;
+
 public class Item {
 
 	private Integer quantity;
+	@DBRef(lazy = true)
 	private Product product;
 
 	public Integer getQuantity() {

imanager-service/src/main/java/com/imanager/service/model/Product.java

@@ -3,6 +3,7 @@
 import java.util.List;
 
 import org.springframework.data.mongodb.core.index.Indexed;
+import org.springframework.data.mongodb.core.mapping.DBRef;
 import org.springframework.data.mongodb.core.mapping.Document;
 
 import com.imanager.service.constants.ServiceConstants;
@@ -14,6 +15,7 @@ public class Product extends BaseDocument {
 	private Long productId;
 	private String productName;
 	private Double price;
+	@DBRef(lazy = true)
 	private List<Supplier> suppliers;
 
 	public Product() {

imanager-service/src/test/java/com/imanager/test/UnitTest.java

@@ -0,0 +1,18 @@
+package com.imanager.test;
+
+import java.io.IOException;
+import java.net.ServerSocket;
+import java.net.Socket;
+
+public class UnitTest {
+
+	public static void main(String[] args) throws IOException{
+        ServerSocket server = new ServerSocket(8080);
+
+        System.out.println("Server has started on 127.0.0.1:80.\r\nWaiting for a connection...");
+
+        Socket client = server.accept();
+
+        System.out.println("A client connected.");
+    }
+}

imanager-web/src/main/java/com/imanager/web/endpoints/ImanagerEndPoint.java

@@ -34,6 +34,8 @@
 import com.imanager.service.request.ServiceRequest;
 import com.imanager.service.vo.BaseVO;
 import com.imanager.util.ServiceDelegate;
+import com.imanager.web.exception.InputValidationException;
+import com.imanager.web.util.WebUtil;
 
 @Service
 @Path("/v1")
@@ -145,6 +147,7 @@ public Response doCRUD(@Context HttpHeaders headers, @PathParam("documentName")
 		BaseVO baseVO;
 		Integer[] deleteIds;
 		try {
+			WebUtil.validateInput(documentName, action, entityData);
 			DocumentType documentType = DocumentType.toEnum(documentName);
 			ActionType actionType = ActionType.toEnum(action);
 			ServiceRequest serviceRequest = new ServiceRequest();
@@ -168,6 +171,10 @@ public Response doCRUD(@Context HttpHeaders headers, @PathParam("documentName")
 			builder = responseBuilder.buildSuccessResponse(successResponse, headers, WebConstants.SUCCESS,
 					WebConstants.STATUS_200);
 			response = builder.build();
+		} catch (InputValidationException e) {
+			builder = responseUtil.buildErrorResponse(headers, WebConstants.INPUT_VALIDATION_ERR, responseBuilder);
+			response = builder.build();
+			logger.error(LogCode.API_ERROR_CODE, "Input validation exception in doCRUD.", e);
 		} catch (Exception e) {
 			builder = responseUtil.buildErrorResponse(headers, "Unexpected error occured.", responseBuilder);
 			response = builder.build();