From 183f99d25beb110ea91df9a7f9402e148039654a Mon Sep 17 00:00:00 2001 From: "Notmoo-PC\\Notmoo" Date: Thu, 26 Oct 2017 21:51:44 +0200 Subject: [PATCH] =?UTF-8?q?Module=20Server=20:=20r=C3=A9organisation=20arb?= =?UTF-8?q?orescence=20pour=20corriger=20anomalies=20de=20g=C3=A9n=C3=A9ra?= =?UTF-8?q?tion=20de=20war?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Workspace/server/server.iml | 8 -------- .../com/pqt/server/controller/IMessageHandler.java | 0 .../com/pqt/server/controller/SimpleMessageHandler.java | 0 .../com/pqt/server/exception/ServerQueryException.java | 0 .../com/pqt/server/module/account/AccountEntry.java | 0 .../com/pqt/server/module/account/AccountService.java | 0 .../com/pqt/server/module/account/FileAccountDao.java | 0 .../com/pqt/server/module/account/IAccountDao.java | 0 .../com/pqt/server/module/client/ClientEntry.java | 0 .../com/pqt/server/module/client/ClientService.java | 0 .../com/pqt/server/module/sale/ISaleDao.java | 0 .../com/pqt/server/module/sale/NoRevertFileSaleDao.java | 0 .../com/pqt/server/module/sale/SaleService.java | 1 - .../pqt/server/module/sale/listeners/ISaleFirerer.java | 0 .../pqt/server/module/sale/listeners/ISaleListener.java | 0 .../server/module/sale/listeners/SaleListenerAdapter.java | 0 .../server/module/sale/listeners/SimpleSaleFirerer.java | 0 .../com/pqt/server/module/state/ServerState.java | 0 .../com/pqt/server/module/state/ServerStateService.java | 2 -- .../pqt/server/module/statistics/StatisticsService.java | 2 -- .../com/pqt/server/module/stock/FileStockDao.java | 0 .../com/pqt/server/module/stock/IStockDao.java | 1 - .../com/pqt/server/module/stock/StockService.java | 1 - .../com/pqt/server/servlets/QueryServlet.java | 0 .../classes => java}/com/pqt/server/tools/FileUtil.java | 0 .../com/pqt/server/tools/entities/SaleContent.java | 0 .../com/pqt/server/tools/io/ISerialFileManager.java | 0 .../com/pqt/server/tools/io/SimpleSerialFileManager.java | 0 .../server/tools/io/SimpleSerialFileManagerFactory.java | 0 .../pqt/server/tools/security/AbstractSimpleHashTool.java | 0 .../com/pqt/server/tools/security/IHashTool.java | 0 .../com/pqt/server/tools/security/MD5HashTool.java | 4 ---- .../com/pqt/server/tools/security/SHA256HashTool.java | 0 33 files changed, 19 deletions(-) rename Workspace/server/src/main/{WEB-INF/classes => java}/com/pqt/server/controller/IMessageHandler.java (100%) rename Workspace/server/src/main/{WEB-INF/classes => java}/com/pqt/server/controller/SimpleMessageHandler.java (100%) rename Workspace/server/src/main/{WEB-INF/classes => java}/com/pqt/server/exception/ServerQueryException.java (100%) rename Workspace/server/src/main/{WEB-INF/classes => java}/com/pqt/server/module/account/AccountEntry.java (100%) rename Workspace/server/src/main/{WEB-INF/classes => java}/com/pqt/server/module/account/AccountService.java (100%) rename Workspace/server/src/main/{WEB-INF/classes => java}/com/pqt/server/module/account/FileAccountDao.java (100%) rename Workspace/server/src/main/{WEB-INF/classes => java}/com/pqt/server/module/account/IAccountDao.java (100%) rename Workspace/server/src/main/{WEB-INF/classes => java}/com/pqt/server/module/client/ClientEntry.java (100%) rename Workspace/server/src/main/{WEB-INF/classes => java}/com/pqt/server/module/client/ClientService.java (100%) rename Workspace/server/src/main/{WEB-INF/classes => java}/com/pqt/server/module/sale/ISaleDao.java (100%) rename Workspace/server/src/main/{WEB-INF/classes => java}/com/pqt/server/module/sale/NoRevertFileSaleDao.java (100%) rename Workspace/server/src/main/{WEB-INF/classes => java}/com/pqt/server/module/sale/SaleService.java (98%) rename Workspace/server/src/main/{WEB-INF/classes => java}/com/pqt/server/module/sale/listeners/ISaleFirerer.java (100%) rename Workspace/server/src/main/{WEB-INF/classes => java}/com/pqt/server/module/sale/listeners/ISaleListener.java (100%) rename Workspace/server/src/main/{WEB-INF/classes => java}/com/pqt/server/module/sale/listeners/SaleListenerAdapter.java (100%) rename Workspace/server/src/main/{WEB-INF/classes => java}/com/pqt/server/module/sale/listeners/SimpleSaleFirerer.java (100%) rename Workspace/server/src/main/{WEB-INF/classes => java}/com/pqt/server/module/state/ServerState.java (100%) rename Workspace/server/src/main/{WEB-INF/classes => java}/com/pqt/server/module/state/ServerStateService.java (98%) rename Workspace/server/src/main/{WEB-INF/classes => java}/com/pqt/server/module/statistics/StatisticsService.java (96%) rename Workspace/server/src/main/{WEB-INF/classes => java}/com/pqt/server/module/stock/FileStockDao.java (100%) rename Workspace/server/src/main/{WEB-INF/classes => java}/com/pqt/server/module/stock/IStockDao.java (99%) rename Workspace/server/src/main/{WEB-INF/classes => java}/com/pqt/server/module/stock/StockService.java (98%) rename Workspace/server/src/main/{WEB-INF/classes => java}/com/pqt/server/servlets/QueryServlet.java (100%) rename Workspace/server/src/main/{WEB-INF/classes => java}/com/pqt/server/tools/FileUtil.java (100%) rename Workspace/server/src/main/{WEB-INF/classes => java}/com/pqt/server/tools/entities/SaleContent.java (100%) rename Workspace/server/src/main/{WEB-INF/classes => java}/com/pqt/server/tools/io/ISerialFileManager.java (100%) rename Workspace/server/src/main/{WEB-INF/classes => java}/com/pqt/server/tools/io/SimpleSerialFileManager.java (100%) rename Workspace/server/src/main/{WEB-INF/classes => java}/com/pqt/server/tools/io/SimpleSerialFileManagerFactory.java (100%) rename Workspace/server/src/main/{WEB-INF/classes => java}/com/pqt/server/tools/security/AbstractSimpleHashTool.java (100%) rename Workspace/server/src/main/{WEB-INF/classes => java}/com/pqt/server/tools/security/IHashTool.java (100%) rename Workspace/server/src/main/{WEB-INF/classes => java}/com/pqt/server/tools/security/MD5HashTool.java (59%) rename Workspace/server/src/main/{WEB-INF/classes => java}/com/pqt/server/tools/security/SHA256HashTool.java (100%) diff --git a/Workspace/server/server.iml b/Workspace/server/server.iml index 9e96cbf1..a82b0167 100644 --- a/Workspace/server/server.iml +++ b/Workspace/server/server.iml @@ -25,14 +25,6 @@ - - - - - - - - diff --git a/Workspace/server/src/main/WEB-INF/classes/com/pqt/server/controller/IMessageHandler.java b/Workspace/server/src/main/java/com/pqt/server/controller/IMessageHandler.java similarity index 100% rename from Workspace/server/src/main/WEB-INF/classes/com/pqt/server/controller/IMessageHandler.java rename to Workspace/server/src/main/java/com/pqt/server/controller/IMessageHandler.java diff --git a/Workspace/server/src/main/WEB-INF/classes/com/pqt/server/controller/SimpleMessageHandler.java b/Workspace/server/src/main/java/com/pqt/server/controller/SimpleMessageHandler.java similarity index 100% rename from Workspace/server/src/main/WEB-INF/classes/com/pqt/server/controller/SimpleMessageHandler.java rename to Workspace/server/src/main/java/com/pqt/server/controller/SimpleMessageHandler.java diff --git a/Workspace/server/src/main/WEB-INF/classes/com/pqt/server/exception/ServerQueryException.java b/Workspace/server/src/main/java/com/pqt/server/exception/ServerQueryException.java similarity index 100% rename from Workspace/server/src/main/WEB-INF/classes/com/pqt/server/exception/ServerQueryException.java rename to Workspace/server/src/main/java/com/pqt/server/exception/ServerQueryException.java diff --git a/Workspace/server/src/main/WEB-INF/classes/com/pqt/server/module/account/AccountEntry.java b/Workspace/server/src/main/java/com/pqt/server/module/account/AccountEntry.java similarity index 100% rename from Workspace/server/src/main/WEB-INF/classes/com/pqt/server/module/account/AccountEntry.java rename to Workspace/server/src/main/java/com/pqt/server/module/account/AccountEntry.java diff --git a/Workspace/server/src/main/WEB-INF/classes/com/pqt/server/module/account/AccountService.java b/Workspace/server/src/main/java/com/pqt/server/module/account/AccountService.java similarity index 100% rename from Workspace/server/src/main/WEB-INF/classes/com/pqt/server/module/account/AccountService.java rename to Workspace/server/src/main/java/com/pqt/server/module/account/AccountService.java diff --git a/Workspace/server/src/main/WEB-INF/classes/com/pqt/server/module/account/FileAccountDao.java b/Workspace/server/src/main/java/com/pqt/server/module/account/FileAccountDao.java similarity index 100% rename from Workspace/server/src/main/WEB-INF/classes/com/pqt/server/module/account/FileAccountDao.java rename to Workspace/server/src/main/java/com/pqt/server/module/account/FileAccountDao.java diff --git a/Workspace/server/src/main/WEB-INF/classes/com/pqt/server/module/account/IAccountDao.java b/Workspace/server/src/main/java/com/pqt/server/module/account/IAccountDao.java similarity index 100% rename from Workspace/server/src/main/WEB-INF/classes/com/pqt/server/module/account/IAccountDao.java rename to Workspace/server/src/main/java/com/pqt/server/module/account/IAccountDao.java diff --git a/Workspace/server/src/main/WEB-INF/classes/com/pqt/server/module/client/ClientEntry.java b/Workspace/server/src/main/java/com/pqt/server/module/client/ClientEntry.java similarity index 100% rename from Workspace/server/src/main/WEB-INF/classes/com/pqt/server/module/client/ClientEntry.java rename to Workspace/server/src/main/java/com/pqt/server/module/client/ClientEntry.java diff --git a/Workspace/server/src/main/WEB-INF/classes/com/pqt/server/module/client/ClientService.java b/Workspace/server/src/main/java/com/pqt/server/module/client/ClientService.java similarity index 100% rename from Workspace/server/src/main/WEB-INF/classes/com/pqt/server/module/client/ClientService.java rename to Workspace/server/src/main/java/com/pqt/server/module/client/ClientService.java diff --git a/Workspace/server/src/main/WEB-INF/classes/com/pqt/server/module/sale/ISaleDao.java b/Workspace/server/src/main/java/com/pqt/server/module/sale/ISaleDao.java similarity index 100% rename from Workspace/server/src/main/WEB-INF/classes/com/pqt/server/module/sale/ISaleDao.java rename to Workspace/server/src/main/java/com/pqt/server/module/sale/ISaleDao.java diff --git a/Workspace/server/src/main/WEB-INF/classes/com/pqt/server/module/sale/NoRevertFileSaleDao.java b/Workspace/server/src/main/java/com/pqt/server/module/sale/NoRevertFileSaleDao.java similarity index 100% rename from Workspace/server/src/main/WEB-INF/classes/com/pqt/server/module/sale/NoRevertFileSaleDao.java rename to Workspace/server/src/main/java/com/pqt/server/module/sale/NoRevertFileSaleDao.java diff --git a/Workspace/server/src/main/WEB-INF/classes/com/pqt/server/module/sale/SaleService.java b/Workspace/server/src/main/java/com/pqt/server/module/sale/SaleService.java similarity index 98% rename from Workspace/server/src/main/WEB-INF/classes/com/pqt/server/module/sale/SaleService.java rename to Workspace/server/src/main/java/com/pqt/server/module/sale/SaleService.java index 54b31fc3..6364ce68 100644 --- a/Workspace/server/src/main/WEB-INF/classes/com/pqt/server/module/sale/SaleService.java +++ b/Workspace/server/src/main/java/com/pqt/server/module/sale/SaleService.java @@ -1,7 +1,6 @@ package com.pqt.server.module.sale; import com.pqt.core.entities.sale.Sale; -import com.pqt.server.exception.ServerQueryException; import com.pqt.server.module.sale.listeners.ISaleFirerer; import com.pqt.server.module.sale.listeners.ISaleListener; import com.pqt.server.module.sale.listeners.SimpleSaleFirerer; diff --git a/Workspace/server/src/main/WEB-INF/classes/com/pqt/server/module/sale/listeners/ISaleFirerer.java b/Workspace/server/src/main/java/com/pqt/server/module/sale/listeners/ISaleFirerer.java similarity index 100% rename from Workspace/server/src/main/WEB-INF/classes/com/pqt/server/module/sale/listeners/ISaleFirerer.java rename to Workspace/server/src/main/java/com/pqt/server/module/sale/listeners/ISaleFirerer.java diff --git a/Workspace/server/src/main/WEB-INF/classes/com/pqt/server/module/sale/listeners/ISaleListener.java b/Workspace/server/src/main/java/com/pqt/server/module/sale/listeners/ISaleListener.java similarity index 100% rename from Workspace/server/src/main/WEB-INF/classes/com/pqt/server/module/sale/listeners/ISaleListener.java rename to Workspace/server/src/main/java/com/pqt/server/module/sale/listeners/ISaleListener.java diff --git a/Workspace/server/src/main/WEB-INF/classes/com/pqt/server/module/sale/listeners/SaleListenerAdapter.java b/Workspace/server/src/main/java/com/pqt/server/module/sale/listeners/SaleListenerAdapter.java similarity index 100% rename from Workspace/server/src/main/WEB-INF/classes/com/pqt/server/module/sale/listeners/SaleListenerAdapter.java rename to Workspace/server/src/main/java/com/pqt/server/module/sale/listeners/SaleListenerAdapter.java diff --git a/Workspace/server/src/main/WEB-INF/classes/com/pqt/server/module/sale/listeners/SimpleSaleFirerer.java b/Workspace/server/src/main/java/com/pqt/server/module/sale/listeners/SimpleSaleFirerer.java similarity index 100% rename from Workspace/server/src/main/WEB-INF/classes/com/pqt/server/module/sale/listeners/SimpleSaleFirerer.java rename to Workspace/server/src/main/java/com/pqt/server/module/sale/listeners/SimpleSaleFirerer.java diff --git a/Workspace/server/src/main/WEB-INF/classes/com/pqt/server/module/state/ServerState.java b/Workspace/server/src/main/java/com/pqt/server/module/state/ServerState.java similarity index 100% rename from Workspace/server/src/main/WEB-INF/classes/com/pqt/server/module/state/ServerState.java rename to Workspace/server/src/main/java/com/pqt/server/module/state/ServerState.java diff --git a/Workspace/server/src/main/WEB-INF/classes/com/pqt/server/module/state/ServerStateService.java b/Workspace/server/src/main/java/com/pqt/server/module/state/ServerStateService.java similarity index 98% rename from Workspace/server/src/main/WEB-INF/classes/com/pqt/server/module/state/ServerStateService.java rename to Workspace/server/src/main/java/com/pqt/server/module/state/ServerStateService.java index 107394e6..7ed4aea6 100644 --- a/Workspace/server/src/main/WEB-INF/classes/com/pqt/server/module/state/ServerStateService.java +++ b/Workspace/server/src/main/java/com/pqt/server/module/state/ServerStateService.java @@ -4,8 +4,6 @@ import com.pqt.core.entities.members.DataServer; import com.pqt.core.entities.server_config.ConfigFields; import com.pqt.core.entities.server_config.ServerConfig; -import java.util.Date; - /** * Cette classe correspond au service interne du serveur, chargé de conserver les données propres au serveur, comme * son adresse IP ou encore les différents aspects de la configuration actuelle. Il permet également de récupérer un diff --git a/Workspace/server/src/main/WEB-INF/classes/com/pqt/server/module/statistics/StatisticsService.java b/Workspace/server/src/main/java/com/pqt/server/module/statistics/StatisticsService.java similarity index 96% rename from Workspace/server/src/main/WEB-INF/classes/com/pqt/server/module/statistics/StatisticsService.java rename to Workspace/server/src/main/java/com/pqt/server/module/statistics/StatisticsService.java index 8d925c90..b4865c05 100644 --- a/Workspace/server/src/main/WEB-INF/classes/com/pqt/server/module/statistics/StatisticsService.java +++ b/Workspace/server/src/main/java/com/pqt/server/module/statistics/StatisticsService.java @@ -3,12 +3,10 @@ package com.pqt.server.module.statistics; import com.pqt.core.entities.product.LightweightProduct; import com.pqt.core.entities.product.Product; import com.pqt.core.entities.sale.Sale; -import com.pqt.server.module.sale.listeners.ISaleListener; import com.pqt.server.module.sale.listeners.SaleListenerAdapter; import com.pqt.server.module.stock.StockService; import com.pqt.server.module.sale.SaleService; -import java.util.ArrayList; import java.util.Comparator; import java.util.List; import java.util.stream.Collectors; diff --git a/Workspace/server/src/main/WEB-INF/classes/com/pqt/server/module/stock/FileStockDao.java b/Workspace/server/src/main/java/com/pqt/server/module/stock/FileStockDao.java similarity index 100% rename from Workspace/server/src/main/WEB-INF/classes/com/pqt/server/module/stock/FileStockDao.java rename to Workspace/server/src/main/java/com/pqt/server/module/stock/FileStockDao.java diff --git a/Workspace/server/src/main/WEB-INF/classes/com/pqt/server/module/stock/IStockDao.java b/Workspace/server/src/main/java/com/pqt/server/module/stock/IStockDao.java similarity index 99% rename from Workspace/server/src/main/WEB-INF/classes/com/pqt/server/module/stock/IStockDao.java rename to Workspace/server/src/main/java/com/pqt/server/module/stock/IStockDao.java index 1eff2683..c6ec0b07 100644 --- a/Workspace/server/src/main/WEB-INF/classes/com/pqt/server/module/stock/IStockDao.java +++ b/Workspace/server/src/main/java/com/pqt/server/module/stock/IStockDao.java @@ -4,7 +4,6 @@ import com.pqt.core.entities.product.Product; import com.pqt.server.tools.entities.SaleContent; import java.util.List; -import java.util.Map; /** * Interface définissant les méthodes requises pour tout DAO du service de gestion des commandes {@link StockService}. diff --git a/Workspace/server/src/main/WEB-INF/classes/com/pqt/server/module/stock/StockService.java b/Workspace/server/src/main/java/com/pqt/server/module/stock/StockService.java similarity index 98% rename from Workspace/server/src/main/WEB-INF/classes/com/pqt/server/module/stock/StockService.java rename to Workspace/server/src/main/java/com/pqt/server/module/stock/StockService.java index fe184569..13e3fef3 100644 --- a/Workspace/server/src/main/WEB-INF/classes/com/pqt/server/module/stock/StockService.java +++ b/Workspace/server/src/main/java/com/pqt/server/module/stock/StockService.java @@ -6,7 +6,6 @@ import com.pqt.server.exception.ServerQueryException; import com.pqt.server.tools.entities.SaleContent; import java.util.List; -import java.util.Map; //TODO ajouter logs diff --git a/Workspace/server/src/main/WEB-INF/classes/com/pqt/server/servlets/QueryServlet.java b/Workspace/server/src/main/java/com/pqt/server/servlets/QueryServlet.java similarity index 100% rename from Workspace/server/src/main/WEB-INF/classes/com/pqt/server/servlets/QueryServlet.java rename to Workspace/server/src/main/java/com/pqt/server/servlets/QueryServlet.java diff --git a/Workspace/server/src/main/WEB-INF/classes/com/pqt/server/tools/FileUtil.java b/Workspace/server/src/main/java/com/pqt/server/tools/FileUtil.java similarity index 100% rename from Workspace/server/src/main/WEB-INF/classes/com/pqt/server/tools/FileUtil.java rename to Workspace/server/src/main/java/com/pqt/server/tools/FileUtil.java diff --git a/Workspace/server/src/main/WEB-INF/classes/com/pqt/server/tools/entities/SaleContent.java b/Workspace/server/src/main/java/com/pqt/server/tools/entities/SaleContent.java similarity index 100% rename from Workspace/server/src/main/WEB-INF/classes/com/pqt/server/tools/entities/SaleContent.java rename to Workspace/server/src/main/java/com/pqt/server/tools/entities/SaleContent.java diff --git a/Workspace/server/src/main/WEB-INF/classes/com/pqt/server/tools/io/ISerialFileManager.java b/Workspace/server/src/main/java/com/pqt/server/tools/io/ISerialFileManager.java similarity index 100% rename from Workspace/server/src/main/WEB-INF/classes/com/pqt/server/tools/io/ISerialFileManager.java rename to Workspace/server/src/main/java/com/pqt/server/tools/io/ISerialFileManager.java diff --git a/Workspace/server/src/main/WEB-INF/classes/com/pqt/server/tools/io/SimpleSerialFileManager.java b/Workspace/server/src/main/java/com/pqt/server/tools/io/SimpleSerialFileManager.java similarity index 100% rename from Workspace/server/src/main/WEB-INF/classes/com/pqt/server/tools/io/SimpleSerialFileManager.java rename to Workspace/server/src/main/java/com/pqt/server/tools/io/SimpleSerialFileManager.java diff --git a/Workspace/server/src/main/WEB-INF/classes/com/pqt/server/tools/io/SimpleSerialFileManagerFactory.java b/Workspace/server/src/main/java/com/pqt/server/tools/io/SimpleSerialFileManagerFactory.java similarity index 100% rename from Workspace/server/src/main/WEB-INF/classes/com/pqt/server/tools/io/SimpleSerialFileManagerFactory.java rename to Workspace/server/src/main/java/com/pqt/server/tools/io/SimpleSerialFileManagerFactory.java diff --git a/Workspace/server/src/main/WEB-INF/classes/com/pqt/server/tools/security/AbstractSimpleHashTool.java b/Workspace/server/src/main/java/com/pqt/server/tools/security/AbstractSimpleHashTool.java similarity index 100% rename from Workspace/server/src/main/WEB-INF/classes/com/pqt/server/tools/security/AbstractSimpleHashTool.java rename to Workspace/server/src/main/java/com/pqt/server/tools/security/AbstractSimpleHashTool.java diff --git a/Workspace/server/src/main/WEB-INF/classes/com/pqt/server/tools/security/IHashTool.java b/Workspace/server/src/main/java/com/pqt/server/tools/security/IHashTool.java similarity index 100% rename from Workspace/server/src/main/WEB-INF/classes/com/pqt/server/tools/security/IHashTool.java rename to Workspace/server/src/main/java/com/pqt/server/tools/security/IHashTool.java diff --git a/Workspace/server/src/main/WEB-INF/classes/com/pqt/server/tools/security/MD5HashTool.java b/Workspace/server/src/main/java/com/pqt/server/tools/security/MD5HashTool.java similarity index 59% rename from Workspace/server/src/main/WEB-INF/classes/com/pqt/server/tools/security/MD5HashTool.java rename to Workspace/server/src/main/java/com/pqt/server/tools/security/MD5HashTool.java index b3b34da9..3d7c711e 100644 --- a/Workspace/server/src/main/WEB-INF/classes/com/pqt/server/tools/security/MD5HashTool.java +++ b/Workspace/server/src/main/java/com/pqt/server/tools/security/MD5HashTool.java @@ -1,9 +1,5 @@ package com.pqt.server.tools.security; -import java.math.BigInteger; -import java.security.MessageDigest; -import java.security.NoSuchAlgorithmException; - public class MD5HashTool extends AbstractSimpleHashTool{ public MD5HashTool() { setInstanceCode("MD5"); diff --git a/Workspace/server/src/main/WEB-INF/classes/com/pqt/server/tools/security/SHA256HashTool.java b/Workspace/server/src/main/java/com/pqt/server/tools/security/SHA256HashTool.java similarity index 100% rename from Workspace/server/src/main/WEB-INF/classes/com/pqt/server/tools/security/SHA256HashTool.java rename to Workspace/server/src/main/java/com/pqt/server/tools/security/SHA256HashTool.java