Przeniesienie definicji wyjątków z baza do model

PC39-Wielomodulowy/baza/src/main/java/sklep/db/CustomerDAO.java

@@ -6,6 +6,8 @@ import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
 
+import sklep.exn.DBException;
+import sklep.exn.RecordNotFound;
 import sklep.model.Customer;
 
 public class CustomerDAO {

PC39-Wielomodulowy/baza/src/main/java/sklep/db/DBConnection.java

@@ -5,6 +5,8 @@ import java.sql.DriverManager;
 import java.sql.SQLException;
 import java.util.Properties;
 
+import sklep.exn.DBException;
+
 public class DBConnection implements AutoCloseable {
 	private Connection sqlConnection;
 

PC39-Wielomodulowy/baza/src/main/java/sklep/db/DBSettings.java

@@ -6,6 +6,8 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.util.Properties;
 
+import sklep.exn.DBException;
+
 public class DBSettings {
 	public static final String DB_SETTINGS_SYSTEM_PROPERTY = "sklep.db_settings_location";
 	private static final String INTERNAL_DEFAULT_PROPERTIES = "/sklep.properties";

PC39-Wielomodulowy/baza/src/main/java/sklep/db/OrderDAO.java

@@ -6,6 +6,8 @@ import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
 
+import sklep.exn.DBException;
+import sklep.exn.RecordNotFound;
 import sklep.model.Order;
 import sklep.model.OrderProduct;
 

PC39-Wielomodulowy/baza/src/main/java/sklep/db/ProductDAO.java

@@ -7,6 +7,8 @@ import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
 
+import sklep.exn.DBException;
+import sklep.exn.RecordNotFound;
 import sklep.model.Product;
 
 /* DAO - Data Access Object(s) 

PC39-Wielomodulowy/baza/src/main/java/sklep/db/ZwyklyOdczyt_DAO.java

@@ -2,6 +2,7 @@ package sklep.db;
 
 import java.util.List;
 
+import sklep.exn.DBException;
 import sklep.model.Product;
 
 public class ZwyklyOdczyt_DAO {

PC39-Wielomodulowy/baza/src/main/java/sklep/photo/PhotoUtil.java

@@ -8,9 +8,9 @@ import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.nio.file.StandardCopyOption;
 
-import sklep.db.DBException;
 import sklep.db.DBSettings;
-import sklep.db.RecordNotFound;
+import sklep.exn.DBException;
+import sklep.exn.RecordNotFound;
 
 public class PhotoUtil {
     

PC39-Wielomodulowy/baza/src/main/java/sklep/db/DBException.java → PC39-Wielomodulowy/model/src/main/java/sklep/exn/DBException.java

-package sklep.db;
+package sklep.exn;
 
 public class DBException extends SklepException {
 

PC39-Wielomodulowy/baza/src/main/java/sklep/db/RecordNotFound.java → PC39-Wielomodulowy/model/src/main/java/sklep/exn/RecordNotFound.java

-package sklep.db;
+package sklep.exn;
 
 public class RecordNotFound extends SklepException {
 

PC39-Wielomodulowy/baza/src/main/java/sklep/db/SklepException.java → PC39-Wielomodulowy/model/src/main/java/sklep/exn/SklepException.java

-package sklep.db;
+package sklep.exn;
 
 public class SklepException extends Exception {
 

PC39-Wielomodulowy/rest_serwer/src/main/java/sklep/rest/RCustomer.java

@@ -15,8 +15,8 @@ import jakarta.ws.rs.core.Response;
 import jakarta.ws.rs.core.UriBuilder;
 import sklep.db.CustomerDAO;
 import sklep.db.DBConnection;
-import sklep.db.DBException;
-import sklep.db.RecordNotFound;
+import sklep.exn.DBException;
+import sklep.exn.RecordNotFound;
 import sklep.model.Customer;
 
 @RequestScoped

PC39-Wielomodulowy/rest_serwer/src/main/java/sklep/rest/ROrder.java

@@ -14,9 +14,9 @@ import jakarta.ws.rs.core.Response.Status;
 import jakarta.ws.rs.core.UriBuilder;
 import sklep.db.CustomerDAO;
 import sklep.db.DBConnection;
-import sklep.db.DBException;
 import sklep.db.OrderDAO;
-import sklep.db.RecordNotFound;
+import sklep.exn.DBException;
+import sklep.exn.RecordNotFound;
 import sklep.model.Customer;
 import sklep.model.Order;
 

PC39-Wielomodulowy/rest_serwer/src/main/java/sklep/rest/RProductPDF.java

@@ -6,9 +6,9 @@ import jakarta.ws.rs.PathParam;
 import jakarta.ws.rs.Produces;
 
 import sklep.db.DBConnection;
-import sklep.db.DBException;
 import sklep.db.ProductDAO;
-import sklep.db.RecordNotFound;
+import sklep.exn.DBException;
+import sklep.exn.RecordNotFound;
 import sklep.model.Product;
 import sklep.model.ProductList;
 

PC39-Wielomodulowy/rest_serwer/src/main/java/sklep/rest/RProducts.java

@@ -15,9 +15,9 @@ import jakarta.ws.rs.Produces;
 import jakarta.ws.rs.core.Response;
 import jakarta.ws.rs.core.UriBuilder;
 import sklep.db.DBConnection;
-import sklep.db.DBException;
 import sklep.db.ProductDAO;
-import sklep.db.RecordNotFound;
+import sklep.exn.DBException;
+import sklep.exn.RecordNotFound;
 import sklep.model.Product;
 import sklep.model.ProductList;
 import sklep.photo.PhotoUtil;

PC39-Wielomodulowy/rest_serwer/src/main/java/sklep/rest/RProductsJSON.java

@@ -12,9 +12,9 @@ import jakarta.ws.rs.Path;
 import jakarta.ws.rs.PathParam;
 import jakarta.ws.rs.Produces;
 import sklep.db.DBConnection;
-import sklep.db.DBException;
 import sklep.db.ProductDAO;
-import sklep.db.RecordNotFound;
+import sklep.exn.DBException;
+import sklep.exn.RecordNotFound;
 import sklep.model.Product;
 import sklep.photo.PhotoUtil;
 

PC39-Wielomodulowy/rest_serwer/src/main/java/sklep/rest/RProductsXML.java

@@ -12,9 +12,9 @@ import jakarta.ws.rs.Path;
 import jakarta.ws.rs.PathParam;
 import jakarta.ws.rs.Produces;
 import sklep.db.DBConnection;
-import sklep.db.DBException;
 import sklep.db.ProductDAO;
-import sklep.db.RecordNotFound;
+import sklep.exn.DBException;
+import sklep.exn.RecordNotFound;
 import sklep.model.Product;
 import sklep.model.ProductList;
 import sklep.photo.PhotoUtil;

PC39-Wielomodulowy/rest_serwer/src/main/java/sklep/rest/ext/RecordNotFoundMapper.java

@@ -3,7 +3,7 @@ package sklep.rest.ext;
 import jakarta.ws.rs.core.Response;
 import jakarta.ws.rs.ext.ExceptionMapper;
 import jakarta.ws.rs.ext.Provider;
-import sklep.db.RecordNotFound;
+import sklep.exn.RecordNotFound;
 
 @Provider
 public class RecordNotFoundMapper implements ExceptionMapper<RecordNotFound> {

PC39-Wielomodulowy/rest_serwer/src/main/java/sklep/rest/ext/SklepExceptionMapper.java

@@ -4,7 +4,7 @@ import jakarta.ws.rs.core.Response;
 import jakarta.ws.rs.core.Response.Status;
 import jakarta.ws.rs.ext.ExceptionMapper;
 import jakarta.ws.rs.ext.Provider;
-import sklep.db.SklepException;
+import sklep.exn.SklepException;
 
 @Provider
 public class SklepExceptionMapper implements ExceptionMapper<SklepException> {

PC39-Wielomodulowy/sklep_web/src/main/java/sklep/web/EditProduct.java

@@ -11,9 +11,9 @@ import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 
 import sklep.db.DBConnection;
-import sklep.db.DBException;
 import sklep.db.ProductDAO;
-import sklep.db.RecordNotFound;
+import sklep.exn.DBException;
+import sklep.exn.RecordNotFound;
 import sklep.model.Product;
 
 @WebServlet("/edit_product")

PC39-Wielomodulowy/sklep_web/src/main/java/sklep/web/ProductBean.java

@@ -4,8 +4,8 @@ import java.math.BigDecimal;
 import java.util.List;
 
 import sklep.db.DBConnection;
-import sklep.db.DBException;
 import sklep.db.ProductDAO;
+import sklep.exn.DBException;
 import sklep.model.Product;
 
 public class ProductBean {

PC39-Wielomodulowy/sklep_web/src/main/java/sklep/web/Products1.java

@@ -10,8 +10,8 @@ import jakarta.servlet.http.HttpServlet;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import sklep.db.DBConnection;
-import sklep.db.DBException;
 import sklep.db.ProductDAO;
+import sklep.exn.DBException;
 import sklep.model.Product;
 
 @WebServlet("/products1")

PC39-Wielomodulowy/sklep_web/src/main/java/sklep/web/Products2.java

@@ -10,8 +10,8 @@ import jakarta.servlet.http.HttpServlet;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import sklep.db.DBConnection;
-import sklep.db.DBException;
 import sklep.db.ProductDAO;
+import sklep.exn.DBException;
 import sklep.model.Product;
 
 @WebServlet("/products2")

PC39-Wielomodulowy/soap_api/src/main/java/sklep/soap/Sklep.java

@@ -6,8 +6,8 @@ import java.util.List;
 import jakarta.jws.WebParam;
 import jakarta.jws.WebResult;
 import jakarta.jws.WebService;
-import sklep.db.DBException;
-import sklep.db.RecordNotFound;
+import sklep.exn.DBException;
+import sklep.exn.RecordNotFound;
 import sklep.model.Customer;
 import sklep.model.Order;
 import sklep.model.Product;

PC39-Wielomodulowy/soap_klient/src/main/java/sklep/klient/Klient1_WszystkieProdukty.java

@@ -2,7 +2,7 @@ package sklep.klient;
 
 import java.util.List;
 
-import sklep.db.DBException;
+import sklep.exn.DBException;
 import sklep.model.Product;
 import sklep.soap.Sklep;
 

PC39-Wielomodulowy/soap_serwer/src/main/java/sklep/soap/SklepImpl.java

@@ -7,10 +7,10 @@ import jakarta.jws.WebService;
 import jakarta.xml.ws.soap.MTOM;
 import sklep.db.CustomerDAO;
 import sklep.db.DBConnection;
-import sklep.db.DBException;
 import sklep.db.OrderDAO;
 import sklep.db.ProductDAO;
-import sklep.db.RecordNotFound;
+import sklep.exn.DBException;
+import sklep.exn.RecordNotFound;
 import sklep.model.Customer;
 import sklep.model.Order;
 import sklep.model.Product;