From 97c307835ab348ae8e879eb7bbf909cc3ea4a06f Mon Sep 17 00:00:00 2001 From: Benkler Date: Thu, 9 Feb 2017 21:00:44 +0100 Subject: [PATCH] Look-up method for enterprise manager implemented --- .../EnterpriseManagerStartup.java | 2 + .../main/resources/wsdl/IBarcodeScanner.wsdl | 148 +- .../src/main/resources/wsdl/ICardReader.wsdl | 178 +-- .../src/main/resources/wsdl/ICashBox.wsdl | 450 +++--- .../src/main/resources/wsdl/ICashDesk.wsdl | 816 +++++----- .../resources/wsdl/IEnterpriseManager.wsdl | 1410 ++++++++--------- .../resources/wsdl/IEnterpriseReport.wsdl | 206 +-- .../main/resources/wsdl/IExpressLight.wsdl | 206 +-- .../main/resources/wsdl/ILoginManager.wsdl | 548 +++---- .../src/main/resources/wsdl/IPrinter.wsdl | 206 +-- .../main/resources/wsdl/IStoreManager.wsdl | 1056 ++++++------ .../resources/wsdl/IURIRegistryManager.wsdl | 232 +-- .../src/main/resources/wsdl/IUserDisplay.wsdl | 150 +- .../enterpriseconnector/EnterpriseQuery.java | 66 +- .../enterpriseconnector/IEnterpriseQuery.java | 16 +- .../enterprisedata/EnterpriseConverter.java | 7 +- .../data/enterprisedata/EnterpriseDAO.java | 7 +- .../enterprisedata/EnterprisePersistence.java | 5 +- .../data/enterprisedata/IEnterpriseDAO.java | 7 +- .../IEnterprisePersistence.java | 6 +- .../web/data/storedata/IStorePersistence.java | 6 +- .../web/data/storedata/StorePersistence.java | 5 +- .../enterprise/EnterpriseInformation.java | 4 +- .../enterprise/IEnterpriseInformation.java | 4 +- .../web/frontend/store/IStoreInformation.java | 2 +- .../web/frontend/store/StoreInformation.java | 2 +- 26 files changed, 2898 insertions(+), 2847 deletions(-) diff --git a/cocome-maven-project/cloud-logic-service/cloud-enterprise-logic/enterprise-logic-webservice/src/main/java/org/cocome/cloud/webservice/enterpriseservice/EnterpriseManagerStartup.java b/cocome-maven-project/cloud-logic-service/cloud-enterprise-logic/enterprise-logic-webservice/src/main/java/org/cocome/cloud/webservice/enterpriseservice/EnterpriseManagerStartup.java index 0ebc840f..1773a00a 100644 --- a/cocome-maven-project/cloud-logic-service/cloud-enterprise-logic/enterprise-logic-webservice/src/main/java/org/cocome/cloud/webservice/enterpriseservice/EnterpriseManagerStartup.java +++ b/cocome-maven-project/cloud-logic-service/cloud-enterprise-logic/enterprise-logic-webservice/src/main/java/org/cocome/cloud/webservice/enterpriseservice/EnterpriseManagerStartup.java @@ -43,6 +43,8 @@ private void registerEnterpriseManagerComponents() { applicationHelper.registerComponent(Names.getLoginManagerRegistryName(defaultEnterpriseIndex), loginManagerWSDL, false); + + LOG.error("########################################################################" + enterpriseServiceWSDL); } catch (URISyntaxException e) { LOG.error("Error registering components: " + e.getMessage()); } diff --git a/cocome-maven-project/cloud-logic-service/cloud-logic-core-services/src/main/resources/wsdl/IBarcodeScanner.wsdl b/cocome-maven-project/cloud-logic-service/cloud-logic-core-services/src/main/resources/wsdl/IBarcodeScanner.wsdl index 52d7d3a5..9dd91be7 100644 --- a/cocome-maven-project/cloud-logic-service/cloud-logic-core-services/src/main/resources/wsdl/IBarcodeScanner.wsdl +++ b/cocome-maven-project/cloud-logic-service/cloud-logic-core-services/src/main/resources/wsdl/IBarcodeScanner.wsdl @@ -1,77 +1,77 @@ - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cocome-maven-project/cloud-logic-service/cloud-logic-core-services/src/main/resources/wsdl/ICardReader.wsdl b/cocome-maven-project/cloud-logic-service/cloud-logic-core-services/src/main/resources/wsdl/ICardReader.wsdl index 028c0f83..ca635299 100644 --- a/cocome-maven-project/cloud-logic-service/cloud-logic-core-services/src/main/resources/wsdl/ICardReader.wsdl +++ b/cocome-maven-project/cloud-logic-service/cloud-logic-core-services/src/main/resources/wsdl/ICardReader.wsdl @@ -1,92 +1,92 @@ - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cocome-maven-project/cloud-logic-service/cloud-logic-core-services/src/main/resources/wsdl/ICashBox.wsdl b/cocome-maven-project/cloud-logic-service/cloud-logic-core-services/src/main/resources/wsdl/ICashBox.wsdl index 59928fde..acd7d036 100644 --- a/cocome-maven-project/cloud-logic-service/cloud-logic-core-services/src/main/resources/wsdl/ICashBox.wsdl +++ b/cocome-maven-project/cloud-logic-service/cloud-logic-core-services/src/main/resources/wsdl/ICashBox.wsdl @@ -1,228 +1,228 @@ - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cocome-maven-project/cloud-logic-service/cloud-logic-core-services/src/main/resources/wsdl/ICashDesk.wsdl b/cocome-maven-project/cloud-logic-service/cloud-logic-core-services/src/main/resources/wsdl/ICashDesk.wsdl index 063898a6..3906e1dc 100644 --- a/cocome-maven-project/cloud-logic-service/cloud-logic-core-services/src/main/resources/wsdl/ICashDesk.wsdl +++ b/cocome-maven-project/cloud-logic-service/cloud-logic-core-services/src/main/resources/wsdl/ICashDesk.wsdl @@ -1,411 +1,411 @@ - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cocome-maven-project/cloud-logic-service/cloud-logic-core-services/src/main/resources/wsdl/IEnterpriseManager.wsdl b/cocome-maven-project/cloud-logic-service/cloud-logic-core-services/src/main/resources/wsdl/IEnterpriseManager.wsdl index fcf532ca..f87c708d 100644 --- a/cocome-maven-project/cloud-logic-service/cloud-logic-core-services/src/main/resources/wsdl/IEnterpriseManager.wsdl +++ b/cocome-maven-project/cloud-logic-service/cloud-logic-core-services/src/main/resources/wsdl/IEnterpriseManager.wsdl @@ -1,708 +1,708 @@ - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cocome-maven-project/cloud-logic-service/cloud-logic-core-services/src/main/resources/wsdl/IEnterpriseReport.wsdl b/cocome-maven-project/cloud-logic-service/cloud-logic-core-services/src/main/resources/wsdl/IEnterpriseReport.wsdl index 4f18b4a8..d375a7d9 100644 --- a/cocome-maven-project/cloud-logic-service/cloud-logic-core-services/src/main/resources/wsdl/IEnterpriseReport.wsdl +++ b/cocome-maven-project/cloud-logic-service/cloud-logic-core-services/src/main/resources/wsdl/IEnterpriseReport.wsdl @@ -1,106 +1,106 @@ - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cocome-maven-project/cloud-logic-service/cloud-logic-core-services/src/main/resources/wsdl/IExpressLight.wsdl b/cocome-maven-project/cloud-logic-service/cloud-logic-core-services/src/main/resources/wsdl/IExpressLight.wsdl index bf7f3c08..dfd43c88 100644 --- a/cocome-maven-project/cloud-logic-service/cloud-logic-core-services/src/main/resources/wsdl/IExpressLight.wsdl +++ b/cocome-maven-project/cloud-logic-service/cloud-logic-core-services/src/main/resources/wsdl/IExpressLight.wsdl @@ -1,106 +1,106 @@ - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cocome-maven-project/cloud-logic-service/cloud-logic-core-services/src/main/resources/wsdl/ILoginManager.wsdl b/cocome-maven-project/cloud-logic-service/cloud-logic-core-services/src/main/resources/wsdl/ILoginManager.wsdl index a99874fe..9b24ff64 100644 --- a/cocome-maven-project/cloud-logic-service/cloud-logic-core-services/src/main/resources/wsdl/ILoginManager.wsdl +++ b/cocome-maven-project/cloud-logic-service/cloud-logic-core-services/src/main/resources/wsdl/ILoginManager.wsdl @@ -1,277 +1,277 @@ - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cocome-maven-project/cloud-logic-service/cloud-logic-core-services/src/main/resources/wsdl/IPrinter.wsdl b/cocome-maven-project/cloud-logic-service/cloud-logic-core-services/src/main/resources/wsdl/IPrinter.wsdl index 7f259278..2be7b4fe 100644 --- a/cocome-maven-project/cloud-logic-service/cloud-logic-core-services/src/main/resources/wsdl/IPrinter.wsdl +++ b/cocome-maven-project/cloud-logic-service/cloud-logic-core-services/src/main/resources/wsdl/IPrinter.wsdl @@ -1,106 +1,106 @@ - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cocome-maven-project/cloud-logic-service/cloud-logic-core-services/src/main/resources/wsdl/IStoreManager.wsdl b/cocome-maven-project/cloud-logic-service/cloud-logic-core-services/src/main/resources/wsdl/IStoreManager.wsdl index d663f8a7..c65184c6 100644 --- a/cocome-maven-project/cloud-logic-service/cloud-logic-core-services/src/main/resources/wsdl/IStoreManager.wsdl +++ b/cocome-maven-project/cloud-logic-service/cloud-logic-core-services/src/main/resources/wsdl/IStoreManager.wsdl @@ -1,531 +1,531 @@ - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cocome-maven-project/cloud-logic-service/cloud-logic-core-services/src/main/resources/wsdl/IURIRegistryManager.wsdl b/cocome-maven-project/cloud-logic-service/cloud-logic-core-services/src/main/resources/wsdl/IURIRegistryManager.wsdl index d5745fd0..ad6d3bf6 100644 --- a/cocome-maven-project/cloud-logic-service/cloud-logic-core-services/src/main/resources/wsdl/IURIRegistryManager.wsdl +++ b/cocome-maven-project/cloud-logic-service/cloud-logic-core-services/src/main/resources/wsdl/IURIRegistryManager.wsdl @@ -1,119 +1,119 @@ - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cocome-maven-project/cloud-logic-service/cloud-logic-core-services/src/main/resources/wsdl/IUserDisplay.wsdl b/cocome-maven-project/cloud-logic-service/cloud-logic-core-services/src/main/resources/wsdl/IUserDisplay.wsdl index ed5ef95b..6194dc38 100644 --- a/cocome-maven-project/cloud-logic-service/cloud-logic-core-services/src/main/resources/wsdl/IUserDisplay.wsdl +++ b/cocome-maven-project/cloud-logic-service/cloud-logic-core-services/src/main/resources/wsdl/IUserDisplay.wsdl @@ -1,78 +1,78 @@ - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cocome-maven-project/cloud-web-frontend/src/main/java/org/cocome/cloud/web/connector/enterpriseconnector/EnterpriseQuery.java b/cocome-maven-project/cloud-web-frontend/src/main/java/org/cocome/cloud/web/connector/enterpriseconnector/EnterpriseQuery.java index 1599f29a..885be36d 100644 --- a/cocome-maven-project/cloud-web-frontend/src/main/java/org/cocome/cloud/web/connector/enterpriseconnector/EnterpriseQuery.java +++ b/cocome-maven-project/cloud-web-frontend/src/main/java/org/cocome/cloud/web/connector/enterpriseconnector/EnterpriseQuery.java @@ -1,5 +1,7 @@ package org.cocome.cloud.web.connector.enterpriseconnector; +import java.lang.reflect.InvocationTargetException; +import java.net.MalformedURLException; import java.util.Collection; import java.util.HashMap; import java.util.LinkedList; @@ -7,16 +9,22 @@ import java.util.Map; import javax.enterprise.context.ApplicationScoped; +import javax.inject.Inject; import javax.inject.Named; import javax.validation.constraints.NotNull; import javax.xml.ws.WebServiceRef; import org.apache.log4j.Logger; +import org.cocome.cloud.logic.registry.client.IApplicationHelper; import org.cocome.cloud.logic.stub.CreateException_Exception; import org.cocome.cloud.logic.stub.IEnterpriseManager; import org.cocome.cloud.logic.stub.IEnterpriseManagerService; +import org.cocome.cloud.logic.stub.IStoreManager; +import org.cocome.cloud.logic.stub.IStoreManagerService; +import org.cocome.cloud.logic.stub.NotBoundException_Exception; import org.cocome.cloud.logic.stub.NotInDatabaseException_Exception; import org.cocome.cloud.logic.stub.UpdateException_Exception; +import org.cocome.cloud.registry.service.Names; import org.cocome.cloud.web.data.enterprisedata.EnterpriseViewData; import org.cocome.cloud.web.data.storedata.ProductWrapper; import org.cocome.cloud.web.data.storedata.StoreViewData; @@ -40,8 +48,31 @@ public class EnterpriseQuery implements IEnterpriseQuery { private Map> storeCollections; private Map stores; - @WebServiceRef(IEnterpriseManagerService.class) IEnterpriseManager enterpriseManager; + + @Inject + long defaultEnterpriseIndex; + + @Inject + IApplicationHelper applicationHelper; + + private IEnterpriseManager lookupEnterpriseManager(long enterpriseID) throws NotInDatabaseException_Exception { + try { + return applicationHelper.getComponent( + Names.getEnterpriseManagerRegistryName(enterpriseID), + IEnterpriseManagerService.SERVICE, + IEnterpriseManagerService.class).getIEnterpriseManagerPort(); + } catch (InstantiationException | IllegalAccessException | IllegalArgumentException | InvocationTargetException + | MalformedURLException | NoSuchMethodException | SecurityException | NotBoundException_Exception e) { + if (enterpriseID == defaultEnterpriseIndex) { + LOG.error("Got exception while retrieving enterprise manager location: " + e.getMessage()); + e.printStackTrace(); + throw new NotInDatabaseException_Exception(e.getMessage()); + } else { + return lookupEnterpriseManager(defaultEnterpriseIndex); + } + } + } /* * (non-Javadoc) @@ -50,7 +81,7 @@ public class EnterpriseQuery implements IEnterpriseQuery { * getEnterprises() */ @Override - public Collection getEnterprises() { + public Collection getEnterprises() throws NotInDatabaseException_Exception { if (enterprises != null) { return enterprises.values(); } @@ -77,7 +108,8 @@ public Collection getStores(long enterpriseID) throws NotInDataba } @Override - public void updateEnterpriseInformation() { + public void updateEnterpriseInformation() throws NotInDatabaseException_Exception { + enterpriseManager = lookupEnterpriseManager(defaultEnterpriseIndex); this.enterprises = new HashMap(); // TODO only update enterprises that are not already present @@ -96,10 +128,10 @@ public void updateStoreInformation() throws NotInDatabaseException_Exception { storeCollections = new HashMap>((int) (enterprises.size() / 0.75) + 1); this.stores = new HashMap(); - + for (EnterpriseViewData ent : enterprises.values()) { LinkedList stores = new LinkedList(); - + enterpriseManager = lookupEnterpriseManager(ent.getId()); for (StoreWithEnterpriseTO store : enterpriseManager.queryStoresByEnterpriseID(ent.getId())) { StoreViewData tempStore = new StoreViewData(store.getId(), store.getEnterpriseTO(), store.getLocation(), store.getName()); @@ -111,7 +143,7 @@ public void updateStoreInformation() throws NotInDatabaseException_Exception { } @Override - public EnterpriseViewData getEnterpriseByID(long enterpriseID) { + public EnterpriseViewData getEnterpriseByID(long enterpriseID) throws NotInDatabaseException_Exception { checkEnterprisesAvailable(); return enterprises.get(enterpriseID); @@ -139,10 +171,11 @@ public StoreViewData getStoreByID(long storeID) throws NotInDatabaseException_Ex return store; } - public List getAllProducts() { + public List getAllProducts() throws NotInDatabaseException_Exception { // TODO should definitely be cached somehow, especially when there are // lots of products List products = new LinkedList(); + enterpriseManager = lookupEnterpriseManager(defaultEnterpriseIndex); for (ProductTO product : enterpriseManager.getAllProducts()) { ProductWrapper wrapper = new ProductWrapper(product); products.add(wrapper); @@ -152,24 +185,26 @@ public List getAllProducts() { @Override public ProductWrapper getProductByID(long productID) throws NotInDatabaseException_Exception { + enterpriseManager = lookupEnterpriseManager(defaultEnterpriseIndex); ProductWrapper product = new ProductWrapper(enterpriseManager.getProductByID(productID)); return product; } @Override public ProductWrapper getProductByBarcode(long barcode) throws NotInDatabaseException_Exception { + enterpriseManager = lookupEnterpriseManager(defaultEnterpriseIndex); ProductWrapper product = new ProductWrapper(enterpriseManager.getProductByBarcode(barcode)); return product; } @Override - public boolean updateStore(@NotNull StoreViewData store) { + public boolean updateStore(@NotNull StoreViewData store) throws NotInDatabaseException_Exception { StoreWithEnterpriseTO storeTO = new StoreWithEnterpriseTO(); storeTO.setId(store.getID()); storeTO.setLocation(store.getLocation()); storeTO.setName(store.getName()); storeTO.setEnterpriseTO(store.getEnterprise()); - + enterpriseManager = lookupEnterpriseManager(store.getEnterprise().getId()); try { enterpriseManager.updateStore(storeTO); } catch (NotInDatabaseException_Exception | UpdateException_Exception e) { @@ -187,10 +222,11 @@ public boolean updateStore(@NotNull StoreViewData store) { } @Override - public boolean createEnterprise(@NotNull String name) { + public boolean createEnterprise(@NotNull String name) throws NotInDatabaseException_Exception { checkEnterprisesAvailable(); EnterpriseTO enterpriseTO; + enterpriseManager = lookupEnterpriseManager(defaultEnterpriseIndex); try { enterpriseManager.createEnterprise(name); @@ -206,12 +242,12 @@ public boolean createEnterprise(@NotNull String name) { } @Override - public boolean createProduct(@NotNull String name, long barcode, double purchasePrice) { + public boolean createProduct(@NotNull String name, long barcode, double purchasePrice) throws NotInDatabaseException_Exception { ProductTO product = new ProductTO(); product.setBarcode(barcode); product.setName(name); product.setPurchasePrice(purchasePrice); - + enterpriseManager = lookupEnterpriseManager(defaultEnterpriseIndex); try { enterpriseManager.createProduct(product); } catch (CreateException_Exception e) { @@ -223,14 +259,14 @@ public boolean createProduct(@NotNull String name, long barcode, double purchase } @Override - public boolean createStore(long enterpriseID, String name, String location) { + public boolean createStore(long enterpriseID, String name, String location) throws NotInDatabaseException_Exception { StoreWithEnterpriseTO storeTO = new StoreWithEnterpriseTO(); storeTO.setEnterpriseTO(EnterpriseViewData.createEnterpriseTO(enterprises.get(enterpriseID))); storeTO.setLocation(location); storeTO.setName(name); Collection storeTOs; - + enterpriseManager = lookupEnterpriseManager(enterpriseID); try { enterpriseManager.createStore(storeTO); storeTOs = enterpriseManager.queryStoreByName(enterpriseID, name); @@ -266,7 +302,7 @@ private boolean checkStoresAvailable() { return true; } - private void checkEnterprisesAvailable() { + private void checkEnterprisesAvailable() throws NotInDatabaseException_Exception { if (enterprises == null) { updateEnterpriseInformation(); } diff --git a/cocome-maven-project/cloud-web-frontend/src/main/java/org/cocome/cloud/web/connector/enterpriseconnector/IEnterpriseQuery.java b/cocome-maven-project/cloud-web-frontend/src/main/java/org/cocome/cloud/web/connector/enterpriseconnector/IEnterpriseQuery.java index 9485808c..9dd15dd6 100644 --- a/cocome-maven-project/cloud-web-frontend/src/main/java/org/cocome/cloud/web/connector/enterpriseconnector/IEnterpriseQuery.java +++ b/cocome-maven-project/cloud-web-frontend/src/main/java/org/cocome/cloud/web/connector/enterpriseconnector/IEnterpriseQuery.java @@ -18,29 +18,29 @@ */ public interface IEnterpriseQuery { - public Collection getEnterprises(); + public Collection getEnterprises() throws NotInDatabaseException_Exception; public Collection getStores(long enterpriseID) throws NotInDatabaseException_Exception; - public void updateEnterpriseInformation(); + public void updateEnterpriseInformation() throws NotInDatabaseException_Exception; public void updateStoreInformation() throws NotInDatabaseException_Exception; - public EnterpriseViewData getEnterpriseByID(long enterpriseID); + public EnterpriseViewData getEnterpriseByID(long enterpriseID) throws NotInDatabaseException_Exception; public StoreViewData getStoreByID(long storeID) throws NotInDatabaseException_Exception; - public List getAllProducts(); + public List getAllProducts() throws NotInDatabaseException_Exception; public ProductWrapper getProductByID(long productID) throws NotInDatabaseException_Exception; public ProductWrapper getProductByBarcode(long barcode) throws NotInDatabaseException_Exception; - public boolean updateStore(@NotNull StoreViewData store); + public boolean updateStore(@NotNull StoreViewData store) throws NotInDatabaseException_Exception; - public boolean createEnterprise(@NotNull String name); + public boolean createEnterprise(@NotNull String name) throws NotInDatabaseException_Exception; - public boolean createProduct(@NotNull String name, long barcode, double purchasePrice); + public boolean createProduct(@NotNull String name, long barcode, double purchasePrice) throws NotInDatabaseException_Exception; - public boolean createStore(long enterpriseID, @NotNull String name, @NotNull String location); + public boolean createStore(long enterpriseID, @NotNull String name, @NotNull String location) throws NotInDatabaseException_Exception; } \ No newline at end of file diff --git a/cocome-maven-project/cloud-web-frontend/src/main/java/org/cocome/cloud/web/data/enterprisedata/EnterpriseConverter.java b/cocome-maven-project/cloud-web-frontend/src/main/java/org/cocome/cloud/web/data/enterprisedata/EnterpriseConverter.java index e6841137..8a902b61 100644 --- a/cocome-maven-project/cloud-web-frontend/src/main/java/org/cocome/cloud/web/data/enterprisedata/EnterpriseConverter.java +++ b/cocome-maven-project/cloud-web-frontend/src/main/java/org/cocome/cloud/web/data/enterprisedata/EnterpriseConverter.java @@ -9,6 +9,7 @@ import javax.inject.Named; import org.apache.log4j.Logger; +import org.cocome.cloud.logic.stub.NotInDatabaseException_Exception; import org.cocome.cloud.web.connector.enterpriseconnector.IEnterpriseQuery; /** @@ -36,7 +37,11 @@ public Object getAsObject(FacesContext context, UIComponent component, String va Long enterpriseID = Long.valueOf(value); EnterpriseViewData enterprise = null; - enterprise = enterpriseQuery.getEnterpriseByID(enterpriseID); + try { + enterprise = enterpriseQuery.getEnterpriseByID(enterpriseID); + } catch (NotInDatabaseException_Exception e) { + //do nothing + } if (enterprise == null) { throw new ConverterException("The value is not a valid Enterprise ID: " + value); diff --git a/cocome-maven-project/cloud-web-frontend/src/main/java/org/cocome/cloud/web/data/enterprisedata/EnterpriseDAO.java b/cocome-maven-project/cloud-web-frontend/src/main/java/org/cocome/cloud/web/data/enterprisedata/EnterpriseDAO.java index fb5d7adc..426e6404 100644 --- a/cocome-maven-project/cloud-web-frontend/src/main/java/org/cocome/cloud/web/data/enterprisedata/EnterpriseDAO.java +++ b/cocome-maven-project/cloud-web-frontend/src/main/java/org/cocome/cloud/web/data/enterprisedata/EnterpriseDAO.java @@ -7,6 +7,7 @@ import javax.inject.Inject; import javax.inject.Named; +import org.cocome.cloud.logic.stub.NotInDatabaseException_Exception; import org.cocome.cloud.web.connector.enterpriseconnector.IEnterpriseQuery; import org.cocome.cloud.web.data.storedata.ProductWrapper; @@ -18,17 +19,17 @@ public class EnterpriseDAO implements IEnterpriseDAO { IEnterpriseQuery enterpriseQuery; @Override - public Collection getAllEnterprises() { + public Collection getAllEnterprises() throws NotInDatabaseException_Exception { return enterpriseQuery.getEnterprises(); } @Override - public EnterpriseViewData getEnterpriseByID(long enterpriseID) { + public EnterpriseViewData getEnterpriseByID(long enterpriseID) throws NotInDatabaseException_Exception { return enterpriseQuery.getEnterpriseByID(enterpriseID); } @Override - public List getAllProducts() { + public List getAllProducts() throws NotInDatabaseException_Exception { return enterpriseQuery.getAllProducts(); } diff --git a/cocome-maven-project/cloud-web-frontend/src/main/java/org/cocome/cloud/web/data/enterprisedata/EnterprisePersistence.java b/cocome-maven-project/cloud-web-frontend/src/main/java/org/cocome/cloud/web/data/enterprisedata/EnterprisePersistence.java index d5e1026c..b265306a 100644 --- a/cocome-maven-project/cloud-web-frontend/src/main/java/org/cocome/cloud/web/data/enterprisedata/EnterprisePersistence.java +++ b/cocome-maven-project/cloud-web-frontend/src/main/java/org/cocome/cloud/web/data/enterprisedata/EnterprisePersistence.java @@ -6,6 +6,7 @@ import javax.inject.Inject; import javax.inject.Named; +import org.cocome.cloud.logic.stub.NotInDatabaseException_Exception; import org.cocome.cloud.web.connector.enterpriseconnector.IEnterpriseQuery; @Named @@ -16,7 +17,7 @@ public class EnterprisePersistence implements IEnterprisePersistence { IEnterpriseQuery enterpriseQuery; @Override - public String createEnterprise(String name) { + public String createEnterprise(String name) throws NotInDatabaseException_Exception { // TODO: Check if name is ok and doesn't include illegal characters if (enterpriseQuery.createEnterprise(name)) { FacesContext.getCurrentInstance().addMessage(null, @@ -41,7 +42,7 @@ public String updateProduct(String name, long barcode, double purchasePrice) { } @Override - public String createProduct(String name, long barcode, double purchasePrice) { + public String createProduct(String name, long barcode, double purchasePrice) throws NotInDatabaseException_Exception { // TODO: Check if name is ok and doesn't include illegal characters if (enterpriseQuery.createProduct(name, barcode, purchasePrice)) { FacesContext.getCurrentInstance().addMessage(null, diff --git a/cocome-maven-project/cloud-web-frontend/src/main/java/org/cocome/cloud/web/data/enterprisedata/IEnterpriseDAO.java b/cocome-maven-project/cloud-web-frontend/src/main/java/org/cocome/cloud/web/data/enterprisedata/IEnterpriseDAO.java index 881ecafd..6cb8baac 100644 --- a/cocome-maven-project/cloud-web-frontend/src/main/java/org/cocome/cloud/web/data/enterprisedata/IEnterpriseDAO.java +++ b/cocome-maven-project/cloud-web-frontend/src/main/java/org/cocome/cloud/web/data/enterprisedata/IEnterpriseDAO.java @@ -3,12 +3,13 @@ import java.util.Collection; import java.util.List; +import org.cocome.cloud.logic.stub.NotInDatabaseException_Exception; import org.cocome.cloud.web.data.storedata.ProductWrapper; public interface IEnterpriseDAO { - public Collection getAllEnterprises(); + public Collection getAllEnterprises() throws NotInDatabaseException_Exception; - public EnterpriseViewData getEnterpriseByID(long enterpriseID); + public EnterpriseViewData getEnterpriseByID(long enterpriseID) throws NotInDatabaseException_Exception; - public List getAllProducts(); + public List getAllProducts() throws NotInDatabaseException_Exception; } diff --git a/cocome-maven-project/cloud-web-frontend/src/main/java/org/cocome/cloud/web/data/enterprisedata/IEnterprisePersistence.java b/cocome-maven-project/cloud-web-frontend/src/main/java/org/cocome/cloud/web/data/enterprisedata/IEnterprisePersistence.java index a4281449..12dc95d9 100644 --- a/cocome-maven-project/cloud-web-frontend/src/main/java/org/cocome/cloud/web/data/enterprisedata/IEnterprisePersistence.java +++ b/cocome-maven-project/cloud-web-frontend/src/main/java/org/cocome/cloud/web/data/enterprisedata/IEnterprisePersistence.java @@ -2,12 +2,14 @@ import javax.validation.constraints.NotNull; +import org.cocome.cloud.logic.stub.NotInDatabaseException_Exception; + public interface IEnterprisePersistence { - public String createEnterprise(@NotNull String name); + public String createEnterprise(@NotNull String name) throws NotInDatabaseException_Exception; public String updateEnterprise(@NotNull EnterpriseViewData enterprise); public String updateProduct(@NotNull String name, long barcode, double purchasePrice); - public String createProduct(@NotNull String name, long barcode, double purchasePrice); + public String createProduct(@NotNull String name, long barcode, double purchasePrice) throws NotInDatabaseException_Exception; } diff --git a/cocome-maven-project/cloud-web-frontend/src/main/java/org/cocome/cloud/web/data/storedata/IStorePersistence.java b/cocome-maven-project/cloud-web-frontend/src/main/java/org/cocome/cloud/web/data/storedata/IStorePersistence.java index 214c5020..fd93beda 100644 --- a/cocome-maven-project/cloud-web-frontend/src/main/java/org/cocome/cloud/web/data/storedata/IStorePersistence.java +++ b/cocome-maven-project/cloud-web-frontend/src/main/java/org/cocome/cloud/web/data/storedata/IStorePersistence.java @@ -4,10 +4,12 @@ import javax.validation.constraints.NotNull; +import org.cocome.cloud.logic.stub.NotInDatabaseException_Exception; + public interface IStorePersistence { - public String updateStore(@NotNull StoreViewData store); + public String updateStore(@NotNull StoreViewData store) throws NotInDatabaseException_Exception; - public String createStore(long enterpriseID, @NotNull String name, @NotNull String location); + public String createStore(long enterpriseID, @NotNull String name, @NotNull String location) throws NotInDatabaseException_Exception; public boolean updateStockItem(@NotNull ProductWrapper stockItem); diff --git a/cocome-maven-project/cloud-web-frontend/src/main/java/org/cocome/cloud/web/data/storedata/StorePersistence.java b/cocome-maven-project/cloud-web-frontend/src/main/java/org/cocome/cloud/web/data/storedata/StorePersistence.java index 86fd0010..116f9be3 100644 --- a/cocome-maven-project/cloud-web-frontend/src/main/java/org/cocome/cloud/web/data/storedata/StorePersistence.java +++ b/cocome-maven-project/cloud-web-frontend/src/main/java/org/cocome/cloud/web/data/storedata/StorePersistence.java @@ -10,6 +10,7 @@ import javax.validation.constraints.NotNull; import org.apache.log4j.Logger; +import org.cocome.cloud.logic.stub.NotInDatabaseException_Exception; import org.cocome.cloud.web.connector.enterpriseconnector.IEnterpriseQuery; import org.cocome.cloud.web.connector.storeconnector.IStoreQuery; import org.cocome.cloud.web.frontend.navigation.NavigationElements; @@ -27,7 +28,7 @@ public class StorePersistence implements IStorePersistence { IStoreQuery storeQuery; @Override - public String updateStore(@NotNull StoreViewData store) { + public String updateStore(@NotNull StoreViewData store) throws NotInDatabaseException_Exception { store.updateStoreInformation(); if (enterpriseQuery.updateStore(store)) { store.setEditingEnabled(false); @@ -42,7 +43,7 @@ public String updateStore(@NotNull StoreViewData store) { } @Override - public String createStore(long enterpriseID, @NotNull String name, @NotNull String location) { + public String createStore(long enterpriseID, @NotNull String name, @NotNull String location) throws NotInDatabaseException_Exception { if (enterpriseQuery.createStore(enterpriseID, name, location)) { FacesContext.getCurrentInstance().addMessage(null, new FacesMessage(FacesMessage.SEVERITY_INFO, Messages.getLocalizedMessage("store.create.success"), null)); diff --git a/cocome-maven-project/cloud-web-frontend/src/main/java/org/cocome/cloud/web/frontend/enterprise/EnterpriseInformation.java b/cocome-maven-project/cloud-web-frontend/src/main/java/org/cocome/cloud/web/frontend/enterprise/EnterpriseInformation.java index 0775ba7d..25721035 100644 --- a/cocome-maven-project/cloud-web-frontend/src/main/java/org/cocome/cloud/web/frontend/enterprise/EnterpriseInformation.java +++ b/cocome-maven-project/cloud-web-frontend/src/main/java/org/cocome/cloud/web/frontend/enterprise/EnterpriseInformation.java @@ -44,7 +44,7 @@ public class EnterpriseInformation implements Serializable, IEnterpriseInformati private boolean enterpriseSubmitted = false; @Override - public Collection getEnterprises() { + public Collection getEnterprises() throws NotInDatabaseException_Exception { return enterpriseDAO.getAllEnterprises(); } @@ -69,7 +69,7 @@ public void setActiveEnterpriseID(long enterpriseID) { } @Override - public EnterpriseViewData getActiveEnterprise() { + public EnterpriseViewData getActiveEnterprise() throws NotInDatabaseException_Exception { if (activeEnterprise == null && activeEnterpriseID != Long.MIN_VALUE) { activeEnterprise = enterpriseDAO.getEnterpriseByID(activeEnterpriseID); } diff --git a/cocome-maven-project/cloud-web-frontend/src/main/java/org/cocome/cloud/web/frontend/enterprise/IEnterpriseInformation.java b/cocome-maven-project/cloud-web-frontend/src/main/java/org/cocome/cloud/web/frontend/enterprise/IEnterpriseInformation.java index 08fa7688..c018a3a6 100644 --- a/cocome-maven-project/cloud-web-frontend/src/main/java/org/cocome/cloud/web/frontend/enterprise/IEnterpriseInformation.java +++ b/cocome-maven-project/cloud-web-frontend/src/main/java/org/cocome/cloud/web/frontend/enterprise/IEnterpriseInformation.java @@ -15,12 +15,12 @@ * @author Robert Heinrich */ public interface IEnterpriseInformation { - public Collection getEnterprises(); + public Collection getEnterprises() throws NotInDatabaseException_Exception; public Collection getStores() throws NotInDatabaseException_Exception; public long getActiveEnterpriseID(); public void setActiveEnterpriseID(long enterpriseID); - public EnterpriseViewData getActiveEnterprise(); + public EnterpriseViewData getActiveEnterprise() throws NotInDatabaseException_Exception; public void setActiveEnterprise(@NotNull EnterpriseViewData enterprise); public String submitActiveEnterprise(); public boolean isEnterpriseSubmitted(); diff --git a/cocome-maven-project/cloud-web-frontend/src/main/java/org/cocome/cloud/web/frontend/store/IStoreInformation.java b/cocome-maven-project/cloud-web-frontend/src/main/java/org/cocome/cloud/web/frontend/store/IStoreInformation.java index 8ebea498..874a32e3 100644 --- a/cocome-maven-project/cloud-web-frontend/src/main/java/org/cocome/cloud/web/frontend/store/IStoreInformation.java +++ b/cocome-maven-project/cloud-web-frontend/src/main/java/org/cocome/cloud/web/frontend/store/IStoreInformation.java @@ -33,7 +33,7 @@ public interface IStoreInformation { public void queryStockItems(); - public void queryProductsWithStockItems(); + public void queryProductsWithStockItems() throws NotInDatabaseException_Exception; public List getStockReport(long storeID); diff --git a/cocome-maven-project/cloud-web-frontend/src/main/java/org/cocome/cloud/web/frontend/store/StoreInformation.java b/cocome-maven-project/cloud-web-frontend/src/main/java/org/cocome/cloud/web/frontend/store/StoreInformation.java index 6feb8402..c1ff4ffd 100644 --- a/cocome-maven-project/cloud-web-frontend/src/main/java/org/cocome/cloud/web/frontend/store/StoreInformation.java +++ b/cocome-maven-project/cloud-web-frontend/src/main/java/org/cocome/cloud/web/frontend/store/StoreInformation.java @@ -186,7 +186,7 @@ public Collection getAllProductsWithStockItems() { } @Override - public void queryProductsWithStockItems() { + public void queryProductsWithStockItems() throws NotInDatabaseException_Exception { updateStockItems(); for (ProductWrapper product : enterpriseDAO.getAllProducts()) { if (!productsWithStockItems.containsKey(product.getBarcode())) {