second commit for new changes

catalog-service/src/main/java/com/training/catalog/controller/CatalogController.java

 package com.training.catalog.controller;
 
 import java.util.List;
+import java.util.Optional;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
@@ -25,10 +26,15 @@ public class CatalogController {
 		return new ResponseEntity<List<Product>>(catalogService.getProducts(), HttpStatus.OK);
 	}
 
+
 	@GetMapping("/{name}")
-	public ResponseEntity<Product> getProductWith(@PathVariable("name") String name) {
-//		System.out.println("name-->" + name);
-		return new ResponseEntity<Product>(catalogService.getProduct(name), HttpStatus.OK);
+	public ResponseEntity<Optional<Product>> getProductWith(@PathVariable("name") String name) {
+
+		Optional<Product> productName =catalogService.getProduct(name);
+		if(productName.isPresent()) {
+			return new ResponseEntity<Optional<Product> >(productName, HttpStatus.OK);
+		}
+		return new ResponseEntity<Optional<Product> >(HttpStatus.NOT_FOUND);
 	}
 
 }

catalog-service/src/main/java/com/training/catalog/service/CatalogService.java

 package com.training.catalog.service;
 
 import java.util.List;
+import java.util.Optional;
 
 import com.training.catalog.model.Product;
 
 public interface CatalogService {
 
 	public List<Product> getProducts();
-	public Product getProduct(String name) ;
+	public Optional<Product> getProduct(String name) ;
 }

catalog-service/src/main/java/com/training/catalog/service/CatalogServiceImpl.java

@@ -3,6 +3,7 @@ package com.training.catalog.service;
 import java.util.List;
 import java.util.Optional;
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.training.catalog.model.Product;
@@ -11,8 +12,9 @@ import com.training.catalog.respository.CatalogRepository;
 @Service
 public class CatalogServiceImpl implements CatalogService {
 
+	@Autowired
 	private CatalogRepository catalogRepository;
-	
+
 	@Override
 	public List<Product> getProducts() {
 		List<Product> listOfProducts = catalogRepository.findAll();
@@ -20,12 +22,15 @@ public class CatalogServiceImpl implements CatalogService {
 	}
 
 	@Override
-	public Product getProduct(String name) {
-		Optional<Product> findById = catalogRepository.findById(name);
-		if (findById.isPresent()) {
-			return findById.get();
+	public Optional<Product> getProduct(String name) {
+
+		if (catalogRepository.existsById(name)) {
+			Optional<Product> findById = catalogRepository.findById(name);
+			if (findById.isPresent()) {
+				return findById;
+			}
 		}
-		return null;
+		return Optional.empty();
 	}
 
 }

product-service/src/main/java/com/training/product/service/BagService.java

 package com.training.product.service;
 
-import org.springframework.stereotype.Service;
-
 import com.training.product.model.Product;
 
 public interface BagService {

product-service/src/main/java/com/training/product/service/BagServiceImpl.java

@@ -30,16 +30,19 @@ public class BagServiceImpl implements BagService {
 			product.setPrice(pro.getPrice());
 			product.setQuantity(pro.getQuantity());
 			bagRepository.save(product);
-			return "updated..!";
+			return "Product Updated..!";
 		}
 
-		return "Product Updated ";
+		return "There is a no product on this name";
 	}
 
 	@Override
 	public String deleteProduct(String name) {
+		if (bagRepository.existsById(name)) {
 		bagRepository.deleteById(name);
 		return "Product Deleted ";
+		}
+		return "Please give correct product name/there is a no product on this name";
 	}
 
 }