From 65bd7614ffe84fb9ff519a848deff41b7194f699 Mon Sep 17 00:00:00 2001 From: Teo Sarca Date: Mon, 15 Jul 2019 19:59:11 +0300 Subject: [PATCH] refactor; QA https://github.com/metasfresh/metasfresh/issues/5380 --- .../java-legacy/org/compiere/acct/Doc.java | 2 +- .../org/compiere/acct/DocLine.java | 2 +- .../org/compiere/acct/DocLine_Allocation.java | 2 +- .../org/compiere/acct/DocLine_InOut.java | 2 +- .../org/compiere/acct/DocLine_MatchPO.java | 2 +- .../org/compiere/acct/DocLine_Movement.java | 2 +- .../java-legacy/org/compiere/acct/Fact.java | 2 +- .../org/compiere/acct/FactLine.java | 2 +- .../org/compiere/process/InvoiceNGL.java | 96 ++++++++++++++++--- .../de/metas/acct/api/IProductAcctDAO.java | 2 +- .../metas/acct/api/impl/ProductAcctDAO.java | 2 +- .../acct/impexp/AccountImportProcess.java | 2 +- .../acct/model/validator/C_AcctSchema.java | 2 +- .../model/validator/C_AcctSchema_Default.java | 3 +- .../model/validator/C_AcctSchema_Element.java | 2 +- .../acct/model/validator/C_AcctSchema_GL.java | 3 +- .../acct/api/ProductAcctProviderTest.java | 2 +- .../exceptions/TaxNoExemptFoundException.java | 43 ++++----- .../org/compiere/model/GridField.java | 2 +- .../org/compiere/model/GridTable.java | 2 +- .../java-legacy/org/compiere/model/MOrg.java | 11 +-- .../org/compiere/model/MPeriod.java | 4 +- .../org/compiere/process/BPartnerOrgLink.java | 4 +- .../org/compiere/process/InventoryValue.java | 2 +- .../org/compiere/report/MReportTree.java | 2 +- .../java-legacy/org/compiere/util/Env.java | 2 +- .../java-legacy/org/compiere/util/Login.java | 2 +- .../org/compiere/util/LoginContext.java | 2 +- .../org/compiere/wf/MWFActivity.java | 4 +- .../java/de/metas/acct/api/AcctSchema.java | 2 +- .../de/metas/acct/api/IAcctSchemaDAO.java | 2 +- .../de/metas/acct/api/impl/AcctSchemaDAO.java | 4 +- .../acct/api/impl/PlainAcctSchemaDAO.java | 2 +- .../main/java/de/metas/bpartner/BPGroup.java | 3 +- .../de/metas/bpartner/BPGroupRepository.java | 2 +- .../metas/bpartner/service/BPartnerQuery.java | 3 +- .../bpartner/service/IBPartnerOrgBL.java | 2 +- .../OrgHasNoBPartnerLinkException.java | 4 +- .../bpartner/service/impl/BPartnerBL.java | 2 +- .../bpartner/service/impl/BPartnerDAO.java | 4 +- .../bpartner/service/impl/BPartnerOrgBL.java | 4 +- .../java/de/metas/costing/CostingLevel.java | 2 +- .../currency/CurrencyConversionContext.java | 2 +- .../currency/CurrencyConversionResult.java | 2 +- .../java/de/metas/currency/ICurrencyBL.java | 2 +- .../de/metas/currency/impl/CurrencyBL.java | 2 +- .../de/metas/currency/impl/CurrencyDAO.java | 2 +- .../metas/currency/impl/PlainCurrencyBL.java | 2 +- .../metas/currency/impl/PlainCurrencyDAO.java | 2 +- .../sequence/impl/DocumentNoBuilder.java | 2 +- .../java/de/metas/i18n/impl/LanguageBL.java | 24 ++--- .../de/metas/location/CountrySequences.java | 3 +- .../java/de/metas/location/ICountryDAO.java | 2 +- .../metas/location/impl/AddressBuilder.java | 2 +- .../de/metas/location/impl/CountryDAO.java | 2 +- .../de/metas/location/impl/LocationBL.java | 2 +- .../NotificationSenderTemplate.java | 2 +- .../notification/UserNotificationsConfig.java | 2 +- .../UserNotificationsConfigRepository.java | 2 +- .../metas/organization}/IOrgDAO.java | 61 ++++-------- .../metas/organization}/OrgId.java | 2 +- .../organization}/OrgIdNotFoundException.java | 2 +- .../java/de/metas/organization/OrgInfo.java | 1 - .../organization/OrgInfoUpdateRequest.java | 1 - .../java/de/metas/organization/OrgQuery.java | 57 +++++++++++ .../metas/organization}/impl/OrgDAO.java | 55 +++++------ .../de/metas/process/ProcessExecutor.java | 2 +- .../java/de/metas/process/ProcessInfo.java | 4 +- .../java/de/metas/security/ISecurityRule.java | 3 +- .../metas/security/ISecurityRuleEngine.java | 3 +- .../metas/security/IUserRolePermissions.java | 2 +- .../security/IUserRolePermissionsDAO.java | 2 +- .../src/main/java/de/metas/security/Role.java | 2 +- .../de/metas/security/TableAccessLevel.java | 3 +- .../java/de/metas/security/UserAuthToken.java | 2 +- .../security/UserAuthTokenRepository.java | 2 +- .../security/impl/CompositeSecurityRule.java | 2 +- .../java/de/metas/security/impl/RoleDAO.java | 2 +- .../security/impl/SecurityRuleEngine.java | 3 +- .../security/impl/UserRolePermissions.java | 2 +- .../security/impl/UserRolePermissionsDAO.java | 4 +- .../security/model/interceptor/AD_Org.java | 2 +- .../permissions/LoginOrgConstraint.java | 3 +- .../security/permissions/OrgPermission.java | 2 +- .../security/permissions/OrgPermissions.java | 2 +- .../security/permissions/OrgResource.java | 4 +- .../CreateDocActionAccessRequest.java | 2 +- .../requests/CreateFormAccessRequest.java | 2 +- .../requests/CreateProcessAccessRequest.java | 2 +- .../requests/CreateTaskAccessRequest.java | 2 +- .../requests/CreateWindowAccessRequest.java | 2 +- .../requests/CreateWorkflowAccessRequest.java | 2 +- .../RemoveDocActionAccessRequest.java | 2 +- .../requests/RemoveFormAccessRequest.java | 2 +- .../requests/RemoveProcessAccessRequest.java | 2 +- .../requests/RemoveTaskAccessRequest.java | 2 +- .../requests/RemoveWindowAccessRequest.java | 2 +- .../requests/RemoveWorkflowAccessRequest.java | 2 +- .../main/java/de/metas/tax/api/ITaxBL.java | 3 +- .../org/adempiere/ad/session/MFSession.java | 2 +- .../model/InterfaceWrapperHelper.java | 2 +- .../spi/impl/LoadPORequestHandler.java | 2 +- .../warehouse/api/IWarehouseDAO.java | 2 +- .../warehouse/api/impl/WarehouseDAO.java | 2 +- .../de/metas/acct/AcctSchemaTestHelper.java | 2 +- .../service/impl/BPartnerDAOTest.java | 2 +- .../de/metas/costing/CostingLevelTest.java | 3 +- .../location/impl/AddressBuilderTest.java | 2 +- .../metas/organization}/impl/OrgDAOTest.java | 10 +- .../impl/CompositeSecurityRuleTest.java | 2 +- .../java/org/adempiere/service/OrgIdTest.java | 2 + .../org/compiere/acct/AcctViewerData.java | 2 +- .../org/compiere/grid/VSortTab.java | 2 +- .../org/compiere/server/Scheduler.java | 4 +- .../compiere/server/WorkflowProcessor.java | 4 +- .../api/impl/CreatePPOrderCostsCommand.java | 2 +- .../eevolution/api/impl/PPOrderCostDAO.java | 2 +- .../java/org/eevolution/callout/PP_Order.java | 2 +- ...tchProcessBOMCostCalculatorRepository.java | 2 +- .../OrderBOMCostCalculatorRepository.java | 2 +- .../DD_Order_GenerateRawMaterialsReturn.java | 2 +- ...awMaterialsReturnDDOrderLineCandidate.java | 2 +- .../org/eevolution/mrp/api/impl/MRPDAO.java | 4 +- .../eevolution/mrp/api/impl/MRPSegmentBL.java | 2 +- .../mrp/spi/impl/ddorder/DDOrderProducer.java | 17 ++-- .../mrp/spi/impl/pporder/PPOrderProducer.java | 16 ++-- .../process/CopyPriceToStandard.java | 2 +- .../eevolution/process/CreateCostElement.java | 2 +- .../process/RollupBillOfMaterial.java | 2 +- .../eevolution/process/RollupWorkflow.java | 2 +- .../org/eevolution/api/PPOrderCostsTest.java | 2 +- .../async/api/impl/WorkPackageQueue.java | 2 +- .../compiere/acct/DocLine_BankStatement.java | 2 +- .../org/compiere/acct/Doc_BankStatement.java | 2 +- .../impl/BPartnerMasterDataContext.java | 3 +- .../JsonPersisterService.java | 9 +- .../JsonRetrieverService.java | 2 +- .../SalesInvoicePaymentStatusRepository.java | 8 +- ...lesInvoicePaymentStatusRestController.java | 2 +- .../order/impl/SalesOrderRestController.java | 2 +- .../impl/BPartnerMasterDataProvider.java | 4 +- .../ordercandidates/impl/JsonConverters.java | 2 +- .../impl/MasterdataProvider.java | 10 +- .../OrderCandidatesRestControllerImpl.java | 2 +- .../impl/ProductMasterDataContext.java | 3 +- .../impl/ProductMasterDataProvider.java | 2 +- .../rest_api/utils/PermissionService.java | 2 +- .../impl/BPartnerMasterDataProviderTest.java | 2 +- .../impl/MasterdataProviderTest.java | 4 +- .../java-legacy/org/compiere/model/MCash.java | 61 +++++++++++- .../java-legacy/org/compiere/model/MGoal.java | 2 +- .../org/compiere/model/MInOut.java | 4 +- .../org/compiere/model/MInvoice.java | 2 +- .../org/compiere/model/MInvoiceLine.java | 2 +- .../org/compiere/model/MMeasure.java | 2 +- .../org/compiere/model/MOrder.java | 4 +- .../org/compiere/model/MOrderLine.java | 2 +- .../org/compiere/model/MPayment.java | 2 +- .../org/compiere/process/DistributionRun.java | 4 +- .../org/compiere/process/ReplenishReport.java | 2 +- .../compiere/process/RequisitionPOCreate.java | 2 +- .../bpartner/composite/BPartnerComposite.java | 2 +- .../composite/BPartnerCompositeQuery.java | 3 +- .../BPartnerCompositeRepository.java | 2 +- .../stats/BPartnerProductStatsRepository.java | 2 +- .../bpartner_product/IBPartnerProductDAO.java | 2 +- .../impl/BPartnerProductDAO.java | 2 +- .../interceptor/C_BPartner_Product.java | 2 +- .../java/de/metas/costing/CostDetail.java | 2 +- .../costing/CostDetailCreateRequest.java | 2 +- .../de/metas/costing/CostDetailQuery.java | 2 +- .../java/de/metas/costing/CostSegment.java | 2 +- .../metas/costing/CostSegmentAndElement.java | 2 +- .../costing/impl/CostDetailRepository.java | 2 +- .../costing/impl/CurrentCostsRepository.java | 2 +- .../de/metas/costing/interceptors/M_Cost.java | 2 +- .../costing/interceptors/M_CostElement.java | 2 +- .../LastInvoiceCostingMethodHandler.java | 2 +- .../methods/LastPOCostingMethodHandler.java | 2 +- .../java/de/metas/customs/CustomsInvoice.java | 3 +- .../de/metas/customs/CustomsInvoiceLine.java | 3 +- .../customs/CustomsInvoiceRepository.java | 2 +- .../de/metas/invoice/impl/InvoiceLineBL.java | 2 +- .../interceptors/M_ForecastLine.java | 5 +- .../main/java/de/metas/order/OrderLine.java | 2 +- .../de/metas/order/OrderLineRepository.java | 2 +- .../java/de/metas/order/impl/OrderLineBL.java | 4 +- .../impl/PricingConditionsRepository.java | 2 +- .../metas/product/CreateProductRequest.java | 3 +- .../product/IProductActivityProvider.java | 2 +- .../java/de/metas/product/IProductDAO.java | 2 +- .../metas/product/ProductPlanningSchema.java | 2 +- .../java/de/metas/product/impl/ProductBL.java | 2 +- .../de/metas/product/impl/ProductDAO.java | 2 +- .../impl/ProductPlanningSchemaDAO.java | 2 +- .../metas/request/api/RequestCandidate.java | 2 +- .../metas/shipment/ShipmentDeclaration.java | 3 +- .../shipment/ShipmentDeclarationLine.java | 3 +- .../repo/ShipmentDeclarationRepository.java | 2 +- .../service/ShipmentDeclarationCreator.java | 2 +- .../metas/tax/api/TaxNotFoundException.java | 4 +- .../mm/attributes/api/impl/AttributesBL.java | 2 +- .../mmovement/api/impl/MovementBL.java | 2 +- .../warehouse/spi/impl/WarehouseAdvisor.java | 4 +- .../org/eevolution/api/BOMCreateRequest.java | 3 +- .../eevolution/api/impl/ProductBOMDAO.java | 2 +- .../impl/BPartnerProductDAOTest.java | 2 +- .../costing/AggregatedCostAmountTest.java | 2 +- .../impl/ProductPlanningSchemaBLTest.java | 2 +- .../de/metas/contracts/impl/FlatrateBL.java | 2 +- .../interceptor/C_Flatrate_Term.java | 2 +- .../invoicecandidate/HandlerTools.java | 2 +- .../FlatrateTermSubscription_Handler.java | 2 +- .../metas/contracts/impl/FlatrateBLTest.java | 2 +- .../FlatrateTermHandlerTest.java | 2 +- .../de/metas/dunning/api/IDunningDAO.java | 2 +- .../dunning/api/impl/AbstractDunningDAO.java | 2 +- .../invoice/api/impl/InvoiceSourceBL.java | 2 +- .../dunning/api/impl/DunningDAOTest.java | 2 +- .../java/de/metas/edi/api/impl/DesadvBL.java | 2 +- .../de/metas/edi/api/impl/EDIDocumentBL.java | 2 +- .../fresh/setup/process/ClientSetup.java | 6 +- .../ddorder/api/impl/HUs2DDOrderProducer.java | 2 +- .../handlingunits/impl/HandlingUnitsDAO.java | 2 +- .../inout/impl/InOutDDOrderBL.java | 2 +- .../inventory/InventoryLine.java | 2 +- .../inventory/InventoryRepository.java | 2 +- .../draftlinescreator/HuForInventoryLine.java | 2 +- .../HuForInventoryLineFactory.java | 2 +- ...enerateForQualityInspectionFlaggedHUs.java | 2 +- .../movement/api/impl/HUMovementBL.java | 2 +- .../order/api/impl/HUOrderBL.java | 2 +- .../handlingunits/trace/HUTraceEvent.java | 3 +- .../trace/HUTraceEventQuery.java | 3 +- .../trace/HUTraceEventsService.java | 2 +- .../HuTraceEventToDbRecordUtil.java | 2 +- .../inventory/InventoryLineTest.java | 2 +- .../inventory/InventoryRepositoryTest.java | 2 +- .../DraftInventoryLinesCreatorTest.java | 2 +- .../trace/HUTraceEventsServiceTests.java | 2 +- .../trace/HUTraceRepositoryTests.java | 2 +- .../trace/HUTransformTracingTests.java | 2 +- .../repository/RetrieveDbRecordsUtilTest.java | 2 +- .../terminal/pporder/view/HUIssuePanel.java | 2 +- .../mail/config/InboundEMailConfig.java | 2 +- .../config/InboundEMailConfigRepository.java | 2 +- .../AvailableForSalesConfigRepo.java | 2 +- .../interceptor/C_Order.java | 2 +- .../interceptor/C_OrderLine.java | 2 +- .../planning/IProductPlanningDAO.java | 2 +- .../planning/ddorder/DDOrderPojoSupplier.java | 2 +- .../planning/ddorder/DDOrderUtil.java | 2 +- .../planning/event/SupplyRequiredHandler.java | 2 +- .../NoPlantForWarehouseException.java | 2 +- .../planning/impl/ProductPlanningDAO.java | 2 +- .../impl/ProductPlanningDAO_findTest.java | 2 +- .../ic/spi/impl/InvoiceCandidateWriter.java | 2 +- .../metas/payment/esr/api/IESRImportDAO.java | 2 +- .../esr/api/impl/AbstractESRImportDAO.java | 2 +- .../payment/esr/api/impl/ESRImportBL.java | 46 ++++----- .../esr/dataimporter/ESRDataLoaderUtil.java | 4 +- .../de/metas/payment/esr/ESRImportTest.java | 2 +- .../printing/rest/PrintingRestController.java | 2 +- .../base/impl/PMMProductNameBuilder.java | 2 +- .../purchasecandidate/PurchaseCandidate.java | 2 +- .../PurchaseCandidateImmutableFields.java | 2 +- .../PurchaseCandidateRepository.java | 2 +- .../PurchaseCandidatesGroup.java | 2 +- .../purchasecandidate/PurchaseDemand.java | 2 +- .../PurchaseDemandWithCandidatesService.java | 4 +- .../purchasecandidate/SalesOrderLine.java | 2 +- .../VendorProductInfoService.java | 2 +- .../PurchaseCandidateAdvisedEventCreator.java | 2 +- .../PurchaseCandidateRequestedHandler.java | 2 +- .../event/PurchaseSupplyRequiredHandler.java | 2 +- .../PurchaseCandidateAggregate.java | 2 +- .../PurchaseCandidateAggregateKey.java | 2 +- .../PurchaseOrderAggregationKey.java | 2 +- .../remoteorder/RealVendorGatewayInvoker.java | 2 +- .../VendorGatewayInvokerFactory.java | 2 +- .../remotepurchaseitem/PurchaseErrorItem.java | 2 +- .../remotepurchaseitem/PurchaseOrderItem.java | 2 +- .../PurchaseCandidateTestTool.java | 2 +- .../PurchaseCandidatesGroupTest.java | 2 +- ...rchaseDemandWithCandidatesServiceTest.java | 2 +- .../PurchaseCandidateToOrderWorkflowTest.java | 2 +- .../PurchaseOrderFromItemFactoryTest.java | 2 +- .../PurchaseOrderFromItemsAggregatorTest.java | 2 +- .../NullVendorGatewayInvokerTest.java | 2 +- .../report/jasper/JasperClassLoader.java | 4 +- .../report/jasper/OrgLogoClassLoaderHook.java | 2 +- .../report/jasper/OrgLogoLocalFileLoader.java | 9 +- .../report/engine/AbstractReportEngine.java | 2 +- .../de/metas/report/xls/engine/OrgData.java | 46 +++------ .../spi/impl/C_OLCand_Handler.java | 2 +- .../api/OLCandCreateRequest.java | 3 +- .../modelvalidator/C_OLCand.java | 2 +- .../DerKurierDraftDeliveryOrderCreator.java | 2 +- .../go/GODraftDeliveryOrderCreator.java | 2 +- .../de/metas/adempiere/callout/OrderLine.java | 4 +- .../adempiere/modelvalidator/AD_OrgInfo.java | 10 +- .../adempiere/modelvalidator/Payment.java | 4 +- .../ProhibitInconsistentDropshipValues.java | 15 +-- .../invoicecandidate/M_InOutLine_Handler.java | 2 +- ...ultFromOrderLineWarehouseDestProvider.java | 2 +- .../api/impl/ShipmentScheduleBL.java | 2 +- .../OrderLineReceiptScheduleProducer.java | 2 +- .../api/impl/InvoiceCandBL.java | 2 +- .../form/CreateInvoiceCandidateDialog.java | 2 +- .../spi/impl/M_InventoryLine_Handler.java | 2 +- .../letters/api/impl/TextTemplateBL.java | 2 +- ...SalesOrderAndBOMsFromQuotationCommand.java | 2 +- .../invoicecandidate/C_OrderLine_Handler.java | 2 +- .../CreatePOFromSOsAggregationKeyBuilder.java | 2 +- .../impl/CreatePOFromSOsAggregator.java | 4 +- .../de/metas/request/api/impl/RequestBL.java | 2 +- .../java/de/metas/tax/api/impl/TaxBL.java | 2 +- .../metas/workflow/api/impl/WorkflowBL.java | 4 +- .../api/impl/ReceiptScheduleTestBase.java | 2 +- .../AbstractICTestSupport.java | 2 +- .../spi/impl/AbstractDeliveryTest.java | 2 +- .../spi/impl/C_OrderLine_Handler_Test.java | 2 +- .../web/security/UserAuthTokenService.java | 2 +- .../MSV3AvailabilityDataPersister.java | 2 +- .../MSV3AvailabilityTransaction.java | 2 +- .../common/Msv3FaultInfoDataPersister.java | 3 +- .../common/Msv3SubstitutionDataPersister.java | 3 +- .../MSV3PurchaseOrderClientImpl.java | 2 +- .../MSV3PurchaseOrderRequestPersister.java | 3 +- .../MSV3PurchaseOrderResponsePersister.java | 2 +- .../MSV3PurchaseOrderTransaction.java | 2 +- .../MSV3AvailabilityDataPersisterTest.java | 2 +- 332 files changed, 705 insertions(+), 613 deletions(-) rename de.metas.adempiere.adempiere/base/src/main/java/{org/adempiere/service => de/metas/organization}/IOrgDAO.java (65%) rename de.metas.adempiere.adempiere/base/src/main/java/{org/adempiere/service => de/metas/organization}/OrgId.java (98%) rename de.metas.adempiere.adempiere/base/src/main/java/{org/adempiere/service => de/metas/organization}/OrgIdNotFoundException.java (96%) create mode 100644 de.metas.adempiere.adempiere/base/src/main/java/de/metas/organization/OrgQuery.java rename de.metas.adempiere.adempiere/base/src/main/java/{org/adempiere/service => de/metas/organization}/impl/OrgDAO.java (86%) rename de.metas.adempiere.adempiere/base/src/test/java/{org/adempiere/service => de/metas/organization}/impl/OrgDAOTest.java (91%) diff --git a/de.metas.acct.base/src/main/java-legacy/org/compiere/acct/Doc.java b/de.metas.acct.base/src/main/java-legacy/org/compiere/acct/Doc.java index 2de8c79dc74..1ba231e6ba8 100644 --- a/de.metas.acct.base/src/main/java-legacy/org/compiere/acct/Doc.java +++ b/de.metas.acct.base/src/main/java-legacy/org/compiere/acct/Doc.java @@ -39,7 +39,6 @@ import org.adempiere.model.InterfaceWrapperHelper; import org.adempiere.service.ClientId; import org.adempiere.service.ISysConfigBL; -import org.adempiere.service.OrgId; import org.adempiere.util.logging.LoggingHelper; import org.adempiere.warehouse.WarehouseId; import org.compiere.model.I_C_BP_BankAccount; @@ -81,6 +80,7 @@ import de.metas.logging.LogManager; import de.metas.money.CurrencyConversionTypeId; import de.metas.money.CurrencyId; +import de.metas.organization.OrgId; import de.metas.product.ProductId; import de.metas.product.acct.api.ActivityId; import de.metas.user.UserId; diff --git a/de.metas.acct.base/src/main/java-legacy/org/compiere/acct/DocLine.java b/de.metas.acct.base/src/main/java-legacy/org/compiere/acct/DocLine.java index 4b8f9ee9229..69af3f857a6 100644 --- a/de.metas.acct.base/src/main/java-legacy/org/compiere/acct/DocLine.java +++ b/de.metas.acct.base/src/main/java-legacy/org/compiere/acct/DocLine.java @@ -27,7 +27,6 @@ import org.adempiere.mm.attributes.AttributeSetInstanceId; import org.adempiere.model.InterfaceWrapperHelper; import org.adempiere.service.ClientId; -import org.adempiere.service.OrgId; import org.compiere.model.I_C_UOM; import org.compiere.model.I_M_Product; import org.compiere.model.I_M_Product_Acct; @@ -56,6 +55,7 @@ import de.metas.money.CurrencyConversionTypeId; import de.metas.money.CurrencyId; import de.metas.order.OrderLineId; +import de.metas.organization.OrgId; import de.metas.product.IProductBL; import de.metas.product.IProductDAO; import de.metas.product.ProductId; diff --git a/de.metas.acct.base/src/main/java-legacy/org/compiere/acct/DocLine_Allocation.java b/de.metas.acct.base/src/main/java-legacy/org/compiere/acct/DocLine_Allocation.java index 47ca5920c9b..6f46987c2be 100644 --- a/de.metas.acct.base/src/main/java-legacy/org/compiere/acct/DocLine_Allocation.java +++ b/de.metas.acct.base/src/main/java-legacy/org/compiere/acct/DocLine_Allocation.java @@ -26,7 +26,6 @@ import org.adempiere.exceptions.DBException; import org.adempiere.invoice.service.IInvoiceBL; import org.adempiere.model.InterfaceWrapperHelper; -import org.adempiere.service.OrgId; import org.compiere.model.I_C_AllocationLine; import org.compiere.model.I_C_Cash; import org.compiere.model.I_C_CashLine; @@ -41,6 +40,7 @@ import de.metas.currency.ICurrencyBL; import de.metas.currency.CurrencyConversionContext; import de.metas.money.CurrencyConversionTypeId; +import de.metas.organization.OrgId; import de.metas.util.Check; import de.metas.util.Services; diff --git a/de.metas.acct.base/src/main/java-legacy/org/compiere/acct/DocLine_InOut.java b/de.metas.acct.base/src/main/java-legacy/org/compiere/acct/DocLine_InOut.java index 6c81c44863b..50cc46e52bf 100644 --- a/de.metas.acct.base/src/main/java-legacy/org/compiere/acct/DocLine_InOut.java +++ b/de.metas.acct.base/src/main/java-legacy/org/compiere/acct/DocLine_InOut.java @@ -2,7 +2,6 @@ import org.adempiere.ad.trx.api.ITrx; import org.adempiere.model.InterfaceWrapperHelper; -import org.adempiere.service.OrgId; import org.compiere.Adempiere; import org.compiere.model.I_C_OrderLine; import org.compiere.model.I_M_InOutLine; @@ -17,6 +16,7 @@ import de.metas.costing.CostingDocumentRef; import de.metas.costing.ICostingService; import de.metas.order.OrderLineId; +import de.metas.organization.OrgId; import de.metas.quantity.Quantity; /* diff --git a/de.metas.acct.base/src/main/java-legacy/org/compiere/acct/DocLine_MatchPO.java b/de.metas.acct.base/src/main/java-legacy/org/compiere/acct/DocLine_MatchPO.java index 8c52325d551..86e0ac334e1 100644 --- a/de.metas.acct.base/src/main/java-legacy/org/compiere/acct/DocLine_MatchPO.java +++ b/de.metas.acct.base/src/main/java-legacy/org/compiere/acct/DocLine_MatchPO.java @@ -5,7 +5,6 @@ import org.adempiere.model.InterfaceWrapperHelper; import org.adempiere.service.ClientId; -import org.adempiere.service.OrgId; import org.compiere.Adempiere; import org.compiere.model.I_C_Order; import org.compiere.model.I_M_InOut; @@ -31,6 +30,7 @@ import de.metas.money.CurrencyConversionTypeId; import de.metas.order.IOrderDAO; import de.metas.order.IOrderLineBL; +import de.metas.organization.OrgId; import de.metas.product.ProductPrice; import de.metas.quantity.Quantity; import de.metas.uom.IUOMConversionBL; diff --git a/de.metas.acct.base/src/main/java-legacy/org/compiere/acct/DocLine_Movement.java b/de.metas.acct.base/src/main/java-legacy/org/compiere/acct/DocLine_Movement.java index f5863e8f5d5..2efd09ab9e1 100644 --- a/de.metas.acct.base/src/main/java-legacy/org/compiere/acct/DocLine_Movement.java +++ b/de.metas.acct.base/src/main/java-legacy/org/compiere/acct/DocLine_Movement.java @@ -1,7 +1,6 @@ package org.compiere.acct; import org.adempiere.model.InterfaceWrapperHelper; -import org.adempiere.service.OrgId; import org.adempiere.warehouse.api.IWarehouseDAO; import org.compiere.Adempiere; import org.compiere.model.I_M_MovementLine; @@ -15,6 +14,7 @@ import de.metas.costing.CostElement; import de.metas.costing.CostingDocumentRef; import de.metas.costing.ICostingService; +import de.metas.organization.OrgId; import de.metas.quantity.Quantity; import de.metas.util.Services; import lombok.NonNull; diff --git a/de.metas.acct.base/src/main/java-legacy/org/compiere/acct/Fact.java b/de.metas.acct.base/src/main/java-legacy/org/compiere/acct/Fact.java index ed58caeceef..a5c49cdf187 100644 --- a/de.metas.acct.base/src/main/java-legacy/org/compiere/acct/Fact.java +++ b/de.metas.acct.base/src/main/java-legacy/org/compiere/acct/Fact.java @@ -26,7 +26,6 @@ import org.adempiere.ad.trx.api.ITrx; import org.adempiere.exceptions.AdempiereException; import org.adempiere.model.InterfaceWrapperHelper; -import org.adempiere.service.OrgId; import org.compiere.acct.FactTrxLines.FactTrxLinesType; import org.compiere.model.I_C_ElementValue; import org.compiere.model.MAccount; @@ -46,6 +45,7 @@ import de.metas.currency.CurrencyConversionContext; import de.metas.logging.LogManager; import de.metas.money.CurrencyId; +import de.metas.organization.OrgId; import de.metas.product.acct.api.ActivityId; import de.metas.quantity.Quantity; import de.metas.util.Check; diff --git a/de.metas.acct.base/src/main/java-legacy/org/compiere/acct/FactLine.java b/de.metas.acct.base/src/main/java-legacy/org/compiere/acct/FactLine.java index ad9e8ddbbd9..245d971072b 100644 --- a/de.metas.acct.base/src/main/java-legacy/org/compiere/acct/FactLine.java +++ b/de.metas.acct.base/src/main/java-legacy/org/compiere/acct/FactLine.java @@ -27,7 +27,6 @@ import org.adempiere.ad.trx.api.ITrx; import org.adempiere.exceptions.DBException; import org.adempiere.model.InterfaceWrapperHelper; -import org.adempiere.service.OrgId; import org.adempiere.warehouse.api.IWarehouseDAO; import org.compiere.model.I_C_BPartner_Location; import org.compiere.model.I_C_RevenueRecognition_Plan; @@ -59,6 +58,7 @@ import de.metas.location.LocationId; import de.metas.money.CurrencyConversionTypeId; import de.metas.money.CurrencyId; +import de.metas.organization.OrgId; import de.metas.product.ProductId; import de.metas.product.acct.api.ActivityId; import de.metas.quantity.Quantity; diff --git a/de.metas.acct.base/src/main/java-legacy/org/compiere/process/InvoiceNGL.java b/de.metas.acct.base/src/main/java-legacy/org/compiere/process/InvoiceNGL.java index 81c57b4444c..7f89be5418f 100644 --- a/de.metas.acct.base/src/main/java-legacy/org/compiere/process/InvoiceNGL.java +++ b/de.metas.acct.base/src/main/java-legacy/org/compiere/process/InvoiceNGL.java @@ -27,7 +27,6 @@ import org.compiere.model.MJournal; import org.compiere.model.MJournalBatch; import org.compiere.model.MJournalLine; -import org.compiere.model.MOrg; import org.compiere.model.Query; import org.compiere.model.X_T_InvoiceGL; import org.compiere.util.DB; @@ -38,6 +37,7 @@ import de.metas.acct.api.IAcctSchemaDAO; import de.metas.i18n.Msg; import de.metas.logging.LogManager; +import de.metas.organization.IOrgDAO; import de.metas.process.JavaProcess; import de.metas.process.ProcessInfoParameter; import de.metas.util.Services; @@ -77,27 +77,45 @@ public class InvoiceNGL extends JavaProcess protected void prepare() { ProcessInfoParameter[] para = getParametersAsArray(); - for (int i = 0; i < para.length; i++) + for (ProcessInfoParameter element : para) { - String name = para[i].getParameterName(); - if (para[i].getParameter() == null) + String name = element.getParameterName(); + if (element.getParameter() == null) + { ; + } else if (name.equals("C_AcctSchema_ID")) - p_C_AcctSchema_ID = AcctSchemaId.ofRepoId(para[i].getParameterAsInt()); + { + p_C_AcctSchema_ID = AcctSchemaId.ofRepoId(element.getParameterAsInt()); + } else if (name.equals("C_ConversionTypeReval_ID")) - p_C_ConversionTypeReval_ID = para[i].getParameterAsInt(); + { + p_C_ConversionTypeReval_ID = element.getParameterAsInt(); + } else if (name.equals("DateReval")) - p_DateReval = (Timestamp)para[i].getParameter(); + { + p_DateReval = (Timestamp)element.getParameter(); + } else if (name.equals("APAR")) - p_APAR = (String)para[i].getParameter(); + { + p_APAR = (String)element.getParameter(); + } else if (name.equals("IsAllCurrencies")) - p_IsAllCurrencies = "Y".equals(para[i].getParameter()); + { + p_IsAllCurrencies = "Y".equals(element.getParameter()); + } else if (name.equals("C_Currency_ID")) - p_C_Currency_ID = para[i].getParameterAsInt(); + { + p_C_Currency_ID = element.getParameterAsInt(); + } else if (name.equals("C_DocTypeReval_ID")) - p_C_DocTypeReval_ID = para[i].getParameterAsInt(); + { + p_C_DocTypeReval_ID = element.getParameterAsInt(); + } else + { log.error("Unknown Parameter: " + name); + } } } // prepare @@ -110,7 +128,9 @@ else if (name.equals("C_DocTypeReval_ID")) protected String doIt () throws Exception { if (p_IsAllCurrencies) + { p_C_Currency_ID = 0; + } log.info("C_AcctSchema_ID=" + p_C_AcctSchema_ID + ",C_ConversionTypeReval_ID=" + p_C_ConversionTypeReval_ID + ",DateReval=" + p_DateReval @@ -121,13 +141,17 @@ protected String doIt () throws Exception // Parameter if (p_DateReval == null) + { p_DateReval = new Timestamp(System.currentTimeMillis()); + } // Delete - just to be sure String sql = "DELETE FROM T_InvoiceGL WHERE AD_PInstance_ID=" + getAD_PInstance_ID(); int no = DB.executeUpdate(sql, get_TrxName()); if (no > 0) + { log.info("Deleted #" + no); + } // Insert Trx String dateStr = DB.TO_DATE(p_DateReval, true); @@ -156,21 +180,35 @@ protected String doIt () throws Exception + "WHERE ev.C_ElementValue_ID=fa.Account_ID AND (ev.AccountType='A' OR ev.AccountType='L'))" + " AND fa.C_AcctSchema_ID=" + p_C_AcctSchema_ID.getRepoId(); if (!p_IsAllCurrencies) + { sql += " AND i.C_Currency_ID<>a.C_Currency_ID"; + } if (ONLY_AR.equals(p_APAR)) + { sql += " AND i.IsSOTrx='Y'"; + } else if (ONLY_AP.equals(p_APAR)) + { sql += " AND i.IsSOTrx='N'"; + } if (!p_IsAllCurrencies && p_C_Currency_ID != 0) + { sql += " AND i.C_Currency_ID=" + p_C_Currency_ID; + } no = DB.executeUpdate(sql, get_TrxName()); if (no != 0) + { log.info("Inserted #" + no); + } else if (LogManager.isLevelFiner()) + { log.warn("Inserted #" + no + " - " + sql); - else + } + else + { log.warn("Inserted #" + no); + } // Calculate Difference sql = DB.convertSqlToNative("UPDATE T_InvoiceGL gl " @@ -181,20 +219,26 @@ else if (LogManager.isLevelFiner()) + "WHERE AD_PInstance_ID=" + getAD_PInstance_ID()); int noT = DB.executeUpdate(sql, get_TrxName()); if (noT > 0) + { log.info("Difference #" + noT); + } // Percentage sql = "UPDATE T_InvoiceGL SET Percent = 100 " + "WHERE GrandTotal=OpenAmt AND AD_PInstance_ID=" + getAD_PInstance_ID(); no = DB.executeUpdate(sql, get_TrxName()); if (no > 0) + { log.info("Not Paid #" + no); + } sql = "UPDATE T_InvoiceGL SET Percent = ROUND(OpenAmt*100/GrandTotal,6) " + "WHERE GrandTotal<>OpenAmt AND GrandTotal <> 0 AND AD_PInstance_ID=" + getAD_PInstance_ID(); no = DB.executeUpdate(sql, get_TrxName()); if (no > 0) + { log.info("Partial Paid #" + no); + } sql = "UPDATE T_InvoiceGL SET AmtRevalDr = AmtRevalDr * Percent/100," + " AmtRevalCr = AmtRevalCr * Percent/100," @@ -203,16 +247,22 @@ else if (LogManager.isLevelFiner()) + "WHERE Percent <> 100 AND AD_PInstance_ID=" + getAD_PInstance_ID(); no = DB.executeUpdate(sql, get_TrxName()); if (no > 0) + { log.info("Partial Calc #" + no); + } // Create Document String info = ""; if (p_C_DocTypeReval_ID != 0) { if (p_C_Currency_ID != 0) + { log.warn("Can create Journal only for all currencies"); + } else + { info = createGLJournal(); + } } return "#" + noT + info; } // doIt @@ -232,7 +282,9 @@ private String createGLJournal() //FR: [ 2214883 ] Remove SQL code and Replace for Query if (list.size() == 0) + { return " - No Records found"; + } // final AcctSchema as = Services.get(IAcctSchemaDAO.class).getById(p_C_AcctSchema_ID); @@ -250,7 +302,9 @@ private String createGLJournal() batch.setDateAcct(p_DateReval); batch.setC_Currency_ID(as.getCurrencyId().getRepoId()); if (!batch.save()) + { return " - Could not create Batch"; + } // MJournal journal = null; BigDecimal drTotal = BigDecimal.ZERO; @@ -260,10 +314,14 @@ private String createGLJournal() { X_T_InvoiceGL gl = list.get(i); if (gl.getAmtRevalDrDiff().signum() == 0 && gl.getAmtRevalCrDiff().signum() == 0) + { continue; + } MInvoice invoice = new MInvoice(getCtx(), gl.getC_Invoice_ID(), null); if (invoice.getC_Currency_ID() == as.getCurrencyId().getRepoId()) + { continue; + } // if (journal == null) { @@ -271,11 +329,15 @@ private String createGLJournal() journal.setC_AcctSchema_ID (as.getId().getRepoId()); journal.setC_Currency_ID(as.getCurrencyId().getRepoId()); journal.setC_ConversionType_ID(p_C_ConversionTypeReval_ID); - MOrg org = MOrg.get(getCtx(), gl.getAD_Org_ID()); - journal.setDescription (getName() + " - " + org.getName()); + + final String orgName = Services.get(IOrgDAO.class).retrieveOrgName(gl.getAD_Org_ID()); + journal.setDescription (getName() + " - " + orgName); + journal.setGL_Category_ID (cat.getGL_Category_ID()); if (!journal.save()) + { return " - Could not create Journal"; + } } // MJournalLine line = new MJournalLine(journal); @@ -295,8 +357,10 @@ private String createGLJournal() line.setAmtAcctCr (cr); line.save(); // - if (AD_Org_ID == 0) // invoice org id + if (AD_Org_ID == 0) + { AD_Org_ID = gl.getAD_Org_ID(); + } // Change in Org if (AD_Org_ID != gl.getAD_Org_ID()) { @@ -326,7 +390,9 @@ private void createBalancing (AcctSchema as, MJournal journal, BigDecimal drTotal, BigDecimal crTotal, int AD_Org_ID, int lineNo) { if (journal == null) + { throw new IllegalArgumentException("Jornal is null"); + } final AcctSchemaId acctSchemaId = as.getId(); diff --git a/de.metas.acct.base/src/main/java/de/metas/acct/api/IProductAcctDAO.java b/de.metas.acct.base/src/main/java/de/metas/acct/api/IProductAcctDAO.java index fc545fea892..d6f8dbc372f 100644 --- a/de.metas.acct.base/src/main/java/de/metas/acct/api/IProductAcctDAO.java +++ b/de.metas.acct.base/src/main/java/de/metas/acct/api/IProductAcctDAO.java @@ -25,12 +25,12 @@ import java.util.Properties; import org.adempiere.service.ClientId; -import org.adempiere.service.OrgId; import org.compiere.model.I_M_Product_Acct; import org.compiere.model.I_M_Product_Category_Acct; import de.metas.acct.api.AcctSchema; import de.metas.acct.api.AcctSchemaId; +import de.metas.organization.OrgId; import de.metas.product.IProductActivityProvider; import de.metas.product.ProductId; import de.metas.product.acct.api.ActivityId; diff --git a/de.metas.acct.base/src/main/java/de/metas/acct/api/impl/ProductAcctDAO.java b/de.metas.acct.base/src/main/java/de/metas/acct/api/impl/ProductAcctDAO.java index 31459315959..cb22c8ba62c 100644 --- a/de.metas.acct.base/src/main/java/de/metas/acct/api/impl/ProductAcctDAO.java +++ b/de.metas.acct.base/src/main/java/de/metas/acct/api/impl/ProductAcctDAO.java @@ -28,7 +28,6 @@ import org.adempiere.ad.trx.api.ITrx; import org.adempiere.model.InterfaceWrapperHelper; import org.adempiere.service.ClientId; -import org.adempiere.service.OrgId; import org.adempiere.util.proxy.Cached; import org.compiere.model.I_M_Product_Acct; import org.compiere.model.I_M_Product_Category; @@ -40,6 +39,7 @@ import de.metas.acct.api.IAcctSchemaDAO; import de.metas.acct.api.IProductAcctDAO; import de.metas.cache.annotation.CacheCtx; +import de.metas.organization.OrgId; import de.metas.product.IProductDAO; import de.metas.product.ProductId; import de.metas.product.acct.api.ActivityId; diff --git a/de.metas.acct.base/src/main/java/de/metas/acct/impexp/AccountImportProcess.java b/de.metas.acct.base/src/main/java/de/metas/acct/impexp/AccountImportProcess.java index 44369edeee5..b812caf4ab3 100644 --- a/de.metas.acct.base/src/main/java/de/metas/acct/impexp/AccountImportProcess.java +++ b/de.metas.acct.base/src/main/java/de/metas/acct/impexp/AccountImportProcess.java @@ -18,7 +18,6 @@ import org.adempiere.impexp.IImportInterceptor; import org.adempiere.model.InterfaceWrapperHelper; import org.adempiere.service.ClientId; -import org.adempiere.service.OrgId; import org.adempiere.util.lang.IMutable; import org.compiere.model.I_AD_Tree; import org.compiere.model.I_C_Element; @@ -36,6 +35,7 @@ import de.metas.acct.api.AccountDimension; import de.metas.acct.api.AcctSchemaId; import de.metas.acct.api.IAcctSchemaDAO; +import de.metas.organization.OrgId; import de.metas.util.Check; import de.metas.util.NumberUtils; import de.metas.util.Services; diff --git a/de.metas.acct.base/src/main/java/de/metas/acct/model/validator/C_AcctSchema.java b/de.metas.acct.base/src/main/java/de/metas/acct/model/validator/C_AcctSchema.java index 6b35a6f74ee..00f05b2a238 100644 --- a/de.metas.acct.base/src/main/java/de/metas/acct/model/validator/C_AcctSchema.java +++ b/de.metas.acct.base/src/main/java/de/metas/acct/model/validator/C_AcctSchema.java @@ -4,7 +4,6 @@ import org.adempiere.ad.modelvalidator.annotations.ModelChange; import org.adempiere.model.InterfaceWrapperHelper; import org.adempiere.service.ClientId; -import org.adempiere.service.OrgId; import org.compiere.model.I_C_AcctSchema; import org.compiere.model.I_M_CostType; import org.compiere.model.ModelValidator; @@ -19,6 +18,7 @@ import de.metas.costing.CostingLevel; import de.metas.costing.CostingMethod; import de.metas.costing.ICostElementRepository; +import de.metas.organization.OrgId; import de.metas.util.Services; /* diff --git a/de.metas.acct.base/src/main/java/de/metas/acct/model/validator/C_AcctSchema_Default.java b/de.metas.acct.base/src/main/java/de/metas/acct/model/validator/C_AcctSchema_Default.java index f04290ad412..22fc1ce79f6 100644 --- a/de.metas.acct.base/src/main/java/de/metas/acct/model/validator/C_AcctSchema_Default.java +++ b/de.metas.acct.base/src/main/java/de/metas/acct/model/validator/C_AcctSchema_Default.java @@ -2,10 +2,11 @@ import org.adempiere.ad.modelvalidator.annotations.Interceptor; import org.adempiere.ad.modelvalidator.annotations.ModelChange; -import org.adempiere.service.OrgId; import org.compiere.model.I_C_AcctSchema_Default; import org.compiere.model.ModelValidator; +import de.metas.organization.OrgId; + /* * #%L * de.metas.business diff --git a/de.metas.acct.base/src/main/java/de/metas/acct/model/validator/C_AcctSchema_Element.java b/de.metas.acct.base/src/main/java/de/metas/acct/model/validator/C_AcctSchema_Element.java index 63297347dce..f8523428f7c 100644 --- a/de.metas.acct.base/src/main/java/de/metas/acct/model/validator/C_AcctSchema_Element.java +++ b/de.metas.acct.base/src/main/java/de/metas/acct/model/validator/C_AcctSchema_Element.java @@ -17,7 +17,6 @@ import org.adempiere.ad.trx.api.ITrx; import org.adempiere.exceptions.AdempiereException; import org.adempiere.model.InterfaceWrapperHelper; -import org.adempiere.service.OrgId; import org.compiere.model.I_C_AcctSchema_Element; import org.compiere.model.MAccount; import org.compiere.model.ModelValidator; @@ -25,6 +24,7 @@ import org.compiere.util.Env; import de.metas.acct.api.AcctSchemaElementType; +import de.metas.organization.OrgId; /* * #%L diff --git a/de.metas.acct.base/src/main/java/de/metas/acct/model/validator/C_AcctSchema_GL.java b/de.metas.acct.base/src/main/java/de/metas/acct/model/validator/C_AcctSchema_GL.java index f73dee5d079..3681097955c 100644 --- a/de.metas.acct.base/src/main/java/de/metas/acct/model/validator/C_AcctSchema_GL.java +++ b/de.metas.acct.base/src/main/java/de/metas/acct/model/validator/C_AcctSchema_GL.java @@ -2,10 +2,11 @@ import org.adempiere.ad.modelvalidator.annotations.Interceptor; import org.adempiere.ad.modelvalidator.annotations.ModelChange; -import org.adempiere.service.OrgId; import org.compiere.model.I_C_AcctSchema_GL; import org.compiere.model.ModelValidator; +import de.metas.organization.OrgId; + /* * #%L * de.metas.business diff --git a/de.metas.acct.base/src/test/java/de/metas/acct/api/ProductAcctProviderTest.java b/de.metas.acct.base/src/test/java/de/metas/acct/api/ProductAcctProviderTest.java index ae16d26cd7c..6385ef8ed1f 100644 --- a/de.metas.acct.base/src/test/java/de/metas/acct/api/ProductAcctProviderTest.java +++ b/de.metas.acct.base/src/test/java/de/metas/acct/api/ProductAcctProviderTest.java @@ -7,7 +7,6 @@ import java.util.Properties; import org.adempiere.service.ClientId; -import org.adempiere.service.OrgId; import org.adempiere.test.AdempiereTestHelper; import org.compiere.model.I_C_Activity; import org.compiere.model.I_M_Product; @@ -19,6 +18,7 @@ import de.metas.acct.AcctSchemaTestHelper; import de.metas.acct.api.AcctSchemaId; import de.metas.acct.api.IProductAcctDAO; +import de.metas.organization.OrgId; import de.metas.product.IProductActivityProvider; import de.metas.product.ProductId; import de.metas.product.acct.api.ActivityId; diff --git a/de.metas.adempiere.adempiere/base/src/main/java-legacy/org/adempiere/exceptions/TaxNoExemptFoundException.java b/de.metas.adempiere.adempiere/base/src/main/java-legacy/org/adempiere/exceptions/TaxNoExemptFoundException.java index 30802a0892f..2a6c420dc10 100644 --- a/de.metas.adempiere.adempiere/base/src/main/java-legacy/org/adempiere/exceptions/TaxNoExemptFoundException.java +++ b/de.metas.adempiere.adempiere/base/src/main/java-legacy/org/adempiere/exceptions/TaxNoExemptFoundException.java @@ -1,25 +1,26 @@ /****************************************************************************** - * Product: Adempiere ERP & CRM Smart Business Solution * - * Copyright (C) 2009 SC ARHIPAC SERVICE SRL. All Rights Reserved. * - * This program is free software; you can redistribute it and/or modify it * - * under the terms version 2 of the GNU General Public License as published * - * by the Free Software Foundation. This program is distributed in the hope * + * Product: Adempiere ERP & CRM Smart Business Solution * + * Copyright (C) 2009 SC ARHIPAC SERVICE SRL. All Rights Reserved. * + * This program is free software; you can redistribute it and/or modify it * + * under the terms version 2 of the GNU General Public License as published * + * by the Free Software Foundation. This program is distributed in the hope * * that it will be useful, but WITHOUT ANY WARRANTY; without even the implied * - * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * - * See the GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License along * - * with this program; if not, write to the Free Software Foundation, Inc., * - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. * + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * + * See the GNU General Public License for more details. * + * You should have received a copy of the GNU General Public License along * + * with this program; if not, write to the Free Software Foundation, Inc., * + * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. * *****************************************************************************/ package org.adempiere.exceptions; -import org.compiere.model.MOrg; -import org.compiere.util.Env; +import de.metas.organization.IOrgDAO; +import de.metas.util.Services; /** * Throw by Tax Engine where no tax found for given criteria + * * @author Teo Sarca, www.arhipac.ro - *
  • FR [ 2758097 ] Implement TaxNotFoundException + *
  • FR [ 2758097 ] Implement TaxNotFoundException */ public class TaxNoExemptFoundException extends AdempiereException { @@ -27,34 +28,30 @@ public class TaxNoExemptFoundException extends AdempiereException * */ private static final long serialVersionUID = -5489066603806460132L; - + private static final String AD_Message = "TaxNoExemptFound"; public TaxNoExemptFoundException(int AD_Org_ID) { super(buildMessage(AD_Org_ID)); } - - private static final String buildMessage (int AD_Org_ID) + + private static final String buildMessage(int AD_Org_ID) { StringBuffer msg = new StringBuffer("@").append(AD_Message).append("@"); msg.append("@AD_Org_ID@:").append(getOrgString(AD_Org_ID)); // return msg.toString(); } - + private static final String getOrgString(int AD_Org_ID) { if (AD_Org_ID <= 0) { return "*"; } - MOrg org = MOrg.get(Env.getCtx(), AD_Org_ID); - if (org == null || org.get_ID() != AD_Org_ID) - { - return "?"; - } - return org.getName(); + + return Services.get(IOrgDAO.class).retrieveOrgName(AD_Org_ID); } } diff --git a/de.metas.adempiere.adempiere/base/src/main/java-legacy/org/compiere/model/GridField.java b/de.metas.adempiere.adempiere/base/src/main/java-legacy/org/compiere/model/GridField.java index fd118e01633..d48efac4cfc 100644 --- a/de.metas.adempiere.adempiere/base/src/main/java-legacy/org/compiere/model/GridField.java +++ b/de.metas.adempiere.adempiere/base/src/main/java-legacy/org/compiere/model/GridField.java @@ -43,7 +43,6 @@ import org.adempiere.ad.validationRule.IValidationContext; import org.adempiere.ad.window.api.IADWindowDAO; import org.adempiere.service.ClientId; -import org.adempiere.service.OrgId; import org.adempiere.util.beans.DelayedPropertyChangeSupport; import org.adempiere.util.lang.ExtendedMemorizingSupplier; import org.compiere.util.DB; @@ -58,6 +57,7 @@ import de.metas.adempiere.form.IClientUI; import de.metas.adempiere.service.IColumnBL; import de.metas.logging.LogManager; +import de.metas.organization.OrgId; import de.metas.process.IProcessDefaultParameter; import de.metas.security.IUserRolePermissions; import de.metas.security.TableAccessLevel; diff --git a/de.metas.adempiere.adempiere/base/src/main/java-legacy/org/compiere/model/GridTable.java b/de.metas.adempiere.adempiere/base/src/main/java-legacy/org/compiere/model/GridTable.java index ed4109a95d7..e643a86cee5 100644 --- a/de.metas.adempiere.adempiere/base/src/main/java-legacy/org/compiere/model/GridTable.java +++ b/de.metas.adempiere.adempiere/base/src/main/java-legacy/org/compiere/model/GridTable.java @@ -45,7 +45,6 @@ import org.adempiere.model.CopyRecordFactory; import org.adempiere.model.CopyRecordSupport; import org.adempiere.service.ClientId; -import org.adempiere.service.OrgId; import org.adempiere.util.GridRowCtx; import org.adempiere.util.lang.ImmutablePair; import org.compiere.model.GridTab.DataNewCopyMode; @@ -60,6 +59,7 @@ import de.metas.cache.CacheMgt; import de.metas.logging.LogManager; import de.metas.logging.MetasfreshLastError; +import de.metas.organization.OrgId; import de.metas.security.IUserRolePermissions; import de.metas.security.permissions.Access; import de.metas.util.Check; diff --git a/de.metas.adempiere.adempiere/base/src/main/java-legacy/org/compiere/model/MOrg.java b/de.metas.adempiere.adempiere/base/src/main/java-legacy/org/compiere/model/MOrg.java index 86dacaabd08..308fb97b1d4 100644 --- a/de.metas.adempiere.adempiere/base/src/main/java-legacy/org/compiere/model/MOrg.java +++ b/de.metas.adempiere.adempiere/base/src/main/java-legacy/org/compiere/model/MOrg.java @@ -20,12 +20,12 @@ import java.util.List; import java.util.Properties; -import org.adempiere.service.IOrgDAO; -import org.adempiere.service.OrgId; import org.adempiere.util.LegacyAdapters; import org.compiere.util.DB; import org.compiere.util.Env; +import de.metas.organization.IOrgDAO; +import de.metas.organization.OrgId; import de.metas.organization.OrgInfoUpdateRequest; import de.metas.util.Services; @@ -59,12 +59,7 @@ public static MOrg[] getOfClient(Properties ctx, int AD_Client_ID) return LegacyAdapters.convertToPOArray(clientOrgs, MOrg.class); } // getOfClient - /** - * Get Org from Cache - * @param ctx context - * @param AD_Org_ID id - * @return MOrg - */ + @Deprecated public static MOrg get (Properties ctx, int AD_Org_ID) { if (AD_Org_ID < 0) diff --git a/de.metas.adempiere.adempiere/base/src/main/java-legacy/org/compiere/model/MPeriod.java b/de.metas.adempiere.adempiere/base/src/main/java-legacy/org/compiere/model/MPeriod.java index da6980724df..e1b4daad79d 100644 --- a/de.metas.adempiere.adempiere/base/src/main/java-legacy/org/compiere/model/MPeriod.java +++ b/de.metas.adempiere.adempiere/base/src/main/java-legacy/org/compiere/model/MPeriod.java @@ -31,8 +31,6 @@ import org.adempiere.model.InterfaceWrapperHelper; import org.adempiere.service.ClientId; import org.adempiere.service.IClientDAO; -import org.adempiere.service.IOrgDAO; -import org.adempiere.service.OrgId; import org.compiere.util.DB; import org.compiere.util.DisplayType; import org.compiere.util.Env; @@ -48,6 +46,8 @@ import de.metas.calendar.IPeriodBL; import de.metas.calendar.IPeriodDAO; import de.metas.logging.LogManager; +import de.metas.organization.IOrgDAO; +import de.metas.organization.OrgId; import de.metas.organization.OrgInfo; import de.metas.util.Services; import de.metas.util.time.SystemTime; diff --git a/de.metas.adempiere.adempiere/base/src/main/java-legacy/org/compiere/process/BPartnerOrgLink.java b/de.metas.adempiere.adempiere/base/src/main/java-legacy/org/compiere/process/BPartnerOrgLink.java index bbc06d48691..17766da7be7 100644 --- a/de.metas.adempiere.adempiere/base/src/main/java-legacy/org/compiere/process/BPartnerOrgLink.java +++ b/de.metas.adempiere.adempiere/base/src/main/java-legacy/org/compiere/process/BPartnerOrgLink.java @@ -21,8 +21,6 @@ import org.adempiere.exceptions.FillMandatoryException; import org.adempiere.model.InterfaceWrapperHelper; -import org.adempiere.service.IOrgDAO; -import org.adempiere.service.OrgId; import org.adempiere.util.LegacyAdapters; import org.adempiere.warehouse.WarehouseId; import org.adempiere.warehouse.api.IWarehouseBL; @@ -36,6 +34,8 @@ import de.metas.bpartner.BPartnerId; import de.metas.bpartner.BPartnerLocationId; import de.metas.bpartner.service.IBPartnerDAO; +import de.metas.organization.IOrgDAO; +import de.metas.organization.OrgId; import de.metas.organization.OrgInfoUpdateRequest; import de.metas.organization.OrgTypeId; import de.metas.process.JavaProcess; diff --git a/de.metas.adempiere.adempiere/base/src/main/java-legacy/org/compiere/process/InventoryValue.java b/de.metas.adempiere.adempiere/base/src/main/java-legacy/org/compiere/process/InventoryValue.java index c0828f4bc46..88838efcc3c 100644 --- a/de.metas.adempiere.adempiere/base/src/main/java-legacy/org/compiere/process/InventoryValue.java +++ b/de.metas.adempiere.adempiere/base/src/main/java-legacy/org/compiere/process/InventoryValue.java @@ -19,7 +19,6 @@ import java.sql.Timestamp; import org.adempiere.service.ClientId; -import org.adempiere.service.OrgId; import org.adempiere.warehouse.WarehouseId; import org.adempiere.warehouse.api.IWarehouseDAO; import org.compiere.model.I_M_Warehouse; @@ -27,6 +26,7 @@ import de.metas.acct.api.AcctSchema; import de.metas.acct.api.IAcctSchemaDAO; +import de.metas.organization.OrgId; import de.metas.process.JavaProcess; import de.metas.process.ProcessInfoParameter; import de.metas.util.Services; diff --git a/de.metas.adempiere.adempiere/base/src/main/java-legacy/org/compiere/report/MReportTree.java b/de.metas.adempiere.adempiere/base/src/main/java-legacy/org/compiere/report/MReportTree.java index 6cac68ecd0d..acd14021400 100644 --- a/de.metas.adempiere.adempiere/base/src/main/java-legacy/org/compiere/report/MReportTree.java +++ b/de.metas.adempiere.adempiere/base/src/main/java-legacy/org/compiere/report/MReportTree.java @@ -26,7 +26,6 @@ import java.util.stream.Stream; import org.adempiere.ad.trx.api.ITrx; -import org.adempiere.service.OrgId; import org.compiere.model.MHierarchy; import org.compiere.model.MTree; import org.compiere.model.MTreeNode; @@ -40,6 +39,7 @@ import de.metas.acct.api.AcctSchemaElementType; import de.metas.cache.CCache; import de.metas.logging.LogManager; +import de.metas.organization.OrgId; import lombok.NonNull; /** diff --git a/de.metas.adempiere.adempiere/base/src/main/java-legacy/org/compiere/util/Env.java b/de.metas.adempiere.adempiere/base/src/main/java-legacy/org/compiere/util/Env.java index 5d89f8eb10b..50edca180de 100644 --- a/de.metas.adempiere.adempiere/base/src/main/java-legacy/org/compiere/util/Env.java +++ b/de.metas.adempiere.adempiere/base/src/main/java-legacy/org/compiere/util/Env.java @@ -46,7 +46,6 @@ import org.adempiere.service.IClientDAO; import org.adempiere.service.ISysConfigBL; import org.adempiere.service.IValuePreferenceBL.IUserValuePreference; -import org.adempiere.service.OrgId; import org.adempiere.util.lang.IAutoCloseable; import org.compiere.Adempiere; import org.compiere.db.CConnection; @@ -64,6 +63,7 @@ import de.metas.i18n.ILanguageDAO; import de.metas.i18n.Language; import de.metas.logging.LogManager; +import de.metas.organization.OrgId; import de.metas.security.IUserRolePermissions; import de.metas.security.IUserRolePermissionsDAO; import de.metas.security.RoleId; diff --git a/de.metas.adempiere.adempiere/base/src/main/java-legacy/org/compiere/util/Login.java b/de.metas.adempiere.adempiere/base/src/main/java-legacy/org/compiere/util/Login.java index 676224a4479..dc2fb775403 100644 --- a/de.metas.adempiere.adempiere/base/src/main/java-legacy/org/compiere/util/Login.java +++ b/de.metas.adempiere.adempiere/base/src/main/java-legacy/org/compiere/util/Login.java @@ -31,7 +31,6 @@ import org.adempiere.service.ClientId; import org.adempiere.service.ISysConfigBL; import org.adempiere.service.IValuePreferenceBL; -import org.adempiere.service.OrgId; import org.compiere.model.ModelValidationEngine; import org.slf4j.Logger; @@ -45,6 +44,7 @@ import de.metas.i18n.Language; import de.metas.location.ICountryDAO; import de.metas.logging.LogManager; +import de.metas.organization.OrgId; import de.metas.security.IRoleDAO; import de.metas.security.IUserRolePermissions; import de.metas.security.IUserRolePermissionsDAO; diff --git a/de.metas.adempiere.adempiere/base/src/main/java-legacy/org/compiere/util/LoginContext.java b/de.metas.adempiere.adempiere/base/src/main/java-legacy/org/compiere/util/LoginContext.java index 9db85126b2e..48f616c704a 100644 --- a/de.metas.adempiere.adempiere/base/src/main/java-legacy/org/compiere/util/LoginContext.java +++ b/de.metas.adempiere.adempiere/base/src/main/java-legacy/org/compiere/util/LoginContext.java @@ -6,11 +6,11 @@ import org.adempiere.service.ClientId; import org.adempiere.service.IValuePreferenceBL.IUserValuePreference; -import org.adempiere.service.OrgId; import org.adempiere.warehouse.WarehouseId; import de.metas.acct.api.AcctSchema; import de.metas.acct.api.AcctSchemaId; +import de.metas.organization.OrgId; import de.metas.security.RoleId; import de.metas.security.TableAccessLevel; import de.metas.user.UserId; diff --git a/de.metas.adempiere.adempiere/base/src/main/java-legacy/org/compiere/wf/MWFActivity.java b/de.metas.adempiere.adempiere/base/src/main/java-legacy/org/compiere/wf/MWFActivity.java index 2630fc9e2f8..65aebd2687d 100644 --- a/de.metas.adempiere.adempiere/base/src/main/java-legacy/org/compiere/wf/MWFActivity.java +++ b/de.metas.adempiere.adempiere/base/src/main/java-legacy/org/compiere/wf/MWFActivity.java @@ -35,8 +35,6 @@ import org.adempiere.ad.trx.api.ITrx; import org.adempiere.ad.trx.api.ITrxSavepoint; import org.adempiere.exceptions.AdempiereException; -import org.adempiere.service.IOrgDAO; -import org.adempiere.service.OrgId; import org.compiere.Adempiere; import org.compiere.model.I_AD_Process_Para; import org.compiere.model.I_AD_Role; @@ -70,6 +68,8 @@ import de.metas.notification.INotificationBL; import de.metas.notification.UserNotificationRequest; import de.metas.notification.UserNotificationRequest.TargetRecordAction; +import de.metas.organization.IOrgDAO; +import de.metas.organization.OrgId; import de.metas.organization.OrgInfo; import de.metas.process.ProcessInfo; import de.metas.process.ProcessInfoParameter; diff --git a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/acct/api/AcctSchema.java b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/acct/api/AcctSchema.java index ae8f998a7ae..fda0e0524ba 100644 --- a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/acct/api/AcctSchema.java +++ b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/acct/api/AcctSchema.java @@ -1,13 +1,13 @@ package de.metas.acct.api; import org.adempiere.service.ClientId; -import org.adempiere.service.OrgId; import com.google.common.collect.ImmutableSet; import de.metas.acct.api.impl.AcctSchemaPeriodControl; import de.metas.currency.CurrencyPrecision; import de.metas.money.CurrencyId; +import de.metas.organization.OrgId; import lombok.Builder; import lombok.NonNull; import lombok.ToString; diff --git a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/acct/api/IAcctSchemaDAO.java b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/acct/api/IAcctSchemaDAO.java index 18a98158a83..baf3e65a2ce 100644 --- a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/acct/api/IAcctSchemaDAO.java +++ b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/acct/api/IAcctSchemaDAO.java @@ -26,11 +26,11 @@ import java.util.Properties; import org.adempiere.service.ClientId; -import org.adempiere.service.OrgId; import org.compiere.model.I_C_AcctSchema; import org.compiere.model.I_C_AcctSchema_Default; import org.compiere.model.I_C_AcctSchema_GL; +import de.metas.organization.OrgId; import de.metas.util.ISingletonService; public interface IAcctSchemaDAO extends ISingletonService diff --git a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/acct/api/impl/AcctSchemaDAO.java b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/acct/api/impl/AcctSchemaDAO.java index 2474a5343c6..8136f45276a 100644 --- a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/acct/api/impl/AcctSchemaDAO.java +++ b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/acct/api/impl/AcctSchemaDAO.java @@ -13,8 +13,6 @@ import org.adempiere.model.InterfaceWrapperHelper; import org.adempiere.service.ClientId; import org.adempiere.service.IClientDAO; -import org.adempiere.service.IOrgDAO; -import org.adempiere.service.OrgId; import org.compiere.model.I_AD_ClientInfo; import org.compiere.model.I_AD_Org; import org.compiere.model.I_C_AcctSchema; @@ -55,6 +53,8 @@ import de.metas.currency.ICurrencyDAO; import de.metas.logging.LogManager; import de.metas.money.CurrencyId; +import de.metas.organization.IOrgDAO; +import de.metas.organization.OrgId; import de.metas.util.Check; import de.metas.util.Services; import lombok.NonNull; diff --git a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/acct/api/impl/PlainAcctSchemaDAO.java b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/acct/api/impl/PlainAcctSchemaDAO.java index a994c74aa8a..236ca92d691 100644 --- a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/acct/api/impl/PlainAcctSchemaDAO.java +++ b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/acct/api/impl/PlainAcctSchemaDAO.java @@ -1,9 +1,9 @@ package de.metas.acct.api.impl; import org.adempiere.service.ClientId; -import org.adempiere.service.OrgId; import de.metas.acct.api.AcctSchemaId; +import de.metas.organization.OrgId; /* * #%L diff --git a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/bpartner/BPGroup.java b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/bpartner/BPGroup.java index 27e544948f7..37cb48c0679 100644 --- a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/bpartner/BPGroup.java +++ b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/bpartner/BPGroup.java @@ -2,8 +2,7 @@ import javax.annotation.Nullable; -import org.adempiere.service.OrgId; - +import de.metas.organization.OrgId; import lombok.Data; import lombok.NonNull; diff --git a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/bpartner/BPGroupRepository.java b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/bpartner/BPGroupRepository.java index 9791050a647..058cbc9c802 100644 --- a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/bpartner/BPGroupRepository.java +++ b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/bpartner/BPGroupRepository.java @@ -9,10 +9,10 @@ import javax.annotation.Nullable; import org.adempiere.ad.dao.IQueryBL; -import org.adempiere.service.OrgId; import org.compiere.model.I_C_BP_Group; import org.springframework.stereotype.Repository; +import de.metas.organization.OrgId; import de.metas.util.Services; import lombok.NonNull; diff --git a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/bpartner/service/BPartnerQuery.java b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/bpartner/service/BPartnerQuery.java index e334b520015..4bb073a1117 100644 --- a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/bpartner/service/BPartnerQuery.java +++ b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/bpartner/service/BPartnerQuery.java @@ -6,11 +6,10 @@ import javax.annotation.Nullable; -import org.adempiere.service.OrgId; - import com.google.common.collect.ImmutableSet; import de.metas.bpartner.BPartnerId; +import de.metas.organization.OrgId; import de.metas.util.rest.ExternalId; import lombok.Builder; import lombok.NonNull; diff --git a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/bpartner/service/IBPartnerOrgBL.java b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/bpartner/service/IBPartnerOrgBL.java index a4cc9a429c3..f0f8413cacc 100644 --- a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/bpartner/service/IBPartnerOrgBL.java +++ b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/bpartner/service/IBPartnerOrgBL.java @@ -25,7 +25,6 @@ import java.util.Optional; import java.util.Properties; -import org.adempiere.service.OrgId; import org.compiere.model.I_AD_Org; import org.compiere.model.I_C_BPartner; import org.compiere.model.I_C_Location; @@ -33,6 +32,7 @@ import de.metas.adempiere.model.I_AD_User; import de.metas.bpartner.BPartnerLocationId; import de.metas.location.CountryId; +import de.metas.organization.OrgId; import de.metas.user.UserId; import de.metas.util.ISingletonService; import lombok.NonNull; diff --git a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/bpartner/service/OrgHasNoBPartnerLinkException.java b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/bpartner/service/OrgHasNoBPartnerLinkException.java index ba645a713a1..f3d86ce11ce 100644 --- a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/bpartner/service/OrgHasNoBPartnerLinkException.java +++ b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/bpartner/service/OrgHasNoBPartnerLinkException.java @@ -25,11 +25,11 @@ import java.util.Properties; import org.adempiere.exceptions.AdempiereException; -import org.adempiere.service.IOrgDAO; -import org.adempiere.service.OrgId; import org.compiere.util.Env; import de.metas.i18n.IMsgBL; +import de.metas.organization.IOrgDAO; +import de.metas.organization.OrgId; import de.metas.util.Check; import de.metas.util.Services; diff --git a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/bpartner/service/impl/BPartnerBL.java b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/bpartner/service/impl/BPartnerBL.java index b65637d7236..e26b7b1d328 100644 --- a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/bpartner/service/impl/BPartnerBL.java +++ b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/bpartner/service/impl/BPartnerBL.java @@ -34,7 +34,6 @@ import org.adempiere.ad.trx.api.ITrxManager; import org.adempiere.model.InterfaceWrapperHelper; import org.adempiere.service.ISysConfigBL; -import org.adempiere.service.OrgId; import org.compiere.model.I_AD_User; import org.compiere.model.I_C_BP_Group; import org.compiere.model.I_C_BPartner; @@ -55,6 +54,7 @@ import de.metas.lang.SOTrx; import de.metas.location.ILocationBL; import de.metas.location.impl.AddressBuilder; +import de.metas.organization.OrgId; import de.metas.user.User; import de.metas.user.UserId; import de.metas.user.UserRepository; diff --git a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/bpartner/service/impl/BPartnerDAO.java b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/bpartner/service/impl/BPartnerDAO.java index 918cb3815b6..fd83bc71c04 100644 --- a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/bpartner/service/impl/BPartnerDAO.java +++ b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/bpartner/service/impl/BPartnerDAO.java @@ -52,8 +52,6 @@ import org.adempiere.exceptions.AdempiereException; import org.adempiere.model.InterfaceWrapperHelper; import org.adempiere.service.ClientId; -import org.adempiere.service.IOrgDAO; -import org.adempiere.service.OrgId; import org.adempiere.util.proxy.Cached; import org.compiere.model.IQuery; import org.compiere.model.I_AD_Org; @@ -88,6 +86,8 @@ import de.metas.location.ILocationDAO; import de.metas.location.LocationId; import de.metas.logging.LogManager; +import de.metas.organization.IOrgDAO; +import de.metas.organization.OrgId; import de.metas.organization.OrgInfo; import de.metas.pricing.PricingSystemId; import de.metas.shipping.IShipperDAO; diff --git a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/bpartner/service/impl/BPartnerOrgBL.java b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/bpartner/service/impl/BPartnerOrgBL.java index 5d0f0720f42..d2051ee138b 100644 --- a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/bpartner/service/impl/BPartnerOrgBL.java +++ b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/bpartner/service/impl/BPartnerOrgBL.java @@ -31,8 +31,6 @@ import org.adempiere.ad.dao.IQueryBuilder; import org.adempiere.ad.trx.api.ITrx; import org.adempiere.model.InterfaceWrapperHelper; -import org.adempiere.service.IOrgDAO; -import org.adempiere.service.OrgId; import org.adempiere.util.proxy.Cached; import org.compiere.model.I_AD_Org; import org.compiere.model.I_C_BPartner; @@ -47,6 +45,8 @@ import de.metas.bpartner.service.OrgHasNoBPartnerLinkException; import de.metas.cache.annotation.CacheCtx; import de.metas.cache.annotation.CacheTrx; +import de.metas.organization.IOrgDAO; +import de.metas.organization.OrgId; import de.metas.user.UserId; import de.metas.util.Services; import lombok.NonNull; diff --git a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/costing/CostingLevel.java b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/costing/CostingLevel.java index c800dfd2478..f9ef0e79866 100644 --- a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/costing/CostingLevel.java +++ b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/costing/CostingLevel.java @@ -6,11 +6,11 @@ import org.adempiere.exceptions.AdempiereException; import org.adempiere.mm.attributes.AttributeSetInstanceId; import org.adempiere.service.ClientId; -import org.adempiere.service.OrgId; import org.compiere.model.X_C_AcctSchema; import com.google.common.collect.ImmutableMap; +import de.metas.organization.OrgId; import de.metas.util.GuavaCollectors; import lombok.Getter; import lombok.NonNull; diff --git a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/currency/CurrencyConversionContext.java b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/currency/CurrencyConversionContext.java index 4c5a25ded0f..21401822d50 100644 --- a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/currency/CurrencyConversionContext.java +++ b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/currency/CurrencyConversionContext.java @@ -5,11 +5,11 @@ import java.util.Optional; import org.adempiere.service.ClientId; -import org.adempiere.service.OrgId; import com.google.common.base.MoreObjects; import de.metas.money.CurrencyConversionTypeId; +import de.metas.organization.OrgId; import lombok.Builder; import lombok.Builder.Default; import lombok.NonNull; diff --git a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/currency/CurrencyConversionResult.java b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/currency/CurrencyConversionResult.java index beb4659cc79..dfdd3d42c30 100644 --- a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/currency/CurrencyConversionResult.java +++ b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/currency/CurrencyConversionResult.java @@ -28,10 +28,10 @@ import javax.annotation.Nullable; import org.adempiere.service.ClientId; -import org.adempiere.service.OrgId; import de.metas.money.CurrencyConversionTypeId; import de.metas.money.CurrencyId; +import de.metas.organization.OrgId; import lombok.Builder; import lombok.NonNull; import lombok.Value; diff --git a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/currency/ICurrencyBL.java b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/currency/ICurrencyBL.java index 21824bb6814..bab8a7e1520 100644 --- a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/currency/ICurrencyBL.java +++ b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/currency/ICurrencyBL.java @@ -29,13 +29,13 @@ import java.util.Properties; import org.adempiere.service.ClientId; -import org.adempiere.service.OrgId; import org.compiere.model.I_C_Currency; import org.compiere.util.TimeUtil; import de.metas.currency.exceptions.NoCurrencyRateFoundException; import de.metas.money.CurrencyConversionTypeId; import de.metas.money.CurrencyId; +import de.metas.organization.OrgId; import de.metas.util.ISingletonService; import lombok.NonNull; diff --git a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/currency/impl/CurrencyBL.java b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/currency/impl/CurrencyBL.java index 98e8ad6bb9e..acc7113a069 100644 --- a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/currency/impl/CurrencyBL.java +++ b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/currency/impl/CurrencyBL.java @@ -29,7 +29,6 @@ import java.util.Properties; import org.adempiere.service.ClientId; -import org.adempiere.service.OrgId; import org.compiere.model.I_C_ConversionType; import org.compiere.model.I_C_Currency; import org.compiere.util.Env; @@ -49,6 +48,7 @@ import de.metas.currency.exceptions.NoCurrencyRateFoundException; import de.metas.money.CurrencyConversionTypeId; import de.metas.money.CurrencyId; +import de.metas.organization.OrgId; import de.metas.util.Check; import de.metas.util.Services; import de.metas.util.time.SystemTime; diff --git a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/currency/impl/CurrencyDAO.java b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/currency/impl/CurrencyDAO.java index 20681e4bf4e..7749f914dc3 100644 --- a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/currency/impl/CurrencyDAO.java +++ b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/currency/impl/CurrencyDAO.java @@ -21,7 +21,6 @@ import org.adempiere.exceptions.AdempiereException; import org.adempiere.model.InterfaceWrapperHelper; import org.adempiere.service.ClientId; -import org.adempiere.service.OrgId; import org.adempiere.util.proxy.Cached; import org.compiere.model.IQuery; import org.compiere.model.I_C_ConversionType; @@ -39,6 +38,7 @@ import de.metas.currency.ICurrencyDAO; import de.metas.money.CurrencyConversionTypeId; import de.metas.money.CurrencyId; +import de.metas.organization.OrgId; import de.metas.util.Check; import de.metas.util.Services; import lombok.NonNull; diff --git a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/currency/impl/PlainCurrencyBL.java b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/currency/impl/PlainCurrencyBL.java index 510e55a9c8c..f55e4f43751 100644 --- a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/currency/impl/PlainCurrencyBL.java +++ b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/currency/impl/PlainCurrencyBL.java @@ -1,12 +1,12 @@ package de.metas.currency.impl; import org.adempiere.service.ClientId; -import org.adempiere.service.OrgId; import org.compiere.model.I_C_Currency; import org.compiere.util.Env; import de.metas.currency.ICurrencyDAO; import de.metas.money.CurrencyId; +import de.metas.organization.OrgId; import de.metas.util.Services; public class PlainCurrencyBL extends CurrencyBL diff --git a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/currency/impl/PlainCurrencyDAO.java b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/currency/impl/PlainCurrencyDAO.java index 004d0daf991..56c9091aeb0 100644 --- a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/currency/impl/PlainCurrencyDAO.java +++ b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/currency/impl/PlainCurrencyDAO.java @@ -8,7 +8,6 @@ import org.adempiere.ad.trx.api.ITrx; import org.adempiere.model.InterfaceWrapperHelper; import org.adempiere.service.ClientId; -import org.adempiere.service.OrgId; import org.compiere.Adempiere; import org.compiere.model.I_C_ConversionType; import org.compiere.model.I_C_ConversionType_Default; @@ -21,6 +20,7 @@ import de.metas.currency.CurrencyConversionContext; import de.metas.currency.ICurrencyDAO; import de.metas.money.CurrencyConversionTypeId; +import de.metas.organization.OrgId; /* * #%L diff --git a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/document/sequence/impl/DocumentNoBuilder.java b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/document/sequence/impl/DocumentNoBuilder.java index ad99cf8a332..d44f747f23c 100644 --- a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/document/sequence/impl/DocumentNoBuilder.java +++ b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/document/sequence/impl/DocumentNoBuilder.java @@ -35,7 +35,6 @@ import org.adempiere.ad.trx.api.ITrx; import org.adempiere.model.InterfaceWrapperHelper; import org.adempiere.service.ClientId; -import org.adempiere.service.OrgId; import org.adempiere.util.lang.IMutable; import org.adempiere.util.lang.Mutable; import org.compiere.model.I_C_DocType; @@ -60,6 +59,7 @@ import de.metas.i18n.IMsgBL; import de.metas.i18n.ITranslatableString; import de.metas.logging.LogManager; +import de.metas.organization.OrgId; import de.metas.util.Check; import de.metas.util.Services; import de.metas.util.time.SimpleDateFormatThreadLocal; diff --git a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/i18n/impl/LanguageBL.java b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/i18n/impl/LanguageBL.java index a83b9aed0c7..fa75f222c9f 100644 --- a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/i18n/impl/LanguageBL.java +++ b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/i18n/impl/LanguageBL.java @@ -3,11 +3,10 @@ import java.util.Properties; import org.adempiere.ad.trx.api.ITrx; +import org.adempiere.service.ClientId; import org.adempiere.service.IClientDAO; import org.compiere.model.I_AD_Client; -import org.compiere.model.I_AD_Org; import org.compiere.model.I_C_BPartner; -import org.compiere.model.MOrg; import org.compiere.util.Env; import de.metas.bpartner.service.IBPartnerDAO; @@ -16,6 +15,8 @@ import de.metas.i18n.ILanguageBL; import de.metas.i18n.ILanguageDAO; import de.metas.i18n.Language; +import de.metas.organization.IOrgDAO; +import de.metas.organization.OrgId; import de.metas.util.Check; import de.metas.util.Services; @@ -35,13 +36,15 @@ public String getOrgAD_Language(final Properties ctx) throws OrgHasNoBPartnerLin } @Override - public String getOrgAD_Language(final Properties ctx, final int AD_Org_ID) throws OrgHasNoBPartnerLinkException + public String getOrgAD_Language(final Properties ctx, final int orgRepoId) throws OrgHasNoBPartnerLinkException { + final OrgId orgId = OrgId.ofRepoIdOrAny(orgRepoId); + // // Check organization Language (if found); - if (AD_Org_ID > 0) + if (orgId.isRegular()) { - final I_C_BPartner bpOrg = Services.get(IBPartnerDAO.class).retrieveOrgBPartner(ctx, AD_Org_ID, I_C_BPartner.class, ITrx.TRXNAME_None); + final I_C_BPartner bpOrg = Services.get(IBPartnerDAO.class).retrieveOrgBPartner(ctx, orgId.getRepoId(), I_C_BPartner.class, ITrx.TRXNAME_None); final String orgAD_Language = bpOrg.getAD_Language(); if (orgAD_Language != null) { @@ -51,17 +54,16 @@ public String getOrgAD_Language(final Properties ctx, final int AD_Org_ID) throw // // Check client language (if found) - final int clientId; - if (AD_Org_ID > 0) + final ClientId clientId; + if (orgId.isRegular()) { - final I_AD_Org organization = MOrg.get(ctx, AD_Org_ID); - clientId = organization.getAD_Client_ID(); + clientId = Services.get(IOrgDAO.class).getClientIdByOrgId(orgId); } else // AD_Org_ID <= 0 { - clientId = Env.getAD_Client_ID(ctx); + clientId = Env.getClientId(ctx); } - final String clientAD_Language = getClientAD_Language(ctx, clientId); + final String clientAD_Language = getClientAD_Language(ctx, clientId.getRepoId()); return clientAD_Language; } diff --git a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/location/CountrySequences.java b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/location/CountrySequences.java index 5d3b4b0c44e..f826773abe6 100644 --- a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/location/CountrySequences.java +++ b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/location/CountrySequences.java @@ -2,8 +2,7 @@ import javax.annotation.Nullable; -import org.adempiere.service.OrgId; - +import de.metas.organization.OrgId; import lombok.Builder; import lombok.NonNull; import lombok.Value; diff --git a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/location/ICountryDAO.java b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/location/ICountryDAO.java index ee45e4dd1a5..c5a1339a63b 100644 --- a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/location/ICountryDAO.java +++ b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/location/ICountryDAO.java @@ -29,13 +29,13 @@ import java.util.Optional; import java.util.Properties; -import org.adempiere.service.OrgId; import org.compiere.model.I_C_Country; import org.compiere.model.I_C_Region; import org.compiere.util.Env; import de.metas.i18n.ITranslatableString; import de.metas.money.CurrencyId; +import de.metas.organization.OrgId; import de.metas.util.ISingletonService; /** diff --git a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/location/impl/AddressBuilder.java b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/location/impl/AddressBuilder.java index 36c9dc93644..3780314c591 100644 --- a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/location/impl/AddressBuilder.java +++ b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/location/impl/AddressBuilder.java @@ -33,7 +33,6 @@ import javax.annotation.Nullable; import org.adempiere.model.InterfaceWrapperHelper; -import org.adempiere.service.OrgId; import org.compiere.model.I_AD_User; import org.compiere.model.I_C_Country; import org.compiere.model.I_C_Greeting; @@ -49,6 +48,7 @@ import de.metas.location.ICountryDAO; import de.metas.location.ILocationBL; import de.metas.logging.LogManager; +import de.metas.organization.OrgId; import de.metas.util.Check; import de.metas.util.Services; import de.metas.util.StringUtils; diff --git a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/location/impl/CountryDAO.java b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/location/impl/CountryDAO.java index eb1bb266de1..ec3b1ac01dd 100644 --- a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/location/impl/CountryDAO.java +++ b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/location/impl/CountryDAO.java @@ -18,7 +18,6 @@ import org.adempiere.exceptions.AdempiereException; import org.adempiere.model.InterfaceWrapperHelper; import org.adempiere.service.IClientDAO; -import org.adempiere.service.OrgId; import org.adempiere.util.proxy.Cached; import org.compiere.model.I_AD_Client; import org.compiere.model.I_AD_Language; @@ -44,6 +43,7 @@ import de.metas.location.CountrySequences; import de.metas.location.ICountryDAO; import de.metas.money.CurrencyId; +import de.metas.organization.OrgId; import de.metas.util.Check; import de.metas.util.GuavaCollectors; import de.metas.util.Services; diff --git a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/location/impl/LocationBL.java b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/location/impl/LocationBL.java index ef444fb5cfe..2204af91647 100644 --- a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/location/impl/LocationBL.java +++ b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/location/impl/LocationBL.java @@ -5,7 +5,6 @@ import org.adempiere.ad.dao.IQueryBL; import org.adempiere.exceptions.AdempiereException; import org.adempiere.model.InterfaceWrapperHelper; -import org.adempiere.service.OrgId; import org.compiere.model.I_C_BPartner; import org.compiere.model.I_C_Country; import org.compiere.model.I_C_Location; @@ -17,6 +16,7 @@ import de.metas.location.ICountryDAO; import de.metas.location.ILocationBL; import de.metas.logging.LogManager; +import de.metas.organization.OrgId; import de.metas.util.Check; import de.metas.util.Services; import lombok.NonNull; diff --git a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/notification/NotificationSenderTemplate.java b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/notification/NotificationSenderTemplate.java index 74facdf53ea..900fe98b175 100644 --- a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/notification/NotificationSenderTemplate.java +++ b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/notification/NotificationSenderTemplate.java @@ -12,7 +12,6 @@ import org.adempiere.model.PlainContextAware; import org.adempiere.model.RecordZoomWindowFinder; import org.adempiere.service.IClientDAO; -import org.adempiere.service.OrgId; import org.adempiere.util.lang.ITableRecordReference; import org.adempiere.util.lang.impl.TableRecordReference; import org.apache.commons.lang3.StringUtils; @@ -40,6 +39,7 @@ import de.metas.notification.UserNotificationRequest.TargetViewAction; import de.metas.notification.spi.IRecordTextProvider; import de.metas.notification.spi.impl.NullRecordTextProvider; +import de.metas.organization.OrgId; import de.metas.security.IRoleDAO; import de.metas.security.RoleId; import de.metas.ui.web.WebuiURLs; diff --git a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/notification/UserNotificationsConfig.java b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/notification/UserNotificationsConfig.java index a38123db981..030f5634b12 100644 --- a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/notification/UserNotificationsConfig.java +++ b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/notification/UserNotificationsConfig.java @@ -8,11 +8,11 @@ import java.util.function.Supplier; import org.adempiere.service.ClientId; -import org.adempiere.service.OrgId; import com.google.common.collect.ImmutableList; import com.google.common.collect.Maps; +import de.metas.organization.OrgId; import de.metas.user.UserId; import de.metas.util.Check; import lombok.AccessLevel; diff --git a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/notification/impl/UserNotificationsConfigRepository.java b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/notification/impl/UserNotificationsConfigRepository.java index 6db2997ceb7..04b22f2e1b7 100644 --- a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/notification/impl/UserNotificationsConfigRepository.java +++ b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/notification/impl/UserNotificationsConfigRepository.java @@ -6,7 +6,6 @@ import org.adempiere.ad.dao.IQueryBL; import org.adempiere.exceptions.AdempiereException; import org.adempiere.service.ClientId; -import org.adempiere.service.OrgId; import org.compiere.model.I_AD_NotificationGroup; import org.compiere.model.I_AD_User_NotificationGroup; import org.compiere.model.X_AD_User_NotificationGroup; @@ -24,6 +23,7 @@ import de.metas.notification.NotificationType; import de.metas.notification.UserNotificationsConfig; import de.metas.notification.UserNotificationsGroup; +import de.metas.organization.OrgId; import de.metas.user.UserId; import de.metas.user.api.IUserDAO; import de.metas.util.Check; diff --git a/de.metas.adempiere.adempiere/base/src/main/java/org/adempiere/service/IOrgDAO.java b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/organization/IOrgDAO.java similarity index 65% rename from de.metas.adempiere.adempiere/base/src/main/java/org/adempiere/service/IOrgDAO.java rename to de.metas.adempiere.adempiere/base/src/main/java/de/metas/organization/IOrgDAO.java index 5a096ab25c5..94b54975431 100644 --- a/de.metas.adempiere.adempiere/base/src/main/java/org/adempiere/service/IOrgDAO.java +++ b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/organization/IOrgDAO.java @@ -1,7 +1,4 @@ -package org.adempiere.service; - -import static de.metas.util.Check.assumeNotEmpty; -import static de.metas.util.lang.CoalesceUtil.coalesce; +package de.metas.organization; /* * #%L @@ -31,47 +28,23 @@ import javax.annotation.Nullable; +import org.adempiere.service.ClientId; import org.adempiere.warehouse.WarehouseId; import org.compiere.model.I_AD_Org; import org.compiere.util.Env; -import de.metas.organization.OrgInfo; -import de.metas.organization.OrgInfoUpdateRequest; import de.metas.util.ISingletonService; -import lombok.Builder; import lombok.NonNull; -import lombok.Value; public interface IOrgDAO extends ISingletonService { void save(I_AD_Org orgRecord); + + ClientId getClientIdByOrgId(OrgId orgId); Optional retrieveOrgIdBy(OrgQuery orgQuery); - @Value - public static class OrgQuery - { - public static OrgQuery ofValue(@NonNull final String value) - { - return OrgQuery.builder().orgValue(value).build(); - } - - boolean outOfTrx; - boolean failIfNotExists; - String orgValue; - - @Builder - private OrgQuery( - @Nullable final Boolean outOfTrx, - @Nullable final Boolean failIfNotExists, - @NonNull final String orgValue) - { - this.outOfTrx = coalesce(outOfTrx, false); - this.failIfNotExists = coalesce(failIfNotExists, false); - this.orgValue = assumeNotEmpty(orgValue.trim(), "Parameter 'orgValue' may not be empty"); - } - } - + @Deprecated I_AD_Org retrieveOrg(Properties ctx, int adOrgId); default I_AD_Org getById(@NonNull final OrgId orgId) @@ -84,20 +57,26 @@ default I_AD_Org getById(int adOrgId) return retrieveOrg(Env.getCtx(), adOrgId); } - default I_AD_Org retrieveOrg(final int adOrgId) - { - return retrieveOrg(Env.getCtx(), adOrgId); - } - default String retrieveOrgName(final int adOrgId) { - return retrieveOrgName(OrgId.ofRepoId(adOrgId)); + return retrieveOrgName(OrgId.ofRepoIdOrNull(adOrgId)); } - default String retrieveOrgName(@NonNull final OrgId adOrgId) + default String retrieveOrgName(@Nullable final OrgId adOrgId) { - final I_AD_Org org = getById(adOrgId); - return org != null ? org.getName() : "<" + adOrgId.getRepoId() + ">"; + if(adOrgId == null) + { + return "?"; + } + else if (adOrgId.isAny()) + { + return "*"; + } + else + { + final I_AD_Org orgRecord = getById(adOrgId); + return orgRecord != null ? orgRecord.getName() : "<" + adOrgId.getRepoId() + ">"; + } } OrgInfo createOrUpdateOrgInfo(OrgInfoUpdateRequest request); diff --git a/de.metas.adempiere.adempiere/base/src/main/java/org/adempiere/service/OrgId.java b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/organization/OrgId.java similarity index 98% rename from de.metas.adempiere.adempiere/base/src/main/java/org/adempiere/service/OrgId.java rename to de.metas.adempiere.adempiere/base/src/main/java/de/metas/organization/OrgId.java index 7401a750727..e06e3f10254 100644 --- a/de.metas.adempiere.adempiere/base/src/main/java/org/adempiere/service/OrgId.java +++ b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/organization/OrgId.java @@ -1,4 +1,4 @@ -package org.adempiere.service; +package de.metas.organization; import java.util.Objects; import java.util.Optional; diff --git a/de.metas.adempiere.adempiere/base/src/main/java/org/adempiere/service/OrgIdNotFoundException.java b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/organization/OrgIdNotFoundException.java similarity index 96% rename from de.metas.adempiere.adempiere/base/src/main/java/org/adempiere/service/OrgIdNotFoundException.java rename to de.metas.adempiere.adempiere/base/src/main/java/de/metas/organization/OrgIdNotFoundException.java index 544e356d2bc..7e611ce9567 100644 --- a/de.metas.adempiere.adempiere/base/src/main/java/org/adempiere/service/OrgIdNotFoundException.java +++ b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/organization/OrgIdNotFoundException.java @@ -1,4 +1,4 @@ -package org.adempiere.service; +package de.metas.organization; import org.adempiere.exceptions.AdempiereException; diff --git a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/organization/OrgInfo.java b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/organization/OrgInfo.java index d03dea2ba6b..838ece3d130 100644 --- a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/organization/OrgInfo.java +++ b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/organization/OrgInfo.java @@ -1,7 +1,6 @@ package de.metas.organization; import org.adempiere.service.ClientId; -import org.adempiere.service.OrgId; import org.adempiere.warehouse.WarehouseId; import de.metas.bpartner.BPartnerLocationId; diff --git a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/organization/OrgInfoUpdateRequest.java b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/organization/OrgInfoUpdateRequest.java index 3fba677107a..bbf7f7edefb 100644 --- a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/organization/OrgInfoUpdateRequest.java +++ b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/organization/OrgInfoUpdateRequest.java @@ -3,7 +3,6 @@ import java.util.Optional; import java.util.OptionalInt; -import org.adempiere.service.OrgId; import org.adempiere.warehouse.WarehouseId; import de.metas.bpartner.BPartnerLocationId; diff --git a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/organization/OrgQuery.java b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/organization/OrgQuery.java new file mode 100644 index 00000000000..013b571cf0b --- /dev/null +++ b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/organization/OrgQuery.java @@ -0,0 +1,57 @@ +package de.metas.organization; + +import static de.metas.util.Check.assumeNotEmpty; +import static de.metas.util.lang.CoalesceUtil.coalesce; + +import javax.annotation.Nullable; + +import lombok.Builder; +import lombok.NonNull; +import lombok.Value; + +/* + * #%L + * de.metas.adempiere.adempiere.base + * %% + * Copyright (C) 2019 metas GmbH + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 2 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * . + * #L% + */ + + +@Value +public class OrgQuery +{ + public static OrgQuery ofValue(@NonNull final String value) + { + return OrgQuery.builder().orgValue(value).build(); + } + + boolean outOfTrx; + boolean failIfNotExists; + String orgValue; + + @Builder + private OrgQuery( + @Nullable final Boolean outOfTrx, + @Nullable final Boolean failIfNotExists, + @NonNull final String orgValue) + { + this.outOfTrx = coalesce(outOfTrx, false); + this.failIfNotExists = coalesce(failIfNotExists, false); + this.orgValue = assumeNotEmpty(orgValue.trim(), "Parameter 'orgValue' may not be empty"); + } +} \ No newline at end of file diff --git a/de.metas.adempiere.adempiere/base/src/main/java/org/adempiere/service/impl/OrgDAO.java b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/organization/impl/OrgDAO.java similarity index 86% rename from de.metas.adempiere.adempiere/base/src/main/java/org/adempiere/service/impl/OrgDAO.java rename to de.metas.adempiere.adempiere/base/src/main/java/de/metas/organization/impl/OrgDAO.java index 01c32a02fb4..cbbddb6f23e 100644 --- a/de.metas.adempiere.adempiere/base/src/main/java/org/adempiere/service/impl/OrgDAO.java +++ b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/organization/impl/OrgDAO.java @@ -1,4 +1,4 @@ -package org.adempiere.service.impl; +package de.metas.organization.impl; import static org.adempiere.model.InterfaceWrapperHelper.newInstance; import static org.adempiere.model.InterfaceWrapperHelper.saveRecord; @@ -32,11 +32,9 @@ import org.adempiere.ad.dao.IQueryBL; import org.adempiere.ad.dao.IQueryBuilder; import org.adempiere.ad.trx.api.ITrx; +import org.adempiere.exceptions.AdempiereException; import org.adempiere.model.InterfaceWrapperHelper; import org.adempiere.service.ClientId; -import org.adempiere.service.IOrgDAO; -import org.adempiere.service.OrgId; -import org.adempiere.service.OrgIdNotFoundException; import org.adempiere.util.proxy.Cached; import org.adempiere.warehouse.WarehouseId; import org.compiere.model.I_AD_Org; @@ -44,10 +42,15 @@ import org.compiere.util.Env; import de.metas.bpartner.BPartnerLocationId; +import de.metas.cache.CCache; import de.metas.cache.annotation.CacheCtx; import de.metas.calendar.CalendarId; +import de.metas.organization.IOrgDAO; +import de.metas.organization.OrgId; +import de.metas.organization.OrgIdNotFoundException; import de.metas.organization.OrgInfo; import de.metas.organization.OrgInfoUpdateRequest; +import de.metas.organization.OrgQuery; import de.metas.organization.OrgTypeId; import de.metas.organization.StoreCreditCardNumberMode; import de.metas.pricing.PricingSystemId; @@ -59,6 +62,17 @@ public class OrgDAO implements IOrgDAO { + private final CCache orgInfosCache = CCache. builder() + .tableName(I_AD_OrgInfo.Table_Name) + .build(); + + @Override + public ClientId getClientIdByOrgId(@NonNull final OrgId orgId) + { + final I_AD_Org orgRecord = getById(orgId); + return ClientId.ofRepoId(orgRecord.getAD_Client_ID()); + } + @Override public void save(@NonNull final I_AD_Org orgRecord) { @@ -127,7 +141,7 @@ record = newInstance(I_AD_OrgInfo.class); @Override public OrgInfo getOrgInfoById(final OrgId adOrgId) { - return retrieveOrgInfo(adOrgId, ITrx.TRXNAME_None); + return orgInfosCache.getOrLoad(adOrgId, k -> retrieveOrgInfo(adOrgId, ITrx.TRXNAME_None)); } @Override @@ -141,9 +155,7 @@ private OrgInfo retrieveOrgInfo(@NonNull final OrgId adOrgId, final String trxNa final I_AD_OrgInfo record = retrieveOrgInfoRecordOrNull(adOrgId, trxName); if (record == null) { - // NOTE: commented out because it fails some JUnit test in case there is not OrgInfo - // throw new AdempiereException("@NotFound@ @AD_OrgInfo@: " + adOrgId); - return null; + throw new AdempiereException("@NotFound@ @AD_OrgInfo@: " + adOrgId); } return toOrgInfo(record); @@ -193,40 +205,19 @@ private static OrgInfo toOrgInfo(final I_AD_OrgInfo record) @Override public WarehouseId getOrgWarehouseId(@NonNull final OrgId orgId) { - final OrgInfo orgInfo = getOrgInfoById(orgId); - // Check.assumeNotNull(orgInfo, "OrgInfo not null"); // NOTE: commented out because it fails some JUnit test in case there is not OrgInfo - if (orgInfo == null) - { - return null; - } - - return orgInfo.getWarehouseId(); + return getOrgInfoById(orgId).getWarehouseId(); } @Override public WarehouseId getOrgPOWarehouseId(@NonNull final OrgId orgId) { - final OrgInfo orgInfo = getOrgInfoById(orgId); - // Check.assumeNotNull(orgInfo, "OrgInfo not null"); // NOTE: commented out because it fails some JUnit test in case there is not OrgInfo - if (orgInfo == null) - { - return null; - } - - return orgInfo.getPurchaseWarehouseId(); + return getOrgInfoById(orgId).getPurchaseWarehouseId(); } @Override public WarehouseId getOrgDropshipWarehouseId(@NonNull final OrgId orgId) { - final OrgInfo orgInfo = getOrgInfoById(orgId); - // Check.assumeNotNull(orgInfo, "OrgInfo not null"); // NOTE: commented out because it fails some JUnit test in case there is not OrgInfo - if (orgInfo == null) - { - return null; - } - - return orgInfo.getDropShipWarehouseId(); + return getOrgInfoById(orgId).getDropShipWarehouseId(); } @Override diff --git a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/process/ProcessExecutor.java b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/process/ProcessExecutor.java index 36785914fb2..021b17cd9fc 100644 --- a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/process/ProcessExecutor.java +++ b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/process/ProcessExecutor.java @@ -13,7 +13,6 @@ import org.adempiere.ad.trx.api.OnTrxMissingPolicy; import org.adempiere.exceptions.AdempiereException; import org.adempiere.exceptions.DBException; -import org.adempiere.service.OrgId; import org.adempiere.util.lang.IAutoCloseable; import org.adempiere.util.lang.NullAutoCloseable; import org.compiere.model.I_AD_Rule; @@ -32,6 +31,7 @@ import de.metas.i18n.IMsgBL; // import de.metas.adempiere.form.IClientUI; import de.metas.logging.LogManager; +import de.metas.organization.OrgId; import de.metas.script.IADRuleDAO; import de.metas.script.ScriptEngineFactory; import de.metas.script.ScriptExecutor; diff --git a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/process/ProcessInfo.java b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/process/ProcessInfo.java index bcd7880d626..ea8946deac9 100644 --- a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/process/ProcessInfo.java +++ b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/process/ProcessInfo.java @@ -29,9 +29,7 @@ import org.adempiere.model.PlainContextAware; import org.adempiere.service.ClientId; import org.adempiere.service.IClientDAO; -import org.adempiere.service.IOrgDAO; import org.adempiere.service.ISysConfigBL; -import org.adempiere.service.OrgId; import org.adempiere.util.api.IRangeAwareParams; import org.adempiere.util.lang.ITableRecordReference; import org.adempiere.util.lang.impl.TableRecordReference; @@ -57,6 +55,8 @@ import de.metas.i18n.ILanguageBL; import de.metas.i18n.Language; import de.metas.logging.LogManager; +import de.metas.organization.IOrgDAO; +import de.metas.organization.OrgId; import de.metas.organization.OrgInfo; import de.metas.security.IUserRolePermissions; import de.metas.security.IUserRolePermissionsDAO; diff --git a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/security/ISecurityRule.java b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/security/ISecurityRule.java index 0000a5dc685..ff9fc6a6f3a 100644 --- a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/security/ISecurityRule.java +++ b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/security/ISecurityRule.java @@ -24,8 +24,7 @@ import java.util.Set; -import org.adempiere.service.OrgId; - +import de.metas.organization.OrgId; import de.metas.security.permissions.Access; /** diff --git a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/security/ISecurityRuleEngine.java b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/security/ISecurityRuleEngine.java index a6e402d6e53..79722e226ea 100644 --- a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/security/ISecurityRuleEngine.java +++ b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/security/ISecurityRuleEngine.java @@ -24,8 +24,7 @@ import java.util.Set; -import org.adempiere.service.OrgId; - +import de.metas.organization.OrgId; import de.metas.security.permissions.Access; import de.metas.util.ISingletonService; diff --git a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/security/IUserRolePermissions.java b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/security/IUserRolePermissions.java index 8958ced13c3..f9d08691eff 100644 --- a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/security/IUserRolePermissions.java +++ b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/security/IUserRolePermissions.java @@ -4,13 +4,13 @@ import java.util.Set; import org.adempiere.service.ClientId; -import org.adempiere.service.OrgId; import org.compiere.util.Env; import org.compiere.util.KeyNamePair; import com.google.common.base.Optional; import de.metas.document.engine.DocActionOptionsContext; +import de.metas.organization.OrgId; import de.metas.security.permissions.Access; import de.metas.security.permissions.Constraint; import de.metas.security.permissions.ElementPermission; diff --git a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/security/IUserRolePermissionsDAO.java b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/security/IUserRolePermissionsDAO.java index 54ec86f5ee4..f2dbe7379ef 100644 --- a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/security/IUserRolePermissionsDAO.java +++ b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/security/IUserRolePermissionsDAO.java @@ -6,12 +6,12 @@ import java.util.function.Predicate; import org.adempiere.service.ClientId; -import org.adempiere.service.OrgId; import org.compiere.model.I_AD_Role; import org.compiere.model.I_AD_Role_OrgAccess; import com.google.common.base.Optional; +import de.metas.organization.OrgId; import de.metas.security.impl.RolePermissionsNotFoundException; import de.metas.security.requests.CreateDocActionAccessRequest; import de.metas.security.requests.CreateFormAccessRequest; diff --git a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/security/Role.java b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/security/Role.java index 43d585e3bcf..bc2b96f1d96 100644 --- a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/security/Role.java +++ b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/security/Role.java @@ -2,9 +2,9 @@ import org.adempiere.model.tree.AdTreeId; import org.adempiere.service.ClientId; -import org.adempiere.service.OrgId; import de.metas.menu.AdMenuId; +import de.metas.organization.OrgId; import de.metas.security.permissions.Constraints; import de.metas.security.permissions.GenericPermissions; import de.metas.user.UserId; diff --git a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/security/TableAccessLevel.java b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/security/TableAccessLevel.java index dbd3a82e4a0..99d50386b7b 100644 --- a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/security/TableAccessLevel.java +++ b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/security/TableAccessLevel.java @@ -25,10 +25,11 @@ import javax.annotation.concurrent.Immutable; import org.adempiere.service.ClientId; -import org.adempiere.service.OrgId; import com.google.common.collect.ImmutableMap; +import de.metas.organization.OrgId; + /** * Table Access Level * diff --git a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/security/UserAuthToken.java b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/security/UserAuthToken.java index 201867d4739..ec838cec72e 100644 --- a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/security/UserAuthToken.java +++ b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/security/UserAuthToken.java @@ -1,8 +1,8 @@ package de.metas.security; import org.adempiere.service.ClientId; -import org.adempiere.service.OrgId; +import de.metas.organization.OrgId; import de.metas.user.UserId; import de.metas.util.Check; import lombok.Builder; diff --git a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/security/UserAuthTokenRepository.java b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/security/UserAuthTokenRepository.java index a12b67a2958..44af0d8b482 100644 --- a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/security/UserAuthTokenRepository.java +++ b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/security/UserAuthTokenRepository.java @@ -6,11 +6,11 @@ import org.adempiere.ad.dao.IQueryBL; import org.adempiere.exceptions.AdempiereException; import org.adempiere.service.ClientId; -import org.adempiere.service.OrgId; import org.compiere.model.I_AD_User_AuthToken; import org.springframework.stereotype.Repository; import de.metas.cache.CCache; +import de.metas.organization.OrgId; import de.metas.user.UserId; import de.metas.util.Check; import de.metas.util.Services; diff --git a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/security/impl/CompositeSecurityRule.java b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/security/impl/CompositeSecurityRule.java index 32336f8a347..af351cd13de 100644 --- a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/security/impl/CompositeSecurityRule.java +++ b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/security/impl/CompositeSecurityRule.java @@ -26,10 +26,10 @@ import java.util.Set; import java.util.concurrent.CopyOnWriteArrayList; -import org.adempiere.service.OrgId; import org.slf4j.Logger; import de.metas.logging.LogManager; +import de.metas.organization.OrgId; import de.metas.security.ISecurityRule; import de.metas.security.IUserRolePermissions; import de.metas.security.permissions.Access; diff --git a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/security/impl/RoleDAO.java b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/security/impl/RoleDAO.java index 0fd5e5e6869..dadc0b9f5d8 100644 --- a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/security/impl/RoleDAO.java +++ b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/security/impl/RoleDAO.java @@ -13,7 +13,6 @@ import org.adempiere.model.InterfaceWrapperHelper; import org.adempiere.model.tree.AdTreeId; import org.adempiere.service.ClientId; -import org.adempiere.service.OrgId; import org.adempiere.util.proxy.Cached; import org.compiere.model.I_AD_Role_Included; import org.compiere.model.I_AD_User_Roles; @@ -26,6 +25,7 @@ import de.metas.adempiere.model.I_AD_Role; import de.metas.cache.CCache; import de.metas.menu.AdMenuId; +import de.metas.organization.OrgId; import de.metas.security.IRoleDAO; import de.metas.security.IRolesTreeNode; import de.metas.security.IUserRolePermissions; diff --git a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/security/impl/SecurityRuleEngine.java b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/security/impl/SecurityRuleEngine.java index d3835613306..4f746f91bf0 100644 --- a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/security/impl/SecurityRuleEngine.java +++ b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/security/impl/SecurityRuleEngine.java @@ -25,8 +25,7 @@ import java.util.Set; -import org.adempiere.service.OrgId; - +import de.metas.organization.OrgId; import de.metas.security.ISecurityRule; import de.metas.security.ISecurityRuleEngine; import de.metas.security.IUserRolePermissions; diff --git a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/security/impl/UserRolePermissions.java b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/security/impl/UserRolePermissions.java index 39386ae8e68..087867d2c43 100644 --- a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/security/impl/UserRolePermissions.java +++ b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/security/impl/UserRolePermissions.java @@ -41,7 +41,6 @@ import org.adempiere.exceptions.DBException; import org.adempiere.service.ClientId; import org.adempiere.service.IRolePermLoggingBL; -import org.adempiere.service.OrgId; import org.adempiere.util.lang.impl.TableRecordReference; import org.compiere.Adempiere; import org.compiere.util.DB; @@ -62,6 +61,7 @@ import de.metas.i18n.IMsgBL; import de.metas.logging.LogManager; import de.metas.logging.MetasfreshLastError; +import de.metas.organization.OrgId; import de.metas.security.ISecurityRuleEngine; import de.metas.security.IUserRolePermissions; import de.metas.security.RoleId; diff --git a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/security/impl/UserRolePermissionsDAO.java b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/security/impl/UserRolePermissionsDAO.java index 71871844778..cca095d08ed 100644 --- a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/security/impl/UserRolePermissionsDAO.java +++ b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/security/impl/UserRolePermissionsDAO.java @@ -25,8 +25,6 @@ import org.adempiere.model.InterfaceWrapperHelper; import org.adempiere.model.tree.AdTreeId; import org.adempiere.service.ClientId; -import org.adempiere.service.IOrgDAO; -import org.adempiere.service.OrgId; import org.adempiere.util.lang.impl.TableRecordReference; import org.adempiere.util.proxy.Cached; import org.compiere.model.IQuery; @@ -66,6 +64,8 @@ import de.metas.cache.CacheMgt; import de.metas.document.DocTypeId; import de.metas.logging.LogManager; +import de.metas.organization.IOrgDAO; +import de.metas.organization.OrgId; import de.metas.process.AdProcessId; import de.metas.security.IRoleDAO; import de.metas.security.IRolesTreeNode; diff --git a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/security/model/interceptor/AD_Org.java b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/security/model/interceptor/AD_Org.java index a7854a570dc..03651aee2e8 100644 --- a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/security/model/interceptor/AD_Org.java +++ b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/security/model/interceptor/AD_Org.java @@ -3,12 +3,12 @@ import org.adempiere.ad.modelvalidator.annotations.Interceptor; import org.adempiere.ad.modelvalidator.annotations.ModelChange; import org.adempiere.service.ClientId; -import org.adempiere.service.OrgId; import org.compiere.model.I_AD_Org; import org.compiere.model.ModelValidator; import org.slf4j.Logger; import de.metas.logging.LogManager; +import de.metas.organization.OrgId; import de.metas.security.IRoleDAO; import de.metas.security.IUserRolePermissionsDAO; import de.metas.security.Role; diff --git a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/security/permissions/LoginOrgConstraint.java b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/security/permissions/LoginOrgConstraint.java index b33d9eae538..9b836824ec4 100644 --- a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/security/permissions/LoginOrgConstraint.java +++ b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/security/permissions/LoginOrgConstraint.java @@ -5,8 +5,6 @@ import javax.annotation.Nullable; import javax.annotation.concurrent.Immutable; -import org.adempiere.service.OrgId; - /* * #%L * de.metas.adempiere.adempiere.base @@ -32,6 +30,7 @@ import org.slf4j.Logger; import de.metas.logging.LogManager; +import de.metas.organization.OrgId; @Immutable public final class LoginOrgConstraint extends Constraint diff --git a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/security/permissions/OrgPermission.java b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/security/permissions/OrgPermission.java index 54c90a7b90a..37989b52149 100644 --- a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/security/permissions/OrgPermission.java +++ b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/security/permissions/OrgPermission.java @@ -28,12 +28,12 @@ import javax.annotation.concurrent.Immutable; import org.adempiere.service.ClientId; -import org.adempiere.service.OrgId; import org.adempiere.util.lang.EqualsBuilder; import org.adempiere.util.lang.HashcodeBuilder; import com.google.common.collect.ImmutableSet; +import de.metas.organization.OrgId; import de.metas.util.Check; /** diff --git a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/security/permissions/OrgPermissions.java b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/security/permissions/OrgPermissions.java index d46e569d358..b3f6e6c1d76 100644 --- a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/security/permissions/OrgPermissions.java +++ b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/security/permissions/OrgPermissions.java @@ -38,12 +38,12 @@ import org.adempiere.exceptions.DBException; import org.adempiere.model.tree.AdTreeId; import org.adempiere.service.ClientId; -import org.adempiere.service.OrgId; import org.compiere.model.MTree_Base; import org.compiere.util.DB; import com.google.common.collect.ImmutableSet; +import de.metas.organization.OrgId; import de.metas.security.permissions.PermissionsBuilder.CollisionPolicy; import de.metas.util.collections.NullPredicate; import lombok.NonNull; diff --git a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/security/permissions/OrgResource.java b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/security/permissions/OrgResource.java index 12760fe3ce4..7c2cd067088 100644 --- a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/security/permissions/OrgResource.java +++ b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/security/permissions/OrgResource.java @@ -26,8 +26,6 @@ import org.adempiere.service.ClientId; import org.adempiere.service.IClientDAO; -import org.adempiere.service.IOrgDAO; -import org.adempiere.service.OrgId; import org.adempiere.util.lang.EqualsBuilder; import org.adempiere.util.lang.HashcodeBuilder; import org.compiere.model.I_AD_Client; @@ -36,6 +34,8 @@ import com.google.common.base.Function; +import de.metas.organization.IOrgDAO; +import de.metas.organization.OrgId; import de.metas.util.Services; import lombok.NonNull; diff --git a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/security/requests/CreateDocActionAccessRequest.java b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/security/requests/CreateDocActionAccessRequest.java index 5178cd7414b..464f6b4a48d 100644 --- a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/security/requests/CreateDocActionAccessRequest.java +++ b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/security/requests/CreateDocActionAccessRequest.java @@ -1,9 +1,9 @@ package de.metas.security.requests; import org.adempiere.service.ClientId; -import org.adempiere.service.OrgId; import de.metas.document.DocTypeId; +import de.metas.organization.OrgId; import de.metas.security.RoleId; import lombok.Builder; import lombok.NonNull; diff --git a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/security/requests/CreateFormAccessRequest.java b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/security/requests/CreateFormAccessRequest.java index e171430e2a9..4178f291c3a 100644 --- a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/security/requests/CreateFormAccessRequest.java +++ b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/security/requests/CreateFormAccessRequest.java @@ -1,8 +1,8 @@ package de.metas.security.requests; import org.adempiere.service.ClientId; -import org.adempiere.service.OrgId; +import de.metas.organization.OrgId; import de.metas.security.RoleId; import lombok.Builder; import lombok.NonNull; diff --git a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/security/requests/CreateProcessAccessRequest.java b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/security/requests/CreateProcessAccessRequest.java index 2ec30cfa8e6..90218e2a44c 100644 --- a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/security/requests/CreateProcessAccessRequest.java +++ b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/security/requests/CreateProcessAccessRequest.java @@ -1,8 +1,8 @@ package de.metas.security.requests; import org.adempiere.service.ClientId; -import org.adempiere.service.OrgId; +import de.metas.organization.OrgId; import de.metas.process.AdProcessId; import de.metas.security.RoleId; import lombok.Builder; diff --git a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/security/requests/CreateTaskAccessRequest.java b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/security/requests/CreateTaskAccessRequest.java index 3eca40c2c67..89c350fe681 100644 --- a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/security/requests/CreateTaskAccessRequest.java +++ b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/security/requests/CreateTaskAccessRequest.java @@ -1,8 +1,8 @@ package de.metas.security.requests; import org.adempiere.service.ClientId; -import org.adempiere.service.OrgId; +import de.metas.organization.OrgId; import de.metas.security.RoleId; import lombok.Builder; import lombok.NonNull; diff --git a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/security/requests/CreateWindowAccessRequest.java b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/security/requests/CreateWindowAccessRequest.java index b02ca4a331f..15810137c92 100644 --- a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/security/requests/CreateWindowAccessRequest.java +++ b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/security/requests/CreateWindowAccessRequest.java @@ -2,8 +2,8 @@ import org.adempiere.ad.element.api.AdWindowId; import org.adempiere.service.ClientId; -import org.adempiere.service.OrgId; +import de.metas.organization.OrgId; import de.metas.security.RoleId; import lombok.Builder; import lombok.NonNull; diff --git a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/security/requests/CreateWorkflowAccessRequest.java b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/security/requests/CreateWorkflowAccessRequest.java index 59f72bc9403..2e29651216e 100644 --- a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/security/requests/CreateWorkflowAccessRequest.java +++ b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/security/requests/CreateWorkflowAccessRequest.java @@ -1,8 +1,8 @@ package de.metas.security.requests; import org.adempiere.service.ClientId; -import org.adempiere.service.OrgId; +import de.metas.organization.OrgId; import de.metas.security.RoleId; import lombok.Builder; import lombok.NonNull; diff --git a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/security/requests/RemoveDocActionAccessRequest.java b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/security/requests/RemoveDocActionAccessRequest.java index e50e2b61f82..36857c897b8 100644 --- a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/security/requests/RemoveDocActionAccessRequest.java +++ b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/security/requests/RemoveDocActionAccessRequest.java @@ -1,9 +1,9 @@ package de.metas.security.requests; import org.adempiere.service.ClientId; -import org.adempiere.service.OrgId; import de.metas.document.DocTypeId; +import de.metas.organization.OrgId; import de.metas.security.RoleId; import lombok.Builder; import lombok.NonNull; diff --git a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/security/requests/RemoveFormAccessRequest.java b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/security/requests/RemoveFormAccessRequest.java index 0ae044d53ba..f7c211ae175 100644 --- a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/security/requests/RemoveFormAccessRequest.java +++ b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/security/requests/RemoveFormAccessRequest.java @@ -1,8 +1,8 @@ package de.metas.security.requests; import org.adempiere.service.ClientId; -import org.adempiere.service.OrgId; +import de.metas.organization.OrgId; import de.metas.security.RoleId; import lombok.Builder; import lombok.NonNull; diff --git a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/security/requests/RemoveProcessAccessRequest.java b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/security/requests/RemoveProcessAccessRequest.java index 775b821c789..be1e16b96e5 100644 --- a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/security/requests/RemoveProcessAccessRequest.java +++ b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/security/requests/RemoveProcessAccessRequest.java @@ -1,8 +1,8 @@ package de.metas.security.requests; import org.adempiere.service.ClientId; -import org.adempiere.service.OrgId; +import de.metas.organization.OrgId; import de.metas.process.AdProcessId; import de.metas.security.RoleId; import lombok.Builder; diff --git a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/security/requests/RemoveTaskAccessRequest.java b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/security/requests/RemoveTaskAccessRequest.java index e8776b3e9d7..b8a24be3ef8 100644 --- a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/security/requests/RemoveTaskAccessRequest.java +++ b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/security/requests/RemoveTaskAccessRequest.java @@ -1,8 +1,8 @@ package de.metas.security.requests; import org.adempiere.service.ClientId; -import org.adempiere.service.OrgId; +import de.metas.organization.OrgId; import de.metas.security.RoleId; import lombok.Builder; import lombok.NonNull; diff --git a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/security/requests/RemoveWindowAccessRequest.java b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/security/requests/RemoveWindowAccessRequest.java index 71dc799a3f3..6bf38912a69 100644 --- a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/security/requests/RemoveWindowAccessRequest.java +++ b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/security/requests/RemoveWindowAccessRequest.java @@ -2,8 +2,8 @@ import org.adempiere.ad.element.api.AdWindowId; import org.adempiere.service.ClientId; -import org.adempiere.service.OrgId; +import de.metas.organization.OrgId; import de.metas.security.RoleId; import lombok.Builder; import lombok.NonNull; diff --git a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/security/requests/RemoveWorkflowAccessRequest.java b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/security/requests/RemoveWorkflowAccessRequest.java index 5fa47de7230..95c3d685490 100644 --- a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/security/requests/RemoveWorkflowAccessRequest.java +++ b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/security/requests/RemoveWorkflowAccessRequest.java @@ -1,8 +1,8 @@ package de.metas.security.requests; import org.adempiere.service.ClientId; -import org.adempiere.service.OrgId; +import de.metas.organization.OrgId; import de.metas.security.RoleId; import lombok.Builder; import lombok.NonNull; diff --git a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/tax/api/ITaxBL.java b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/tax/api/ITaxBL.java index 4cb424e9d01..a7b682079d8 100644 --- a/de.metas.adempiere.adempiere/base/src/main/java/de/metas/tax/api/ITaxBL.java +++ b/de.metas.adempiere.adempiere/base/src/main/java/de/metas/tax/api/ITaxBL.java @@ -28,7 +28,8 @@ import org.adempiere.exceptions.TaxNoExemptFoundException; import de.metas.location.CountryId; -import org.adempiere.service.OrgId; +import de.metas.organization.OrgId; + import org.adempiere.warehouse.WarehouseId; import org.compiere.model.I_C_Tax; diff --git a/de.metas.adempiere.adempiere/base/src/main/java/org/adempiere/ad/session/MFSession.java b/de.metas.adempiere.adempiere/base/src/main/java/org/adempiere/ad/session/MFSession.java index 82f00cd2646..7951bc9001c 100644 --- a/de.metas.adempiere.adempiere/base/src/main/java/org/adempiere/ad/session/MFSession.java +++ b/de.metas.adempiere.adempiere/base/src/main/java/org/adempiere/ad/session/MFSession.java @@ -10,7 +10,6 @@ import org.adempiere.model.InterfaceWrapperHelper; import org.adempiere.service.ClientId; -import org.adempiere.service.OrgId; import org.adempiere.util.LegacyAdapters; import org.compiere.model.I_AD_Session; import org.compiere.model.PO; @@ -26,6 +25,7 @@ import de.metas.hostkey.api.IHostKeyBL; import de.metas.hostkey.spi.impl.SessionRemoteHostStorage; import de.metas.logging.LogManager; +import de.metas.organization.OrgId; import de.metas.security.RoleId; import de.metas.user.UserId; import de.metas.util.Check; diff --git a/de.metas.adempiere.adempiere/base/src/main/java/org/adempiere/model/InterfaceWrapperHelper.java b/de.metas.adempiere.adempiere/base/src/main/java/org/adempiere/model/InterfaceWrapperHelper.java index 7de43e11896..150cfb9a0fe 100644 --- a/de.metas.adempiere.adempiere/base/src/main/java/org/adempiere/model/InterfaceWrapperHelper.java +++ b/de.metas.adempiere.adempiere/base/src/main/java/org/adempiere/model/InterfaceWrapperHelper.java @@ -53,7 +53,6 @@ import org.adempiere.ad.wrapper.POJOWrapper; import org.adempiere.exceptions.AdempiereException; import org.adempiere.service.ClientId; -import org.adempiere.service.OrgId; import org.adempiere.util.lang.IContextAware; import org.adempiere.util.lang.ITableRecordReference; import org.compiere.Adempiere; @@ -73,6 +72,7 @@ import de.metas.i18n.IModelTranslationMap; import de.metas.i18n.impl.NullModelTranslationMap; import de.metas.logging.LogManager; +import de.metas.organization.OrgId; import de.metas.util.Check; import de.metas.util.GuavaCollectors; import de.metas.util.NumberUtils; diff --git a/de.metas.adempiere.adempiere/base/src/main/java/org/adempiere/process/rpl/requesthandler/spi/impl/LoadPORequestHandler.java b/de.metas.adempiere.adempiere/base/src/main/java/org/adempiere/process/rpl/requesthandler/spi/impl/LoadPORequestHandler.java index a0978f0c6fd..698c1690da5 100644 --- a/de.metas.adempiere.adempiere/base/src/main/java/org/adempiere/process/rpl/requesthandler/spi/impl/LoadPORequestHandler.java +++ b/de.metas.adempiere.adempiere/base/src/main/java/org/adempiere/process/rpl/requesthandler/spi/impl/LoadPORequestHandler.java @@ -31,13 +31,13 @@ import org.adempiere.process.rpl.requesthandler.spi.ReplRequestHandlerAdapter; import org.adempiere.server.rpl.exceptions.ReplicationException; import org.adempiere.service.ClientId; -import org.adempiere.service.OrgId; import org.compiere.model.PO; import org.compiere.util.Env; import org.compiere.util.Util; import org.slf4j.Logger; import de.metas.logging.LogManager; +import de.metas.organization.OrgId; import de.metas.security.IUserRolePermissions; import de.metas.util.Services; diff --git a/de.metas.adempiere.adempiere/base/src/main/java/org/adempiere/warehouse/api/IWarehouseDAO.java b/de.metas.adempiere.adempiere/base/src/main/java/org/adempiere/warehouse/api/IWarehouseDAO.java index 801fa0ac060..70e9251f68f 100644 --- a/de.metas.adempiere.adempiere/base/src/main/java/org/adempiere/warehouse/api/IWarehouseDAO.java +++ b/de.metas.adempiere.adempiere/base/src/main/java/org/adempiere/warehouse/api/IWarehouseDAO.java @@ -28,7 +28,6 @@ import java.util.Optional; import java.util.Set; -import org.adempiere.service.OrgId; import org.adempiere.warehouse.LocatorId; import org.adempiere.warehouse.WarehouseId; import org.adempiere.warehouse.WarehousePickingGroup; @@ -38,6 +37,7 @@ import org.compiere.model.I_M_Locator; import org.compiere.model.I_M_Warehouse; +import de.metas.organization.OrgId; import de.metas.util.ISingletonService; public interface IWarehouseDAO extends ISingletonService diff --git a/de.metas.adempiere.adempiere/base/src/main/java/org/adempiere/warehouse/api/impl/WarehouseDAO.java b/de.metas.adempiere.adempiere/base/src/main/java/org/adempiere/warehouse/api/impl/WarehouseDAO.java index d5e0f017c6a..bcc00ffcef4 100644 --- a/de.metas.adempiere.adempiere/base/src/main/java/org/adempiere/warehouse/api/impl/WarehouseDAO.java +++ b/de.metas.adempiere.adempiere/base/src/main/java/org/adempiere/warehouse/api/impl/WarehouseDAO.java @@ -41,7 +41,6 @@ import org.adempiere.ad.trx.api.ITrx; import org.adempiere.exceptions.AdempiereException; import org.adempiere.model.InterfaceWrapperHelper; -import org.adempiere.service.OrgId; import org.adempiere.util.proxy.Cached; import org.adempiere.warehouse.LocatorId; import org.adempiere.warehouse.WarehouseId; @@ -65,6 +64,7 @@ import de.metas.cache.CCache; import de.metas.i18n.ITranslatableString; import de.metas.logging.LogManager; +import de.metas.organization.OrgId; import de.metas.util.Check; import de.metas.util.GuavaCollectors; import de.metas.util.Services; diff --git a/de.metas.adempiere.adempiere/base/src/test/java/de/metas/acct/AcctSchemaTestHelper.java b/de.metas.adempiere.adempiere/base/src/test/java/de/metas/acct/AcctSchemaTestHelper.java index 50772ffcc9b..445e3fd5130 100644 --- a/de.metas.adempiere.adempiere/base/src/test/java/de/metas/acct/AcctSchemaTestHelper.java +++ b/de.metas.adempiere.adempiere/base/src/test/java/de/metas/acct/AcctSchemaTestHelper.java @@ -4,7 +4,6 @@ import static org.adempiere.model.InterfaceWrapperHelper.saveRecord; import org.adempiere.service.ClientId; -import org.adempiere.service.OrgId; import org.compiere.model.I_C_AcctSchema; import org.compiere.model.I_C_AcctSchema_Default; import org.compiere.model.I_C_AcctSchema_GL; @@ -19,6 +18,7 @@ import de.metas.costing.CostingLevel; import de.metas.costing.CostingMethod; import de.metas.logging.LogManager; +import de.metas.organization.OrgId; import de.metas.util.Services; import lombok.Builder; import lombok.NonNull; diff --git a/de.metas.adempiere.adempiere/base/src/test/java/de/metas/bpartner/service/impl/BPartnerDAOTest.java b/de.metas.adempiere.adempiere/base/src/test/java/de/metas/bpartner/service/impl/BPartnerDAOTest.java index 40248b52cfe..f83a4a4a32b 100644 --- a/de.metas.adempiere.adempiere/base/src/test/java/de/metas/bpartner/service/impl/BPartnerDAOTest.java +++ b/de.metas.adempiere.adempiere/base/src/test/java/de/metas/bpartner/service/impl/BPartnerDAOTest.java @@ -7,7 +7,6 @@ import java.util.Map; -import org.adempiere.service.OrgId; import org.adempiere.test.AdempiereTestHelper; import org.assertj.core.api.AbstractComparableAssert; import org.compiere.model.I_C_BP_Group; @@ -18,6 +17,7 @@ import de.metas.bpartner.BPartnerId; import de.metas.bpartner.BPartnerType; import de.metas.bpartner.service.BPartnerQuery; +import de.metas.organization.OrgId; /* * #%L diff --git a/de.metas.adempiere.adempiere/base/src/test/java/de/metas/costing/CostingLevelTest.java b/de.metas.adempiere.adempiere/base/src/test/java/de/metas/costing/CostingLevelTest.java index 68ff21b6729..68f786a371f 100644 --- a/de.metas.adempiere.adempiere/base/src/test/java/de/metas/costing/CostingLevelTest.java +++ b/de.metas.adempiere.adempiere/base/src/test/java/de/metas/costing/CostingLevelTest.java @@ -2,10 +2,11 @@ import org.adempiere.exceptions.AdempiereException; import org.adempiere.mm.attributes.AttributeSetInstanceId; -import org.adempiere.service.OrgId; import org.junit.Assert; import org.junit.Test; +import de.metas.organization.OrgId; + /* * #%L * de.metas.adempiere.adempiere.base diff --git a/de.metas.adempiere.adempiere/base/src/test/java/de/metas/location/impl/AddressBuilderTest.java b/de.metas.adempiere.adempiere/base/src/test/java/de/metas/location/impl/AddressBuilderTest.java index 6128f188d02..c1a66627164 100644 --- a/de.metas.adempiere.adempiere/base/src/test/java/de/metas/location/impl/AddressBuilderTest.java +++ b/de.metas.adempiere.adempiere/base/src/test/java/de/metas/location/impl/AddressBuilderTest.java @@ -2,7 +2,6 @@ import org.adempiere.ad.trx.api.ITrx; import org.adempiere.model.InterfaceWrapperHelper; -import org.adempiere.service.OrgId; import org.adempiere.test.AdempiereTestHelper; import org.compiere.model.I_AD_Org; import org.compiere.model.I_C_BPartner_Location; @@ -20,6 +19,7 @@ import de.metas.bpartner.service.IBPartnerBL; import de.metas.bpartner.service.impl.BPartnerBL; import de.metas.interfaces.I_C_BPartner; +import de.metas.organization.OrgId; import de.metas.user.UserRepository; public class AddressBuilderTest diff --git a/de.metas.adempiere.adempiere/base/src/test/java/org/adempiere/service/impl/OrgDAOTest.java b/de.metas.adempiere.adempiere/base/src/test/java/de/metas/organization/impl/OrgDAOTest.java similarity index 91% rename from de.metas.adempiere.adempiere/base/src/test/java/org/adempiere/service/impl/OrgDAOTest.java rename to de.metas.adempiere.adempiere/base/src/test/java/de/metas/organization/impl/OrgDAOTest.java index d2ecb0ca825..4b157944db6 100644 --- a/de.metas.adempiere.adempiere/base/src/test/java/org/adempiere/service/impl/OrgDAOTest.java +++ b/de.metas.adempiere.adempiere/base/src/test/java/de/metas/organization/impl/OrgDAOTest.java @@ -1,18 +1,20 @@ -package org.adempiere.service.impl; +package de.metas.organization.impl; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertThrows; import java.util.Optional; -import org.adempiere.service.IOrgDAO.OrgQuery; -import org.adempiere.service.OrgId; -import org.adempiere.service.OrgIdNotFoundException; import org.adempiere.test.AdempiereTestHelper; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; +import de.metas.organization.OrgId; +import de.metas.organization.OrgIdNotFoundException; +import de.metas.organization.OrgQuery; +import de.metas.organization.impl.OrgDAO; + /* * #%L * de.metas.adempiere.adempiere.base diff --git a/de.metas.adempiere.adempiere/base/src/test/java/de/metas/security/impl/CompositeSecurityRuleTest.java b/de.metas.adempiere.adempiere/base/src/test/java/de/metas/security/impl/CompositeSecurityRuleTest.java index 919988f3b96..5f30781921b 100644 --- a/de.metas.adempiere.adempiere/base/src/test/java/de/metas/security/impl/CompositeSecurityRuleTest.java +++ b/de.metas.adempiere.adempiere/base/src/test/java/de/metas/security/impl/CompositeSecurityRuleTest.java @@ -26,12 +26,12 @@ import java.util.Properties; import java.util.Set; -import org.adempiere.service.OrgId; import org.adempiere.test.AdempiereTestHelper; import org.junit.Assert; import org.junit.Before; import org.junit.Test; +import de.metas.organization.OrgId; import de.metas.security.IUserRolePermissions; import de.metas.security.permissions.Access; import mockit.Mocked; diff --git a/de.metas.adempiere.adempiere/base/src/test/java/org/adempiere/service/OrgIdTest.java b/de.metas.adempiere.adempiere/base/src/test/java/org/adempiere/service/OrgIdTest.java index 524be8df203..fa0d3ef7dd9 100644 --- a/de.metas.adempiere.adempiere/base/src/test/java/org/adempiere/service/OrgIdTest.java +++ b/de.metas.adempiere.adempiere/base/src/test/java/org/adempiere/service/OrgIdTest.java @@ -5,6 +5,8 @@ import org.junit.Test; +import de.metas.organization.OrgId; + /* * #%L * de.metas.adempiere.adempiere.base diff --git a/de.metas.adempiere.adempiere/client/src/main/java-legacy/org/compiere/acct/AcctViewerData.java b/de.metas.adempiere.adempiere/client/src/main/java-legacy/org/compiere/acct/AcctViewerData.java index 36a426ab1ba..17dd091f79b 100644 --- a/de.metas.adempiere.adempiere/client/src/main/java-legacy/org/compiere/acct/AcctViewerData.java +++ b/de.metas.adempiere.adempiere/client/src/main/java-legacy/org/compiere/acct/AcctViewerData.java @@ -32,7 +32,6 @@ import org.adempiere.acct.api.IFactAcctBL; import org.adempiere.ad.trx.api.ITrx; import org.adempiere.service.ClientId; -import org.adempiere.service.OrgId; import org.compiere.model.I_Fact_Acct; import org.compiere.model.MLookupFactory; import org.compiere.model.MLookupFactory.LanguageInfo; @@ -56,6 +55,7 @@ import de.metas.acct.api.IAcctSchemaDAO; import de.metas.i18n.IMsgBL; import de.metas.logging.LogManager; +import de.metas.organization.OrgId; import de.metas.util.Check; import de.metas.util.Services; import de.metas.util.StringUtils; diff --git a/de.metas.adempiere.adempiere/client/src/main/java-legacy/org/compiere/grid/VSortTab.java b/de.metas.adempiere.adempiere/client/src/main/java-legacy/org/compiere/grid/VSortTab.java index 1c1b52f4ed2..fbd5c9ac41e 100644 --- a/de.metas.adempiere.adempiere/client/src/main/java-legacy/org/compiere/grid/VSortTab.java +++ b/de.metas.adempiere.adempiere/client/src/main/java-legacy/org/compiere/grid/VSortTab.java @@ -58,7 +58,6 @@ import org.adempiere.exceptions.DBException; import org.adempiere.images.Images; import org.adempiere.service.ClientId; -import org.adempiere.service.OrgId; import org.compiere.apps.ADialog; import org.compiere.apps.APanel; import org.compiere.model.GridTabVO; @@ -76,6 +75,7 @@ import de.metas.i18n.IMsgBL; import de.metas.logging.LogManager; +import de.metas.organization.OrgId; import de.metas.util.Check; import de.metas.util.Services; diff --git a/de.metas.adempiere.adempiere/serverRoot/de.metas.adempiere.adempiere.serverRoot.base/src/main/java-legacy/org/compiere/server/Scheduler.java b/de.metas.adempiere.adempiere/serverRoot/de.metas.adempiere.adempiere.serverRoot.base/src/main/java-legacy/org/compiere/server/Scheduler.java index 64368bbadef..88c6b2c52e4 100644 --- a/de.metas.adempiere.adempiere/serverRoot/de.metas.adempiere.adempiere.serverRoot.base/src/main/java-legacy/org/compiere/server/Scheduler.java +++ b/de.metas.adempiere.adempiere/serverRoot/de.metas.adempiere.adempiere.serverRoot.base/src/main/java-legacy/org/compiere/server/Scheduler.java @@ -29,9 +29,7 @@ import org.adempiere.model.InterfaceWrapperHelper; import org.adempiere.service.ClientId; import org.adempiere.service.IClientDAO; -import org.adempiere.service.IOrgDAO; import org.adempiere.service.ISysConfigBL; -import org.adempiere.service.OrgId; import org.adempiere.util.lang.IAutoCloseable; import org.adempiere.util.lang.Mutable; import org.adempiere.util.lang.impl.TableRecordReference; @@ -64,6 +62,8 @@ import de.metas.notification.INotificationBL; import de.metas.notification.UserNotificationRequest; import de.metas.notification.UserNotificationRequest.TargetRecordAction; +import de.metas.organization.IOrgDAO; +import de.metas.organization.OrgId; import de.metas.organization.OrgInfo; import de.metas.process.PInstanceId; import de.metas.process.ProcessExecutionResult; diff --git a/de.metas.adempiere.adempiere/serverRoot/de.metas.adempiere.adempiere.serverRoot.base/src/main/java-legacy/org/compiere/server/WorkflowProcessor.java b/de.metas.adempiere.adempiere/serverRoot/de.metas.adempiere.adempiere.serverRoot.base/src/main/java-legacy/org/compiere/server/WorkflowProcessor.java index 9efb4a77853..7948e213ec4 100644 --- a/de.metas.adempiere.adempiere/serverRoot/de.metas.adempiere.adempiere.serverRoot.base/src/main/java-legacy/org/compiere/server/WorkflowProcessor.java +++ b/de.metas.adempiere.adempiere/serverRoot/de.metas.adempiere.adempiere.serverRoot.base/src/main/java-legacy/org/compiere/server/WorkflowProcessor.java @@ -24,8 +24,6 @@ import java.util.ArrayList; import java.util.Set; -import org.adempiere.service.IOrgDAO; -import org.adempiere.service.OrgId; import org.compiere.model.MClient; import org.compiere.model.PO; import org.compiere.process.StateEngine; @@ -41,6 +39,8 @@ import de.metas.document.engine.IDocument; import de.metas.document.engine.IDocumentBL; import de.metas.i18n.Msg; +import de.metas.organization.IOrgDAO; +import de.metas.organization.OrgId; import de.metas.organization.OrgInfo; import de.metas.security.IRoleDAO; import de.metas.security.RoleId; diff --git a/de.metas.adempiere.libero.libero/src/main/java/org/eevolution/api/impl/CreatePPOrderCostsCommand.java b/de.metas.adempiere.libero.libero/src/main/java/org/eevolution/api/impl/CreatePPOrderCostsCommand.java index 350aa89ae00..9c2daa695cf 100644 --- a/de.metas.adempiere.libero.libero/src/main/java/org/eevolution/api/impl/CreatePPOrderCostsCommand.java +++ b/de.metas.adempiere.libero.libero/src/main/java/org/eevolution/api/impl/CreatePPOrderCostsCommand.java @@ -9,7 +9,6 @@ import org.adempiere.mm.attributes.AttributeSetInstanceId; import org.adempiere.service.ClientId; -import org.adempiere.service.OrgId; import org.compiere.Adempiere; import org.eevolution.api.BOMComponentType; import org.eevolution.api.IPPOrderBL; @@ -45,6 +44,7 @@ import de.metas.material.planning.pporder.IPPOrderBOMDAO; import de.metas.material.planning.pporder.PPOrderId; import de.metas.money.CurrencyId; +import de.metas.organization.OrgId; import de.metas.product.ProductId; import de.metas.product.ResourceId; import de.metas.quantity.Quantity; diff --git a/de.metas.adempiere.libero.libero/src/main/java/org/eevolution/api/impl/PPOrderCostDAO.java b/de.metas.adempiere.libero.libero/src/main/java/org/eevolution/api/impl/PPOrderCostDAO.java index cbe654147e3..07bfdef4fc7 100644 --- a/de.metas.adempiere.libero.libero/src/main/java/org/eevolution/api/impl/PPOrderCostDAO.java +++ b/de.metas.adempiere.libero.libero/src/main/java/org/eevolution/api/impl/PPOrderCostDAO.java @@ -14,7 +14,6 @@ import org.adempiere.mm.attributes.AttributeSetInstanceId; import org.adempiere.model.InterfaceWrapperHelper; import org.adempiere.service.ClientId; -import org.adempiere.service.OrgId; import org.eevolution.api.IPPOrderCostDAO; import org.eevolution.api.PPOrderCost; import org.eevolution.api.PPOrderCostId; @@ -36,6 +35,7 @@ import de.metas.costing.IProductCostingBL; import de.metas.material.planning.pporder.PPOrderId; import de.metas.money.CurrencyId; +import de.metas.organization.OrgId; import de.metas.product.ProductId; import de.metas.util.GuavaCollectors; import de.metas.util.Services; diff --git a/de.metas.adempiere.libero.libero/src/main/java/org/eevolution/callout/PP_Order.java b/de.metas.adempiere.libero.libero/src/main/java/org/eevolution/callout/PP_Order.java index 3ad93feb1a7..b47568adb6f 100644 --- a/de.metas.adempiere.libero.libero/src/main/java/org/eevolution/callout/PP_Order.java +++ b/de.metas.adempiere.libero.libero/src/main/java/org/eevolution/callout/PP_Order.java @@ -30,7 +30,6 @@ import org.adempiere.ad.callout.annotations.CalloutMethod; import org.adempiere.mm.attributes.AttributeSetInstanceId; import org.adempiere.model.InterfaceWrapperHelper; -import org.adempiere.service.OrgId; import org.adempiere.warehouse.LocatorId; import org.adempiere.warehouse.WarehouseId; import org.adempiere.warehouse.api.IWarehouseBL; @@ -48,6 +47,7 @@ import de.metas.material.planning.IProductPlanningDAO.ProductPlanningQuery; import de.metas.material.planning.pporder.IPPRoutingRepository; import de.metas.material.planning.pporder.PPRoutingId; +import de.metas.organization.OrgId; import de.metas.product.IProductBL; import de.metas.product.ProductId; import de.metas.product.ResourceId; diff --git a/de.metas.adempiere.libero.libero/src/main/java/org/eevolution/costing/BatchProcessBOMCostCalculatorRepository.java b/de.metas.adempiere.libero.libero/src/main/java/org/eevolution/costing/BatchProcessBOMCostCalculatorRepository.java index 10d58521546..05b2775720c 100644 --- a/de.metas.adempiere.libero.libero/src/main/java/org/eevolution/costing/BatchProcessBOMCostCalculatorRepository.java +++ b/de.metas.adempiere.libero.libero/src/main/java/org/eevolution/costing/BatchProcessBOMCostCalculatorRepository.java @@ -9,7 +9,6 @@ import org.adempiere.mm.attributes.AttributeSetInstanceId; import org.adempiere.service.ClientId; -import org.adempiere.service.OrgId; import org.compiere.Adempiere; import org.eevolution.api.BOMComponentType; import org.eevolution.api.IProductBOMBL; @@ -32,6 +31,7 @@ import de.metas.costing.IProductCostingBL; import de.metas.material.planning.IProductPlanningDAO; import de.metas.material.planning.IProductPlanningDAO.ProductPlanningQuery; +import de.metas.organization.OrgId; import de.metas.product.IProductBL; import de.metas.product.ProductId; import de.metas.util.GuavaCollectors; diff --git a/de.metas.adempiere.libero.libero/src/main/java/org/eevolution/costing/OrderBOMCostCalculatorRepository.java b/de.metas.adempiere.libero.libero/src/main/java/org/eevolution/costing/OrderBOMCostCalculatorRepository.java index 42904c2130a..8a7266da7a9 100644 --- a/de.metas.adempiere.libero.libero/src/main/java/org/eevolution/costing/OrderBOMCostCalculatorRepository.java +++ b/de.metas.adempiere.libero.libero/src/main/java/org/eevolution/costing/OrderBOMCostCalculatorRepository.java @@ -8,7 +8,6 @@ import org.adempiere.exceptions.AdempiereException; import org.adempiere.mm.attributes.AttributeSetInstanceId; import org.adempiere.service.ClientId; -import org.adempiere.service.OrgId; import org.eevolution.api.BOMComponentType; import org.eevolution.api.IPPOrderCostBL; import org.eevolution.api.PPOrderCost; @@ -27,6 +26,7 @@ import de.metas.material.planning.pporder.IPPOrderBOMBL; import de.metas.material.planning.pporder.IPPOrderBOMDAO; import de.metas.material.planning.pporder.PPOrderId; +import de.metas.organization.OrgId; import de.metas.product.ProductId; import de.metas.quantity.Quantity; import de.metas.util.Check; diff --git a/de.metas.adempiere.libero.libero/src/main/java/org/eevolution/drp/process/DD_Order_GenerateRawMaterialsReturn.java b/de.metas.adempiere.libero.libero/src/main/java/org/eevolution/drp/process/DD_Order_GenerateRawMaterialsReturn.java index 363576d5845..067636614e0 100644 --- a/de.metas.adempiere.libero.libero/src/main/java/org/eevolution/drp/process/DD_Order_GenerateRawMaterialsReturn.java +++ b/de.metas.adempiere.libero.libero/src/main/java/org/eevolution/drp/process/DD_Order_GenerateRawMaterialsReturn.java @@ -36,7 +36,6 @@ import org.adempiere.mm.attributes.api.PlainAttributeSetInstanceAware; import org.adempiere.model.InterfaceWrapperHelper; import org.adempiere.model.PlainContextAware; -import org.adempiere.service.OrgId; import org.adempiere.util.lang.IContextAware; import org.adempiere.warehouse.WarehouseId; import org.compiere.model.I_C_UOM; @@ -59,6 +58,7 @@ import de.metas.document.IDocTypeDAO; import de.metas.document.engine.IDocument; import de.metas.document.engine.IDocumentBL; +import de.metas.organization.OrgId; import de.metas.process.JavaProcess; import de.metas.process.ProcessInfoParameter; import de.metas.product.ProductId; diff --git a/de.metas.adempiere.libero.libero/src/main/java/org/eevolution/drp/process/RawMaterialsReturnDDOrderLineCandidate.java b/de.metas.adempiere.libero.libero/src/main/java/org/eevolution/drp/process/RawMaterialsReturnDDOrderLineCandidate.java index bbbde62ffad..c156df0caa0 100644 --- a/de.metas.adempiere.libero.libero/src/main/java/org/eevolution/drp/process/RawMaterialsReturnDDOrderLineCandidate.java +++ b/de.metas.adempiere.libero.libero/src/main/java/org/eevolution/drp/process/RawMaterialsReturnDDOrderLineCandidate.java @@ -30,7 +30,6 @@ import org.adempiere.mm.attributes.AttributeSetInstanceId; import org.adempiere.mm.attributes.api.IAttributeSetInstanceAware; -import org.adempiere.service.OrgId; import org.adempiere.warehouse.WarehouseId; import org.adempiere.warehouse.api.IWarehouseBL; import org.adempiere.warehouse.api.IWarehouseDAO; @@ -48,6 +47,7 @@ import de.metas.material.planning.IProductPlanningDAO.ProductPlanningQuery; import de.metas.material.planning.ddorder.IDistributionNetworkDAO; import de.metas.material.planning.exception.NoPlantForWarehouseException; +import de.metas.organization.OrgId; import de.metas.product.IProductBL; import de.metas.product.ProductId; import de.metas.product.ResourceId; diff --git a/de.metas.adempiere.libero.libero/src/main/java/org/eevolution/mrp/api/impl/MRPDAO.java b/de.metas.adempiere.libero.libero/src/main/java/org/eevolution/mrp/api/impl/MRPDAO.java index 84d4702d7ed..81f2ed3a68f 100644 --- a/de.metas.adempiere.libero.libero/src/main/java/org/eevolution/mrp/api/impl/MRPDAO.java +++ b/de.metas.adempiere.libero.libero/src/main/java/org/eevolution/mrp/api/impl/MRPDAO.java @@ -36,7 +36,6 @@ import org.adempiere.ad.dao.IQueryBuilder; import org.adempiere.ad.trx.api.ITrx; import org.adempiere.model.InterfaceWrapperHelper; -import org.adempiere.service.IOrgDAO; import org.adempiere.util.lang.IContextAware; import org.adempiere.util.trxConstraints.api.ITrxConstraintsBL; import org.compiere.model.I_AD_Org; @@ -61,6 +60,7 @@ import de.metas.logging.LogManager; import de.metas.material.planning.IMRPSegment; import de.metas.material.planning.IResourceDAO; +import de.metas.organization.IOrgDAO; import de.metas.util.Check; import de.metas.util.Services; import lombok.NonNull; @@ -382,7 +382,7 @@ private final List retrieveMRPSegments(final IQueryBuilder 0) { - adOrg = orgDAO.retrieveOrg(ctx, adOrgId); + adOrg = orgDAO.getById(adOrgId); } final Integer warehouseId = (Integer)mrpSegmentValues.get(I_PP_MRP.COLUMNNAME_M_Warehouse_ID); diff --git a/de.metas.adempiere.libero.libero/src/main/java/org/eevolution/mrp/api/impl/MRPSegmentBL.java b/de.metas.adempiere.libero.libero/src/main/java/org/eevolution/mrp/api/impl/MRPSegmentBL.java index 76fcf68160f..f2e4018cc9c 100644 --- a/de.metas.adempiere.libero.libero/src/main/java/org/eevolution/mrp/api/impl/MRPSegmentBL.java +++ b/de.metas.adempiere.libero.libero/src/main/java/org/eevolution/mrp/api/impl/MRPSegmentBL.java @@ -34,7 +34,6 @@ import org.adempiere.ad.dao.IQueryBL; import org.adempiere.ad.trx.api.ITrx; -import org.adempiere.service.IOrgDAO; import org.compiere.model.I_AD_Org; import org.compiere.model.I_M_Product; import org.compiere.model.I_M_Warehouse; @@ -48,6 +47,7 @@ import de.metas.material.planning.IResourceDAO; import de.metas.material.planning.ddorder.IDistributionNetworkDAO; import de.metas.material.planning.pporder.LiberoException; +import de.metas.organization.IOrgDAO; import de.metas.util.Check; import de.metas.util.Services; diff --git a/de.metas.adempiere.libero.libero/src/main/java/org/eevolution/mrp/spi/impl/ddorder/DDOrderProducer.java b/de.metas.adempiere.libero.libero/src/main/java/org/eevolution/mrp/spi/impl/ddorder/DDOrderProducer.java index dc62b05920e..5d1641b8782 100644 --- a/de.metas.adempiere.libero.libero/src/main/java/org/eevolution/mrp/spi/impl/ddorder/DDOrderProducer.java +++ b/de.metas.adempiere.libero.libero/src/main/java/org/eevolution/mrp/spi/impl/ddorder/DDOrderProducer.java @@ -6,7 +6,6 @@ import java.sql.Timestamp; import java.util.Date; import java.util.List; -import java.util.Properties; import javax.annotation.Nullable; @@ -14,11 +13,9 @@ import org.adempiere.ad.trx.api.ITrx; import org.adempiere.mm.attributes.api.ASICopy; import org.adempiere.model.InterfaceWrapperHelper; -import org.adempiere.service.IOrgDAO; -import org.adempiere.service.OrgId; +import org.adempiere.service.ClientId; import org.adempiere.warehouse.WarehouseId; import org.adempiere.warehouse.api.IWarehouseBL; -import org.compiere.model.I_AD_Org; import org.compiere.model.I_C_UOM; import org.compiere.model.I_M_AttributeSetInstance; import org.compiere.model.I_M_Locator; @@ -47,6 +44,8 @@ import de.metas.material.event.ddorder.DDOrder; import de.metas.material.event.ddorder.DDOrderLine; import de.metas.material.planning.ddorder.DDOrderUtil; +import de.metas.organization.IOrgDAO; +import de.metas.organization.OrgId; import de.metas.util.Services; import lombok.NonNull; @@ -121,7 +120,7 @@ private I_DD_Order createDDOrder( ddOrderRecord.setAD_User_ID(productPlanning.getPlanner_ID()); // FIXME: improve performances/cache and retrive Primary BP's User ddOrderRecord.setSalesRep_ID(productPlanning.getPlanner_ID()); - ddOrderRecord.setC_DocType_ID(getC_DocType_ID(pojo.getOrgId())); + ddOrderRecord.setC_DocType_ID(getC_DocType_ID(OrgId.ofRepoId(pojo.getOrgId()))); final WarehouseId inTransitWarehouseId = DDOrderUtil.retrieveInTransitWarehouseId(OrgId.ofRepoId(pojo.getOrgId())); ddOrderRecord.setM_Warehouse_ID(inTransitWarehouseId.getRepoId()); @@ -263,14 +262,12 @@ private void createDD_OrderLine_Alternative( ddOrdersRepo.save(ddOrderLineAlt); } - private int getC_DocType_ID(final int orgId) + private int getC_DocType_ID(final OrgId orgId) { - final Properties ctx = Env.getCtx(); - final IOrgDAO orgDAO = Services.get(IOrgDAO.class); - final I_AD_Org org = orgDAO.retrieveOrg(ctx, orgId); + final ClientId clientId = orgDAO.getClientIdByOrgId(orgId); final IDocTypeDAO docTypeDAO = Services.get(IDocTypeDAO.class); - return docTypeDAO.getDocTypeId(ctx, X_C_DocType.DOCBASETYPE_ManufacturingOrder, org.getAD_Client_ID(), orgId, ITrx.TRXNAME_None); + return docTypeDAO.getDocTypeId(Env.getCtx(), X_C_DocType.DOCBASETYPE_ManufacturingOrder, clientId.getRepoId(), orgId.getRepoId(), ITrx.TRXNAME_None); } } diff --git a/de.metas.adempiere.libero.libero/src/main/java/org/eevolution/mrp/spi/impl/pporder/PPOrderProducer.java b/de.metas.adempiere.libero.libero/src/main/java/org/eevolution/mrp/spi/impl/pporder/PPOrderProducer.java index 3f7f6455f7f..f66cc3db94a 100644 --- a/de.metas.adempiere.libero.libero/src/main/java/org/eevolution/mrp/spi/impl/pporder/PPOrderProducer.java +++ b/de.metas.adempiere.libero.libero/src/main/java/org/eevolution/mrp/spi/impl/pporder/PPOrderProducer.java @@ -6,12 +6,10 @@ import java.math.BigDecimal; import java.sql.Timestamp; import java.util.Date; -import java.util.Properties; import org.adempiere.ad.trx.api.ITrx; import org.adempiere.model.InterfaceWrapperHelper; -import org.adempiere.service.IOrgDAO; -import org.compiere.model.I_AD_Org; +import org.adempiere.service.ClientId; import org.compiere.model.I_M_Product; import org.compiere.model.X_C_DocType; import org.compiere.util.Env; @@ -28,6 +26,8 @@ import de.metas.material.event.commons.ProductDescriptor; import de.metas.material.event.pporder.PPOrder; import de.metas.material.planning.pporder.PPOrderPojoConverter; +import de.metas.organization.IOrgDAO; +import de.metas.organization.OrgId; import de.metas.util.Services; import lombok.NonNull; @@ -85,7 +85,7 @@ public I_PP_Order createPPOrder( // // Document Type & Status - final int docTypeId = getC_DocType_ID(ppOrderPojo.getOrgId()); + final int docTypeId = getC_DocType_ID(OrgId.ofRepoId(ppOrderPojo.getOrgId())); ppOrderRecord.setC_DocTypeTarget_ID(docTypeId); ppOrderRecord.setC_DocType_ID(docTypeId); @@ -147,14 +147,12 @@ else if (ppOrderPojo.getOrderLineId() > 0) return ppOrderRecord; } - private int getC_DocType_ID(final int orgId) + private int getC_DocType_ID(final OrgId orgId) { - final Properties ctx = Env.getCtx(); - final IOrgDAO orgDAO = Services.get(IOrgDAO.class); - final I_AD_Org org = orgDAO.retrieveOrg(ctx, orgId); + final ClientId clientId = orgDAO.getClientIdByOrgId(orgId); final IDocTypeDAO docTypeDAO = Services.get(IDocTypeDAO.class); - return docTypeDAO.getDocTypeId(ctx, X_C_DocType.DOCBASETYPE_ManufacturingOrder, org.getAD_Client_ID(), orgId, ITrx.TRXNAME_None); + return docTypeDAO.getDocTypeId(Env.getCtx(), X_C_DocType.DOCBASETYPE_ManufacturingOrder, clientId.getRepoId(), orgId.getRepoId(), ITrx.TRXNAME_None); } } diff --git a/de.metas.adempiere.libero.libero/src/main/java/org/eevolution/process/CopyPriceToStandard.java b/de.metas.adempiere.libero.libero/src/main/java/org/eevolution/process/CopyPriceToStandard.java index 190299fdecf..82274f1ac17 100644 --- a/de.metas.adempiere.libero.libero/src/main/java/org/eevolution/process/CopyPriceToStandard.java +++ b/de.metas.adempiere.libero.libero/src/main/java/org/eevolution/process/CopyPriceToStandard.java @@ -49,7 +49,6 @@ import org.adempiere.mm.attributes.AttributeSetInstanceId; import org.adempiere.model.InterfaceWrapperHelper; import org.adempiere.service.ClientId; -import org.adempiere.service.OrgId; import org.compiere.Adempiere; import org.compiere.model.IQuery; import org.compiere.model.I_M_Cost; @@ -71,6 +70,7 @@ import de.metas.costing.IProductCostingBL; import de.metas.currency.ICurrencyBL; import de.metas.material.planning.pporder.LiberoException; +import de.metas.organization.OrgId; import de.metas.pricing.service.IPriceListDAO; import de.metas.process.JavaProcess; import de.metas.process.ProcessInfoParameter; diff --git a/de.metas.adempiere.libero.libero/src/main/java/org/eevolution/process/CreateCostElement.java b/de.metas.adempiere.libero.libero/src/main/java/org/eevolution/process/CreateCostElement.java index 332d68e55ea..b9590bc9ebe 100644 --- a/de.metas.adempiere.libero.libero/src/main/java/org/eevolution/process/CreateCostElement.java +++ b/de.metas.adempiere.libero.libero/src/main/java/org/eevolution/process/CreateCostElement.java @@ -47,7 +47,6 @@ import org.adempiere.ad.dao.IQueryBuilder; import org.adempiere.mm.attributes.AttributeSetInstanceId; import org.adempiere.service.ClientId; -import org.adempiere.service.OrgId; import org.compiere.Adempiere; import org.compiere.model.I_AD_Org; import org.compiere.model.I_M_Cost; @@ -65,6 +64,7 @@ import de.metas.costing.CostingLevel; import de.metas.costing.ICurrentCostsRepository; import de.metas.costing.IProductCostingBL; +import de.metas.organization.OrgId; import de.metas.process.JavaProcess; import de.metas.process.ProcessInfoParameter; import de.metas.product.ProductId; diff --git a/de.metas.adempiere.libero.libero/src/main/java/org/eevolution/process/RollupBillOfMaterial.java b/de.metas.adempiere.libero.libero/src/main/java/org/eevolution/process/RollupBillOfMaterial.java index fe46069abd2..cc86fa12cf3 100644 --- a/de.metas.adempiere.libero.libero/src/main/java/org/eevolution/process/RollupBillOfMaterial.java +++ b/de.metas.adempiere.libero.libero/src/main/java/org/eevolution/process/RollupBillOfMaterial.java @@ -22,7 +22,6 @@ import org.adempiere.ad.dao.IQueryBL; import org.adempiere.ad.dao.IQueryBuilder; import org.adempiere.service.ClientId; -import org.adempiere.service.OrgId; import org.compiere.model.I_M_Cost; import org.compiere.model.I_M_CostElement; import org.compiere.model.I_M_Product; @@ -34,6 +33,7 @@ import de.metas.acct.api.IAcctSchemaDAO; import de.metas.costing.CostTypeId; import de.metas.costing.CostingMethod; +import de.metas.organization.OrgId; import de.metas.process.JavaProcess; import de.metas.process.ProcessInfoParameter; import de.metas.product.ProductCategoryId; diff --git a/de.metas.adempiere.libero.libero/src/main/java/org/eevolution/process/RollupWorkflow.java b/de.metas.adempiere.libero.libero/src/main/java/org/eevolution/process/RollupWorkflow.java index efe4972d90d..1888fc50c6a 100644 --- a/de.metas.adempiere.libero.libero/src/main/java/org/eevolution/process/RollupWorkflow.java +++ b/de.metas.adempiere.libero.libero/src/main/java/org/eevolution/process/RollupWorkflow.java @@ -32,7 +32,6 @@ import org.adempiere.ad.dao.IQueryBuilder; import org.adempiere.mm.attributes.AttributeSetInstanceId; import org.adempiere.service.ClientId; -import org.adempiere.service.OrgId; import org.compiere.Adempiere; import org.compiere.model.I_M_Cost; import org.compiere.model.I_M_CostElement; @@ -69,6 +68,7 @@ import de.metas.material.planning.pporder.PPRoutingActivityId; import de.metas.material.planning.pporder.PPRoutingChangeRequest; import de.metas.material.planning.pporder.PPRoutingId; +import de.metas.organization.OrgId; import de.metas.process.JavaProcess; import de.metas.process.ProcessInfoParameter; import de.metas.product.ProductCategoryId; diff --git a/de.metas.adempiere.libero.libero/src/test/java/org/eevolution/api/PPOrderCostsTest.java b/de.metas.adempiere.libero.libero/src/test/java/org/eevolution/api/PPOrderCostsTest.java index ac891eddcd3..1b0771c230d 100644 --- a/de.metas.adempiere.libero.libero/src/test/java/org/eevolution/api/PPOrderCostsTest.java +++ b/de.metas.adempiere.libero.libero/src/test/java/org/eevolution/api/PPOrderCostsTest.java @@ -6,7 +6,6 @@ import org.adempiere.mm.attributes.AttributeSetInstanceId; import org.adempiere.service.ClientId; -import org.adempiere.service.OrgId; import org.assertj.core.api.AbstractBigDecimalAssert; import org.junit.Test; @@ -20,6 +19,7 @@ import de.metas.currency.CurrencyPrecision; import de.metas.material.planning.pporder.PPOrderId; import de.metas.money.CurrencyId; +import de.metas.organization.OrgId; import de.metas.product.ProductId; import de.metas.util.lang.Percent; import lombok.NonNull; diff --git a/de.metas.async/src/main/java/de/metas/async/api/impl/WorkPackageQueue.java b/de.metas.async/src/main/java/de/metas/async/api/impl/WorkPackageQueue.java index 05ba5b9bb64..5ccf994dee1 100644 --- a/de.metas.async/src/main/java/de/metas/async/api/impl/WorkPackageQueue.java +++ b/de.metas.async/src/main/java/de/metas/async/api/impl/WorkPackageQueue.java @@ -39,7 +39,6 @@ import org.adempiere.model.InterfaceWrapperHelper; import org.adempiere.service.ClientId; import org.adempiere.service.ISysConfigBL; -import org.adempiere.service.OrgId; import org.compiere.model.IQuery; import org.compiere.model.I_AD_User; import org.compiere.util.Env; @@ -69,6 +68,7 @@ import de.metas.lock.api.ILockManager; import de.metas.lock.exceptions.UnlockFailedException; import de.metas.logging.LogManager; +import de.metas.organization.OrgId; import de.metas.security.IUserRolePermissions; import de.metas.security.IUserRolePermissionsDAO; import de.metas.security.RoleId; diff --git a/de.metas.banking/de.metas.banking.base/src/main/java-legacy/org/compiere/acct/DocLine_BankStatement.java b/de.metas.banking/de.metas.banking.base/src/main/java-legacy/org/compiere/acct/DocLine_BankStatement.java index 4f6e8fdf4d9..2136c56c132 100644 --- a/de.metas.banking/de.metas.banking.base/src/main/java-legacy/org/compiere/acct/DocLine_BankStatement.java +++ b/de.metas.banking/de.metas.banking.base/src/main/java-legacy/org/compiere/acct/DocLine_BankStatement.java @@ -21,7 +21,6 @@ import org.adempiere.ad.trx.api.ITrx; import org.adempiere.model.InterfaceWrapperHelper; -import org.adempiere.service.OrgId; import org.compiere.model.I_C_BankStatementLine; import org.compiere.model.I_C_Payment; import org.compiere.model.MPeriod; @@ -38,6 +37,7 @@ import de.metas.currency.ICurrencyBL; import de.metas.currency.ICurrencyDAO; import de.metas.money.CurrencyConversionTypeId; +import de.metas.organization.OrgId; import de.metas.util.Services; /** diff --git a/de.metas.banking/de.metas.banking.base/src/main/java-legacy/org/compiere/acct/Doc_BankStatement.java b/de.metas.banking/de.metas.banking.base/src/main/java-legacy/org/compiere/acct/Doc_BankStatement.java index 48521e3800c..d46fcaa1544 100644 --- a/de.metas.banking/de.metas.banking.base/src/main/java-legacy/org/compiere/acct/Doc_BankStatement.java +++ b/de.metas.banking/de.metas.banking.base/src/main/java-legacy/org/compiere/acct/Doc_BankStatement.java @@ -20,7 +20,6 @@ import java.util.ArrayList; import java.util.List; -import org.adempiere.service.OrgId; import org.compiere.acct.Fact.FactLineBuilder; import org.compiere.model.I_C_BP_BankAccount; import org.compiere.model.MAccount; @@ -35,6 +34,7 @@ import de.metas.banking.service.IBankStatementDAO; import de.metas.bpartner.BPartnerId; import de.metas.money.CurrencyId; +import de.metas.organization.OrgId; import de.metas.util.Check; import de.metas.util.Services; diff --git a/de.metas.business.rest-api-impl/src/main/java/de/metas/rest_api/bpartner/impl/BPartnerMasterDataContext.java b/de.metas.business.rest-api-impl/src/main/java/de/metas/rest_api/bpartner/impl/BPartnerMasterDataContext.java index f476bada70c..b10ca10c3d2 100644 --- a/de.metas.business.rest-api-impl/src/main/java/de/metas/rest_api/bpartner/impl/BPartnerMasterDataContext.java +++ b/de.metas.business.rest-api-impl/src/main/java/de/metas/rest_api/bpartner/impl/BPartnerMasterDataContext.java @@ -2,11 +2,10 @@ import javax.annotation.Nullable; -import org.adempiere.service.OrgId; - import de.metas.bpartner.BPartnerContactId; import de.metas.bpartner.BPartnerId; import de.metas.bpartner.BPartnerLocationId; +import de.metas.organization.OrgId; import lombok.Builder; import lombok.NonNull; import lombok.Value; diff --git a/de.metas.business.rest-api-impl/src/main/java/de/metas/rest_api/bpartner/impl/bpartnercomposite/JsonPersisterService.java b/de.metas.business.rest-api-impl/src/main/java/de/metas/rest_api/bpartner/impl/bpartnercomposite/JsonPersisterService.java index 621c27fd62f..a92a2d1cd24 100644 --- a/de.metas.business.rest-api-impl/src/main/java/de/metas/rest_api/bpartner/impl/bpartnercomposite/JsonPersisterService.java +++ b/de.metas.business.rest-api-impl/src/main/java/de/metas/rest_api/bpartner/impl/bpartnercomposite/JsonPersisterService.java @@ -3,15 +3,13 @@ import static de.metas.util.Check.assumeNotEmpty; import static de.metas.util.Check.isEmpty; import static de.metas.util.lang.CoalesceUtil.coalesce; + import java.util.Collection; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Optional; -import org.adempiere.service.IOrgDAO; -import org.adempiere.service.IOrgDAO.OrgQuery; -import org.adempiere.service.OrgId; import org.compiere.util.Env; import de.metas.bpartner.BPGroup; @@ -29,6 +27,9 @@ import de.metas.bpartner.composite.BPartnerContactQuery.BPartnerContactQueryBuilder; import de.metas.bpartner.composite.BPartnerLocation; import de.metas.i18n.Language; +import de.metas.organization.IOrgDAO; +import de.metas.organization.OrgId; +import de.metas.organization.OrgQuery; import de.metas.rest_api.MetasfreshId; import de.metas.rest_api.SyncAdvise; import de.metas.rest_api.SyncAdvise.IfExists; @@ -44,12 +45,12 @@ import de.metas.rest_api.bpartner.request.JsonResponseUpsert.JsonResponseUpsertBuilder; import de.metas.rest_api.bpartner.request.JsonResponseUpsertItem; import de.metas.rest_api.utils.IdentifierString; +import de.metas.rest_api.utils.IdentifierString.Type; import de.metas.rest_api.utils.InvalidIdentifierException; import de.metas.rest_api.utils.JsonConverters; import de.metas.rest_api.utils.JsonExternalIds; import de.metas.rest_api.utils.MissingPropertyException; import de.metas.rest_api.utils.MissingResourceException; -import de.metas.rest_api.utils.IdentifierString.Type; import de.metas.user.UserId; import de.metas.util.Services; import de.metas.util.rest.ExternalId; diff --git a/de.metas.business.rest-api-impl/src/main/java/de/metas/rest_api/bpartner/impl/bpartnercomposite/JsonRetrieverService.java b/de.metas.business.rest-api-impl/src/main/java/de/metas/rest_api/bpartner/impl/bpartnercomposite/JsonRetrieverService.java index d10b18dd80e..d7b77d64922 100644 --- a/de.metas.business.rest-api-impl/src/main/java/de/metas/rest_api/bpartner/impl/bpartnercomposite/JsonRetrieverService.java +++ b/de.metas.business.rest-api-impl/src/main/java/de/metas/rest_api/bpartner/impl/bpartnercomposite/JsonRetrieverService.java @@ -14,7 +14,6 @@ import org.adempiere.ad.table.RecordChangeLogEntry; import org.adempiere.ad.table.RecordChangeLogRepository; import org.adempiere.exceptions.AdempiereException; -import org.adempiere.service.OrgId; import org.compiere.util.Env; import com.google.common.annotations.VisibleForTesting; @@ -40,6 +39,7 @@ import de.metas.dao.selection.pagination.QueryResultPage; import de.metas.dao.selection.pagination.UnknownPageIdentifierException; import de.metas.i18n.Language; +import de.metas.organization.OrgId; import de.metas.rest_api.JsonExternalId; import de.metas.rest_api.MetasfreshId; import de.metas.rest_api.bpartner.response.JsonResponseBPartner; diff --git a/de.metas.business.rest-api-impl/src/main/java/de/metas/rest_api/invoice/impl/SalesInvoicePaymentStatusRepository.java b/de.metas.business.rest-api-impl/src/main/java/de/metas/rest_api/invoice/impl/SalesInvoicePaymentStatusRepository.java index 3b2b17aa83f..859e1bb5cae 100644 --- a/de.metas.business.rest-api-impl/src/main/java/de/metas/rest_api/invoice/impl/SalesInvoicePaymentStatusRepository.java +++ b/de.metas.business.rest-api-impl/src/main/java/de/metas/rest_api/invoice/impl/SalesInvoicePaymentStatusRepository.java @@ -15,10 +15,6 @@ import org.adempiere.ad.dao.IQueryBuilder; import org.adempiere.ad.dao.impl.CompareQueryFilter.Operator; import org.adempiere.invoice.service.IInvoiceBL; -import org.adempiere.service.IOrgDAO; -import org.adempiere.service.IOrgDAO.OrgQuery; -import org.adempiere.service.OrgId; -import org.adempiere.service.OrgIdNotFoundException; import org.compiere.model.IQuery; import org.compiere.model.I_C_BPartner; import org.compiere.model.I_C_BPartner_Location; @@ -31,6 +27,10 @@ import de.metas.allocation.api.IAllocationDAO; import de.metas.document.engine.IDocument; +import de.metas.organization.IOrgDAO; +import de.metas.organization.OrgId; +import de.metas.organization.OrgIdNotFoundException; +import de.metas.organization.OrgQuery; import de.metas.rest_api.invoice.SalesInvoicePayment; import de.metas.rest_api.invoice.SalesInvoicePaymentStatus; import de.metas.rest_api.invoice.SalesInvoicePaymentStatus.SalesInvoicePaymentStatusBuilder; diff --git a/de.metas.business.rest-api-impl/src/main/java/de/metas/rest_api/invoice/impl/SalesInvoicePaymentStatusRestController.java b/de.metas.business.rest-api-impl/src/main/java/de/metas/rest_api/invoice/impl/SalesInvoicePaymentStatusRestController.java index 6f83611c1f0..b1418c433f3 100644 --- a/de.metas.business.rest-api-impl/src/main/java/de/metas/rest_api/invoice/impl/SalesInvoicePaymentStatusRestController.java +++ b/de.metas.business.rest-api-impl/src/main/java/de/metas/rest_api/invoice/impl/SalesInvoicePaymentStatusRestController.java @@ -2,7 +2,6 @@ import java.time.LocalDate; -import org.adempiere.service.OrgIdNotFoundException; import org.springframework.context.annotation.Profile; import org.springframework.format.annotation.DateTimeFormat; import org.springframework.http.HttpStatus; @@ -16,6 +15,7 @@ import com.google.common.collect.ImmutableList; import de.metas.Profiles; +import de.metas.organization.OrgIdNotFoundException; import de.metas.rest_api.invoice.SalesInvoicePaymentStatus; import de.metas.rest_api.invoice.SalesInvoicePaymentStatusResponse; import de.metas.rest_api.invoice.impl.SalesInvoicePaymentStatusRepository.PaymentStatusQuery; diff --git a/de.metas.business.rest-api-impl/src/main/java/de/metas/rest_api/order/impl/SalesOrderRestController.java b/de.metas.business.rest-api-impl/src/main/java/de/metas/rest_api/order/impl/SalesOrderRestController.java index cf2cd0b72e2..1d1b46fcfaa 100644 --- a/de.metas.business.rest-api-impl/src/main/java/de/metas/rest_api/order/impl/SalesOrderRestController.java +++ b/de.metas.business.rest-api-impl/src/main/java/de/metas/rest_api/order/impl/SalesOrderRestController.java @@ -6,7 +6,6 @@ import org.adempiere.ad.trx.api.ITrx; import org.adempiere.ad.trx.api.ITrxManager; import org.adempiere.exceptions.AdempiereException; -import org.adempiere.service.OrgId; import org.adempiere.util.lang.impl.TableRecordReference; import org.compiere.model.I_C_Order; import org.compiere.model.I_C_UOM; @@ -34,6 +33,7 @@ import de.metas.document.DocTypeQuery; import de.metas.document.IDocTypeDAO; import de.metas.order.OrderFactory; +import de.metas.organization.OrgId; import de.metas.product.IProductBL; import de.metas.product.IProductDAO; import de.metas.product.ProductId; diff --git a/de.metas.business.rest-api-impl/src/main/java/de/metas/rest_api/ordercandidates/impl/BPartnerMasterDataProvider.java b/de.metas.business.rest-api-impl/src/main/java/de/metas/rest_api/ordercandidates/impl/BPartnerMasterDataProvider.java index c6071476924..06c37df72c2 100644 --- a/de.metas.business.rest-api-impl/src/main/java/de/metas/rest_api/ordercandidates/impl/BPartnerMasterDataProvider.java +++ b/de.metas.business.rest-api-impl/src/main/java/de/metas/rest_api/ordercandidates/impl/BPartnerMasterDataProvider.java @@ -12,8 +12,6 @@ import javax.annotation.Nullable; -import org.adempiere.service.IOrgDAO; -import org.adempiere.service.OrgId; import org.compiere.model.I_AD_User; import org.compiere.model.I_C_BPartner; import org.compiere.model.I_C_BPartner_Location; @@ -33,6 +31,8 @@ import de.metas.location.CountryId; import de.metas.location.ICountryDAO; import de.metas.location.ILocationDAO; +import de.metas.organization.IOrgDAO; +import de.metas.organization.OrgId; import de.metas.organization.OrgInfoUpdateRequest; import de.metas.rest_api.JsonExternalId; import de.metas.rest_api.SyncAdvise; diff --git a/de.metas.business.rest-api-impl/src/main/java/de/metas/rest_api/ordercandidates/impl/JsonConverters.java b/de.metas.business.rest-api-impl/src/main/java/de/metas/rest_api/ordercandidates/impl/JsonConverters.java index 8c13e24a463..79c2234685f 100644 --- a/de.metas.business.rest-api-impl/src/main/java/de/metas/rest_api/ordercandidates/impl/JsonConverters.java +++ b/de.metas.business.rest-api-impl/src/main/java/de/metas/rest_api/ordercandidates/impl/JsonConverters.java @@ -3,7 +3,6 @@ import java.util.List; import org.adempiere.exceptions.AdempiereException; -import org.adempiere.service.OrgId; import org.compiere.util.TimeUtil; import org.springframework.stereotype.Service; @@ -17,6 +16,7 @@ import de.metas.ordercandidate.api.OLCand; import de.metas.ordercandidate.api.OLCandCreateRequest; import de.metas.ordercandidate.api.OLCandCreateRequest.OLCandCreateRequestBuilder; +import de.metas.organization.OrgId; import de.metas.pricing.PricingSystemId; import de.metas.rest_api.ordercandidates.JsonBPartnerInfo; import de.metas.rest_api.ordercandidates.JsonOLCand; diff --git a/de.metas.business.rest-api-impl/src/main/java/de/metas/rest_api/ordercandidates/impl/MasterdataProvider.java b/de.metas.business.rest-api-impl/src/main/java/de/metas/rest_api/ordercandidates/impl/MasterdataProvider.java index 0d89629006e..151f08fdf2e 100644 --- a/de.metas.business.rest-api-impl/src/main/java/de/metas/rest_api/ordercandidates/impl/MasterdataProvider.java +++ b/de.metas.business.rest-api-impl/src/main/java/de/metas/rest_api/ordercandidates/impl/MasterdataProvider.java @@ -11,9 +11,6 @@ import javax.annotation.Nullable; -import org.adempiere.service.IOrgDAO; -import org.adempiere.service.IOrgDAO.OrgQuery; -import org.adempiere.service.OrgId; import org.compiere.model.I_AD_Org; import org.compiere.model.I_C_Currency; import org.compiere.util.Env; @@ -26,6 +23,9 @@ import de.metas.document.IDocTypeDAO; import de.metas.money.CurrencyId; import de.metas.ordercandidate.model.I_C_OLCand; +import de.metas.organization.IOrgDAO; +import de.metas.organization.OrgId; +import de.metas.organization.OrgQuery; import de.metas.pricing.PricingSystemId; import de.metas.pricing.service.IPriceListDAO; import de.metas.rest_api.SyncAdvise; @@ -185,7 +185,7 @@ private void updateOrgRecord(@NonNull final I_AD_Org orgRecord, @NonNull final J public JsonOrganization getJsonOrganizationById(final int orgId) { - final I_AD_Org orgRecord = orgsRepo.retrieveOrg(orgId); + final I_AD_Org orgRecord = orgsRepo.getById(orgId); if (orgRecord == null) { return null; @@ -205,7 +205,7 @@ public DocTypeId getDocTypeId( invoiceDocType.getDocSubType(), DocTypeQuery.DOCSUBTYPE_NONE); - final I_AD_Org orgRecord = orgsRepo.retrieveOrg(orgId.getRepoId()); + final I_AD_Org orgRecord = orgsRepo.getById(orgId); final DocTypeQuery query = DocTypeQuery .builder() diff --git a/de.metas.business.rest-api-impl/src/main/java/de/metas/rest_api/ordercandidates/impl/OrderCandidatesRestControllerImpl.java b/de.metas.business.rest-api-impl/src/main/java/de/metas/rest_api/ordercandidates/impl/OrderCandidatesRestControllerImpl.java index d42ac56b97e..d345f9d9cc7 100644 --- a/de.metas.business.rest-api-impl/src/main/java/de/metas/rest_api/ordercandidates/impl/OrderCandidatesRestControllerImpl.java +++ b/de.metas.business.rest-api-impl/src/main/java/de/metas/rest_api/ordercandidates/impl/OrderCandidatesRestControllerImpl.java @@ -8,7 +8,6 @@ import javax.annotation.Nullable; import org.adempiere.ad.trx.api.ITrxManager; -import org.adempiere.service.OrgId; import org.springframework.context.annotation.Profile; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -34,6 +33,7 @@ import de.metas.ordercandidate.api.OLCandCreateRequest; import de.metas.ordercandidate.api.OLCandQuery; import de.metas.ordercandidate.api.OLCandRepository; +import de.metas.organization.OrgId; import de.metas.rest_api.attachment.JsonAttachmentType; import de.metas.rest_api.ordercandidates.JsonAttachment; import de.metas.rest_api.ordercandidates.JsonOLCand; diff --git a/de.metas.business.rest-api-impl/src/main/java/de/metas/rest_api/product/impl/ProductMasterDataContext.java b/de.metas.business.rest-api-impl/src/main/java/de/metas/rest_api/product/impl/ProductMasterDataContext.java index cf3e37cfb16..06b1ce3fca2 100644 --- a/de.metas.business.rest-api-impl/src/main/java/de/metas/rest_api/product/impl/ProductMasterDataContext.java +++ b/de.metas.business.rest-api-impl/src/main/java/de/metas/rest_api/product/impl/ProductMasterDataContext.java @@ -1,7 +1,6 @@ package de.metas.rest_api.product.impl; -import org.adempiere.service.OrgId; - +import de.metas.organization.OrgId; import lombok.Builder; import lombok.NonNull; import lombok.Value; diff --git a/de.metas.business.rest-api-impl/src/main/java/de/metas/rest_api/product/impl/ProductMasterDataProvider.java b/de.metas.business.rest-api-impl/src/main/java/de/metas/rest_api/product/impl/ProductMasterDataProvider.java index 5229ba3a968..42080c8166a 100644 --- a/de.metas.business.rest-api-impl/src/main/java/de/metas/rest_api/product/impl/ProductMasterDataProvider.java +++ b/de.metas.business.rest-api-impl/src/main/java/de/metas/rest_api/product/impl/ProductMasterDataProvider.java @@ -9,11 +9,11 @@ import javax.annotation.Nullable; -import org.adempiere.service.OrgId; import org.compiere.model.I_M_Product; import org.compiere.model.X_M_Product; import de.metas.cache.CCache; +import de.metas.organization.OrgId; import de.metas.product.IProductBL; import de.metas.product.IProductDAO; import de.metas.product.IProductDAO.ProductQuery; diff --git a/de.metas.business.rest-api-impl/src/main/java/de/metas/rest_api/utils/PermissionService.java b/de.metas.business.rest-api-impl/src/main/java/de/metas/rest_api/utils/PermissionService.java index 47d476616d7..308ac71379d 100644 --- a/de.metas.business.rest-api-impl/src/main/java/de/metas/rest_api/utils/PermissionService.java +++ b/de.metas.business.rest-api-impl/src/main/java/de/metas/rest_api/utils/PermissionService.java @@ -13,9 +13,9 @@ import javax.annotation.Nullable; -import org.adempiere.service.OrgId; import org.compiere.util.Env; +import de.metas.organization.OrgId; import de.metas.security.IUserRolePermissions; import de.metas.security.IUserRolePermissionsDAO; import de.metas.security.UserRolePermissionsKey; diff --git a/de.metas.business.rest-api-impl/src/test/java/de/metas/rest_api/ordercandidates/impl/BPartnerMasterDataProviderTest.java b/de.metas.business.rest-api-impl/src/test/java/de/metas/rest_api/ordercandidates/impl/BPartnerMasterDataProviderTest.java index 793607473dd..d28bf82868e 100644 --- a/de.metas.business.rest-api-impl/src/test/java/de/metas/rest_api/ordercandidates/impl/BPartnerMasterDataProviderTest.java +++ b/de.metas.business.rest-api-impl/src/test/java/de/metas/rest_api/ordercandidates/impl/BPartnerMasterDataProviderTest.java @@ -9,7 +9,6 @@ import java.util.List; import org.adempiere.ad.wrapper.POJOLookupMap; -import org.adempiere.service.OrgId; import org.adempiere.test.AdempiereTestHelper; import org.adempiere.test.AdempiereTestWatcher; import org.compiere.model.I_AD_User; @@ -27,6 +26,7 @@ import de.metas.bpartner.BPartnerLocationId; import de.metas.bpartner.service.BPartnerIdNotFoundException; import de.metas.bpartner.service.BPartnerInfo; +import de.metas.organization.OrgId; import de.metas.rest_api.JsonExternalId; import de.metas.rest_api.SyncAdvise; import de.metas.rest_api.SyncAdvise.IfExists; diff --git a/de.metas.business.rest-api-impl/src/test/java/de/metas/rest_api/ordercandidates/impl/MasterdataProviderTest.java b/de.metas.business.rest-api-impl/src/test/java/de/metas/rest_api/ordercandidates/impl/MasterdataProviderTest.java index 44df8300e2a..7eaa692b0da 100644 --- a/de.metas.business.rest-api-impl/src/test/java/de/metas/rest_api/ordercandidates/impl/MasterdataProviderTest.java +++ b/de.metas.business.rest-api-impl/src/test/java/de/metas/rest_api/ordercandidates/impl/MasterdataProviderTest.java @@ -8,8 +8,6 @@ import static org.assertj.core.api.Assertions.assertThat; import org.adempiere.ad.trx.api.ITrx; -import org.adempiere.service.IOrgDAO; -import org.adempiere.service.OrgId; import org.adempiere.test.AdempiereTestHelper; import org.compiere.model.I_AD_Org; import org.compiere.model.I_C_BPartner; @@ -24,6 +22,8 @@ import org.mockito.MockitoAnnotations; import de.metas.bpartner.service.IBPartnerDAO; +import de.metas.organization.IOrgDAO; +import de.metas.organization.OrgId; import de.metas.organization.OrgInfo; import de.metas.rest_api.JsonExternalId; import de.metas.rest_api.SyncAdvise; diff --git a/de.metas.business/src/main/java-legacy/org/compiere/model/MCash.java b/de.metas.business/src/main/java-legacy/org/compiere/model/MCash.java index bf20bd0ba3f..1a358f1efe4 100644 --- a/de.metas.business/src/main/java-legacy/org/compiere/model/MCash.java +++ b/de.metas.business/src/main/java-legacy/org/compiere/model/MCash.java @@ -38,6 +38,7 @@ import de.metas.i18n.Msg; import de.metas.logging.LogManager; import de.metas.logging.MetasfreshLastError; +import de.metas.organization.IOrgDAO; import de.metas.util.Services; /** @@ -90,7 +91,9 @@ public static MCash get (Properties ctx, int AD_Org_ID, ; if (retValue != null) + { return retValue; + } // Get CashBook MCashBook cb = MCashBook.get (ctx, AD_Org_ID, C_Currency_ID); @@ -127,7 +130,9 @@ public static MCash get (Properties ctx, int C_CashBook_ID, ; if (retValue != null) + { return retValue; + } // Get CashBook MCashBook cb = new MCashBook (ctx, C_CashBook_ID, trxName); @@ -168,8 +173,10 @@ public MCash (Properties ctx, int C_Cash_ID, String trxName) Timestamp today = TimeUtil.getDay(System.currentTimeMillis()); setStatementDate (today); // @#Date@ setDateAcct (today); // @#Date@ + + final String orgName = Services.get(IOrgDAO.class).retrieveOrgName(getAD_Org_ID()); String name = DisplayType.getDateFormat(DisplayType.Date).format(today) - + " " + MOrg.get(ctx, getAD_Org_ID()).getValue(); + + " " + orgName; setName (name); setIsApproved(false); setPosted (false); // N @@ -244,7 +251,9 @@ public MCashLine[] getLines (boolean requery) public MCashBook getCashBook() { if (m_book == null) + { m_book = MCashBook.get(getCtx(), getC_CashBook_ID()); + } return m_book; } // getCashBook @@ -370,7 +379,9 @@ public String prepareIt() log.info(toString()); m_processMsg = ModelValidationEngine.get().fireDocValidate(this, ModelValidator.TIMING_BEFORE_PREPARE); if (m_processMsg != null) + { return IDocument.STATUS_Invalid; + } // Std Period open? if (!MPeriod.isOpen(getCtx(), getDateAcct(), MDocType.DOCBASETYPE_CashJournal, getAD_Org_ID())) @@ -391,9 +402,13 @@ public String prepareIt() { MCashLine line = line2; if (!line.isActive()) + { continue; + } if (C_Currency_ID == line.getC_Currency_ID()) + { difference = difference.add(line.getAmount()); + } else { BigDecimal amt = Services.get(ICurrencyBL.class).convert(getCtx(), line.getAmount(), @@ -412,11 +427,15 @@ public String prepareIt() m_processMsg = ModelValidationEngine.get().fireDocValidate(this, ModelValidator.TIMING_AFTER_PREPARE); if (m_processMsg != null) + { return IDocument.STATUS_Invalid; + } m_justPrepared = true; if (!DOCACTION_Complete.equals(getDocAction())) + { setDocAction(DOCACTION_Complete); + } return IDocument.STATUS_InProgress; } // prepareIt @@ -456,17 +475,23 @@ public String completeIt() { String status = prepareIt(); if (!IDocument.STATUS_InProgress.equals(status)) + { return status; + } } m_processMsg = ModelValidationEngine.get().fireDocValidate(this, ModelValidator.TIMING_BEFORE_COMPLETE); if (m_processMsg != null) + { return IDocument.STATUS_Invalid; + } // Implicit Approval if (!isApproved()) + { approveIt(); + } // log.debug("Completed: {}", this); @@ -585,7 +610,9 @@ public boolean voidIt() // Before Void m_processMsg = ModelValidationEngine.get().fireDocValidate(this,ModelValidator.TIMING_BEFORE_VOID); if (m_processMsg != null) + { return false; + } //FR [ 1866214 ] boolean retValue = reverseIt(); @@ -594,7 +621,9 @@ public boolean voidIt() // After Void m_processMsg = ModelValidationEngine.get().fireDocValidate(this,ModelValidator.TIMING_AFTER_VOID); if (m_processMsg != null) + { return false; + } setDocAction(DOCACTION_None); } @@ -620,7 +649,9 @@ private boolean reverseIt() // Can we delete posting if (!MPeriod.isOpen(getCtx(), this.getDateAcct(), X_C_DocType.DOCBASETYPE_CashJournal, getAD_Org_ID())) + { throw new IllegalStateException("@PeriodClosed@"); + } // Reverse Allocations MAllocationHdr[] allocations = MAllocationHdr.getOfCash(getCtx(), getC_Cash_ID(), get_TrxName()); @@ -628,7 +659,9 @@ private boolean reverseIt() { allocation.reverseCorrectIt(); if(!allocation.save()) + { throw new IllegalStateException("Cannot reverse allocations"); + } } MCashLine[] cashlines = getLines(true); @@ -646,7 +679,9 @@ private boolean reverseIt() if (MCashLine.CASHTYPE_BankAccountTransfer.equals(cashline.getCashType())) { if (cashline.getC_Payment_ID() == 0) + { throw new IllegalStateException("Cannot reverse payment"); + } MPayment payment = new MPayment(getCtx(), cashline.getC_Payment_ID(),get_TrxName()); payment.reverseCorrectIt(); @@ -677,9 +712,13 @@ public void addDescription (String description) { String desc = getDescription(); if (desc == null) + { setDescription(description); + } else + { setDescription(desc + " | " + description); + } } // addDescription /** @@ -694,11 +733,15 @@ public boolean closeIt() // Before Close m_processMsg = ModelValidationEngine.get().fireDocValidate(this,ModelValidator.TIMING_BEFORE_CLOSE); if (m_processMsg != null) + { return false; + } // After Close m_processMsg = ModelValidationEngine.get().fireDocValidate(this,ModelValidator.TIMING_AFTER_CLOSE); if (m_processMsg != null) + { return false; + } setDocAction(DOCACTION_None); return true; @@ -715,7 +758,9 @@ public boolean reverseCorrectIt() // Before reverseCorrect m_processMsg = ModelValidationEngine.get().fireDocValidate(this,ModelValidator.TIMING_BEFORE_REVERSECORRECT); if (m_processMsg != null) + { return false; + } //FR [ 1866214 ] boolean retValue = reverseIt(); @@ -724,7 +769,9 @@ public boolean reverseCorrectIt() // After reverseCorrect m_processMsg = ModelValidationEngine.get().fireDocValidate(this,ModelValidator.TIMING_AFTER_REVERSECORRECT); if (m_processMsg != null) + { return false; + } } return retValue; @@ -741,12 +788,16 @@ public boolean reverseAccrualIt() // Before reverseAccrual m_processMsg = ModelValidationEngine.get().fireDocValidate(this,ModelValidator.TIMING_BEFORE_REVERSEACCRUAL); if (m_processMsg != null) + { return false; + } // After reverseAccrual m_processMsg = ModelValidationEngine.get().fireDocValidate(this,ModelValidator.TIMING_AFTER_REVERSEACCRUAL); if (m_processMsg != null) + { return false; + } return false; } // reverseAccrualIt @@ -762,16 +813,22 @@ public boolean reActivateIt() // Before reActivate m_processMsg = ModelValidationEngine.get().fireDocValidate(this,ModelValidator.TIMING_BEFORE_REACTIVATE); if (m_processMsg != null) + { return false; + } setProcessed(false); if (reverseCorrectIt()) + { return true; + } // After reActivate m_processMsg = ModelValidationEngine.get().fireDocValidate(this,ModelValidator.TIMING_AFTER_REACTIVATE); if (m_processMsg != null) + { return false; + } return false; } // reActivateIt @@ -824,7 +881,9 @@ public String getSummary() .append(" (#").append(getLines(false).length).append(")"); // - Description if (getDescription() != null && getDescription().length() > 0) + { sb.append(" - ").append(getDescription()); + } return sb.toString(); } // getSummary diff --git a/de.metas.business/src/main/java-legacy/org/compiere/model/MGoal.java b/de.metas.business/src/main/java-legacy/org/compiere/model/MGoal.java index a2584174f87..2b4f83999e2 100644 --- a/de.metas.business/src/main/java-legacy/org/compiere/model/MGoal.java +++ b/de.metas.business/src/main/java-legacy/org/compiere/model/MGoal.java @@ -27,7 +27,6 @@ import org.adempiere.exceptions.FillMandatoryException; import org.adempiere.service.ClientId; -import org.adempiere.service.OrgId; import org.compiere.util.DB; import org.compiere.util.Env; import org.compiere.util.TimeUtil; @@ -35,6 +34,7 @@ import de.metas.i18n.Msg; import de.metas.logging.LogManager; +import de.metas.organization.OrgId; import de.metas.security.IUserRolePermissions; import de.metas.security.IUserRolePermissionsDAO; import de.metas.security.permissions.Access; diff --git a/de.metas.business/src/main/java-legacy/org/compiere/model/MInOut.java b/de.metas.business/src/main/java-legacy/org/compiere/model/MInOut.java index 722b46a94a5..27493fd188a 100644 --- a/de.metas.business/src/main/java-legacy/org/compiere/model/MInOut.java +++ b/de.metas.business/src/main/java-legacy/org/compiere/model/MInOut.java @@ -32,9 +32,7 @@ import org.adempiere.misc.service.IPOService; import org.adempiere.mm.attributes.api.IAttributeSetInstanceBL; import org.adempiere.model.InterfaceWrapperHelper; -import org.adempiere.service.IOrgDAO; import org.adempiere.service.ISysConfigBL; -import org.adempiere.service.OrgId; import org.adempiere.util.LegacyAdapters; import org.adempiere.warehouse.WarehouseId; import org.adempiere.warehouse.api.IWarehouseBL; @@ -69,6 +67,8 @@ import de.metas.order.IMatchPOBL; import de.metas.order.IMatchPODAO; import de.metas.order.IOrderDAO; +import de.metas.organization.IOrgDAO; +import de.metas.organization.OrgId; import de.metas.organization.OrgInfo; import de.metas.product.IProductBL; import de.metas.product.IStorageBL; diff --git a/de.metas.business/src/main/java-legacy/org/compiere/model/MInvoice.java b/de.metas.business/src/main/java-legacy/org/compiere/model/MInvoice.java index 7b8a0420cc6..cb49a8c88ca 100644 --- a/de.metas.business/src/main/java-legacy/org/compiere/model/MInvoice.java +++ b/de.metas.business/src/main/java-legacy/org/compiere/model/MInvoice.java @@ -40,7 +40,6 @@ import org.adempiere.misc.service.IPOService; import org.adempiere.model.InterfaceWrapperHelper; import org.adempiere.service.ClientId; -import org.adempiere.service.OrgId; import org.adempiere.util.LegacyAdapters; import org.compiere.Adempiere; import org.compiere.print.ReportEngine; @@ -74,6 +73,7 @@ import de.metas.money.CurrencyId; import de.metas.order.IMatchPOBL; import de.metas.order.IMatchPODAO; +import de.metas.organization.OrgId; import de.metas.pricing.service.IPriceListDAO; import de.metas.tax.api.ITaxBL; import de.metas.util.Check; diff --git a/de.metas.business/src/main/java-legacy/org/compiere/model/MInvoiceLine.java b/de.metas.business/src/main/java-legacy/org/compiere/model/MInvoiceLine.java index a6b52c683f2..56a816ec6a2 100644 --- a/de.metas.business/src/main/java-legacy/org/compiere/model/MInvoiceLine.java +++ b/de.metas.business/src/main/java-legacy/org/compiere/model/MInvoiceLine.java @@ -26,7 +26,6 @@ import org.adempiere.exceptions.AdempiereException; import org.adempiere.invoice.service.IInvoiceBL; import org.adempiere.model.InterfaceWrapperHelper; -import org.adempiere.service.OrgId; import org.compiere.util.DB; import org.compiere.util.Env; import org.slf4j.Logger; @@ -39,6 +38,7 @@ import de.metas.invoice.IMatchInvDAO; import de.metas.location.CountryId; import de.metas.logging.LogManager; +import de.metas.organization.OrgId; import de.metas.tax.api.ITaxBL; import de.metas.tax.api.TaxCategoryId; import de.metas.tax.api.TaxNotFoundException; diff --git a/de.metas.business/src/main/java-legacy/org/compiere/model/MMeasure.java b/de.metas.business/src/main/java-legacy/org/compiere/model/MMeasure.java index 4c6c12a1cbf..d10b705747e 100644 --- a/de.metas.business/src/main/java-legacy/org/compiere/model/MMeasure.java +++ b/de.metas.business/src/main/java-legacy/org/compiere/model/MMeasure.java @@ -28,12 +28,12 @@ import org.adempiere.apps.graph.GraphColumn; import org.adempiere.exceptions.FillMandatoryException; import org.adempiere.service.ClientId; -import org.adempiere.service.OrgId; import org.compiere.util.DB; import org.compiere.util.Env; import org.compiere.util.TimeUtil; import de.metas.cache.CCache; +import de.metas.organization.OrgId; import de.metas.security.IUserRolePermissions; import de.metas.security.IUserRolePermissionsDAO; import de.metas.security.RoleId; diff --git a/de.metas.business/src/main/java-legacy/org/compiere/model/MOrder.java b/de.metas.business/src/main/java-legacy/org/compiere/model/MOrder.java index 342d9a4a204..5b20798d422 100644 --- a/de.metas.business/src/main/java-legacy/org/compiere/model/MOrder.java +++ b/de.metas.business/src/main/java-legacy/org/compiere/model/MOrder.java @@ -34,8 +34,6 @@ import org.adempiere.exceptions.FillMandatoryException; import org.adempiere.mm.attributes.api.IAttributeSetInstanceBL; import org.adempiere.model.InterfaceWrapperHelper; -import org.adempiere.service.IOrgDAO; -import org.adempiere.service.OrgId; import org.adempiere.util.LegacyAdapters; import org.adempiere.warehouse.WarehouseId; import org.adempiere.warehouse.api.IWarehouseBL; @@ -62,6 +60,8 @@ import de.metas.order.IOrderBL; import de.metas.order.IOrderDAO; import de.metas.order.IOrderLineBL; +import de.metas.organization.IOrgDAO; +import de.metas.organization.OrgId; import de.metas.payment.paymentterm.IPaymentTermRepository; import de.metas.payment.paymentterm.PaymentTermId; import de.metas.product.IProductBL; diff --git a/de.metas.business/src/main/java-legacy/org/compiere/model/MOrderLine.java b/de.metas.business/src/main/java-legacy/org/compiere/model/MOrderLine.java index 2a9b5977dc4..2fcee9672f4 100644 --- a/de.metas.business/src/main/java-legacy/org/compiere/model/MOrderLine.java +++ b/de.metas.business/src/main/java-legacy/org/compiere/model/MOrderLine.java @@ -29,7 +29,6 @@ import org.adempiere.exceptions.AdempiereException; import org.adempiere.mm.attributes.AttributeSetInstanceId; import org.adempiere.model.InterfaceWrapperHelper; -import org.adempiere.service.OrgId; import org.adempiere.util.LegacyAdapters; import org.adempiere.warehouse.WarehouseId; import org.adempiere.warehouse.api.IWarehouseBL; @@ -45,6 +44,7 @@ import de.metas.logging.LogManager; import de.metas.order.IOrderBL; import de.metas.order.IOrderLineBL; +import de.metas.organization.OrgId; import de.metas.product.ProductId; import de.metas.tax.api.ITaxBL; import de.metas.tax.api.TaxCategoryId; diff --git a/de.metas.business/src/main/java-legacy/org/compiere/model/MPayment.java b/de.metas.business/src/main/java-legacy/org/compiere/model/MPayment.java index a7d157e5e61..9c66b27fc81 100644 --- a/de.metas.business/src/main/java-legacy/org/compiere/model/MPayment.java +++ b/de.metas.business/src/main/java-legacy/org/compiere/model/MPayment.java @@ -31,7 +31,6 @@ import org.adempiere.exceptions.FillMandatoryException; import org.adempiere.service.ClientId; import org.adempiere.service.ISysConfigBL; -import org.adempiere.service.OrgId; import org.compiere.Adempiere; import org.compiere.util.DB; import org.compiere.util.Env; @@ -54,6 +53,7 @@ import de.metas.i18n.IMsgBL; import de.metas.logging.LogManager; import de.metas.money.CurrencyId; +import de.metas.organization.OrgId; import de.metas.payment.api.IPaymentBL; import de.metas.payment.api.IPaymentDAO; import de.metas.util.Check; diff --git a/de.metas.business/src/main/java-legacy/org/compiere/process/DistributionRun.java b/de.metas.business/src/main/java-legacy/org/compiere/process/DistributionRun.java index 6a82e0a0692..42cf1bc2d0b 100644 --- a/de.metas.business/src/main/java-legacy/org/compiere/process/DistributionRun.java +++ b/de.metas.business/src/main/java-legacy/org/compiere/process/DistributionRun.java @@ -24,8 +24,6 @@ import org.adempiere.exceptions.AdempiereException; import org.adempiere.mm.attributes.AttributeSetInstanceId; -import org.adempiere.service.IOrgDAO; -import org.adempiere.service.OrgId; import org.adempiere.warehouse.WarehouseId; import org.adempiere.warehouse.api.IWarehouseBL; import org.adempiere.warehouse.api.IWarehouseDAO; @@ -50,6 +48,8 @@ import de.metas.bpartner.service.IBPartnerDAO; import de.metas.i18n.Msg; import de.metas.order.IOrderBL; +import de.metas.organization.IOrgDAO; +import de.metas.organization.OrgId; import de.metas.organization.OrgInfo; import de.metas.process.JavaProcess; import de.metas.process.ProcessInfoParameter; diff --git a/de.metas.business/src/main/java-legacy/org/compiere/process/ReplenishReport.java b/de.metas.business/src/main/java-legacy/org/compiere/process/ReplenishReport.java index 3cf85bf0199..611826e47a6 100644 --- a/de.metas.business/src/main/java-legacy/org/compiere/process/ReplenishReport.java +++ b/de.metas.business/src/main/java-legacy/org/compiere/process/ReplenishReport.java @@ -25,7 +25,6 @@ import java.util.List; import org.adempiere.exceptions.FillMandatoryException; -import org.adempiere.service.OrgId; import org.adempiere.warehouse.LocatorId; import org.adempiere.warehouse.WarehouseId; import org.adempiere.warehouse.api.IWarehouseBL; @@ -55,6 +54,7 @@ import de.metas.i18n.Msg; import de.metas.order.DeliveryRule; import de.metas.order.IOrderBL; +import de.metas.organization.OrgId; import de.metas.process.JavaProcess; import de.metas.process.ProcessInfoParameter; import de.metas.product.IProductBL; diff --git a/de.metas.business/src/main/java-legacy/org/compiere/process/RequisitionPOCreate.java b/de.metas.business/src/main/java-legacy/org/compiere/process/RequisitionPOCreate.java index 0168e04b5a2..30444726f6d 100644 --- a/de.metas.business/src/main/java-legacy/org/compiere/process/RequisitionPOCreate.java +++ b/de.metas.business/src/main/java-legacy/org/compiere/process/RequisitionPOCreate.java @@ -25,7 +25,6 @@ import org.adempiere.exceptions.AdempiereException; import org.adempiere.exceptions.NoVendorForProductException; import org.adempiere.model.InterfaceWrapperHelper; -import org.adempiere.service.OrgId; import org.compiere.model.I_C_BPartner; import org.compiere.model.I_C_BPartner_Product; import org.compiere.model.I_M_PriceList; @@ -49,6 +48,7 @@ import de.metas.bpartner_product.IBPartnerProductDAO; import de.metas.i18n.IMsgBL; import de.metas.order.IOrderBL; +import de.metas.organization.OrgId; import de.metas.pricing.service.IPriceListDAO; import de.metas.process.JavaProcess; import de.metas.process.ProcessInfoParameter; diff --git a/de.metas.business/src/main/java/de/metas/bpartner/composite/BPartnerComposite.java b/de.metas.business/src/main/java/de/metas/bpartner/composite/BPartnerComposite.java index fc815a9789d..7b37a4c2199 100644 --- a/de.metas.business/src/main/java/de/metas/bpartner/composite/BPartnerComposite.java +++ b/de.metas.business/src/main/java/de/metas/bpartner/composite/BPartnerComposite.java @@ -14,7 +14,6 @@ import javax.annotation.Nullable; import org.adempiere.exceptions.AdempiereException; -import org.adempiere.service.OrgId; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; @@ -24,6 +23,7 @@ import de.metas.bpartner.BPartnerLocationId; import de.metas.i18n.ITranslatableString; import de.metas.i18n.TranslatableStrings; +import de.metas.organization.OrgId; import lombok.Builder; import lombok.Data; import lombok.NonNull; diff --git a/de.metas.business/src/main/java/de/metas/bpartner/composite/BPartnerCompositeQuery.java b/de.metas.business/src/main/java/de/metas/bpartner/composite/BPartnerCompositeQuery.java index 953ccb6b4b5..93af93232a2 100644 --- a/de.metas.business/src/main/java/de/metas/bpartner/composite/BPartnerCompositeQuery.java +++ b/de.metas.business/src/main/java/de/metas/bpartner/composite/BPartnerCompositeQuery.java @@ -1,10 +1,9 @@ package de.metas.bpartner.composite; -import org.adempiere.service.OrgId; - import com.google.common.collect.ImmutableSet; import de.metas.bpartner.BPartnerId; +import de.metas.organization.OrgId; import de.metas.util.rest.ExternalId; import lombok.Builder; import lombok.Singular; diff --git a/de.metas.business/src/main/java/de/metas/bpartner/composite/BPartnerCompositeRepository.java b/de.metas.business/src/main/java/de/metas/bpartner/composite/BPartnerCompositeRepository.java index e6d26dac134..652cd9cd436 100644 --- a/de.metas.business/src/main/java/de/metas/bpartner/composite/BPartnerCompositeRepository.java +++ b/de.metas.business/src/main/java/de/metas/bpartner/composite/BPartnerCompositeRepository.java @@ -28,7 +28,6 @@ import org.adempiere.ad.table.RecordChangeLog; import org.adempiere.ad.table.RecordChangeLogEntry; import org.adempiere.exceptions.AdempiereException; -import org.adempiere.service.OrgId; import org.adempiere.util.lang.impl.TableRecordReference; import org.compiere.model.IQuery; import org.compiere.model.I_AD_User; @@ -63,6 +62,7 @@ import de.metas.location.ICountryDAO; import de.metas.location.LocationId; import de.metas.location.impl.PostalQueryFilter; +import de.metas.organization.OrgId; import de.metas.util.Check; import de.metas.util.Services; import de.metas.util.collections.CollectionUtils; diff --git a/de.metas.business/src/main/java/de/metas/bpartner/product/stats/BPartnerProductStatsRepository.java b/de.metas.business/src/main/java/de/metas/bpartner/product/stats/BPartnerProductStatsRepository.java index 6ef328bfd06..4fb5d29b109 100644 --- a/de.metas.business/src/main/java/de/metas/bpartner/product/stats/BPartnerProductStatsRepository.java +++ b/de.metas.business/src/main/java/de/metas/bpartner/product/stats/BPartnerProductStatsRepository.java @@ -17,7 +17,6 @@ import javax.annotation.Nullable; import org.adempiere.ad.dao.IQueryBL; -import org.adempiere.service.OrgId; import org.compiere.model.I_C_BPartner_Product_Stats; import org.compiere.model.I_C_BPartner_Product_Stats_InOut_Online_v; import org.compiere.model.I_C_BPartner_Product_Stats_Invoice_Online_V; @@ -34,6 +33,7 @@ import de.metas.lang.SOTrx; import de.metas.money.CurrencyId; import de.metas.money.Money; +import de.metas.organization.OrgId; import de.metas.product.ProductId; import de.metas.util.Check; import de.metas.util.Services; diff --git a/de.metas.business/src/main/java/de/metas/bpartner_product/IBPartnerProductDAO.java b/de.metas.business/src/main/java/de/metas/bpartner_product/IBPartnerProductDAO.java index d1fec015567..d437a990345 100644 --- a/de.metas.business/src/main/java/de/metas/bpartner_product/IBPartnerProductDAO.java +++ b/de.metas.business/src/main/java/de/metas/bpartner_product/IBPartnerProductDAO.java @@ -31,12 +31,12 @@ import java.util.Properties; import java.util.Set; -import org.adempiere.service.OrgId; import org.compiere.model.I_C_BPartner; import org.compiere.model.I_C_BPartner_Product; import org.compiere.model.I_M_Product; import de.metas.bpartner.BPartnerId; +import de.metas.organization.OrgId; import de.metas.product.ProductId; import de.metas.util.ISingletonService; diff --git a/de.metas.business/src/main/java/de/metas/bpartner_product/impl/BPartnerProductDAO.java b/de.metas.business/src/main/java/de/metas/bpartner_product/impl/BPartnerProductDAO.java index 4f1f7f9f418..abc41265ff5 100644 --- a/de.metas.business/src/main/java/de/metas/bpartner_product/impl/BPartnerProductDAO.java +++ b/de.metas.business/src/main/java/de/metas/bpartner_product/impl/BPartnerProductDAO.java @@ -39,7 +39,6 @@ import org.adempiere.ad.dao.IQueryOrderBy.Nulls; import org.adempiere.ad.trx.api.ITrx; import org.adempiere.model.InterfaceWrapperHelper; -import org.adempiere.service.OrgId; import org.adempiere.util.proxy.Cached; import org.compiere.Adempiere; import org.compiere.model.I_C_BPartner; @@ -56,6 +55,7 @@ import de.metas.bpartner_product.ProductExclude.ProductExcludeBuilder; import de.metas.cache.annotation.CacheCtx; import de.metas.cache.annotation.CacheTrx; +import de.metas.organization.OrgId; import de.metas.product.Product; import de.metas.product.ProductId; import de.metas.product.ProductRepository; diff --git a/de.metas.business/src/main/java/de/metas/bpartner_product/interceptor/C_BPartner_Product.java b/de.metas.business/src/main/java/de/metas/bpartner_product/interceptor/C_BPartner_Product.java index a0620957b0a..27814ccaf58 100644 --- a/de.metas.business/src/main/java/de/metas/bpartner_product/interceptor/C_BPartner_Product.java +++ b/de.metas.business/src/main/java/de/metas/bpartner_product/interceptor/C_BPartner_Product.java @@ -9,7 +9,6 @@ import org.adempiere.mm.attributes.AttributeSetInstanceId; import org.adempiere.mm.attributes.api.IAttributeDAO; import org.adempiere.mm.attributes.api.ImmutableAttributeSet; -import org.adempiere.service.OrgId; import org.compiere.model.I_C_BPartner_Product; import org.compiere.model.ModelValidator; import org.compiere.util.Env; @@ -19,6 +18,7 @@ import de.metas.bpartner_product.IBPartnerProductDAO; import de.metas.i18n.IMsgBL; import de.metas.i18n.ITranslatableString; +import de.metas.organization.OrgId; import de.metas.product.ProductId; import de.metas.util.Services; diff --git a/de.metas.business/src/main/java/de/metas/costing/CostDetail.java b/de.metas.business/src/main/java/de/metas/costing/CostDetail.java index bb160e3bf38..f1d0dcb2354 100644 --- a/de.metas.business/src/main/java/de/metas/costing/CostDetail.java +++ b/de.metas.business/src/main/java/de/metas/costing/CostDetail.java @@ -5,10 +5,10 @@ import org.adempiere.exceptions.AdempiereException; import org.adempiere.mm.attributes.AttributeSetInstanceId; import org.adempiere.service.ClientId; -import org.adempiere.service.OrgId; import de.metas.acct.api.AcctSchemaId; import de.metas.money.CurrencyId; +import de.metas.organization.OrgId; import de.metas.product.ProductId; import de.metas.quantity.Quantity; import lombok.Builder; diff --git a/de.metas.business/src/main/java/de/metas/costing/CostDetailCreateRequest.java b/de.metas.business/src/main/java/de/metas/costing/CostDetailCreateRequest.java index d975bafa990..c9382637a13 100644 --- a/de.metas.business/src/main/java/de/metas/costing/CostDetailCreateRequest.java +++ b/de.metas.business/src/main/java/de/metas/costing/CostDetailCreateRequest.java @@ -7,11 +7,11 @@ import org.adempiere.mm.attributes.AttributeSetInstanceId; import org.adempiere.service.ClientId; -import org.adempiere.service.OrgId; import de.metas.acct.api.AcctSchemaId; import de.metas.costing.CostDetail.CostDetailBuilder; import de.metas.money.CurrencyConversionTypeId; +import de.metas.organization.OrgId; import de.metas.product.ProductId; import de.metas.quantity.Quantity; import de.metas.util.Check; diff --git a/de.metas.business/src/main/java/de/metas/costing/CostDetailQuery.java b/de.metas.business/src/main/java/de/metas/costing/CostDetailQuery.java index f017da2af46..2219379d845 100644 --- a/de.metas.business/src/main/java/de/metas/costing/CostDetailQuery.java +++ b/de.metas.business/src/main/java/de/metas/costing/CostDetailQuery.java @@ -2,9 +2,9 @@ import org.adempiere.mm.attributes.AttributeSetInstanceId; import org.adempiere.service.ClientId; -import org.adempiere.service.OrgId; import de.metas.acct.api.AcctSchemaId; +import de.metas.organization.OrgId; import de.metas.product.ProductId; import lombok.Builder; import lombok.Value; diff --git a/de.metas.business/src/main/java/de/metas/costing/CostSegment.java b/de.metas.business/src/main/java/de/metas/costing/CostSegment.java index 26c17d1eb0f..b70ba49cefc 100644 --- a/de.metas.business/src/main/java/de/metas/costing/CostSegment.java +++ b/de.metas.business/src/main/java/de/metas/costing/CostSegment.java @@ -2,9 +2,9 @@ import org.adempiere.mm.attributes.AttributeSetInstanceId; import org.adempiere.service.ClientId; -import org.adempiere.service.OrgId; import de.metas.acct.api.AcctSchemaId; +import de.metas.organization.OrgId; import de.metas.product.ProductId; import lombok.AccessLevel; import lombok.Builder; diff --git a/de.metas.business/src/main/java/de/metas/costing/CostSegmentAndElement.java b/de.metas.business/src/main/java/de/metas/costing/CostSegmentAndElement.java index 7c1e359a948..432adf478f0 100644 --- a/de.metas.business/src/main/java/de/metas/costing/CostSegmentAndElement.java +++ b/de.metas.business/src/main/java/de/metas/costing/CostSegmentAndElement.java @@ -2,9 +2,9 @@ import org.adempiere.mm.attributes.AttributeSetInstanceId; import org.adempiere.service.ClientId; -import org.adempiere.service.OrgId; import de.metas.acct.api.AcctSchemaId; +import de.metas.organization.OrgId; import de.metas.product.ProductId; import lombok.AccessLevel; import lombok.Builder; diff --git a/de.metas.business/src/main/java/de/metas/costing/impl/CostDetailRepository.java b/de.metas.business/src/main/java/de/metas/costing/impl/CostDetailRepository.java index 890d2237040..49ea1156aa2 100644 --- a/de.metas.business/src/main/java/de/metas/costing/impl/CostDetailRepository.java +++ b/de.metas.business/src/main/java/de/metas/costing/impl/CostDetailRepository.java @@ -14,7 +14,6 @@ import org.adempiere.mm.attributes.AttributeSetInstanceId; import org.adempiere.model.InterfaceWrapperHelper; import org.adempiere.service.ClientId; -import org.adempiere.service.OrgId; import org.compiere.model.I_C_UOM; import org.compiere.model.I_M_CostDetail; import org.springframework.stereotype.Component; @@ -32,6 +31,7 @@ import de.metas.costing.CostingDocumentRef; import de.metas.costing.ICostDetailRepository; import de.metas.money.CurrencyId; +import de.metas.organization.OrgId; import de.metas.product.ProductId; import de.metas.quantity.Quantity; import de.metas.uom.IUOMDAO; diff --git a/de.metas.business/src/main/java/de/metas/costing/impl/CurrentCostsRepository.java b/de.metas.business/src/main/java/de/metas/costing/impl/CurrentCostsRepository.java index 84f0a4a9c25..f46bafa54da 100644 --- a/de.metas.business/src/main/java/de/metas/costing/impl/CurrentCostsRepository.java +++ b/de.metas.business/src/main/java/de/metas/costing/impl/CurrentCostsRepository.java @@ -13,7 +13,6 @@ import org.adempiere.mm.attributes.AttributeSetInstanceId; import org.adempiere.model.InterfaceWrapperHelper; import org.adempiere.service.ClientId; -import org.adempiere.service.OrgId; import org.compiere.model.I_AD_Org; import org.compiere.model.I_C_UOM; import org.compiere.model.I_M_Cost; @@ -47,6 +46,7 @@ import de.metas.currency.CurrencyPrecision; import de.metas.logging.LogManager; import de.metas.money.CurrencyId; +import de.metas.organization.OrgId; import de.metas.product.IProductBL; import de.metas.product.ProductId; import de.metas.uom.IUOMDAO; diff --git a/de.metas.business/src/main/java/de/metas/costing/interceptors/M_Cost.java b/de.metas.business/src/main/java/de/metas/costing/interceptors/M_Cost.java index 0d5d1d92e97..48376bf75cb 100644 --- a/de.metas.business/src/main/java/de/metas/costing/interceptors/M_Cost.java +++ b/de.metas.business/src/main/java/de/metas/costing/interceptors/M_Cost.java @@ -8,7 +8,6 @@ import org.adempiere.exceptions.FillMandatoryException; import org.adempiere.mm.attributes.AttributeSetInstanceId; import org.adempiere.model.InterfaceWrapperHelper; -import org.adempiere.service.OrgId; import org.compiere.Adempiere; import org.compiere.model.I_M_Cost; import org.compiere.model.ModelValidator; @@ -20,6 +19,7 @@ import de.metas.costing.CostingLevel; import de.metas.costing.ICostElementRepository; import de.metas.costing.IProductCostingBL; +import de.metas.organization.OrgId; import de.metas.product.ProductId; import de.metas.util.Services; diff --git a/de.metas.business/src/main/java/de/metas/costing/interceptors/M_CostElement.java b/de.metas.business/src/main/java/de/metas/costing/interceptors/M_CostElement.java index 4d226670342..e035c24f09e 100644 --- a/de.metas.business/src/main/java/de/metas/costing/interceptors/M_CostElement.java +++ b/de.metas.business/src/main/java/de/metas/costing/interceptors/M_CostElement.java @@ -7,7 +7,6 @@ import org.adempiere.ad.modelvalidator.annotations.ModelChange; import org.adempiere.exceptions.AdempiereException; import org.adempiere.service.ClientId; -import org.adempiere.service.OrgId; import org.compiere.model.I_M_CostElement; import org.compiere.model.I_M_Product_Category; import org.compiere.model.I_M_Product_Category_Acct; @@ -18,6 +17,7 @@ import de.metas.acct.api.IAcctSchemaDAO; import de.metas.costing.CostElementType; import de.metas.costing.CostingMethod; +import de.metas.organization.OrgId; import de.metas.util.Check; import de.metas.util.Services; diff --git a/de.metas.business/src/main/java/de/metas/costing/methods/LastInvoiceCostingMethodHandler.java b/de.metas.business/src/main/java/de/metas/costing/methods/LastInvoiceCostingMethodHandler.java index 40fc9da9ef6..bc6cb95f9ec 100644 --- a/de.metas.business/src/main/java/de/metas/costing/methods/LastInvoiceCostingMethodHandler.java +++ b/de.metas.business/src/main/java/de/metas/costing/methods/LastInvoiceCostingMethodHandler.java @@ -10,7 +10,6 @@ import org.adempiere.ad.trx.api.ITrx; import org.adempiere.exceptions.DBException; import org.adempiere.mm.attributes.AttributeSetInstanceId; -import org.adempiere.service.OrgId; import org.compiere.util.DB; import org.springframework.stereotype.Component; @@ -26,6 +25,7 @@ import de.metas.costing.CurrentCost; import de.metas.money.CurrencyId; import de.metas.order.OrderLineId; +import de.metas.organization.OrgId; import de.metas.product.ProductId; import de.metas.quantity.Quantity; import de.metas.util.Services; diff --git a/de.metas.business/src/main/java/de/metas/costing/methods/LastPOCostingMethodHandler.java b/de.metas.business/src/main/java/de/metas/costing/methods/LastPOCostingMethodHandler.java index 77dc095ed79..ccd4c820ec5 100644 --- a/de.metas.business/src/main/java/de/metas/costing/methods/LastPOCostingMethodHandler.java +++ b/de.metas.business/src/main/java/de/metas/costing/methods/LastPOCostingMethodHandler.java @@ -11,7 +11,6 @@ import org.adempiere.ad.trx.api.ITrx; import org.adempiere.exceptions.DBException; import org.adempiere.mm.attributes.AttributeSetInstanceId; -import org.adempiere.service.OrgId; import org.compiere.util.DB; import org.springframework.stereotype.Component; @@ -27,6 +26,7 @@ import de.metas.costing.CurrentCost; import de.metas.money.CurrencyId; import de.metas.order.OrderLineId; +import de.metas.organization.OrgId; import de.metas.product.ProductId; import de.metas.quantity.Quantity; import de.metas.util.Optionals; diff --git a/de.metas.business/src/main/java/de/metas/customs/CustomsInvoice.java b/de.metas.business/src/main/java/de/metas/customs/CustomsInvoice.java index 1a8633a756f..78d7c24214c 100644 --- a/de.metas.business/src/main/java/de/metas/customs/CustomsInvoice.java +++ b/de.metas.business/src/main/java/de/metas/customs/CustomsInvoice.java @@ -4,14 +4,13 @@ import javax.annotation.Nullable; -import org.adempiere.service.OrgId; - import com.google.common.collect.ImmutableList; import de.metas.bpartner.BPartnerLocationId; import de.metas.document.DocTypeId; import de.metas.document.engine.DocStatus; import de.metas.money.CurrencyId; +import de.metas.organization.OrgId; import de.metas.user.UserId; import lombok.AccessLevel; import lombok.Builder; diff --git a/de.metas.business/src/main/java/de/metas/customs/CustomsInvoiceLine.java b/de.metas.business/src/main/java/de/metas/customs/CustomsInvoiceLine.java index ec62e9bd9c9..d56e34fc06e 100644 --- a/de.metas.business/src/main/java/de/metas/customs/CustomsInvoiceLine.java +++ b/de.metas.business/src/main/java/de/metas/customs/CustomsInvoiceLine.java @@ -1,8 +1,7 @@ package de.metas.customs; -import org.adempiere.service.OrgId; - import de.metas.money.Money; +import de.metas.organization.OrgId; import de.metas.product.ProductId; import de.metas.quantity.Quantity; import de.metas.uom.UomId; diff --git a/de.metas.business/src/main/java/de/metas/customs/CustomsInvoiceRepository.java b/de.metas.business/src/main/java/de/metas/customs/CustomsInvoiceRepository.java index 6097ba6c8bb..4a501f16f1d 100644 --- a/de.metas.business/src/main/java/de/metas/customs/CustomsInvoiceRepository.java +++ b/de.metas.business/src/main/java/de/metas/customs/CustomsInvoiceRepository.java @@ -10,7 +10,6 @@ import java.util.Set; import org.adempiere.ad.dao.IQueryBL; -import org.adempiere.service.OrgId; import org.compiere.model.I_C_Customs_Invoice; import org.compiere.model.I_C_Customs_Invoice_Line; import org.compiere.model.I_M_InOut; @@ -32,6 +31,7 @@ import de.metas.inout.InOutAndLineId; import de.metas.inout.InOutId; import de.metas.money.Money; +import de.metas.organization.OrgId; import de.metas.product.ProductId; import de.metas.quantity.Quantity; import de.metas.user.UserId; diff --git a/de.metas.business/src/main/java/de/metas/invoice/impl/InvoiceLineBL.java b/de.metas.business/src/main/java/de/metas/invoice/impl/InvoiceLineBL.java index f8d4b793dd1..48e4149e1c4 100644 --- a/de.metas.business/src/main/java/de/metas/invoice/impl/InvoiceLineBL.java +++ b/de.metas.business/src/main/java/de/metas/invoice/impl/InvoiceLineBL.java @@ -32,7 +32,6 @@ import org.adempiere.exceptions.TaxCategoryNotFoundException; import org.adempiere.invoice.service.IInvoiceBL; import org.adempiere.model.InterfaceWrapperHelper; -import org.adempiere.service.OrgId; import org.adempiere.warehouse.WarehouseId; import org.adempiere.warehouse.api.IWarehouseBL; import org.compiere.model.I_C_BPartner_Location; @@ -54,6 +53,7 @@ import de.metas.invoice.IInvoiceLineBL; import de.metas.location.CountryId; import de.metas.logging.LogManager; +import de.metas.organization.OrgId; import de.metas.pricing.IEditablePricingContext; import de.metas.pricing.IPricingResult; import de.metas.pricing.PriceListId; diff --git a/de.metas.business/src/main/java/de/metas/mforecast/interceptors/M_ForecastLine.java b/de.metas.business/src/main/java/de/metas/mforecast/interceptors/M_ForecastLine.java index 36b14b9d9af..0ee8150a5c5 100644 --- a/de.metas.business/src/main/java/de/metas/mforecast/interceptors/M_ForecastLine.java +++ b/de.metas.business/src/main/java/de/metas/mforecast/interceptors/M_ForecastLine.java @@ -11,10 +11,10 @@ import org.compiere.model.I_M_Forecast; import org.compiere.model.I_M_ForecastLine; import org.compiere.model.I_M_Warehouse; -import org.compiere.model.MOrg; import org.compiere.model.ModelValidator; import org.springframework.stereotype.Component; +import de.metas.organization.IOrgDAO; import de.metas.util.Services; /* @@ -53,7 +53,8 @@ public void beforeSave(final I_M_ForecastLine forecastLine) final int adOrgId = forecastLine.getAD_Org_ID(); if (wh.getAD_Org_ID() != adOrgId) { - throw new WarehouseInvalidForOrgException(wh.getName(), MOrg.get(ctx, adOrgId).getName()); + final String orgName = Services.get(IOrgDAO.class).retrieveOrgName(adOrgId); + throw new WarehouseInvalidForOrgException(wh.getName(), orgName); } } diff --git a/de.metas.business/src/main/java/de/metas/order/OrderLine.java b/de.metas.business/src/main/java/de/metas/order/OrderLine.java index 65e290ba821..da9313e4e94 100644 --- a/de.metas.business/src/main/java/de/metas/order/OrderLine.java +++ b/de.metas.business/src/main/java/de/metas/order/OrderLine.java @@ -5,12 +5,12 @@ import javax.annotation.Nullable; import org.adempiere.mm.attributes.AttributeSetInstanceId; -import org.adempiere.service.OrgId; import org.adempiere.warehouse.WarehouseId; import de.metas.bpartner.BPartnerId; import de.metas.lang.SOTrx; import de.metas.money.Money; +import de.metas.organization.OrgId; import de.metas.payment.paymentterm.PaymentTermId; import de.metas.product.ProductId; import de.metas.quantity.Quantity; diff --git a/de.metas.business/src/main/java/de/metas/order/OrderLineRepository.java b/de.metas.business/src/main/java/de/metas/order/OrderLineRepository.java index 2a48fef4ad6..d9b4733fb43 100644 --- a/de.metas.business/src/main/java/de/metas/order/OrderLineRepository.java +++ b/de.metas.business/src/main/java/de/metas/order/OrderLineRepository.java @@ -5,7 +5,6 @@ import java.time.ZonedDateTime; import org.adempiere.mm.attributes.AttributeSetInstanceId; -import org.adempiere.service.OrgId; import org.adempiere.warehouse.WarehouseId; import org.compiere.model.I_C_OrderLine; import org.compiere.util.TimeUtil; @@ -15,6 +14,7 @@ import de.metas.lang.SOTrx; import de.metas.money.CurrencyId; import de.metas.money.Money; +import de.metas.organization.OrgId; import de.metas.payment.paymentterm.PaymentTermId; import de.metas.product.ProductId; import de.metas.quantity.Quantity; diff --git a/de.metas.business/src/main/java/de/metas/order/impl/OrderLineBL.java b/de.metas.business/src/main/java/de/metas/order/impl/OrderLineBL.java index 1d058eff570..82319b559d3 100644 --- a/de.metas.business/src/main/java/de/metas/order/impl/OrderLineBL.java +++ b/de.metas.business/src/main/java/de/metas/order/impl/OrderLineBL.java @@ -36,9 +36,7 @@ import org.adempiere.exceptions.AdempiereException; import org.adempiere.mm.attributes.AttributeSetInstanceId; import org.adempiere.model.InterfaceWrapperHelper; -import org.adempiere.service.IOrgDAO; import org.adempiere.service.ISysConfigBL; -import org.adempiere.service.OrgId; import org.compiere.model.I_AD_Org; import org.compiere.model.I_C_Order; import org.compiere.model.I_C_Tax; @@ -70,6 +68,8 @@ import de.metas.order.OrderAndLineId; import de.metas.order.OrderLinePriceUpdateRequest; import de.metas.order.PriceAndDiscount; +import de.metas.organization.IOrgDAO; +import de.metas.organization.OrgId; import de.metas.payment.paymentterm.PaymentTermId; import de.metas.pricing.IPricingResult; import de.metas.pricing.PriceListId; diff --git a/de.metas.business/src/main/java/de/metas/pricing/conditions/service/impl/PricingConditionsRepository.java b/de.metas.business/src/main/java/de/metas/pricing/conditions/service/impl/PricingConditionsRepository.java index 5b644a6c94c..b3cf5effac8 100644 --- a/de.metas.business/src/main/java/de/metas/pricing/conditions/service/impl/PricingConditionsRepository.java +++ b/de.metas.business/src/main/java/de/metas/pricing/conditions/service/impl/PricingConditionsRepository.java @@ -44,7 +44,6 @@ import org.adempiere.mm.attributes.AttributeValueId; import org.adempiere.model.InterfaceWrapperHelper; import org.adempiere.service.ClientId; -import org.adempiere.service.OrgId; import org.compiere.Adempiere; import org.compiere.model.I_M_DiscountSchema; import org.compiere.model.I_M_DiscountSchemaBreak; @@ -68,6 +67,7 @@ import de.metas.logging.LogManager; import de.metas.money.CurrencyId; import de.metas.money.Money; +import de.metas.organization.OrgId; import de.metas.payment.paymentterm.PaymentTermId; import de.metas.payment.paymentterm.PaymentTermService; import de.metas.pricing.PricingSystemId; diff --git a/de.metas.business/src/main/java/de/metas/product/CreateProductRequest.java b/de.metas.business/src/main/java/de/metas/product/CreateProductRequest.java index 573436e9b83..147f928d20d 100644 --- a/de.metas.business/src/main/java/de/metas/product/CreateProductRequest.java +++ b/de.metas.business/src/main/java/de/metas/product/CreateProductRequest.java @@ -2,8 +2,7 @@ import javax.annotation.Nullable; -import org.adempiere.service.OrgId; - +import de.metas.organization.OrgId; import de.metas.uom.UomId; import lombok.Builder; import lombok.NonNull; diff --git a/de.metas.business/src/main/java/de/metas/product/IProductActivityProvider.java b/de.metas.business/src/main/java/de/metas/product/IProductActivityProvider.java index 2f6a7326fce..620d77dbbb1 100644 --- a/de.metas.business/src/main/java/de/metas/product/IProductActivityProvider.java +++ b/de.metas.business/src/main/java/de/metas/product/IProductActivityProvider.java @@ -1,8 +1,8 @@ package de.metas.product; import org.adempiere.service.ClientId; -import org.adempiere.service.OrgId; +import de.metas.organization.OrgId; import de.metas.product.acct.api.ActivityId; import de.metas.util.ISingletonService; diff --git a/de.metas.business/src/main/java/de/metas/product/IProductDAO.java b/de.metas.business/src/main/java/de/metas/product/IProductDAO.java index 8b9af856cda..99eb20e821a 100644 --- a/de.metas.business/src/main/java/de/metas/product/IProductDAO.java +++ b/de.metas.business/src/main/java/de/metas/product/IProductDAO.java @@ -28,10 +28,10 @@ import java.util.function.BiConsumer; import java.util.function.Consumer; -import org.adempiere.service.OrgId; import org.compiere.model.I_M_Product; import org.compiere.model.I_M_Product_Category; +import de.metas.organization.OrgId; import de.metas.util.ISingletonService; import lombok.Builder; import lombok.Builder.Default; diff --git a/de.metas.business/src/main/java/de/metas/product/ProductPlanningSchema.java b/de.metas.business/src/main/java/de/metas/product/ProductPlanningSchema.java index cd1f02800ea..42f74d81176 100644 --- a/de.metas.business/src/main/java/de/metas/product/ProductPlanningSchema.java +++ b/de.metas.business/src/main/java/de/metas/product/ProductPlanningSchema.java @@ -2,11 +2,11 @@ import javax.annotation.Nullable; -import org.adempiere.service.OrgId; import org.adempiere.warehouse.WarehouseId; import de.metas.material.planning.ddorder.DistributionNetworkId; import de.metas.material.planning.pporder.PPRoutingId; +import de.metas.organization.OrgId; import de.metas.user.UserId; import lombok.Builder; import lombok.Data; diff --git a/de.metas.business/src/main/java/de/metas/product/impl/ProductBL.java b/de.metas.business/src/main/java/de/metas/product/impl/ProductBL.java index 9ecd8408ce0..3110341ec05 100644 --- a/de.metas.business/src/main/java/de/metas/product/impl/ProductBL.java +++ b/de.metas.business/src/main/java/de/metas/product/impl/ProductBL.java @@ -35,7 +35,6 @@ import org.adempiere.model.InterfaceWrapperHelper; import org.adempiere.service.ClientId; import org.adempiere.service.IClientDAO; -import org.adempiere.service.OrgId; import org.compiere.model.I_C_UOM; import org.compiere.model.I_M_AttributeSet; import org.compiere.model.I_M_AttributeSetInstance; @@ -51,6 +50,7 @@ import de.metas.costing.CostingLevel; import de.metas.costing.IProductCostingBL; import de.metas.logging.LogManager; +import de.metas.organization.OrgId; import de.metas.product.IProductBL; import de.metas.product.IProductDAO; import de.metas.product.ProductCategoryId; diff --git a/de.metas.business/src/main/java/de/metas/product/impl/ProductDAO.java b/de.metas.business/src/main/java/de/metas/product/impl/ProductDAO.java index ae10dc11dc4..7f92ca83220 100644 --- a/de.metas.business/src/main/java/de/metas/product/impl/ProductDAO.java +++ b/de.metas.business/src/main/java/de/metas/product/impl/ProductDAO.java @@ -44,7 +44,6 @@ import org.adempiere.ad.trx.api.ITrx; import org.adempiere.exceptions.AdempiereException; import org.adempiere.model.InterfaceWrapperHelper; -import org.adempiere.service.OrgId; import org.adempiere.util.proxy.Cached; import org.compiere.model.IQuery; import org.compiere.model.I_M_Product; @@ -55,6 +54,7 @@ import com.google.common.collect.Maps; import de.metas.cache.annotation.CacheCtx; +import de.metas.organization.OrgId; import de.metas.product.CreateProductRequest; import de.metas.product.IProductDAO; import de.metas.product.IProductMappingAware; diff --git a/de.metas.business/src/main/java/de/metas/product/impl/ProductPlanningSchemaDAO.java b/de.metas.business/src/main/java/de/metas/product/impl/ProductPlanningSchemaDAO.java index e6c4e091ee7..19828b7a143 100644 --- a/de.metas.business/src/main/java/de/metas/product/impl/ProductPlanningSchemaDAO.java +++ b/de.metas.business/src/main/java/de/metas/product/impl/ProductPlanningSchemaDAO.java @@ -11,7 +11,6 @@ import org.adempiere.ad.dao.IQueryBL; import org.adempiere.exceptions.AdempiereException; -import org.adempiere.service.OrgId; import org.adempiere.warehouse.WarehouseId; import org.compiere.model.IQuery; import org.compiere.model.I_M_Product; @@ -21,6 +20,7 @@ import de.metas.material.planning.ddorder.DistributionNetworkId; import de.metas.material.planning.pporder.PPRoutingId; +import de.metas.organization.OrgId; import de.metas.product.OnMaterialReceiptWithDestWarehouse; import de.metas.product.ProductId; import de.metas.product.ProductPlanningSchema; diff --git a/de.metas.business/src/main/java/de/metas/request/api/RequestCandidate.java b/de.metas.business/src/main/java/de/metas/request/api/RequestCandidate.java index 6e3f668ffa9..174be73dad7 100644 --- a/de.metas.business/src/main/java/de/metas/request/api/RequestCandidate.java +++ b/de.metas.business/src/main/java/de/metas/request/api/RequestCandidate.java @@ -4,11 +4,11 @@ import javax.annotation.Nullable; -import org.adempiere.service.OrgId; import org.adempiere.util.lang.impl.TableRecordReference; import de.metas.bpartner.BPartnerId; import de.metas.inout.QualityNoteId; +import de.metas.organization.OrgId; import de.metas.product.ProductId; import de.metas.request.RequestTypeId; import de.metas.user.UserId; diff --git a/de.metas.business/src/main/java/de/metas/shipment/ShipmentDeclaration.java b/de.metas.business/src/main/java/de/metas/shipment/ShipmentDeclaration.java index 455a1b6fd86..3a23dbb27f8 100644 --- a/de.metas.business/src/main/java/de/metas/shipment/ShipmentDeclaration.java +++ b/de.metas.business/src/main/java/de/metas/shipment/ShipmentDeclaration.java @@ -4,13 +4,12 @@ import javax.annotation.Nullable; -import org.adempiere.service.OrgId; - import com.google.common.collect.ImmutableList; import de.metas.bpartner.BPartnerLocationId; import de.metas.document.DocTypeId; import de.metas.inout.InOutId; +import de.metas.organization.OrgId; import de.metas.user.UserId; import lombok.AccessLevel; import lombok.Builder; diff --git a/de.metas.business/src/main/java/de/metas/shipment/ShipmentDeclarationLine.java b/de.metas.business/src/main/java/de/metas/shipment/ShipmentDeclarationLine.java index eb3f6599120..3bf27d664a5 100644 --- a/de.metas.business/src/main/java/de/metas/shipment/ShipmentDeclarationLine.java +++ b/de.metas.business/src/main/java/de/metas/shipment/ShipmentDeclarationLine.java @@ -2,9 +2,8 @@ import javax.annotation.Nullable; -import org.adempiere.service.OrgId; - import de.metas.inout.InOutLineId; +import de.metas.organization.OrgId; import de.metas.product.ProductId; import de.metas.quantity.Quantity; import lombok.AccessLevel; diff --git a/de.metas.business/src/main/java/de/metas/shipment/repo/ShipmentDeclarationRepository.java b/de.metas.business/src/main/java/de/metas/shipment/repo/ShipmentDeclarationRepository.java index 53171be1514..4059dac2f78 100644 --- a/de.metas.business/src/main/java/de/metas/shipment/repo/ShipmentDeclarationRepository.java +++ b/de.metas.business/src/main/java/de/metas/shipment/repo/ShipmentDeclarationRepository.java @@ -9,7 +9,6 @@ import java.util.List; import org.adempiere.ad.dao.IQueryBL; -import org.adempiere.service.OrgId; import org.compiere.model.I_M_Shipment_Declaration; import org.compiere.model.I_M_Shipment_Declaration_Line; import org.compiere.util.TimeUtil; @@ -20,6 +19,7 @@ import de.metas.document.DocTypeId; import de.metas.inout.InOutId; import de.metas.inout.InOutLineId; +import de.metas.organization.OrgId; import de.metas.product.ProductId; import de.metas.quantity.Quantity; import de.metas.shipment.ShipmentDeclaration; diff --git a/de.metas.business/src/main/java/de/metas/shipment/service/ShipmentDeclarationCreator.java b/de.metas.business/src/main/java/de/metas/shipment/service/ShipmentDeclarationCreator.java index 79838a7bfb4..ce5f269fb5e 100644 --- a/de.metas.business/src/main/java/de/metas/shipment/service/ShipmentDeclarationCreator.java +++ b/de.metas.business/src/main/java/de/metas/shipment/service/ShipmentDeclarationCreator.java @@ -7,7 +7,6 @@ import java.util.Set; import org.adempiere.exceptions.AdempiereException; -import org.adempiere.service.OrgId; import org.compiere.model.I_C_UOM; import org.compiere.model.I_M_InOut; import org.compiere.model.I_M_InOutLine; @@ -33,6 +32,7 @@ import de.metas.inout.InOutId; import de.metas.inout.InOutLineId; import de.metas.logging.LogManager; +import de.metas.organization.OrgId; import de.metas.product.IProductDAO; import de.metas.product.ProductId; import de.metas.quantity.Quantity; diff --git a/de.metas.business/src/main/java/de/metas/tax/api/TaxNotFoundException.java b/de.metas.business/src/main/java/de/metas/tax/api/TaxNotFoundException.java index 67c13ce88c9..63b32aa1650 100644 --- a/de.metas.business/src/main/java/de/metas/tax/api/TaxNotFoundException.java +++ b/de.metas.business/src/main/java/de/metas/tax/api/TaxNotFoundException.java @@ -6,8 +6,6 @@ import org.adempiere.ad.trx.api.ITrx; import org.adempiere.exceptions.AdempiereException; import org.adempiere.model.InterfaceWrapperHelper; -import org.adempiere.service.IOrgDAO; -import org.adempiere.service.OrgId; import org.compiere.model.I_C_Charge; import org.compiere.model.MLocation; import org.compiere.util.Env; @@ -18,6 +16,8 @@ import de.metas.i18n.TranslatableStrings; import de.metas.location.CountryId; import de.metas.location.ICountryDAO; +import de.metas.organization.IOrgDAO; +import de.metas.organization.OrgId; import de.metas.product.IProductBL; import de.metas.product.ProductId; import de.metas.util.Services; diff --git a/de.metas.business/src/main/java/org/adempiere/mm/attributes/api/impl/AttributesBL.java b/de.metas.business/src/main/java/org/adempiere/mm/attributes/api/impl/AttributesBL.java index 7ff60b4fcb7..979057aec76 100644 --- a/de.metas.business/src/main/java/org/adempiere/mm/attributes/api/impl/AttributesBL.java +++ b/de.metas.business/src/main/java/org/adempiere/mm/attributes/api/impl/AttributesBL.java @@ -42,7 +42,6 @@ import org.adempiere.mm.attributes.spi.impl.DefaultAttributeValuesProvider; import org.adempiere.model.InterfaceWrapperHelper; import org.adempiere.service.ISysConfigBL; -import org.adempiere.service.OrgId; import org.compiere.model.I_C_BPartner_Product; import org.compiere.model.I_C_UOM; import org.compiere.model.I_M_Attribute; @@ -58,6 +57,7 @@ import de.metas.javaclasses.IJavaClassBL; import de.metas.javaclasses.IJavaClassDAO; import de.metas.javaclasses.model.I_AD_JavaClass; +import de.metas.organization.OrgId; import de.metas.product.IProductBL; import de.metas.product.IProductDAO; import de.metas.product.ProductId; diff --git a/de.metas.business/src/main/java/org/adempiere/mmovement/api/impl/MovementBL.java b/de.metas.business/src/main/java/org/adempiere/mmovement/api/impl/MovementBL.java index 4f114f364cf..16caaa6732c 100644 --- a/de.metas.business/src/main/java/org/adempiere/mmovement/api/impl/MovementBL.java +++ b/de.metas.business/src/main/java/org/adempiere/mmovement/api/impl/MovementBL.java @@ -27,12 +27,12 @@ import org.adempiere.mmovement.api.IMovementBL; import org.adempiere.model.InterfaceWrapperHelper; import org.adempiere.service.ClientId; -import org.adempiere.service.OrgId; import org.compiere.model.I_C_UOM; import org.compiere.model.I_M_Locator; import org.compiere.model.I_M_Movement; import org.compiere.model.I_M_MovementLine; +import de.metas.organization.OrgId; import de.metas.product.IProductActivityProvider; import de.metas.product.IProductBL; import de.metas.product.ProductId; diff --git a/de.metas.business/src/main/java/org/adempiere/warehouse/spi/impl/WarehouseAdvisor.java b/de.metas.business/src/main/java/org/adempiere/warehouse/spi/impl/WarehouseAdvisor.java index 63992fe9ddb..a10ff97bc22 100644 --- a/de.metas.business/src/main/java/org/adempiere/warehouse/spi/impl/WarehouseAdvisor.java +++ b/de.metas.business/src/main/java/org/adempiere/warehouse/spi/impl/WarehouseAdvisor.java @@ -3,8 +3,6 @@ import static org.adempiere.model.InterfaceWrapperHelper.load; import org.adempiere.exceptions.AdempiereException; -import org.adempiere.service.IOrgDAO; -import org.adempiere.service.OrgId; import org.adempiere.warehouse.WarehouseId; import org.adempiere.warehouse.api.IWarehouseDAO; import org.adempiere.warehouse.spi.IWarehouseAdvisor; @@ -15,6 +13,8 @@ import de.metas.bpartner.BPartnerId; import de.metas.bpartner.service.IBPartnerDAO; import de.metas.order.OrderLineId; +import de.metas.organization.IOrgDAO; +import de.metas.organization.OrgId; import de.metas.util.Services; import lombok.NonNull; diff --git a/de.metas.business/src/main/java/org/eevolution/api/BOMCreateRequest.java b/de.metas.business/src/main/java/org/eevolution/api/BOMCreateRequest.java index 7403dacb40a..d0822dd9530 100644 --- a/de.metas.business/src/main/java/org/eevolution/api/BOMCreateRequest.java +++ b/de.metas.business/src/main/java/org/eevolution/api/BOMCreateRequest.java @@ -5,10 +5,9 @@ import javax.annotation.Nullable; -import org.adempiere.service.OrgId; - import com.google.common.collect.ImmutableList; +import de.metas.organization.OrgId; import de.metas.product.ProductId; import de.metas.quantity.Quantity; import de.metas.uom.UomId; diff --git a/de.metas.business/src/main/java/org/eevolution/api/impl/ProductBOMDAO.java b/de.metas.business/src/main/java/org/eevolution/api/impl/ProductBOMDAO.java index 43edce378b1..819f242ac5f 100644 --- a/de.metas.business/src/main/java/org/eevolution/api/impl/ProductBOMDAO.java +++ b/de.metas.business/src/main/java/org/eevolution/api/impl/ProductBOMDAO.java @@ -41,7 +41,6 @@ import org.adempiere.ad.dao.IQueryFilter; import org.adempiere.ad.dao.ISqlQueryFilter; import org.adempiere.model.InterfaceWrapperHelper; -import org.adempiere.service.OrgId; import org.adempiere.util.proxy.Cached; import org.compiere.model.IQuery; import org.compiere.model.I_M_Product; @@ -59,6 +58,7 @@ import de.metas.cache.annotation.CacheCtx; import de.metas.cache.annotation.CacheTrx; +import de.metas.organization.OrgId; import de.metas.product.IProductDAO; import de.metas.product.ProductId; import de.metas.util.Check; diff --git a/de.metas.business/src/test/java/de/metas/bpartner_product/impl/BPartnerProductDAOTest.java b/de.metas.business/src/test/java/de/metas/bpartner_product/impl/BPartnerProductDAOTest.java index a1024dd72c1..44f2d09d493 100644 --- a/de.metas.business/src/test/java/de/metas/bpartner_product/impl/BPartnerProductDAOTest.java +++ b/de.metas.business/src/test/java/de/metas/bpartner_product/impl/BPartnerProductDAOTest.java @@ -6,7 +6,6 @@ import java.util.List; -import org.adempiere.service.OrgId; import org.adempiere.test.AdempiereTestHelper; import org.adempiere.test.AdempiereTestWatcher; import org.compiere.model.I_AD_Org; @@ -22,6 +21,7 @@ import de.metas.bpartner.BPartnerId; import de.metas.bpartner_product.IBPartnerProductDAO; +import de.metas.organization.OrgId; import de.metas.product.ProductId; import de.metas.util.Services; diff --git a/de.metas.business/src/test/java/de/metas/costing/AggregatedCostAmountTest.java b/de.metas.business/src/test/java/de/metas/costing/AggregatedCostAmountTest.java index c57da8937b5..66f436cd471 100644 --- a/de.metas.business/src/test/java/de/metas/costing/AggregatedCostAmountTest.java +++ b/de.metas.business/src/test/java/de/metas/costing/AggregatedCostAmountTest.java @@ -7,13 +7,13 @@ import org.adempiere.mm.attributes.AttributeSetInstanceId; import org.adempiere.service.ClientId; -import org.adempiere.service.OrgId; import org.junit.Test; import com.google.common.collect.ImmutableSet; import de.metas.acct.api.AcctSchemaId; import de.metas.money.CurrencyId; +import de.metas.organization.OrgId; import de.metas.product.ProductId; /* diff --git a/de.metas.business/src/test/java/de/metas/product/impl/ProductPlanningSchemaBLTest.java b/de.metas.business/src/test/java/de/metas/product/impl/ProductPlanningSchemaBLTest.java index 504cc076ef5..e58fa398681 100644 --- a/de.metas.business/src/test/java/de/metas/product/impl/ProductPlanningSchemaBLTest.java +++ b/de.metas.business/src/test/java/de/metas/product/impl/ProductPlanningSchemaBLTest.java @@ -7,7 +7,6 @@ import java.util.List; -import org.adempiere.service.OrgId; import org.adempiere.test.AdempiereTestHelper; import org.adempiere.warehouse.WarehouseId; import org.compiere.model.I_M_Product; @@ -18,6 +17,7 @@ import org.junit.Test; import de.metas.material.planning.ddorder.DistributionNetworkId; +import de.metas.organization.OrgId; import de.metas.product.IProductDAO; import de.metas.product.IProductPlanningSchemaBL; import de.metas.product.OnMaterialReceiptWithDestWarehouse; diff --git a/de.metas.contracts/src/main/java/de/metas/contracts/impl/FlatrateBL.java b/de.metas.contracts/src/main/java/de/metas/contracts/impl/FlatrateBL.java index 6a700906475..d2767753435 100644 --- a/de.metas.contracts/src/main/java/de/metas/contracts/impl/FlatrateBL.java +++ b/de.metas.contracts/src/main/java/de/metas/contracts/impl/FlatrateBL.java @@ -45,7 +45,6 @@ import org.adempiere.mm.attributes.api.IAttributeSetInstanceBL; import org.adempiere.model.InterfaceWrapperHelper; import org.adempiere.service.ClientId; -import org.adempiere.service.OrgId; import org.adempiere.util.lang.IContextAware; import org.adempiere.warehouse.WarehouseId; import org.adempiere.warehouse.api.IWarehouseDAO; @@ -100,6 +99,7 @@ import de.metas.invoicecandidate.model.I_C_ILCandHandler; import de.metas.invoicecandidate.model.I_C_Invoice_Candidate; import de.metas.logging.LogManager; +import de.metas.organization.OrgId; import de.metas.process.PInstanceId; import de.metas.product.ProductId; import de.metas.product.acct.api.ActivityId; diff --git a/de.metas.contracts/src/main/java/de/metas/contracts/interceptor/C_Flatrate_Term.java b/de.metas.contracts/src/main/java/de/metas/contracts/interceptor/C_Flatrate_Term.java index afcb9b2d4b3..4e64f15ffc6 100644 --- a/de.metas.contracts/src/main/java/de/metas/contracts/interceptor/C_Flatrate_Term.java +++ b/de.metas.contracts/src/main/java/de/metas/contracts/interceptor/C_Flatrate_Term.java @@ -41,7 +41,6 @@ import org.adempiere.exceptions.FillMandatoryException; import org.adempiere.model.InterfaceWrapperHelper; import org.adempiere.service.ISysConfigBL; -import org.adempiere.service.OrgId; import org.compiere.Adempiere; import org.compiere.model.I_AD_Org; import org.compiere.model.I_C_Calendar; @@ -79,6 +78,7 @@ import de.metas.order.IOrderDAO; import de.metas.order.OrderId; import de.metas.ordercandidate.modelvalidator.C_OLCand; +import de.metas.organization.OrgId; import de.metas.util.Check; import de.metas.util.Services; import lombok.NonNull; diff --git a/de.metas.contracts/src/main/java/de/metas/contracts/invoicecandidate/HandlerTools.java b/de.metas.contracts/src/main/java/de/metas/contracts/invoicecandidate/HandlerTools.java index bf68c184c97..b122e77174d 100644 --- a/de.metas.contracts/src/main/java/de/metas/contracts/invoicecandidate/HandlerTools.java +++ b/de.metas.contracts/src/main/java/de/metas/contracts/invoicecandidate/HandlerTools.java @@ -10,7 +10,6 @@ import org.adempiere.exceptions.AdempiereException; import org.adempiere.model.InterfaceWrapperHelper; import org.adempiere.service.ClientId; -import org.adempiere.service.OrgId; import org.adempiere.util.lang.impl.TableRecordReference; import org.compiere.model.IQuery; import org.compiere.model.I_C_OrderLine; @@ -21,6 +20,7 @@ import de.metas.contracts.model.X_C_Flatrate_Term; import de.metas.invoicecandidate.api.IInvoiceCandDAO; import de.metas.invoicecandidate.model.I_C_Invoice_Candidate; +import de.metas.organization.OrgId; import de.metas.product.IProductBL; import de.metas.product.ProductId; import de.metas.product.acct.api.ActivityId; diff --git a/de.metas.contracts/src/main/java/de/metas/contracts/subscription/invoicecandidatehandler/FlatrateTermSubscription_Handler.java b/de.metas.contracts/src/main/java/de/metas/contracts/subscription/invoicecandidatehandler/FlatrateTermSubscription_Handler.java index 4af4ca75968..5eee77c8ac6 100644 --- a/de.metas.contracts/src/main/java/de/metas/contracts/subscription/invoicecandidatehandler/FlatrateTermSubscription_Handler.java +++ b/de.metas.contracts/src/main/java/de/metas/contracts/subscription/invoicecandidatehandler/FlatrateTermSubscription_Handler.java @@ -29,7 +29,6 @@ import java.util.Iterator; import java.util.function.Consumer; -import org.adempiere.service.OrgId; import org.adempiere.warehouse.WarehouseId; import org.compiere.model.I_C_UOM; import org.compiere.util.Env; @@ -47,6 +46,7 @@ import de.metas.contracts.model.X_C_Flatrate_Transition; import de.metas.invoicecandidate.model.I_C_Invoice_Candidate; import de.metas.invoicecandidate.spi.IInvoiceCandidateHandler.PriceAndTax; +import de.metas.organization.OrgId; import de.metas.quantity.Quantity; import de.metas.tax.api.ITaxBL; import de.metas.tax.api.TaxCategoryId; diff --git a/de.metas.contracts/src/test/java/de/metas/contracts/impl/FlatrateBLTest.java b/de.metas.contracts/src/test/java/de/metas/contracts/impl/FlatrateBLTest.java index f7d40de209f..e3a49c411d2 100644 --- a/de.metas.contracts/src/test/java/de/metas/contracts/impl/FlatrateBLTest.java +++ b/de.metas.contracts/src/test/java/de/metas/contracts/impl/FlatrateBLTest.java @@ -30,7 +30,6 @@ import org.adempiere.exceptions.AdempiereException; import org.adempiere.pricing.model.I_C_PricingRule; -import org.adempiere.service.OrgId; import org.adempiere.warehouse.WarehouseId; import org.compiere.model.I_AD_Org; import org.compiere.model.I_C_Activity; @@ -68,6 +67,7 @@ import de.metas.contracts.model.X_C_Flatrate_Term; import de.metas.contracts.model.X_C_Flatrate_Transition; import de.metas.invoicecandidate.model.I_C_ILCandHandler; +import de.metas.organization.OrgId; import de.metas.pricing.rules.MockedPricingRule; import de.metas.product.ProductId; import de.metas.product.acct.api.ActivityId; diff --git a/de.metas.contracts/src/test/java/de/metas/contracts/invoicecandidate/FlatrateTermHandlerTest.java b/de.metas.contracts/src/test/java/de/metas/contracts/invoicecandidate/FlatrateTermHandlerTest.java index 2c220723e3c..35c98082f67 100644 --- a/de.metas.contracts/src/test/java/de/metas/contracts/invoicecandidate/FlatrateTermHandlerTest.java +++ b/de.metas.contracts/src/test/java/de/metas/contracts/invoicecandidate/FlatrateTermHandlerTest.java @@ -9,7 +9,6 @@ import org.adempiere.ad.wrapper.POJOWrapper; import org.adempiere.exceptions.AdempiereException; -import org.adempiere.service.OrgId; import org.adempiere.warehouse.WarehouseId; import org.compiere.Adempiere; import org.compiere.model.I_AD_Org; @@ -35,6 +34,7 @@ import de.metas.invoicecandidate.spi.InvoiceCandidateGenerateRequest; import de.metas.invoicecandidate.spi.InvoiceCandidateGenerateResult; import de.metas.lang.SOTrx; +import de.metas.organization.OrgId; import de.metas.product.ProductId; import de.metas.product.acct.api.ActivityId; import de.metas.tax.api.ITaxBL; diff --git a/de.metas.dunning/src/main/java/de/metas/dunning/api/IDunningDAO.java b/de.metas.dunning/src/main/java/de/metas/dunning/api/IDunningDAO.java index 22116e638e2..5ec0bafff43 100644 --- a/de.metas.dunning/src/main/java/de/metas/dunning/api/IDunningDAO.java +++ b/de.metas.dunning/src/main/java/de/metas/dunning/api/IDunningDAO.java @@ -26,7 +26,6 @@ import java.util.List; import java.util.Properties; -import org.adempiere.service.OrgId; import org.compiere.model.I_C_BPartner; import de.metas.dunning.interfaces.I_C_Dunning; @@ -35,6 +34,7 @@ import de.metas.dunning.model.I_C_DunningDoc_Line; import de.metas.dunning.model.I_C_DunningDoc_Line_Source; import de.metas.dunning.model.I_C_Dunning_Candidate; +import de.metas.organization.OrgId; import de.metas.util.ISingletonService; public interface IDunningDAO extends ISingletonService diff --git a/de.metas.dunning/src/main/java/de/metas/dunning/api/impl/AbstractDunningDAO.java b/de.metas.dunning/src/main/java/de/metas/dunning/api/impl/AbstractDunningDAO.java index 34754ab2f5a..2a17f47bb7f 100644 --- a/de.metas.dunning/src/main/java/de/metas/dunning/api/impl/AbstractDunningDAO.java +++ b/de.metas.dunning/src/main/java/de/metas/dunning/api/impl/AbstractDunningDAO.java @@ -29,7 +29,6 @@ import org.adempiere.ad.dao.IQueryBL; import org.adempiere.model.InterfaceWrapperHelper; -import org.adempiere.service.OrgId; import org.adempiere.util.lang.impl.TableRecordReference; import org.adempiere.util.proxy.Cached; import org.compiere.model.I_C_BPartner; @@ -47,6 +46,7 @@ import de.metas.dunning.model.I_C_DunningDoc_Line; import de.metas.dunning.model.I_C_DunningDoc_Line_Source; import de.metas.dunning.model.I_C_Dunning_Candidate; +import de.metas.organization.OrgId; import de.metas.util.Check; import de.metas.util.Services; import lombok.NonNull; diff --git a/de.metas.dunning/src/main/java/de/metas/dunning/invoice/api/impl/InvoiceSourceBL.java b/de.metas.dunning/src/main/java/de/metas/dunning/invoice/api/impl/InvoiceSourceBL.java index 984aef70cd8..c6362004eba 100644 --- a/de.metas.dunning/src/main/java/de/metas/dunning/invoice/api/impl/InvoiceSourceBL.java +++ b/de.metas.dunning/src/main/java/de/metas/dunning/invoice/api/impl/InvoiceSourceBL.java @@ -9,7 +9,6 @@ import org.adempiere.ad.trx.api.ITrxManager; import org.adempiere.invoice.service.IInvoiceBL; import org.adempiere.model.InterfaceWrapperHelper; -import org.adempiere.service.OrgId; import org.adempiere.util.lang.Mutable; import org.compiere.Adempiere; import org.compiere.model.I_C_Invoice; @@ -28,6 +27,7 @@ import de.metas.dunning.model.I_C_Dunning_Candidate; import de.metas.invoice.InvoiceId; import de.metas.logging.LogManager; +import de.metas.organization.OrgId; import de.metas.util.Check; import de.metas.util.Loggables; import de.metas.util.Services; diff --git a/de.metas.dunning/src/test/java/de/metas/dunning/api/impl/DunningDAOTest.java b/de.metas.dunning/src/test/java/de/metas/dunning/api/impl/DunningDAOTest.java index 8997b2b8f24..0bf8d02bc44 100644 --- a/de.metas.dunning/src/test/java/de/metas/dunning/api/impl/DunningDAOTest.java +++ b/de.metas.dunning/src/test/java/de/metas/dunning/api/impl/DunningDAOTest.java @@ -24,13 +24,13 @@ import org.adempiere.exceptions.AdempiereException; import org.adempiere.model.InterfaceWrapperHelper; -import org.adempiere.service.OrgId; import org.junit.Assert; import org.junit.Test; import de.metas.dunning.DunningTestBase; import de.metas.dunning.exception.DunningException; import de.metas.dunning.interfaces.I_C_Dunning; +import de.metas.organization.OrgId; public class DunningDAOTest extends DunningTestBase { diff --git a/de.metas.edi/src/main/java/de/metas/edi/api/impl/DesadvBL.java b/de.metas.edi/src/main/java/de/metas/edi/api/impl/DesadvBL.java index 69ac23ba33d..418b200838a 100644 --- a/de.metas.edi/src/main/java/de/metas/edi/api/impl/DesadvBL.java +++ b/de.metas.edi/src/main/java/de/metas/edi/api/impl/DesadvBL.java @@ -30,7 +30,6 @@ import org.adempiere.ad.trx.api.ITrx; import org.adempiere.mm.attributes.AttributeId; import org.adempiere.model.InterfaceWrapperHelper; -import org.adempiere.service.OrgId; import org.compiere.model.I_C_BPartner_Product; import org.compiere.model.I_M_Product; import org.compiere.util.DB; @@ -56,6 +55,7 @@ import de.metas.inout.IInOutDAO; import de.metas.order.IOrderBL; import de.metas.order.IOrderDAO; +import de.metas.organization.OrgId; import de.metas.process.ProcessInfo; import de.metas.product.IProductDAO; import de.metas.product.ProductId; diff --git a/de.metas.edi/src/main/java/de/metas/edi/api/impl/EDIDocumentBL.java b/de.metas.edi/src/main/java/de/metas/edi/api/impl/EDIDocumentBL.java index 4a7b8bcef35..3cc2e2c1cc7 100644 --- a/de.metas.edi/src/main/java/de/metas/edi/api/impl/EDIDocumentBL.java +++ b/de.metas.edi/src/main/java/de/metas/edi/api/impl/EDIDocumentBL.java @@ -35,7 +35,6 @@ import org.adempiere.invoice.service.IInvoiceBL; import org.adempiere.invoice.service.IInvoiceDAO; import org.adempiere.model.InterfaceWrapperHelper; -import org.adempiere.service.OrgId; import org.compiere.model.I_C_BPartner_Product; import org.compiere.model.I_C_DocType; import org.compiere.model.I_C_OrderLine; @@ -69,6 +68,7 @@ import de.metas.invoicecandidate.api.IInvoiceAggregationFactory; import de.metas.invoicecandidate.model.I_C_Invoice_Candidate; import de.metas.order.IOrderDAO; +import de.metas.organization.OrgId; import de.metas.util.Check; import de.metas.util.Services; diff --git a/de.metas.fresh/de.metas.fresh.base/src/main/java/de/metas/fresh/setup/process/ClientSetup.java b/de.metas.fresh/de.metas.fresh.base/src/main/java/de/metas/fresh/setup/process/ClientSetup.java index ecf242e0d5a..44f5f288927 100644 --- a/de.metas.fresh/de.metas.fresh.base/src/main/java/de/metas/fresh/setup/process/ClientSetup.java +++ b/de.metas.fresh/de.metas.fresh.base/src/main/java/de/metas/fresh/setup/process/ClientSetup.java @@ -8,8 +8,6 @@ import org.adempiere.ad.trx.api.OnTrxMissingPolicy; import org.adempiere.model.InterfaceWrapperHelper; import org.adempiere.service.IClientDAO; -import org.adempiere.service.IOrgDAO; -import org.adempiere.service.OrgId; import org.adempiere.util.lang.IAutoCloseable; import org.compiere.model.I_AD_Client; import org.compiere.model.I_AD_ClientInfo; @@ -34,6 +32,8 @@ import de.metas.bpartner.service.IBPartnerOrgBL; import de.metas.cache.interceptor.CacheInterceptor; import de.metas.location.ILocationBL; +import de.metas.organization.IOrgDAO; +import de.metas.organization.OrgId; import de.metas.organization.OrgInfo; import de.metas.organization.OrgInfoUpdateRequest; import de.metas.pricing.service.IPriceListDAO; @@ -124,7 +124,7 @@ private ClientSetup(@NonNull final Properties ctx) adClientInfo = clientDAO.retrieveClientInfo(getCtx(), adClient.getAD_Client_ID()); InterfaceWrapperHelper.setTrxName(adClientInfo, ITrx.TRXNAME_ThreadInherited); // - adOrg = orgDAO.retrieveOrg(getCtx(), AD_Org_ID_Main.getRepoId()); + adOrg = orgDAO.getById(AD_Org_ID_Main); InterfaceWrapperHelper.setTrxName(adOrg, ITrx.TRXNAME_ThreadInherited); // final OrgInfo adOrgInfo = orgDAO.getOrgInfoByIdInTrx(AD_Org_ID_Main); diff --git a/de.metas.handlingunits.base/src/main/java/de/metas/handlingunits/ddorder/api/impl/HUs2DDOrderProducer.java b/de.metas.handlingunits.base/src/main/java/de/metas/handlingunits/ddorder/api/impl/HUs2DDOrderProducer.java index 1ace2adffe5..b1de8d0eda4 100644 --- a/de.metas.handlingunits.base/src/main/java/de/metas/handlingunits/ddorder/api/impl/HUs2DDOrderProducer.java +++ b/de.metas.handlingunits.base/src/main/java/de/metas/handlingunits/ddorder/api/impl/HUs2DDOrderProducer.java @@ -16,7 +16,6 @@ import org.adempiere.mm.attributes.api.IAttributeSetInstanceBL; import org.adempiere.model.InterfaceWrapperHelper; import org.adempiere.model.PlainContextAware; -import org.adempiere.service.OrgId; import org.adempiere.warehouse.WarehouseId; import org.adempiere.warehouse.api.IWarehouseDAO; import org.compiere.model.I_C_UOM; @@ -58,6 +57,7 @@ import de.metas.handlingunits.storage.IHUProductStorage; import de.metas.i18n.IMsgBL; import de.metas.logging.LogManager; +import de.metas.organization.OrgId; import de.metas.product.IProductDAO; import de.metas.product.LotNumberQuarantine; import de.metas.util.Check; diff --git a/de.metas.handlingunits.base/src/main/java/de/metas/handlingunits/impl/HandlingUnitsDAO.java b/de.metas.handlingunits.base/src/main/java/de/metas/handlingunits/impl/HandlingUnitsDAO.java index 1e9b12fb06a..736eaf47d1b 100644 --- a/de.metas.handlingunits.base/src/main/java/de/metas/handlingunits/impl/HandlingUnitsDAO.java +++ b/de.metas.handlingunits.base/src/main/java/de/metas/handlingunits/impl/HandlingUnitsDAO.java @@ -51,7 +51,6 @@ import org.adempiere.ad.trx.api.ITrx; import org.adempiere.exceptions.AdempiereException; import org.adempiere.model.InterfaceWrapperHelper; -import org.adempiere.service.OrgId; import org.adempiere.util.lang.IContextAware; import org.adempiere.util.lang.IPair; import org.adempiere.util.lang.ImmutablePair; @@ -96,6 +95,7 @@ import de.metas.handlingunits.model.X_M_HU_PI_Item; import de.metas.handlingunits.reservation.HUReservationRepository; import de.metas.logging.LogManager; +import de.metas.organization.OrgId; import de.metas.util.Check; import de.metas.util.Services; import de.metas.util.collections.IteratorUtils; diff --git a/de.metas.handlingunits.base/src/main/java/de/metas/handlingunits/inout/impl/InOutDDOrderBL.java b/de.metas.handlingunits.base/src/main/java/de/metas/handlingunits/inout/impl/InOutDDOrderBL.java index 3b3369f20da..5a9076a3407 100644 --- a/de.metas.handlingunits.base/src/main/java/de/metas/handlingunits/inout/impl/InOutDDOrderBL.java +++ b/de.metas.handlingunits.base/src/main/java/de/metas/handlingunits/inout/impl/InOutDDOrderBL.java @@ -8,7 +8,6 @@ import javax.annotation.Nullable; import org.adempiere.mm.attributes.AttributeSetInstanceId; -import org.adempiere.service.OrgId; import org.adempiere.warehouse.LocatorId; import org.compiere.model.I_M_InOut; import org.compiere.model.I_M_Locator; @@ -26,6 +25,7 @@ import de.metas.inout.api.ReceiptLineFindForwardToLocatorTool; import de.metas.material.planning.IProductPlanningDAO; import de.metas.material.planning.IProductPlanningDAO.ProductPlanningQuery; +import de.metas.organization.OrgId; import de.metas.product.ProductId; import de.metas.util.Check; import de.metas.util.Services; diff --git a/de.metas.handlingunits.base/src/main/java/de/metas/handlingunits/inventory/InventoryLine.java b/de.metas.handlingunits.base/src/main/java/de/metas/handlingunits/inventory/InventoryLine.java index 8b6d2474d51..80571023e1c 100644 --- a/de.metas.handlingunits.base/src/main/java/de/metas/handlingunits/inventory/InventoryLine.java +++ b/de.metas.handlingunits.base/src/main/java/de/metas/handlingunits/inventory/InventoryLine.java @@ -7,7 +7,6 @@ import org.adempiere.exceptions.AdempiereException; import org.adempiere.mm.attributes.AttributeSetInstanceId; -import org.adempiere.service.OrgId; import org.adempiere.warehouse.LocatorId; import com.fasterxml.jackson.annotation.JsonAutoDetect; @@ -17,6 +16,7 @@ import de.metas.inventory.HUAggregationType; import de.metas.inventory.InventoryLineId; import de.metas.material.event.commons.AttributesKey; +import de.metas.organization.OrgId; import de.metas.product.ProductId; import de.metas.quantity.Quantity; import de.metas.util.Check; diff --git a/de.metas.handlingunits.base/src/main/java/de/metas/handlingunits/inventory/InventoryRepository.java b/de.metas.handlingunits.base/src/main/java/de/metas/handlingunits/inventory/InventoryRepository.java index eb42edaeaa6..d053c255094 100644 --- a/de.metas.handlingunits.base/src/main/java/de/metas/handlingunits/inventory/InventoryRepository.java +++ b/de.metas.handlingunits.base/src/main/java/de/metas/handlingunits/inventory/InventoryRepository.java @@ -20,7 +20,6 @@ import org.adempiere.mm.attributes.AttributeSetInstanceId; import org.adempiere.mm.attributes.api.AttributesKeys; import org.adempiere.model.InterfaceWrapperHelper; -import org.adempiere.service.OrgId; import org.adempiere.warehouse.LocatorId; import org.adempiere.warehouse.api.IWarehouseDAO; import org.compiere.model.I_C_UOM; @@ -45,6 +44,7 @@ import de.metas.inventory.InventoryId; import de.metas.inventory.InventoryLineId; import de.metas.material.event.commons.AttributesKey; +import de.metas.organization.OrgId; import de.metas.product.ProductId; import de.metas.quantity.Quantity; import de.metas.uom.IUOMConversionBL; diff --git a/de.metas.handlingunits.base/src/main/java/de/metas/handlingunits/inventory/draftlinescreator/HuForInventoryLine.java b/de.metas.handlingunits.base/src/main/java/de/metas/handlingunits/inventory/draftlinescreator/HuForInventoryLine.java index e50ca31f296..fc56a870ca0 100644 --- a/de.metas.handlingunits.base/src/main/java/de/metas/handlingunits/inventory/draftlinescreator/HuForInventoryLine.java +++ b/de.metas.handlingunits.base/src/main/java/de/metas/handlingunits/inventory/draftlinescreator/HuForInventoryLine.java @@ -1,10 +1,10 @@ package de.metas.handlingunits.inventory.draftlinescreator; -import org.adempiere.service.OrgId; import org.adempiere.warehouse.LocatorId; import de.metas.handlingunits.HuId; import de.metas.material.event.commons.AttributesKey; +import de.metas.organization.OrgId; import de.metas.product.ProductId; import de.metas.quantity.Quantity; import lombok.Builder; diff --git a/de.metas.handlingunits.base/src/main/java/de/metas/handlingunits/inventory/draftlinescreator/HuForInventoryLineFactory.java b/de.metas.handlingunits.base/src/main/java/de/metas/handlingunits/inventory/draftlinescreator/HuForInventoryLineFactory.java index 73176191027..c9b64b624e9 100644 --- a/de.metas.handlingunits.base/src/main/java/de/metas/handlingunits/inventory/draftlinescreator/HuForInventoryLineFactory.java +++ b/de.metas.handlingunits.base/src/main/java/de/metas/handlingunits/inventory/draftlinescreator/HuForInventoryLineFactory.java @@ -5,7 +5,6 @@ import org.adempiere.mm.attributes.api.AttributesKeys; import org.adempiere.mm.attributes.api.IAttributeSet; import org.adempiere.mm.attributes.api.ImmutableAttributeSet; -import org.adempiere.service.OrgId; import org.compiere.model.I_M_Attribute; import org.springframework.stereotype.Service; @@ -17,6 +16,7 @@ import de.metas.handlingunits.model.I_M_HU; import de.metas.handlingunits.storage.IHUProductStorage; import de.metas.material.event.commons.AttributesKey; +import de.metas.organization.OrgId; import de.metas.util.Services; import lombok.NonNull; diff --git a/de.metas.handlingunits.base/src/main/java/de/metas/handlingunits/materialtracking/process/DD_Order_GenerateForQualityInspectionFlaggedHUs.java b/de.metas.handlingunits.base/src/main/java/de/metas/handlingunits/materialtracking/process/DD_Order_GenerateForQualityInspectionFlaggedHUs.java index 88e2c3b64d2..408c3d56633 100644 --- a/de.metas.handlingunits.base/src/main/java/de/metas/handlingunits/materialtracking/process/DD_Order_GenerateForQualityInspectionFlaggedHUs.java +++ b/de.metas.handlingunits.base/src/main/java/de/metas/handlingunits/materialtracking/process/DD_Order_GenerateForQualityInspectionFlaggedHUs.java @@ -6,7 +6,6 @@ import org.adempiere.exceptions.AdempiereException; import org.adempiere.exceptions.FillMandatoryException; import org.adempiere.model.InterfaceWrapperHelper; -import org.adempiere.service.OrgId; import org.adempiere.util.api.IRangeAwareParams; import org.adempiere.warehouse.WarehouseId; import org.adempiere.warehouse.api.IWarehouseBL; @@ -24,6 +23,7 @@ import de.metas.handlingunits.model.I_M_HU; import de.metas.handlingunits.model.I_M_Warehouse; import de.metas.handlingunits.model.X_M_HU; +import de.metas.organization.OrgId; import de.metas.process.JavaProcess; import de.metas.process.RunOutOfTrx; import de.metas.util.Check; diff --git a/de.metas.handlingunits.base/src/main/java/de/metas/handlingunits/movement/api/impl/HUMovementBL.java b/de.metas.handlingunits.base/src/main/java/de/metas/handlingunits/movement/api/impl/HUMovementBL.java index dcfe701cbb0..8613041450f 100644 --- a/de.metas.handlingunits.base/src/main/java/de/metas/handlingunits/movement/api/impl/HUMovementBL.java +++ b/de.metas.handlingunits.base/src/main/java/de/metas/handlingunits/movement/api/impl/HUMovementBL.java @@ -11,7 +11,6 @@ import org.adempiere.model.PlainContextAware; import org.adempiere.service.ClientId; import org.adempiere.service.ISysConfigBL; -import org.adempiere.service.OrgId; import org.adempiere.warehouse.WarehouseId; import org.adempiere.warehouse.api.IWarehouseBL; import org.adempiere.warehouse.api.IWarehouseDAO; @@ -27,6 +26,7 @@ import de.metas.handlingunits.movement.api.HUMovementResult; import de.metas.handlingunits.movement.api.IHUMovementBL; import de.metas.interfaces.I_M_Movement; +import de.metas.organization.OrgId; import de.metas.product.ProductId; import de.metas.product.acct.api.ActivityId; import de.metas.util.Check; diff --git a/de.metas.handlingunits.base/src/main/java/de/metas/handlingunits/order/api/impl/HUOrderBL.java b/de.metas.handlingunits.base/src/main/java/de/metas/handlingunits/order/api/impl/HUOrderBL.java index eba2b7d21f0..bbe88ee5983 100644 --- a/de.metas.handlingunits.base/src/main/java/de/metas/handlingunits/order/api/impl/HUOrderBL.java +++ b/de.metas.handlingunits.base/src/main/java/de/metas/handlingunits/order/api/impl/HUOrderBL.java @@ -29,7 +29,6 @@ import org.adempiere.ad.trx.api.ITrx; import org.adempiere.model.InterfaceWrapperHelper; -import org.adempiere.service.OrgId; import org.compiere.model.I_C_UOM; import org.compiere.model.I_M_Forecast; import org.slf4j.Logger; @@ -52,6 +51,7 @@ import de.metas.order.IOrderLineBL; import de.metas.order.OrderLinePriceUpdateRequest; import de.metas.order.OrderLinePriceUpdateRequest.ResultUOM; +import de.metas.organization.OrgId; import de.metas.product.IProductDAO; import de.metas.product.ProductId; import de.metas.util.Check; diff --git a/de.metas.handlingunits.base/src/main/java/de/metas/handlingunits/trace/HUTraceEvent.java b/de.metas.handlingunits.base/src/main/java/de/metas/handlingunits/trace/HUTraceEvent.java index 0a1c7bc8412..07674f3eaf5 100644 --- a/de.metas.handlingunits.base/src/main/java/de/metas/handlingunits/trace/HUTraceEvent.java +++ b/de.metas.handlingunits.base/src/main/java/de/metas/handlingunits/trace/HUTraceEvent.java @@ -5,12 +5,11 @@ import java.util.Optional; import java.util.OptionalInt; -import org.adempiere.service.OrgId; - import de.metas.document.DocTypeId; import de.metas.handlingunits.HuId; import de.metas.handlingunits.trace.HUTraceEventQuery.HUTraceEventQueryBuilder; import de.metas.inoutcandidate.api.ShipmentScheduleId; +import de.metas.organization.OrgId; import de.metas.product.ProductId; import lombok.Builder; import lombok.Builder.Default; diff --git a/de.metas.handlingunits.base/src/main/java/de/metas/handlingunits/trace/HUTraceEventQuery.java b/de.metas.handlingunits.base/src/main/java/de/metas/handlingunits/trace/HUTraceEventQuery.java index 457f7db51a4..feae3432d86 100644 --- a/de.metas.handlingunits.base/src/main/java/de/metas/handlingunits/trace/HUTraceEventQuery.java +++ b/de.metas.handlingunits.base/src/main/java/de/metas/handlingunits/trace/HUTraceEventQuery.java @@ -5,13 +5,12 @@ import java.util.Optional; import java.util.OptionalInt; -import org.adempiere.service.OrgId; - import com.google.common.collect.ImmutableSet; import de.metas.document.DocTypeId; import de.metas.handlingunits.HuId; import de.metas.inoutcandidate.api.ShipmentScheduleId; +import de.metas.organization.OrgId; import de.metas.product.ProductId; import lombok.Builder; import lombok.Builder.Default; diff --git a/de.metas.handlingunits.base/src/main/java/de/metas/handlingunits/trace/HUTraceEventsService.java b/de.metas.handlingunits.base/src/main/java/de/metas/handlingunits/trace/HUTraceEventsService.java index 18e2599765f..022853fd7a7 100644 --- a/de.metas.handlingunits.base/src/main/java/de/metas/handlingunits/trace/HUTraceEventsService.java +++ b/de.metas.handlingunits.base/src/main/java/de/metas/handlingunits/trace/HUTraceEventsService.java @@ -9,7 +9,6 @@ import java.util.Set; import java.util.function.Function; -import org.adempiere.service.OrgId; import org.adempiere.util.lang.IPair; import org.compiere.model.I_M_InOut; import org.compiere.model.I_M_InOutLine; @@ -38,6 +37,7 @@ import de.metas.inoutcandidate.api.ShipmentScheduleId; import de.metas.logging.LogManager; import de.metas.material.planning.pporder.PPOrderBOMLineId; +import de.metas.organization.OrgId; import de.metas.product.ProductId; import de.metas.quantity.Quantity; import de.metas.util.Check; diff --git a/de.metas.handlingunits.base/src/main/java/de/metas/handlingunits/trace/repository/HuTraceEventToDbRecordUtil.java b/de.metas.handlingunits.base/src/main/java/de/metas/handlingunits/trace/repository/HuTraceEventToDbRecordUtil.java index cdc92b9b549..2a0fd848f48 100644 --- a/de.metas.handlingunits.base/src/main/java/de/metas/handlingunits/trace/repository/HuTraceEventToDbRecordUtil.java +++ b/de.metas.handlingunits.base/src/main/java/de/metas/handlingunits/trace/repository/HuTraceEventToDbRecordUtil.java @@ -5,7 +5,6 @@ import java.util.Optional; import java.util.OptionalInt; -import org.adempiere.service.OrgId; import org.compiere.util.TimeUtil; import de.metas.document.DocTypeId; @@ -15,6 +14,7 @@ import de.metas.handlingunits.trace.HUTraceEvent.HUTraceEventBuilder; import de.metas.handlingunits.trace.HUTraceType; import de.metas.inoutcandidate.api.ShipmentScheduleId; +import de.metas.organization.OrgId; import de.metas.product.ProductId; import lombok.NonNull; diff --git a/de.metas.handlingunits.base/src/test/java/de/metas/handlingunits/inventory/InventoryLineTest.java b/de.metas.handlingunits.base/src/test/java/de/metas/handlingunits/inventory/InventoryLineTest.java index dc73e475287..d85696dbfe0 100644 --- a/de.metas.handlingunits.base/src/test/java/de/metas/handlingunits/inventory/InventoryLineTest.java +++ b/de.metas.handlingunits.base/src/test/java/de/metas/handlingunits/inventory/InventoryLineTest.java @@ -7,7 +7,6 @@ import java.math.BigDecimal; -import org.adempiere.service.OrgId; import org.adempiere.test.AdempiereTestHelper; import org.adempiere.warehouse.LocatorId; import org.adempiere.warehouse.WarehouseId; @@ -19,6 +18,7 @@ import de.metas.inventory.HUAggregationType; import de.metas.inventory.InventoryLineId; import de.metas.material.event.commons.AttributesKey; +import de.metas.organization.OrgId; import de.metas.product.ProductId; import de.metas.quantity.Quantity; diff --git a/de.metas.handlingunits.base/src/test/java/de/metas/handlingunits/inventory/InventoryRepositoryTest.java b/de.metas.handlingunits.base/src/test/java/de/metas/handlingunits/inventory/InventoryRepositoryTest.java index f7540b047b5..c61d4487289 100644 --- a/de.metas.handlingunits.base/src/test/java/de/metas/handlingunits/inventory/InventoryRepositoryTest.java +++ b/de.metas.handlingunits.base/src/test/java/de/metas/handlingunits/inventory/InventoryRepositoryTest.java @@ -14,7 +14,6 @@ import org.adempiere.mm.attributes.AttributeSetInstanceId; import org.adempiere.mm.attributes.api.AttributesKeys; -import org.adempiere.service.OrgId; import org.adempiere.test.AdempiereTestHelper; import org.adempiere.test.DumpPOJOLookupMapOnTestFail; import org.adempiere.warehouse.LocatorId; @@ -39,6 +38,7 @@ import de.metas.inventory.InventoryId; import de.metas.inventory.InventoryLineId; import de.metas.material.event.commons.AttributesKey; +import de.metas.organization.OrgId; import de.metas.product.ProductId; import de.metas.quantity.Quantity; diff --git a/de.metas.handlingunits.base/src/test/java/de/metas/handlingunits/inventory/draftlinescreator/DraftInventoryLinesCreatorTest.java b/de.metas.handlingunits.base/src/test/java/de/metas/handlingunits/inventory/draftlinescreator/DraftInventoryLinesCreatorTest.java index 14d391a93f7..284b9649247 100644 --- a/de.metas.handlingunits.base/src/test/java/de/metas/handlingunits/inventory/draftlinescreator/DraftInventoryLinesCreatorTest.java +++ b/de.metas.handlingunits.base/src/test/java/de/metas/handlingunits/inventory/draftlinescreator/DraftInventoryLinesCreatorTest.java @@ -13,7 +13,6 @@ import java.math.BigDecimal; -import org.adempiere.service.OrgId; import org.adempiere.test.AdempiereTestHelper; import org.adempiere.test.DumpPOJOLookupMapOnTestFail; import org.adempiere.warehouse.LocatorId; @@ -41,6 +40,7 @@ import de.metas.inventory.AggregationType; import de.metas.inventory.InventoryId; import de.metas.material.event.commons.AttributesKey; +import de.metas.organization.OrgId; import de.metas.product.ProductId; import de.metas.quantity.Quantity; import lombok.NonNull; diff --git a/de.metas.handlingunits.base/src/test/java/de/metas/handlingunits/trace/HUTraceEventsServiceTests.java b/de.metas.handlingunits.base/src/test/java/de/metas/handlingunits/trace/HUTraceEventsServiceTests.java index 323467be063..700524afda9 100644 --- a/de.metas.handlingunits.base/src/test/java/de/metas/handlingunits/trace/HUTraceEventsServiceTests.java +++ b/de.metas.handlingunits.base/src/test/java/de/metas/handlingunits/trace/HUTraceEventsServiceTests.java @@ -11,7 +11,6 @@ import java.util.Optional; import org.adempiere.ad.dao.IQueryBL; -import org.adempiere.service.OrgId; import org.adempiere.test.AdempiereTestHelper; import org.adempiere.util.lang.ImmutablePair; import org.adempiere.util.lang.impl.TableRecordReference; @@ -36,6 +35,7 @@ import de.metas.handlingunits.model.X_M_HU_Trace; import de.metas.handlingunits.trace.HUTraceEvent.HUTraceEventBuilder; import de.metas.logging.LogManager; +import de.metas.organization.OrgId; import de.metas.product.ProductId; import de.metas.quantity.Quantity; import de.metas.util.Services; diff --git a/de.metas.handlingunits.base/src/test/java/de/metas/handlingunits/trace/HUTraceRepositoryTests.java b/de.metas.handlingunits.base/src/test/java/de/metas/handlingunits/trace/HUTraceRepositoryTests.java index c37d3c0b0de..439b724c4f1 100644 --- a/de.metas.handlingunits.base/src/test/java/de/metas/handlingunits/trace/HUTraceRepositoryTests.java +++ b/de.metas.handlingunits.base/src/test/java/de/metas/handlingunits/trace/HUTraceRepositoryTests.java @@ -10,7 +10,6 @@ import java.util.Comparator; import java.util.List; -import org.adempiere.service.OrgId; import org.adempiere.test.AdempiereTestHelper; import org.adempiere.test.AdempiereTestWatcher; import org.junit.Before; @@ -23,6 +22,7 @@ import de.metas.handlingunits.trace.HUTraceEvent.HUTraceEventBuilder; import de.metas.handlingunits.trace.HUTraceEventQuery.RecursionMode; import de.metas.inoutcandidate.api.ShipmentScheduleId; +import de.metas.organization.OrgId; import de.metas.product.ProductId; /* diff --git a/de.metas.handlingunits.base/src/test/java/de/metas/handlingunits/trace/HUTransformTracingTests.java b/de.metas.handlingunits.base/src/test/java/de/metas/handlingunits/trace/HUTransformTracingTests.java index 9e5f4337d8b..4039d2c1604 100644 --- a/de.metas.handlingunits.base/src/test/java/de/metas/handlingunits/trace/HUTransformTracingTests.java +++ b/de.metas.handlingunits.base/src/test/java/de/metas/handlingunits/trace/HUTransformTracingTests.java @@ -11,7 +11,6 @@ import java.util.OptionalInt; import org.adempiere.ad.modelvalidator.IModelInterceptorRegistry; -import org.adempiere.service.OrgId; import org.adempiere.test.AdempiereTestWatcher; import org.compiere.model.I_AD_SysConfig; import org.junit.Before; @@ -28,6 +27,7 @@ import de.metas.handlingunits.trace.HUTraceEvent.HUTraceEventBuilder; import de.metas.handlingunits.trace.interceptor.HUTraceModuleInterceptor; import de.metas.handlingunits.trace.repository.RetrieveDbRecordsUtil; +import de.metas.organization.OrgId; import de.metas.util.Services; import de.metas.util.StringUtils; diff --git a/de.metas.handlingunits.base/src/test/java/de/metas/handlingunits/trace/repository/RetrieveDbRecordsUtilTest.java b/de.metas.handlingunits.base/src/test/java/de/metas/handlingunits/trace/repository/RetrieveDbRecordsUtilTest.java index aa11917f1e3..3fcaa7a2b1a 100644 --- a/de.metas.handlingunits.base/src/test/java/de/metas/handlingunits/trace/repository/RetrieveDbRecordsUtilTest.java +++ b/de.metas.handlingunits.base/src/test/java/de/metas/handlingunits/trace/repository/RetrieveDbRecordsUtilTest.java @@ -9,7 +9,6 @@ import org.adempiere.ad.dao.IQueryBL; import org.adempiere.ad.dao.IQueryBuilder; -import org.adempiere.service.OrgId; import org.adempiere.test.AdempiereTestHelper; import org.adempiere.test.AdempiereTestWatcher; import org.compiere.util.TimeUtil; @@ -22,6 +21,7 @@ import de.metas.handlingunits.trace.HUTraceEvent; import de.metas.handlingunits.trace.HUTraceEventQuery; import de.metas.handlingunits.trace.HUTraceEventQuery.RecursionMode; +import de.metas.organization.OrgId; import de.metas.handlingunits.trace.HUTraceRepository; import de.metas.handlingunits.trace.HUTraceRepositoryTests; import de.metas.handlingunits.trace.HUTraceType; diff --git a/de.metas.handlingunits.client/src/main/java/de/metas/handlingunits/client/terminal/pporder/view/HUIssuePanel.java b/de.metas.handlingunits.client/src/main/java/de/metas/handlingunits/client/terminal/pporder/view/HUIssuePanel.java index 3a0c2d96016..37a66b61117 100644 --- a/de.metas.handlingunits.client/src/main/java/de/metas/handlingunits/client/terminal/pporder/view/HUIssuePanel.java +++ b/de.metas.handlingunits.client/src/main/java/de/metas/handlingunits/client/terminal/pporder/view/HUIssuePanel.java @@ -36,7 +36,6 @@ import org.adempiere.ad.trx.api.ITrx; import org.adempiere.exceptions.AdempiereException; import org.adempiere.model.InterfaceWrapperHelper; -import org.adempiere.service.OrgId; import org.adempiere.util.beans.WeakPropertyChangeSupport; import org.adempiere.util.lang.IContextAware; import org.compiere.apps.form.FormFrame; @@ -90,6 +89,7 @@ import de.metas.handlingunits.model.X_M_HU; import de.metas.handlingunits.pporder.api.IHUPPOrderBL; import de.metas.i18n.IMsgBL; +import de.metas.organization.OrgId; import de.metas.product.IProductDAO; import de.metas.util.Check; import de.metas.util.Services; diff --git a/de.metas.inbound.mail/src/main/java/de/metas/inbound/mail/config/InboundEMailConfig.java b/de.metas.inbound.mail/src/main/java/de/metas/inbound/mail/config/InboundEMailConfig.java index b472261fa6f..68d9854875d 100644 --- a/de.metas.inbound.mail/src/main/java/de/metas/inbound/mail/config/InboundEMailConfig.java +++ b/de.metas.inbound.mail/src/main/java/de/metas/inbound/mail/config/InboundEMailConfig.java @@ -1,8 +1,8 @@ package de.metas.inbound.mail.config; import org.adempiere.service.ClientId; -import org.adempiere.service.OrgId; +import de.metas.organization.OrgId; import de.metas.request.RequestTypeId; import de.metas.util.Check; import lombok.Builder; diff --git a/de.metas.inbound.mail/src/main/java/de/metas/inbound/mail/config/InboundEMailConfigRepository.java b/de.metas.inbound.mail/src/main/java/de/metas/inbound/mail/config/InboundEMailConfigRepository.java index 995cb114174..56ed63d7203 100644 --- a/de.metas.inbound.mail/src/main/java/de/metas/inbound/mail/config/InboundEMailConfigRepository.java +++ b/de.metas.inbound.mail/src/main/java/de/metas/inbound/mail/config/InboundEMailConfigRepository.java @@ -7,7 +7,6 @@ import org.adempiere.ad.dao.IQueryBL; import org.adempiere.exceptions.AdempiereException; import org.adempiere.service.ClientId; -import org.adempiere.service.OrgId; import org.compiere.Adempiere; import org.springframework.context.annotation.DependsOn; import org.springframework.stereotype.Repository; @@ -17,6 +16,7 @@ import de.metas.cache.CCache; import de.metas.inbound.mail.model.I_C_InboundMailConfig; +import de.metas.organization.OrgId; import de.metas.request.RequestTypeId; import de.metas.util.GuavaCollectors; import de.metas.util.Services; diff --git a/de.metas.material/cockpit/src/main/java/de/metas/material/cockpit/availableforsales/AvailableForSalesConfigRepo.java b/de.metas.material/cockpit/src/main/java/de/metas/material/cockpit/availableforsales/AvailableForSalesConfigRepo.java index b98518423a1..5b394be64f1 100644 --- a/de.metas.material/cockpit/src/main/java/de/metas/material/cockpit/availableforsales/AvailableForSalesConfigRepo.java +++ b/de.metas.material/cockpit/src/main/java/de/metas/material/cockpit/availableforsales/AvailableForSalesConfigRepo.java @@ -4,11 +4,11 @@ import org.adempiere.ad.dao.IQueryBL; import org.adempiere.service.ClientId; -import org.adempiere.service.OrgId; import org.springframework.stereotype.Repository; import de.metas.cache.CCache; import de.metas.material.cockpit.model.I_MD_AvailableForSales_Config; +import de.metas.organization.OrgId; import de.metas.util.ColorId; import de.metas.util.Services; import lombok.Builder; diff --git a/de.metas.material/cockpit/src/main/java/de/metas/material/cockpit/availableforsales/interceptor/C_Order.java b/de.metas.material/cockpit/src/main/java/de/metas/material/cockpit/availableforsales/interceptor/C_Order.java index 0662506b995..f99e20e5547 100644 --- a/de.metas.material/cockpit/src/main/java/de/metas/material/cockpit/availableforsales/interceptor/C_Order.java +++ b/de.metas.material/cockpit/src/main/java/de/metas/material/cockpit/availableforsales/interceptor/C_Order.java @@ -5,7 +5,6 @@ import org.adempiere.ad.modelvalidator.annotations.Interceptor; import org.adempiere.ad.modelvalidator.annotations.ModelChange; import org.adempiere.service.ClientId; -import org.adempiere.service.OrgId; import org.compiere.model.I_C_Order; import org.compiere.model.ModelValidator; import org.springframework.stereotype.Component; @@ -14,6 +13,7 @@ import de.metas.material.cockpit.availableforsales.AvailableForSalesConfigRepo; import de.metas.material.cockpit.availableforsales.AvailableForSalesConfigRepo.ConfigQuery; import de.metas.material.cockpit.availableforsales.interceptor.AvailableForSalesUtil.CheckAvailableForSalesRequest; +import de.metas.organization.OrgId; import lombok.NonNull; /* diff --git a/de.metas.material/cockpit/src/main/java/de/metas/material/cockpit/availableforsales/interceptor/C_OrderLine.java b/de.metas.material/cockpit/src/main/java/de/metas/material/cockpit/availableforsales/interceptor/C_OrderLine.java index 92a218fcf2a..f4b210fb5d1 100644 --- a/de.metas.material/cockpit/src/main/java/de/metas/material/cockpit/availableforsales/interceptor/C_OrderLine.java +++ b/de.metas.material/cockpit/src/main/java/de/metas/material/cockpit/availableforsales/interceptor/C_OrderLine.java @@ -3,7 +3,6 @@ import org.adempiere.ad.modelvalidator.annotations.Interceptor; import org.adempiere.ad.modelvalidator.annotations.ModelChange; import org.adempiere.service.ClientId; -import org.adempiere.service.OrgId; import org.compiere.model.ModelValidator; import org.springframework.stereotype.Component; @@ -14,6 +13,7 @@ import de.metas.material.cockpit.availableforsales.AvailableForSalesConfigRepo.ConfigQuery; import de.metas.material.cockpit.availableforsales.interceptor.AvailableForSalesUtil.CheckAvailableForSalesRequest; import de.metas.material.cockpit.availableforsales.model.I_C_OrderLine; +import de.metas.organization.OrgId; import lombok.NonNull; /* diff --git a/de.metas.material/planning/src/main/java/de/metas/material/planning/IProductPlanningDAO.java b/de.metas.material/planning/src/main/java/de/metas/material/planning/IProductPlanningDAO.java index c6fe02e13f1..7d157561c8c 100644 --- a/de.metas.material/planning/src/main/java/de/metas/material/planning/IProductPlanningDAO.java +++ b/de.metas.material/planning/src/main/java/de/metas/material/planning/IProductPlanningDAO.java @@ -28,7 +28,6 @@ import javax.annotation.Nullable; import org.adempiere.mm.attributes.AttributeSetInstanceId; -import org.adempiere.service.OrgId; import org.adempiere.warehouse.WarehouseId; import org.compiere.model.I_AD_Org; import org.compiere.model.I_M_Warehouse; @@ -37,6 +36,7 @@ import org.eevolution.model.I_PP_Product_Planning; import de.metas.material.planning.exception.NoPlantForWarehouseException; +import de.metas.organization.OrgId; import de.metas.product.ProductId; import de.metas.product.ResourceId; import de.metas.util.ISingletonService; diff --git a/de.metas.material/planning/src/main/java/de/metas/material/planning/ddorder/DDOrderPojoSupplier.java b/de.metas.material/planning/src/main/java/de/metas/material/planning/ddorder/DDOrderPojoSupplier.java index 354504e6020..34041c92ecb 100644 --- a/de.metas.material/planning/src/main/java/de/metas/material/planning/ddorder/DDOrderPojoSupplier.java +++ b/de.metas.material/planning/src/main/java/de/metas/material/planning/ddorder/DDOrderPojoSupplier.java @@ -11,7 +11,6 @@ import javax.annotation.Nullable; import org.adempiere.mm.attributes.api.PlainAttributeSetInstanceAware; -import org.adempiere.service.OrgId; import org.adempiere.warehouse.WarehouseId; import org.adempiere.warehouse.api.IWarehouseBL; import org.compiere.model.I_M_Locator; @@ -33,6 +32,7 @@ import de.metas.material.planning.IMaterialPlanningContext; import de.metas.material.planning.IMaterialRequest; import de.metas.material.planning.exception.MrpException; +import de.metas.organization.OrgId; import de.metas.quantity.Quantity; import de.metas.uom.IUOMConversionBL; import de.metas.util.Loggables; diff --git a/de.metas.material/planning/src/main/java/de/metas/material/planning/ddorder/DDOrderUtil.java b/de.metas.material/planning/src/main/java/de/metas/material/planning/ddorder/DDOrderUtil.java index 673eed30940..6c3f3015d5a 100644 --- a/de.metas.material/planning/src/main/java/de/metas/material/planning/ddorder/DDOrderUtil.java +++ b/de.metas.material/planning/src/main/java/de/metas/material/planning/ddorder/DDOrderUtil.java @@ -7,7 +7,6 @@ import org.adempiere.ad.trx.api.ITrx; import org.adempiere.model.InterfaceWrapperHelper; -import org.adempiere.service.OrgId; import org.adempiere.warehouse.WarehouseId; import org.adempiere.warehouse.api.IWarehouseDAO; import org.compiere.model.I_AD_Org; @@ -18,6 +17,7 @@ import de.metas.bpartner.BPartnerLocationId; import de.metas.bpartner.service.IBPartnerOrgBL; import de.metas.material.planning.exception.MrpException; +import de.metas.organization.OrgId; import de.metas.util.Check; import de.metas.util.Services; import lombok.NonNull; diff --git a/de.metas.material/planning/src/main/java/de/metas/material/planning/event/SupplyRequiredHandler.java b/de.metas.material/planning/src/main/java/de/metas/material/planning/event/SupplyRequiredHandler.java index 8a555e87b65..f8738076049 100644 --- a/de.metas.material/planning/src/main/java/de/metas/material/planning/event/SupplyRequiredHandler.java +++ b/de.metas.material/planning/src/main/java/de/metas/material/planning/event/SupplyRequiredHandler.java @@ -8,7 +8,6 @@ import org.adempiere.ad.trx.api.ITrx; import org.adempiere.mm.attributes.AttributeSetInstanceId; -import org.adempiere.service.OrgId; import org.adempiere.warehouse.WarehouseId; import org.compiere.model.I_AD_Org; import org.compiere.model.I_M_Product; @@ -38,6 +37,7 @@ import de.metas.material.planning.ddorder.DDOrderAdvisedEventCreator; import de.metas.material.planning.ddorder.DDOrderPojoSupplier; import de.metas.material.planning.pporder.PPOrderAdvisedEventCreator; +import de.metas.organization.OrgId; import de.metas.product.ProductId; import de.metas.product.ResourceId; import de.metas.util.Loggables; diff --git a/de.metas.material/planning/src/main/java/de/metas/material/planning/exception/NoPlantForWarehouseException.java b/de.metas.material/planning/src/main/java/de/metas/material/planning/exception/NoPlantForWarehouseException.java index 2c6dfba7d32..85ca58a75ce 100644 --- a/de.metas.material/planning/src/main/java/de/metas/material/planning/exception/NoPlantForWarehouseException.java +++ b/de.metas.material/planning/src/main/java/de/metas/material/planning/exception/NoPlantForWarehouseException.java @@ -13,10 +13,10 @@ *****************************************************************************/ package de.metas.material.planning.exception; -import org.adempiere.service.OrgId; import org.adempiere.warehouse.WarehouseId; import org.adempiere.warehouse.api.IWarehouseDAO; +import de.metas.organization.OrgId; import de.metas.product.ProductId; import de.metas.util.Services; diff --git a/de.metas.material/planning/src/main/java/de/metas/material/planning/impl/ProductPlanningDAO.java b/de.metas.material/planning/src/main/java/de/metas/material/planning/impl/ProductPlanningDAO.java index 573ce2ff6d5..308d0810e81 100644 --- a/de.metas.material/planning/src/main/java/de/metas/material/planning/impl/ProductPlanningDAO.java +++ b/de.metas.material/planning/src/main/java/de/metas/material/planning/impl/ProductPlanningDAO.java @@ -36,7 +36,6 @@ import org.adempiere.ad.trx.api.ITrx; import org.adempiere.mm.attributes.AttributeSetInstanceId; import org.adempiere.mm.attributes.api.AttributesKeys; -import org.adempiere.service.OrgId; import org.adempiere.util.proxy.Cached; import org.adempiere.warehouse.WarehouseId; import org.compiere.model.I_AD_Org; @@ -52,6 +51,7 @@ import de.metas.material.planning.IProductPlanningDAO; import de.metas.material.planning.IResourceDAO; import de.metas.material.planning.exception.NoPlantForWarehouseException; +import de.metas.organization.OrgId; import de.metas.product.ProductId; import de.metas.product.ResourceId; import de.metas.util.Check; diff --git a/de.metas.material/planning/src/test/java/de/metas/material/planning/impl/ProductPlanningDAO_findTest.java b/de.metas.material/planning/src/test/java/de/metas/material/planning/impl/ProductPlanningDAO_findTest.java index e8874b5d128..2d2872e216b 100644 --- a/de.metas.material/planning/src/test/java/de/metas/material/planning/impl/ProductPlanningDAO_findTest.java +++ b/de.metas.material/planning/src/test/java/de/metas/material/planning/impl/ProductPlanningDAO_findTest.java @@ -9,7 +9,6 @@ import org.adempiere.mm.attributes.api.ASICopy; import org.adempiere.mm.attributes.api.AttributeConstants; import org.adempiere.mm.attributes.api.impl.AttributesTestHelper; -import org.adempiere.service.OrgId; import org.adempiere.test.AdempiereTestHelper; import org.adempiere.test.AdempiereTestWatcher; import org.adempiere.warehouse.WarehouseId; @@ -28,6 +27,7 @@ import de.metas.business.BusinessTestHelper; import de.metas.material.planning.IProductPlanningDAO.ProductPlanningQuery; +import de.metas.organization.OrgId; import de.metas.product.ProductId; import de.metas.product.ResourceId; diff --git a/de.metas.materialtracking/src/main/java/de/metas/materialtracking/qualityBasedInvoicing/ic/spi/impl/InvoiceCandidateWriter.java b/de.metas.materialtracking/src/main/java/de/metas/materialtracking/qualityBasedInvoicing/ic/spi/impl/InvoiceCandidateWriter.java index d94d28783ba..f84d87c2cb2 100644 --- a/de.metas.materialtracking/src/main/java/de/metas/materialtracking/qualityBasedInvoicing/ic/spi/impl/InvoiceCandidateWriter.java +++ b/de.metas.materialtracking/src/main/java/de/metas/materialtracking/qualityBasedInvoicing/ic/spi/impl/InvoiceCandidateWriter.java @@ -36,7 +36,6 @@ import org.adempiere.ad.trx.api.ITrxManager; import org.adempiere.model.InterfaceWrapperHelper; import org.adempiere.service.ClientId; -import org.adempiere.service.OrgId; import org.adempiere.util.lang.IContextAware; import org.adempiere.warehouse.WarehouseId; import org.compiere.model.IQuery.Aggregate; @@ -63,6 +62,7 @@ import de.metas.materialtracking.qualityBasedInvoicing.invoicing.IQualityInvoiceLineGroup; import de.metas.materialtracking.qualityBasedInvoicing.invoicing.QualityInvoiceLineGroupByTypeComparator; import de.metas.materialtracking.qualityBasedInvoicing.invoicing.QualityInvoiceLineGroupType; +import de.metas.organization.OrgId; import de.metas.pricing.IPricingResult; import de.metas.pricing.PriceListVersionId; import de.metas.pricing.PricingSystemId; diff --git a/de.metas.payment.esr/src/main/java/de/metas/payment/esr/api/IESRImportDAO.java b/de.metas.payment.esr/src/main/java/de/metas/payment/esr/api/IESRImportDAO.java index 00f67de3422..38329ac6c17 100644 --- a/de.metas.payment.esr/src/main/java/de/metas/payment/esr/api/IESRImportDAO.java +++ b/de.metas.payment.esr/src/main/java/de/metas/payment/esr/api/IESRImportDAO.java @@ -26,13 +26,13 @@ import java.util.List; import java.util.Properties; -import org.adempiere.service.OrgId; import org.compiere.model.I_C_Invoice; import org.compiere.model.I_C_Payment; import de.metas.banking.model.I_C_BankStatementLine; import de.metas.banking.model.I_C_BankStatementLine_Ref; import de.metas.document.refid.model.I_C_ReferenceNo_Doc; +import de.metas.organization.OrgId; import de.metas.payment.esr.model.I_ESR_Import; import de.metas.payment.esr.model.I_ESR_ImportLine; import de.metas.util.ISingletonService; diff --git a/de.metas.payment.esr/src/main/java/de/metas/payment/esr/api/impl/AbstractESRImportDAO.java b/de.metas.payment.esr/src/main/java/de/metas/payment/esr/api/impl/AbstractESRImportDAO.java index 06047a2b07b..c6849f9ff70 100644 --- a/de.metas.payment.esr/src/main/java/de/metas/payment/esr/api/impl/AbstractESRImportDAO.java +++ b/de.metas.payment.esr/src/main/java/de/metas/payment/esr/api/impl/AbstractESRImportDAO.java @@ -32,7 +32,6 @@ import org.adempiere.ad.dao.impl.CompareQueryFilter.Operator; import org.adempiere.exceptions.AdempiereException; import org.adempiere.model.InterfaceWrapperHelper; -import org.adempiere.service.OrgId; import org.adempiere.util.comparator.AccessorComparator; import org.adempiere.util.comparator.ComparableComparator; import org.adempiere.util.comparator.ComparatorChain; @@ -45,6 +44,7 @@ import de.metas.document.refid.model.I_C_ReferenceNo; import de.metas.document.refid.model.I_C_ReferenceNo_Doc; import de.metas.document.refid.model.I_C_ReferenceNo_Type; +import de.metas.organization.OrgId; import de.metas.payment.esr.ESRConstants; import de.metas.payment.esr.api.IESRImportDAO; import de.metas.payment.esr.model.I_ESR_Import; diff --git a/de.metas.payment.esr/src/main/java/de/metas/payment/esr/api/impl/ESRImportBL.java b/de.metas.payment.esr/src/main/java/de/metas/payment/esr/api/impl/ESRImportBL.java index 8811690685b..138a8d60486 100644 --- a/de.metas.payment.esr/src/main/java/de/metas/payment/esr/api/impl/ESRImportBL.java +++ b/de.metas.payment.esr/src/main/java/de/metas/payment/esr/api/impl/ESRImportBL.java @@ -32,12 +32,10 @@ import org.adempiere.invoice.service.IInvoiceBL; import org.adempiere.invoice.service.IInvoiceDAO; import org.adempiere.model.InterfaceWrapperHelper; -import org.adempiere.service.IOrgDAO; import org.adempiere.service.ISysConfigBL; import org.adempiere.util.lang.IMutable; import org.adempiere.util.lang.Mutable; import org.compiere.acct.Doc; -import org.compiere.model.I_AD_Org; import org.compiere.model.I_C_BPartner; import org.compiere.model.I_C_Invoice; import org.compiere.model.I_C_Payment; @@ -65,6 +63,7 @@ import de.metas.i18n.IMsgBL; import de.metas.lock.api.ILockManager; import de.metas.logging.LogManager; +import de.metas.organization.IOrgDAO; import de.metas.payment.api.DefaultPaymentBuilder.TenderType; import de.metas.payment.api.IPaymentBL; import de.metas.payment.esr.ESRConstants; @@ -426,14 +425,9 @@ private ArrayKey mkESRLineKey(final I_ESR_ImportLine line) public int process(final I_ESR_Import esrImport) { final IMutable processedLinesCount = new Mutable<>(); - lockAndProcess(esrImport, new Runnable() - { - @Override - public void run() - { - final int count = process0(esrImport); - processedLinesCount.setValue(count); - } + lockAndProcess(esrImport, () -> { + final int count = process0(esrImport); + processedLinesCount.setValue(count); }); return processedLinesCount.getValue(); @@ -841,20 +835,15 @@ public void linkInvoiceToPayment(final I_ESR_ImportLine importLine) final ITrxManager trxManager = Services.get(ITrxManager.class); final String trxName = trxManager.getThreadInheritedTrxName(OnTrxMissingPolicy.ReturnTrxNone); - trxManager.run(trxName, new TrxRunnable() - { - @Override - public void run(final String trxName) throws Exception - { - // must assure that the invoice has transaction - refresh(invoice, trxName); - - final boolean ignoreIsAutoAllocateAvailableAmt = true; // task 09167: when processing ESR lines (i.e. from this method) we always allocate the payment to the invoice. - Services.get(IAllocationBL.class).autoAllocateSpecificPayment(invoice, - create(payment, de.metas.banking.model.I_C_Payment.class), - ignoreIsAutoAllocateAvailableAmt); - save(importLine); // saving, because updateLinesOpenAmt doesn't save the line it was called with - } + trxManager.run(trxName, (TrxRunnable)trxName1 -> { + // must assure that the invoice has transaction + refresh(invoice, trxName1); + + final boolean ignoreIsAutoAllocateAvailableAmt = true; // task 09167: when processing ESR lines (i.e. from this method) we always allocate the payment to the invoice. + Services.get(IAllocationBL.class).autoAllocateSpecificPayment(invoice, + create(payment, de.metas.banking.model.I_C_Payment.class), + ignoreIsAutoAllocateAvailableAmt); + save(importLine); // saving, because updateLinesOpenAmt doesn't save the line it was called with }); } @@ -1044,12 +1033,13 @@ else if (invoice.isPaid()) if (invoice.getAD_Org_ID() != importLine.getAD_Org_ID()) { final Properties ctx = getCtx(importLine); - final I_AD_Org invoiceOrg = Services.get(IOrgDAO.class).retrieveOrg(ctx, invoice.getAD_Org_ID()); + final IOrgDAO orgsRepo = Services.get(IOrgDAO.class); + final String invoiceOrgName = orgsRepo.retrieveOrgName(invoice.getAD_Org_ID()); + final String importLineOrgName = orgsRepo.retrieveOrgName(importLine.getAD_Org_ID()); ESRDataLoaderUtil.addMatchErrorMsg(importLine, Services.get(IMsgBL.class).getMsg(ctx, ESR_NO_HAS_WRONG_ORG_2P, new Object[] { - invoiceOrg.getValue(), - importLine.getAD_Org().getValue() - })); + invoiceOrgName, + importLineOrgName})); } importLine.setC_Invoice(invoice); diff --git a/de.metas.payment.esr/src/main/java/de/metas/payment/esr/dataimporter/ESRDataLoaderUtil.java b/de.metas.payment.esr/src/main/java/de/metas/payment/esr/dataimporter/ESRDataLoaderUtil.java index 998c94b3590..6f2a0c69afb 100644 --- a/de.metas.payment.esr/src/main/java/de/metas/payment/esr/dataimporter/ESRDataLoaderUtil.java +++ b/de.metas.payment.esr/src/main/java/de/metas/payment/esr/dataimporter/ESRDataLoaderUtil.java @@ -8,8 +8,6 @@ import org.adempiere.ad.trx.api.ITrx; import org.adempiere.invoice.service.IInvoiceDAO; import org.adempiere.model.InterfaceWrapperHelper; -import org.adempiere.service.IOrgDAO; -import org.adempiere.service.OrgId; import org.compiere.model.I_AD_Org; import org.compiere.model.I_C_BPartner; import org.compiere.model.I_C_Invoice; @@ -20,6 +18,8 @@ import de.metas.document.refid.model.I_C_ReferenceNo_Doc; import de.metas.document.sequence.IDocumentNoBuilderFactory; import de.metas.i18n.IMsgBL; +import de.metas.organization.IOrgDAO; +import de.metas.organization.OrgId; import de.metas.payment.esr.api.IESRBPBankAccountDAO; import de.metas.payment.esr.api.IESRImportBL; import de.metas.payment.esr.api.IESRImportDAO; diff --git a/de.metas.payment.esr/src/test/java/de/metas/payment/esr/ESRImportTest.java b/de.metas.payment.esr/src/test/java/de/metas/payment/esr/ESRImportTest.java index 9a21ba26144..fa0ac7507da 100644 --- a/de.metas.payment.esr/src/test/java/de/metas/payment/esr/ESRImportTest.java +++ b/de.metas.payment.esr/src/test/java/de/metas/payment/esr/ESRImportTest.java @@ -45,7 +45,6 @@ import org.adempiere.invoice.service.IInvoiceBL; import org.adempiere.invoice.service.IInvoiceDAO; import org.adempiere.model.InterfaceWrapperHelper; -import org.adempiere.service.IOrgDAO; import org.adempiere.service.ISysConfigBL; import org.adempiere.service.ISysConfigDAO; import org.adempiere.util.test.RepeatRule; @@ -74,6 +73,7 @@ import de.metas.interfaces.I_C_BPartner; import de.metas.interfaces.I_C_DocType; import de.metas.lock.api.ILockManager; +import de.metas.organization.IOrgDAO; import de.metas.payment.api.IPaymentBL; import de.metas.payment.api.IPaymentDAO; import de.metas.payment.esr.actionhandler.impl.MoneyTransferedBackESRActionHandler; diff --git a/de.metas.printing.rest-api-impl/src/main/java/de/metas/printing/rest/PrintingRestController.java b/de.metas.printing.rest-api-impl/src/main/java/de/metas/printing/rest/PrintingRestController.java index feca4ccaf48..f2fc5a146b1 100644 --- a/de.metas.printing.rest-api-impl/src/main/java/de/metas/printing/rest/PrintingRestController.java +++ b/de.metas.printing.rest-api-impl/src/main/java/de/metas/printing/rest/PrintingRestController.java @@ -13,7 +13,6 @@ import org.adempiere.exceptions.AdempiereException; import org.adempiere.model.InterfaceWrapperHelper; import org.adempiere.service.ClientId; -import org.adempiere.service.OrgId; import org.compiere.util.Env; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; @@ -23,6 +22,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import de.metas.organization.OrgId; import de.metas.printing.api.IPrintingDAO; import de.metas.printing.esb.api.LoginRequest; import de.metas.printing.esb.api.LoginResponse; diff --git a/de.metas.procurement.base/src/main/java/de/metas/procurement/base/impl/PMMProductNameBuilder.java b/de.metas.procurement.base/src/main/java/de/metas/procurement/base/impl/PMMProductNameBuilder.java index d817e4d65a1..19a5e9233d1 100644 --- a/de.metas.procurement.base/src/main/java/de/metas/procurement/base/impl/PMMProductNameBuilder.java +++ b/de.metas.procurement.base/src/main/java/de/metas/procurement/base/impl/PMMProductNameBuilder.java @@ -1,7 +1,6 @@ package de.metas.procurement.base.impl; import org.adempiere.model.InterfaceWrapperHelper; -import org.adempiere.service.OrgId; import org.compiere.model.I_C_BPartner; import org.compiere.model.I_C_BPartner_Product; import org.compiere.model.I_M_AttributeSetInstance; @@ -11,6 +10,7 @@ import com.google.common.base.Optional; import de.metas.bpartner_product.IBPartnerProductDAO; +import de.metas.organization.OrgId; import de.metas.procurement.base.model.I_PMM_Product; import de.metas.util.Check; import de.metas.util.Services; diff --git a/de.metas.purchasecandidate.base/src/main/java/de/metas/purchasecandidate/PurchaseCandidate.java b/de.metas.purchasecandidate.base/src/main/java/de/metas/purchasecandidate/PurchaseCandidate.java index 3243263190d..0969267e0c0 100644 --- a/de.metas.purchasecandidate.base/src/main/java/de/metas/purchasecandidate/PurchaseCandidate.java +++ b/de.metas.purchasecandidate.base/src/main/java/de/metas/purchasecandidate/PurchaseCandidate.java @@ -11,7 +11,6 @@ import javax.annotation.Nullable; import org.adempiere.mm.attributes.AttributeSetInstanceId; -import org.adempiere.service.OrgId; import org.adempiere.util.lang.ITableRecordReference; import org.adempiere.warehouse.WarehouseId; @@ -19,6 +18,7 @@ import de.metas.bpartner.BPartnerId; import de.metas.order.OrderAndLineId; +import de.metas.organization.OrgId; import de.metas.product.ProductId; import de.metas.purchasecandidate.grossprofit.PurchaseProfitInfo; import de.metas.purchasecandidate.purchaseordercreation.remotepurchaseitem.PurchaseErrorItem; diff --git a/de.metas.purchasecandidate.base/src/main/java/de/metas/purchasecandidate/PurchaseCandidateImmutableFields.java b/de.metas.purchasecandidate.base/src/main/java/de/metas/purchasecandidate/PurchaseCandidateImmutableFields.java index 97015ce3df8..79ef61374bb 100644 --- a/de.metas.purchasecandidate.base/src/main/java/de/metas/purchasecandidate/PurchaseCandidateImmutableFields.java +++ b/de.metas.purchasecandidate.base/src/main/java/de/metas/purchasecandidate/PurchaseCandidateImmutableFields.java @@ -3,11 +3,11 @@ import javax.annotation.Nullable; import org.adempiere.mm.attributes.AttributeSetInstanceId; -import org.adempiere.service.OrgId; import org.adempiere.warehouse.WarehouseId; import de.metas.bpartner.BPartnerId; import de.metas.order.OrderAndLineId; +import de.metas.organization.OrgId; import de.metas.product.ProductId; import lombok.Builder; import lombok.NonNull; diff --git a/de.metas.purchasecandidate.base/src/main/java/de/metas/purchasecandidate/PurchaseCandidateRepository.java b/de.metas.purchasecandidate.base/src/main/java/de/metas/purchasecandidate/PurchaseCandidateRepository.java index 208b722567a..01c868fe320 100644 --- a/de.metas.purchasecandidate.base/src/main/java/de/metas/purchasecandidate/PurchaseCandidateRepository.java +++ b/de.metas.purchasecandidate.base/src/main/java/de/metas/purchasecandidate/PurchaseCandidateRepository.java @@ -20,7 +20,6 @@ import org.adempiere.ad.dao.impl.CompareQueryFilter.Operator; import org.adempiere.exceptions.AdempiereException; import org.adempiere.mm.attributes.AttributeSetInstanceId; -import org.adempiere.service.OrgId; import org.adempiere.util.lang.impl.TableRecordReference; import org.adempiere.warehouse.WarehouseId; import org.compiere.model.I_C_OrderLine; @@ -45,6 +44,7 @@ import de.metas.order.OrderAndLineId; import de.metas.order.OrderId; import de.metas.order.OrderLineId; +import de.metas.organization.OrgId; import de.metas.product.IProductDAO; import de.metas.product.ProductId; import de.metas.purchasecandidate.grossprofit.PurchaseProfitInfo; diff --git a/de.metas.purchasecandidate.base/src/main/java/de/metas/purchasecandidate/PurchaseCandidatesGroup.java b/de.metas.purchasecandidate.base/src/main/java/de/metas/purchasecandidate/PurchaseCandidatesGroup.java index e1aa135ddcf..b32dd12c213 100644 --- a/de.metas.purchasecandidate.base/src/main/java/de/metas/purchasecandidate/PurchaseCandidatesGroup.java +++ b/de.metas.purchasecandidate.base/src/main/java/de/metas/purchasecandidate/PurchaseCandidatesGroup.java @@ -8,7 +8,6 @@ import javax.annotation.Nullable; import org.adempiere.mm.attributes.AttributeSetInstanceId; -import org.adempiere.service.OrgId; import org.adempiere.warehouse.WarehouseId; import com.google.common.annotations.VisibleForTesting; @@ -17,6 +16,7 @@ import de.metas.bpartner.BPartnerId; import de.metas.order.OrderAndLineId; +import de.metas.organization.OrgId; import de.metas.product.ProductId; import de.metas.purchasecandidate.grossprofit.PurchaseProfitInfo; import de.metas.quantity.Quantity; diff --git a/de.metas.purchasecandidate.base/src/main/java/de/metas/purchasecandidate/PurchaseDemand.java b/de.metas.purchasecandidate.base/src/main/java/de/metas/purchasecandidate/PurchaseDemand.java index 1aab181ed71..ecf052d5edf 100644 --- a/de.metas.purchasecandidate.base/src/main/java/de/metas/purchasecandidate/PurchaseDemand.java +++ b/de.metas.purchasecandidate.base/src/main/java/de/metas/purchasecandidate/PurchaseDemand.java @@ -6,11 +6,11 @@ import javax.annotation.Nullable; import org.adempiere.mm.attributes.AttributeSetInstanceId; -import org.adempiere.service.OrgId; import org.adempiere.warehouse.WarehouseId; import de.metas.money.CurrencyId; import de.metas.order.OrderAndLineId; +import de.metas.organization.OrgId; import de.metas.product.ProductId; import de.metas.quantity.Quantity; import lombok.Builder; diff --git a/de.metas.purchasecandidate.base/src/main/java/de/metas/purchasecandidate/PurchaseDemandWithCandidatesService.java b/de.metas.purchasecandidate.base/src/main/java/de/metas/purchasecandidate/PurchaseDemandWithCandidatesService.java index 371cdfcaa83..24c5a5504ea 100644 --- a/de.metas.purchasecandidate.base/src/main/java/de/metas/purchasecandidate/PurchaseDemandWithCandidatesService.java +++ b/de.metas.purchasecandidate.base/src/main/java/de/metas/purchasecandidate/PurchaseDemandWithCandidatesService.java @@ -17,8 +17,6 @@ import javax.annotation.Nullable; import org.adempiere.mm.attributes.AttributeSetInstanceId; -import org.adempiere.service.IOrgDAO; -import org.adempiere.service.OrgId; import org.adempiere.warehouse.WarehouseId; import org.compiere.util.TimeUtil; import org.springframework.stereotype.Service; @@ -33,6 +31,8 @@ import de.metas.bpartner.BPartnerId; import de.metas.order.OrderAndLineId; +import de.metas.organization.IOrgDAO; +import de.metas.organization.OrgId; import de.metas.product.ProductId; import de.metas.purchasecandidate.PurchaseCandidatesGroup.PurchaseCandidatesGroupBuilder; import de.metas.purchasecandidate.grossprofit.PurchaseProfitInfo; diff --git a/de.metas.purchasecandidate.base/src/main/java/de/metas/purchasecandidate/SalesOrderLine.java b/de.metas.purchasecandidate.base/src/main/java/de/metas/purchasecandidate/SalesOrderLine.java index 8fcbec57c37..84ee6959b81 100644 --- a/de.metas.purchasecandidate.base/src/main/java/de/metas/purchasecandidate/SalesOrderLine.java +++ b/de.metas.purchasecandidate.base/src/main/java/de/metas/purchasecandidate/SalesOrderLine.java @@ -3,13 +3,13 @@ import java.time.ZonedDateTime; import org.adempiere.mm.attributes.AttributeSetInstanceId; -import org.adempiere.service.OrgId; import org.adempiere.warehouse.WarehouseId; import de.metas.money.Money; import de.metas.order.OrderAndLineId; import de.metas.order.OrderLine; import de.metas.order.OrderLineId; +import de.metas.organization.OrgId; import de.metas.product.ProductId; import de.metas.quantity.Quantity; import lombok.AccessLevel; diff --git a/de.metas.purchasecandidate.base/src/main/java/de/metas/purchasecandidate/VendorProductInfoService.java b/de.metas.purchasecandidate.base/src/main/java/de/metas/purchasecandidate/VendorProductInfoService.java index 69ee2c15c59..945ff19cb43 100644 --- a/de.metas.purchasecandidate.base/src/main/java/de/metas/purchasecandidate/VendorProductInfoService.java +++ b/de.metas.purchasecandidate.base/src/main/java/de/metas/purchasecandidate/VendorProductInfoService.java @@ -7,7 +7,6 @@ import javax.annotation.Nullable; import org.adempiere.mm.attributes.AttributeSetInstanceId; -import org.adempiere.service.OrgId; import org.compiere.model.I_C_BPartner; import org.compiere.model.I_C_BPartner_Product; import org.springframework.stereotype.Service; @@ -19,6 +18,7 @@ import de.metas.bpartner.service.IBPartnerBL; import de.metas.bpartner.service.IBPartnerDAO; import de.metas.bpartner_product.IBPartnerProductDAO; +import de.metas.organization.OrgId; import de.metas.pricing.conditions.PricingConditions; import de.metas.pricing.conditions.PricingConditionsId; import de.metas.pricing.conditions.service.IPricingConditionsRepository; diff --git a/de.metas.purchasecandidate.base/src/main/java/de/metas/purchasecandidate/material/event/PurchaseCandidateAdvisedEventCreator.java b/de.metas.purchasecandidate.base/src/main/java/de/metas/purchasecandidate/material/event/PurchaseCandidateAdvisedEventCreator.java index 7702f01b40e..4045e247ebb 100644 --- a/de.metas.purchasecandidate.base/src/main/java/de/metas/purchasecandidate/material/event/PurchaseCandidateAdvisedEventCreator.java +++ b/de.metas.purchasecandidate.base/src/main/java/de/metas/purchasecandidate/material/event/PurchaseCandidateAdvisedEventCreator.java @@ -2,13 +2,13 @@ import java.util.Optional; -import org.adempiere.service.OrgId; import org.eevolution.model.I_PP_Product_Planning; import org.springframework.stereotype.Service; import de.metas.material.event.commons.SupplyRequiredDescriptor; import de.metas.material.event.purchase.PurchaseCandidateAdvisedEvent; import de.metas.material.planning.IMutableMRPContext; +import de.metas.organization.OrgId; import de.metas.product.ProductId; import de.metas.purchasecandidate.VendorProductInfo; import de.metas.purchasecandidate.VendorProductInfoService; diff --git a/de.metas.purchasecandidate.base/src/main/java/de/metas/purchasecandidate/material/event/PurchaseCandidateRequestedHandler.java b/de.metas.purchasecandidate.base/src/main/java/de/metas/purchasecandidate/material/event/PurchaseCandidateRequestedHandler.java index cd62e3f45f3..27e49eb96df 100644 --- a/de.metas.purchasecandidate.base/src/main/java/de/metas/purchasecandidate/material/event/PurchaseCandidateRequestedHandler.java +++ b/de.metas.purchasecandidate.base/src/main/java/de/metas/purchasecandidate/material/event/PurchaseCandidateRequestedHandler.java @@ -6,7 +6,6 @@ import org.adempiere.exceptions.AdempiereException; import org.adempiere.mm.attributes.AttributeSetInstanceId; -import org.adempiere.service.OrgId; import org.adempiere.warehouse.WarehouseId; import org.compiere.model.I_C_UOM; import org.compiere.util.TimeUtil; @@ -24,6 +23,7 @@ import de.metas.material.event.purchase.PurchaseCandidateCreatedEvent; import de.metas.material.event.purchase.PurchaseCandidateRequestedEvent; import de.metas.order.OrderAndLineId; +import de.metas.organization.OrgId; import de.metas.product.Product; import de.metas.product.ProductId; import de.metas.product.ProductRepository; diff --git a/de.metas.purchasecandidate.base/src/main/java/de/metas/purchasecandidate/material/event/PurchaseSupplyRequiredHandler.java b/de.metas.purchasecandidate.base/src/main/java/de/metas/purchasecandidate/material/event/PurchaseSupplyRequiredHandler.java index 37c7534ff00..bdc6adfdd91 100644 --- a/de.metas.purchasecandidate.base/src/main/java/de/metas/purchasecandidate/material/event/PurchaseSupplyRequiredHandler.java +++ b/de.metas.purchasecandidate.base/src/main/java/de/metas/purchasecandidate/material/event/PurchaseSupplyRequiredHandler.java @@ -6,7 +6,6 @@ import org.adempiere.ad.trx.api.ITrx; import org.adempiere.mm.attributes.AttributeSetInstanceId; -import org.adempiere.service.OrgId; import org.adempiere.warehouse.WarehouseId; import org.compiere.model.I_AD_Org; import org.compiere.model.I_M_Product; @@ -31,6 +30,7 @@ import de.metas.material.planning.IMutableMRPContext; import de.metas.material.planning.IProductPlanningDAO; import de.metas.material.planning.IProductPlanningDAO.ProductPlanningQuery; +import de.metas.organization.OrgId; import de.metas.product.ProductId; import de.metas.product.ResourceId; import de.metas.util.Loggables; diff --git a/de.metas.purchasecandidate.base/src/main/java/de/metas/purchasecandidate/purchaseordercreation/localorder/PurchaseCandidateAggregate.java b/de.metas.purchasecandidate.base/src/main/java/de/metas/purchasecandidate/purchaseordercreation/localorder/PurchaseCandidateAggregate.java index 17b6c11e491..f2a81718a99 100644 --- a/de.metas.purchasecandidate.base/src/main/java/de/metas/purchasecandidate/purchaseordercreation/localorder/PurchaseCandidateAggregate.java +++ b/de.metas.purchasecandidate.base/src/main/java/de/metas/purchasecandidate/purchaseordercreation/localorder/PurchaseCandidateAggregate.java @@ -8,7 +8,6 @@ import org.adempiere.exceptions.AdempiereException; import org.adempiere.mm.attributes.AttributeSetInstanceId; -import org.adempiere.service.OrgId; import org.adempiere.warehouse.WarehouseId; import org.compiere.util.TimeUtil; @@ -16,6 +15,7 @@ import com.google.common.collect.ImmutableSet; import de.metas.order.OrderAndLineId; +import de.metas.organization.OrgId; import de.metas.product.ProductId; import de.metas.purchasecandidate.PurchaseCandidate; import de.metas.purchasecandidate.PurchaseCandidateId; diff --git a/de.metas.purchasecandidate.base/src/main/java/de/metas/purchasecandidate/purchaseordercreation/localorder/PurchaseCandidateAggregateKey.java b/de.metas.purchasecandidate.base/src/main/java/de/metas/purchasecandidate/purchaseordercreation/localorder/PurchaseCandidateAggregateKey.java index 334866cd94a..9547bc0178b 100644 --- a/de.metas.purchasecandidate.base/src/main/java/de/metas/purchasecandidate/purchaseordercreation/localorder/PurchaseCandidateAggregateKey.java +++ b/de.metas.purchasecandidate.base/src/main/java/de/metas/purchasecandidate/purchaseordercreation/localorder/PurchaseCandidateAggregateKey.java @@ -1,9 +1,9 @@ package de.metas.purchasecandidate.purchaseordercreation.localorder; import org.adempiere.mm.attributes.AttributeSetInstanceId; -import org.adempiere.service.OrgId; import org.adempiere.warehouse.WarehouseId; +import de.metas.organization.OrgId; import de.metas.product.ProductId; import de.metas.purchasecandidate.PurchaseCandidate; import lombok.Builder; diff --git a/de.metas.purchasecandidate.base/src/main/java/de/metas/purchasecandidate/purchaseordercreation/localorder/PurchaseOrderAggregationKey.java b/de.metas.purchasecandidate.base/src/main/java/de/metas/purchasecandidate/purchaseordercreation/localorder/PurchaseOrderAggregationKey.java index 48450264787..a2b2609ea04 100644 --- a/de.metas.purchasecandidate.base/src/main/java/de/metas/purchasecandidate/purchaseordercreation/localorder/PurchaseOrderAggregationKey.java +++ b/de.metas.purchasecandidate.base/src/main/java/de/metas/purchasecandidate/purchaseordercreation/localorder/PurchaseOrderAggregationKey.java @@ -2,10 +2,10 @@ import java.time.ZonedDateTime; -import org.adempiere.service.OrgId; import org.adempiere.warehouse.WarehouseId; import de.metas.bpartner.BPartnerId; +import de.metas.organization.OrgId; import de.metas.purchasecandidate.PurchaseCandidate; import de.metas.purchasecandidate.purchaseordercreation.remotepurchaseitem.PurchaseOrderItem; import lombok.Builder; diff --git a/de.metas.purchasecandidate.base/src/main/java/de/metas/purchasecandidate/purchaseordercreation/remoteorder/RealVendorGatewayInvoker.java b/de.metas.purchasecandidate.base/src/main/java/de/metas/purchasecandidate/purchaseordercreation/remoteorder/RealVendorGatewayInvoker.java index 8e36816c642..e33831c43d3 100644 --- a/de.metas.purchasecandidate.base/src/main/java/de/metas/purchasecandidate/purchaseordercreation/remoteorder/RealVendorGatewayInvoker.java +++ b/de.metas.purchasecandidate.base/src/main/java/de/metas/purchasecandidate/purchaseordercreation/remoteorder/RealVendorGatewayInvoker.java @@ -5,7 +5,6 @@ import java.util.List; import java.util.Map; -import org.adempiere.service.OrgId; import org.adempiere.util.lang.ITableRecordReference; import org.adempiere.util.lang.impl.TableRecordReference; import org.compiere.model.I_C_UOM; @@ -16,6 +15,7 @@ import de.metas.bpartner.BPartnerId; import de.metas.order.OrderAndLineId; +import de.metas.organization.OrgId; import de.metas.purchasecandidate.PurchaseCandidate; import de.metas.purchasecandidate.PurchaseCandidateId; import de.metas.purchasecandidate.purchaseordercreation.remotepurchaseitem.PurchaseErrorItem; diff --git a/de.metas.purchasecandidate.base/src/main/java/de/metas/purchasecandidate/purchaseordercreation/remoteorder/VendorGatewayInvokerFactory.java b/de.metas.purchasecandidate.base/src/main/java/de/metas/purchasecandidate/purchaseordercreation/remoteorder/VendorGatewayInvokerFactory.java index de73afc7c4e..3c14489f15b 100644 --- a/de.metas.purchasecandidate.base/src/main/java/de/metas/purchasecandidate/purchaseordercreation/remoteorder/VendorGatewayInvokerFactory.java +++ b/de.metas.purchasecandidate.base/src/main/java/de/metas/purchasecandidate/purchaseordercreation/remoteorder/VendorGatewayInvokerFactory.java @@ -3,12 +3,12 @@ import java.util.Optional; import java.util.function.Supplier; -import org.adempiere.service.OrgId; import org.compiere.Adempiere; import org.compiere.util.Env; import org.springframework.stereotype.Service; import de.metas.bpartner.BPartnerId; +import de.metas.organization.OrgId; import de.metas.util.Check; import de.metas.vendor.gateway.api.VendorGatewayRegistry; import de.metas.vendor.gateway.api.VendorGatewayService; diff --git a/de.metas.purchasecandidate.base/src/main/java/de/metas/purchasecandidate/purchaseordercreation/remotepurchaseitem/PurchaseErrorItem.java b/de.metas.purchasecandidate.base/src/main/java/de/metas/purchasecandidate/purchaseordercreation/remotepurchaseitem/PurchaseErrorItem.java index 086c02a03b4..d5c69460a96 100644 --- a/de.metas.purchasecandidate.base/src/main/java/de/metas/purchasecandidate/purchaseordercreation/remotepurchaseitem/PurchaseErrorItem.java +++ b/de.metas.purchasecandidate.base/src/main/java/de/metas/purchasecandidate/purchaseordercreation/remotepurchaseitem/PurchaseErrorItem.java @@ -2,9 +2,9 @@ import javax.annotation.Nullable; -import org.adempiere.service.OrgId; import org.adempiere.util.lang.ITableRecordReference; +import de.metas.organization.OrgId; import de.metas.purchasecandidate.PurchaseCandidateId; import de.metas.util.Check; import lombok.Builder; diff --git a/de.metas.purchasecandidate.base/src/main/java/de/metas/purchasecandidate/purchaseordercreation/remotepurchaseitem/PurchaseOrderItem.java b/de.metas.purchasecandidate.base/src/main/java/de/metas/purchasecandidate/purchaseordercreation/remotepurchaseitem/PurchaseOrderItem.java index a0d2578e47a..c7a48937956 100644 --- a/de.metas.purchasecandidate.base/src/main/java/de/metas/purchasecandidate/purchaseordercreation/remotepurchaseitem/PurchaseOrderItem.java +++ b/de.metas.purchasecandidate.base/src/main/java/de/metas/purchasecandidate/purchaseordercreation/remotepurchaseitem/PurchaseOrderItem.java @@ -4,7 +4,6 @@ import javax.annotation.Nullable; -import org.adempiere.service.OrgId; import org.adempiere.util.lang.ITableRecordReference; import org.adempiere.warehouse.WarehouseId; @@ -13,6 +12,7 @@ import de.metas.bpartner.BPartnerId; import de.metas.order.OrderAndLineId; import de.metas.order.OrderId; +import de.metas.organization.OrgId; import de.metas.product.ProductId; import de.metas.purchasecandidate.PurchaseCandidate; import de.metas.purchasecandidate.PurchaseCandidateId; diff --git a/de.metas.purchasecandidate.base/src/test/java/de/metas/purchasecandidate/PurchaseCandidateTestTool.java b/de.metas.purchasecandidate.base/src/test/java/de/metas/purchasecandidate/PurchaseCandidateTestTool.java index 4c3347b4d0c..2dec26e5e3d 100644 --- a/de.metas.purchasecandidate.base/src/test/java/de/metas/purchasecandidate/PurchaseCandidateTestTool.java +++ b/de.metas.purchasecandidate.base/src/test/java/de/metas/purchasecandidate/PurchaseCandidateTestTool.java @@ -3,7 +3,6 @@ import java.time.temporal.ChronoUnit; import org.adempiere.mm.attributes.AttributeSetInstanceId; -import org.adempiere.service.OrgId; import org.adempiere.warehouse.WarehouseId; import de.metas.bpartner.BPartnerId; @@ -12,6 +11,7 @@ import de.metas.order.OrderAndLineId; import de.metas.order.OrderId; import de.metas.order.OrderLineId; +import de.metas.organization.OrgId; import de.metas.product.ProductId; import de.metas.purchasecandidate.grossprofit.PurchaseProfitInfo; import de.metas.quantity.Quantity; diff --git a/de.metas.purchasecandidate.base/src/test/java/de/metas/purchasecandidate/PurchaseCandidatesGroupTest.java b/de.metas.purchasecandidate.base/src/test/java/de/metas/purchasecandidate/PurchaseCandidatesGroupTest.java index 66bade0044c..2ffec67d73d 100644 --- a/de.metas.purchasecandidate.base/src/test/java/de/metas/purchasecandidate/PurchaseCandidatesGroupTest.java +++ b/de.metas.purchasecandidate.base/src/test/java/de/metas/purchasecandidate/PurchaseCandidatesGroupTest.java @@ -7,7 +7,6 @@ import java.time.ZonedDateTime; import org.adempiere.mm.attributes.AttributeSetInstanceId; -import org.adempiere.service.OrgId; import org.adempiere.test.AdempiereTestHelper; import org.adempiere.warehouse.WarehouseId; import org.compiere.model.I_C_UOM; @@ -17,6 +16,7 @@ import com.google.common.collect.ImmutableList; import de.metas.bpartner.BPartnerId; +import de.metas.organization.OrgId; import de.metas.pricing.conditions.PricingConditions; import de.metas.product.ProductAndCategoryAndManufacturerId; import de.metas.quantity.Quantity; diff --git a/de.metas.purchasecandidate.base/src/test/java/de/metas/purchasecandidate/PurchaseDemandWithCandidatesServiceTest.java b/de.metas.purchasecandidate.base/src/test/java/de/metas/purchasecandidate/PurchaseDemandWithCandidatesServiceTest.java index 244581b05d6..b63c9a28286 100644 --- a/de.metas.purchasecandidate.base/src/test/java/de/metas/purchasecandidate/PurchaseDemandWithCandidatesServiceTest.java +++ b/de.metas.purchasecandidate.base/src/test/java/de/metas/purchasecandidate/PurchaseDemandWithCandidatesServiceTest.java @@ -12,7 +12,6 @@ import java.util.Optional; import org.adempiere.mm.attributes.AttributeSetInstanceId; -import org.adempiere.service.OrgId; import org.adempiere.test.AdempiereTestHelper; import org.adempiere.warehouse.WarehouseId; import org.compiere.model.I_C_Currency; @@ -46,6 +45,7 @@ import de.metas.money.grossprofit.ProfitPriceActualFactory; import de.metas.order.OrderAndLineId; import de.metas.order.grossprofit.OrderLineWithGrossProfitPriceRepository; +import de.metas.organization.OrgId; import de.metas.payment.grossprofit.PaymentProfitPriceActualComponentProvider; import de.metas.payment.paymentterm.PaymentTermService; import de.metas.pricing.conditions.BreakValueType; diff --git a/de.metas.purchasecandidate.base/src/test/java/de/metas/purchasecandidate/purchaseordercreation/PurchaseCandidateToOrderWorkflowTest.java b/de.metas.purchasecandidate.base/src/test/java/de/metas/purchasecandidate/purchaseordercreation/PurchaseCandidateToOrderWorkflowTest.java index 348609edd67..a92e7a657e4 100644 --- a/de.metas.purchasecandidate.base/src/test/java/de/metas/purchasecandidate/purchaseordercreation/PurchaseCandidateToOrderWorkflowTest.java +++ b/de.metas.purchasecandidate.base/src/test/java/de/metas/purchasecandidate/purchaseordercreation/PurchaseCandidateToOrderWorkflowTest.java @@ -10,7 +10,6 @@ import java.util.Iterator; import org.adempiere.mm.attributes.AttributeSetInstanceId; -import org.adempiere.service.OrgId; import org.adempiere.test.AdempiereTestHelper; import org.adempiere.warehouse.WarehouseId; import org.compiere.model.I_C_UOM; @@ -28,6 +27,7 @@ import de.metas.bpartner.BPartnerId; import de.metas.money.grossprofit.ProfitPriceActualFactory; import de.metas.order.OrderAndLineId; +import de.metas.organization.OrgId; import de.metas.product.ProductId; import de.metas.purchasecandidate.DemandGroupReference; import de.metas.purchasecandidate.PurchaseCandidate; diff --git a/de.metas.purchasecandidate.base/src/test/java/de/metas/purchasecandidate/purchaseordercreation/localorder/PurchaseOrderFromItemFactoryTest.java b/de.metas.purchasecandidate.base/src/test/java/de/metas/purchasecandidate/purchaseordercreation/localorder/PurchaseOrderFromItemFactoryTest.java index 64186bcc6b8..ad0710e406f 100644 --- a/de.metas.purchasecandidate.base/src/test/java/de/metas/purchasecandidate/purchaseordercreation/localorder/PurchaseOrderFromItemFactoryTest.java +++ b/de.metas.purchasecandidate.base/src/test/java/de/metas/purchasecandidate/purchaseordercreation/localorder/PurchaseOrderFromItemFactoryTest.java @@ -10,7 +10,6 @@ import org.adempiere.ad.trx.api.ITrxManager; import org.adempiere.mm.attributes.AttributeSetInstanceId; -import org.adempiere.service.OrgId; import org.adempiere.test.AdempiereTestHelper; import org.adempiere.util.lang.impl.TableRecordReference; import org.adempiere.warehouse.WarehouseId; @@ -35,6 +34,7 @@ import de.metas.order.event.OrderUserNotifications.NotificationRequest; import de.metas.order.impl.OrderLineBL; import de.metas.order.model.I_C_Order; +import de.metas.organization.OrgId; import de.metas.pricing.conditions.PricingConditions; import de.metas.product.ProductAndCategoryAndManufacturerId; import de.metas.product.ProductId; diff --git a/de.metas.purchasecandidate.base/src/test/java/de/metas/purchasecandidate/purchaseordercreation/localorder/PurchaseOrderFromItemsAggregatorTest.java b/de.metas.purchasecandidate.base/src/test/java/de/metas/purchasecandidate/purchaseordercreation/localorder/PurchaseOrderFromItemsAggregatorTest.java index c3579cade79..52476df26d1 100644 --- a/de.metas.purchasecandidate.base/src/test/java/de/metas/purchasecandidate/purchaseordercreation/localorder/PurchaseOrderFromItemsAggregatorTest.java +++ b/de.metas.purchasecandidate.base/src/test/java/de/metas/purchasecandidate/purchaseordercreation/localorder/PurchaseOrderFromItemsAggregatorTest.java @@ -10,7 +10,6 @@ import org.adempiere.ad.trx.api.ITrxManager; import org.adempiere.mm.attributes.AttributeSetInstanceId; -import org.adempiere.service.OrgId; import org.adempiere.test.AdempiereTestHelper; import org.adempiere.warehouse.WarehouseId; import org.compiere.model.I_C_BPartner; @@ -31,6 +30,7 @@ import de.metas.order.IOrderLineBL; import de.metas.order.OrderAndLineId; import de.metas.order.impl.OrderLineBL; +import de.metas.organization.OrgId; import de.metas.pricing.conditions.PricingConditions; import de.metas.product.ProductAndCategoryAndManufacturerId; import de.metas.purchasecandidate.DemandGroupReference; diff --git a/de.metas.purchasecandidate.base/src/test/java/de/metas/purchasecandidate/purchaseordercreation/remoteorder/NullVendorGatewayInvokerTest.java b/de.metas.purchasecandidate.base/src/test/java/de/metas/purchasecandidate/purchaseordercreation/remoteorder/NullVendorGatewayInvokerTest.java index cb96c79d91b..ca400e30512 100644 --- a/de.metas.purchasecandidate.base/src/test/java/de/metas/purchasecandidate/purchaseordercreation/remoteorder/NullVendorGatewayInvokerTest.java +++ b/de.metas.purchasecandidate.base/src/test/java/de/metas/purchasecandidate/purchaseordercreation/remoteorder/NullVendorGatewayInvokerTest.java @@ -8,7 +8,6 @@ import java.util.List; import org.adempiere.mm.attributes.AttributeSetInstanceId; -import org.adempiere.service.OrgId; import org.adempiere.warehouse.WarehouseId; import org.compiere.model.I_C_UOM; import org.junit.Test; @@ -23,6 +22,7 @@ import de.metas.bpartner.BPartnerId; import de.metas.money.grossprofit.ProfitPriceActualFactory; import de.metas.order.OrderAndLineId; +import de.metas.organization.OrgId; import de.metas.product.ProductId; import de.metas.purchasecandidate.DemandGroupReference; import de.metas.purchasecandidate.PurchaseCandidate; diff --git a/de.metas.report/report-service/src/main/java/de/metas/adempiere/report/jasper/JasperClassLoader.java b/de.metas.report/report-service/src/main/java/de/metas/adempiere/report/jasper/JasperClassLoader.java index f5c85710fa6..be7457f495f 100644 --- a/de.metas.report/report-service/src/main/java/de/metas/adempiere/report/jasper/JasperClassLoader.java +++ b/de.metas.report/report-service/src/main/java/de/metas/adempiere/report/jasper/JasperClassLoader.java @@ -32,8 +32,6 @@ import java.util.regex.Pattern; import org.adempiere.exceptions.AdempiereException; -import org.adempiere.service.IOrgDAO; -import org.adempiere.service.OrgId; import org.apache.commons.vfs2.FileContent; import org.apache.commons.vfs2.FileObject; import org.apache.commons.vfs2.FileSystemException; @@ -44,6 +42,8 @@ import com.google.common.annotations.VisibleForTesting; import de.metas.logging.LogManager; +import de.metas.organization.IOrgDAO; +import de.metas.organization.OrgId; import de.metas.util.Check; import de.metas.util.FileUtil; import de.metas.util.Services; diff --git a/de.metas.report/report-service/src/main/java/de/metas/adempiere/report/jasper/OrgLogoClassLoaderHook.java b/de.metas.report/report-service/src/main/java/de/metas/adempiere/report/jasper/OrgLogoClassLoaderHook.java index 718b48f6250..b15ab7359f1 100644 --- a/de.metas.report/report-service/src/main/java/de/metas/adempiere/report/jasper/OrgLogoClassLoaderHook.java +++ b/de.metas.report/report-service/src/main/java/de/metas/adempiere/report/jasper/OrgLogoClassLoaderHook.java @@ -30,7 +30,6 @@ import java.util.concurrent.Callable; import org.adempiere.service.ISysConfigBL; -import org.adempiere.service.OrgId; import org.compiere.model.I_AD_ClientInfo; import org.compiere.model.I_AD_Image; import org.compiere.model.I_AD_OrgInfo; @@ -42,6 +41,7 @@ import de.metas.cache.CCache; import de.metas.logging.LogManager; +import de.metas.organization.OrgId; import de.metas.util.Check; import de.metas.util.Services; import lombok.NonNull; diff --git a/de.metas.report/report-service/src/main/java/de/metas/adempiere/report/jasper/OrgLogoLocalFileLoader.java b/de.metas.report/report-service/src/main/java/de/metas/adempiere/report/jasper/OrgLogoLocalFileLoader.java index 137541409b9..1d70784414b 100644 --- a/de.metas.report/report-service/src/main/java/de/metas/adempiere/report/jasper/OrgLogoLocalFileLoader.java +++ b/de.metas.report/report-service/src/main/java/de/metas/adempiere/report/jasper/OrgLogoLocalFileLoader.java @@ -32,8 +32,6 @@ import org.adempiere.exceptions.AdempiereException; import org.adempiere.service.ClientId; import org.adempiere.service.IClientDAO; -import org.adempiere.service.IOrgDAO; -import org.adempiere.service.OrgId; import org.compiere.model.I_AD_ClientInfo; import org.compiere.model.I_AD_Image; import org.compiere.model.I_AD_Org; @@ -44,6 +42,8 @@ import de.metas.bpartner.service.IBPartnerOrgBL; import de.metas.logging.LogManager; +import de.metas.organization.IOrgDAO; +import de.metas.organization.OrgId; import de.metas.organization.OrgInfo; import de.metas.util.Services; import lombok.NonNull; @@ -130,11 +130,6 @@ private final I_AD_Image retrieveLogoImage() // // Get Org Logo final OrgInfo orgInfo = Services.get(IOrgDAO.class).getOrgInfoById(adOrgId); - if (orgInfo == null) - { - return null; - } - // final int logoImageId = orgInfo.getLogoImageId(); if (logoImageId > 0) { diff --git a/de.metas.report/report-service/src/main/java/de/metas/report/engine/AbstractReportEngine.java b/de.metas.report/report-service/src/main/java/de/metas/report/engine/AbstractReportEngine.java index 17a02530cbc..f80def41060 100644 --- a/de.metas.report/report-service/src/main/java/de/metas/report/engine/AbstractReportEngine.java +++ b/de.metas.report/report-service/src/main/java/de/metas/report/engine/AbstractReportEngine.java @@ -1,11 +1,11 @@ package de.metas.report.engine; import org.adempiere.ad.service.IDeveloperModeBL; -import org.adempiere.service.OrgId; import org.compiere.util.Env; import de.metas.adempiere.report.jasper.JasperClassLoader; import de.metas.adempiere.report.jasper.JasperCompileClassLoader; +import de.metas.organization.OrgId; import de.metas.util.Services; /* diff --git a/de.metas.report/report-service/src/main/java/de/metas/report/xls/engine/OrgData.java b/de.metas.report/report-service/src/main/java/de/metas/report/xls/engine/OrgData.java index eb681c1216d..44b08f5d075 100644 --- a/de.metas.report/report-service/src/main/java/de/metas/report/xls/engine/OrgData.java +++ b/de.metas.report/report-service/src/main/java/de/metas/report/xls/engine/OrgData.java @@ -3,13 +3,10 @@ import java.io.InputStream; import java.util.Properties; -import org.adempiere.service.IOrgDAO; -import org.compiere.model.I_AD_Org; import org.compiere.util.Env; -import com.google.common.base.Supplier; -import com.google.common.base.Suppliers; - +import de.metas.organization.IOrgDAO; +import de.metas.organization.OrgId; import de.metas.util.Services; /* @@ -25,11 +22,11 @@ * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public - * License along with this program. If not, see + * License along with this program. If not, see * . * #L% */ @@ -38,39 +35,26 @@ public class OrgData { public static final OrgData ofAD_Org_ID(final Properties ctx) { - final int adOrgId = Env.getAD_Org_ID(ctx); - return new OrgData(ctx, adOrgId); + final OrgId adOrgId = Env.getOrgId(ctx); + return new OrgData(adOrgId); } - // private static final transient CLogger logger = CLogger.getCLogger(OrgData.class); - - private final Properties ctx; - private final int adOrgId; - - private final Supplier orgSupplier = Suppliers.memoize(new Supplier() - { - - @Override - public I_AD_Org get() - { - return Services.get(IOrgDAO.class).retrieveOrg(ctx, adOrgId); - } - }); + private final OrgId adOrgId; + private transient String orgName; // lazy - private OrgData(final Properties ctx, final int adOrgId) + private OrgData(final OrgId adOrgId) { - this.ctx = ctx; this.adOrgId = adOrgId; } - private final I_AD_Org getAD_Org() - { - return orgSupplier.get(); - } - public String getName() { - return getAD_Org().getName(); + String orgName = this.orgName; + if (orgName == null) + { + orgName = this.orgName = Services.get(IOrgDAO.class).retrieveOrgName(adOrgId); + } + return orgName; } public InputStream getLogo() diff --git a/de.metas.salescandidate.base/src/main/java/de/metas/invoicecandidate/spi/impl/C_OLCand_Handler.java b/de.metas.salescandidate.base/src/main/java/de/metas/invoicecandidate/spi/impl/C_OLCand_Handler.java index 758c4ea5a39..b880a9fc540 100644 --- a/de.metas.salescandidate.base/src/main/java/de/metas/invoicecandidate/spi/impl/C_OLCand_Handler.java +++ b/de.metas.salescandidate.base/src/main/java/de/metas/invoicecandidate/spi/impl/C_OLCand_Handler.java @@ -36,7 +36,6 @@ import org.adempiere.ad.table.api.IADTableDAO; import org.adempiere.ad.trx.api.ITrx; import org.adempiere.service.ClientId; -import org.adempiere.service.OrgId; import org.adempiere.warehouse.WarehouseId; import org.compiere.util.Env; import org.compiere.util.TimeUtil; @@ -57,6 +56,7 @@ import de.metas.ordercandidate.api.IOLCandBL; import de.metas.ordercandidate.api.IOLCandEffectiveValuesBL; import de.metas.ordercandidate.model.I_C_OLCand; +import de.metas.organization.OrgId; import de.metas.pricing.IPricingResult; import de.metas.pricing.PricingSystemId; import de.metas.product.ProductId; diff --git a/de.metas.salescandidate.base/src/main/java/de/metas/ordercandidate/api/OLCandCreateRequest.java b/de.metas.salescandidate.base/src/main/java/de/metas/ordercandidate/api/OLCandCreateRequest.java index ff42277bae1..9209a86211d 100644 --- a/de.metas.salescandidate.base/src/main/java/de/metas/ordercandidate/api/OLCandCreateRequest.java +++ b/de.metas.salescandidate.base/src/main/java/de/metas/ordercandidate/api/OLCandCreateRequest.java @@ -7,11 +7,10 @@ import javax.annotation.Nullable; -import org.adempiere.service.OrgId; - import de.metas.bpartner.service.BPartnerInfo; import de.metas.document.DocTypeId; import de.metas.money.CurrencyId; +import de.metas.organization.OrgId; import de.metas.pricing.PricingSystemId; import de.metas.product.ProductId; import de.metas.uom.UomId; diff --git a/de.metas.salescandidate.base/src/main/java/de/metas/ordercandidate/modelvalidator/C_OLCand.java b/de.metas.salescandidate.base/src/main/java/de/metas/ordercandidate/modelvalidator/C_OLCand.java index 086b106243d..532ee91ab95 100644 --- a/de.metas.salescandidate.base/src/main/java/de/metas/ordercandidate/modelvalidator/C_OLCand.java +++ b/de.metas.salescandidate.base/src/main/java/de/metas/ordercandidate/modelvalidator/C_OLCand.java @@ -32,7 +32,6 @@ import org.adempiere.ad.modelvalidator.annotations.ModelChange; import org.adempiere.ad.modelvalidator.annotations.Validator; import org.adempiere.model.InterfaceWrapperHelper; -import org.adempiere.service.OrgId; import org.compiere.model.I_C_BPartner; import org.compiere.model.I_C_BPartner_Location; import org.compiere.model.I_C_BPartner_Product; @@ -50,6 +49,7 @@ import de.metas.ordercandidate.api.IOLCandValidatorBL; import de.metas.ordercandidate.model.I_C_OLCand; import de.metas.ordercandidate.model.I_C_Order_Line_Alloc; +import de.metas.organization.OrgId; import de.metas.util.Check; import de.metas.util.Services; import lombok.NonNull; diff --git a/de.metas.shipper.gateway.derkurier/src/main/java/de/metas/shipper/gateway/derkurier/DerKurierDraftDeliveryOrderCreator.java b/de.metas.shipper.gateway.derkurier/src/main/java/de/metas/shipper/gateway/derkurier/DerKurierDraftDeliveryOrderCreator.java index aeb489b1915..2339da17ccb 100644 --- a/de.metas.shipper.gateway.derkurier/src/main/java/de/metas/shipper/gateway/derkurier/DerKurierDraftDeliveryOrderCreator.java +++ b/de.metas.shipper.gateway.derkurier/src/main/java/de/metas/shipper/gateway/derkurier/DerKurierDraftDeliveryOrderCreator.java @@ -5,13 +5,13 @@ import java.time.LocalDate; import java.util.Set; -import org.adempiere.service.OrgId; import org.compiere.model.I_C_BPartner; import org.compiere.model.I_C_BPartner_Location; import org.compiere.model.I_C_Location; import org.springframework.stereotype.Service; import de.metas.bpartner.service.IBPartnerOrgBL; +import de.metas.organization.OrgId; import de.metas.shipper.gateway.commons.DeliveryOrderUtil; import de.metas.shipper.gateway.derkurier.misc.DerKurierServiceType; import de.metas.shipper.gateway.derkurier.misc.DerKurierShipperConfig; diff --git a/de.metas.shipper.gateway.go/src/main/java/de/metas/shipper/gateway/go/GODraftDeliveryOrderCreator.java b/de.metas.shipper.gateway.go/src/main/java/de/metas/shipper/gateway/go/GODraftDeliveryOrderCreator.java index 7a0cb73c080..5b1c753f585 100644 --- a/de.metas.shipper.gateway.go/src/main/java/de/metas/shipper/gateway/go/GODraftDeliveryOrderCreator.java +++ b/de.metas.shipper.gateway.go/src/main/java/de/metas/shipper/gateway/go/GODraftDeliveryOrderCreator.java @@ -5,13 +5,13 @@ import java.time.LocalDate; import java.util.Set; -import org.adempiere.service.OrgId; import org.compiere.model.I_C_BPartner; import org.compiere.model.I_C_BPartner_Location; import org.compiere.model.I_C_Location; import org.springframework.stereotype.Service; import de.metas.bpartner.service.IBPartnerOrgBL; +import de.metas.organization.OrgId; import de.metas.shipper.gateway.commons.DeliveryOrderUtil; import de.metas.shipper.gateway.go.schema.GOPaidMode; import de.metas.shipper.gateway.go.schema.GOSelfDelivery; diff --git a/de.metas.swat/de.metas.swat.base/src/main/java/de/metas/adempiere/callout/OrderLine.java b/de.metas.swat/de.metas.swat.base/src/main/java/de/metas/adempiere/callout/OrderLine.java index 1fcd254657b..8be131f1735 100644 --- a/de.metas.swat/de.metas.swat.base/src/main/java/de/metas/adempiere/callout/OrderLine.java +++ b/de.metas.swat/de.metas.swat.base/src/main/java/de/metas/adempiere/callout/OrderLine.java @@ -2,14 +2,14 @@ import org.adempiere.ad.callout.api.ICalloutField; import org.adempiere.model.InterfaceWrapperHelper; -import org.adempiere.service.IOrgDAO; -import org.adempiere.service.OrgId; import org.adempiere.warehouse.WarehouseId; import org.compiere.model.CalloutEngine; import de.metas.adempiere.model.I_C_Order; import de.metas.interfaces.I_C_OrderLine; import de.metas.order.IOrderLineBL; +import de.metas.organization.IOrgDAO; +import de.metas.organization.OrgId; import de.metas.product.IProductBL; import de.metas.product.ProductId; import de.metas.util.Services; diff --git a/de.metas.swat/de.metas.swat.base/src/main/java/de/metas/adempiere/modelvalidator/AD_OrgInfo.java b/de.metas.swat/de.metas.swat.base/src/main/java/de/metas/adempiere/modelvalidator/AD_OrgInfo.java index be09ac7908e..6323b94d085 100644 --- a/de.metas.swat/de.metas.swat.base/src/main/java/de/metas/adempiere/modelvalidator/AD_OrgInfo.java +++ b/de.metas.swat/de.metas.swat.base/src/main/java/de/metas/adempiere/modelvalidator/AD_OrgInfo.java @@ -25,8 +25,6 @@ import java.util.Properties; import org.adempiere.model.InterfaceWrapperHelper; -import org.adempiere.service.IOrgDAO; -import org.adempiere.service.OrgId; import org.compiere.model.I_AD_OrgInfo; import org.compiere.model.MClient; import org.compiere.model.ModelValidationEngine; @@ -36,6 +34,8 @@ import org.slf4j.Logger; import de.metas.logging.LogManager; +import de.metas.organization.IOrgDAO; +import de.metas.organization.OrgId; import de.metas.organization.OrgInfo; import de.metas.organization.StoreCreditCardNumberMode; import de.metas.util.Services; @@ -65,13 +65,7 @@ public String login(final int orgRepoId, final int AD_Role_ID, final int AD_User final OrgId orgId = OrgId.ofRepoIdOrAny(orgRepoId); final OrgInfo orgInfo = Services.get(IOrgDAO.class).getOrgInfoById(orgId); - if (orgInfo == null) - { - logger.warn("Unable to retrieve AD_OrgInfo for AD_Org_ID={}; AD_Role_ID={}; AD_User_ID={}", orgId, AD_Role_ID, AD_User_ID); - return null; - } final StoreCreditCardNumberMode ccStoreMode = orgInfo.getStoreCreditCardNumberMode(); - Env.setContext(ctx, ENV_ORG_INFO_STORE_CC_DATA, ccStoreMode.getCode()); return null; diff --git a/de.metas.swat/de.metas.swat.base/src/main/java/de/metas/adempiere/modelvalidator/Payment.java b/de.metas.swat/de.metas.swat.base/src/main/java/de/metas/adempiere/modelvalidator/Payment.java index fb4e66ca06c..73f90b6ea61 100644 --- a/de.metas.swat/de.metas.swat.base/src/main/java/de/metas/adempiere/modelvalidator/Payment.java +++ b/de.metas.swat/de.metas.swat.base/src/main/java/de/metas/adempiere/modelvalidator/Payment.java @@ -1,7 +1,5 @@ package de.metas.adempiere.modelvalidator; -import org.adempiere.service.IOrgDAO; -import org.adempiere.service.OrgId; import org.compiere.model.I_C_Payment; import org.compiere.model.MClient; import org.compiere.model.MPayment; @@ -11,6 +9,8 @@ import org.compiere.model.PO; import org.compiere.model.X_AD_Field; +import de.metas.organization.IOrgDAO; +import de.metas.organization.OrgId; import de.metas.organization.OrgInfo; import de.metas.organization.StoreCreditCardNumberMode; import de.metas.util.Services; diff --git a/de.metas.swat/de.metas.swat.base/src/main/java/de/metas/adempiere/modelvalidator/ProhibitInconsistentDropshipValues.java b/de.metas.swat/de.metas.swat.base/src/main/java/de/metas/adempiere/modelvalidator/ProhibitInconsistentDropshipValues.java index 56d2122efa8..8f488397711 100644 --- a/de.metas.swat/de.metas.swat.base/src/main/java/de/metas/adempiere/modelvalidator/ProhibitInconsistentDropshipValues.java +++ b/de.metas.swat/de.metas.swat.base/src/main/java/de/metas/adempiere/modelvalidator/ProhibitInconsistentDropshipValues.java @@ -24,8 +24,6 @@ import org.adempiere.exceptions.AdempiereException; -import org.adempiere.service.IOrgDAO; -import org.adempiere.service.OrgId; import org.adempiere.warehouse.WarehouseId; import org.compiere.model.I_C_DocType; import org.compiere.model.I_M_InOut; @@ -33,7 +31,6 @@ import org.compiere.model.MInOut; import org.compiere.model.MOrder; import org.compiere.model.MOrderLine; -import org.compiere.model.MOrg; import org.compiere.model.ModelValidationEngine; import org.compiere.model.ModelValidator; import org.compiere.model.PO; @@ -43,6 +40,8 @@ import de.metas.i18n.IMsgBL; import de.metas.interfaces.I_C_OrderLine; import de.metas.modelvalidator.SwatValidator; +import de.metas.organization.IOrgDAO; +import de.metas.organization.OrgId; import de.metas.util.Check; import de.metas.util.Services; @@ -177,7 +176,7 @@ public String modelChange(final PO po, int type) new Object[] { io.getDocumentNo(), io.getM_Warehouse().getName(), - MOrg.get(io.getCtx(), io.getAD_Org_ID()).getName() + Services.get(IOrgDAO.class).retrieveOrgName(io.getAD_Org_ID()) })); } else @@ -187,7 +186,7 @@ public String modelChange(final PO po, int type) new Object[] { io.getDocumentNo(), io.getM_Warehouse().getName(), - MOrg.get(io.getCtx(), io.getAD_Org_ID()).getName() + Services.get(IOrgDAO.class).retrieveOrgName(io.getAD_Org_ID()) })); } } @@ -272,7 +271,8 @@ else if (po instanceof MOrder) new Object[] { o.getDocumentNo(), o.getM_Warehouse().getName(), - MOrg.get(o.getCtx(), o.getAD_Org_ID()).getName() })); + Services.get(IOrgDAO.class).retrieveOrgName(o.getAD_Org_ID()) + })); } else { @@ -282,7 +282,8 @@ else if (po instanceof MOrder) new Object[] { o.getDocumentNo(), o.getM_Warehouse().getName(), - MOrg.get(o.getCtx(), o.getAD_Org_ID()).getName() })); + Services.get(IOrgDAO.class).retrieveOrgName(o.getAD_Org_ID()) + })); } } } diff --git a/de.metas.swat/de.metas.swat.base/src/main/java/de/metas/inout/invoicecandidate/M_InOutLine_Handler.java b/de.metas.swat/de.metas.swat.base/src/main/java/de/metas/inout/invoicecandidate/M_InOutLine_Handler.java index 881e50a90c4..15e3167d9a7 100644 --- a/de.metas.swat/de.metas.swat.base/src/main/java/de/metas/inout/invoicecandidate/M_InOutLine_Handler.java +++ b/de.metas.swat/de.metas.swat.base/src/main/java/de/metas/inout/invoicecandidate/M_InOutLine_Handler.java @@ -43,7 +43,6 @@ import org.adempiere.mm.attributes.api.IAttributeDAO; import org.adempiere.mm.attributes.api.ImmutableAttributeSet; import org.adempiere.service.ClientId; -import org.adempiere.service.OrgId; import org.adempiere.warehouse.WarehouseId; import org.compiere.Adempiere; import org.compiere.model.I_AD_Note; @@ -78,6 +77,7 @@ import de.metas.invoicecandidate.spi.InvoiceCandidateGenerateRequest; import de.metas.invoicecandidate.spi.InvoiceCandidateGenerateResult; import de.metas.order.IOrderLineBL; +import de.metas.organization.OrgId; import de.metas.payment.paymentterm.PaymentTermId; import de.metas.pricing.IPricingContext; import de.metas.pricing.IPricingResult; diff --git a/de.metas.swat/de.metas.swat.base/src/main/java/de/metas/inoutcandidate/api/impl/DefaultFromOrderLineWarehouseDestProvider.java b/de.metas.swat/de.metas.swat.base/src/main/java/de/metas/inoutcandidate/api/impl/DefaultFromOrderLineWarehouseDestProvider.java index 7a72247952d..abec5693bf5 100644 --- a/de.metas.swat/de.metas.swat.base/src/main/java/de/metas/inoutcandidate/api/impl/DefaultFromOrderLineWarehouseDestProvider.java +++ b/de.metas.swat/de.metas.swat.base/src/main/java/de/metas/inoutcandidate/api/impl/DefaultFromOrderLineWarehouseDestProvider.java @@ -4,7 +4,6 @@ import org.adempiere.mm.attributes.AttributeSetInstanceId; import org.adempiere.mm.attributes.api.AttributeConstants; -import org.adempiere.service.OrgId; import org.adempiere.warehouse.LocatorId; import org.adempiere.warehouse.api.IWarehouseDAO; import org.compiere.model.I_M_Locator; @@ -18,6 +17,7 @@ import de.metas.material.planning.IProductPlanningDAO; import de.metas.material.planning.IProductPlanningDAO.ProductPlanningQuery; import de.metas.material.planning.ddorder.IDistributionNetworkDAO; +import de.metas.organization.OrgId; import de.metas.product.IProductDAO; import de.metas.product.ProductId; import de.metas.util.Services; diff --git a/de.metas.swat/de.metas.swat.base/src/main/java/de/metas/inoutcandidate/api/impl/ShipmentScheduleBL.java b/de.metas.swat/de.metas.swat.base/src/main/java/de/metas/inoutcandidate/api/impl/ShipmentScheduleBL.java index d443ce8b12b..a1265bcf4a7 100644 --- a/de.metas.swat/de.metas.swat.base/src/main/java/de/metas/inoutcandidate/api/impl/ShipmentScheduleBL.java +++ b/de.metas.swat/de.metas.swat.base/src/main/java/de/metas/inoutcandidate/api/impl/ShipmentScheduleBL.java @@ -44,7 +44,6 @@ import org.adempiere.mm.attributes.api.IAttributeSet; import org.adempiere.model.InterfaceWrapperHelper; import org.adempiere.model.PlainContextAware; -import org.adempiere.service.OrgId; import org.adempiere.util.agg.key.IAggregationKeyBuilder; import org.adempiere.util.lang.IAutoCloseable; import org.adempiere.util.lang.IContextAware; @@ -92,6 +91,7 @@ import de.metas.material.cockpit.stock.StockRepository; import de.metas.order.DeliveryRule; import de.metas.order.OrderLineId; +import de.metas.organization.OrgId; import de.metas.product.IProductBL; import de.metas.product.ProductId; import de.metas.quantity.Quantity; diff --git a/de.metas.swat/de.metas.swat.base/src/main/java/de/metas/inoutcandidate/spi/impl/OrderLineReceiptScheduleProducer.java b/de.metas.swat/de.metas.swat.base/src/main/java/de/metas/inoutcandidate/spi/impl/OrderLineReceiptScheduleProducer.java index 2c8f17bcd1c..a4e94c3391e 100644 --- a/de.metas.swat/de.metas.swat.base/src/main/java/de/metas/inoutcandidate/spi/impl/OrderLineReceiptScheduleProducer.java +++ b/de.metas.swat/de.metas.swat.base/src/main/java/de/metas/inoutcandidate/spi/impl/OrderLineReceiptScheduleProducer.java @@ -37,7 +37,6 @@ import org.adempiere.mm.attributes.api.ILotNumberBL; import org.adempiere.mm.attributes.api.ILotNumberDateAttributeDAO; import org.adempiere.model.InterfaceWrapperHelper; -import org.adempiere.service.OrgId; import org.adempiere.warehouse.WarehouseId; import org.adempiere.warehouse.spi.IWarehouseAdvisor; import org.compiere.model.I_C_DocType; @@ -62,6 +61,7 @@ import de.metas.interfaces.I_C_OrderLine; import de.metas.material.planning.IProductPlanningDAO; import de.metas.material.planning.IProductPlanningDAO.ProductPlanningQuery; +import de.metas.organization.OrgId; import de.metas.product.ProductId; import de.metas.util.Check; import de.metas.util.Services; diff --git a/de.metas.swat/de.metas.swat.base/src/main/java/de/metas/invoicecandidate/api/impl/InvoiceCandBL.java b/de.metas.swat/de.metas.swat.base/src/main/java/de/metas/invoicecandidate/api/impl/InvoiceCandBL.java index 88a766cb657..6f7af6cdcc4 100644 --- a/de.metas.swat/de.metas.swat.base/src/main/java/de/metas/invoicecandidate/api/impl/InvoiceCandBL.java +++ b/de.metas.swat/de.metas.swat.base/src/main/java/de/metas/invoicecandidate/api/impl/InvoiceCandBL.java @@ -59,7 +59,6 @@ import org.adempiere.model.InterfaceWrapperHelper; import org.adempiere.service.ClientId; import org.adempiere.service.ISysConfigBL; -import org.adempiere.service.OrgId; import org.adempiere.util.concurrent.AutoClosableThreadLocalBoolean; import org.adempiere.util.lang.IAutoCloseable; import org.adempiere.util.lang.IPair; @@ -123,6 +122,7 @@ import de.metas.location.CountryId; import de.metas.order.IOrderDAO; import de.metas.order.IOrderLineBL; +import de.metas.organization.OrgId; import de.metas.pricing.PricingSystemId; import de.metas.pricing.conditions.PricingConditions; import de.metas.pricing.conditions.PricingConditionsBreak; diff --git a/de.metas.swat/de.metas.swat.base/src/main/java/de/metas/invoicecandidate/form/CreateInvoiceCandidateDialog.java b/de.metas.swat/de.metas.swat.base/src/main/java/de/metas/invoicecandidate/form/CreateInvoiceCandidateDialog.java index ef2a33a0f5a..38187cd203c 100644 --- a/de.metas.swat/de.metas.swat.base/src/main/java/de/metas/invoicecandidate/form/CreateInvoiceCandidateDialog.java +++ b/de.metas.swat/de.metas.swat.base/src/main/java/de/metas/invoicecandidate/form/CreateInvoiceCandidateDialog.java @@ -52,7 +52,6 @@ import org.adempiere.model.PlainContextAware; import org.adempiere.plaf.AdempierePLAF; import org.adempiere.service.ClientId; -import org.adempiere.service.OrgId; import org.adempiere.util.lang.IContextAware; import org.adempiere.warehouse.WarehouseId; import org.compiere.apps.ADialog; @@ -85,6 +84,7 @@ import de.metas.invoicecandidate.spi.impl.ManualCandidateHandler; import de.metas.lang.SOTrx; import de.metas.location.CountryId; +import de.metas.organization.OrgId; import de.metas.pricing.PricingSystemId; import de.metas.pricing.exception.ProductPriceNotFoundException; import de.metas.pricing.service.IPriceListBL; diff --git a/de.metas.swat/de.metas.swat.base/src/main/java/de/metas/invoicecandidate/spi/impl/M_InventoryLine_Handler.java b/de.metas.swat/de.metas.swat.base/src/main/java/de/metas/invoicecandidate/spi/impl/M_InventoryLine_Handler.java index e74f71dccf8..a0419e73a3a 100644 --- a/de.metas.swat/de.metas.swat.base/src/main/java/de/metas/invoicecandidate/spi/impl/M_InventoryLine_Handler.java +++ b/de.metas.swat/de.metas.swat.base/src/main/java/de/metas/invoicecandidate/spi/impl/M_InventoryLine_Handler.java @@ -15,7 +15,6 @@ import org.adempiere.mm.attributes.api.ImmutableAttributeSet; import org.adempiere.model.InterfaceWrapperHelper; import org.adempiere.service.ClientId; -import org.adempiere.service.OrgId; import org.adempiere.warehouse.WarehouseId; import org.compiere.model.I_AD_User; import org.compiere.model.I_C_BPartner; @@ -42,6 +41,7 @@ import de.metas.invoicecandidate.spi.IInventoryLine_HandlerDAO; import de.metas.invoicecandidate.spi.InvoiceCandidateGenerateRequest; import de.metas.invoicecandidate.spi.InvoiceCandidateGenerateResult; +import de.metas.organization.OrgId; import de.metas.product.IProductBL; import de.metas.product.ProductId; import de.metas.product.acct.api.ActivityId; diff --git a/de.metas.swat/de.metas.swat.base/src/main/java/de/metas/letters/api/impl/TextTemplateBL.java b/de.metas.swat/de.metas.swat.base/src/main/java/de/metas/letters/api/impl/TextTemplateBL.java index 35bfc85f89d..3c38d692a90 100644 --- a/de.metas.swat/de.metas.swat.base/src/main/java/de/metas/letters/api/impl/TextTemplateBL.java +++ b/de.metas.swat/de.metas.swat.base/src/main/java/de/metas/letters/api/impl/TextTemplateBL.java @@ -33,7 +33,6 @@ import org.adempiere.exceptions.FillMandatoryException; import org.adempiere.model.InterfaceWrapperHelper; import org.adempiere.service.ClientId; -import org.adempiere.service.OrgId; import org.adempiere.util.proxy.Cached; import org.compiere.model.I_AD_User; import org.compiere.model.I_C_BPartner_Location; @@ -57,6 +56,7 @@ import de.metas.letters.model.MADBoilerPlate.BoilerPlateContext; import de.metas.letters.spi.ILetterProducer; import de.metas.logging.LogManager; +import de.metas.organization.OrgId; import de.metas.process.AdProcessId; import de.metas.process.IADPInstanceDAO; import de.metas.process.PInstanceId; diff --git a/de.metas.swat/de.metas.swat.base/src/main/java/de/metas/order/impl/CreateSalesOrderAndBOMsFromQuotationCommand.java b/de.metas.swat/de.metas.swat.base/src/main/java/de/metas/order/impl/CreateSalesOrderAndBOMsFromQuotationCommand.java index b7c77c91074..c5d8599d61a 100644 --- a/de.metas.swat/de.metas.swat.base/src/main/java/de/metas/order/impl/CreateSalesOrderAndBOMsFromQuotationCommand.java +++ b/de.metas.swat/de.metas.swat.base/src/main/java/de/metas/order/impl/CreateSalesOrderAndBOMsFromQuotationCommand.java @@ -18,7 +18,6 @@ import org.adempiere.mm.attributes.AttributeSetInstanceId; import org.adempiere.mm.attributes.api.IAttributeSetInstanceBL; import org.adempiere.model.InterfaceWrapperHelper; -import org.adempiere.service.OrgId; import org.compiere.Adempiere; import org.compiere.model.I_C_Order; import org.compiere.model.I_C_OrderLine; @@ -50,6 +49,7 @@ import de.metas.order.compensationGroup.OrderGroupCompensationUtils; import de.metas.order.compensationGroup.OrderGroupInfo; import de.metas.order.compensationGroup.OrderGroupRepository; +import de.metas.organization.OrgId; import de.metas.pricing.PriceListId; import de.metas.pricing.PriceListVersionId; import de.metas.pricing.service.AddProductPriceRequest; diff --git a/de.metas.swat/de.metas.swat.base/src/main/java/de/metas/order/invoicecandidate/C_OrderLine_Handler.java b/de.metas.swat/de.metas.swat.base/src/main/java/de/metas/order/invoicecandidate/C_OrderLine_Handler.java index 27a38cb65db..265eb4aba92 100644 --- a/de.metas.swat/de.metas.swat.base/src/main/java/de/metas/order/invoicecandidate/C_OrderLine_Handler.java +++ b/de.metas.swat/de.metas.swat.base/src/main/java/de/metas/order/invoicecandidate/C_OrderLine_Handler.java @@ -35,7 +35,6 @@ import org.adempiere.mm.attributes.api.ImmutableAttributeSet; import org.adempiere.model.InterfaceWrapperHelper; import org.adempiere.service.ClientId; -import org.adempiere.service.OrgId; import org.adempiere.warehouse.WarehouseId; import org.compiere.Adempiere; import org.compiere.model.I_M_InOut; @@ -62,6 +61,7 @@ import de.metas.order.compensationGroup.GroupCompensationLine; import de.metas.order.compensationGroup.GroupId; import de.metas.order.compensationGroup.OrderGroupCompensationUtils; +import de.metas.organization.OrgId; import de.metas.payment.paymentterm.PaymentTermId; import de.metas.product.ProductId; import de.metas.product.acct.api.ActivityId; diff --git a/de.metas.swat/de.metas.swat.base/src/main/java/de/metas/order/process/impl/CreatePOFromSOsAggregationKeyBuilder.java b/de.metas.swat/de.metas.swat.base/src/main/java/de/metas/order/process/impl/CreatePOFromSOsAggregationKeyBuilder.java index 5648604cd98..1f2ab05af47 100644 --- a/de.metas.swat/de.metas.swat.base/src/main/java/de/metas/order/process/impl/CreatePOFromSOsAggregationKeyBuilder.java +++ b/de.metas.swat/de.metas.swat.base/src/main/java/de/metas/order/process/impl/CreatePOFromSOsAggregationKeyBuilder.java @@ -2,7 +2,6 @@ import org.adempiere.exceptions.AdempiereException; import org.adempiere.service.ISysConfigBL; -import org.adempiere.service.OrgId; import org.adempiere.util.lang.IContextAware; import org.adempiere.util.lang.ObjectUtils; import org.compiere.model.I_C_BPartner; @@ -14,6 +13,7 @@ import de.metas.bpartner.service.IBPartnerDAO; import de.metas.bpartner_product.IBPartnerProductDAO; import de.metas.i18n.IMsgBL; +import de.metas.organization.OrgId; import de.metas.product.IProductDAO; import de.metas.util.ILoggable; import de.metas.util.Loggables; diff --git a/de.metas.swat/de.metas.swat.base/src/main/java/de/metas/order/process/impl/CreatePOFromSOsAggregator.java b/de.metas.swat/de.metas.swat.base/src/main/java/de/metas/order/process/impl/CreatePOFromSOsAggregator.java index 7e3d1e54881..12ba46e2dfb 100644 --- a/de.metas.swat/de.metas.swat.base/src/main/java/de/metas/order/process/impl/CreatePOFromSOsAggregator.java +++ b/de.metas.swat/de.metas.swat.base/src/main/java/de/metas/order/process/impl/CreatePOFromSOsAggregator.java @@ -6,8 +6,6 @@ import org.adempiere.exceptions.AdempiereException; import org.adempiere.model.InterfaceWrapperHelper; -import org.adempiere.service.IOrgDAO; -import org.adempiere.service.OrgId; import org.adempiere.util.lang.IContextAware; import org.adempiere.util.lang.ObjectUtils; import org.adempiere.warehouse.WarehouseId; @@ -20,6 +18,8 @@ import de.metas.document.engine.IDocument; import de.metas.i18n.IMsgBL; import de.metas.order.IOrderBL; +import de.metas.organization.IOrgDAO; +import de.metas.organization.OrgId; import de.metas.util.Loggables; import de.metas.util.Services; import de.metas.util.collections.MapReduceAggregator; diff --git a/de.metas.swat/de.metas.swat.base/src/main/java/de/metas/request/api/impl/RequestBL.java b/de.metas.swat/de.metas.swat.base/src/main/java/de/metas/request/api/impl/RequestBL.java index 92afb540ace..285c37c8c22 100644 --- a/de.metas.swat/de.metas.swat.base/src/main/java/de/metas/request/api/impl/RequestBL.java +++ b/de.metas.swat/de.metas.swat.base/src/main/java/de/metas/request/api/impl/RequestBL.java @@ -2,7 +2,6 @@ import org.adempiere.mm.attributes.AttributeId; import org.adempiere.mm.attributes.api.IAttributeDAO; -import org.adempiere.service.OrgId; import org.adempiere.util.lang.impl.TableRecordReference; import org.compiere.model.I_M_AttributeInstance; import org.compiere.model.I_M_InOut; @@ -22,6 +21,7 @@ import de.metas.inout.model.I_M_InOutLine; import de.metas.inout.model.I_M_QualityNote; import de.metas.lang.SOTrx; +import de.metas.organization.OrgId; import de.metas.product.ProductId; import de.metas.request.RequestTypeId; import de.metas.request.api.IRequestBL; diff --git a/de.metas.swat/de.metas.swat.base/src/main/java/de/metas/tax/api/impl/TaxBL.java b/de.metas.swat/de.metas.swat.base/src/main/java/de/metas/tax/api/impl/TaxBL.java index ca37c872fc7..aa7fcfee533 100644 --- a/de.metas.swat/de.metas.swat.base/src/main/java/de/metas/tax/api/impl/TaxBL.java +++ b/de.metas.swat/de.metas.swat.base/src/main/java/de/metas/tax/api/impl/TaxBL.java @@ -41,7 +41,6 @@ import org.adempiere.exceptions.DBException; import org.adempiere.exceptions.TaxNoExemptFoundException; import org.adempiere.model.InterfaceWrapperHelper; -import org.adempiere.service.OrgId; import org.adempiere.warehouse.WarehouseId; import org.adempiere.warehouse.api.IWarehouseBL; import org.compiere.model.IQuery; @@ -66,6 +65,7 @@ import de.metas.location.ILocationDAO; import de.metas.location.LocationId; import de.metas.logging.LogManager; +import de.metas.organization.OrgId; import de.metas.product.ProductId; import de.metas.tax.api.ITaxDAO; import de.metas.tax.api.TaxCategoryId; diff --git a/de.metas.swat/de.metas.swat.base/src/main/java/de/metas/workflow/api/impl/WorkflowBL.java b/de.metas.swat/de.metas.swat.base/src/main/java/de/metas/workflow/api/impl/WorkflowBL.java index 892e99afcbb..3cd26d9972b 100644 --- a/de.metas.swat/de.metas.swat.base/src/main/java/de/metas/workflow/api/impl/WorkflowBL.java +++ b/de.metas.swat/de.metas.swat.base/src/main/java/de/metas/workflow/api/impl/WorkflowBL.java @@ -28,14 +28,14 @@ import org.adempiere.ad.table.api.IADTableDAO; import org.adempiere.ad.trx.api.ITrx; import org.adempiere.model.InterfaceWrapperHelper; -import org.adempiere.service.IOrgDAO; -import org.adempiere.service.OrgId; import org.compiere.model.I_AD_User; import org.compiere.model.I_AD_WF_Responsible; import org.compiere.model.X_AD_WF_Responsible; import org.compiere.util.Env; import org.compiere.wf.MWFResponsible; +import de.metas.organization.IOrgDAO; +import de.metas.organization.OrgId; import de.metas.organization.OrgInfo; import de.metas.util.Check; import de.metas.util.Services; diff --git a/de.metas.swat/de.metas.swat.base/src/test/java/de/metas/inoutcandidate/api/impl/ReceiptScheduleTestBase.java b/de.metas.swat/de.metas.swat.base/src/test/java/de/metas/inoutcandidate/api/impl/ReceiptScheduleTestBase.java index e09881e2024..c6f9458a879 100644 --- a/de.metas.swat/de.metas.swat.base/src/test/java/de/metas/inoutcandidate/api/impl/ReceiptScheduleTestBase.java +++ b/de.metas.swat/de.metas.swat.base/src/test/java/de/metas/inoutcandidate/api/impl/ReceiptScheduleTestBase.java @@ -33,7 +33,6 @@ import org.adempiere.mm.attributes.api.impl.LotNumberDateAttributeDAO; import org.adempiere.model.InterfaceWrapperHelper; import org.adempiere.service.ClientId; -import org.adempiere.service.OrgId; import org.adempiere.test.AdempiereTestHelper; import org.adempiere.test.AdempiereTestWatcher; import org.compiere.model.I_AD_Org; @@ -61,6 +60,7 @@ import de.metas.inoutcandidate.modelvalidator.InOutCandidateValidator; import de.metas.inoutcandidate.modelvalidator.ReceiptScheduleValidator; import de.metas.interfaces.I_C_DocType; +import de.metas.organization.OrgId; import de.metas.product.ProductId; import de.metas.product.acct.api.ActivityId; import de.metas.util.Services; diff --git a/de.metas.swat/de.metas.swat.base/src/test/java/de/metas/invoicecandidate/AbstractICTestSupport.java b/de.metas.swat/de.metas.swat.base/src/test/java/de/metas/invoicecandidate/AbstractICTestSupport.java index 68b66c80dad..f096c1e3e52 100644 --- a/de.metas.swat/de.metas.swat.base/src/test/java/de/metas/invoicecandidate/AbstractICTestSupport.java +++ b/de.metas.swat/de.metas.swat.base/src/test/java/de/metas/invoicecandidate/AbstractICTestSupport.java @@ -37,7 +37,6 @@ import de.metas.location.CountryId; import org.adempiere.model.InterfaceWrapperHelper; import org.adempiere.service.ClientId; -import org.adempiere.service.OrgId; import org.adempiere.test.AdempiereTestHelper; import org.adempiere.util.lang.IAutoCloseable; import org.adempiere.warehouse.WarehouseId; @@ -104,6 +103,7 @@ import de.metas.notification.INotificationRepository; import de.metas.notification.impl.NotificationRepository; import de.metas.order.compensationGroup.GroupCompensationLineCreateRequestFactory; +import de.metas.organization.OrgId; import de.metas.pricing.service.IPriceListDAO; import de.metas.product.ProductId; import de.metas.product.acct.api.ActivityId; diff --git a/de.metas.swat/de.metas.swat.base/src/test/java/de/metas/invoicecandidate/spi/impl/AbstractDeliveryTest.java b/de.metas.swat/de.metas.swat.base/src/test/java/de/metas/invoicecandidate/spi/impl/AbstractDeliveryTest.java index 4856808f7dd..210a93d3660 100644 --- a/de.metas.swat/de.metas.swat.base/src/test/java/de/metas/invoicecandidate/spi/impl/AbstractDeliveryTest.java +++ b/de.metas.swat/de.metas.swat.base/src/test/java/de/metas/invoicecandidate/spi/impl/AbstractDeliveryTest.java @@ -31,7 +31,6 @@ import org.adempiere.ad.trx.api.ITrx; import org.adempiere.model.InterfaceWrapperHelper; import org.adempiere.service.ClientId; -import org.adempiere.service.OrgId; import org.adempiere.test.AdempiereTestHelper; import org.adempiere.test.AdempiereTestWatcher; import org.adempiere.warehouse.WarehouseId; @@ -52,6 +51,7 @@ import de.metas.interfaces.I_C_BPartner; import de.metas.invoicecandidate.model.I_C_ILCandHandler; import de.metas.order.invoicecandidate.C_OrderLine_Handler; +import de.metas.organization.OrgId; import de.metas.product.ProductId; import de.metas.product.acct.api.ActivityId; import de.metas.tax.api.ITaxBL; diff --git a/de.metas.swat/de.metas.swat.base/src/test/java/de/metas/invoicecandidate/spi/impl/C_OrderLine_Handler_Test.java b/de.metas.swat/de.metas.swat.base/src/test/java/de/metas/invoicecandidate/spi/impl/C_OrderLine_Handler_Test.java index 29684d4f274..705c044770e 100644 --- a/de.metas.swat/de.metas.swat.base/src/test/java/de/metas/invoicecandidate/spi/impl/C_OrderLine_Handler_Test.java +++ b/de.metas.swat/de.metas.swat.base/src/test/java/de/metas/invoicecandidate/spi/impl/C_OrderLine_Handler_Test.java @@ -33,7 +33,6 @@ import org.adempiere.ad.trx.api.ITrx; import org.adempiere.model.InterfaceWrapperHelper; -import org.adempiere.service.OrgId; import org.adempiere.util.agg.key.IAggregationKeyBuilder; import org.adempiere.warehouse.WarehouseId; import org.compiere.model.I_C_DocType; @@ -58,6 +57,7 @@ import de.metas.invoicecandidate.spi.InvoiceCandidateGenerateRequest; import de.metas.logging.LogManager; import de.metas.order.invoicecandidate.C_OrderLine_Handler; +import de.metas.organization.OrgId; import de.metas.tax.api.ITaxBL; import de.metas.tax.api.TaxCategoryId; import de.metas.user.UserRepository; diff --git a/de.metas.util.web/src/main/java/de/metas/util/web/security/UserAuthTokenService.java b/de.metas.util.web/src/main/java/de/metas/util/web/security/UserAuthTokenService.java index d0629830d50..5a55245ebf5 100644 --- a/de.metas.util.web/src/main/java/de/metas/util/web/security/UserAuthTokenService.java +++ b/de.metas.util.web/src/main/java/de/metas/util/web/security/UserAuthTokenService.java @@ -3,7 +3,6 @@ import java.util.Properties; import org.adempiere.exceptions.AdempiereException; -import org.adempiere.service.OrgId; import org.adempiere.util.lang.IAutoCloseable; import org.compiere.util.Env; import org.springframework.beans.factory.annotation.Autowired; @@ -11,6 +10,7 @@ import com.google.common.base.Supplier; +import de.metas.organization.OrgId; import de.metas.security.IUserRolePermissions; import de.metas.security.IUserRolePermissionsDAO; import de.metas.security.RoleId; diff --git a/de.metas.vertical.pharma.vendor.gateway.msv3/src/main/java/de/metas/vertical/pharma/vendor/gateway/msv3/availability/MSV3AvailabilityDataPersister.java b/de.metas.vertical.pharma.vendor.gateway.msv3/src/main/java/de/metas/vertical/pharma/vendor/gateway/msv3/availability/MSV3AvailabilityDataPersister.java index 60d1c855e1b..1b86e2103da 100644 --- a/de.metas.vertical.pharma.vendor.gateway.msv3/src/main/java/de/metas/vertical/pharma/vendor/gateway/msv3/availability/MSV3AvailabilityDataPersister.java +++ b/de.metas.vertical.pharma.vendor.gateway.msv3/src/main/java/de/metas/vertical/pharma/vendor/gateway/msv3/availability/MSV3AvailabilityDataPersister.java @@ -7,11 +7,11 @@ import java.util.List; import java.util.Map; -import org.adempiere.service.OrgId; import org.compiere.util.TimeUtil; import com.google.common.collect.ImmutableMap; +import de.metas.organization.OrgId; import de.metas.vertical.pharma.msv3.protocol.stockAvailability.StockAvailabilityQuery; import de.metas.vertical.pharma.msv3.protocol.stockAvailability.StockAvailabilityQueryItem; import de.metas.vertical.pharma.msv3.protocol.stockAvailability.StockAvailabilityResponse; diff --git a/de.metas.vertical.pharma.vendor.gateway.msv3/src/main/java/de/metas/vertical/pharma/vendor/gateway/msv3/availability/MSV3AvailabilityTransaction.java b/de.metas.vertical.pharma.vendor.gateway.msv3/src/main/java/de/metas/vertical/pharma/vendor/gateway/msv3/availability/MSV3AvailabilityTransaction.java index be4a2c8f19a..eb7ea3f7991 100644 --- a/de.metas.vertical.pharma.vendor.gateway.msv3/src/main/java/de/metas/vertical/pharma/vendor/gateway/msv3/availability/MSV3AvailabilityTransaction.java +++ b/de.metas.vertical.pharma.vendor.gateway.msv3/src/main/java/de/metas/vertical/pharma/vendor/gateway/msv3/availability/MSV3AvailabilityTransaction.java @@ -7,13 +7,13 @@ import java.util.Map; import org.adempiere.ad.service.IErrorManager; -import org.adempiere.service.OrgId; import org.compiere.model.I_AD_Issue; import org.compiere.model.I_C_BPartner; import com.google.common.collect.ImmutableMap; import de.metas.bpartner.service.IBPartnerDAO; +import de.metas.organization.OrgId; import de.metas.util.Services; import de.metas.vertical.pharma.msv3.protocol.stockAvailability.StockAvailabilityQuery; import de.metas.vertical.pharma.msv3.protocol.stockAvailability.StockAvailabilityQueryItem; diff --git a/de.metas.vertical.pharma.vendor.gateway.msv3/src/main/java/de/metas/vertical/pharma/vendor/gateway/msv3/common/Msv3FaultInfoDataPersister.java b/de.metas.vertical.pharma.vendor.gateway.msv3/src/main/java/de/metas/vertical/pharma/vendor/gateway/msv3/common/Msv3FaultInfoDataPersister.java index 6006daa9e60..f755d2181d5 100644 --- a/de.metas.vertical.pharma.vendor.gateway.msv3/src/main/java/de/metas/vertical/pharma/vendor/gateway/msv3/common/Msv3FaultInfoDataPersister.java +++ b/de.metas.vertical.pharma.vendor.gateway.msv3/src/main/java/de/metas/vertical/pharma/vendor/gateway/msv3/common/Msv3FaultInfoDataPersister.java @@ -5,8 +5,7 @@ import javax.annotation.Nullable; -import org.adempiere.service.OrgId; - +import de.metas.organization.OrgId; import de.metas.vertical.pharma.msv3.protocol.types.FaultInfo; import de.metas.vertical.pharma.vendor.gateway.msv3.model.I_MSV3_FaultInfo; import lombok.AccessLevel; diff --git a/de.metas.vertical.pharma.vendor.gateway.msv3/src/main/java/de/metas/vertical/pharma/vendor/gateway/msv3/common/Msv3SubstitutionDataPersister.java b/de.metas.vertical.pharma.vendor.gateway.msv3/src/main/java/de/metas/vertical/pharma/vendor/gateway/msv3/common/Msv3SubstitutionDataPersister.java index 5426e594215..9ebb34844c1 100644 --- a/de.metas.vertical.pharma.vendor.gateway.msv3/src/main/java/de/metas/vertical/pharma/vendor/gateway/msv3/common/Msv3SubstitutionDataPersister.java +++ b/de.metas.vertical.pharma.vendor.gateway.msv3/src/main/java/de/metas/vertical/pharma/vendor/gateway/msv3/common/Msv3SubstitutionDataPersister.java @@ -5,8 +5,7 @@ import javax.annotation.Nullable; -import org.adempiere.service.OrgId; - +import de.metas.organization.OrgId; import de.metas.vertical.pharma.msv3.protocol.order.OrderResponsePackageItemSubstitution; import de.metas.vertical.pharma.msv3.protocol.stockAvailability.StockAvailabilitySubstitution; import de.metas.vertical.pharma.vendor.gateway.msv3.model.I_MSV3_Substitution; diff --git a/de.metas.vertical.pharma.vendor.gateway.msv3/src/main/java/de/metas/vertical/pharma/vendor/gateway/msv3/purchaseOrder/MSV3PurchaseOrderClientImpl.java b/de.metas.vertical.pharma.vendor.gateway.msv3/src/main/java/de/metas/vertical/pharma/vendor/gateway/msv3/purchaseOrder/MSV3PurchaseOrderClientImpl.java index 67542f4d7b4..1f08312b1f1 100644 --- a/de.metas.vertical.pharma.vendor.gateway.msv3/src/main/java/de/metas/vertical/pharma/vendor/gateway/msv3/purchaseOrder/MSV3PurchaseOrderClientImpl.java +++ b/de.metas.vertical.pharma.vendor.gateway.msv3/src/main/java/de/metas/vertical/pharma/vendor/gateway/msv3/purchaseOrder/MSV3PurchaseOrderClientImpl.java @@ -6,7 +6,6 @@ import javax.xml.bind.JAXBElement; -import org.adempiere.service.OrgId; import org.springframework.ws.client.core.WebServiceTemplate; import com.google.common.annotations.VisibleForTesting; @@ -14,6 +13,7 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; +import de.metas.organization.OrgId; import de.metas.util.Check; import de.metas.vendor.gateway.api.ProductAndQuantity; import de.metas.vendor.gateway.api.order.MSV3OrderResponsePackageItemPartRepoId; diff --git a/de.metas.vertical.pharma.vendor.gateway.msv3/src/main/java/de/metas/vertical/pharma/vendor/gateway/msv3/purchaseOrder/MSV3PurchaseOrderRequestPersister.java b/de.metas.vertical.pharma.vendor.gateway.msv3/src/main/java/de/metas/vertical/pharma/vendor/gateway/msv3/purchaseOrder/MSV3PurchaseOrderRequestPersister.java index 200c824b157..1d511f3ccb7 100644 --- a/de.metas.vertical.pharma.vendor.gateway.msv3/src/main/java/de/metas/vertical/pharma/vendor/gateway/msv3/purchaseOrder/MSV3PurchaseOrderRequestPersister.java +++ b/de.metas.vertical.pharma.vendor.gateway.msv3/src/main/java/de/metas/vertical/pharma/vendor/gateway/msv3/purchaseOrder/MSV3PurchaseOrderRequestPersister.java @@ -3,8 +3,7 @@ import static org.adempiere.model.InterfaceWrapperHelper.newInstanceOutOfTrx; import static org.adempiere.model.InterfaceWrapperHelper.save; -import org.adempiere.service.OrgId; - +import de.metas.organization.OrgId; import de.metas.vertical.pharma.msv3.protocol.order.MSV3PurchaseCandidateId; import de.metas.vertical.pharma.msv3.protocol.order.OrderCreateRequest; import de.metas.vertical.pharma.msv3.protocol.order.OrderCreateRequestPackage; diff --git a/de.metas.vertical.pharma.vendor.gateway.msv3/src/main/java/de/metas/vertical/pharma/vendor/gateway/msv3/purchaseOrder/MSV3PurchaseOrderResponsePersister.java b/de.metas.vertical.pharma.vendor.gateway.msv3/src/main/java/de/metas/vertical/pharma/vendor/gateway/msv3/purchaseOrder/MSV3PurchaseOrderResponsePersister.java index 8449a6eb9dc..9dbd6d5ed5c 100644 --- a/de.metas.vertical.pharma.vendor.gateway.msv3/src/main/java/de/metas/vertical/pharma/vendor/gateway/msv3/purchaseOrder/MSV3PurchaseOrderResponsePersister.java +++ b/de.metas.vertical.pharma.vendor.gateway.msv3/src/main/java/de/metas/vertical/pharma/vendor/gateway/msv3/purchaseOrder/MSV3PurchaseOrderResponsePersister.java @@ -5,9 +5,9 @@ import java.util.Optional; -import org.adempiere.service.OrgId; import org.compiere.util.TimeUtil; +import de.metas.organization.OrgId; import de.metas.vendor.gateway.api.order.MSV3OrderResponsePackageItemPartRepoId; import de.metas.vertical.pharma.msv3.protocol.order.MSV3PurchaseCandidateId; import de.metas.vertical.pharma.msv3.protocol.order.OrderDefectReason; diff --git a/de.metas.vertical.pharma.vendor.gateway.msv3/src/main/java/de/metas/vertical/pharma/vendor/gateway/msv3/purchaseOrder/MSV3PurchaseOrderTransaction.java b/de.metas.vertical.pharma.vendor.gateway.msv3/src/main/java/de/metas/vertical/pharma/vendor/gateway/msv3/purchaseOrder/MSV3PurchaseOrderTransaction.java index 0a15c0fb38d..99472ef9938 100644 --- a/de.metas.vertical.pharma.vendor.gateway.msv3/src/main/java/de/metas/vertical/pharma/vendor/gateway/msv3/purchaseOrder/MSV3PurchaseOrderTransaction.java +++ b/de.metas.vertical.pharma.vendor.gateway.msv3/src/main/java/de/metas/vertical/pharma/vendor/gateway/msv3/purchaseOrder/MSV3PurchaseOrderTransaction.java @@ -4,9 +4,9 @@ import static org.adempiere.model.InterfaceWrapperHelper.save; import org.adempiere.ad.service.IErrorManager; -import org.adempiere.service.OrgId; import org.compiere.model.I_AD_Issue; +import de.metas.organization.OrgId; import de.metas.util.Services; import de.metas.vendor.gateway.api.order.MSV3OrderResponsePackageItemPartRepoId; import de.metas.vertical.pharma.msv3.protocol.order.OrderCreateRequest; diff --git a/de.metas.vertical.pharma.vendor.gateway.msv3/src/test/java/de/metas/vertical/pharma/vendor/gateway/msv3/availability/MSV3AvailabilityDataPersisterTest.java b/de.metas.vertical.pharma.vendor.gateway.msv3/src/test/java/de/metas/vertical/pharma/vendor/gateway/msv3/availability/MSV3AvailabilityDataPersisterTest.java index 3fe60adb8fe..463d97f3e4c 100644 --- a/de.metas.vertical.pharma.vendor.gateway.msv3/src/test/java/de/metas/vertical/pharma/vendor/gateway/msv3/availability/MSV3AvailabilityDataPersisterTest.java +++ b/de.metas.vertical.pharma.vendor.gateway.msv3/src/test/java/de/metas/vertical/pharma/vendor/gateway/msv3/availability/MSV3AvailabilityDataPersisterTest.java @@ -3,13 +3,13 @@ import static org.assertj.core.api.Assertions.assertThat; import org.adempiere.ad.dao.IQueryBL; -import org.adempiere.service.OrgId; import org.adempiere.test.AdempiereTestHelper; import org.junit.Before; import org.junit.Test; import com.google.common.collect.ImmutableMap; +import de.metas.organization.OrgId; import de.metas.util.Services; import de.metas.vertical.pharma.msv3.protocol.stockAvailability.AvailabilityType; import de.metas.vertical.pharma.msv3.protocol.stockAvailability.StockAvailabilityResponse;