From e57156f161ccda290e919e95c3ecf534c93c7dc4 Mon Sep 17 00:00:00 2001 From: Mateusz Kwiatkowski Date: Mon, 27 Aug 2018 14:07:15 +0200 Subject: [PATCH] OLMIS-4295: updated checkstyle to new google style fixed LICENCE header fixed import order fixed minor code style issues added missing periods in javadocs --- LICENSE-HEADER | 6 +- build.gradle | 2 +- config/checkstyle/checkstyle.xml | 131 ++++++++++++------ .../referencedata/JaVersIntegrationTest.java | 14 +- .../referencedata/PageImplRepresentation.java | 11 +- .../BaseMigrationIntegrationTest.java | 20 ++- ...eDispensablesMigrationIntegrationTest.java | 10 +- ...pOfOrderablesMigrationIntegrationTest.java | 7 +- .../BaseCrudRepositoryIntegrationTest.java | 11 +- ...ommodityTypeRepositoryIntegrationTest.java | 21 ++- .../FacilityRepositoryIntegrationTest.java | 16 +-- ...rovedProductRepositoryIntegrationTest.java | 18 +-- ...FacilityTypeRepositoryIntegrationTest.java | 6 +- ...graphicLevelRepositoryIntegrationTest.java | 6 +- ...ographicZoneRepositoryIntegrationTest.java | 14 +- ...lStockAmountRepositoryIntegrationTest.java | 17 ++- .../LotRepositoryIntegrationTest.java | 12 +- ...playCategoryRepositoryIntegrationTest.java | 13 +- .../OrderableRepositoryIntegrationTest.java | 6 +- ...essingPeriodRepositoryIntegrationTest.java | 6 +- ...singScheduleRepositoryIntegrationTest.java | 12 +- .../ProgramRepositoryIntegrationTest.java | 13 +- ...gramScheduleRepositoryIntegrationTest.java | 11 +- ...isitionGroupRepositoryIntegrationTest.java | 15 +- ...htAssignmentRepositoryIntegrationTest.java | 11 +- .../RightRepositoryIntegrationTest.java | 13 +- ...leAssignmentRepositoryIntegrationTest.java | 6 +- .../RoleRepositoryIntegrationTest.java | 6 +- ...rviceAccountRepositoryIntegrationTest.java | 9 +- ...stmentReasonRepositoryIntegrationTest.java | 11 +- .../SupplyLineRepositoryIntegrationTest.java | 13 +- .../TradeItemRepositoryIntegrationTest.java | 10 +- .../referencedata/utils/AuditLogHelper.java | 11 +- .../web/BaseWebIntegrationTest.java | 6 +- ...ommodityTypeControllerIntegrationTest.java | 24 ++-- ...rrencySettingControllerIntegratonTest.java | 9 +- .../FacilityControllerIntegrationTest.java | 6 +- ...lityOperatorControllerIntegrationTest.java | 16 +-- ...rovedProductControllerIntegrationTest.java | 6 +- ...FacilityTypeControllerIntegrationTest.java | 6 +- ...graphicLevelControllerIntegrationTest.java | 16 +-- ...ographicZoneControllerIntegrationTest.java | 23 ++- ...lStockAmountControllerIntegrationTest.java | 25 ++-- .../web/LocaleControllerIntegrationTest.java | 2 +- .../LocationControllerIntegrationTest.java | 14 +- .../web/LotControllerIntegrationTest.java | 6 +- .../OrderableControllerIntegrationTest.java | 6 +- ...playCategoryControllerIntegrationTest.java | 18 ++- ...rableFulfillControllerIntegrationTest.java | 11 +- ...essingPeriodControllerIntegrationTest.java | 18 +-- ...singScheduleControllerIntegrationTest.java | 12 +- .../web/ProgramControllerIntegrationTest.java | 6 +- ...isitionGroupControllerIntegrationTest.java | 6 +- .../web/RightControllerIntegrationTest.java | 21 ++- .../web/RoleControllerIntegrationTest.java | 6 +- ...rviceAccountControllerIntegrationTest.java | 13 +- ...stmentReasonControllerIntegrationTest.java | 18 ++- ...ervisoryNodeControllerIntegrationTest.java | 6 +- .../SupplyLineControllerIntegrationTest.java | 23 ++- .../TradeItemControllerIntegrationTest.java | 22 ++- .../web/UserControllerIntegrationTest.java | 6 +- .../openlmis/referencedata/Application.java | 13 +- .../referencedata/AuditLogInitializer.java | 7 +- .../referencedata/CurrencyConfig.java | 6 +- .../CustomWebMvcConfigurerAdapter.java | 9 +- .../ExportSchemaFlywayCallback.java | 6 +- .../referencedata/JaVersDateProvider.java | 15 +- .../openlmis/referencedata/JacksonConfig.java | 6 +- .../RightAssignmentInitializer.java | 6 +- .../referencedata/TestDataInitializer.java | 6 +- .../referencedata/domain/BaseEntity.java | 6 +- .../openlmis/referencedata/domain/Code.java | 12 +- .../referencedata/domain/CommodityType.java | 33 ++--- .../domain/ContainerDispensable.java | 11 +- .../referencedata/domain/CreationDetails.java | 19 ++- .../domain/DefaultDispensable.java | 11 +- .../domain/DirectRoleAssignment.java | 14 +- .../referencedata/domain/Dispensable.java | 19 ++- .../domain/ExtraDataConverter.java | 8 +- .../referencedata/domain/Facility.java | 24 ++-- .../domain/FacilityOperator.java | 21 ++- .../referencedata/domain/FacilityType.java | 8 +- .../domain/FacilityTypeApprovedProduct.java | 8 +- .../domain/FulfillmentRoleAssignment.java | 6 +- .../referencedata/domain/GeographicLevel.java | 21 ++- .../referencedata/domain/GeographicZone.java | 24 ++-- .../openlmis/referencedata/domain/Gtin.java | 15 +- .../domain/IdealStockAmount.java | 21 ++- .../referencedata/domain/Identifiable.java | 6 +- .../openlmis/referencedata/domain/Lot.java | 19 ++- .../referencedata/domain/Orderable.java | 8 +- .../domain/OrderableDisplayCategory.java | 13 +- .../domain/OrderedDisplayValue.java | 10 +- .../domain/ProcessingPeriod.java | 6 +- .../domain/ProcessingSchedule.java | 19 ++- .../referencedata/domain/Program.java | 19 ++- .../domain/ProgramOrderable.java | 33 ++--- .../domain/RequisitionGroup.java | 21 ++- .../RequisitionGroupProgramSchedule.java | 17 +-- .../openlmis/referencedata/domain/Right.java | 6 +- .../referencedata/domain/RightAssignment.java | 17 +-- .../referencedata/domain/RightName.java | 6 +- .../referencedata/domain/RightQuery.java | 9 +- .../referencedata/domain/RightType.java | 6 +- .../openlmis/referencedata/domain/Role.java | 23 ++- .../referencedata/domain/RoleAssignment.java | 6 +- .../referencedata/domain/ServiceAccount.java | 23 ++- .../domain/StockAdjustmentReason.java | 18 ++- .../domain/SupervisionRoleAssignment.java | 18 +-- .../referencedata/domain/SupervisoryNode.java | 27 ++-- .../referencedata/domain/SupplyLine.java | 21 ++- .../domain/SupportedProgram.java | 16 +-- .../domain/SupportedProgramPrimaryKey.java | 12 +- .../referencedata/domain/TradeItem.java | 23 ++- .../domain/TradeItemClassification.java | 18 ++- .../domain/VaccineDispensable.java | 13 +- .../referencedata/dto/ApprovedProductDto.java | 6 +- .../openlmis/referencedata/dto/BaseDto.java | 10 +- .../referencedata/dto/BasicFacilityDto.java | 21 ++- .../referencedata/dto/CommodityTypeDto.java | 12 +- .../dto/CurrencySettingsDto.java | 6 +- .../dto/DetailedRoleAssignmentDto.java | 11 +- .../referencedata/dto/DispensableDto.java | 11 +- .../referencedata/dto/FacilityDto.java | 6 +- .../dto/FacilityOperatorDto.java | 9 +- .../referencedata/dto/FacilityTypeDto.java | 9 +- .../referencedata/dto/GeographicLevelDto.java | 9 +- .../referencedata/dto/GeographicZoneDto.java | 6 +- .../dto/GeographicZoneSimpleDto.java | 6 +- .../dto/IdealStockAmountCsvModel.java | 6 +- .../dto/IdealStockAmountDto.java | 6 +- .../dto/IsaProcessingPeriodDto.java | 6 +- .../openlmis/referencedata/dto/LotDto.java | 20 ++- .../referencedata/dto/MinimalFacilityDto.java | 13 +- .../referencedata/dto/NamedResource.java | 6 +- .../referencedata/dto/ObjectReferenceDto.java | 9 +- .../dto/OrderableDisplayCategoryDto.java | 10 +- .../referencedata/dto/OrderableDto.java | 16 +-- .../dto/ProcessingPeriodDto.java | 18 ++- .../dto/ProcessingScheduleDto.java | 6 +- .../referencedata/dto/ProgramDto.java | 12 +- .../dto/ProgramOrderableDto.java | 14 +- .../dto/RequisitionGroupBaseDto.java | 23 ++- .../dto/RequisitionGroupDto.java | 17 +-- ...equisitionGroupProgramScheduleBaseDto.java | 21 ++- .../RequisitionGroupProgramScheduleDto.java | 7 +- .../openlmis/referencedata/dto/ResultDto.java | 6 +- .../referencedata/dto/RightAssignmentDto.java | 7 +- .../openlmis/referencedata/dto/RightDto.java | 14 +- .../referencedata/dto/RoleAssignmentDto.java | 6 +- .../openlmis/referencedata/dto/RoleDto.java | 14 +- .../dto/ServiceAccountCreationBody.java | 9 +- .../referencedata/dto/ServiceAccountDto.java | 14 +- .../dto/SupervisoryNodeBaseDto.java | 21 ++- .../referencedata/dto/SupervisoryNodeDto.java | 19 ++- .../referencedata/dto/SupplyLineDto.java | 15 +- .../dto/SupplyLineSimpleDto.java | 17 +-- .../dto/SupportedProgramDto.java | 16 +-- .../dto/TradeItemClassificationDto.java | 10 +- .../referencedata/dto/TradeItemDto.java | 12 +- .../referencedata/dto/UploadResultDto.java | 6 +- .../openlmis/referencedata/dto/UserDto.java | 6 +- .../errorhandling/BaseHandler.java | 6 +- .../errorhandling/RefDataErrorHandling.java | 6 +- .../exception/BaseMessageException.java | 6 +- .../exception/ExceptionDetail.java | 6 +- .../IntegrityViolationException.java | 6 +- .../exception/InternalErrorException.java | 6 +- .../exception/NotFoundException.java | 6 +- .../exception/UnauthorizedException.java | 6 +- .../exception/ValidationMessageException.java | 8 +- .../i18n/ExposedMessageSource.java | 9 +- .../i18n/ExposedMessageSourceImpl.java | 11 +- .../referencedata/i18n/MessageService.java | 8 +- .../repository/CommodityTypeRepository.java | 11 +- .../repository/CountResource.java | 6 +- .../FacilityOperatorRepository.java | 9 +- .../repository/FacilityRepository.java | 16 +-- ...FacilityTypeApprovedProductRepository.java | 9 +- .../repository/FacilityTypeRepository.java | 10 +- .../repository/GeographicLevelRepository.java | 9 +- .../repository/GeographicZoneRepository.java | 14 +- .../IdealStockAmountRepository.java | 9 +- .../repository/LotRepository.java | 8 +- .../OrderableDisplayCategoryRepository.java | 9 +- .../repository/OrderableRepository.java | 6 +- .../ProcessingPeriodRepository.java | 6 +- .../ProcessingScheduleRepository.java | 11 +- .../repository/ProgramRepository.java | 6 +- ...isitionGroupProgramScheduleRepository.java | 9 +- .../RequisitionGroupRepository.java | 6 +- .../repository/RightAssignmentRepository.java | 6 +- .../repository/RightRepository.java | 9 +- .../repository/RoleAssignmentRepository.java | 6 +- .../repository/RoleRepository.java | 6 +- .../repository/ServiceAccountRepository.java | 9 +- .../StockAdjustmentReasonRepository.java | 11 +- .../repository/SupervisoryNodeRepository.java | 9 +- .../repository/SupplyLineRepository.java | 11 +- .../repository/TradeItemRepository.java | 9 +- .../repository/UserRepository.java | 6 +- .../repository/UserSearchParams.java | 6 +- .../custom/FacilityRepositoryCustom.java | 9 +- ...tyTypeApprovedProductRepositoryCustom.java | 10 +- .../GeographicZoneRepositoryCustom.java | 6 +- .../IdealStockAmountRepositoryCustom.java | 11 +- .../custom/LotRepositoryCustom.java | 14 +- .../custom/OrderableRepositoryCustom.java | 6 +- .../ProcessingPeriodRepositoryCustom.java | 6 +- .../custom/ProgramRepositoryCustom.java | 9 +- ...nGroupProgramScheduleRepositoryCustom.java | 10 +- .../RequisitionGroupRepositoryCustom.java | 9 +- .../custom/RightRepositoryCustom.java | 9 +- .../SupervisoryNodeRepositoryCustom.java | 6 +- .../custom/SupplyLineRepositoryCustom.java | 9 +- .../custom/TradeItemRepositoryCustom.java | 6 +- .../custom/UserRepositoryCustom.java | 6 +- .../custom/impl/FacilityRepositoryImpl.java | 6 +- ...lityTypeApprovedProductRepositoryImpl.java | 6 +- .../impl/GeographicZoneRepositoryImpl.java | 29 ++-- .../impl/IdealStockAmountRepositoryImpl.java | 25 ++-- .../custom/impl/LotRepositoryImpl.java | 6 +- .../custom/impl/OrderableRepositoryImpl.java | 23 ++- .../repository/custom/impl/PageableUtil.java | 6 +- .../impl/ProcessingPeriodRepositoryImpl.java | 6 +- .../custom/impl/ProgramRepositoryImpl.java | 9 +- ...ionGroupProgramScheduleRepositoryImpl.java | 19 ++- .../impl/RequisitionGroupRepositoryImpl.java | 25 ++-- .../custom/impl/RightRepositoryImpl.java | 19 ++- .../impl/SupervisoryNodeRepositoryImpl.java | 6 +- .../custom/impl/SupplyLineRepositoryImpl.java | 26 ++-- .../custom/impl/TradeItemRepositoryImpl.java | 13 +- .../custom/impl/UserRepositoryImpl.java | 6 +- .../CustomUserAuthenticationConverter.java | 12 +- .../security/MethodSecurityConfiguration.java | 7 +- .../ResourceServerSecurityConfiguration.java | 20 ++- .../security/UserNameProvider.java | 6 +- .../serializer/MoneyDeserializer.java | 10 +- .../serializer/MoneySerializer.java | 10 +- .../service/AuthenticationHelper.java | 8 +- .../service/FacilityService.java | 6 +- .../FacilityTypeApprovedProductBuilder.java | 6 +- .../FacilityTypeApprovedProductService.java | 8 +- .../service/FacilityTypeService.java | 6 +- .../service/GeographicZoneService.java | 16 +-- .../service/IdealStockAmountSearchParams.java | 8 +- .../service/IdealStockAmountService.java | 12 +- .../service/LotSearchParams.java | 12 +- .../referencedata/service/LotService.java | 6 +- .../service/ProcessingPeriodSearchParams.java | 6 +- .../service/ProcessingPeriodService.java | 6 +- .../referencedata/service/RequestHelper.java | 11 +- .../service/RequestParameters.java | 7 +- ...equisitionGroupProgramScheduleService.java | 9 +- .../service/RequisitionGroupService.java | 15 +- .../service/RightAssignmentExecutor.java | 6 +- .../service/RightAssignmentService.java | 36 ++--- .../referencedata/service/RightService.java | 9 +- .../service/SupplyLineService.java | 11 +- .../referencedata/service/UserService.java | 6 +- .../referencedata/util/AuthUserRequest.java | 7 +- .../util/ConditionalUuidGenerator.java | 9 +- .../util/CustomPhysicalNamingStrategy.java | 6 +- .../util/CustomSortDeserializer.java | 8 +- .../util/IdealStockAmountDtoBuilder.java | 8 +- .../referencedata/util/LocalizedMessage.java | 6 +- .../openlmis/referencedata/util/Message.java | 9 +- .../referencedata/util/OrderableBuilder.java | 8 +- .../referencedata/util/Pagination.java | 15 +- .../referencedata/util/Resource2Db.java | 18 +-- .../referencedata/util/StringHelper.java | 6 +- .../openlmis/referencedata/util/UuidUtil.java | 8 +- .../messagekeys/CommodityTypeMessageKeys.java | 6 +- .../messagekeys/CsvExportMessageKeys.java | 6 +- .../messagekeys/CsvUploadMessageKeys.java | 6 +- .../util/messagekeys/FacilityMessageKeys.java | 6 +- .../FacilityOperatorMessageKeys.java | 6 +- ...acilityTypeApprovedProductMessageKeys.java | 6 +- .../messagekeys/FacilityTypeMessageKeys.java | 6 +- .../GeographicLevelMessageKeys.java | 6 +- .../GeographicZoneMessageKeys.java | 6 +- .../IdealStockAmountMessageKeys.java | 6 +- .../util/messagekeys/LotMessageKeys.java | 6 +- .../util/messagekeys/MessageKeys.java | 6 +- .../OrderableDisplayCategoryMessageKeys.java | 6 +- .../messagekeys/OrderableMessageKeys.java | 6 +- .../OrderedDisplayValueMessageKeys.java | 6 +- .../ProcessingPeriodMessageKeys.java | 6 +- .../ProcessingScheduleMessageKeys.java | 6 +- .../util/messagekeys/ProgramMessageKeys.java | 6 +- ...derableBuilderDeserializerMessageKeys.java | 6 +- .../ProgramOrderableBuilderMessageKeys.java | 6 +- .../RequisitionGroupMessageKeys.java | 6 +- .../util/messagekeys/RightMessageKeys.java | 6 +- .../RoleAssignmentMessageKeys.java | 6 +- .../util/messagekeys/RoleMessageKeys.java | 6 +- .../ServiceAccountMessageKeys.java | 6 +- .../StockAdjustmentReasonMessageKeys.java | 6 +- .../SupervisoryNodeMessageKeys.java | 6 +- .../messagekeys/SupplyLineMessageKeys.java | 6 +- .../util/messagekeys/SystemMessageKeys.java | 6 +- .../messagekeys/TradeItemMessageKeys.java | 6 +- .../util/messagekeys/UserMessageKeys.java | 6 +- .../messagekeys/ValidationMessageKeys.java | 6 +- .../referencedata/validate/BaseValidator.java | 6 +- .../validate/CommodityTypeValidator.java | 6 +- .../validate/CsvHeaderValidator.java | 21 ++- .../validate/FacilityValidator.java | 13 +- .../validate/IdealStockAmountValidator.java | 10 +- .../referencedata/validate/LotValidator.java | 13 +- .../validate/OrderableValidator.java | 6 +- .../validate/ProcessingPeriodValidator.java | 12 +- .../validate/ProgramValidator.java | 6 +- .../validate/RequisitionGroupValidator.java | 19 ++- .../validate/SupervisoryNodeValidator.java | 6 +- .../validate/TradeItemValidator.java | 6 +- .../referencedata/web/BaseController.java | 18 ++- .../web/CommodityTypeController.java | 15 +- .../web/CurrencySettingsController.java | 6 +- .../referencedata/web/FacilityController.java | 6 +- .../web/FacilityOperatorController.java | 8 +- .../web/FacilitySearchParams.java | 6 +- ...FacilityTypeApprovedProductController.java | 6 +- .../web/FacilityTypeController.java | 8 +- .../web/GeographicLevelController.java | 9 +- .../web/GeographicZoneController.java | 18 ++- .../web/IdealStockAmountController.java | 16 +-- .../referencedata/web/LocationController.java | 10 +- .../referencedata/web/LotController.java | 13 +- .../referencedata/web/MessageController.java | 9 +- .../OrderableDisplayCategoryController.java | 11 +- .../referencedata/web/OrderableFulfill.java | 13 +- .../web/OrderableFulfillController.java | 16 +-- .../web/OrderableFulfillFactory.java | 12 +- .../web/ProcessingPeriodController.java | 10 +- .../web/ProcessingScheduleController.java | 14 +- .../referencedata/web/ProgramController.java | 6 +- .../web/ProgramSearchParams.java | 6 +- .../web/RequisitionGroupController.java | 6 +- .../referencedata/web/RightController.java | 23 ++- .../referencedata/web/RoleController.java | 6 +- .../web/ServiceAccountController.java | 9 +- .../web/StockAdjustmentReasonController.java | 13 +- .../web/SupervisoryNodeController.java | 6 +- .../web/SupervisoryNodeSearchParams.java | 6 +- .../web/SupplyLineController.java | 17 ++- .../web/TradeItemController.java | 9 +- .../referencedata/web/UserController.java | 16 +-- .../referencedata/web/VersionController.java | 6 +- .../web/csv/format/CsvBeanWriter.java | 21 ++- .../web/csv/format/CsvFormatter.java | 17 ++- .../web/csv/model/ImportField.java | 14 +- .../web/csv/model/ModelClass.java | 11 +- .../web/csv/model/ModelClassHelper.java | 9 +- .../web/csv/model/ModelField.java | 6 +- .../web/csv/parser/CsvBeanReader.java | 21 ++- .../web/csv/parser/CsvParser.java | 17 +-- .../web/csv/processor/CsvCellProcessors.java | 14 +- .../csv/processor/FormatCommodityType.java | 6 +- .../web/csv/processor/FormatFacility.java | 6 +- .../csv/processor/FormatProcessingPeriod.java | 6 +- .../web/csv/processor/ParseCommodityType.java | 9 +- .../web/csv/processor/ParseFacility.java | 6 +- .../csv/processor/ParsePositiveInteger.java | 6 +- .../csv/processor/ParseProcessingPeriod.java | 9 +- .../IdealStockAmountProcessor.java | 16 +-- .../recordhandler/IdealStockAmountWriter.java | 6 +- .../csv/recordhandler/RecordProcessor.java | 9 +- .../web/csv/recordhandler/RecordWriter.java | 6 +- .../referencedata/web/fhir/Coding.java | 7 +- .../referencedata/web/fhir/Element.java | 9 +- .../referencedata/web/fhir/Identifier.java | 8 +- .../referencedata/web/fhir/Location.java | 14 +- .../web/fhir/LocationFactory.java | 6 +- .../referencedata/web/fhir/PhysicalType.java | 9 +- .../referencedata/web/fhir/Position.java | 6 +- .../referencedata/web/fhir/Reference.java | 9 +- .../referencedata/web/fhir/Resource.java | 9 +- .../referencedata/web/fhir/Status.java | 6 +- .../ExportSchemaFlywayCallbackTest.java | 6 +- .../TestDataInitializerTest.java | 6 +- .../referencedata/ToStringTestUtils.java | 6 +- .../openlmis/referencedata/WireMockTest.java | 7 +- .../referencedata/domain/CodeTest.java | 6 +- .../domain/CommodityTypeTest.java | 8 +- .../domain/ContainerDispensableTest.java | 12 +- .../domain/CreationDetailsTest.java | 7 +- .../domain/DefaultDispensableTest.java | 12 +- .../referencedata/domain/FacilityTest.java | 6 +- .../domain/FulfillmentRoleAssignmentTest.java | 6 +- .../referencedata/domain/GtinTest.java | 6 +- .../referencedata/domain/OrderableTest.java | 6 +- .../domain/OrderedDisplayValueTest.java | 6 +- .../domain/ProcessingPeriodTest.java | 10 +- .../domain/ProcessingScheduleTest.java | 6 +- .../domain/ProgramOrderableTest.java | 6 +- .../referencedata/domain/ProgramTest.java | 7 +- .../domain/RequisitionGroupTest.java | 9 +- .../domain/RightAssignmentTest.java | 15 +- .../referencedata/domain/RightTest.java | 9 +- .../domain/RoleAssignmentTest.java | 12 +- .../referencedata/domain/RoleTest.java | 9 +- .../domain/ServiceAccountTest.java | 15 +- .../domain/SupervisionRoleAssignmentTest.java | 6 +- .../domain/SupervisoryNodeTest.java | 12 +- .../domain/SupportedProgramTest.java | 7 +- .../referencedata/domain/TradeItemTest.java | 8 +- .../referencedata/domain/UserTest.java | 6 +- .../domain/VaccineDispensableTest.java | 12 +- .../dto/ApprovedProductDtoTest.java | 6 +- .../dto/BasicFacilityDtoTest.java | 7 +- .../referencedata/dto/FacilityDtoTest.java | 8 +- .../referencedata/dto/LotDtoTest.java | 12 +- .../dto/MinimalFacilityDtoTest.java | 7 +- .../dto/ProcessingScheduleDtoTest.java | 6 +- .../dto/ServiceAccountCreationBodyTest.java | 10 +- .../dto/ServiceAccountDtoTest.java | 7 +- .../dto/SupportedProgramDtoTest.java | 7 +- .../referencedata/dto/UserDtoTest.java | 6 +- .../RefDataErrorHandlingTest.java | 6 +- .../repository/CountResourceTest.java | 6 +- .../repository/UserSearchParamsTest.java | 6 +- .../custom/impl/PageableUtilTest.java | 6 +- ...CustomUserAuthenticationConverterTest.java | 12 +- .../serializer/MoneyDeserializerTest.java | 16 +-- .../serializer/MoneySerializerTest.java | 14 +- .../service/FacilityServiceTest.java | 6 +- ...acilityTypeApprovedProductServiceTest.java | 12 +- .../service/FacilityTypeServiceTest.java | 6 +- .../service/GeographicZoneServiceTest.java | 18 ++- .../service/IdealStockAmountServiceTest.java | 11 +- .../referencedata/service/LotServiceTest.java | 6 +- .../ProcessingPeriodSearchParamsTest.java | 6 +- .../service/ProcessingPeriodServiceTest.java | 6 +- .../service/RequestHelperTest.java | 9 +- .../service/RequestParametersTest.java | 10 +- .../service/RequisitionGroupServiceTest.java | 6 +- .../service/RightAssignmentExecutorTest.java | 6 +- .../service/RightAssignmentServiceTest.java | 6 +- .../service/RightServiceTest.java | 6 +- .../service/SupplyLineServiceTest.java | 15 +- .../service/UserServiceTest.java | 6 +- .../testbuilder/CommodityTypeDataBuilder.java | 12 +- .../DirectRoleAssignmentDataBuilder.java | 6 +- .../testbuilder/ExtraDataBuilder.java | 7 +- .../testbuilder/FacilityDataBuilder.java | 16 +-- .../FacilityOperatorDataBuilder.java | 8 +- ...cilityTypeApprovedProductsDataBuilder.java | 6 +- .../testbuilder/FacilityTypeDataBuilder.java | 8 +- .../GeographicLevelDataBuilder.java | 9 +- .../GeographicZoneDataBuilder.java | 10 +- .../testbuilder/LotDataBuilder.java | 11 +- .../OAuth2AuthenticationDataBuilder.java | 12 +- .../testbuilder/OrderableDataBuilder.java | 6 +- .../ProcessingPeriodDataBuilder.java | 11 +- .../ProcessingScheduleDataBuilder.java | 11 +- .../testbuilder/ProgramDataBuilder.java | 8 +- .../RequisitionGroupDataBuilder.java | 6 +- .../testbuilder/RightDataBuilder.java | 6 +- .../testbuilder/RoleDataBuilder.java | 6 +- .../ServiceAccountDataBuilder.java | 11 +- .../SupervisoryNodeDataBuilder.java | 12 +- .../testbuilder/SupplyLineDataBuilder.java | 8 +- .../SupportedProgramDataBuilder.java | 9 +- .../testbuilder/TradeItemDataBuilder.java | 12 +- .../testbuilder/UserDataBuilder.java | 6 +- .../util/CustomSortDeserializerTest.java | 8 +- .../referencedata/util/MessageTest.java | 11 +- .../util/OrderableBuilderTest.java | 12 +- .../referencedata/util/Resource2DbTest.java | 6 +- .../util/UserSearchParamsDataBuilder.java | 6 +- .../IdealStockAmountMessageKeysTest.java | 6 +- .../ProcessingPeriodMessageKeysTest.java | 6 +- .../RoleAssignmentMessageKeysTest.java | 6 +- .../SupervisoryNodeMessageKeysTest.java | 6 +- .../SupplyLineMessageKeysTest.java | 6 +- .../validate/CsvHeaderValidatorTest.java | 23 ++- .../validate/FacilityValidatorTest.java | 21 ++- .../IdealStockAmountValidatorTest.java | 6 +- .../validate/LotValidatorTest.java | 16 +-- .../ProcessingPeriodValidatorTest.java | 12 +- .../validate/ProgramValidatorTest.java | 8 +- ...sitionGroupValidatorParameterizedTest.java | 11 +- .../RequisitionGroupValidatorTest.java | 14 +- .../SupervisoryNodeValidatorTest.java | 6 +- .../validate/UserValidatorTest.java | 6 +- .../validate/ValidationTestUtils.java | 6 +- .../openlmis/referencedata/web/DummyPage.java | 10 +- .../web/FacilitySearchParamsTest.java | 6 +- ...rderableDisplayCategoryControllerTest.java | 8 +- .../web/OrderableFulfillFactoryTest.java | 7 +- .../web/ProgramSearchParamsTest.java | 6 +- .../referencedata/web/RoleControllerTest.java | 6 +- .../web/SupervisoryNodeSearchParamsTest.java | 6 +- .../web/SupplyLineControllerTest.java | 16 +-- .../referencedata/web/UserControllerTest.java | 10 +- .../referencedata/web/csv/ModelClassTest.java | 21 ++- .../referencedata/web/csv/ModelFieldTest.java | 23 ++- .../csv/processor/CsvCellProcessorsTest.java | 25 ++-- .../processor/FormatCommodityTypeTest.java | 10 +- .../web/csv/processor/FormatFacilityTest.java | 10 +- .../processor/FormatProcessingPeriodTest.java | 6 +- .../csv/processor/ParseCommodityTypeTest.java | 10 +- .../web/csv/processor/ParseFacilityTest.java | 10 +- .../processor/ParsePositiveIntegerTest.java | 6 +- .../processor/ParseProcessingPeriodTest.java | 10 +- .../IdealStockAmountProcessorTest.java | 13 +- .../IdealStockAmountWriterTest.java | 17 ++- .../web/dummy/DummyNestedField.java | 6 +- .../web/dummy/DummyTransferObject.java | 10 +- 510 files changed, 2533 insertions(+), 2847 deletions(-) diff --git a/LICENSE-HEADER b/LICENSE-HEADER index 3ccb3d37f..50d1d85e5 100644 --- a/LICENSE-HEADER +++ b/LICENSE-HEADER @@ -5,10 +5,10 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ diff --git a/build.gradle b/build.gradle index aa11cd0a8..4b213f5a9 100644 --- a/build.gradle +++ b/build.gradle @@ -195,7 +195,7 @@ jacocoTestReport { } checkstyle { - toolVersion = "7.1" + toolVersion = "8.12" } //Usage: gradle sonarqube diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml index 4c4f9fe88..4497a06de 100644 --- a/config/checkstyle/checkstyle.xml +++ b/config/checkstyle/checkstyle.xml @@ -1,7 +1,7 @@ + "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN" + "https://checkstyle.org/dtds/configuration_1_3.dtd"> - - - + + + - - + + @@ -45,16 +47,23 @@ - + - - + + + + - + - + @@ -62,9 +71,9 @@ - + value="WhitespaceAround: ''{0}'' is not followed by whitespace. Empty blocks may only be represented as '{}' when not part of a multi-block statement (4.1.3)"/> + @@ -77,69 +86,92 @@ + + + + + + + + + + + + + + + + + + + + value="Package name ''{0}'' must match pattern ''{1}''."/> + value="Type name ''{0}'' must match pattern ''{1}''."/> + value="Member name ''{0}'' must match pattern ''{1}''."/> - + + + + + + value="Lambda parameter name ''{0}'' must match pattern ''{1}''."/> - + + value="Catch parameter name ''{0}'' must match pattern ''{1}''."/> - - + + value="Local variable name ''{0}'' must match pattern ''{1}''."/> + value="Class type name ''{0}'' must match pattern ''{1}''."/> + value="Method type name ''{0}'' must match pattern ''{1}''."/> + value="Interface type name ''{0}'' must match pattern ''{1}''."/> - - - + value="GenericWhitespace ''{0}'' is followed by whitespace."/> + + + @@ -155,27 +187,45 @@ + + + + + + + + + + - + - + + + - + - + @@ -189,7 +239,7 @@ + value="Method name ''{0}'' must match pattern ''{1}''."/> @@ -202,6 +252,5 @@ - diff --git a/src/integration-test/java/org/openlmis/referencedata/JaVersIntegrationTest.java b/src/integration-test/java/org/openlmis/referencedata/JaVersIntegrationTest.java index 36e926b04..1b4e893cc 100644 --- a/src/integration-test/java/org/openlmis/referencedata/JaVersIntegrationTest.java +++ b/src/integration-test/java/org/openlmis/referencedata/JaVersIntegrationTest.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata; @@ -18,6 +18,9 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; +import java.io.IOException; +import java.util.List; +import javax.annotation.Resource; import org.javers.core.Javers; import org.javers.core.metamodel.object.CdoSnapshot; import org.javers.repository.jql.QueryBuilder; @@ -34,11 +37,6 @@ import org.springframework.test.context.junit4.SpringRunner; import org.springframework.transaction.annotation.Transactional; -import java.io.IOException; -import java.util.List; - -import javax.annotation.Resource; - @RunWith(SpringRunner.class) @ActiveProfiles("test") @SpringBootTest diff --git a/src/integration-test/java/org/openlmis/referencedata/PageImplRepresentation.java b/src/integration-test/java/org/openlmis/referencedata/PageImplRepresentation.java index af0034f2c..3928e045c 100644 --- a/src/integration-test/java/org/openlmis/referencedata/PageImplRepresentation.java +++ b/src/integration-test/java/org/openlmis/referencedata/PageImplRepresentation.java @@ -5,25 +5,24 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import java.util.ArrayList; +import java.util.List; import org.openlmis.referencedata.util.CustomSortDeserializer; import org.springframework.data.domain.PageImpl; import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Sort; -import java.util.ArrayList; -import java.util.List; - /** * PageImplRepresentation offers a convenient substitute for PageImpl. * Because the former lacks a default constructor, it is inconvenient to diff --git a/src/integration-test/java/org/openlmis/referencedata/migration/BaseMigrationIntegrationTest.java b/src/integration-test/java/org/openlmis/referencedata/migration/BaseMigrationIntegrationTest.java index 4b61294e9..29479d3c1 100644 --- a/src/integration-test/java/org/openlmis/referencedata/migration/BaseMigrationIntegrationTest.java +++ b/src/integration-test/java/org/openlmis/referencedata/migration/BaseMigrationIntegrationTest.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.migration; @@ -19,6 +19,12 @@ import static org.hamcrest.Matchers.is; import static org.junit.Assert.assertThat; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.stream.Collectors; +import javax.sql.DataSource; import org.flywaydb.core.Flyway; import org.flywaydb.core.api.MigrationVersion; import org.junit.Test; @@ -34,14 +40,6 @@ import org.springframework.test.context.ActiveProfiles; import org.springframework.test.context.junit4.SpringRunner; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.concurrent.atomic.AtomicInteger; -import java.util.stream.Collectors; - -import javax.sql.DataSource; - @RunWith(SpringRunner.class) @ActiveProfiles("test") diff --git a/src/integration-test/java/org/openlmis/referencedata/migration/CreateDispensablesMigrationIntegrationTest.java b/src/integration-test/java/org/openlmis/referencedata/migration/CreateDispensablesMigrationIntegrationTest.java index 9402a978b..5ad0ec915 100644 --- a/src/integration-test/java/org/openlmis/referencedata/migration/CreateDispensablesMigrationIntegrationTest.java +++ b/src/integration-test/java/org/openlmis/referencedata/migration/CreateDispensablesMigrationIntegrationTest.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.migration; @@ -21,12 +21,10 @@ import static org.junit.Assert.assertThat; import com.google.common.collect.ImmutableMap; - -import org.apache.commons.lang.RandomStringUtils; - import java.util.List; import java.util.Map; import java.util.UUID; +import org.apache.commons.lang.RandomStringUtils; public class CreateDispensablesMigrationIntegrationTest extends BaseMigrationIntegrationTest { diff --git a/src/integration-test/java/org/openlmis/referencedata/migration/ReverseRelationshipOfOrderablesMigrationIntegrationTest.java b/src/integration-test/java/org/openlmis/referencedata/migration/ReverseRelationshipOfOrderablesMigrationIntegrationTest.java index d8c7acec3..0aa10222f 100644 --- a/src/integration-test/java/org/openlmis/referencedata/migration/ReverseRelationshipOfOrderablesMigrationIntegrationTest.java +++ b/src/integration-test/java/org/openlmis/referencedata/migration/ReverseRelationshipOfOrderablesMigrationIntegrationTest.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.migration; @@ -20,7 +20,6 @@ import static org.junit.Assert.assertThat; import com.google.common.collect.ImmutableMap; - import java.util.Map; import java.util.UUID; diff --git a/src/integration-test/java/org/openlmis/referencedata/repository/BaseCrudRepositoryIntegrationTest.java b/src/integration-test/java/org/openlmis/referencedata/repository/BaseCrudRepositoryIntegrationTest.java index 939939b9d..012aceed2 100644 --- a/src/integration-test/java/org/openlmis/referencedata/repository/BaseCrudRepositoryIntegrationTest.java +++ b/src/integration-test/java/org/openlmis/referencedata/repository/BaseCrudRepositoryIntegrationTest.java @@ -5,16 +5,18 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.repository; +import java.util.UUID; +import java.util.concurrent.atomic.AtomicInteger; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; @@ -25,9 +27,6 @@ import org.springframework.test.context.junit4.SpringRunner; import org.springframework.transaction.annotation.Transactional; -import java.util.UUID; -import java.util.concurrent.atomic.AtomicInteger; - @RunWith(SpringRunner.class) @SpringBootTest diff --git a/src/integration-test/java/org/openlmis/referencedata/repository/CommodityTypeRepositoryIntegrationTest.java b/src/integration-test/java/org/openlmis/referencedata/repository/CommodityTypeRepositoryIntegrationTest.java index 12bd4fc26..a8f9c8f36 100644 --- a/src/integration-test/java/org/openlmis/referencedata/repository/CommodityTypeRepositoryIntegrationTest.java +++ b/src/integration-test/java/org/openlmis/referencedata/repository/CommodityTypeRepositoryIntegrationTest.java @@ -5,24 +5,16 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.repository; -import org.junit.Test; -import org.openlmis.referencedata.domain.CommodityType; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.repository.CrudRepository; - -import java.util.ArrayList; -import java.util.UUID; - import static java.util.Arrays.asList; import static java.util.Collections.singletonList; import static org.hamcrest.Matchers.empty; @@ -32,6 +24,13 @@ import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; +import java.util.ArrayList; +import java.util.UUID; +import org.junit.Test; +import org.openlmis.referencedata.domain.CommodityType; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.repository.CrudRepository; + public class CommodityTypeRepositoryIntegrationTest extends BaseCrudRepositoryIntegrationTest { diff --git a/src/integration-test/java/org/openlmis/referencedata/repository/FacilityRepositoryIntegrationTest.java b/src/integration-test/java/org/openlmis/referencedata/repository/FacilityRepositoryIntegrationTest.java index 590e7c5e9..9765f86e5 100644 --- a/src/integration-test/java/org/openlmis/referencedata/repository/FacilityRepositoryIntegrationTest.java +++ b/src/integration-test/java/org/openlmis/referencedata/repository/FacilityRepositoryIntegrationTest.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.repository; @@ -35,6 +35,11 @@ import com.vividsolutions.jts.geom.Coordinate; import com.vividsolutions.jts.geom.GeometryFactory; import com.vividsolutions.jts.geom.Polygon; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.UUID; +import java.util.stream.Collectors; import org.junit.Before; import org.junit.Test; import org.openlmis.referencedata.domain.Facility; @@ -54,11 +59,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.UUID; -import java.util.stream.Collectors; @SuppressWarnings("PMD.TooManyMethods") public class FacilityRepositoryIntegrationTest extends BaseCrudRepositoryIntegrationTest { diff --git a/src/integration-test/java/org/openlmis/referencedata/repository/FacilityTypeApprovedProductRepositoryIntegrationTest.java b/src/integration-test/java/org/openlmis/referencedata/repository/FacilityTypeApprovedProductRepositoryIntegrationTest.java index 32b33a0c6..dde21b4d3 100644 --- a/src/integration-test/java/org/openlmis/referencedata/repository/FacilityTypeApprovedProductRepositoryIntegrationTest.java +++ b/src/integration-test/java/org/openlmis/referencedata/repository/FacilityTypeApprovedProductRepositoryIntegrationTest.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.repository; @@ -24,6 +24,12 @@ import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.UUID; +import javax.persistence.EntityManager; +import javax.persistence.PersistenceException; import org.joda.money.CurrencyUnit; import org.joda.money.Money; import org.junit.Before; @@ -45,12 +51,6 @@ import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Pageable; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.UUID; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceException; @SuppressWarnings("PMD.TooManyMethods") public class FacilityTypeApprovedProductRepositoryIntegrationTest extends diff --git a/src/integration-test/java/org/openlmis/referencedata/repository/FacilityTypeRepositoryIntegrationTest.java b/src/integration-test/java/org/openlmis/referencedata/repository/FacilityTypeRepositoryIntegrationTest.java index 04a588475..c9b3942be 100644 --- a/src/integration-test/java/org/openlmis/referencedata/repository/FacilityTypeRepositoryIntegrationTest.java +++ b/src/integration-test/java/org/openlmis/referencedata/repository/FacilityTypeRepositoryIntegrationTest.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.repository; diff --git a/src/integration-test/java/org/openlmis/referencedata/repository/GeographicLevelRepositoryIntegrationTest.java b/src/integration-test/java/org/openlmis/referencedata/repository/GeographicLevelRepositoryIntegrationTest.java index 70383e860..05cda05c5 100644 --- a/src/integration-test/java/org/openlmis/referencedata/repository/GeographicLevelRepositoryIntegrationTest.java +++ b/src/integration-test/java/org/openlmis/referencedata/repository/GeographicLevelRepositoryIntegrationTest.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.repository; diff --git a/src/integration-test/java/org/openlmis/referencedata/repository/GeographicZoneRepositoryIntegrationTest.java b/src/integration-test/java/org/openlmis/referencedata/repository/GeographicZoneRepositoryIntegrationTest.java index 417705b66..4bbd97035 100644 --- a/src/integration-test/java/org/openlmis/referencedata/repository/GeographicZoneRepositoryIntegrationTest.java +++ b/src/integration-test/java/org/openlmis/referencedata/repository/GeographicZoneRepositoryIntegrationTest.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.repository; @@ -31,7 +31,9 @@ import com.vividsolutions.jts.geom.GeometryFactory; import com.vividsolutions.jts.geom.Point; import com.vividsolutions.jts.geom.Polygon; - +import java.util.List; +import java.util.Set; +import java.util.UUID; import org.junit.Before; import org.junit.Test; import org.openlmis.referencedata.domain.GeographicLevel; @@ -43,10 +45,6 @@ import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Sort; -import java.util.List; -import java.util.Set; -import java.util.UUID; - @SuppressWarnings({"PMD.TooManyMethods"}) public class GeographicZoneRepositoryIntegrationTest extends BaseCrudRepositoryIntegrationTest { diff --git a/src/integration-test/java/org/openlmis/referencedata/repository/IdealStockAmountRepositoryIntegrationTest.java b/src/integration-test/java/org/openlmis/referencedata/repository/IdealStockAmountRepositoryIntegrationTest.java index 4f57ba599..33ab0e138 100644 --- a/src/integration-test/java/org/openlmis/referencedata/repository/IdealStockAmountRepositoryIntegrationTest.java +++ b/src/integration-test/java/org/openlmis/referencedata/repository/IdealStockAmountRepositoryIntegrationTest.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.repository; @@ -20,6 +20,11 @@ import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; +import java.time.LocalDate; +import java.time.ZonedDateTime; +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; import org.assertj.core.util.Lists; import org.junit.Before; import org.junit.Test; @@ -36,12 +41,6 @@ import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; -import java.time.LocalDate; -import java.time.ZonedDateTime; -import java.util.ArrayList; -import java.util.List; -import java.util.UUID; - @SuppressWarnings("PMD.TooManyMethods") public class IdealStockAmountRepositoryIntegrationTest extends BaseCrudRepositoryIntegrationTest { diff --git a/src/integration-test/java/org/openlmis/referencedata/repository/LotRepositoryIntegrationTest.java b/src/integration-test/java/org/openlmis/referencedata/repository/LotRepositoryIntegrationTest.java index 5542ebc9b..9129495ae 100644 --- a/src/integration-test/java/org/openlmis/referencedata/repository/LotRepositoryIntegrationTest.java +++ b/src/integration-test/java/org/openlmis/referencedata/repository/LotRepositoryIntegrationTest.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.repository; @@ -18,6 +18,9 @@ import static org.junit.Assert.assertEquals; import com.google.common.collect.ImmutableList; +import java.time.LocalDate; +import java.util.Arrays; +import java.util.Collections; import org.junit.Before; import org.junit.Test; import org.openlmis.referencedata.domain.Lot; @@ -28,9 +31,6 @@ import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Pageable; -import java.time.LocalDate; -import java.util.Arrays; -import java.util.Collections; @SuppressWarnings("PMD.TooManyMethods") public class LotRepositoryIntegrationTest extends BaseCrudRepositoryIntegrationTest { diff --git a/src/integration-test/java/org/openlmis/referencedata/repository/OrderableDisplayCategoryRepositoryIntegrationTest.java b/src/integration-test/java/org/openlmis/referencedata/repository/OrderableDisplayCategoryRepositoryIntegrationTest.java index 37430f53a..7f6514d0e 100644 --- a/src/integration-test/java/org/openlmis/referencedata/repository/OrderableDisplayCategoryRepositoryIntegrationTest.java +++ b/src/integration-test/java/org/openlmis/referencedata/repository/OrderableDisplayCategoryRepositoryIntegrationTest.java @@ -5,16 +5,19 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.repository; +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -24,10 +27,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.repository.CrudRepository; -import java.util.ArrayList; -import java.util.List; -import java.util.UUID; - public class OrderableDisplayCategoryRepositoryIntegrationTest extends BaseCrudRepositoryIntegrationTest { diff --git a/src/integration-test/java/org/openlmis/referencedata/repository/OrderableRepositoryIntegrationTest.java b/src/integration-test/java/org/openlmis/referencedata/repository/OrderableRepositoryIntegrationTest.java index 91568e8d5..e1871dc56 100644 --- a/src/integration-test/java/org/openlmis/referencedata/repository/OrderableRepositoryIntegrationTest.java +++ b/src/integration-test/java/org/openlmis/referencedata/repository/OrderableRepositoryIntegrationTest.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.repository; diff --git a/src/integration-test/java/org/openlmis/referencedata/repository/ProcessingPeriodRepositoryIntegrationTest.java b/src/integration-test/java/org/openlmis/referencedata/repository/ProcessingPeriodRepositoryIntegrationTest.java index 3debc34c0..0d3ef49be 100644 --- a/src/integration-test/java/org/openlmis/referencedata/repository/ProcessingPeriodRepositoryIntegrationTest.java +++ b/src/integration-test/java/org/openlmis/referencedata/repository/ProcessingPeriodRepositoryIntegrationTest.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.repository; diff --git a/src/integration-test/java/org/openlmis/referencedata/repository/ProcessingScheduleRepositoryIntegrationTest.java b/src/integration-test/java/org/openlmis/referencedata/repository/ProcessingScheduleRepositoryIntegrationTest.java index 1ce41fa5d..69bc1a949 100644 --- a/src/integration-test/java/org/openlmis/referencedata/repository/ProcessingScheduleRepositoryIntegrationTest.java +++ b/src/integration-test/java/org/openlmis/referencedata/repository/ProcessingScheduleRepositoryIntegrationTest.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.repository; @@ -19,7 +19,8 @@ import static org.junit.Assert.assertTrue; import com.google.common.collect.Lists; - +import java.time.ZonedDateTime; +import java.util.Optional; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -29,9 +30,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.dao.DataIntegrityViolationException; -import java.time.ZonedDateTime; -import java.util.Optional; - public class ProcessingScheduleRepositoryIntegrationTest extends BaseCrudRepositoryIntegrationTest { diff --git a/src/integration-test/java/org/openlmis/referencedata/repository/ProgramRepositoryIntegrationTest.java b/src/integration-test/java/org/openlmis/referencedata/repository/ProgramRepositoryIntegrationTest.java index 205cce227..6ee86ac8d 100644 --- a/src/integration-test/java/org/openlmis/referencedata/repository/ProgramRepositoryIntegrationTest.java +++ b/src/integration-test/java/org/openlmis/referencedata/repository/ProgramRepositoryIntegrationTest.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.repository; @@ -23,6 +23,9 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; +import java.util.List; +import java.util.Set; +import java.util.UUID; import org.junit.Test; import org.openlmis.referencedata.domain.Facility; import org.openlmis.referencedata.domain.FacilityType; @@ -40,10 +43,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.dao.DataIntegrityViolationException; -import java.util.List; -import java.util.Set; -import java.util.UUID; - @SuppressWarnings("PMD.TooManyMethods") public class ProgramRepositoryIntegrationTest extends BaseCrudRepositoryIntegrationTest { diff --git a/src/integration-test/java/org/openlmis/referencedata/repository/RequisitionGroupProgramScheduleRepositoryIntegrationTest.java b/src/integration-test/java/org/openlmis/referencedata/repository/RequisitionGroupProgramScheduleRepositoryIntegrationTest.java index aaafa7063..4f0229af1 100644 --- a/src/integration-test/java/org/openlmis/referencedata/repository/RequisitionGroupProgramScheduleRepositoryIntegrationTest.java +++ b/src/integration-test/java/org/openlmis/referencedata/repository/RequisitionGroupProgramScheduleRepositoryIntegrationTest.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.repository; @@ -22,6 +22,8 @@ import com.google.common.collect.Lists; import com.google.common.collect.Sets; +import java.util.List; +import javax.persistence.PersistenceException; import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -40,9 +42,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.annotation.Commit; -import java.util.List; -import javax.persistence.PersistenceException; - /** * Allow testing requisitionGroupProgramScheduleRepository. */ diff --git a/src/integration-test/java/org/openlmis/referencedata/repository/RequisitionGroupRepositoryIntegrationTest.java b/src/integration-test/java/org/openlmis/referencedata/repository/RequisitionGroupRepositoryIntegrationTest.java index 0ef2516b5..9efd34c29 100644 --- a/src/integration-test/java/org/openlmis/referencedata/repository/RequisitionGroupRepositoryIntegrationTest.java +++ b/src/integration-test/java/org/openlmis/referencedata/repository/RequisitionGroupRepositoryIntegrationTest.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.repository; @@ -21,6 +21,10 @@ import static org.mockito.BDDMockito.given; import static org.mockito.Mockito.mock; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; import org.javers.common.collections.Sets; import org.junit.Before; import org.junit.Test; @@ -39,11 +43,6 @@ import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; - /** * Allow testing requisitionGroupRepository. */ diff --git a/src/integration-test/java/org/openlmis/referencedata/repository/RightAssignmentRepositoryIntegrationTest.java b/src/integration-test/java/org/openlmis/referencedata/repository/RightAssignmentRepositoryIntegrationTest.java index 8c4e8ed9c..5e6b73cce 100644 --- a/src/integration-test/java/org/openlmis/referencedata/repository/RightAssignmentRepositoryIntegrationTest.java +++ b/src/integration-test/java/org/openlmis/referencedata/repository/RightAssignmentRepositoryIntegrationTest.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.repository; @@ -19,6 +19,8 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; +import java.util.Set; +import java.util.UUID; import org.junit.Before; import org.junit.Test; import org.openlmis.referencedata.domain.Facility; @@ -34,9 +36,6 @@ import org.openlmis.referencedata.testbuilder.UserDataBuilder; import org.springframework.beans.factory.annotation.Autowired; -import java.util.Set; -import java.util.UUID; - public class RightAssignmentRepositoryIntegrationTest extends BaseCrudRepositoryIntegrationTest { diff --git a/src/integration-test/java/org/openlmis/referencedata/repository/RightRepositoryIntegrationTest.java b/src/integration-test/java/org/openlmis/referencedata/repository/RightRepositoryIntegrationTest.java index f90f31d64..26bf1da9f 100644 --- a/src/integration-test/java/org/openlmis/referencedata/repository/RightRepositoryIntegrationTest.java +++ b/src/integration-test/java/org/openlmis/referencedata/repository/RightRepositoryIntegrationTest.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.repository; @@ -23,16 +23,15 @@ import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; +import java.util.Arrays; +import java.util.List; +import java.util.Set; import org.junit.Before; import org.junit.Test; import org.openlmis.referencedata.domain.Right; import org.openlmis.referencedata.domain.RightType; import org.springframework.beans.factory.annotation.Autowired; -import java.util.Arrays; -import java.util.List; -import java.util.Set; - public class RightRepositoryIntegrationTest extends BaseCrudRepositoryIntegrationTest { diff --git a/src/integration-test/java/org/openlmis/referencedata/repository/RoleAssignmentRepositoryIntegrationTest.java b/src/integration-test/java/org/openlmis/referencedata/repository/RoleAssignmentRepositoryIntegrationTest.java index 63818a260..9d3cbd80a 100644 --- a/src/integration-test/java/org/openlmis/referencedata/repository/RoleAssignmentRepositoryIntegrationTest.java +++ b/src/integration-test/java/org/openlmis/referencedata/repository/RoleAssignmentRepositoryIntegrationTest.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.repository; diff --git a/src/integration-test/java/org/openlmis/referencedata/repository/RoleRepositoryIntegrationTest.java b/src/integration-test/java/org/openlmis/referencedata/repository/RoleRepositoryIntegrationTest.java index 2ad0b8661..a2ffffdba 100644 --- a/src/integration-test/java/org/openlmis/referencedata/repository/RoleRepositoryIntegrationTest.java +++ b/src/integration-test/java/org/openlmis/referencedata/repository/RoleRepositoryIntegrationTest.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.repository; diff --git a/src/integration-test/java/org/openlmis/referencedata/repository/ServiceAccountRepositoryIntegrationTest.java b/src/integration-test/java/org/openlmis/referencedata/repository/ServiceAccountRepositoryIntegrationTest.java index 19f4a4f4f..003268a94 100644 --- a/src/integration-test/java/org/openlmis/referencedata/repository/ServiceAccountRepositoryIntegrationTest.java +++ b/src/integration-test/java/org/openlmis/referencedata/repository/ServiceAccountRepositoryIntegrationTest.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.repository; @@ -20,14 +20,13 @@ import static org.hamcrest.Matchers.notNullValue; import static org.junit.Assert.assertThat; +import java.util.UUID; import org.junit.Before; import org.openlmis.referencedata.domain.ServiceAccount; import org.openlmis.referencedata.testbuilder.ServiceAccountDataBuilder; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.repository.CrudRepository; -import java.util.UUID; - public class ServiceAccountRepositoryIntegrationTest extends BaseCrudRepositoryIntegrationTest { diff --git a/src/integration-test/java/org/openlmis/referencedata/repository/StockAdjustmentReasonRepositoryIntegrationTest.java b/src/integration-test/java/org/openlmis/referencedata/repository/StockAdjustmentReasonRepositoryIntegrationTest.java index 4d9180427..9cd0d74f9 100644 --- a/src/integration-test/java/org/openlmis/referencedata/repository/StockAdjustmentReasonRepositoryIntegrationTest.java +++ b/src/integration-test/java/org/openlmis/referencedata/repository/StockAdjustmentReasonRepositoryIntegrationTest.java @@ -5,26 +5,25 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.repository; import static org.junit.Assert.assertEquals; +import java.util.List; +import java.util.UUID; import org.junit.Test; import org.openlmis.referencedata.domain.Program; import org.openlmis.referencedata.domain.StockAdjustmentReason; import org.springframework.beans.factory.annotation.Autowired; -import java.util.List; -import java.util.UUID; - public class StockAdjustmentReasonRepositoryIntegrationTest extends BaseCrudRepositoryIntegrationTest { diff --git a/src/integration-test/java/org/openlmis/referencedata/repository/SupplyLineRepositoryIntegrationTest.java b/src/integration-test/java/org/openlmis/referencedata/repository/SupplyLineRepositoryIntegrationTest.java index 69e168136..898c492bf 100644 --- a/src/integration-test/java/org/openlmis/referencedata/repository/SupplyLineRepositoryIntegrationTest.java +++ b/src/integration-test/java/org/openlmis/referencedata/repository/SupplyLineRepositoryIntegrationTest.java @@ -5,16 +5,19 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.repository; +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; import org.hamcrest.Matchers; import org.junit.Assert; import org.junit.Before; @@ -37,10 +40,6 @@ import org.springframework.dao.DataIntegrityViolationException; import org.springframework.data.repository.CrudRepository; -import java.util.ArrayList; -import java.util.List; -import java.util.UUID; - @SuppressWarnings("PMD.TooManyMethods") public class SupplyLineRepositoryIntegrationTest extends BaseCrudRepositoryIntegrationTest { diff --git a/src/integration-test/java/org/openlmis/referencedata/repository/TradeItemRepositoryIntegrationTest.java b/src/integration-test/java/org/openlmis/referencedata/repository/TradeItemRepositoryIntegrationTest.java index b491fdaad..0dd2c4805 100644 --- a/src/integration-test/java/org/openlmis/referencedata/repository/TradeItemRepositoryIntegrationTest.java +++ b/src/integration-test/java/org/openlmis/referencedata/repository/TradeItemRepositoryIntegrationTest.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.repository; @@ -22,14 +22,14 @@ import static org.hamcrest.Matchers.iterableWithSize; import static org.junit.Assert.assertThat; +import java.util.ArrayList; +import java.util.UUID; import org.junit.Test; import org.openlmis.referencedata.domain.Gtin; import org.openlmis.referencedata.domain.TradeItem; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.dao.DataIntegrityViolationException; import org.springframework.data.repository.CrudRepository; -import java.util.ArrayList; -import java.util.UUID; public class TradeItemRepositoryIntegrationTest extends BaseCrudRepositoryIntegrationTest { diff --git a/src/integration-test/java/org/openlmis/referencedata/utils/AuditLogHelper.java b/src/integration-test/java/org/openlmis/referencedata/utils/AuditLogHelper.java index 82971e94a..e4dab5cf4 100644 --- a/src/integration-test/java/org/openlmis/referencedata/utils/AuditLogHelper.java +++ b/src/integration-test/java/org/openlmis/referencedata/utils/AuditLogHelper.java @@ -5,23 +5,20 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.utils; import com.jayway.restassured.response.Response; - -import org.springframework.http.HttpHeaders; - import guru.nidi.ramltester.restassured.RestAssuredClient; - import java.util.UUID; +import org.springframework.http.HttpHeaders; public final class AuditLogHelper { diff --git a/src/integration-test/java/org/openlmis/referencedata/web/BaseWebIntegrationTest.java b/src/integration-test/java/org/openlmis/referencedata/web/BaseWebIntegrationTest.java index f691e9471..269cd33d6 100644 --- a/src/integration-test/java/org/openlmis/referencedata/web/BaseWebIntegrationTest.java +++ b/src/integration-test/java/org/openlmis/referencedata/web/BaseWebIntegrationTest.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.web; diff --git a/src/integration-test/java/org/openlmis/referencedata/web/CommodityTypeControllerIntegrationTest.java b/src/integration-test/java/org/openlmis/referencedata/web/CommodityTypeControllerIntegrationTest.java index c95f87640..18bc0faa3 100644 --- a/src/integration-test/java/org/openlmis/referencedata/web/CommodityTypeControllerIntegrationTest.java +++ b/src/integration-test/java/org/openlmis/referencedata/web/CommodityTypeControllerIntegrationTest.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.web; @@ -35,6 +35,14 @@ import static org.openlmis.referencedata.util.messagekeys.CommodityTypeMessageKeys.ERROR_CLASSIFICATION_SYSTEM_REQUIRED; import static org.openlmis.referencedata.util.messagekeys.CommodityTypeMessageKeys.ERROR_NAME_REQUIRED; +import guru.nidi.ramltester.junit.RamlMatchers; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.UUID; import org.hamcrest.Matchers; import org.junit.Before; import org.junit.Test; @@ -53,16 +61,6 @@ import org.springframework.http.HttpHeaders; import org.springframework.http.MediaType; -import guru.nidi.ramltester.junit.RamlMatchers; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.UUID; - @SuppressWarnings({"PMD.TooManyMethods"}) public class CommodityTypeControllerIntegrationTest extends BaseWebIntegrationTest { diff --git a/src/integration-test/java/org/openlmis/referencedata/web/CurrencySettingControllerIntegratonTest.java b/src/integration-test/java/org/openlmis/referencedata/web/CurrencySettingControllerIntegratonTest.java index 10ff1f498..70fde51cb 100644 --- a/src/integration-test/java/org/openlmis/referencedata/web/CurrencySettingControllerIntegratonTest.java +++ b/src/integration-test/java/org/openlmis/referencedata/web/CurrencySettingControllerIntegratonTest.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.web; @@ -24,11 +24,10 @@ import static org.openlmis.referencedata.CurrencyConfig.GROUPING_SEPARATOR; import static org.openlmis.referencedata.CurrencyConfig.GROUPING_SIZE; +import guru.nidi.ramltester.junit.RamlMatchers; import org.joda.money.CurrencyUnit; import org.junit.Test; import org.openlmis.referencedata.dto.CurrencySettingsDto; - -import guru.nidi.ramltester.junit.RamlMatchers; import org.springframework.http.HttpHeaders; public class CurrencySettingControllerIntegratonTest extends BaseWebIntegrationTest { diff --git a/src/integration-test/java/org/openlmis/referencedata/web/FacilityControllerIntegrationTest.java b/src/integration-test/java/org/openlmis/referencedata/web/FacilityControllerIntegrationTest.java index d3f3b078a..95dccf220 100644 --- a/src/integration-test/java/org/openlmis/referencedata/web/FacilityControllerIntegrationTest.java +++ b/src/integration-test/java/org/openlmis/referencedata/web/FacilityControllerIntegrationTest.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.web; diff --git a/src/integration-test/java/org/openlmis/referencedata/web/FacilityOperatorControllerIntegrationTest.java b/src/integration-test/java/org/openlmis/referencedata/web/FacilityOperatorControllerIntegrationTest.java index e5cce309b..3cdc0c599 100644 --- a/src/integration-test/java/org/openlmis/referencedata/web/FacilityOperatorControllerIntegrationTest.java +++ b/src/integration-test/java/org/openlmis/referencedata/web/FacilityOperatorControllerIntegrationTest.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.web; @@ -24,6 +24,10 @@ import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doThrow; +import guru.nidi.ramltester.junit.RamlMatchers; +import java.util.Arrays; +import java.util.List; +import java.util.UUID; import org.junit.Before; import org.junit.Test; import org.openlmis.referencedata.domain.FacilityOperator; @@ -34,12 +38,6 @@ import org.springframework.http.HttpHeaders; import org.springframework.http.MediaType; -import guru.nidi.ramltester.junit.RamlMatchers; - -import java.util.Arrays; -import java.util.List; -import java.util.UUID; - @SuppressWarnings({"PMD.TooManyMethods"}) public class FacilityOperatorControllerIntegrationTest extends BaseWebIntegrationTest { diff --git a/src/integration-test/java/org/openlmis/referencedata/web/FacilityTypeApprovedProductControllerIntegrationTest.java b/src/integration-test/java/org/openlmis/referencedata/web/FacilityTypeApprovedProductControllerIntegrationTest.java index 33eb994c1..d1babf6b1 100644 --- a/src/integration-test/java/org/openlmis/referencedata/web/FacilityTypeApprovedProductControllerIntegrationTest.java +++ b/src/integration-test/java/org/openlmis/referencedata/web/FacilityTypeApprovedProductControllerIntegrationTest.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.web; diff --git a/src/integration-test/java/org/openlmis/referencedata/web/FacilityTypeControllerIntegrationTest.java b/src/integration-test/java/org/openlmis/referencedata/web/FacilityTypeControllerIntegrationTest.java index 2a922911b..c58bc2b0e 100644 --- a/src/integration-test/java/org/openlmis/referencedata/web/FacilityTypeControllerIntegrationTest.java +++ b/src/integration-test/java/org/openlmis/referencedata/web/FacilityTypeControllerIntegrationTest.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.web; diff --git a/src/integration-test/java/org/openlmis/referencedata/web/GeographicLevelControllerIntegrationTest.java b/src/integration-test/java/org/openlmis/referencedata/web/GeographicLevelControllerIntegrationTest.java index e968a0613..7f1d4713e 100644 --- a/src/integration-test/java/org/openlmis/referencedata/web/GeographicLevelControllerIntegrationTest.java +++ b/src/integration-test/java/org/openlmis/referencedata/web/GeographicLevelControllerIntegrationTest.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.web; @@ -24,6 +24,10 @@ import static org.mockito.Mockito.doThrow; import static org.openlmis.referencedata.domain.RightName.GEOGRAPHIC_ZONES_MANAGE_RIGHT; +import guru.nidi.ramltester.junit.RamlMatchers; +import java.util.Arrays; +import java.util.List; +import java.util.UUID; import org.hamcrest.Matchers; import org.junit.Test; import org.openlmis.referencedata.domain.GeographicLevel; @@ -34,12 +38,6 @@ import org.springframework.http.HttpHeaders; import org.springframework.http.MediaType; -import guru.nidi.ramltester.junit.RamlMatchers; - -import java.util.Arrays; -import java.util.List; -import java.util.UUID; - @SuppressWarnings({"PMD.TooManyMethods"}) public class GeographicLevelControllerIntegrationTest extends BaseWebIntegrationTest { diff --git a/src/integration-test/java/org/openlmis/referencedata/web/GeographicZoneControllerIntegrationTest.java b/src/integration-test/java/org/openlmis/referencedata/web/GeographicZoneControllerIntegrationTest.java index fe5bcfc0a..8ab97c3ff 100644 --- a/src/integration-test/java/org/openlmis/referencedata/web/GeographicZoneControllerIntegrationTest.java +++ b/src/integration-test/java/org/openlmis/referencedata/web/GeographicZoneControllerIntegrationTest.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.web; @@ -26,7 +26,13 @@ import com.vividsolutions.jts.geom.Coordinate; import com.vividsolutions.jts.geom.GeometryFactory; import com.vividsolutions.jts.geom.Point; - +import guru.nidi.ramltester.junit.RamlMatchers; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.UUID; import org.junit.Test; import org.openlmis.referencedata.PageImplRepresentation; import org.openlmis.referencedata.domain.GeographicLevel; @@ -45,15 +51,6 @@ import org.springframework.http.HttpHeaders; import org.springframework.http.MediaType; -import guru.nidi.ramltester.junit.RamlMatchers; - -import java.util.Arrays; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.UUID; - @SuppressWarnings({"PMD.TooManyMethods"}) public class GeographicZoneControllerIntegrationTest extends BaseWebIntegrationTest { diff --git a/src/integration-test/java/org/openlmis/referencedata/web/IdealStockAmountControllerIntegrationTest.java b/src/integration-test/java/org/openlmis/referencedata/web/IdealStockAmountControllerIntegrationTest.java index 18653f84c..f6aa78c92 100644 --- a/src/integration-test/java/org/openlmis/referencedata/web/IdealStockAmountControllerIntegrationTest.java +++ b/src/integration-test/java/org/openlmis/referencedata/web/IdealStockAmountControllerIntegrationTest.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.web; @@ -32,7 +32,14 @@ import com.jayway.restassured.response.Response; import com.jayway.restassured.response.ValidatableResponse; import com.jayway.restassured.specification.RequestSpecification; - +import guru.nidi.ramltester.junit.RamlMatchers; +import java.io.IOException; +import java.time.LocalDate; +import java.time.ZonedDateTime; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Optional; +import java.util.UUID; import org.apache.commons.lang3.StringUtils; import org.hamcrest.Matchers; import org.junit.Before; @@ -54,16 +61,6 @@ import org.springframework.http.HttpHeaders; import org.springframework.http.MediaType; -import guru.nidi.ramltester.junit.RamlMatchers; - -import java.io.IOException; -import java.time.LocalDate; -import java.time.ZonedDateTime; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Optional; -import java.util.UUID; - @SuppressWarnings("PMD.TooManyMethods") public class IdealStockAmountControllerIntegrationTest extends BaseWebIntegrationTest { diff --git a/src/integration-test/java/org/openlmis/referencedata/web/LocaleControllerIntegrationTest.java b/src/integration-test/java/org/openlmis/referencedata/web/LocaleControllerIntegrationTest.java index 58b474505..16f16b8cd 100644 --- a/src/integration-test/java/org/openlmis/referencedata/web/LocaleControllerIntegrationTest.java +++ b/src/integration-test/java/org/openlmis/referencedata/web/LocaleControllerIntegrationTest.java @@ -35,7 +35,7 @@ public void shouldReturnLocaleSettings() { .statusCode(200) .extract().as(response.getClass()); - assertEquals("UTC" ,response.getTimeZoneId()); + assertEquals("UTC", response.getTimeZoneId()); assertThat(RAML_ASSERT_MESSAGE, restAssured.getLastReport(), RamlMatchers.hasNoViolations()); } diff --git a/src/integration-test/java/org/openlmis/referencedata/web/LocationControllerIntegrationTest.java b/src/integration-test/java/org/openlmis/referencedata/web/LocationControllerIntegrationTest.java index d42dbf771..508a18fe3 100644 --- a/src/integration-test/java/org/openlmis/referencedata/web/LocationControllerIntegrationTest.java +++ b/src/integration-test/java/org/openlmis/referencedata/web/LocationControllerIntegrationTest.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.web; @@ -23,9 +23,9 @@ import static org.openlmis.referencedata.web.BaseController.API_PATH; import com.google.common.collect.ImmutableList; - import com.jayway.restassured.response.ValidatableResponse; - +import guru.nidi.ramltester.junit.RamlMatchers; +import java.util.UUID; import org.junit.Test; import org.openlmis.referencedata.domain.Facility; import org.openlmis.referencedata.domain.GeographicZone; @@ -40,10 +40,6 @@ import org.springframework.http.HttpHeaders; import org.springframework.http.MediaType; -import guru.nidi.ramltester.junit.RamlMatchers; - -import java.util.UUID; - public class LocationControllerIntegrationTest extends BaseWebIntegrationTest { private static final String RESOURCE_URL = "/api/Location"; diff --git a/src/integration-test/java/org/openlmis/referencedata/web/LotControllerIntegrationTest.java b/src/integration-test/java/org/openlmis/referencedata/web/LotControllerIntegrationTest.java index 50033cae2..d33ec8282 100644 --- a/src/integration-test/java/org/openlmis/referencedata/web/LotControllerIntegrationTest.java +++ b/src/integration-test/java/org/openlmis/referencedata/web/LotControllerIntegrationTest.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.web; diff --git a/src/integration-test/java/org/openlmis/referencedata/web/OrderableControllerIntegrationTest.java b/src/integration-test/java/org/openlmis/referencedata/web/OrderableControllerIntegrationTest.java index 0ad70563c..a6a7e3571 100644 --- a/src/integration-test/java/org/openlmis/referencedata/web/OrderableControllerIntegrationTest.java +++ b/src/integration-test/java/org/openlmis/referencedata/web/OrderableControllerIntegrationTest.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.web; diff --git a/src/integration-test/java/org/openlmis/referencedata/web/OrderableDisplayCategoryControllerIntegrationTest.java b/src/integration-test/java/org/openlmis/referencedata/web/OrderableDisplayCategoryControllerIntegrationTest.java index 48052d5b3..d765da649 100644 --- a/src/integration-test/java/org/openlmis/referencedata/web/OrderableDisplayCategoryControllerIntegrationTest.java +++ b/src/integration-test/java/org/openlmis/referencedata/web/OrderableDisplayCategoryControllerIntegrationTest.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.web; @@ -24,6 +24,11 @@ import static org.mockito.Mockito.doThrow; import static org.openlmis.referencedata.domain.RightName.ORDERABLES_MANAGE; +import guru.nidi.ramltester.junit.RamlMatchers; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; +import java.util.UUID; import org.hamcrest.Matchers; import org.junit.Test; import org.openlmis.referencedata.domain.Code; @@ -37,13 +42,6 @@ import org.springframework.http.HttpHeaders; import org.springframework.http.MediaType; -import guru.nidi.ramltester.junit.RamlMatchers; - -import java.util.Arrays; -import java.util.Collections; -import java.util.List; -import java.util.UUID; - @SuppressWarnings({"PMD.TooManyMethods"}) public class OrderableDisplayCategoryControllerIntegrationTest extends BaseWebIntegrationTest { diff --git a/src/integration-test/java/org/openlmis/referencedata/web/OrderableFulfillControllerIntegrationTest.java b/src/integration-test/java/org/openlmis/referencedata/web/OrderableFulfillControllerIntegrationTest.java index 85690c42e..906e8e3cc 100644 --- a/src/integration-test/java/org/openlmis/referencedata/web/OrderableFulfillControllerIntegrationTest.java +++ b/src/integration-test/java/org/openlmis/referencedata/web/OrderableFulfillControllerIntegrationTest.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.web; @@ -23,9 +23,8 @@ import static org.mockito.Mockito.verifyZeroInteractions; import com.google.common.collect.Lists; - import com.jayway.restassured.response.ValidatableResponse; - +import java.util.UUID; import org.junit.Before; import org.junit.Test; import org.openlmis.referencedata.domain.Orderable; @@ -34,8 +33,6 @@ import org.springframework.data.domain.PageImpl; import org.springframework.http.HttpHeaders; -import java.util.UUID; - public class OrderableFulfillControllerIntegrationTest extends BaseWebIntegrationTest { private Orderable orderable = new OrderableDataBuilder().build(); diff --git a/src/integration-test/java/org/openlmis/referencedata/web/ProcessingPeriodControllerIntegrationTest.java b/src/integration-test/java/org/openlmis/referencedata/web/ProcessingPeriodControllerIntegrationTest.java index e54dc361e..74d75905c 100644 --- a/src/integration-test/java/org/openlmis/referencedata/web/ProcessingPeriodControllerIntegrationTest.java +++ b/src/integration-test/java/org/openlmis/referencedata/web/ProcessingPeriodControllerIntegrationTest.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.web; @@ -31,6 +31,12 @@ import com.google.common.collect.Lists; import guru.nidi.ramltester.junit.RamlMatchers; +import java.time.LocalDate; +import java.time.ZonedDateTime; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; +import java.util.UUID; import org.junit.Before; import org.junit.Test; import org.openlmis.referencedata.domain.Code; @@ -52,12 +58,6 @@ import org.springframework.http.HttpHeaders; import org.springframework.http.MediaType; import org.springframework.validation.Errors; -import java.time.LocalDate; -import java.time.ZonedDateTime; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; -import java.util.UUID; @SuppressWarnings({"PMD.TooManyMethods"}) public class ProcessingPeriodControllerIntegrationTest extends BaseWebIntegrationTest { diff --git a/src/integration-test/java/org/openlmis/referencedata/web/ProcessingScheduleControllerIntegrationTest.java b/src/integration-test/java/org/openlmis/referencedata/web/ProcessingScheduleControllerIntegrationTest.java index 825141a45..639afa897 100644 --- a/src/integration-test/java/org/openlmis/referencedata/web/ProcessingScheduleControllerIntegrationTest.java +++ b/src/integration-test/java/org/openlmis/referencedata/web/ProcessingScheduleControllerIntegrationTest.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.web; @@ -24,6 +24,9 @@ import static org.mockito.Mockito.doThrow; import guru.nidi.ramltester.junit.RamlMatchers; +import java.util.Collections; +import java.util.LinkedHashMap; +import java.util.UUID; import org.junit.Test; import org.openlmis.referencedata.PageImplRepresentation; import org.openlmis.referencedata.domain.Code; @@ -40,9 +43,6 @@ import org.springframework.data.domain.PageRequest; import org.springframework.http.HttpHeaders; import org.springframework.http.MediaType; -import java.util.Collections; -import java.util.LinkedHashMap; -import java.util.UUID; @SuppressWarnings({"PMD.TooManyMethods"}) public class ProcessingScheduleControllerIntegrationTest extends BaseWebIntegrationTest { diff --git a/src/integration-test/java/org/openlmis/referencedata/web/ProgramControllerIntegrationTest.java b/src/integration-test/java/org/openlmis/referencedata/web/ProgramControllerIntegrationTest.java index f43d6ead0..e7692be8c 100644 --- a/src/integration-test/java/org/openlmis/referencedata/web/ProgramControllerIntegrationTest.java +++ b/src/integration-test/java/org/openlmis/referencedata/web/ProgramControllerIntegrationTest.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.web; diff --git a/src/integration-test/java/org/openlmis/referencedata/web/RequisitionGroupControllerIntegrationTest.java b/src/integration-test/java/org/openlmis/referencedata/web/RequisitionGroupControllerIntegrationTest.java index a1f6fdcba..154a6cc60 100644 --- a/src/integration-test/java/org/openlmis/referencedata/web/RequisitionGroupControllerIntegrationTest.java +++ b/src/integration-test/java/org/openlmis/referencedata/web/RequisitionGroupControllerIntegrationTest.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.web; diff --git a/src/integration-test/java/org/openlmis/referencedata/web/RightControllerIntegrationTest.java b/src/integration-test/java/org/openlmis/referencedata/web/RightControllerIntegrationTest.java index cf4ea5dfd..373b15cd0 100644 --- a/src/integration-test/java/org/openlmis/referencedata/web/RightControllerIntegrationTest.java +++ b/src/integration-test/java/org/openlmis/referencedata/web/RightControllerIntegrationTest.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.web; @@ -22,7 +22,12 @@ import static org.mockito.Matchers.any; import com.google.common.collect.Sets; - +import guru.nidi.ramltester.junit.RamlMatchers; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; +import java.util.Set; +import java.util.UUID; import org.junit.Test; import org.openlmis.referencedata.domain.Right; import org.openlmis.referencedata.domain.RightName; @@ -32,14 +37,6 @@ import org.springframework.http.HttpHeaders; import org.springframework.http.MediaType; -import guru.nidi.ramltester.junit.RamlMatchers; - -import java.util.Arrays; -import java.util.Collections; -import java.util.List; -import java.util.Set; -import java.util.UUID; - @SuppressWarnings({"PMD.TooManyMethods"}) public class RightControllerIntegrationTest extends BaseWebIntegrationTest { diff --git a/src/integration-test/java/org/openlmis/referencedata/web/RoleControllerIntegrationTest.java b/src/integration-test/java/org/openlmis/referencedata/web/RoleControllerIntegrationTest.java index 5e0db5c3c..bb983288b 100644 --- a/src/integration-test/java/org/openlmis/referencedata/web/RoleControllerIntegrationTest.java +++ b/src/integration-test/java/org/openlmis/referencedata/web/RoleControllerIntegrationTest.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.web; diff --git a/src/integration-test/java/org/openlmis/referencedata/web/ServiceAccountControllerIntegrationTest.java b/src/integration-test/java/org/openlmis/referencedata/web/ServiceAccountControllerIntegrationTest.java index 9f3865d0c..43a4b8e77 100644 --- a/src/integration-test/java/org/openlmis/referencedata/web/ServiceAccountControllerIntegrationTest.java +++ b/src/integration-test/java/org/openlmis/referencedata/web/ServiceAccountControllerIntegrationTest.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.web; @@ -26,7 +26,8 @@ import static org.openlmis.referencedata.util.messagekeys.SystemMessageKeys.ERROR_UNAUTHORIZED; import com.jayway.restassured.response.ValidatableResponse; - +import guru.nidi.ramltester.junit.RamlMatchers; +import java.util.UUID; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -38,10 +39,6 @@ import org.openlmis.referencedata.testbuilder.UserDataBuilder; import org.springframework.http.HttpStatus; -import guru.nidi.ramltester.junit.RamlMatchers; - -import java.util.UUID; - @SuppressWarnings({"PMD.TooManyMethods"}) public class ServiceAccountControllerIntegrationTest extends BaseWebIntegrationTest { private static final String RESOURCE_URL = "/api/serviceAccounts"; diff --git a/src/integration-test/java/org/openlmis/referencedata/web/StockAdjustmentReasonControllerIntegrationTest.java b/src/integration-test/java/org/openlmis/referencedata/web/StockAdjustmentReasonControllerIntegrationTest.java index 4aec106bd..051d66805 100644 --- a/src/integration-test/java/org/openlmis/referencedata/web/StockAdjustmentReasonControllerIntegrationTest.java +++ b/src/integration-test/java/org/openlmis/referencedata/web/StockAdjustmentReasonControllerIntegrationTest.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.web; @@ -26,6 +26,11 @@ import static org.mockito.Mockito.when; import static org.openlmis.referencedata.domain.RightName.STOCK_ADJUSTMENT_REASONS_MANAGE; +import guru.nidi.ramltester.junit.RamlMatchers; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.UUID; import org.hamcrest.Matchers; import org.junit.Test; import org.openlmis.referencedata.domain.Program; @@ -37,13 +42,6 @@ import org.springframework.http.HttpHeaders; import org.springframework.http.MediaType; -import guru.nidi.ramltester.junit.RamlMatchers; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.UUID; - @SuppressWarnings({"PMD.TooManyMethods"}) public class StockAdjustmentReasonControllerIntegrationTest extends BaseWebIntegrationTest { diff --git a/src/integration-test/java/org/openlmis/referencedata/web/SupervisoryNodeControllerIntegrationTest.java b/src/integration-test/java/org/openlmis/referencedata/web/SupervisoryNodeControllerIntegrationTest.java index f0a9efb8a..97372ee0d 100644 --- a/src/integration-test/java/org/openlmis/referencedata/web/SupervisoryNodeControllerIntegrationTest.java +++ b/src/integration-test/java/org/openlmis/referencedata/web/SupervisoryNodeControllerIntegrationTest.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.web; diff --git a/src/integration-test/java/org/openlmis/referencedata/web/SupplyLineControllerIntegrationTest.java b/src/integration-test/java/org/openlmis/referencedata/web/SupplyLineControllerIntegrationTest.java index 8f703c952..a126b5dee 100644 --- a/src/integration-test/java/org/openlmis/referencedata/web/SupplyLineControllerIntegrationTest.java +++ b/src/integration-test/java/org/openlmis/referencedata/web/SupplyLineControllerIntegrationTest.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.web; @@ -24,6 +24,12 @@ import static org.mockito.Mockito.doThrow; import static org.openlmis.referencedata.domain.RightName.SUPPLY_LINES_MANAGE; +import guru.nidi.ramltester.junit.RamlMatchers; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.UUID; import org.hamcrest.Matchers; import org.junit.Test; import org.openlmis.referencedata.PageImplRepresentation; @@ -41,20 +47,11 @@ import org.openlmis.referencedata.util.Message; import org.openlmis.referencedata.util.Pagination; import org.openlmis.referencedata.util.messagekeys.SupplyLineMessageKeys; +import org.openlmis.referencedata.utils.AuditLogHelper; import org.springframework.data.domain.Pageable; import org.springframework.http.HttpHeaders; import org.springframework.http.MediaType; -import java.util.HashMap; -import java.util.Map; -import org.openlmis.referencedata.utils.AuditLogHelper; - -import guru.nidi.ramltester.junit.RamlMatchers; - -import java.util.Arrays; -import java.util.List; -import java.util.UUID; - @SuppressWarnings("PMD.TooManyMethods") public class SupplyLineControllerIntegrationTest extends BaseWebIntegrationTest { diff --git a/src/integration-test/java/org/openlmis/referencedata/web/TradeItemControllerIntegrationTest.java b/src/integration-test/java/org/openlmis/referencedata/web/TradeItemControllerIntegrationTest.java index e6746c591..d5f11989f 100644 --- a/src/integration-test/java/org/openlmis/referencedata/web/TradeItemControllerIntegrationTest.java +++ b/src/integration-test/java/org/openlmis/referencedata/web/TradeItemControllerIntegrationTest.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.web; @@ -27,6 +27,13 @@ import static org.openlmis.referencedata.dto.TradeItemDto.newInstance; import static org.openlmis.referencedata.util.messagekeys.TradeItemMessageKeys.ERROR_MANUFACTURER_REQUIRED; +import guru.nidi.ramltester.junit.RamlMatchers; +import java.util.ArrayList; +import java.util.Collections; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.UUID; import org.junit.Before; import org.junit.Test; import org.openlmis.referencedata.PageImplRepresentation; @@ -40,15 +47,6 @@ import org.springframework.http.HttpHeaders; import org.springframework.http.MediaType; -import guru.nidi.ramltester.junit.RamlMatchers; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.UUID; - public class TradeItemControllerIntegrationTest extends BaseWebIntegrationTest { private static final String RESOURCE_URL = "/api/tradeItems"; diff --git a/src/integration-test/java/org/openlmis/referencedata/web/UserControllerIntegrationTest.java b/src/integration-test/java/org/openlmis/referencedata/web/UserControllerIntegrationTest.java index e3527164d..939ddd2a6 100644 --- a/src/integration-test/java/org/openlmis/referencedata/web/UserControllerIntegrationTest.java +++ b/src/integration-test/java/org/openlmis/referencedata/web/UserControllerIntegrationTest.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.web; diff --git a/src/main/java/org/openlmis/referencedata/Application.java b/src/main/java/org/openlmis/referencedata/Application.java index cc693cb2d..f75d111e6 100644 --- a/src/main/java/org/openlmis/referencedata/Application.java +++ b/src/main/java/org/openlmis/referencedata/Application.java @@ -5,20 +5,21 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata; import com.google.gson.internal.bind.TypeAdapters; - import java.time.Clock; import java.time.ZoneId; +import java.util.Locale; +import javax.annotation.PostConstruct; import org.flywaydb.core.Flyway; import org.javers.core.Javers; import org.javers.core.MappingStyle; @@ -55,10 +56,6 @@ import org.springframework.web.servlet.LocaleResolver; import org.springframework.web.servlet.i18n.CookieLocaleResolver; -import java.util.Locale; - -import javax.annotation.PostConstruct; - @SpringBootApplication(scanBasePackages = "org.openlmis") @ImportResource("classpath*:/applicationContext.xml") @EntityScan(basePackageClasses = BaseEntity.class) diff --git a/src/main/java/org/openlmis/referencedata/AuditLogInitializer.java b/src/main/java/org/openlmis/referencedata/AuditLogInitializer.java index ee162e81d..50d3e3e79 100644 --- a/src/main/java/org/openlmis/referencedata/AuditLogInitializer.java +++ b/src/main/java/org/openlmis/referencedata/AuditLogInitializer.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata; @@ -20,7 +20,6 @@ import java.util.List; import java.util.Map; import javax.annotation.Resource; - import org.javers.core.Javers; import org.javers.core.metamodel.object.CdoSnapshot; import org.javers.repository.jql.QueryBuilder; diff --git a/src/main/java/org/openlmis/referencedata/CurrencyConfig.java b/src/main/java/org/openlmis/referencedata/CurrencyConfig.java index d5e51818e..d7a1a43ec 100644 --- a/src/main/java/org/openlmis/referencedata/CurrencyConfig.java +++ b/src/main/java/org/openlmis/referencedata/CurrencyConfig.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata; diff --git a/src/main/java/org/openlmis/referencedata/CustomWebMvcConfigurerAdapter.java b/src/main/java/org/openlmis/referencedata/CustomWebMvcConfigurerAdapter.java index 5d28845a9..34326164e 100644 --- a/src/main/java/org/openlmis/referencedata/CustomWebMvcConfigurerAdapter.java +++ b/src/main/java/org/openlmis/referencedata/CustomWebMvcConfigurerAdapter.java @@ -5,16 +5,17 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata; +import java.util.List; import org.openlmis.referencedata.util.Pagination; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Configuration; @@ -25,8 +26,6 @@ import org.springframework.web.servlet.config.annotation.ViewControllerRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter; -import java.util.List; - @Configuration public class CustomWebMvcConfigurerAdapter extends WebMvcConfigurerAdapter { diff --git a/src/main/java/org/openlmis/referencedata/ExportSchemaFlywayCallback.java b/src/main/java/org/openlmis/referencedata/ExportSchemaFlywayCallback.java index c7a4c923a..cb7580ada 100644 --- a/src/main/java/org/openlmis/referencedata/ExportSchemaFlywayCallback.java +++ b/src/main/java/org/openlmis/referencedata/ExportSchemaFlywayCallback.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata; diff --git a/src/main/java/org/openlmis/referencedata/JaVersDateProvider.java b/src/main/java/org/openlmis/referencedata/JaVersDateProvider.java index 349c4580e..3a1f195b6 100644 --- a/src/main/java/org/openlmis/referencedata/JaVersDateProvider.java +++ b/src/main/java/org/openlmis/referencedata/JaVersDateProvider.java @@ -5,24 +5,23 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata; -import org.javers.common.date.DateProvider; -import org.joda.time.DateTimeZone; -import org.joda.time.LocalDateTime; - import java.time.Duration; import java.time.Instant; import java.time.ZoneId; import java.time.ZonedDateTime; +import org.javers.common.date.DateProvider; +import org.joda.time.DateTimeZone; +import org.joda.time.LocalDateTime; /** * This class may be used by JaVers to retrieve the LocalDateTime that it associates with commits. @@ -49,7 +48,7 @@ public static ZonedDateTime getZonedDateTime(LocalDateTime localDateTime) { Instant instant = Instant.ofEpochMilli(epoch); //Convert the instant to a ZonedDateTime in UTC. - return ZonedDateTime.ofInstant( instant, ZONE_ID ); + return ZonedDateTime.ofInstant(instant, ZONE_ID); } /** diff --git a/src/main/java/org/openlmis/referencedata/JacksonConfig.java b/src/main/java/org/openlmis/referencedata/JacksonConfig.java index ca15ba3f8..529e5b57b 100644 --- a/src/main/java/org/openlmis/referencedata/JacksonConfig.java +++ b/src/main/java/org/openlmis/referencedata/JacksonConfig.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata; diff --git a/src/main/java/org/openlmis/referencedata/RightAssignmentInitializer.java b/src/main/java/org/openlmis/referencedata/RightAssignmentInitializer.java index f71d14475..181da8bde 100644 --- a/src/main/java/org/openlmis/referencedata/RightAssignmentInitializer.java +++ b/src/main/java/org/openlmis/referencedata/RightAssignmentInitializer.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata; diff --git a/src/main/java/org/openlmis/referencedata/TestDataInitializer.java b/src/main/java/org/openlmis/referencedata/TestDataInitializer.java index eb9da9d91..8199111b0 100644 --- a/src/main/java/org/openlmis/referencedata/TestDataInitializer.java +++ b/src/main/java/org/openlmis/referencedata/TestDataInitializer.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata; diff --git a/src/main/java/org/openlmis/referencedata/domain/BaseEntity.java b/src/main/java/org/openlmis/referencedata/domain/BaseEntity.java index 7aad9b3d4..07db47648 100644 --- a/src/main/java/org/openlmis/referencedata/domain/BaseEntity.java +++ b/src/main/java/org/openlmis/referencedata/domain/BaseEntity.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.domain; diff --git a/src/main/java/org/openlmis/referencedata/domain/Code.java b/src/main/java/org/openlmis/referencedata/domain/Code.java index a52fb683c..da1a36d59 100644 --- a/src/main/java/org/openlmis/referencedata/domain/Code.java +++ b/src/main/java/org/openlmis/referencedata/domain/Code.java @@ -5,22 +5,20 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.domain; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; - -import org.apache.commons.lang3.StringUtils; - import javax.persistence.Embeddable; +import org.apache.commons.lang3.StringUtils; /** * Represents a unique designation. @@ -38,7 +36,7 @@ private Code(String code) { } /** - * is this blank + * is this blank. * @return true if blank, false otherwise. */ public boolean isBlank() { diff --git a/src/main/java/org/openlmis/referencedata/domain/CommodityType.java b/src/main/java/org/openlmis/referencedata/domain/CommodityType.java index 62c820e75..668d9b2b3 100644 --- a/src/main/java/org/openlmis/referencedata/domain/CommodityType.java +++ b/src/main/java/org/openlmis/referencedata/domain/CommodityType.java @@ -5,39 +5,36 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.domain; -import org.javers.core.metamodel.annotation.DiffIgnore; -import org.javers.core.metamodel.annotation.TypeName; -import org.openlmis.referencedata.dto.CommodityTypeDto; -import org.openlmis.referencedata.exception.ValidationMessageException; -import org.openlmis.referencedata.util.Message; -import org.openlmis.referencedata.util.messagekeys.CommodityTypeMessageKeys; - -import lombok.AllArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; - import java.util.ArrayList; import java.util.List; import java.util.UUID; - import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.JoinColumn; import javax.persistence.ManyToOne; import javax.persistence.OneToMany; import javax.persistence.Table; +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import org.javers.core.metamodel.annotation.DiffIgnore; +import org.javers.core.metamodel.annotation.TypeName; +import org.openlmis.referencedata.dto.CommodityTypeDto; +import org.openlmis.referencedata.exception.ValidationMessageException; +import org.openlmis.referencedata.util.Message; +import org.openlmis.referencedata.util.messagekeys.CommodityTypeMessageKeys; /** * CommodityTypes are generic commodities to simplify ordering and use. A CommodityType doesn't @@ -102,7 +99,7 @@ private void validateIsNotDescendant(CommodityType commodityType) { } /** - * Creates new instance based on data from {@link Importer} + * Creates new instance based on data from {@link Importer}. * * @param importer instance of {@link Importer} * @return new instance of TradeItem. diff --git a/src/main/java/org/openlmis/referencedata/domain/ContainerDispensable.java b/src/main/java/org/openlmis/referencedata/domain/ContainerDispensable.java index 49b00e6e8..89ea0bb1d 100644 --- a/src/main/java/org/openlmis/referencedata/domain/ContainerDispensable.java +++ b/src/main/java/org/openlmis/referencedata/domain/ContainerDispensable.java @@ -5,21 +5,20 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.domain; -import lombok.NoArgsConstructor; - +import java.util.Objects; import javax.persistence.DiscriminatorValue; import javax.persistence.Entity; -import java.util.Objects; +import lombok.NoArgsConstructor; /** * A container dispensable describes a dispensable by a single property, size, represented by the diff --git a/src/main/java/org/openlmis/referencedata/domain/CreationDetails.java b/src/main/java/org/openlmis/referencedata/domain/CreationDetails.java index 8a56a4907..e048c525e 100644 --- a/src/main/java/org/openlmis/referencedata/domain/CreationDetails.java +++ b/src/main/java/org/openlmis/referencedata/domain/CreationDetails.java @@ -5,31 +5,28 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.domain; import static org.openlmis.referencedata.domain.BaseEntity.UUID_TYPE; -import org.hibernate.annotations.Type; - +import java.time.ZonedDateTime; +import java.util.UUID; +import javax.persistence.Column; +import javax.persistence.Embeddable; import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; - -import java.time.ZonedDateTime; -import java.util.UUID; - -import javax.persistence.Column; -import javax.persistence.Embeddable; +import org.hibernate.annotations.Type; @Embeddable @NoArgsConstructor diff --git a/src/main/java/org/openlmis/referencedata/domain/DefaultDispensable.java b/src/main/java/org/openlmis/referencedata/domain/DefaultDispensable.java index 24154daf0..d7d9c8c6e 100644 --- a/src/main/java/org/openlmis/referencedata/domain/DefaultDispensable.java +++ b/src/main/java/org/openlmis/referencedata/domain/DefaultDispensable.java @@ -5,21 +5,20 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.domain; -import lombok.NoArgsConstructor; - +import java.util.Objects; import javax.persistence.DiscriminatorValue; import javax.persistence.Entity; -import java.util.Objects; +import lombok.NoArgsConstructor; /** * A default dispensable is the default usage of a dispensable. This class describes a dispensable diff --git a/src/main/java/org/openlmis/referencedata/domain/DirectRoleAssignment.java b/src/main/java/org/openlmis/referencedata/domain/DirectRoleAssignment.java index 12f348eff..ed1ff9692 100644 --- a/src/main/java/org/openlmis/referencedata/domain/DirectRoleAssignment.java +++ b/src/main/java/org/openlmis/referencedata/domain/DirectRoleAssignment.java @@ -5,26 +5,22 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.domain; import com.google.common.collect.Sets; - -import org.javers.core.metamodel.annotation.TypeName; - -import lombok.NoArgsConstructor; - import java.util.Set; - import javax.persistence.DiscriminatorValue; import javax.persistence.Entity; +import lombok.NoArgsConstructor; +import org.javers.core.metamodel.annotation.TypeName; @Entity @DiscriminatorValue("direct") diff --git a/src/main/java/org/openlmis/referencedata/domain/Dispensable.java b/src/main/java/org/openlmis/referencedata/domain/Dispensable.java index 46ff31e78..5701735c9 100644 --- a/src/main/java/org/openlmis/referencedata/domain/Dispensable.java +++ b/src/main/java/org/openlmis/referencedata/domain/Dispensable.java @@ -5,20 +5,19 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.domain; -import lombok.Getter; -import org.openlmis.referencedata.exception.ValidationMessageException; -import org.openlmis.referencedata.util.messagekeys.OrderableMessageKeys; - +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; import javax.persistence.CollectionTable; import javax.persistence.Column; import javax.persistence.DiscriminatorColumn; @@ -32,9 +31,9 @@ import javax.persistence.JoinColumn; import javax.persistence.MapKeyColumn; import javax.persistence.Table; -import java.util.Collections; -import java.util.HashMap; -import java.util.Map; +import lombok.Getter; +import org.openlmis.referencedata.exception.ValidationMessageException; +import org.openlmis.referencedata.util.messagekeys.OrderableMessageKeys; /** * A dispensable describes how product is dispensed/given to a patient. diff --git a/src/main/java/org/openlmis/referencedata/domain/ExtraDataConverter.java b/src/main/java/org/openlmis/referencedata/domain/ExtraDataConverter.java index 16dab554a..e770cbc68 100644 --- a/src/main/java/org/openlmis/referencedata/domain/ExtraDataConverter.java +++ b/src/main/java/org/openlmis/referencedata/domain/ExtraDataConverter.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.domain; @@ -18,10 +18,8 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; - import java.io.IOException; import java.util.Map; - import javax.persistence.AttributeConverter; import javax.validation.constraints.NotNull; diff --git a/src/main/java/org/openlmis/referencedata/domain/Facility.java b/src/main/java/org/openlmis/referencedata/domain/Facility.java index c03ade949..b0b1224f8 100644 --- a/src/main/java/org/openlmis/referencedata/domain/Facility.java +++ b/src/main/java/org/openlmis/referencedata/domain/Facility.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.domain; @@ -18,22 +18,12 @@ import com.fasterxml.jackson.annotation.JsonIdentityInfo; import com.fasterxml.jackson.annotation.ObjectIdGenerators; import com.vividsolutions.jts.geom.Point; - -import org.hibernate.annotations.Type; -import org.javers.core.metamodel.annotation.DiffIgnore; -import org.javers.core.metamodel.annotation.TypeName; -import org.openlmis.referencedata.dto.NamedResource; - -import lombok.Getter; -import lombok.Setter; - import java.time.LocalDate; import java.util.HashSet; import java.util.Map; import java.util.Objects; import java.util.Set; import java.util.UUID; - import javax.persistence.CascadeType; import javax.persistence.Column; import javax.persistence.ColumnResult; @@ -49,6 +39,12 @@ import javax.persistence.SqlResultSetMapping; import javax.persistence.SqlResultSetMappings; import javax.persistence.Table; +import lombok.Getter; +import lombok.Setter; +import org.hibernate.annotations.Type; +import org.javers.core.metamodel.annotation.DiffIgnore; +import org.javers.core.metamodel.annotation.TypeName; +import org.openlmis.referencedata.dto.NamedResource; @Entity @TypeName("Facility") @@ -196,7 +192,7 @@ public int hashCode() { } /** - * Creates new facility object based on data from {@link Importer} + * Creates new facility object based on data from {@link Importer}. * * @param importer instance of {@link Importer} * @return new instance of facility. diff --git a/src/main/java/org/openlmis/referencedata/domain/FacilityOperator.java b/src/main/java/org/openlmis/referencedata/domain/FacilityOperator.java index 5421b2173..174af89e1 100644 --- a/src/main/java/org/openlmis/referencedata/domain/FacilityOperator.java +++ b/src/main/java/org/openlmis/referencedata/domain/FacilityOperator.java @@ -5,29 +5,26 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.domain; -import lombok.AllArgsConstructor; -import org.javers.core.metamodel.annotation.TypeName; - -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; - import java.util.Objects; import java.util.UUID; - import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import org.javers.core.metamodel.annotation.TypeName; @Entity @Table(name = "facility_operators", schema = "referencedata") @@ -73,7 +70,7 @@ public int hashCode() { } /** - * Creates new facility operator object based on data from {@link Importer} + * Creates new facility operator object based on data from {@link Importer}. * * @param importer instance of {@link Importer} * @return new instance of facility operator. diff --git a/src/main/java/org/openlmis/referencedata/domain/FacilityType.java b/src/main/java/org/openlmis/referencedata/domain/FacilityType.java index e9741dbf3..67b521908 100644 --- a/src/main/java/org/openlmis/referencedata/domain/FacilityType.java +++ b/src/main/java/org/openlmis/referencedata/domain/FacilityType.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.domain; @@ -89,7 +89,7 @@ public int hashCode() { } /** - * Creates new facility type object based on data from {@link Importer} + * Creates new facility type object based on data from {@link Importer}. * * @param importer instance of {@link Importer} * @return new instance of facility type. diff --git a/src/main/java/org/openlmis/referencedata/domain/FacilityTypeApprovedProduct.java b/src/main/java/org/openlmis/referencedata/domain/FacilityTypeApprovedProduct.java index c353ada05..9bc1220b1 100644 --- a/src/main/java/org/openlmis/referencedata/domain/FacilityTypeApprovedProduct.java +++ b/src/main/java/org/openlmis/referencedata/domain/FacilityTypeApprovedProduct.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.domain; @@ -71,7 +71,7 @@ public class FacilityTypeApprovedProduct extends BaseEntity { /** * Creates new FacilityTypeApprovedProduct based on data - * from {@link FacilityTypeApprovedProduct.Importer} + * from {@link FacilityTypeApprovedProduct.Importer}. * * @param importer instance of {@link FacilityTypeApprovedProduct.Importer} * @return new instance of FacilityTypeApprovedProduct. diff --git a/src/main/java/org/openlmis/referencedata/domain/FulfillmentRoleAssignment.java b/src/main/java/org/openlmis/referencedata/domain/FulfillmentRoleAssignment.java index 26bd59eab..0fce4c996 100644 --- a/src/main/java/org/openlmis/referencedata/domain/FulfillmentRoleAssignment.java +++ b/src/main/java/org/openlmis/referencedata/domain/FulfillmentRoleAssignment.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.domain; diff --git a/src/main/java/org/openlmis/referencedata/domain/GeographicLevel.java b/src/main/java/org/openlmis/referencedata/domain/GeographicLevel.java index 46158a104..3b0218aac 100644 --- a/src/main/java/org/openlmis/referencedata/domain/GeographicLevel.java +++ b/src/main/java/org/openlmis/referencedata/domain/GeographicLevel.java @@ -5,29 +5,26 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.domain; -import lombok.AllArgsConstructor; -import org.javers.core.metamodel.annotation.TypeName; - -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; - import java.util.Objects; import java.util.UUID; - import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import org.javers.core.metamodel.annotation.TypeName; @Entity @Table(name = "geographic_levels", schema = "referencedata") @@ -74,7 +71,7 @@ public int hashCode() { } /** - * Creates new geographic level object based on data from {@link Importer} + * Creates new geographic level object based on data from {@link Importer}. * * @param importer instance of {@link Importer} * @return new instance of geographic level. diff --git a/src/main/java/org/openlmis/referencedata/domain/GeographicZone.java b/src/main/java/org/openlmis/referencedata/domain/GeographicZone.java index 54cbd2462..076998ef8 100644 --- a/src/main/java/org/openlmis/referencedata/domain/GeographicZone.java +++ b/src/main/java/org/openlmis/referencedata/domain/GeographicZone.java @@ -5,29 +5,19 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.domain; import com.vividsolutions.jts.geom.Polygon; - -import org.hibernate.annotations.Type; -import org.javers.core.metamodel.annotation.TypeName; - -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; - import java.util.Objects; import java.util.UUID; - import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.JoinColumn; @@ -35,6 +25,12 @@ import javax.persistence.NamedQueries; import javax.persistence.NamedQuery; import javax.persistence.Table; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import org.hibernate.annotations.Type; +import org.javers.core.metamodel.annotation.TypeName; @Entity @Table(name = "geographic_zones", schema = "referencedata") @@ -111,7 +107,7 @@ public int hashCode() { } /** - * Creates new geographic zone object based on data from {@link Importer} + * Creates new geographic zone object based on data from {@link Importer}. * * @param importer instance of {@link Importer} * @return new instance of geographic zone. diff --git a/src/main/java/org/openlmis/referencedata/domain/Gtin.java b/src/main/java/org/openlmis/referencedata/domain/Gtin.java index f49248564..56a9cf0f4 100644 --- a/src/main/java/org/openlmis/referencedata/domain/Gtin.java +++ b/src/main/java/org/openlmis/referencedata/domain/Gtin.java @@ -5,27 +5,26 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.domain; +import static org.openlmis.referencedata.util.messagekeys.TradeItemMessageKeys.ERROR_GTIN_INVALID_LENGTH; +import static org.openlmis.referencedata.util.messagekeys.TradeItemMessageKeys.ERROR_GTIN_NUMERIC; + +import javax.persistence.Embeddable; import lombok.EqualsAndHashCode; import lombok.Getter; import org.apache.commons.lang3.StringUtils; import org.openlmis.referencedata.exception.ValidationMessageException; import org.openlmis.referencedata.util.Message; -import javax.persistence.Embeddable; - -import static org.openlmis.referencedata.util.messagekeys.TradeItemMessageKeys.ERROR_GTIN_INVALID_LENGTH; -import static org.openlmis.referencedata.util.messagekeys.TradeItemMessageKeys.ERROR_GTIN_NUMERIC; - /** * Global Trade Item Number, associated with TradeItem. */ diff --git a/src/main/java/org/openlmis/referencedata/domain/IdealStockAmount.java b/src/main/java/org/openlmis/referencedata/domain/IdealStockAmount.java index cf67c6dec..cb1456810 100644 --- a/src/main/java/org/openlmis/referencedata/domain/IdealStockAmount.java +++ b/src/main/java/org/openlmis/referencedata/domain/IdealStockAmount.java @@ -5,28 +5,27 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.domain; -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; -import org.javers.core.metamodel.annotation.TypeName; - +import java.util.UUID; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.JoinColumn; import javax.persistence.ManyToOne; import javax.persistence.Table; -import java.util.UUID; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import org.javers.core.metamodel.annotation.TypeName; @Entity @TypeName("IdealStockAmount") @@ -59,7 +58,7 @@ public class IdealStockAmount extends BaseEntity { private Integer amount; /** - * Creates new ideal stock amount object based on data from {@link Importer} + * Creates new ideal stock amount object based on data from {@link Importer}. * * @param importer instance of {@link Importer} * @return new instance of ideal stock amount. diff --git a/src/main/java/org/openlmis/referencedata/domain/Identifiable.java b/src/main/java/org/openlmis/referencedata/domain/Identifiable.java index 07e4662a8..d8b5dc7fb 100644 --- a/src/main/java/org/openlmis/referencedata/domain/Identifiable.java +++ b/src/main/java/org/openlmis/referencedata/domain/Identifiable.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.domain; diff --git a/src/main/java/org/openlmis/referencedata/domain/Lot.java b/src/main/java/org/openlmis/referencedata/domain/Lot.java index a98619ce2..32dacc3da 100644 --- a/src/main/java/org/openlmis/referencedata/domain/Lot.java +++ b/src/main/java/org/openlmis/referencedata/domain/Lot.java @@ -5,33 +5,30 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.domain; -import org.javers.core.metamodel.annotation.TypeName; - -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; - import java.time.LocalDate; import java.util.Objects; import java.util.UUID; - import javax.persistence.CascadeType; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.JoinColumn; import javax.persistence.ManyToOne; import javax.persistence.Table; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import org.javers.core.metamodel.annotation.TypeName; @Entity @Table(name = "lots", schema = "referencedata") diff --git a/src/main/java/org/openlmis/referencedata/domain/Orderable.java b/src/main/java/org/openlmis/referencedata/domain/Orderable.java index 3424edaaf..086eb1dae 100644 --- a/src/main/java/org/openlmis/referencedata/domain/Orderable.java +++ b/src/main/java/org/openlmis/referencedata/domain/Orderable.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.domain; @@ -170,7 +170,7 @@ public final int hashCode() { } /** - * Creates new instance based on data from {@link Importer} + * Creates new instance based on data from {@link Importer}. * * @param importer instance of {@link Importer} * @return new instance of Orderable. diff --git a/src/main/java/org/openlmis/referencedata/domain/OrderableDisplayCategory.java b/src/main/java/org/openlmis/referencedata/domain/OrderableDisplayCategory.java index e416d1b3b..745425dfb 100644 --- a/src/main/java/org/openlmis/referencedata/domain/OrderableDisplayCategory.java +++ b/src/main/java/org/openlmis/referencedata/domain/OrderableDisplayCategory.java @@ -5,28 +5,25 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.domain; import static org.apache.commons.lang3.BooleanUtils.isFalse; -import org.javers.core.metamodel.annotation.TypeName; - -import lombok.Getter; - import java.util.Objects; import java.util.UUID; - import javax.persistence.Embedded; import javax.persistence.Entity; import javax.persistence.Table; +import lombok.Getter; +import org.javers.core.metamodel.annotation.TypeName; /** * Informative category a Product is in when assigned to a {@link Program}. diff --git a/src/main/java/org/openlmis/referencedata/domain/OrderedDisplayValue.java b/src/main/java/org/openlmis/referencedata/domain/OrderedDisplayValue.java index 1f151e0c1..0c954ac4f 100644 --- a/src/main/java/org/openlmis/referencedata/domain/OrderedDisplayValue.java +++ b/src/main/java/org/openlmis/referencedata/domain/OrderedDisplayValue.java @@ -5,21 +5,21 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.domain; import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.Getter; -import org.openlmis.referencedata.exception.ValidationMessageException; import java.util.Objects; import javax.persistence.Embeddable; +import lombok.Getter; +import org.openlmis.referencedata.exception.ValidationMessageException; /** * An OrderedDisplayValue is used for unique values/categories that a user would select. This is diff --git a/src/main/java/org/openlmis/referencedata/domain/ProcessingPeriod.java b/src/main/java/org/openlmis/referencedata/domain/ProcessingPeriod.java index 51721aab3..26c0f59da 100644 --- a/src/main/java/org/openlmis/referencedata/domain/ProcessingPeriod.java +++ b/src/main/java/org/openlmis/referencedata/domain/ProcessingPeriod.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.domain; diff --git a/src/main/java/org/openlmis/referencedata/domain/ProcessingSchedule.java b/src/main/java/org/openlmis/referencedata/domain/ProcessingSchedule.java index 557e63887..e382e7301 100644 --- a/src/main/java/org/openlmis/referencedata/domain/ProcessingSchedule.java +++ b/src/main/java/org/openlmis/referencedata/domain/ProcessingSchedule.java @@ -5,32 +5,29 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.domain; -import lombok.AllArgsConstructor; -import org.javers.core.metamodel.annotation.TypeName; - -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; - import java.time.ZonedDateTime; import java.util.Objects; import java.util.UUID; - import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.PrePersist; import javax.persistence.PreUpdate; import javax.persistence.Table; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import org.javers.core.metamodel.annotation.TypeName; @Entity @Table(name = "processing_schedules", schema = "referencedata") diff --git a/src/main/java/org/openlmis/referencedata/domain/Program.java b/src/main/java/org/openlmis/referencedata/domain/Program.java index aded71870..219b3dcbf 100644 --- a/src/main/java/org/openlmis/referencedata/domain/Program.java +++ b/src/main/java/org/openlmis/referencedata/domain/Program.java @@ -5,32 +5,29 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.domain; import static org.apache.commons.lang3.BooleanUtils.isFalse; -import org.javers.core.metamodel.annotation.TypeName; - -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.Setter; - import java.util.Objects; import java.util.UUID; - import javax.persistence.Column; import javax.persistence.Embedded; import javax.persistence.Entity; import javax.persistence.PrePersist; import javax.persistence.Table; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.Setter; +import org.javers.core.metamodel.annotation.TypeName; @Entity @Getter @@ -120,7 +117,7 @@ public int hashCode() { } /** - * Creates new program object based on data from {@link Importer} + * Creates new program object based on data from {@link Importer}. * * @param importer instance of {@link Importer} * @return new instance of program. diff --git a/src/main/java/org/openlmis/referencedata/domain/ProgramOrderable.java b/src/main/java/org/openlmis/referencedata/domain/ProgramOrderable.java index 91525a2b8..bf5a2898b 100644 --- a/src/main/java/org/openlmis/referencedata/domain/ProgramOrderable.java +++ b/src/main/java/org/openlmis/referencedata/domain/ProgramOrderable.java @@ -5,37 +5,34 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.domain; -import javax.persistence.UniqueConstraint; -import org.hibernate.annotations.Parameter; -import org.hibernate.annotations.Type; -import org.javers.core.metamodel.annotation.TypeName; -import org.joda.money.CurrencyUnit; -import org.joda.money.Money; -import org.openlmis.referencedata.CurrencyConfig; - -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; - import java.math.BigDecimal; import java.util.Objects; import java.util.UUID; - import javax.persistence.Entity; import javax.persistence.JoinColumn; import javax.persistence.ManyToOne; import javax.persistence.Table; +import javax.persistence.UniqueConstraint; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import org.hibernate.annotations.Parameter; +import org.hibernate.annotations.Type; +import org.javers.core.metamodel.annotation.TypeName; +import org.joda.money.CurrencyUnit; +import org.joda.money.Money; +import org.openlmis.referencedata.CurrencyConfig; @Entity @Table(name = "program_orderables", schema = "referencedata", @@ -181,7 +178,7 @@ public int hashCode() { } /** - * Creates new instance based on data from {@link Importer} + * Creates new instance based on data from {@link Importer}. * * @param importer instance of {@link Importer} * @return new instance of ProgramOrderable. diff --git a/src/main/java/org/openlmis/referencedata/domain/RequisitionGroup.java b/src/main/java/org/openlmis/referencedata/domain/RequisitionGroup.java index a7228e65b..685d4b184 100644 --- a/src/main/java/org/openlmis/referencedata/domain/RequisitionGroup.java +++ b/src/main/java/org/openlmis/referencedata/domain/RequisitionGroup.java @@ -5,24 +5,16 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.domain; -import lombok.AllArgsConstructor; -import org.javers.core.metamodel.annotation.DiffIgnore; -import org.javers.core.metamodel.annotation.TypeName; - -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; - import java.util.ArrayList; import java.util.HashSet; import java.util.List; @@ -31,7 +23,6 @@ import java.util.Set; import java.util.UUID; import java.util.stream.Collectors; - import javax.persistence.CascadeType; import javax.persistence.Column; import javax.persistence.Entity; @@ -42,6 +33,12 @@ import javax.persistence.OneToMany; import javax.persistence.OneToOne; import javax.persistence.Table; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import org.javers.core.metamodel.annotation.DiffIgnore; +import org.javers.core.metamodel.annotation.TypeName; /** * RequisitionGroup represents a group of facilities which follow a particular schedule for a diff --git a/src/main/java/org/openlmis/referencedata/domain/RequisitionGroupProgramSchedule.java b/src/main/java/org/openlmis/referencedata/domain/RequisitionGroupProgramSchedule.java index 67a6825a5..311acc03a 100644 --- a/src/main/java/org/openlmis/referencedata/domain/RequisitionGroupProgramSchedule.java +++ b/src/main/java/org/openlmis/referencedata/domain/RequisitionGroupProgramSchedule.java @@ -5,25 +5,18 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.domain; -import org.javers.core.metamodel.annotation.TypeName; - -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; - import java.util.Objects; import java.util.UUID; - import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.JoinColumn; @@ -31,6 +24,10 @@ import javax.persistence.OneToOne; import javax.persistence.Table; import javax.persistence.UniqueConstraint; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import org.javers.core.metamodel.annotation.TypeName; /** * RequisitionGroupProgramSchedule represents the schedule to be mapped for a given program and diff --git a/src/main/java/org/openlmis/referencedata/domain/Right.java b/src/main/java/org/openlmis/referencedata/domain/Right.java index af198376a..1d4a997b7 100644 --- a/src/main/java/org/openlmis/referencedata/domain/Right.java +++ b/src/main/java/org/openlmis/referencedata/domain/Right.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.domain; diff --git a/src/main/java/org/openlmis/referencedata/domain/RightAssignment.java b/src/main/java/org/openlmis/referencedata/domain/RightAssignment.java index 2d5fd704a..fc99ef3b5 100644 --- a/src/main/java/org/openlmis/referencedata/domain/RightAssignment.java +++ b/src/main/java/org/openlmis/referencedata/domain/RightAssignment.java @@ -5,29 +5,26 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.domain; -import lombok.EqualsAndHashCode; -import org.javers.core.metamodel.annotation.TypeName; - -import lombok.Getter; -import lombok.NoArgsConstructor; - import java.util.UUID; - import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.JoinColumn; import javax.persistence.ManyToOne; import javax.persistence.Table; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import org.javers.core.metamodel.annotation.TypeName; @Entity @Table(name = "right_assignments") diff --git a/src/main/java/org/openlmis/referencedata/domain/RightName.java b/src/main/java/org/openlmis/referencedata/domain/RightName.java index 951b6408f..44c76512c 100644 --- a/src/main/java/org/openlmis/referencedata/domain/RightName.java +++ b/src/main/java/org/openlmis/referencedata/domain/RightName.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.domain; diff --git a/src/main/java/org/openlmis/referencedata/domain/RightQuery.java b/src/main/java/org/openlmis/referencedata/domain/RightQuery.java index 35c0253f6..fb205a74d 100644 --- a/src/main/java/org/openlmis/referencedata/domain/RightQuery.java +++ b/src/main/java/org/openlmis/referencedata/domain/RightQuery.java @@ -5,19 +5,18 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.domain; -import lombok.Getter; - import java.util.Objects; +import lombok.Getter; @Getter public class RightQuery { diff --git a/src/main/java/org/openlmis/referencedata/domain/RightType.java b/src/main/java/org/openlmis/referencedata/domain/RightType.java index e791a042a..c44a376bd 100644 --- a/src/main/java/org/openlmis/referencedata/domain/RightType.java +++ b/src/main/java/org/openlmis/referencedata/domain/RightType.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.domain; diff --git a/src/main/java/org/openlmis/referencedata/domain/Role.java b/src/main/java/org/openlmis/referencedata/domain/Role.java index ddd92c15b..5d84d92bb 100644 --- a/src/main/java/org/openlmis/referencedata/domain/Role.java +++ b/src/main/java/org/openlmis/referencedata/domain/Role.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.domain; @@ -21,21 +21,11 @@ import static org.openlmis.referencedata.util.messagekeys.RoleMessageKeys.ERROR_MUST_HAVE_A_RIGHT; import static org.openlmis.referencedata.util.messagekeys.RoleMessageKeys.ERROR_RIGHTS_ARE_DIFFERENT_TYPES; -import org.javers.core.metamodel.annotation.DiffIgnore; -import org.javers.core.metamodel.annotation.TypeName; -import org.openlmis.referencedata.exception.ValidationMessageException; -import org.openlmis.referencedata.util.Message; - -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; - import java.util.Arrays; import java.util.HashSet; import java.util.Objects; import java.util.Set; import java.util.UUID; - import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.FetchType; @@ -43,6 +33,13 @@ import javax.persistence.JoinTable; import javax.persistence.ManyToMany; import javax.persistence.Table; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import org.javers.core.metamodel.annotation.DiffIgnore; +import org.javers.core.metamodel.annotation.TypeName; +import org.openlmis.referencedata.exception.ValidationMessageException; +import org.openlmis.referencedata.util.Message; @Entity @Table(name = "roles", schema = "referencedata") diff --git a/src/main/java/org/openlmis/referencedata/domain/RoleAssignment.java b/src/main/java/org/openlmis/referencedata/domain/RoleAssignment.java index c03cd5b58..9f2f0ecea 100644 --- a/src/main/java/org/openlmis/referencedata/domain/RoleAssignment.java +++ b/src/main/java/org/openlmis/referencedata/domain/RoleAssignment.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.domain; diff --git a/src/main/java/org/openlmis/referencedata/domain/ServiceAccount.java b/src/main/java/org/openlmis/referencedata/domain/ServiceAccount.java index 9f19a3cae..c52b163eb 100644 --- a/src/main/java/org/openlmis/referencedata/domain/ServiceAccount.java +++ b/src/main/java/org/openlmis/referencedata/domain/ServiceAccount.java @@ -5,34 +5,31 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.domain; -import org.javers.core.metamodel.annotation.TypeName; - -import lombok.AllArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.ToString; - import java.time.ZonedDateTime; import java.util.Objects; import java.util.UUID; - import javax.persistence.Column; import javax.persistence.Embedded; import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.Table; import javax.persistence.Transient; +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; +import org.javers.core.metamodel.annotation.TypeName; @Entity @TypeName("ServiceAccount") @@ -52,7 +49,7 @@ public final class ServiceAccount implements Identifiable { private CreationDetails creationDetails; /** - * Creates new service account object based on data from {@link Importer} + * Creates new service account object based on data from {@link Importer}. * * @param importer instance of {@link Importer} * @return new instance of service account. diff --git a/src/main/java/org/openlmis/referencedata/domain/StockAdjustmentReason.java b/src/main/java/org/openlmis/referencedata/domain/StockAdjustmentReason.java index 0392008e3..e6dc66593 100644 --- a/src/main/java/org/openlmis/referencedata/domain/StockAdjustmentReason.java +++ b/src/main/java/org/openlmis/referencedata/domain/StockAdjustmentReason.java @@ -5,29 +5,27 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.domain; -import org.javers.core.metamodel.annotation.TypeName; - -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; - import javax.persistence.CascadeType; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.JoinColumn; import javax.persistence.ManyToOne; import javax.persistence.Table; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import org.javers.core.metamodel.annotation.TypeName; @Entity diff --git a/src/main/java/org/openlmis/referencedata/domain/SupervisionRoleAssignment.java b/src/main/java/org/openlmis/referencedata/domain/SupervisionRoleAssignment.java index 8e82551b9..b65a3a8d5 100644 --- a/src/main/java/org/openlmis/referencedata/domain/SupervisionRoleAssignment.java +++ b/src/main/java/org/openlmis/referencedata/domain/SupervisionRoleAssignment.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.domain; @@ -18,12 +18,6 @@ import static java.util.Collections.singleton; import static org.openlmis.referencedata.domain.RightType.SUPERVISION; -import lombok.Getter; -import lombok.NoArgsConstructor; -import org.javers.core.metamodel.annotation.TypeName; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.slf4j.profiler.Profiler; import java.util.HashSet; import java.util.Objects; import java.util.Set; @@ -32,6 +26,12 @@ import javax.persistence.Entity; import javax.persistence.JoinColumn; import javax.persistence.ManyToOne; +import lombok.Getter; +import lombok.NoArgsConstructor; +import org.javers.core.metamodel.annotation.TypeName; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.slf4j.profiler.Profiler; @Entity @DiscriminatorValue("supervision") diff --git a/src/main/java/org/openlmis/referencedata/domain/SupervisoryNode.java b/src/main/java/org/openlmis/referencedata/domain/SupervisoryNode.java index 69b395844..fc182eb60 100644 --- a/src/main/java/org/openlmis/referencedata/domain/SupervisoryNode.java +++ b/src/main/java/org/openlmis/referencedata/domain/SupervisoryNode.java @@ -5,33 +5,21 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.domain; -import org.javers.core.metamodel.annotation.DiffIgnore; -import org.javers.core.metamodel.annotation.TypeName; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.slf4j.profiler.Profiler; - -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; - import java.util.HashSet; import java.util.Objects; import java.util.Set; import java.util.UUID; import java.util.stream.Collectors; - import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.FetchType; @@ -40,6 +28,15 @@ import javax.persistence.OneToMany; import javax.persistence.OneToOne; import javax.persistence.Table; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import org.javers.core.metamodel.annotation.DiffIgnore; +import org.javers.core.metamodel.annotation.TypeName; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.slf4j.profiler.Profiler; @Entity @Table(name = "supervisory_nodes", schema = "referencedata") diff --git a/src/main/java/org/openlmis/referencedata/domain/SupplyLine.java b/src/main/java/org/openlmis/referencedata/domain/SupplyLine.java index f0e978a1a..0c4bb462e 100644 --- a/src/main/java/org/openlmis/referencedata/domain/SupplyLine.java +++ b/src/main/java/org/openlmis/referencedata/domain/SupplyLine.java @@ -5,27 +5,18 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.domain; -import javax.persistence.UniqueConstraint; -import org.javers.core.metamodel.annotation.TypeName; - -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; - import java.util.Objects; import java.util.UUID; - import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.JoinColumn; @@ -33,6 +24,12 @@ import javax.persistence.NamedQueries; import javax.persistence.NamedQuery; import javax.persistence.Table; +import javax.persistence.UniqueConstraint; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import org.javers.core.metamodel.annotation.TypeName; @Entity @Table(name = "supply_lines", schema = "referencedata", diff --git a/src/main/java/org/openlmis/referencedata/domain/SupportedProgram.java b/src/main/java/org/openlmis/referencedata/domain/SupportedProgram.java index 7c574f38d..f18b90443 100644 --- a/src/main/java/org/openlmis/referencedata/domain/SupportedProgram.java +++ b/src/main/java/org/openlmis/referencedata/domain/SupportedProgram.java @@ -5,21 +5,16 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.domain; -import lombok.AllArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.NoArgsConstructor; -import org.javers.core.metamodel.annotation.TypeName; import java.io.Serializable; import java.time.LocalDate; import java.util.UUID; @@ -27,6 +22,11 @@ import javax.persistence.EmbeddedId; import javax.persistence.Entity; import javax.persistence.Table; +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import org.javers.core.metamodel.annotation.TypeName; @Entity @Table(name = "supported_programs", schema = "referencedata") diff --git a/src/main/java/org/openlmis/referencedata/domain/SupportedProgramPrimaryKey.java b/src/main/java/org/openlmis/referencedata/domain/SupportedProgramPrimaryKey.java index 89e47d1d0..a81f68e3a 100644 --- a/src/main/java/org/openlmis/referencedata/domain/SupportedProgramPrimaryKey.java +++ b/src/main/java/org/openlmis/referencedata/domain/SupportedProgramPrimaryKey.java @@ -5,23 +5,23 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.domain; -import lombok.AllArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.Getter; import java.io.Serializable; import javax.persistence.Embeddable; import javax.persistence.JoinColumn; import javax.persistence.ManyToOne; +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; @Embeddable @AllArgsConstructor diff --git a/src/main/java/org/openlmis/referencedata/domain/TradeItem.java b/src/main/java/org/openlmis/referencedata/domain/TradeItem.java index bdde52c87..9f2482e50 100644 --- a/src/main/java/org/openlmis/referencedata/domain/TradeItem.java +++ b/src/main/java/org/openlmis/referencedata/domain/TradeItem.java @@ -5,34 +5,31 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.domain; -import lombok.Setter; -import org.javers.core.metamodel.annotation.DiffIgnore; -import org.javers.core.metamodel.annotation.TypeName; -import org.openlmis.referencedata.dto.TradeItemClassificationDto; - -import lombok.Getter; -import lombok.NoArgsConstructor; - import java.util.ArrayList; import java.util.List; import java.util.UUID; - import javax.persistence.CascadeType; import javax.persistence.Column; import javax.persistence.Embedded; import javax.persistence.Entity; import javax.persistence.OneToMany; import javax.persistence.Table; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import org.javers.core.metamodel.annotation.DiffIgnore; +import org.javers.core.metamodel.annotation.TypeName; +import org.openlmis.referencedata.dto.TradeItemClassificationDto; /** * TradeItems represent branded/produced/physical products. A TradeItem is used for Product's that @@ -120,7 +117,7 @@ TradeItemClassification findClassificationById(String classificationId) { return null; } - /** Creates new instance based on data from {@link Importer} + /** Creates new instance based on data from {@link Importer}. * * @param importer instance of {@link Importer} * @return new instance of TradeItem. diff --git a/src/main/java/org/openlmis/referencedata/domain/TradeItemClassification.java b/src/main/java/org/openlmis/referencedata/domain/TradeItemClassification.java index 0ed79b266..be8c3978b 100644 --- a/src/main/java/org/openlmis/referencedata/domain/TradeItemClassification.java +++ b/src/main/java/org/openlmis/referencedata/domain/TradeItemClassification.java @@ -5,28 +5,26 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.domain; -import org.javers.core.metamodel.annotation.TypeName; - +import javax.persistence.Entity; +import javax.persistence.ManyToOne; +import javax.persistence.Table; +import javax.persistence.UniqueConstraint; import lombok.AccessLevel; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; - -import javax.persistence.Entity; -import javax.persistence.ManyToOne; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; +import org.javers.core.metamodel.annotation.TypeName; /** * Represents a trade item identification using a classification system. diff --git a/src/main/java/org/openlmis/referencedata/domain/VaccineDispensable.java b/src/main/java/org/openlmis/referencedata/domain/VaccineDispensable.java index 93e4a1a7b..1d105ccf0 100644 --- a/src/main/java/org/openlmis/referencedata/domain/VaccineDispensable.java +++ b/src/main/java/org/openlmis/referencedata/domain/VaccineDispensable.java @@ -5,22 +5,21 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.domain; -import lombok.NoArgsConstructor; -import org.apache.commons.lang3.StringUtils; - +import java.util.Objects; import javax.persistence.DiscriminatorValue; import javax.persistence.Entity; -import java.util.Objects; +import lombok.NoArgsConstructor; +import org.apache.commons.lang3.StringUtils; /** * A vaccine dispensable describes a dispensable by two properties, number of doses, represented diff --git a/src/main/java/org/openlmis/referencedata/dto/ApprovedProductDto.java b/src/main/java/org/openlmis/referencedata/dto/ApprovedProductDto.java index 0ee1ca8e1..f28241790 100644 --- a/src/main/java/org/openlmis/referencedata/dto/ApprovedProductDto.java +++ b/src/main/java/org/openlmis/referencedata/dto/ApprovedProductDto.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.dto; diff --git a/src/main/java/org/openlmis/referencedata/dto/BaseDto.java b/src/main/java/org/openlmis/referencedata/dto/BaseDto.java index c34b07f8d..28beaa79f 100644 --- a/src/main/java/org/openlmis/referencedata/dto/BaseDto.java +++ b/src/main/java/org/openlmis/referencedata/dto/BaseDto.java @@ -5,26 +5,24 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.dto; import com.fasterxml.jackson.annotation.JsonInclude; - +import java.util.UUID; import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; -import java.util.UUID; - @Getter @Setter @JsonInclude(JsonInclude.Include.NON_NULL) diff --git a/src/main/java/org/openlmis/referencedata/dto/BasicFacilityDto.java b/src/main/java/org/openlmis/referencedata/dto/BasicFacilityDto.java index 9eadc68f6..d67ed7ea7 100644 --- a/src/main/java/org/openlmis/referencedata/dto/BasicFacilityDto.java +++ b/src/main/java/org/openlmis/referencedata/dto/BasicFacilityDto.java @@ -5,31 +5,28 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.dto; import com.vividsolutions.jts.geom.Point; - -import org.openlmis.referencedata.domain.Facility; -import org.openlmis.referencedata.domain.FacilityOperator; -import org.openlmis.referencedata.domain.FacilityType; -import org.openlmis.referencedata.domain.GeographicZone; - +import java.time.LocalDate; +import java.util.Map; import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; - -import java.time.LocalDate; -import java.util.Map; +import org.openlmis.referencedata.domain.Facility; +import org.openlmis.referencedata.domain.FacilityOperator; +import org.openlmis.referencedata.domain.FacilityType; +import org.openlmis.referencedata.domain.GeographicZone; @Getter @Setter diff --git a/src/main/java/org/openlmis/referencedata/dto/CommodityTypeDto.java b/src/main/java/org/openlmis/referencedata/dto/CommodityTypeDto.java index 4704df2af..7687be796 100644 --- a/src/main/java/org/openlmis/referencedata/dto/CommodityTypeDto.java +++ b/src/main/java/org/openlmis/referencedata/dto/CommodityTypeDto.java @@ -5,24 +5,24 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.dto; +import java.util.LinkedList; +import java.util.List; import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; import org.openlmis.referencedata.domain.CommodityType; -import java.util.LinkedList; -import java.util.List; @Getter @Setter @@ -41,7 +41,7 @@ public class CommodityTypeDto extends BaseDto private CommodityTypeDto parent; /** - * Create new list of CommodityTypeDto based on given list of {@link CommodityType} + * Create new list of CommodityTypeDto based on given list of {@link CommodityType}. * * @param commodityTypes list of {@link CommodityType} * @return new list of CommodityTypeDto. diff --git a/src/main/java/org/openlmis/referencedata/dto/CurrencySettingsDto.java b/src/main/java/org/openlmis/referencedata/dto/CurrencySettingsDto.java index b2564fe18..440ac81c6 100644 --- a/src/main/java/org/openlmis/referencedata/dto/CurrencySettingsDto.java +++ b/src/main/java/org/openlmis/referencedata/dto/CurrencySettingsDto.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.dto; diff --git a/src/main/java/org/openlmis/referencedata/dto/DetailedRoleAssignmentDto.java b/src/main/java/org/openlmis/referencedata/dto/DetailedRoleAssignmentDto.java index 116e4b34d..0e3c5da6d 100644 --- a/src/main/java/org/openlmis/referencedata/dto/DetailedRoleAssignmentDto.java +++ b/src/main/java/org/openlmis/referencedata/dto/DetailedRoleAssignmentDto.java @@ -5,17 +5,19 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.dto; import com.fasterxml.jackson.annotation.JsonInclude; +import java.util.Objects; +import java.util.UUID; import lombok.Getter; import lombok.Setter; import org.openlmis.referencedata.domain.Facility; @@ -26,9 +28,6 @@ import org.openlmis.referencedata.domain.SupervisionRoleAssignment; import org.openlmis.referencedata.domain.SupervisoryNode; -import java.util.Objects; -import java.util.UUID; - @JsonInclude(JsonInclude.Include.NON_NULL) public class DetailedRoleAssignmentDto implements RoleAssignment.Exporter, SupervisionRoleAssignment.Exporter, FulfillmentRoleAssignment.Exporter { diff --git a/src/main/java/org/openlmis/referencedata/dto/DispensableDto.java b/src/main/java/org/openlmis/referencedata/dto/DispensableDto.java index c6f5ae5f0..f62a7e4b7 100644 --- a/src/main/java/org/openlmis/referencedata/dto/DispensableDto.java +++ b/src/main/java/org/openlmis/referencedata/dto/DispensableDto.java @@ -5,27 +5,26 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.dto; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonInclude; +import java.util.HashMap; +import java.util.Map; import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import org.openlmis.referencedata.domain.Dispensable; -import java.util.HashMap; -import java.util.Map; - @Getter @NoArgsConstructor @AllArgsConstructor diff --git a/src/main/java/org/openlmis/referencedata/dto/FacilityDto.java b/src/main/java/org/openlmis/referencedata/dto/FacilityDto.java index 457d5f8dc..6c7aeafbf 100644 --- a/src/main/java/org/openlmis/referencedata/dto/FacilityDto.java +++ b/src/main/java/org/openlmis/referencedata/dto/FacilityDto.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.dto; diff --git a/src/main/java/org/openlmis/referencedata/dto/FacilityOperatorDto.java b/src/main/java/org/openlmis/referencedata/dto/FacilityOperatorDto.java index 9f4a7c7d2..9dddc605b 100644 --- a/src/main/java/org/openlmis/referencedata/dto/FacilityOperatorDto.java +++ b/src/main/java/org/openlmis/referencedata/dto/FacilityOperatorDto.java @@ -5,22 +5,21 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.dto; -import org.openlmis.referencedata.domain.FacilityOperator; - import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; +import org.openlmis.referencedata.domain.FacilityOperator; @NoArgsConstructor @AllArgsConstructor diff --git a/src/main/java/org/openlmis/referencedata/dto/FacilityTypeDto.java b/src/main/java/org/openlmis/referencedata/dto/FacilityTypeDto.java index 9bf4890de..d96bf656d 100644 --- a/src/main/java/org/openlmis/referencedata/dto/FacilityTypeDto.java +++ b/src/main/java/org/openlmis/referencedata/dto/FacilityTypeDto.java @@ -5,22 +5,21 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.dto; -import org.openlmis.referencedata.domain.FacilityType; - import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; +import org.openlmis.referencedata.domain.FacilityType; @NoArgsConstructor @AllArgsConstructor diff --git a/src/main/java/org/openlmis/referencedata/dto/GeographicLevelDto.java b/src/main/java/org/openlmis/referencedata/dto/GeographicLevelDto.java index efac0a142..e45f49583 100644 --- a/src/main/java/org/openlmis/referencedata/dto/GeographicLevelDto.java +++ b/src/main/java/org/openlmis/referencedata/dto/GeographicLevelDto.java @@ -5,22 +5,21 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.dto; -import org.openlmis.referencedata.domain.GeographicLevel; - import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; +import org.openlmis.referencedata.domain.GeographicLevel; @NoArgsConstructor @AllArgsConstructor diff --git a/src/main/java/org/openlmis/referencedata/dto/GeographicZoneDto.java b/src/main/java/org/openlmis/referencedata/dto/GeographicZoneDto.java index 5cf812fb4..78399082d 100644 --- a/src/main/java/org/openlmis/referencedata/dto/GeographicZoneDto.java +++ b/src/main/java/org/openlmis/referencedata/dto/GeographicZoneDto.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.dto; diff --git a/src/main/java/org/openlmis/referencedata/dto/GeographicZoneSimpleDto.java b/src/main/java/org/openlmis/referencedata/dto/GeographicZoneSimpleDto.java index 761937c99..62a6ebc65 100644 --- a/src/main/java/org/openlmis/referencedata/dto/GeographicZoneSimpleDto.java +++ b/src/main/java/org/openlmis/referencedata/dto/GeographicZoneSimpleDto.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.dto; diff --git a/src/main/java/org/openlmis/referencedata/dto/IdealStockAmountCsvModel.java b/src/main/java/org/openlmis/referencedata/dto/IdealStockAmountCsvModel.java index 4e8f234d3..2fed86b2b 100644 --- a/src/main/java/org/openlmis/referencedata/dto/IdealStockAmountCsvModel.java +++ b/src/main/java/org/openlmis/referencedata/dto/IdealStockAmountCsvModel.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.dto; diff --git a/src/main/java/org/openlmis/referencedata/dto/IdealStockAmountDto.java b/src/main/java/org/openlmis/referencedata/dto/IdealStockAmountDto.java index d1382313e..2c6da7ec6 100644 --- a/src/main/java/org/openlmis/referencedata/dto/IdealStockAmountDto.java +++ b/src/main/java/org/openlmis/referencedata/dto/IdealStockAmountDto.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.dto; diff --git a/src/main/java/org/openlmis/referencedata/dto/IsaProcessingPeriodDto.java b/src/main/java/org/openlmis/referencedata/dto/IsaProcessingPeriodDto.java index 19ca8613b..ca32ebc1a 100644 --- a/src/main/java/org/openlmis/referencedata/dto/IsaProcessingPeriodDto.java +++ b/src/main/java/org/openlmis/referencedata/dto/IsaProcessingPeriodDto.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.dto; diff --git a/src/main/java/org/openlmis/referencedata/dto/LotDto.java b/src/main/java/org/openlmis/referencedata/dto/LotDto.java index 92e24eee8..3abd30b65 100644 --- a/src/main/java/org/openlmis/referencedata/dto/LotDto.java +++ b/src/main/java/org/openlmis/referencedata/dto/LotDto.java @@ -5,28 +5,26 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.dto; -import org.openlmis.referencedata.domain.Lot; - +import java.time.LocalDate; +import java.util.LinkedList; +import java.util.List; +import java.util.UUID; import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; - -import java.time.LocalDate; -import java.util.LinkedList; -import java.util.List; -import java.util.UUID; +import org.openlmis.referencedata.domain.Lot; @NoArgsConstructor @AllArgsConstructor @@ -42,7 +40,7 @@ public class LotDto extends BaseDto implements Lot.Exporter, Lot.Importer { private LocalDate manufactureDate; /** - * Create new set of LotDto based on given iterable of {@link Lot} + * Create new set of LotDto based on given iterable of {@link Lot}. * * @param lots list of {@link Lot} * @return new list of LotDto. diff --git a/src/main/java/org/openlmis/referencedata/dto/MinimalFacilityDto.java b/src/main/java/org/openlmis/referencedata/dto/MinimalFacilityDto.java index 35bb16932..910f7f398 100644 --- a/src/main/java/org/openlmis/referencedata/dto/MinimalFacilityDto.java +++ b/src/main/java/org/openlmis/referencedata/dto/MinimalFacilityDto.java @@ -5,17 +5,20 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.dto; import com.vividsolutions.jts.geom.Point; +import java.time.LocalDate; +import java.util.Map; +import java.util.Set; import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; import lombok.Getter; @@ -27,10 +30,6 @@ import org.openlmis.referencedata.domain.GeographicZone; import org.openlmis.referencedata.domain.SupportedProgram; -import java.time.LocalDate; -import java.util.Map; -import java.util.Set; - @NoArgsConstructor @AllArgsConstructor @EqualsAndHashCode(callSuper = true) diff --git a/src/main/java/org/openlmis/referencedata/dto/NamedResource.java b/src/main/java/org/openlmis/referencedata/dto/NamedResource.java index b3cd594ec..370a23098 100644 --- a/src/main/java/org/openlmis/referencedata/dto/NamedResource.java +++ b/src/main/java/org/openlmis/referencedata/dto/NamedResource.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.dto; diff --git a/src/main/java/org/openlmis/referencedata/dto/ObjectReferenceDto.java b/src/main/java/org/openlmis/referencedata/dto/ObjectReferenceDto.java index 74b2a660a..badc37497 100644 --- a/src/main/java/org/openlmis/referencedata/dto/ObjectReferenceDto.java +++ b/src/main/java/org/openlmis/referencedata/dto/ObjectReferenceDto.java @@ -5,22 +5,21 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.dto; +import java.util.UUID; import lombok.Getter; import lombok.Setter; import org.apache.commons.lang3.StringUtils; -import java.util.UUID; - public class ObjectReferenceDto extends BaseDto { private static final String SEPARATOR = "/"; diff --git a/src/main/java/org/openlmis/referencedata/dto/OrderableDisplayCategoryDto.java b/src/main/java/org/openlmis/referencedata/dto/OrderableDisplayCategoryDto.java index 8a494270f..c29b40c76 100644 --- a/src/main/java/org/openlmis/referencedata/dto/OrderableDisplayCategoryDto.java +++ b/src/main/java/org/openlmis/referencedata/dto/OrderableDisplayCategoryDto.java @@ -5,22 +5,22 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.dto; +import java.util.HashSet; +import java.util.Set; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; import org.openlmis.referencedata.domain.OrderableDisplayCategory; -import java.util.HashSet; -import java.util.Set; @Getter @Setter diff --git a/src/main/java/org/openlmis/referencedata/dto/OrderableDto.java b/src/main/java/org/openlmis/referencedata/dto/OrderableDto.java index fb81563f6..552f32f51 100644 --- a/src/main/java/org/openlmis/referencedata/dto/OrderableDto.java +++ b/src/main/java/org/openlmis/referencedata/dto/OrderableDto.java @@ -5,16 +5,20 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.dto; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Set; import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; import lombok.Getter; @@ -22,10 +26,6 @@ import lombok.Setter; import org.openlmis.referencedata.domain.Dispensable; import org.openlmis.referencedata.domain.Orderable; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Set; @Getter @Setter @@ -55,7 +55,7 @@ public class OrderableDto extends BaseDto implements Orderable.Importer, Orderab private Map extraData; /** - * Create new set of OrderableDto based on given iterable of {@link Orderable} + * Create new set of OrderableDto based on given iterable of {@link Orderable}. * * @param orderables list of {@link Orderable} * @return new list of OrderableDto. diff --git a/src/main/java/org/openlmis/referencedata/dto/ProcessingPeriodDto.java b/src/main/java/org/openlmis/referencedata/dto/ProcessingPeriodDto.java index f2c4b7422..00af47144 100644 --- a/src/main/java/org/openlmis/referencedata/dto/ProcessingPeriodDto.java +++ b/src/main/java/org/openlmis/referencedata/dto/ProcessingPeriodDto.java @@ -5,28 +5,26 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.dto; +import java.time.LocalDate; import java.util.Map; -import org.openlmis.referencedata.domain.ProcessingPeriod; -import org.openlmis.referencedata.domain.ProcessingSchedule; - +import java.util.Objects; +import java.util.Optional; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; - -import java.time.LocalDate; -import java.util.Objects; -import java.util.Optional; +import org.openlmis.referencedata.domain.ProcessingPeriod; +import org.openlmis.referencedata.domain.ProcessingSchedule; @NoArgsConstructor @AllArgsConstructor diff --git a/src/main/java/org/openlmis/referencedata/dto/ProcessingScheduleDto.java b/src/main/java/org/openlmis/referencedata/dto/ProcessingScheduleDto.java index 4e098e2c1..c9c146dac 100644 --- a/src/main/java/org/openlmis/referencedata/dto/ProcessingScheduleDto.java +++ b/src/main/java/org/openlmis/referencedata/dto/ProcessingScheduleDto.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.dto; diff --git a/src/main/java/org/openlmis/referencedata/dto/ProgramDto.java b/src/main/java/org/openlmis/referencedata/dto/ProgramDto.java index 242451ef4..4424f6e52 100644 --- a/src/main/java/org/openlmis/referencedata/dto/ProgramDto.java +++ b/src/main/java/org/openlmis/referencedata/dto/ProgramDto.java @@ -5,25 +5,23 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.dto; -import org.openlmis.referencedata.domain.Program; - +import java.util.UUID; import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; - -import java.util.UUID; +import org.openlmis.referencedata.domain.Program; @NoArgsConstructor @AllArgsConstructor diff --git a/src/main/java/org/openlmis/referencedata/dto/ProgramOrderableDto.java b/src/main/java/org/openlmis/referencedata/dto/ProgramOrderableDto.java index 2fd53178e..ab23d5766 100644 --- a/src/main/java/org/openlmis/referencedata/dto/ProgramOrderableDto.java +++ b/src/main/java/org/openlmis/referencedata/dto/ProgramOrderableDto.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.dto; @@ -18,6 +18,9 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import java.util.HashSet; +import java.util.Set; +import java.util.UUID; import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; import lombok.Getter; @@ -27,9 +30,6 @@ import org.openlmis.referencedata.domain.ProgramOrderable; import org.openlmis.referencedata.serializer.MoneyDeserializer; import org.openlmis.referencedata.serializer.MoneySerializer; -import java.util.HashSet; -import java.util.Set; -import java.util.UUID; @Getter @Setter @@ -60,7 +60,7 @@ public class ProgramOrderableDto implements ProgramOrderable.Importer, ProgramOr private Money pricePerPack; /** - * Create new list of ProgramOrderableDto based on given list of {@link ProgramOrderable} + * Create new list of ProgramOrderableDto based on given list of {@link ProgramOrderable}. * * @param programOrderables list of {@link ProgramOrderable} * @return new list of ProgramOrderableDto. diff --git a/src/main/java/org/openlmis/referencedata/dto/RequisitionGroupBaseDto.java b/src/main/java/org/openlmis/referencedata/dto/RequisitionGroupBaseDto.java index 99c8f4e16..747a4eaaf 100644 --- a/src/main/java/org/openlmis/referencedata/dto/RequisitionGroupBaseDto.java +++ b/src/main/java/org/openlmis/referencedata/dto/RequisitionGroupBaseDto.java @@ -5,32 +5,29 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.dto; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; - -import org.openlmis.referencedata.domain.Facility; -import org.openlmis.referencedata.domain.RequisitionGroup; -import org.openlmis.referencedata.domain.RequisitionGroupProgramSchedule; -import org.openlmis.referencedata.domain.SupervisoryNode; - -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; - import java.util.List; import java.util.Objects; import java.util.Set; import java.util.UUID; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import org.openlmis.referencedata.domain.Facility; +import org.openlmis.referencedata.domain.RequisitionGroup; +import org.openlmis.referencedata.domain.RequisitionGroupProgramSchedule; +import org.openlmis.referencedata.domain.SupervisoryNode; @NoArgsConstructor public class RequisitionGroupBaseDto extends BaseDto implements RequisitionGroup.Importer, diff --git a/src/main/java/org/openlmis/referencedata/dto/RequisitionGroupDto.java b/src/main/java/org/openlmis/referencedata/dto/RequisitionGroupDto.java index db6d9bd81..058dc9f99 100644 --- a/src/main/java/org/openlmis/referencedata/dto/RequisitionGroupDto.java +++ b/src/main/java/org/openlmis/referencedata/dto/RequisitionGroupDto.java @@ -5,30 +5,27 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.dto; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; - -import org.openlmis.referencedata.domain.Facility; -import org.openlmis.referencedata.domain.RequisitionGroupProgramSchedule; -import org.openlmis.referencedata.domain.SupervisoryNode; - -import lombok.NoArgsConstructor; - import java.util.ArrayList; import java.util.HashSet; import java.util.List; import java.util.Set; import java.util.UUID; +import lombok.NoArgsConstructor; +import org.openlmis.referencedata.domain.Facility; +import org.openlmis.referencedata.domain.RequisitionGroupProgramSchedule; +import org.openlmis.referencedata.domain.SupervisoryNode; @NoArgsConstructor public class RequisitionGroupDto extends RequisitionGroupBaseDto { diff --git a/src/main/java/org/openlmis/referencedata/dto/RequisitionGroupProgramScheduleBaseDto.java b/src/main/java/org/openlmis/referencedata/dto/RequisitionGroupProgramScheduleBaseDto.java index 1cc3336b7..786ee77a5 100644 --- a/src/main/java/org/openlmis/referencedata/dto/RequisitionGroupProgramScheduleBaseDto.java +++ b/src/main/java/org/openlmis/referencedata/dto/RequisitionGroupProgramScheduleBaseDto.java @@ -5,33 +5,30 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.dto; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; - +import java.util.Objects; +import java.util.UUID; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; import org.openlmis.referencedata.domain.Facility; import org.openlmis.referencedata.domain.ProcessingSchedule; import org.openlmis.referencedata.domain.Program; import org.openlmis.referencedata.domain.RequisitionGroup; import org.openlmis.referencedata.domain.RequisitionGroupProgramSchedule; -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; - -import java.util.Objects; -import java.util.UUID; - @NoArgsConstructor @AllArgsConstructor public class RequisitionGroupProgramScheduleBaseDto extends BaseDto implements diff --git a/src/main/java/org/openlmis/referencedata/dto/RequisitionGroupProgramScheduleDto.java b/src/main/java/org/openlmis/referencedata/dto/RequisitionGroupProgramScheduleDto.java index 309488d1f..31f0e03f8 100644 --- a/src/main/java/org/openlmis/referencedata/dto/RequisitionGroupProgramScheduleDto.java +++ b/src/main/java/org/openlmis/referencedata/dto/RequisitionGroupProgramScheduleDto.java @@ -5,18 +5,17 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.dto; import com.fasterxml.jackson.annotation.JsonIgnore; - import org.openlmis.referencedata.domain.Facility; import org.openlmis.referencedata.domain.Program; import org.openlmis.referencedata.domain.RequisitionGroup; diff --git a/src/main/java/org/openlmis/referencedata/dto/ResultDto.java b/src/main/java/org/openlmis/referencedata/dto/ResultDto.java index 0afc57541..552b710f8 100644 --- a/src/main/java/org/openlmis/referencedata/dto/ResultDto.java +++ b/src/main/java/org/openlmis/referencedata/dto/ResultDto.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.dto; diff --git a/src/main/java/org/openlmis/referencedata/dto/RightAssignmentDto.java b/src/main/java/org/openlmis/referencedata/dto/RightAssignmentDto.java index ae5d64c47..be598df59 100644 --- a/src/main/java/org/openlmis/referencedata/dto/RightAssignmentDto.java +++ b/src/main/java/org/openlmis/referencedata/dto/RightAssignmentDto.java @@ -5,19 +5,18 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.dto; import java.util.Objects; import java.util.UUID; - import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/src/main/java/org/openlmis/referencedata/dto/RightDto.java b/src/main/java/org/openlmis/referencedata/dto/RightDto.java index 758277ca8..b00fc256b 100644 --- a/src/main/java/org/openlmis/referencedata/dto/RightDto.java +++ b/src/main/java/org/openlmis/referencedata/dto/RightDto.java @@ -5,26 +5,24 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.dto; +import java.util.HashSet; +import java.util.Objects; +import java.util.Set; import lombok.Getter; import lombok.Setter; - import org.openlmis.referencedata.domain.Right; import org.openlmis.referencedata.domain.RightType; -import java.util.HashSet; -import java.util.Objects; -import java.util.Set; - public class RightDto extends BaseDto implements Right.Exporter, Right.Importer { @Getter diff --git a/src/main/java/org/openlmis/referencedata/dto/RoleAssignmentDto.java b/src/main/java/org/openlmis/referencedata/dto/RoleAssignmentDto.java index a0693140a..433106cd1 100644 --- a/src/main/java/org/openlmis/referencedata/dto/RoleAssignmentDto.java +++ b/src/main/java/org/openlmis/referencedata/dto/RoleAssignmentDto.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.dto; diff --git a/src/main/java/org/openlmis/referencedata/dto/RoleDto.java b/src/main/java/org/openlmis/referencedata/dto/RoleDto.java index ca3fbece1..b69f22d13 100644 --- a/src/main/java/org/openlmis/referencedata/dto/RoleDto.java +++ b/src/main/java/org/openlmis/referencedata/dto/RoleDto.java @@ -5,26 +5,24 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.dto; +import java.util.HashSet; +import java.util.Objects; +import java.util.Set; import lombok.Getter; import lombok.Setter; - import org.openlmis.referencedata.domain.Right; import org.openlmis.referencedata.domain.Role; -import java.util.HashSet; -import java.util.Objects; -import java.util.Set; - public class RoleDto extends BaseDto implements Role.Exporter, Role.Importer { @Getter diff --git a/src/main/java/org/openlmis/referencedata/dto/ServiceAccountCreationBody.java b/src/main/java/org/openlmis/referencedata/dto/ServiceAccountCreationBody.java index 93356783a..16ffb0cb1 100644 --- a/src/main/java/org/openlmis/referencedata/dto/ServiceAccountCreationBody.java +++ b/src/main/java/org/openlmis/referencedata/dto/ServiceAccountCreationBody.java @@ -5,24 +5,23 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.dto; +import java.util.UUID; import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; -import java.util.UUID; - @Getter @NoArgsConstructor @AllArgsConstructor diff --git a/src/main/java/org/openlmis/referencedata/dto/ServiceAccountDto.java b/src/main/java/org/openlmis/referencedata/dto/ServiceAccountDto.java index 2868cc86c..18febb848 100644 --- a/src/main/java/org/openlmis/referencedata/dto/ServiceAccountDto.java +++ b/src/main/java/org/openlmis/referencedata/dto/ServiceAccountDto.java @@ -5,25 +5,23 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.dto; -import org.openlmis.referencedata.domain.ServiceAccount; - +import java.time.ZonedDateTime; +import java.util.UUID; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; import lombok.ToString; - -import java.time.ZonedDateTime; -import java.util.UUID; +import org.openlmis.referencedata.domain.ServiceAccount; @Getter @Setter diff --git a/src/main/java/org/openlmis/referencedata/dto/SupervisoryNodeBaseDto.java b/src/main/java/org/openlmis/referencedata/dto/SupervisoryNodeBaseDto.java index 0446c2668..58e8b0a08 100644 --- a/src/main/java/org/openlmis/referencedata/dto/SupervisoryNodeBaseDto.java +++ b/src/main/java/org/openlmis/referencedata/dto/SupervisoryNodeBaseDto.java @@ -5,30 +5,27 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.dto; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; - -import org.openlmis.referencedata.domain.Facility; -import org.openlmis.referencedata.domain.RequisitionGroup; -import org.openlmis.referencedata.domain.SupervisoryNode; - -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; - import java.util.Objects; import java.util.Set; import java.util.UUID; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import org.openlmis.referencedata.domain.Facility; +import org.openlmis.referencedata.domain.RequisitionGroup; +import org.openlmis.referencedata.domain.SupervisoryNode; @NoArgsConstructor public class SupervisoryNodeBaseDto extends BaseDto implements SupervisoryNode.Exporter, diff --git a/src/main/java/org/openlmis/referencedata/dto/SupervisoryNodeDto.java b/src/main/java/org/openlmis/referencedata/dto/SupervisoryNodeDto.java index 0ec809da8..c5db14d83 100644 --- a/src/main/java/org/openlmis/referencedata/dto/SupervisoryNodeDto.java +++ b/src/main/java/org/openlmis/referencedata/dto/SupervisoryNodeDto.java @@ -5,29 +5,26 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.dto; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; - -import org.openlmis.referencedata.domain.Facility; -import org.openlmis.referencedata.domain.RequisitionGroup; -import org.openlmis.referencedata.domain.SupervisoryNode; - -import lombok.Getter; -import lombok.NoArgsConstructor; - import java.util.HashSet; import java.util.Set; import java.util.UUID; +import lombok.Getter; +import lombok.NoArgsConstructor; +import org.openlmis.referencedata.domain.Facility; +import org.openlmis.referencedata.domain.RequisitionGroup; +import org.openlmis.referencedata.domain.SupervisoryNode; @NoArgsConstructor public class SupervisoryNodeDto extends SupervisoryNodeBaseDto { diff --git a/src/main/java/org/openlmis/referencedata/dto/SupplyLineDto.java b/src/main/java/org/openlmis/referencedata/dto/SupplyLineDto.java index 749f82fb3..a7910bd95 100644 --- a/src/main/java/org/openlmis/referencedata/dto/SupplyLineDto.java +++ b/src/main/java/org/openlmis/referencedata/dto/SupplyLineDto.java @@ -5,29 +5,26 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.dto; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; - +import java.util.Objects; +import lombok.Getter; +import lombok.Setter; import org.openlmis.referencedata.domain.Facility; import org.openlmis.referencedata.domain.Program; import org.openlmis.referencedata.domain.SupervisoryNode; import org.openlmis.referencedata.domain.SupplyLine; -import lombok.Getter; -import lombok.Setter; - -import java.util.Objects; - public class SupplyLineDto extends BaseDto implements SupplyLine.Exporter, SupplyLine.Importer { @JsonProperty diff --git a/src/main/java/org/openlmis/referencedata/dto/SupplyLineSimpleDto.java b/src/main/java/org/openlmis/referencedata/dto/SupplyLineSimpleDto.java index 6c93e2077..918a0bac6 100644 --- a/src/main/java/org/openlmis/referencedata/dto/SupplyLineSimpleDto.java +++ b/src/main/java/org/openlmis/referencedata/dto/SupplyLineSimpleDto.java @@ -5,30 +5,27 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.dto; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; - +import java.util.UUID; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; import org.openlmis.referencedata.domain.Facility; import org.openlmis.referencedata.domain.Program; import org.openlmis.referencedata.domain.SupervisoryNode; import org.openlmis.referencedata.domain.SupplyLine; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; - -import java.util.UUID; - @NoArgsConstructor public class SupplyLineSimpleDto extends BaseDto implements SupplyLine.Exporter, SupplyLine.Importer { diff --git a/src/main/java/org/openlmis/referencedata/dto/SupportedProgramDto.java b/src/main/java/org/openlmis/referencedata/dto/SupportedProgramDto.java index c5128724c..5ac7b199d 100644 --- a/src/main/java/org/openlmis/referencedata/dto/SupportedProgramDto.java +++ b/src/main/java/org/openlmis/referencedata/dto/SupportedProgramDto.java @@ -5,26 +5,24 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.dto; -import org.openlmis.referencedata.domain.Program; -import org.openlmis.referencedata.domain.SupportedProgram; - +import java.time.LocalDate; +import java.util.Optional; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; - -import java.time.LocalDate; -import java.util.Optional; +import org.openlmis.referencedata.domain.Program; +import org.openlmis.referencedata.domain.SupportedProgram; @Getter @NoArgsConstructor diff --git a/src/main/java/org/openlmis/referencedata/dto/TradeItemClassificationDto.java b/src/main/java/org/openlmis/referencedata/dto/TradeItemClassificationDto.java index 2503c4ca4..590a99d30 100644 --- a/src/main/java/org/openlmis/referencedata/dto/TradeItemClassificationDto.java +++ b/src/main/java/org/openlmis/referencedata/dto/TradeItemClassificationDto.java @@ -5,23 +5,23 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.dto; import com.fasterxml.jackson.annotation.JsonInclude; +import java.util.ArrayList; +import java.util.List; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; import org.openlmis.referencedata.domain.TradeItemClassification; -import java.util.ArrayList; -import java.util.List; @Getter @Setter diff --git a/src/main/java/org/openlmis/referencedata/dto/TradeItemDto.java b/src/main/java/org/openlmis/referencedata/dto/TradeItemDto.java index 0988d0639..3132b2b02 100644 --- a/src/main/java/org/openlmis/referencedata/dto/TradeItemDto.java +++ b/src/main/java/org/openlmis/referencedata/dto/TradeItemDto.java @@ -5,22 +5,22 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.dto; +import java.util.LinkedList; +import java.util.List; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; import org.openlmis.referencedata.domain.TradeItem; -import java.util.LinkedList; -import java.util.List; @Getter @Setter @@ -34,7 +34,7 @@ public class TradeItemDto extends BaseDto implements TradeItem.Importer, TradeIt private String gtin; /** - * Create new list of TradeItemDto based on given list of {@link TradeItem} + * Create new list of TradeItemDto based on given list of {@link TradeItem}. * * @param tradeItems list of {@link TradeItem} * @return new list of TradeItemDto. diff --git a/src/main/java/org/openlmis/referencedata/dto/UploadResultDto.java b/src/main/java/org/openlmis/referencedata/dto/UploadResultDto.java index a540b95d7..67597357c 100644 --- a/src/main/java/org/openlmis/referencedata/dto/UploadResultDto.java +++ b/src/main/java/org/openlmis/referencedata/dto/UploadResultDto.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.dto; diff --git a/src/main/java/org/openlmis/referencedata/dto/UserDto.java b/src/main/java/org/openlmis/referencedata/dto/UserDto.java index a9f077bff..db06b2d8c 100644 --- a/src/main/java/org/openlmis/referencedata/dto/UserDto.java +++ b/src/main/java/org/openlmis/referencedata/dto/UserDto.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.dto; diff --git a/src/main/java/org/openlmis/referencedata/errorhandling/BaseHandler.java b/src/main/java/org/openlmis/referencedata/errorhandling/BaseHandler.java index 6a0de3e9e..27e3ee6a4 100644 --- a/src/main/java/org/openlmis/referencedata/errorhandling/BaseHandler.java +++ b/src/main/java/org/openlmis/referencedata/errorhandling/BaseHandler.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.errorhandling; diff --git a/src/main/java/org/openlmis/referencedata/errorhandling/RefDataErrorHandling.java b/src/main/java/org/openlmis/referencedata/errorhandling/RefDataErrorHandling.java index 2a84bbdc4..c93968cf7 100644 --- a/src/main/java/org/openlmis/referencedata/errorhandling/RefDataErrorHandling.java +++ b/src/main/java/org/openlmis/referencedata/errorhandling/RefDataErrorHandling.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.errorhandling; diff --git a/src/main/java/org/openlmis/referencedata/exception/BaseMessageException.java b/src/main/java/org/openlmis/referencedata/exception/BaseMessageException.java index 00a379e63..0fda46e0b 100644 --- a/src/main/java/org/openlmis/referencedata/exception/BaseMessageException.java +++ b/src/main/java/org/openlmis/referencedata/exception/BaseMessageException.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.exception; diff --git a/src/main/java/org/openlmis/referencedata/exception/ExceptionDetail.java b/src/main/java/org/openlmis/referencedata/exception/ExceptionDetail.java index ce274ffec..9cd89ce72 100644 --- a/src/main/java/org/openlmis/referencedata/exception/ExceptionDetail.java +++ b/src/main/java/org/openlmis/referencedata/exception/ExceptionDetail.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.exception; diff --git a/src/main/java/org/openlmis/referencedata/exception/IntegrityViolationException.java b/src/main/java/org/openlmis/referencedata/exception/IntegrityViolationException.java index 911c375ba..ce4b093e8 100644 --- a/src/main/java/org/openlmis/referencedata/exception/IntegrityViolationException.java +++ b/src/main/java/org/openlmis/referencedata/exception/IntegrityViolationException.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.exception; diff --git a/src/main/java/org/openlmis/referencedata/exception/InternalErrorException.java b/src/main/java/org/openlmis/referencedata/exception/InternalErrorException.java index d84be6812..e6e9eb74a 100644 --- a/src/main/java/org/openlmis/referencedata/exception/InternalErrorException.java +++ b/src/main/java/org/openlmis/referencedata/exception/InternalErrorException.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.exception; diff --git a/src/main/java/org/openlmis/referencedata/exception/NotFoundException.java b/src/main/java/org/openlmis/referencedata/exception/NotFoundException.java index 00c2864a8..31885ec88 100644 --- a/src/main/java/org/openlmis/referencedata/exception/NotFoundException.java +++ b/src/main/java/org/openlmis/referencedata/exception/NotFoundException.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.exception; diff --git a/src/main/java/org/openlmis/referencedata/exception/UnauthorizedException.java b/src/main/java/org/openlmis/referencedata/exception/UnauthorizedException.java index 452bd3315..72a63e3c1 100644 --- a/src/main/java/org/openlmis/referencedata/exception/UnauthorizedException.java +++ b/src/main/java/org/openlmis/referencedata/exception/UnauthorizedException.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.exception; diff --git a/src/main/java/org/openlmis/referencedata/exception/ValidationMessageException.java b/src/main/java/org/openlmis/referencedata/exception/ValidationMessageException.java index d095897a8..b93892dc9 100644 --- a/src/main/java/org/openlmis/referencedata/exception/ValidationMessageException.java +++ b/src/main/java/org/openlmis/referencedata/exception/ValidationMessageException.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.exception; @@ -29,7 +29,7 @@ public class ValidationMessageException extends BaseMessageException { * @param messageKey the messageKey of a {@link Message}. */ public ValidationMessageException(String messageKey) { - super( messageKey ); + super(messageKey); } /** diff --git a/src/main/java/org/openlmis/referencedata/i18n/ExposedMessageSource.java b/src/main/java/org/openlmis/referencedata/i18n/ExposedMessageSource.java index 1010124a8..9e0e29bb2 100644 --- a/src/main/java/org/openlmis/referencedata/i18n/ExposedMessageSource.java +++ b/src/main/java/org/openlmis/referencedata/i18n/ExposedMessageSource.java @@ -5,20 +5,19 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.i18n; -import org.springframework.context.MessageSource; - import java.util.Locale; import java.util.Map; +import org.springframework.context.MessageSource; public interface ExposedMessageSource extends MessageSource { diff --git a/src/main/java/org/openlmis/referencedata/i18n/ExposedMessageSourceImpl.java b/src/main/java/org/openlmis/referencedata/i18n/ExposedMessageSourceImpl.java index 69a69564e..c790df3d4 100644 --- a/src/main/java/org/openlmis/referencedata/i18n/ExposedMessageSourceImpl.java +++ b/src/main/java/org/openlmis/referencedata/i18n/ExposedMessageSourceImpl.java @@ -5,24 +5,23 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.i18n; -import org.springframework.context.support.ReloadableResourceBundleMessageSource; -import org.springframework.stereotype.Component; - import java.util.Enumeration; import java.util.HashMap; import java.util.Locale; import java.util.Map; import java.util.Properties; +import org.springframework.context.support.ReloadableResourceBundleMessageSource; +import org.springframework.stereotype.Component; @Component public class ExposedMessageSourceImpl extends ReloadableResourceBundleMessageSource implements diff --git a/src/main/java/org/openlmis/referencedata/i18n/MessageService.java b/src/main/java/org/openlmis/referencedata/i18n/MessageService.java index 1c9013dd4..ea38adb40 100644 --- a/src/main/java/org/openlmis/referencedata/i18n/MessageService.java +++ b/src/main/java/org/openlmis/referencedata/i18n/MessageService.java @@ -5,18 +5,18 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.i18n; -import org.openlmis.referencedata.util.Message; import org.openlmis.referencedata.util.LocalizedMessage; +import org.openlmis.referencedata.util.Message; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.i18n.LocaleContextHolder; import org.springframework.stereotype.Service; diff --git a/src/main/java/org/openlmis/referencedata/repository/CommodityTypeRepository.java b/src/main/java/org/openlmis/referencedata/repository/CommodityTypeRepository.java index 761017a5f..9e99a73fb 100644 --- a/src/main/java/org/openlmis/referencedata/repository/CommodityTypeRepository.java +++ b/src/main/java/org/openlmis/referencedata/repository/CommodityTypeRepository.java @@ -5,23 +5,22 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.repository; +import java.util.Optional; +import java.util.UUID; import org.javers.spring.annotation.JaversSpringDataAuditable; import org.openlmis.referencedata.domain.CommodityType; import org.springframework.data.repository.PagingAndSortingRepository; -import java.util.Optional; -import java.util.UUID; - @JaversSpringDataAuditable public interface CommodityTypeRepository extends PagingAndSortingRepository { diff --git a/src/main/java/org/openlmis/referencedata/repository/CountResource.java b/src/main/java/org/openlmis/referencedata/repository/CountResource.java index 9057aebe2..08a687f7c 100644 --- a/src/main/java/org/openlmis/referencedata/repository/CountResource.java +++ b/src/main/java/org/openlmis/referencedata/repository/CountResource.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.repository; diff --git a/src/main/java/org/openlmis/referencedata/repository/FacilityOperatorRepository.java b/src/main/java/org/openlmis/referencedata/repository/FacilityOperatorRepository.java index ef20c28f6..897cec2db 100644 --- a/src/main/java/org/openlmis/referencedata/repository/FacilityOperatorRepository.java +++ b/src/main/java/org/openlmis/referencedata/repository/FacilityOperatorRepository.java @@ -5,22 +5,21 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.repository; +import java.util.UUID; import org.javers.spring.annotation.JaversSpringDataAuditable; import org.openlmis.referencedata.domain.FacilityOperator; import org.springframework.data.repository.PagingAndSortingRepository; -import java.util.UUID; - @JaversSpringDataAuditable public interface FacilityOperatorRepository extends PagingAndSortingRepository { diff --git a/src/main/java/org/openlmis/referencedata/repository/FacilityRepository.java b/src/main/java/org/openlmis/referencedata/repository/FacilityRepository.java index fbc8a7d14..3807931cc 100644 --- a/src/main/java/org/openlmis/referencedata/repository/FacilityRepository.java +++ b/src/main/java/org/openlmis/referencedata/repository/FacilityRepository.java @@ -5,18 +5,21 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.repository; import com.vividsolutions.jts.geom.Polygon; - +import java.util.List; +import java.util.Optional; +import java.util.Set; +import java.util.UUID; import org.javers.spring.annotation.JaversSpringDataAuditable; import org.openlmis.referencedata.domain.Facility; import org.openlmis.referencedata.dto.NamedResource; @@ -27,11 +30,6 @@ import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; -import java.util.List; -import java.util.Optional; -import java.util.Set; -import java.util.UUID; - @JaversSpringDataAuditable public interface FacilityRepository extends JpaRepository, FacilityRepositoryCustom { diff --git a/src/main/java/org/openlmis/referencedata/repository/FacilityTypeApprovedProductRepository.java b/src/main/java/org/openlmis/referencedata/repository/FacilityTypeApprovedProductRepository.java index 7546c3b54..5107c0d47 100644 --- a/src/main/java/org/openlmis/referencedata/repository/FacilityTypeApprovedProductRepository.java +++ b/src/main/java/org/openlmis/referencedata/repository/FacilityTypeApprovedProductRepository.java @@ -5,23 +5,22 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.repository; +import java.util.UUID; import org.javers.spring.annotation.JaversSpringDataAuditable; import org.openlmis.referencedata.domain.FacilityTypeApprovedProduct; import org.openlmis.referencedata.repository.custom.FacilityTypeApprovedProductRepositoryCustom; import org.springframework.data.repository.PagingAndSortingRepository; -import java.util.UUID; - @JaversSpringDataAuditable public interface FacilityTypeApprovedProductRepository extends PagingAndSortingRepository, diff --git a/src/main/java/org/openlmis/referencedata/repository/FacilityTypeRepository.java b/src/main/java/org/openlmis/referencedata/repository/FacilityTypeRepository.java index 9e8c71a2c..806b615be 100644 --- a/src/main/java/org/openlmis/referencedata/repository/FacilityTypeRepository.java +++ b/src/main/java/org/openlmis/referencedata/repository/FacilityTypeRepository.java @@ -5,24 +5,24 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.repository; +import java.util.Collection; +import java.util.UUID; import org.javers.spring.annotation.JaversSpringDataAuditable; import org.openlmis.referencedata.domain.FacilityType; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.repository.query.Param; -import java.util.Collection; -import java.util.UUID; @JaversSpringDataAuditable public interface FacilityTypeRepository extends JpaRepository { diff --git a/src/main/java/org/openlmis/referencedata/repository/GeographicLevelRepository.java b/src/main/java/org/openlmis/referencedata/repository/GeographicLevelRepository.java index 3da2c4d48..af5f8365b 100644 --- a/src/main/java/org/openlmis/referencedata/repository/GeographicLevelRepository.java +++ b/src/main/java/org/openlmis/referencedata/repository/GeographicLevelRepository.java @@ -5,22 +5,21 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.repository; +import java.util.UUID; import org.javers.spring.annotation.JaversSpringDataAuditable; import org.openlmis.referencedata.domain.GeographicLevel; import org.springframework.data.repository.PagingAndSortingRepository; -import java.util.UUID; - @JaversSpringDataAuditable public interface GeographicLevelRepository extends PagingAndSortingRepository { diff --git a/src/main/java/org/openlmis/referencedata/repository/GeographicZoneRepository.java b/src/main/java/org/openlmis/referencedata/repository/GeographicZoneRepository.java index 4b8b7e3f6..875042fd9 100644 --- a/src/main/java/org/openlmis/referencedata/repository/GeographicZoneRepository.java +++ b/src/main/java/org/openlmis/referencedata/repository/GeographicZoneRepository.java @@ -5,18 +5,20 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.repository; import com.vividsolutions.jts.geom.Point; - +import java.util.List; +import java.util.Set; +import java.util.UUID; import org.javers.spring.annotation.JaversSpringDataAuditable; import org.openlmis.referencedata.domain.GeographicLevel; import org.openlmis.referencedata.domain.GeographicZone; @@ -25,10 +27,6 @@ import org.springframework.data.repository.PagingAndSortingRepository; import org.springframework.data.repository.query.Param; -import java.util.List; -import java.util.Set; -import java.util.UUID; - @JaversSpringDataAuditable public interface GeographicZoneRepository extends PagingAndSortingRepository, GeographicZoneRepositoryCustom { diff --git a/src/main/java/org/openlmis/referencedata/repository/IdealStockAmountRepository.java b/src/main/java/org/openlmis/referencedata/repository/IdealStockAmountRepository.java index e0b532b15..e933c4fa0 100644 --- a/src/main/java/org/openlmis/referencedata/repository/IdealStockAmountRepository.java +++ b/src/main/java/org/openlmis/referencedata/repository/IdealStockAmountRepository.java @@ -5,22 +5,21 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.repository; +import java.util.UUID; import org.openlmis.referencedata.domain.IdealStockAmount; import org.openlmis.referencedata.repository.custom.IdealStockAmountRepositoryCustom; import org.springframework.data.repository.PagingAndSortingRepository; -import java.util.UUID; - public interface IdealStockAmountRepository extends PagingAndSortingRepository, IdealStockAmountRepositoryCustom { } diff --git a/src/main/java/org/openlmis/referencedata/repository/LotRepository.java b/src/main/java/org/openlmis/referencedata/repository/LotRepository.java index c8705da83..c92dadc46 100644 --- a/src/main/java/org/openlmis/referencedata/repository/LotRepository.java +++ b/src/main/java/org/openlmis/referencedata/repository/LotRepository.java @@ -5,21 +5,21 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.repository; +import java.util.UUID; import org.javers.spring.annotation.JaversSpringDataAuditable; import org.openlmis.referencedata.domain.Lot; import org.openlmis.referencedata.repository.custom.LotRepositoryCustom; import org.springframework.data.repository.PagingAndSortingRepository; -import java.util.UUID; @JaversSpringDataAuditable public interface LotRepository diff --git a/src/main/java/org/openlmis/referencedata/repository/OrderableDisplayCategoryRepository.java b/src/main/java/org/openlmis/referencedata/repository/OrderableDisplayCategoryRepository.java index 5992a7362..674d54e4a 100644 --- a/src/main/java/org/openlmis/referencedata/repository/OrderableDisplayCategoryRepository.java +++ b/src/main/java/org/openlmis/referencedata/repository/OrderableDisplayCategoryRepository.java @@ -5,23 +5,22 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.repository; +import java.util.UUID; import org.javers.spring.annotation.JaversSpringDataAuditable; import org.openlmis.referencedata.domain.Code; import org.openlmis.referencedata.domain.OrderableDisplayCategory; import org.springframework.data.repository.PagingAndSortingRepository; -import java.util.UUID; - @JaversSpringDataAuditable public interface OrderableDisplayCategoryRepository extends PagingAndSortingRepository { diff --git a/src/main/java/org/openlmis/referencedata/repository/OrderableRepository.java b/src/main/java/org/openlmis/referencedata/repository/OrderableRepository.java index b7dddfe18..13c2455b8 100644 --- a/src/main/java/org/openlmis/referencedata/repository/OrderableRepository.java +++ b/src/main/java/org/openlmis/referencedata/repository/OrderableRepository.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.repository; diff --git a/src/main/java/org/openlmis/referencedata/repository/ProcessingPeriodRepository.java b/src/main/java/org/openlmis/referencedata/repository/ProcessingPeriodRepository.java index 77c72a0ed..d038f84e7 100644 --- a/src/main/java/org/openlmis/referencedata/repository/ProcessingPeriodRepository.java +++ b/src/main/java/org/openlmis/referencedata/repository/ProcessingPeriodRepository.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.repository; diff --git a/src/main/java/org/openlmis/referencedata/repository/ProcessingScheduleRepository.java b/src/main/java/org/openlmis/referencedata/repository/ProcessingScheduleRepository.java index 056f2e61c..a9b2d51b1 100644 --- a/src/main/java/org/openlmis/referencedata/repository/ProcessingScheduleRepository.java +++ b/src/main/java/org/openlmis/referencedata/repository/ProcessingScheduleRepository.java @@ -5,24 +5,23 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.repository; +import java.util.Optional; +import java.util.UUID; import org.javers.spring.annotation.JaversSpringDataAuditable; import org.openlmis.referencedata.domain.Code; import org.openlmis.referencedata.domain.ProcessingSchedule; import org.springframework.data.jpa.repository.JpaRepository; -import java.util.Optional; -import java.util.UUID; - @JaversSpringDataAuditable public interface ProcessingScheduleRepository extends JpaRepository { diff --git a/src/main/java/org/openlmis/referencedata/repository/ProgramRepository.java b/src/main/java/org/openlmis/referencedata/repository/ProgramRepository.java index d3e73c9ea..cd9343b83 100644 --- a/src/main/java/org/openlmis/referencedata/repository/ProgramRepository.java +++ b/src/main/java/org/openlmis/referencedata/repository/ProgramRepository.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.repository; diff --git a/src/main/java/org/openlmis/referencedata/repository/RequisitionGroupProgramScheduleRepository.java b/src/main/java/org/openlmis/referencedata/repository/RequisitionGroupProgramScheduleRepository.java index 1b47f653c..ae80ffea9 100644 --- a/src/main/java/org/openlmis/referencedata/repository/RequisitionGroupProgramScheduleRepository.java +++ b/src/main/java/org/openlmis/referencedata/repository/RequisitionGroupProgramScheduleRepository.java @@ -5,23 +5,22 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.repository; +import java.util.UUID; import org.javers.spring.annotation.JaversSpringDataAuditable; import org.openlmis.referencedata.domain.RequisitionGroupProgramSchedule; import org.openlmis.referencedata.repository.custom.RequisitionGroupProgramScheduleRepositoryCustom; import org.springframework.data.repository.PagingAndSortingRepository; -import java.util.UUID; - @JaversSpringDataAuditable public interface RequisitionGroupProgramScheduleRepository extends PagingAndSortingRepository, diff --git a/src/main/java/org/openlmis/referencedata/repository/RequisitionGroupRepository.java b/src/main/java/org/openlmis/referencedata/repository/RequisitionGroupRepository.java index dc1a15614..7414dd8c2 100644 --- a/src/main/java/org/openlmis/referencedata/repository/RequisitionGroupRepository.java +++ b/src/main/java/org/openlmis/referencedata/repository/RequisitionGroupRepository.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.repository; diff --git a/src/main/java/org/openlmis/referencedata/repository/RightAssignmentRepository.java b/src/main/java/org/openlmis/referencedata/repository/RightAssignmentRepository.java index 1e753c690..1777fc766 100644 --- a/src/main/java/org/openlmis/referencedata/repository/RightAssignmentRepository.java +++ b/src/main/java/org/openlmis/referencedata/repository/RightAssignmentRepository.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.repository; diff --git a/src/main/java/org/openlmis/referencedata/repository/RightRepository.java b/src/main/java/org/openlmis/referencedata/repository/RightRepository.java index 2d86f9237..81ffce144 100644 --- a/src/main/java/org/openlmis/referencedata/repository/RightRepository.java +++ b/src/main/java/org/openlmis/referencedata/repository/RightRepository.java @@ -5,23 +5,22 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.repository; +import java.util.UUID; import org.javers.spring.annotation.JaversSpringDataAuditable; import org.openlmis.referencedata.domain.Right; import org.openlmis.referencedata.repository.custom.RightRepositoryCustom; import org.springframework.data.repository.PagingAndSortingRepository; -import java.util.UUID; - @JaversSpringDataAuditable public interface RightRepository extends PagingAndSortingRepository, RightRepositoryCustom { diff --git a/src/main/java/org/openlmis/referencedata/repository/RoleAssignmentRepository.java b/src/main/java/org/openlmis/referencedata/repository/RoleAssignmentRepository.java index 826e080d9..a34d5872b 100644 --- a/src/main/java/org/openlmis/referencedata/repository/RoleAssignmentRepository.java +++ b/src/main/java/org/openlmis/referencedata/repository/RoleAssignmentRepository.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.repository; diff --git a/src/main/java/org/openlmis/referencedata/repository/RoleRepository.java b/src/main/java/org/openlmis/referencedata/repository/RoleRepository.java index fb926a50f..99feceba2 100644 --- a/src/main/java/org/openlmis/referencedata/repository/RoleRepository.java +++ b/src/main/java/org/openlmis/referencedata/repository/RoleRepository.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.repository; diff --git a/src/main/java/org/openlmis/referencedata/repository/ServiceAccountRepository.java b/src/main/java/org/openlmis/referencedata/repository/ServiceAccountRepository.java index b929aaf76..486794085 100644 --- a/src/main/java/org/openlmis/referencedata/repository/ServiceAccountRepository.java +++ b/src/main/java/org/openlmis/referencedata/repository/ServiceAccountRepository.java @@ -5,22 +5,21 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.repository; +import java.util.UUID; import org.javers.spring.annotation.JaversSpringDataAuditable; import org.openlmis.referencedata.domain.ServiceAccount; import org.springframework.data.jpa.repository.JpaRepository; -import java.util.UUID; - @JaversSpringDataAuditable public interface ServiceAccountRepository extends JpaRepository { } diff --git a/src/main/java/org/openlmis/referencedata/repository/StockAdjustmentReasonRepository.java b/src/main/java/org/openlmis/referencedata/repository/StockAdjustmentReasonRepository.java index bb40f4f33..87b3f0756 100644 --- a/src/main/java/org/openlmis/referencedata/repository/StockAdjustmentReasonRepository.java +++ b/src/main/java/org/openlmis/referencedata/repository/StockAdjustmentReasonRepository.java @@ -5,25 +5,24 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.repository; +import java.util.List; +import java.util.UUID; import org.javers.spring.annotation.JaversSpringDataAuditable; import org.openlmis.referencedata.domain.StockAdjustmentReason; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.PagingAndSortingRepository; import org.springframework.data.repository.query.Param; -import java.util.List; -import java.util.UUID; - @JaversSpringDataAuditable public interface StockAdjustmentReasonRepository extends PagingAndSortingRepository { diff --git a/src/main/java/org/openlmis/referencedata/repository/SupervisoryNodeRepository.java b/src/main/java/org/openlmis/referencedata/repository/SupervisoryNodeRepository.java index 4e767a13f..1297afcf2 100644 --- a/src/main/java/org/openlmis/referencedata/repository/SupervisoryNodeRepository.java +++ b/src/main/java/org/openlmis/referencedata/repository/SupervisoryNodeRepository.java @@ -5,23 +5,22 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.repository; +import java.util.UUID; import org.javers.spring.annotation.JaversSpringDataAuditable; import org.openlmis.referencedata.domain.SupervisoryNode; import org.openlmis.referencedata.repository.custom.SupervisoryNodeRepositoryCustom; import org.springframework.data.jpa.repository.JpaRepository; -import java.util.UUID; - @JaversSpringDataAuditable public interface SupervisoryNodeRepository extends JpaRepository, SupervisoryNodeRepositoryCustom { diff --git a/src/main/java/org/openlmis/referencedata/repository/SupplyLineRepository.java b/src/main/java/org/openlmis/referencedata/repository/SupplyLineRepository.java index adb1a48de..19e270ae8 100644 --- a/src/main/java/org/openlmis/referencedata/repository/SupplyLineRepository.java +++ b/src/main/java/org/openlmis/referencedata/repository/SupplyLineRepository.java @@ -5,16 +5,18 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.repository; +import java.util.List; +import java.util.UUID; import org.javers.spring.annotation.JaversSpringDataAuditable; import org.openlmis.referencedata.domain.Facility; import org.openlmis.referencedata.domain.SupplyLine; @@ -23,9 +25,6 @@ import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; -import java.util.List; -import java.util.UUID; - @JaversSpringDataAuditable public interface SupplyLineRepository extends JpaRepository, SupplyLineRepositoryCustom { diff --git a/src/main/java/org/openlmis/referencedata/repository/TradeItemRepository.java b/src/main/java/org/openlmis/referencedata/repository/TradeItemRepository.java index 97e353028..6cf928839 100644 --- a/src/main/java/org/openlmis/referencedata/repository/TradeItemRepository.java +++ b/src/main/java/org/openlmis/referencedata/repository/TradeItemRepository.java @@ -5,23 +5,22 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.repository; +import java.util.UUID; import org.javers.spring.annotation.JaversSpringDataAuditable; import org.openlmis.referencedata.domain.TradeItem; import org.openlmis.referencedata.repository.custom.TradeItemRepositoryCustom; import org.springframework.data.jpa.repository.JpaRepository; -import java.util.UUID; - @JaversSpringDataAuditable public interface TradeItemRepository extends JpaRepository, TradeItemRepositoryCustom { diff --git a/src/main/java/org/openlmis/referencedata/repository/UserRepository.java b/src/main/java/org/openlmis/referencedata/repository/UserRepository.java index 60ce59b89..388b993a9 100644 --- a/src/main/java/org/openlmis/referencedata/repository/UserRepository.java +++ b/src/main/java/org/openlmis/referencedata/repository/UserRepository.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.repository; diff --git a/src/main/java/org/openlmis/referencedata/repository/UserSearchParams.java b/src/main/java/org/openlmis/referencedata/repository/UserSearchParams.java index 2e3a39dd3..1b5180c96 100644 --- a/src/main/java/org/openlmis/referencedata/repository/UserSearchParams.java +++ b/src/main/java/org/openlmis/referencedata/repository/UserSearchParams.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.repository; diff --git a/src/main/java/org/openlmis/referencedata/repository/custom/FacilityRepositoryCustom.java b/src/main/java/org/openlmis/referencedata/repository/custom/FacilityRepositoryCustom.java index 21e2625e1..8b2b84389 100644 --- a/src/main/java/org/openlmis/referencedata/repository/custom/FacilityRepositoryCustom.java +++ b/src/main/java/org/openlmis/referencedata/repository/custom/FacilityRepositoryCustom.java @@ -5,21 +5,20 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.repository.custom; -import org.openlmis.referencedata.domain.Facility; - import java.util.List; import java.util.Set; import java.util.UUID; +import org.openlmis.referencedata.domain.Facility; public interface FacilityRepositoryCustom { diff --git a/src/main/java/org/openlmis/referencedata/repository/custom/FacilityTypeApprovedProductRepositoryCustom.java b/src/main/java/org/openlmis/referencedata/repository/custom/FacilityTypeApprovedProductRepositoryCustom.java index ba24aa789..f59481a5f 100644 --- a/src/main/java/org/openlmis/referencedata/repository/custom/FacilityTypeApprovedProductRepositoryCustom.java +++ b/src/main/java/org/openlmis/referencedata/repository/custom/FacilityTypeApprovedProductRepositoryCustom.java @@ -5,21 +5,21 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.repository.custom; +import java.util.List; +import java.util.UUID; import org.openlmis.referencedata.domain.FacilityTypeApprovedProduct; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; -import java.util.List; -import java.util.UUID; public interface FacilityTypeApprovedProductRepositoryCustom { diff --git a/src/main/java/org/openlmis/referencedata/repository/custom/GeographicZoneRepositoryCustom.java b/src/main/java/org/openlmis/referencedata/repository/custom/GeographicZoneRepositoryCustom.java index fcaa2f11a..7886f0a24 100644 --- a/src/main/java/org/openlmis/referencedata/repository/custom/GeographicZoneRepositoryCustom.java +++ b/src/main/java/org/openlmis/referencedata/repository/custom/GeographicZoneRepositoryCustom.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.repository.custom; diff --git a/src/main/java/org/openlmis/referencedata/repository/custom/IdealStockAmountRepositoryCustom.java b/src/main/java/org/openlmis/referencedata/repository/custom/IdealStockAmountRepositoryCustom.java index db5bbc7e4..e60283fe8 100644 --- a/src/main/java/org/openlmis/referencedata/repository/custom/IdealStockAmountRepositoryCustom.java +++ b/src/main/java/org/openlmis/referencedata/repository/custom/IdealStockAmountRepositoryCustom.java @@ -5,23 +5,22 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.repository.custom; +import java.util.List; +import java.util.UUID; import org.openlmis.referencedata.domain.IdealStockAmount; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; -import java.util.List; -import java.util.UUID; - public interface IdealStockAmountRepositoryCustom { List search(List idealStockAmounts); diff --git a/src/main/java/org/openlmis/referencedata/repository/custom/LotRepositoryCustom.java b/src/main/java/org/openlmis/referencedata/repository/custom/LotRepositoryCustom.java index 51d1fde85..e8f623b17 100644 --- a/src/main/java/org/openlmis/referencedata/repository/custom/LotRepositoryCustom.java +++ b/src/main/java/org/openlmis/referencedata/repository/custom/LotRepositoryCustom.java @@ -5,24 +5,24 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.repository.custom; -import org.openlmis.referencedata.domain.Lot; -import org.openlmis.referencedata.domain.TradeItem; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; import java.time.LocalDate; import java.util.Collection; import java.util.List; import java.util.UUID; +import org.openlmis.referencedata.domain.Lot; +import org.openlmis.referencedata.domain.TradeItem; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; public interface LotRepositoryCustom { diff --git a/src/main/java/org/openlmis/referencedata/repository/custom/OrderableRepositoryCustom.java b/src/main/java/org/openlmis/referencedata/repository/custom/OrderableRepositoryCustom.java index 403573e96..c9487d853 100644 --- a/src/main/java/org/openlmis/referencedata/repository/custom/OrderableRepositoryCustom.java +++ b/src/main/java/org/openlmis/referencedata/repository/custom/OrderableRepositoryCustom.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.repository.custom; diff --git a/src/main/java/org/openlmis/referencedata/repository/custom/ProcessingPeriodRepositoryCustom.java b/src/main/java/org/openlmis/referencedata/repository/custom/ProcessingPeriodRepositoryCustom.java index bb02ea80d..e0eb25f4f 100644 --- a/src/main/java/org/openlmis/referencedata/repository/custom/ProcessingPeriodRepositoryCustom.java +++ b/src/main/java/org/openlmis/referencedata/repository/custom/ProcessingPeriodRepositoryCustom.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.repository.custom; diff --git a/src/main/java/org/openlmis/referencedata/repository/custom/ProgramRepositoryCustom.java b/src/main/java/org/openlmis/referencedata/repository/custom/ProgramRepositoryCustom.java index b0911d123..7a9369e11 100644 --- a/src/main/java/org/openlmis/referencedata/repository/custom/ProgramRepositoryCustom.java +++ b/src/main/java/org/openlmis/referencedata/repository/custom/ProgramRepositoryCustom.java @@ -5,19 +5,18 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.repository.custom; -import org.openlmis.referencedata.domain.Program; - import java.util.List; +import org.openlmis.referencedata.domain.Program; public interface ProgramRepositoryCustom { List findProgramsByName(String name); diff --git a/src/main/java/org/openlmis/referencedata/repository/custom/RequisitionGroupProgramScheduleRepositoryCustom.java b/src/main/java/org/openlmis/referencedata/repository/custom/RequisitionGroupProgramScheduleRepositoryCustom.java index 1f365aa79..c52bf9ec0 100644 --- a/src/main/java/org/openlmis/referencedata/repository/custom/RequisitionGroupProgramScheduleRepositoryCustom.java +++ b/src/main/java/org/openlmis/referencedata/repository/custom/RequisitionGroupProgramScheduleRepositoryCustom.java @@ -5,23 +5,21 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.repository.custom; - +import java.util.List; import org.openlmis.referencedata.domain.Facility; import org.openlmis.referencedata.domain.Program; import org.openlmis.referencedata.domain.RequisitionGroupProgramSchedule; -import java.util.List; - public interface RequisitionGroupProgramScheduleRepositoryCustom { List searchRequisitionGroupProgramSchedules(Program program, diff --git a/src/main/java/org/openlmis/referencedata/repository/custom/RequisitionGroupRepositoryCustom.java b/src/main/java/org/openlmis/referencedata/repository/custom/RequisitionGroupRepositoryCustom.java index 2ef87c924..a7866ae20 100644 --- a/src/main/java/org/openlmis/referencedata/repository/custom/RequisitionGroupRepositoryCustom.java +++ b/src/main/java/org/openlmis/referencedata/repository/custom/RequisitionGroupRepositoryCustom.java @@ -5,24 +5,23 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.repository.custom; +import java.util.List; import org.openlmis.referencedata.domain.Program; import org.openlmis.referencedata.domain.RequisitionGroup; import org.openlmis.referencedata.domain.SupervisoryNode; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; -import java.util.List; - public interface RequisitionGroupRepositoryCustom { Page search(String code, String name, Program program, List supervisoryNode, Pageable pageable); diff --git a/src/main/java/org/openlmis/referencedata/repository/custom/RightRepositoryCustom.java b/src/main/java/org/openlmis/referencedata/repository/custom/RightRepositoryCustom.java index d1f8569a8..d0f7689b9 100644 --- a/src/main/java/org/openlmis/referencedata/repository/custom/RightRepositoryCustom.java +++ b/src/main/java/org/openlmis/referencedata/repository/custom/RightRepositoryCustom.java @@ -5,21 +5,20 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.repository.custom; +import java.util.Set; import org.openlmis.referencedata.domain.Right; import org.openlmis.referencedata.domain.RightType; -import java.util.Set; - public interface RightRepositoryCustom { Set searchRights(String name, RightType type); diff --git a/src/main/java/org/openlmis/referencedata/repository/custom/SupervisoryNodeRepositoryCustom.java b/src/main/java/org/openlmis/referencedata/repository/custom/SupervisoryNodeRepositoryCustom.java index 0d38b9dda..21af4e4dd 100644 --- a/src/main/java/org/openlmis/referencedata/repository/custom/SupervisoryNodeRepositoryCustom.java +++ b/src/main/java/org/openlmis/referencedata/repository/custom/SupervisoryNodeRepositoryCustom.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.repository.custom; diff --git a/src/main/java/org/openlmis/referencedata/repository/custom/SupplyLineRepositoryCustom.java b/src/main/java/org/openlmis/referencedata/repository/custom/SupplyLineRepositoryCustom.java index de8c6253a..9c0596010 100644 --- a/src/main/java/org/openlmis/referencedata/repository/custom/SupplyLineRepositoryCustom.java +++ b/src/main/java/org/openlmis/referencedata/repository/custom/SupplyLineRepositoryCustom.java @@ -5,16 +5,17 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.repository.custom; +import java.util.List; import org.openlmis.referencedata.domain.Facility; import org.openlmis.referencedata.domain.Program; import org.openlmis.referencedata.domain.SupervisoryNode; @@ -22,8 +23,6 @@ import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; -import java.util.List; - public interface SupplyLineRepositoryCustom { List searchSupplyLines(Program program, SupervisoryNode supervisoryNode, diff --git a/src/main/java/org/openlmis/referencedata/repository/custom/TradeItemRepositoryCustom.java b/src/main/java/org/openlmis/referencedata/repository/custom/TradeItemRepositoryCustom.java index 85677bca2..5253a9893 100644 --- a/src/main/java/org/openlmis/referencedata/repository/custom/TradeItemRepositoryCustom.java +++ b/src/main/java/org/openlmis/referencedata/repository/custom/TradeItemRepositoryCustom.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.repository.custom; diff --git a/src/main/java/org/openlmis/referencedata/repository/custom/UserRepositoryCustom.java b/src/main/java/org/openlmis/referencedata/repository/custom/UserRepositoryCustom.java index 4aa21f3e6..e13bfc93b 100644 --- a/src/main/java/org/openlmis/referencedata/repository/custom/UserRepositoryCustom.java +++ b/src/main/java/org/openlmis/referencedata/repository/custom/UserRepositoryCustom.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.repository.custom; diff --git a/src/main/java/org/openlmis/referencedata/repository/custom/impl/FacilityRepositoryImpl.java b/src/main/java/org/openlmis/referencedata/repository/custom/impl/FacilityRepositoryImpl.java index 55586d602..6fc233704 100644 --- a/src/main/java/org/openlmis/referencedata/repository/custom/impl/FacilityRepositoryImpl.java +++ b/src/main/java/org/openlmis/referencedata/repository/custom/impl/FacilityRepositoryImpl.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.repository.custom.impl; diff --git a/src/main/java/org/openlmis/referencedata/repository/custom/impl/FacilityTypeApprovedProductRepositoryImpl.java b/src/main/java/org/openlmis/referencedata/repository/custom/impl/FacilityTypeApprovedProductRepositoryImpl.java index 58e895ef1..483273aac 100644 --- a/src/main/java/org/openlmis/referencedata/repository/custom/impl/FacilityTypeApprovedProductRepositoryImpl.java +++ b/src/main/java/org/openlmis/referencedata/repository/custom/impl/FacilityTypeApprovedProductRepositoryImpl.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.repository.custom.impl; diff --git a/src/main/java/org/openlmis/referencedata/repository/custom/impl/GeographicZoneRepositoryImpl.java b/src/main/java/org/openlmis/referencedata/repository/custom/impl/GeographicZoneRepositoryImpl.java index ce04d087b..5f06889ce 100644 --- a/src/main/java/org/openlmis/referencedata/repository/custom/impl/GeographicZoneRepositoryImpl.java +++ b/src/main/java/org/openlmis/referencedata/repository/custom/impl/GeographicZoneRepositoryImpl.java @@ -5,16 +5,27 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.repository.custom.impl; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Iterator; +import java.util.List; +import javax.persistence.EntityManager; +import javax.persistence.PersistenceContext; +import javax.persistence.criteria.CriteriaBuilder; +import javax.persistence.criteria.CriteriaQuery; +import javax.persistence.criteria.Order; +import javax.persistence.criteria.Predicate; +import javax.persistence.criteria.Root; import org.apache.commons.lang3.StringUtils; import org.openlmis.referencedata.domain.GeographicLevel; import org.openlmis.referencedata.domain.GeographicZone; @@ -24,18 +35,6 @@ import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Sort; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Order; -import javax.persistence.criteria.Predicate; -import javax.persistence.criteria.Root; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Iterator; -import java.util.List; - public class GeographicZoneRepositoryImpl implements GeographicZoneRepositoryCustom { private static final String CODE = "code"; diff --git a/src/main/java/org/openlmis/referencedata/repository/custom/impl/IdealStockAmountRepositoryImpl.java b/src/main/java/org/openlmis/referencedata/repository/custom/impl/IdealStockAmountRepositoryImpl.java index 625890e4f..581b9947f 100644 --- a/src/main/java/org/openlmis/referencedata/repository/custom/impl/IdealStockAmountRepositoryImpl.java +++ b/src/main/java/org/openlmis/referencedata/repository/custom/impl/IdealStockAmountRepositoryImpl.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.repository.custom.impl; @@ -20,7 +20,14 @@ import com.google.common.base.Joiner; import com.google.common.collect.Lists; import com.google.common.collect.Maps; - +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.UUID; +import java.util.stream.Collectors; +import javax.persistence.EntityManager; +import javax.persistence.PersistenceContext; +import javax.persistence.Query; import org.apache.commons.lang3.tuple.Pair; import org.hibernate.SQLQuery; import org.hibernate.type.IntegerType; @@ -35,16 +42,6 @@ import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.UUID; -import java.util.stream.Collectors; - -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; -import javax.persistence.Query; - public class IdealStockAmountRepositoryImpl implements IdealStockAmountRepositoryCustom { private static final String ID_SEARCH_SQL = "SELECT" diff --git a/src/main/java/org/openlmis/referencedata/repository/custom/impl/LotRepositoryImpl.java b/src/main/java/org/openlmis/referencedata/repository/custom/impl/LotRepositoryImpl.java index e913db62e..20183df4c 100644 --- a/src/main/java/org/openlmis/referencedata/repository/custom/impl/LotRepositoryImpl.java +++ b/src/main/java/org/openlmis/referencedata/repository/custom/impl/LotRepositoryImpl.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.repository.custom.impl; diff --git a/src/main/java/org/openlmis/referencedata/repository/custom/impl/OrderableRepositoryImpl.java b/src/main/java/org/openlmis/referencedata/repository/custom/impl/OrderableRepositoryImpl.java index 9034f0bbc..d866b47a3 100644 --- a/src/main/java/org/openlmis/referencedata/repository/custom/impl/OrderableRepositoryImpl.java +++ b/src/main/java/org/openlmis/referencedata/repository/custom/impl/OrderableRepositoryImpl.java @@ -5,25 +5,16 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.repository.custom.impl; -import org.apache.commons.lang3.tuple.Pair; -import org.openlmis.referencedata.domain.Code; -import org.openlmis.referencedata.domain.Orderable; -import org.openlmis.referencedata.domain.ProgramOrderable; -import org.openlmis.referencedata.repository.custom.OrderableRepositoryCustom; -import org.openlmis.referencedata.util.Pagination; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; - import java.util.List; import javax.persistence.EntityManager; import javax.persistence.PersistenceContext; @@ -33,6 +24,14 @@ import javax.persistence.criteria.JoinType; import javax.persistence.criteria.Predicate; import javax.persistence.criteria.Root; +import org.apache.commons.lang3.tuple.Pair; +import org.openlmis.referencedata.domain.Code; +import org.openlmis.referencedata.domain.Orderable; +import org.openlmis.referencedata.domain.ProgramOrderable; +import org.openlmis.referencedata.repository.custom.OrderableRepositoryCustom; +import org.openlmis.referencedata.util.Pagination; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; public class OrderableRepositoryImpl implements OrderableRepositoryCustom { diff --git a/src/main/java/org/openlmis/referencedata/repository/custom/impl/PageableUtil.java b/src/main/java/org/openlmis/referencedata/repository/custom/impl/PageableUtil.java index 38baac605..5be2dc779 100644 --- a/src/main/java/org/openlmis/referencedata/repository/custom/impl/PageableUtil.java +++ b/src/main/java/org/openlmis/referencedata/repository/custom/impl/PageableUtil.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.repository.custom.impl; diff --git a/src/main/java/org/openlmis/referencedata/repository/custom/impl/ProcessingPeriodRepositoryImpl.java b/src/main/java/org/openlmis/referencedata/repository/custom/impl/ProcessingPeriodRepositoryImpl.java index 1e0276aa4..886566d65 100644 --- a/src/main/java/org/openlmis/referencedata/repository/custom/impl/ProcessingPeriodRepositoryImpl.java +++ b/src/main/java/org/openlmis/referencedata/repository/custom/impl/ProcessingPeriodRepositoryImpl.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.repository.custom.impl; diff --git a/src/main/java/org/openlmis/referencedata/repository/custom/impl/ProgramRepositoryImpl.java b/src/main/java/org/openlmis/referencedata/repository/custom/impl/ProgramRepositoryImpl.java index aa39a585b..808c31aae 100644 --- a/src/main/java/org/openlmis/referencedata/repository/custom/impl/ProgramRepositoryImpl.java +++ b/src/main/java/org/openlmis/referencedata/repository/custom/impl/ProgramRepositoryImpl.java @@ -5,16 +5,17 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.repository.custom.impl; +import java.util.List; import javax.persistence.EntityManager; import javax.persistence.PersistenceContext; import javax.persistence.criteria.CriteriaBuilder; @@ -24,8 +25,6 @@ import org.openlmis.referencedata.domain.Program; import org.openlmis.referencedata.repository.custom.ProgramRepositoryCustom; -import java.util.List; - public class ProgramRepositoryImpl implements ProgramRepositoryCustom { @PersistenceContext diff --git a/src/main/java/org/openlmis/referencedata/repository/custom/impl/RequisitionGroupProgramScheduleRepositoryImpl.java b/src/main/java/org/openlmis/referencedata/repository/custom/impl/RequisitionGroupProgramScheduleRepositoryImpl.java index 0998c5fac..15d309aee 100644 --- a/src/main/java/org/openlmis/referencedata/repository/custom/impl/RequisitionGroupProgramScheduleRepositoryImpl.java +++ b/src/main/java/org/openlmis/referencedata/repository/custom/impl/RequisitionGroupProgramScheduleRepositoryImpl.java @@ -5,22 +5,17 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.repository.custom.impl; -import org.openlmis.referencedata.domain.Facility; -import org.openlmis.referencedata.domain.Program; -import org.openlmis.referencedata.domain.RequisitionGroup; -import org.openlmis.referencedata.domain.RequisitionGroupProgramSchedule; -import org.openlmis.referencedata.repository.custom.RequisitionGroupProgramScheduleRepositoryCustom; - +import java.util.List; import javax.persistence.EntityManager; import javax.persistence.PersistenceContext; import javax.persistence.criteria.CriteriaBuilder; @@ -28,7 +23,11 @@ import javax.persistence.criteria.Join; import javax.persistence.criteria.Predicate; import javax.persistence.criteria.Root; -import java.util.List; +import org.openlmis.referencedata.domain.Facility; +import org.openlmis.referencedata.domain.Program; +import org.openlmis.referencedata.domain.RequisitionGroup; +import org.openlmis.referencedata.domain.RequisitionGroupProgramSchedule; +import org.openlmis.referencedata.repository.custom.RequisitionGroupProgramScheduleRepositoryCustom; public class RequisitionGroupProgramScheduleRepositoryImpl implements diff --git a/src/main/java/org/openlmis/referencedata/repository/custom/impl/RequisitionGroupRepositoryImpl.java b/src/main/java/org/openlmis/referencedata/repository/custom/impl/RequisitionGroupRepositoryImpl.java index 520ec1349..1b18d1d61 100644 --- a/src/main/java/org/openlmis/referencedata/repository/custom/impl/RequisitionGroupRepositoryImpl.java +++ b/src/main/java/org/openlmis/referencedata/repository/custom/impl/RequisitionGroupRepositoryImpl.java @@ -5,26 +5,16 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.repository.custom.impl; -import org.apache.commons.lang3.StringUtils; -import org.openlmis.referencedata.domain.Program; -import org.openlmis.referencedata.domain.RequisitionGroup; -import org.openlmis.referencedata.domain.RequisitionGroupProgramSchedule; -import org.openlmis.referencedata.domain.SupervisoryNode; -import org.openlmis.referencedata.repository.custom.RequisitionGroupRepositoryCustom; -import org.openlmis.referencedata.util.Pagination; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; - import java.util.Collections; import java.util.List; import javax.persistence.EntityManager; @@ -35,6 +25,15 @@ import javax.persistence.criteria.JoinType; import javax.persistence.criteria.Predicate; import javax.persistence.criteria.Root; +import org.apache.commons.lang3.StringUtils; +import org.openlmis.referencedata.domain.Program; +import org.openlmis.referencedata.domain.RequisitionGroup; +import org.openlmis.referencedata.domain.RequisitionGroupProgramSchedule; +import org.openlmis.referencedata.domain.SupervisoryNode; +import org.openlmis.referencedata.repository.custom.RequisitionGroupRepositoryCustom; +import org.openlmis.referencedata.util.Pagination; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; public class RequisitionGroupRepositoryImpl implements RequisitionGroupRepositoryCustom { diff --git a/src/main/java/org/openlmis/referencedata/repository/custom/impl/RightRepositoryImpl.java b/src/main/java/org/openlmis/referencedata/repository/custom/impl/RightRepositoryImpl.java index b25bac37c..e5abdfe54 100644 --- a/src/main/java/org/openlmis/referencedata/repository/custom/impl/RightRepositoryImpl.java +++ b/src/main/java/org/openlmis/referencedata/repository/custom/impl/RightRepositoryImpl.java @@ -5,29 +5,28 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.repository.custom.impl; -import org.openlmis.referencedata.domain.Right; -import org.openlmis.referencedata.domain.RightType; -import org.openlmis.referencedata.repository.custom.RightRepositoryCustom; - +import java.util.HashSet; +import java.util.List; +import java.util.Set; import javax.persistence.EntityManager; import javax.persistence.PersistenceContext; import javax.persistence.criteria.CriteriaBuilder; import javax.persistence.criteria.CriteriaQuery; import javax.persistence.criteria.Predicate; import javax.persistence.criteria.Root; -import java.util.HashSet; -import java.util.List; -import java.util.Set; +import org.openlmis.referencedata.domain.Right; +import org.openlmis.referencedata.domain.RightType; +import org.openlmis.referencedata.repository.custom.RightRepositoryCustom; public class RightRepositoryImpl implements RightRepositoryCustom { diff --git a/src/main/java/org/openlmis/referencedata/repository/custom/impl/SupervisoryNodeRepositoryImpl.java b/src/main/java/org/openlmis/referencedata/repository/custom/impl/SupervisoryNodeRepositoryImpl.java index bc77364de..33c6b5b97 100644 --- a/src/main/java/org/openlmis/referencedata/repository/custom/impl/SupervisoryNodeRepositoryImpl.java +++ b/src/main/java/org/openlmis/referencedata/repository/custom/impl/SupervisoryNodeRepositoryImpl.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.repository.custom.impl; diff --git a/src/main/java/org/openlmis/referencedata/repository/custom/impl/SupplyLineRepositoryImpl.java b/src/main/java/org/openlmis/referencedata/repository/custom/impl/SupplyLineRepositoryImpl.java index 28f9887ce..f6a0d8e82 100644 --- a/src/main/java/org/openlmis/referencedata/repository/custom/impl/SupplyLineRepositoryImpl.java +++ b/src/main/java/org/openlmis/referencedata/repository/custom/impl/SupplyLineRepositoryImpl.java @@ -5,30 +5,19 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.repository.custom.impl; -import org.openlmis.referencedata.domain.Facility; -import org.openlmis.referencedata.domain.Program; -import org.openlmis.referencedata.domain.SupervisoryNode; -import org.openlmis.referencedata.domain.SupplyLine; -import org.openlmis.referencedata.repository.custom.SupplyLineRepositoryCustom; -import org.openlmis.referencedata.util.Pagination; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; -import org.springframework.data.domain.Sort; - import java.util.ArrayList; import java.util.Iterator; import java.util.List; - import javax.persistence.EntityManager; import javax.persistence.PersistenceContext; import javax.persistence.criteria.CriteriaBuilder; @@ -38,6 +27,15 @@ import javax.persistence.criteria.Path; import javax.persistence.criteria.Predicate; import javax.persistence.criteria.Root; +import org.openlmis.referencedata.domain.Facility; +import org.openlmis.referencedata.domain.Program; +import org.openlmis.referencedata.domain.SupervisoryNode; +import org.openlmis.referencedata.domain.SupplyLine; +import org.openlmis.referencedata.repository.custom.SupplyLineRepositoryCustom; +import org.openlmis.referencedata.util.Pagination; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; +import org.springframework.data.domain.Sort; public class SupplyLineRepositoryImpl implements SupplyLineRepositoryCustom { diff --git a/src/main/java/org/openlmis/referencedata/repository/custom/impl/TradeItemRepositoryImpl.java b/src/main/java/org/openlmis/referencedata/repository/custom/impl/TradeItemRepositoryImpl.java index 59a21c9d2..29b6293cc 100644 --- a/src/main/java/org/openlmis/referencedata/repository/custom/impl/TradeItemRepositoryImpl.java +++ b/src/main/java/org/openlmis/referencedata/repository/custom/impl/TradeItemRepositoryImpl.java @@ -5,20 +5,16 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.repository.custom.impl; -import org.openlmis.referencedata.domain.TradeItem; -import org.openlmis.referencedata.domain.TradeItemClassification; -import org.openlmis.referencedata.repository.custom.TradeItemRepositoryCustom; - import javax.persistence.EntityManager; import javax.persistence.PersistenceContext; import javax.persistence.criteria.CriteriaBuilder; @@ -26,6 +22,9 @@ import javax.persistence.criteria.Join; import javax.persistence.criteria.JoinType; import javax.persistence.criteria.Root; +import org.openlmis.referencedata.domain.TradeItem; +import org.openlmis.referencedata.domain.TradeItemClassification; +import org.openlmis.referencedata.repository.custom.TradeItemRepositoryCustom; public class TradeItemRepositoryImpl implements TradeItemRepositoryCustom { diff --git a/src/main/java/org/openlmis/referencedata/repository/custom/impl/UserRepositoryImpl.java b/src/main/java/org/openlmis/referencedata/repository/custom/impl/UserRepositoryImpl.java index b7dda3377..96801725c 100644 --- a/src/main/java/org/openlmis/referencedata/repository/custom/impl/UserRepositoryImpl.java +++ b/src/main/java/org/openlmis/referencedata/repository/custom/impl/UserRepositoryImpl.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.repository.custom.impl; diff --git a/src/main/java/org/openlmis/referencedata/security/CustomUserAuthenticationConverter.java b/src/main/java/org/openlmis/referencedata/security/CustomUserAuthenticationConverter.java index 4264fb2cb..93c324653 100644 --- a/src/main/java/org/openlmis/referencedata/security/CustomUserAuthenticationConverter.java +++ b/src/main/java/org/openlmis/referencedata/security/CustomUserAuthenticationConverter.java @@ -5,25 +5,25 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.security; +import java.util.Collection; +import java.util.Map; +import java.util.UUID; import org.flywaydb.core.internal.util.StringUtils; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.core.Authentication; import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.authority.AuthorityUtils; import org.springframework.security.oauth2.provider.token.UserAuthenticationConverter; -import java.util.Collection; -import java.util.Map; -import java.util.UUID; /** * Implementation of {@link UserAuthenticationConverter}. Converts from an Authentication diff --git a/src/main/java/org/openlmis/referencedata/security/MethodSecurityConfiguration.java b/src/main/java/org/openlmis/referencedata/security/MethodSecurityConfiguration.java index ca9eed9ac..e8538f593 100644 --- a/src/main/java/org/openlmis/referencedata/security/MethodSecurityConfiguration.java +++ b/src/main/java/org/openlmis/referencedata/security/MethodSecurityConfiguration.java @@ -5,17 +5,16 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.security; - import org.springframework.context.annotation.Configuration; import org.springframework.security.access.expression.method.MethodSecurityExpressionHandler; import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity; diff --git a/src/main/java/org/openlmis/referencedata/security/ResourceServerSecurityConfiguration.java b/src/main/java/org/openlmis/referencedata/security/ResourceServerSecurityConfiguration.java index f21675cba..89b485b5c 100644 --- a/src/main/java/org/openlmis/referencedata/security/ResourceServerSecurityConfiguration.java +++ b/src/main/java/org/openlmis/referencedata/security/ResourceServerSecurityConfiguration.java @@ -5,16 +5,22 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.security; +import java.io.IOException; +import java.util.Arrays; +import javax.servlet.FilterChain; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; @@ -37,14 +43,6 @@ import org.springframework.web.cors.UrlBasedCorsConfigurationSource; import org.springframework.web.filter.OncePerRequestFilter; -import java.io.IOException; -import java.util.Arrays; - -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - @Configuration @EnableWebSecurity @Import({ MethodSecurityConfiguration.class }) diff --git a/src/main/java/org/openlmis/referencedata/security/UserNameProvider.java b/src/main/java/org/openlmis/referencedata/security/UserNameProvider.java index 3bf51627f..515eb4db8 100644 --- a/src/main/java/org/openlmis/referencedata/security/UserNameProvider.java +++ b/src/main/java/org/openlmis/referencedata/security/UserNameProvider.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.security; diff --git a/src/main/java/org/openlmis/referencedata/serializer/MoneyDeserializer.java b/src/main/java/org/openlmis/referencedata/serializer/MoneyDeserializer.java index e47b56dec..e1afacc13 100644 --- a/src/main/java/org/openlmis/referencedata/serializer/MoneyDeserializer.java +++ b/src/main/java/org/openlmis/referencedata/serializer/MoneyDeserializer.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.serializer; @@ -18,13 +18,11 @@ import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.JsonDeserializer; - +import java.io.IOException; import org.joda.money.CurrencyUnit; import org.joda.money.Money; import org.openlmis.referencedata.CurrencyConfig; -import java.io.IOException; - /** * MoneyDeserializer class represents the deserializer for Money. */ diff --git a/src/main/java/org/openlmis/referencedata/serializer/MoneySerializer.java b/src/main/java/org/openlmis/referencedata/serializer/MoneySerializer.java index 54eeacc1d..fce13f273 100644 --- a/src/main/java/org/openlmis/referencedata/serializer/MoneySerializer.java +++ b/src/main/java/org/openlmis/referencedata/serializer/MoneySerializer.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.serializer; @@ -18,10 +18,8 @@ import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; - -import org.joda.money.Money; - import java.io.IOException; +import org.joda.money.Money; /** * MoneySerializer class represents the serializer for Money. diff --git a/src/main/java/org/openlmis/referencedata/service/AuthenticationHelper.java b/src/main/java/org/openlmis/referencedata/service/AuthenticationHelper.java index ce1f1fe58..72a42810b 100644 --- a/src/main/java/org/openlmis/referencedata/service/AuthenticationHelper.java +++ b/src/main/java/org/openlmis/referencedata/service/AuthenticationHelper.java @@ -5,16 +5,17 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.service; +import java.util.UUID; import org.openlmis.referencedata.domain.User; import org.openlmis.referencedata.exception.NotFoundException; import org.openlmis.referencedata.repository.UserRepository; @@ -22,7 +23,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.stereotype.Component; -import java.util.UUID; @Component public class AuthenticationHelper { diff --git a/src/main/java/org/openlmis/referencedata/service/FacilityService.java b/src/main/java/org/openlmis/referencedata/service/FacilityService.java index 7696faaa9..37fe4175a 100644 --- a/src/main/java/org/openlmis/referencedata/service/FacilityService.java +++ b/src/main/java/org/openlmis/referencedata/service/FacilityService.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.service; diff --git a/src/main/java/org/openlmis/referencedata/service/FacilityTypeApprovedProductBuilder.java b/src/main/java/org/openlmis/referencedata/service/FacilityTypeApprovedProductBuilder.java index 6fd15e478..881f84f5e 100644 --- a/src/main/java/org/openlmis/referencedata/service/FacilityTypeApprovedProductBuilder.java +++ b/src/main/java/org/openlmis/referencedata/service/FacilityTypeApprovedProductBuilder.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.service; diff --git a/src/main/java/org/openlmis/referencedata/service/FacilityTypeApprovedProductService.java b/src/main/java/org/openlmis/referencedata/service/FacilityTypeApprovedProductService.java index ea1ac354b..6332f2e5f 100644 --- a/src/main/java/org/openlmis/referencedata/service/FacilityTypeApprovedProductService.java +++ b/src/main/java/org/openlmis/referencedata/service/FacilityTypeApprovedProductService.java @@ -5,18 +5,19 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.service; import static org.openlmis.referencedata.util.messagekeys.FacilityTypeApprovedProductMessageKeys.ERROR_LACK_PARAMS; +import java.util.Map; import org.apache.commons.lang3.StringUtils; import org.openlmis.referencedata.domain.FacilityTypeApprovedProduct; import org.openlmis.referencedata.exception.ValidationMessageException; @@ -25,7 +26,6 @@ import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; -import java.util.Map; @Service public class FacilityTypeApprovedProductService { diff --git a/src/main/java/org/openlmis/referencedata/service/FacilityTypeService.java b/src/main/java/org/openlmis/referencedata/service/FacilityTypeService.java index 866deb402..5b1b5196a 100644 --- a/src/main/java/org/openlmis/referencedata/service/FacilityTypeService.java +++ b/src/main/java/org/openlmis/referencedata/service/FacilityTypeService.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.service; diff --git a/src/main/java/org/openlmis/referencedata/service/GeographicZoneService.java b/src/main/java/org/openlmis/referencedata/service/GeographicZoneService.java index ec802e7f7..40d6c0587 100644 --- a/src/main/java/org/openlmis/referencedata/service/GeographicZoneService.java +++ b/src/main/java/org/openlmis/referencedata/service/GeographicZoneService.java @@ -5,18 +5,21 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.service; import com.google.common.collect.Sets; - +import java.util.Map; +import java.util.Optional; +import java.util.Set; +import java.util.UUID; import org.apache.commons.collections4.MapUtils; import org.apache.commons.lang3.StringUtils; import org.openlmis.referencedata.domain.GeographicLevel; @@ -33,11 +36,6 @@ import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; -import java.util.Map; -import java.util.Optional; -import java.util.Set; -import java.util.UUID; - @Service public class GeographicZoneService { diff --git a/src/main/java/org/openlmis/referencedata/service/IdealStockAmountSearchParams.java b/src/main/java/org/openlmis/referencedata/service/IdealStockAmountSearchParams.java index 6895f6709..b5bfdd1dd 100644 --- a/src/main/java/org/openlmis/referencedata/service/IdealStockAmountSearchParams.java +++ b/src/main/java/org/openlmis/referencedata/service/IdealStockAmountSearchParams.java @@ -5,21 +5,21 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.service; +import java.util.UUID; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; -import java.util.UUID; @NoArgsConstructor @AllArgsConstructor diff --git a/src/main/java/org/openlmis/referencedata/service/IdealStockAmountService.java b/src/main/java/org/openlmis/referencedata/service/IdealStockAmountService.java index 4bda8dab4..9536421f0 100644 --- a/src/main/java/org/openlmis/referencedata/service/IdealStockAmountService.java +++ b/src/main/java/org/openlmis/referencedata/service/IdealStockAmountService.java @@ -5,18 +5,19 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.service; import com.google.common.collect.Lists; - +import java.util.List; +import java.util.UUID; import org.openlmis.referencedata.domain.IdealStockAmount; import org.openlmis.referencedata.repository.IdealStockAmountRepository; import org.springframework.beans.factory.annotation.Autowired; @@ -24,9 +25,6 @@ import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; -import java.util.List; -import java.util.UUID; - @Service public class IdealStockAmountService { diff --git a/src/main/java/org/openlmis/referencedata/service/LotSearchParams.java b/src/main/java/org/openlmis/referencedata/service/LotSearchParams.java index 7c780ffe7..fa898d9ad 100644 --- a/src/main/java/org/openlmis/referencedata/service/LotSearchParams.java +++ b/src/main/java/org/openlmis/referencedata/service/LotSearchParams.java @@ -5,24 +5,24 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.service; +import java.time.LocalDate; +import java.util.List; +import java.util.UUID; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; import org.springframework.format.annotation.DateTimeFormat; -import java.time.LocalDate; -import java.util.List; -import java.util.UUID; @Getter @Setter diff --git a/src/main/java/org/openlmis/referencedata/service/LotService.java b/src/main/java/org/openlmis/referencedata/service/LotService.java index 1b15ede27..afb9cd9b6 100644 --- a/src/main/java/org/openlmis/referencedata/service/LotService.java +++ b/src/main/java/org/openlmis/referencedata/service/LotService.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.service; diff --git a/src/main/java/org/openlmis/referencedata/service/ProcessingPeriodSearchParams.java b/src/main/java/org/openlmis/referencedata/service/ProcessingPeriodSearchParams.java index 5070511bf..0f65776b0 100644 --- a/src/main/java/org/openlmis/referencedata/service/ProcessingPeriodSearchParams.java +++ b/src/main/java/org/openlmis/referencedata/service/ProcessingPeriodSearchParams.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.service; diff --git a/src/main/java/org/openlmis/referencedata/service/ProcessingPeriodService.java b/src/main/java/org/openlmis/referencedata/service/ProcessingPeriodService.java index 736d525d2..b99fd08d6 100644 --- a/src/main/java/org/openlmis/referencedata/service/ProcessingPeriodService.java +++ b/src/main/java/org/openlmis/referencedata/service/ProcessingPeriodService.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.service; diff --git a/src/main/java/org/openlmis/referencedata/service/RequestHelper.java b/src/main/java/org/openlmis/referencedata/service/RequestHelper.java index 4a0b9464b..e465b6afd 100644 --- a/src/main/java/org/openlmis/referencedata/service/RequestHelper.java +++ b/src/main/java/org/openlmis/referencedata/service/RequestHelper.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.service; @@ -19,13 +19,12 @@ import static java.nio.charset.StandardCharsets.UTF_8; import static org.springframework.web.util.UriUtils.encodeQueryParam; +import java.io.UnsupportedEncodingException; +import java.net.URI; import org.springframework.http.HttpEntity; import org.springframework.http.HttpHeaders; import org.springframework.web.util.UriComponentsBuilder; -import java.io.UnsupportedEncodingException; -import java.net.URI; - final class RequestHelper { private RequestHelper() { diff --git a/src/main/java/org/openlmis/referencedata/service/RequestParameters.java b/src/main/java/org/openlmis/referencedata/service/RequestParameters.java index cb6540064..fd4124b40 100644 --- a/src/main/java/org/openlmis/referencedata/service/RequestParameters.java +++ b/src/main/java/org/openlmis/referencedata/service/RequestParameters.java @@ -5,18 +5,17 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.service; import com.google.common.collect.Maps; - import java.util.Map; import java.util.function.Consumer; diff --git a/src/main/java/org/openlmis/referencedata/service/RequisitionGroupProgramScheduleService.java b/src/main/java/org/openlmis/referencedata/service/RequisitionGroupProgramScheduleService.java index 56003ccc2..28ece4099 100644 --- a/src/main/java/org/openlmis/referencedata/service/RequisitionGroupProgramScheduleService.java +++ b/src/main/java/org/openlmis/referencedata/service/RequisitionGroupProgramScheduleService.java @@ -5,16 +5,17 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.service; +import java.util.List; import org.openlmis.referencedata.domain.Facility; import org.openlmis.referencedata.domain.Program; import org.openlmis.referencedata.domain.RequisitionGroupProgramSchedule; @@ -22,8 +23,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.List; - @Service public class RequisitionGroupProgramScheduleService { diff --git a/src/main/java/org/openlmis/referencedata/service/RequisitionGroupService.java b/src/main/java/org/openlmis/referencedata/service/RequisitionGroupService.java index 645b48283..a83d8fe66 100644 --- a/src/main/java/org/openlmis/referencedata/service/RequisitionGroupService.java +++ b/src/main/java/org/openlmis/referencedata/service/RequisitionGroupService.java @@ -5,17 +5,20 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.service; import com.google.common.collect.Lists; +import java.util.Comparator; +import java.util.List; +import java.util.Map; import org.apache.commons.collections4.MapUtils; import org.apache.commons.lang3.StringUtils; import org.openlmis.referencedata.domain.Code; @@ -39,10 +42,6 @@ import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; -import java.util.Comparator; -import java.util.List; -import java.util.Map; - @Service public class RequisitionGroupService { @@ -71,7 +70,7 @@ public class RequisitionGroupService { */ public Page searchRequisitionGroups(Map queryMap, Pageable pageable) { - if ( MapUtils.isEmpty(queryMap) ) { + if (MapUtils.isEmpty(queryMap)) { List requisitionGroups = Lists.newArrayList(requisitionGroupRepository.findAll()); requisitionGroups.sort(Comparator.comparing(RequisitionGroup::getName)); diff --git a/src/main/java/org/openlmis/referencedata/service/RightAssignmentExecutor.java b/src/main/java/org/openlmis/referencedata/service/RightAssignmentExecutor.java index 579afa2e9..e45373126 100644 --- a/src/main/java/org/openlmis/referencedata/service/RightAssignmentExecutor.java +++ b/src/main/java/org/openlmis/referencedata/service/RightAssignmentExecutor.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.service; diff --git a/src/main/java/org/openlmis/referencedata/service/RightAssignmentService.java b/src/main/java/org/openlmis/referencedata/service/RightAssignmentService.java index ef724f917..0c5ed402b 100644 --- a/src/main/java/org/openlmis/referencedata/service/RightAssignmentService.java +++ b/src/main/java/org/openlmis/referencedata/service/RightAssignmentService.java @@ -5,16 +5,28 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.service; +import java.io.IOException; +import java.io.InputStream; +import java.nio.charset.Charset; +import java.sql.ResultSet; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashSet; +import java.util.List; +import java.util.Set; +import java.util.UUID; +import java.util.concurrent.Future; +import java.util.stream.Collectors; import org.apache.commons.collections4.ListUtils; import org.apache.commons.lang3.tuple.MutablePair; import org.openlmis.referencedata.dto.RightAssignmentDto; @@ -31,18 +43,6 @@ import org.springframework.transaction.annotation.Isolation; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.StreamUtils; -import java.io.IOException; -import java.io.InputStream; -import java.nio.charset.Charset; -import java.sql.ResultSet; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashSet; -import java.util.List; -import java.util.Set; -import java.util.UUID; -import java.util.concurrent.Future; -import java.util.stream.Collectors; /** * RightAssignmentInitializer runs after its associated Spring application has loaded. It @@ -95,7 +95,7 @@ public Future regenerateRightAssignments() { Resource2Db r2db = new Resource2Db(template); try { - for ( List partialRightAssignments : ListUtils.partition(dbRightAssignments, 100) ) { + for (List partialRightAssignments : ListUtils.partition(dbRightAssignments, 100)) { insertFromDbRightAssignmentList(r2db, partialRightAssignments); } } catch (IOException ioe) { @@ -118,9 +118,9 @@ private void insertFromDbRightAssignmentList(Resource2Db resource2Db, // Convert set of right assignments to insert to a set of SQL inserts XLOGGER.debug("Convert right assignments to SQL inserts"); MutablePair dataWithHeader = new MutablePair, List>(); - dataWithHeader.setRight( rightAssignmentsToInsert.stream() + dataWithHeader.setRight(rightAssignmentsToInsert.stream() .map(rad -> rad.toColumnArray()) - .collect(Collectors.toList()) ); + .collect(Collectors.toList())); // set column headers dataWithHeader.setLeft(Arrays.asList("id", diff --git a/src/main/java/org/openlmis/referencedata/service/RightService.java b/src/main/java/org/openlmis/referencedata/service/RightService.java index ce0823470..8255c25ff 100644 --- a/src/main/java/org/openlmis/referencedata/service/RightService.java +++ b/src/main/java/org/openlmis/referencedata/service/RightService.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.service; @@ -18,6 +18,7 @@ import static org.apache.commons.lang3.StringUtils.isBlank; import static org.apache.commons.lang3.StringUtils.startsWith; +import java.util.UUID; import org.openlmis.referencedata.exception.UnauthorizedException; import org.openlmis.referencedata.repository.RightAssignmentRepository; import org.openlmis.referencedata.repository.UserRepository; @@ -31,8 +32,6 @@ import org.springframework.security.oauth2.provider.OAuth2Authentication; import org.springframework.stereotype.Service; -import java.util.UUID; - @Service public class RightService { private static final XLogger XLOGGER = XLoggerFactory.getXLogger(RightService.class); diff --git a/src/main/java/org/openlmis/referencedata/service/SupplyLineService.java b/src/main/java/org/openlmis/referencedata/service/SupplyLineService.java index 990d57152..339d191ee 100644 --- a/src/main/java/org/openlmis/referencedata/service/SupplyLineService.java +++ b/src/main/java/org/openlmis/referencedata/service/SupplyLineService.java @@ -5,16 +5,18 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.service; +import java.util.List; +import java.util.Map; import org.apache.commons.collections4.MapUtils; import org.apache.commons.lang3.StringUtils; import org.openlmis.referencedata.domain.Code; @@ -37,9 +39,6 @@ import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; -import java.util.List; -import java.util.Map; - @Service public class SupplyLineService { diff --git a/src/main/java/org/openlmis/referencedata/service/UserService.java b/src/main/java/org/openlmis/referencedata/service/UserService.java index 2052c2483..2e80ac56e 100644 --- a/src/main/java/org/openlmis/referencedata/service/UserService.java +++ b/src/main/java/org/openlmis/referencedata/service/UserService.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.service; diff --git a/src/main/java/org/openlmis/referencedata/util/AuthUserRequest.java b/src/main/java/org/openlmis/referencedata/util/AuthUserRequest.java index e58426b94..f6bb86e55 100644 --- a/src/main/java/org/openlmis/referencedata/util/AuthUserRequest.java +++ b/src/main/java/org/openlmis/referencedata/util/AuthUserRequest.java @@ -5,18 +5,17 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.util; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; - import java.util.UUID; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/src/main/java/org/openlmis/referencedata/util/ConditionalUuidGenerator.java b/src/main/java/org/openlmis/referencedata/util/ConditionalUuidGenerator.java index 6800dbe55..31d48a345 100644 --- a/src/main/java/org/openlmis/referencedata/util/ConditionalUuidGenerator.java +++ b/src/main/java/org/openlmis/referencedata/util/ConditionalUuidGenerator.java @@ -5,22 +5,21 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.util; +import java.io.Serializable; import org.hibernate.engine.spi.SessionImplementor; import org.hibernate.id.UUIDGenerator; import org.openlmis.referencedata.domain.BaseEntity; -import java.io.Serializable; - public class ConditionalUuidGenerator extends UUIDGenerator { @Override diff --git a/src/main/java/org/openlmis/referencedata/util/CustomPhysicalNamingStrategy.java b/src/main/java/org/openlmis/referencedata/util/CustomPhysicalNamingStrategy.java index 71209c7a7..c28322029 100644 --- a/src/main/java/org/openlmis/referencedata/util/CustomPhysicalNamingStrategy.java +++ b/src/main/java/org/openlmis/referencedata/util/CustomPhysicalNamingStrategy.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.util; diff --git a/src/main/java/org/openlmis/referencedata/util/CustomSortDeserializer.java b/src/main/java/org/openlmis/referencedata/util/CustomSortDeserializer.java index ce8d24226..f53e4d10b 100644 --- a/src/main/java/org/openlmis/referencedata/util/CustomSortDeserializer.java +++ b/src/main/java/org/openlmis/referencedata/util/CustomSortDeserializer.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.util; @@ -20,8 +20,8 @@ import com.fasterxml.jackson.databind.JsonDeserializer; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.node.ArrayNode; -import org.springframework.data.domain.Sort; import java.io.IOException; +import org.springframework.data.domain.Sort; public class CustomSortDeserializer extends JsonDeserializer { diff --git a/src/main/java/org/openlmis/referencedata/util/IdealStockAmountDtoBuilder.java b/src/main/java/org/openlmis/referencedata/util/IdealStockAmountDtoBuilder.java index 59289ccc2..9f8fea9b5 100644 --- a/src/main/java/org/openlmis/referencedata/util/IdealStockAmountDtoBuilder.java +++ b/src/main/java/org/openlmis/referencedata/util/IdealStockAmountDtoBuilder.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.util; @@ -27,7 +27,7 @@ public class IdealStockAmountDtoBuilder { private String serviceUrl; /** - * Builds Ideal Stock Amount dto from {@link IdealStockAmount} + * Builds Ideal Stock Amount dto from {@link IdealStockAmount}. * * @param idealStockAmount instance of {@link IdealStockAmount} * @return instance of Ideal Stock Amount dto. diff --git a/src/main/java/org/openlmis/referencedata/util/LocalizedMessage.java b/src/main/java/org/openlmis/referencedata/util/LocalizedMessage.java index 524e4e64a..595068559 100644 --- a/src/main/java/org/openlmis/referencedata/util/LocalizedMessage.java +++ b/src/main/java/org/openlmis/referencedata/util/LocalizedMessage.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.util; diff --git a/src/main/java/org/openlmis/referencedata/util/Message.java b/src/main/java/org/openlmis/referencedata/util/Message.java index 47dedc2cd..1b07238cd 100644 --- a/src/main/java/org/openlmis/referencedata/util/Message.java +++ b/src/main/java/org/openlmis/referencedata/util/Message.java @@ -5,22 +5,21 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.util; +import java.util.Locale; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.Validate; import org.springframework.context.MessageSource; -import java.util.Locale; - /** * Immutable value object for a message that is localizable. diff --git a/src/main/java/org/openlmis/referencedata/util/OrderableBuilder.java b/src/main/java/org/openlmis/referencedata/util/OrderableBuilder.java index 0ae5be2d3..b82e8fa19 100644 --- a/src/main/java/org/openlmis/referencedata/util/OrderableBuilder.java +++ b/src/main/java/org/openlmis/referencedata/util/OrderableBuilder.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.util; @@ -35,7 +35,7 @@ public class OrderableBuilder { private ProgramRepository programRepository; /** - * Creates new instance based on data from {@link Orderable.Importer} + * Creates new instance based on data from {@link Orderable.Importer}. * * @param importer instance of {@link Orderable.Importer} * @return new instance of Orderable. diff --git a/src/main/java/org/openlmis/referencedata/util/Pagination.java b/src/main/java/org/openlmis/referencedata/util/Pagination.java index 38162aa89..fece73411 100644 --- a/src/main/java/org/openlmis/referencedata/util/Pagination.java +++ b/src/main/java/org/openlmis/referencedata/util/Pagination.java @@ -5,25 +5,24 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.util; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.PageImpl; -import org.springframework.data.domain.PageRequest; -import org.springframework.data.domain.Pageable; - import java.util.ArrayList; import java.util.List; import java.util.function.Consumer; import java.util.function.Function; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.PageImpl; +import org.springframework.data.domain.PageRequest; +import org.springframework.data.domain.Pageable; public class Pagination { diff --git a/src/main/java/org/openlmis/referencedata/util/Resource2Db.java b/src/main/java/org/openlmis/referencedata/util/Resource2Db.java index 32d2f1b3c..dd41ac2a0 100644 --- a/src/main/java/org/openlmis/referencedata/util/Resource2Db.java +++ b/src/main/java/org/openlmis/referencedata/util/Resource2Db.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.util; @@ -51,7 +51,7 @@ public class Resource2Db { private final JdbcTemplate template; /** - * new with given data connection + * New with given data connection. * @param template the active {@link JdbcTemplate} to run SQL updates against. * @throws NullPointerException if template is null. */ @@ -122,18 +122,18 @@ Pair, List> resourceCsvToBatchedPair(final Resource resou // read header row MutablePair, List> readData = new MutablePair<>(); - readData.setLeft( new ArrayList<>( parser.getHeaderMap().keySet() ) ); - XLOGGER.info("Read header: " + readData.getLeft() ); + readData.setLeft(new ArrayList<>(parser.getHeaderMap().keySet())); + XLOGGER.info("Read header: " + readData.getLeft()); // read data rows List rows = new ArrayList<>(); - for ( CSVRecord record : parser.getRecords() ) { - if ( ! record.isConsistent() ) { + for (CSVRecord record : parser.getRecords()) { + if (!record.isConsistent()) { throw new IllegalArgumentException("CSV record inconsistent: " + record); } List theRow = IteratorUtils.toList(record.iterator()); - rows.add( theRow.toArray() ); + rows.add(theRow.toArray()); } readData.setRight(rows); diff --git a/src/main/java/org/openlmis/referencedata/util/StringHelper.java b/src/main/java/org/openlmis/referencedata/util/StringHelper.java index 96fbfefb9..1fe0623ad 100644 --- a/src/main/java/org/openlmis/referencedata/util/StringHelper.java +++ b/src/main/java/org/openlmis/referencedata/util/StringHelper.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.util; diff --git a/src/main/java/org/openlmis/referencedata/util/UuidUtil.java b/src/main/java/org/openlmis/referencedata/util/UuidUtil.java index f28184399..b204beab5 100644 --- a/src/main/java/org/openlmis/referencedata/util/UuidUtil.java +++ b/src/main/java/org/openlmis/referencedata/util/UuidUtil.java @@ -5,23 +5,23 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.util; -import org.springframework.util.MultiValueMap; import java.util.Collections; import java.util.HashSet; import java.util.Objects; import java.util.Optional; import java.util.Set; import java.util.UUID; +import org.springframework.util.MultiValueMap; /** * Generic utility functions for {@link UUID}. diff --git a/src/main/java/org/openlmis/referencedata/util/messagekeys/CommodityTypeMessageKeys.java b/src/main/java/org/openlmis/referencedata/util/messagekeys/CommodityTypeMessageKeys.java index a584bc70e..b50230183 100644 --- a/src/main/java/org/openlmis/referencedata/util/messagekeys/CommodityTypeMessageKeys.java +++ b/src/main/java/org/openlmis/referencedata/util/messagekeys/CommodityTypeMessageKeys.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.util.messagekeys; diff --git a/src/main/java/org/openlmis/referencedata/util/messagekeys/CsvExportMessageKeys.java b/src/main/java/org/openlmis/referencedata/util/messagekeys/CsvExportMessageKeys.java index 955779221..c5d82539e 100644 --- a/src/main/java/org/openlmis/referencedata/util/messagekeys/CsvExportMessageKeys.java +++ b/src/main/java/org/openlmis/referencedata/util/messagekeys/CsvExportMessageKeys.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.util.messagekeys; diff --git a/src/main/java/org/openlmis/referencedata/util/messagekeys/CsvUploadMessageKeys.java b/src/main/java/org/openlmis/referencedata/util/messagekeys/CsvUploadMessageKeys.java index 0c6ffe89b..54d72758c 100644 --- a/src/main/java/org/openlmis/referencedata/util/messagekeys/CsvUploadMessageKeys.java +++ b/src/main/java/org/openlmis/referencedata/util/messagekeys/CsvUploadMessageKeys.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.util.messagekeys; diff --git a/src/main/java/org/openlmis/referencedata/util/messagekeys/FacilityMessageKeys.java b/src/main/java/org/openlmis/referencedata/util/messagekeys/FacilityMessageKeys.java index 107f895ba..c8e0dfe97 100644 --- a/src/main/java/org/openlmis/referencedata/util/messagekeys/FacilityMessageKeys.java +++ b/src/main/java/org/openlmis/referencedata/util/messagekeys/FacilityMessageKeys.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.util.messagekeys; diff --git a/src/main/java/org/openlmis/referencedata/util/messagekeys/FacilityOperatorMessageKeys.java b/src/main/java/org/openlmis/referencedata/util/messagekeys/FacilityOperatorMessageKeys.java index b6d4d0b05..9ea4d5b8d 100644 --- a/src/main/java/org/openlmis/referencedata/util/messagekeys/FacilityOperatorMessageKeys.java +++ b/src/main/java/org/openlmis/referencedata/util/messagekeys/FacilityOperatorMessageKeys.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.util.messagekeys; diff --git a/src/main/java/org/openlmis/referencedata/util/messagekeys/FacilityTypeApprovedProductMessageKeys.java b/src/main/java/org/openlmis/referencedata/util/messagekeys/FacilityTypeApprovedProductMessageKeys.java index ea2dc894a..d18cb2621 100644 --- a/src/main/java/org/openlmis/referencedata/util/messagekeys/FacilityTypeApprovedProductMessageKeys.java +++ b/src/main/java/org/openlmis/referencedata/util/messagekeys/FacilityTypeApprovedProductMessageKeys.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.util.messagekeys; diff --git a/src/main/java/org/openlmis/referencedata/util/messagekeys/FacilityTypeMessageKeys.java b/src/main/java/org/openlmis/referencedata/util/messagekeys/FacilityTypeMessageKeys.java index c6a6f4c98..e38788b17 100644 --- a/src/main/java/org/openlmis/referencedata/util/messagekeys/FacilityTypeMessageKeys.java +++ b/src/main/java/org/openlmis/referencedata/util/messagekeys/FacilityTypeMessageKeys.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.util.messagekeys; diff --git a/src/main/java/org/openlmis/referencedata/util/messagekeys/GeographicLevelMessageKeys.java b/src/main/java/org/openlmis/referencedata/util/messagekeys/GeographicLevelMessageKeys.java index cf4ea44c8..25eb4f44d 100644 --- a/src/main/java/org/openlmis/referencedata/util/messagekeys/GeographicLevelMessageKeys.java +++ b/src/main/java/org/openlmis/referencedata/util/messagekeys/GeographicLevelMessageKeys.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.util.messagekeys; diff --git a/src/main/java/org/openlmis/referencedata/util/messagekeys/GeographicZoneMessageKeys.java b/src/main/java/org/openlmis/referencedata/util/messagekeys/GeographicZoneMessageKeys.java index 1d83997a8..725d20ab8 100644 --- a/src/main/java/org/openlmis/referencedata/util/messagekeys/GeographicZoneMessageKeys.java +++ b/src/main/java/org/openlmis/referencedata/util/messagekeys/GeographicZoneMessageKeys.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.util.messagekeys; diff --git a/src/main/java/org/openlmis/referencedata/util/messagekeys/IdealStockAmountMessageKeys.java b/src/main/java/org/openlmis/referencedata/util/messagekeys/IdealStockAmountMessageKeys.java index fb82afe5e..27ea6a066 100644 --- a/src/main/java/org/openlmis/referencedata/util/messagekeys/IdealStockAmountMessageKeys.java +++ b/src/main/java/org/openlmis/referencedata/util/messagekeys/IdealStockAmountMessageKeys.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.util.messagekeys; diff --git a/src/main/java/org/openlmis/referencedata/util/messagekeys/LotMessageKeys.java b/src/main/java/org/openlmis/referencedata/util/messagekeys/LotMessageKeys.java index b9fad5678..f833358f5 100644 --- a/src/main/java/org/openlmis/referencedata/util/messagekeys/LotMessageKeys.java +++ b/src/main/java/org/openlmis/referencedata/util/messagekeys/LotMessageKeys.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.util.messagekeys; diff --git a/src/main/java/org/openlmis/referencedata/util/messagekeys/MessageKeys.java b/src/main/java/org/openlmis/referencedata/util/messagekeys/MessageKeys.java index f96222837..476ffd8a0 100644 --- a/src/main/java/org/openlmis/referencedata/util/messagekeys/MessageKeys.java +++ b/src/main/java/org/openlmis/referencedata/util/messagekeys/MessageKeys.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.util.messagekeys; diff --git a/src/main/java/org/openlmis/referencedata/util/messagekeys/OrderableDisplayCategoryMessageKeys.java b/src/main/java/org/openlmis/referencedata/util/messagekeys/OrderableDisplayCategoryMessageKeys.java index b8c39bd07..f244f1c8c 100644 --- a/src/main/java/org/openlmis/referencedata/util/messagekeys/OrderableDisplayCategoryMessageKeys.java +++ b/src/main/java/org/openlmis/referencedata/util/messagekeys/OrderableDisplayCategoryMessageKeys.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.util.messagekeys; diff --git a/src/main/java/org/openlmis/referencedata/util/messagekeys/OrderableMessageKeys.java b/src/main/java/org/openlmis/referencedata/util/messagekeys/OrderableMessageKeys.java index 75e5bc9ee..506644187 100644 --- a/src/main/java/org/openlmis/referencedata/util/messagekeys/OrderableMessageKeys.java +++ b/src/main/java/org/openlmis/referencedata/util/messagekeys/OrderableMessageKeys.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.util.messagekeys; diff --git a/src/main/java/org/openlmis/referencedata/util/messagekeys/OrderedDisplayValueMessageKeys.java b/src/main/java/org/openlmis/referencedata/util/messagekeys/OrderedDisplayValueMessageKeys.java index d3b984ccc..15489d1ca 100644 --- a/src/main/java/org/openlmis/referencedata/util/messagekeys/OrderedDisplayValueMessageKeys.java +++ b/src/main/java/org/openlmis/referencedata/util/messagekeys/OrderedDisplayValueMessageKeys.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.util.messagekeys; diff --git a/src/main/java/org/openlmis/referencedata/util/messagekeys/ProcessingPeriodMessageKeys.java b/src/main/java/org/openlmis/referencedata/util/messagekeys/ProcessingPeriodMessageKeys.java index 7f381aa13..dcc426aed 100644 --- a/src/main/java/org/openlmis/referencedata/util/messagekeys/ProcessingPeriodMessageKeys.java +++ b/src/main/java/org/openlmis/referencedata/util/messagekeys/ProcessingPeriodMessageKeys.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.util.messagekeys; diff --git a/src/main/java/org/openlmis/referencedata/util/messagekeys/ProcessingScheduleMessageKeys.java b/src/main/java/org/openlmis/referencedata/util/messagekeys/ProcessingScheduleMessageKeys.java index 64ee70afd..be91adefe 100644 --- a/src/main/java/org/openlmis/referencedata/util/messagekeys/ProcessingScheduleMessageKeys.java +++ b/src/main/java/org/openlmis/referencedata/util/messagekeys/ProcessingScheduleMessageKeys.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.util.messagekeys; diff --git a/src/main/java/org/openlmis/referencedata/util/messagekeys/ProgramMessageKeys.java b/src/main/java/org/openlmis/referencedata/util/messagekeys/ProgramMessageKeys.java index 43b57d978..587254417 100644 --- a/src/main/java/org/openlmis/referencedata/util/messagekeys/ProgramMessageKeys.java +++ b/src/main/java/org/openlmis/referencedata/util/messagekeys/ProgramMessageKeys.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.util.messagekeys; diff --git a/src/main/java/org/openlmis/referencedata/util/messagekeys/ProgramOrderableBuilderDeserializerMessageKeys.java b/src/main/java/org/openlmis/referencedata/util/messagekeys/ProgramOrderableBuilderDeserializerMessageKeys.java index 9da7878f1..51c885873 100644 --- a/src/main/java/org/openlmis/referencedata/util/messagekeys/ProgramOrderableBuilderDeserializerMessageKeys.java +++ b/src/main/java/org/openlmis/referencedata/util/messagekeys/ProgramOrderableBuilderDeserializerMessageKeys.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.util.messagekeys; diff --git a/src/main/java/org/openlmis/referencedata/util/messagekeys/ProgramOrderableBuilderMessageKeys.java b/src/main/java/org/openlmis/referencedata/util/messagekeys/ProgramOrderableBuilderMessageKeys.java index a4e358893..2d2eca252 100644 --- a/src/main/java/org/openlmis/referencedata/util/messagekeys/ProgramOrderableBuilderMessageKeys.java +++ b/src/main/java/org/openlmis/referencedata/util/messagekeys/ProgramOrderableBuilderMessageKeys.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.util.messagekeys; diff --git a/src/main/java/org/openlmis/referencedata/util/messagekeys/RequisitionGroupMessageKeys.java b/src/main/java/org/openlmis/referencedata/util/messagekeys/RequisitionGroupMessageKeys.java index f2e312ad6..26256e248 100644 --- a/src/main/java/org/openlmis/referencedata/util/messagekeys/RequisitionGroupMessageKeys.java +++ b/src/main/java/org/openlmis/referencedata/util/messagekeys/RequisitionGroupMessageKeys.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.util.messagekeys; diff --git a/src/main/java/org/openlmis/referencedata/util/messagekeys/RightMessageKeys.java b/src/main/java/org/openlmis/referencedata/util/messagekeys/RightMessageKeys.java index 5b1fc5e82..9f7340816 100644 --- a/src/main/java/org/openlmis/referencedata/util/messagekeys/RightMessageKeys.java +++ b/src/main/java/org/openlmis/referencedata/util/messagekeys/RightMessageKeys.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.util.messagekeys; diff --git a/src/main/java/org/openlmis/referencedata/util/messagekeys/RoleAssignmentMessageKeys.java b/src/main/java/org/openlmis/referencedata/util/messagekeys/RoleAssignmentMessageKeys.java index 9449a46ca..2155f4b1c 100644 --- a/src/main/java/org/openlmis/referencedata/util/messagekeys/RoleAssignmentMessageKeys.java +++ b/src/main/java/org/openlmis/referencedata/util/messagekeys/RoleAssignmentMessageKeys.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.util.messagekeys; diff --git a/src/main/java/org/openlmis/referencedata/util/messagekeys/RoleMessageKeys.java b/src/main/java/org/openlmis/referencedata/util/messagekeys/RoleMessageKeys.java index a847e8b67..655442c9b 100644 --- a/src/main/java/org/openlmis/referencedata/util/messagekeys/RoleMessageKeys.java +++ b/src/main/java/org/openlmis/referencedata/util/messagekeys/RoleMessageKeys.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.util.messagekeys; diff --git a/src/main/java/org/openlmis/referencedata/util/messagekeys/ServiceAccountMessageKeys.java b/src/main/java/org/openlmis/referencedata/util/messagekeys/ServiceAccountMessageKeys.java index 3772ff76b..34301eef7 100644 --- a/src/main/java/org/openlmis/referencedata/util/messagekeys/ServiceAccountMessageKeys.java +++ b/src/main/java/org/openlmis/referencedata/util/messagekeys/ServiceAccountMessageKeys.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.util.messagekeys; diff --git a/src/main/java/org/openlmis/referencedata/util/messagekeys/StockAdjustmentReasonMessageKeys.java b/src/main/java/org/openlmis/referencedata/util/messagekeys/StockAdjustmentReasonMessageKeys.java index d82f69fe3..a5ea8b03d 100644 --- a/src/main/java/org/openlmis/referencedata/util/messagekeys/StockAdjustmentReasonMessageKeys.java +++ b/src/main/java/org/openlmis/referencedata/util/messagekeys/StockAdjustmentReasonMessageKeys.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.util.messagekeys; diff --git a/src/main/java/org/openlmis/referencedata/util/messagekeys/SupervisoryNodeMessageKeys.java b/src/main/java/org/openlmis/referencedata/util/messagekeys/SupervisoryNodeMessageKeys.java index e1e2a93ad..c29781f0e 100644 --- a/src/main/java/org/openlmis/referencedata/util/messagekeys/SupervisoryNodeMessageKeys.java +++ b/src/main/java/org/openlmis/referencedata/util/messagekeys/SupervisoryNodeMessageKeys.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.util.messagekeys; diff --git a/src/main/java/org/openlmis/referencedata/util/messagekeys/SupplyLineMessageKeys.java b/src/main/java/org/openlmis/referencedata/util/messagekeys/SupplyLineMessageKeys.java index 619f68aa6..5f60e4e31 100644 --- a/src/main/java/org/openlmis/referencedata/util/messagekeys/SupplyLineMessageKeys.java +++ b/src/main/java/org/openlmis/referencedata/util/messagekeys/SupplyLineMessageKeys.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.util.messagekeys; diff --git a/src/main/java/org/openlmis/referencedata/util/messagekeys/SystemMessageKeys.java b/src/main/java/org/openlmis/referencedata/util/messagekeys/SystemMessageKeys.java index 7b01c70bf..5e56bb209 100644 --- a/src/main/java/org/openlmis/referencedata/util/messagekeys/SystemMessageKeys.java +++ b/src/main/java/org/openlmis/referencedata/util/messagekeys/SystemMessageKeys.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.util.messagekeys; diff --git a/src/main/java/org/openlmis/referencedata/util/messagekeys/TradeItemMessageKeys.java b/src/main/java/org/openlmis/referencedata/util/messagekeys/TradeItemMessageKeys.java index d07863a61..9051fba9e 100644 --- a/src/main/java/org/openlmis/referencedata/util/messagekeys/TradeItemMessageKeys.java +++ b/src/main/java/org/openlmis/referencedata/util/messagekeys/TradeItemMessageKeys.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.util.messagekeys; diff --git a/src/main/java/org/openlmis/referencedata/util/messagekeys/UserMessageKeys.java b/src/main/java/org/openlmis/referencedata/util/messagekeys/UserMessageKeys.java index 3e5b16e5e..62068f7d4 100644 --- a/src/main/java/org/openlmis/referencedata/util/messagekeys/UserMessageKeys.java +++ b/src/main/java/org/openlmis/referencedata/util/messagekeys/UserMessageKeys.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.util.messagekeys; diff --git a/src/main/java/org/openlmis/referencedata/util/messagekeys/ValidationMessageKeys.java b/src/main/java/org/openlmis/referencedata/util/messagekeys/ValidationMessageKeys.java index bd098ec9c..33006c593 100644 --- a/src/main/java/org/openlmis/referencedata/util/messagekeys/ValidationMessageKeys.java +++ b/src/main/java/org/openlmis/referencedata/util/messagekeys/ValidationMessageKeys.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.util.messagekeys; diff --git a/src/main/java/org/openlmis/referencedata/validate/BaseValidator.java b/src/main/java/org/openlmis/referencedata/validate/BaseValidator.java index 8c02066a3..01f26d0d0 100644 --- a/src/main/java/org/openlmis/referencedata/validate/BaseValidator.java +++ b/src/main/java/org/openlmis/referencedata/validate/BaseValidator.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.validate; diff --git a/src/main/java/org/openlmis/referencedata/validate/CommodityTypeValidator.java b/src/main/java/org/openlmis/referencedata/validate/CommodityTypeValidator.java index 5a880bdfe..8d2d94e8a 100644 --- a/src/main/java/org/openlmis/referencedata/validate/CommodityTypeValidator.java +++ b/src/main/java/org/openlmis/referencedata/validate/CommodityTypeValidator.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.validate; diff --git a/src/main/java/org/openlmis/referencedata/validate/CsvHeaderValidator.java b/src/main/java/org/openlmis/referencedata/validate/CsvHeaderValidator.java index 207e5cc3f..66de51241 100644 --- a/src/main/java/org/openlmis/referencedata/validate/CsvHeaderValidator.java +++ b/src/main/java/org/openlmis/referencedata/validate/CsvHeaderValidator.java @@ -5,16 +5,23 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.validate; +import static org.openlmis.referencedata.util.StringHelper.lowerCase; +import static org.openlmis.referencedata.util.messagekeys.CsvUploadMessageKeys.ERROR_UPLOAD_HEADER_INVALID; +import static org.openlmis.referencedata.util.messagekeys.CsvUploadMessageKeys.ERROR_UPLOAD_HEADER_MISSING; +import static org.openlmis.referencedata.util.messagekeys.CsvUploadMessageKeys.ERROR_UPLOAD_MISSING_MANDATORY_COLUMNS; + +import java.util.List; +import java.util.stream.Collectors; import org.apache.commons.collections.ListUtils; import org.openlmis.referencedata.exception.ValidationMessageException; import org.openlmis.referencedata.util.Message; @@ -22,14 +29,6 @@ import org.openlmis.referencedata.web.csv.model.ModelField; import org.springframework.stereotype.Component; -import java.util.List; -import java.util.stream.Collectors; - -import static org.openlmis.referencedata.util.StringHelper.lowerCase; -import static org.openlmis.referencedata.util.messagekeys.CsvUploadMessageKeys.ERROR_UPLOAD_HEADER_INVALID; -import static org.openlmis.referencedata.util.messagekeys.CsvUploadMessageKeys.ERROR_UPLOAD_HEADER_MISSING; -import static org.openlmis.referencedata.util.messagekeys.CsvUploadMessageKeys.ERROR_UPLOAD_MISSING_MANDATORY_COLUMNS; - @Component public class CsvHeaderValidator { diff --git a/src/main/java/org/openlmis/referencedata/validate/FacilityValidator.java b/src/main/java/org/openlmis/referencedata/validate/FacilityValidator.java index a1f03af1b..6c96f4271 100644 --- a/src/main/java/org/openlmis/referencedata/validate/FacilityValidator.java +++ b/src/main/java/org/openlmis/referencedata/validate/FacilityValidator.java @@ -5,16 +5,19 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.validate; +import java.util.HashSet; +import java.util.Objects; +import java.util.Set; import org.openlmis.referencedata.dto.FacilityDto; import org.openlmis.referencedata.dto.SupportedProgramDto; import org.openlmis.referencedata.exception.ValidationMessageException; @@ -24,10 +27,6 @@ import org.springframework.stereotype.Component; import org.springframework.validation.Errors; -import java.util.HashSet; -import java.util.Objects; -import java.util.Set; - @Component public class FacilityValidator implements BaseValidator { diff --git a/src/main/java/org/openlmis/referencedata/validate/IdealStockAmountValidator.java b/src/main/java/org/openlmis/referencedata/validate/IdealStockAmountValidator.java index 0f0d55be7..3e9dc23fe 100644 --- a/src/main/java/org/openlmis/referencedata/validate/IdealStockAmountValidator.java +++ b/src/main/java/org/openlmis/referencedata/validate/IdealStockAmountValidator.java @@ -5,23 +5,23 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.validate; +import static org.openlmis.referencedata.util.messagekeys.IdealStockAmountMessageKeys.ERROR_FROM_FIELD_REQUIRED; + import org.openlmis.referencedata.dto.IdealStockAmountCsvModel; import org.openlmis.referencedata.exception.ValidationMessageException; import org.openlmis.referencedata.util.Message; import org.springframework.stereotype.Component; -import static org.openlmis.referencedata.util.messagekeys.IdealStockAmountMessageKeys.ERROR_FROM_FIELD_REQUIRED; - @Component public class IdealStockAmountValidator { diff --git a/src/main/java/org/openlmis/referencedata/validate/LotValidator.java b/src/main/java/org/openlmis/referencedata/validate/LotValidator.java index 05fbe401e..a4d503b67 100644 --- a/src/main/java/org/openlmis/referencedata/validate/LotValidator.java +++ b/src/main/java/org/openlmis/referencedata/validate/LotValidator.java @@ -5,16 +5,19 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.validate; +import java.util.List; +import java.util.UUID; +import java.util.stream.Collectors; import org.openlmis.referencedata.domain.Lot; import org.openlmis.referencedata.domain.TradeItem; import org.openlmis.referencedata.dto.LotDto; @@ -28,10 +31,6 @@ import org.springframework.validation.ValidationUtils; import org.springframework.validation.Validator; -import java.util.List; -import java.util.UUID; -import java.util.stream.Collectors; - /** * A validator for {@link LotDto} object. */ diff --git a/src/main/java/org/openlmis/referencedata/validate/OrderableValidator.java b/src/main/java/org/openlmis/referencedata/validate/OrderableValidator.java index 044a67df9..019601794 100644 --- a/src/main/java/org/openlmis/referencedata/validate/OrderableValidator.java +++ b/src/main/java/org/openlmis/referencedata/validate/OrderableValidator.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.validate; diff --git a/src/main/java/org/openlmis/referencedata/validate/ProcessingPeriodValidator.java b/src/main/java/org/openlmis/referencedata/validate/ProcessingPeriodValidator.java index 75da5492b..c982da348 100644 --- a/src/main/java/org/openlmis/referencedata/validate/ProcessingPeriodValidator.java +++ b/src/main/java/org/openlmis/referencedata/validate/ProcessingPeriodValidator.java @@ -5,25 +5,25 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.validate; +import java.time.LocalDate; +import java.util.List; +import java.util.UUID; import org.openlmis.referencedata.domain.ProcessingPeriod; import org.openlmis.referencedata.repository.ProcessingPeriodRepository; import org.openlmis.referencedata.util.messagekeys.ProcessingPeriodMessageKeys; import org.openlmis.referencedata.util.messagekeys.ValidationMessageKeys; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.Errors; -import java.time.LocalDate; -import java.util.List; -import java.util.UUID; public class ProcessingPeriodValidator implements BaseValidator { private static final String START_DATE = "startDate"; diff --git a/src/main/java/org/openlmis/referencedata/validate/ProgramValidator.java b/src/main/java/org/openlmis/referencedata/validate/ProgramValidator.java index 563c70c2d..1019e5986 100644 --- a/src/main/java/org/openlmis/referencedata/validate/ProgramValidator.java +++ b/src/main/java/org/openlmis/referencedata/validate/ProgramValidator.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.validate; diff --git a/src/main/java/org/openlmis/referencedata/validate/RequisitionGroupValidator.java b/src/main/java/org/openlmis/referencedata/validate/RequisitionGroupValidator.java index 2b6514cc6..fa0779263 100644 --- a/src/main/java/org/openlmis/referencedata/validate/RequisitionGroupValidator.java +++ b/src/main/java/org/openlmis/referencedata/validate/RequisitionGroupValidator.java @@ -5,16 +5,22 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.validate; +import java.util.Collections; +import java.util.List; +import java.util.Optional; +import java.util.Set; +import java.util.UUID; +import java.util.stream.Collectors; import org.openlmis.referencedata.domain.RequisitionGroup; import org.openlmis.referencedata.domain.RequisitionGroupProgramSchedule; import org.openlmis.referencedata.dto.FacilityDto; @@ -31,13 +37,6 @@ import org.springframework.validation.ValidationUtils; import org.springframework.validation.Validator; -import java.util.Collections; -import java.util.List; -import java.util.Optional; -import java.util.Set; -import java.util.UUID; -import java.util.stream.Collectors; - /** * A validator for {@link RequisitionGroupBaseDto} object. */ diff --git a/src/main/java/org/openlmis/referencedata/validate/SupervisoryNodeValidator.java b/src/main/java/org/openlmis/referencedata/validate/SupervisoryNodeValidator.java index 380e17552..46876b36f 100644 --- a/src/main/java/org/openlmis/referencedata/validate/SupervisoryNodeValidator.java +++ b/src/main/java/org/openlmis/referencedata/validate/SupervisoryNodeValidator.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.validate; diff --git a/src/main/java/org/openlmis/referencedata/validate/TradeItemValidator.java b/src/main/java/org/openlmis/referencedata/validate/TradeItemValidator.java index 26c837d85..50af34502 100644 --- a/src/main/java/org/openlmis/referencedata/validate/TradeItemValidator.java +++ b/src/main/java/org/openlmis/referencedata/validate/TradeItemValidator.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.validate; diff --git a/src/main/java/org/openlmis/referencedata/web/BaseController.java b/src/main/java/org/openlmis/referencedata/web/BaseController.java index b1496288e..4d399d376 100644 --- a/src/main/java/org/openlmis/referencedata/web/BaseController.java +++ b/src/main/java/org/openlmis/referencedata/web/BaseController.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.web; @@ -19,6 +19,9 @@ import static org.openlmis.referencedata.util.messagekeys.CsvUploadMessageKeys.ERROR_INCORRECT_FILE_FORMAT; import static org.openlmis.referencedata.web.BaseController.API_PATH; +import java.util.List; +import java.util.UUID; +import javax.annotation.Resource; import org.apache.commons.lang3.StringUtils; import org.javers.core.Javers; import org.javers.core.changelog.SimpleTextChangeLog; @@ -41,11 +44,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.multipart.MultipartFile; -import java.util.List; -import java.util.UUID; - -import javax.annotation.Resource; - @RequestMapping(API_PATH) public abstract class BaseController { @@ -207,10 +205,10 @@ private List getChangesByType(Class type, UUID id, String author, queryBuilder = queryBuilder.withNewObjectChanges(true).skip(skip).limit(limit); - if ( StringUtils.isNotBlank(author) ) { + if (StringUtils.isNotBlank(author)) { queryBuilder = queryBuilder.byAuthor(author); } - if ( StringUtils.isNotBlank(changedPropertyName) ) { + if (StringUtils.isNotBlank(changedPropertyName)) { queryBuilder = queryBuilder.andProperty(changedPropertyName); } diff --git a/src/main/java/org/openlmis/referencedata/web/CommodityTypeController.java b/src/main/java/org/openlmis/referencedata/web/CommodityTypeController.java index 0f2bc6827..73e74409f 100644 --- a/src/main/java/org/openlmis/referencedata/web/CommodityTypeController.java +++ b/src/main/java/org/openlmis/referencedata/web/CommodityTypeController.java @@ -5,18 +5,21 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.web; import static org.openlmis.referencedata.domain.RightName.ORDERABLES_MANAGE; +import java.util.HashSet; +import java.util.Set; +import java.util.UUID; import org.openlmis.referencedata.domain.CommodityType; import org.openlmis.referencedata.domain.TradeItem; import org.openlmis.referencedata.dto.CommodityTypeDto; @@ -45,10 +48,6 @@ import org.springframework.web.bind.annotation.ResponseStatus; import org.springframework.web.bind.annotation.RestController; -import java.util.HashSet; -import java.util.Set; -import java.util.UUID; - @RestController public class CommodityTypeController extends BaseController { @@ -64,7 +63,7 @@ public class CommodityTypeController extends BaseController { private CommodityTypeValidator validator; /** - * Add or update a commodity type + * Add or update a commodity type. * * @param commodityTypeDto the commodity type to add or update. * diff --git a/src/main/java/org/openlmis/referencedata/web/CurrencySettingsController.java b/src/main/java/org/openlmis/referencedata/web/CurrencySettingsController.java index 30dd7cad5..8bcb4a9db 100644 --- a/src/main/java/org/openlmis/referencedata/web/CurrencySettingsController.java +++ b/src/main/java/org/openlmis/referencedata/web/CurrencySettingsController.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.web; diff --git a/src/main/java/org/openlmis/referencedata/web/FacilityController.java b/src/main/java/org/openlmis/referencedata/web/FacilityController.java index 1c140ee76..209bbbe4f 100755 --- a/src/main/java/org/openlmis/referencedata/web/FacilityController.java +++ b/src/main/java/org/openlmis/referencedata/web/FacilityController.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.web; diff --git a/src/main/java/org/openlmis/referencedata/web/FacilityOperatorController.java b/src/main/java/org/openlmis/referencedata/web/FacilityOperatorController.java index c59bd134a..5c0a2ee85 100644 --- a/src/main/java/org/openlmis/referencedata/web/FacilityOperatorController.java +++ b/src/main/java/org/openlmis/referencedata/web/FacilityOperatorController.java @@ -5,18 +5,19 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.web; import static org.openlmis.referencedata.web.FacilityOperatorController.RESOURCE_PATH; +import java.util.UUID; import org.openlmis.referencedata.domain.FacilityOperator; import org.openlmis.referencedata.domain.RightName; import org.openlmis.referencedata.exception.NotFoundException; @@ -39,7 +40,6 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.ResponseStatus; -import java.util.UUID; @Controller @RequestMapping(RESOURCE_PATH) diff --git a/src/main/java/org/openlmis/referencedata/web/FacilitySearchParams.java b/src/main/java/org/openlmis/referencedata/web/FacilitySearchParams.java index 527ee0f9c..aab1aeb7e 100644 --- a/src/main/java/org/openlmis/referencedata/web/FacilitySearchParams.java +++ b/src/main/java/org/openlmis/referencedata/web/FacilitySearchParams.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.web; diff --git a/src/main/java/org/openlmis/referencedata/web/FacilityTypeApprovedProductController.java b/src/main/java/org/openlmis/referencedata/web/FacilityTypeApprovedProductController.java index a097e1c99..215280419 100644 --- a/src/main/java/org/openlmis/referencedata/web/FacilityTypeApprovedProductController.java +++ b/src/main/java/org/openlmis/referencedata/web/FacilityTypeApprovedProductController.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.web; diff --git a/src/main/java/org/openlmis/referencedata/web/FacilityTypeController.java b/src/main/java/org/openlmis/referencedata/web/FacilityTypeController.java index eb99fd586..88bd02470 100644 --- a/src/main/java/org/openlmis/referencedata/web/FacilityTypeController.java +++ b/src/main/java/org/openlmis/referencedata/web/FacilityTypeController.java @@ -5,18 +5,19 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.web; import static org.openlmis.referencedata.web.FacilityTypeController.RESOURCE_PATH; +import java.util.UUID; import org.openlmis.referencedata.domain.FacilityType; import org.openlmis.referencedata.domain.RightName; import org.openlmis.referencedata.exception.IntegrityViolationException; @@ -44,7 +45,6 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.ResponseStatus; -import java.util.UUID; @Controller @RequestMapping(RESOURCE_PATH) diff --git a/src/main/java/org/openlmis/referencedata/web/GeographicLevelController.java b/src/main/java/org/openlmis/referencedata/web/GeographicLevelController.java index 22dbc616a..35b61dc94 100644 --- a/src/main/java/org/openlmis/referencedata/web/GeographicLevelController.java +++ b/src/main/java/org/openlmis/referencedata/web/GeographicLevelController.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.web; @@ -18,6 +18,7 @@ import static org.openlmis.referencedata.domain.RightName.GEOGRAPHIC_ZONES_MANAGE_RIGHT; import static org.openlmis.referencedata.web.GeographicLevelController.RESOURCE_PATH; +import java.util.UUID; import org.openlmis.referencedata.domain.GeographicLevel; import org.openlmis.referencedata.exception.NotFoundException; import org.openlmis.referencedata.repository.GeographicLevelRepository; @@ -40,8 +41,6 @@ import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.ResponseStatus; -import java.util.UUID; - @Controller @RequestMapping(RESOURCE_PATH) @Transactional diff --git a/src/main/java/org/openlmis/referencedata/web/GeographicZoneController.java b/src/main/java/org/openlmis/referencedata/web/GeographicZoneController.java index e1a461838..cb7c607b0 100644 --- a/src/main/java/org/openlmis/referencedata/web/GeographicZoneController.java +++ b/src/main/java/org/openlmis/referencedata/web/GeographicZoneController.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.web; @@ -18,7 +18,11 @@ import static org.openlmis.referencedata.domain.RightName.GEOGRAPHIC_ZONES_MANAGE_RIGHT; import com.vividsolutions.jts.geom.Point; - +import java.util.List; +import java.util.Map; +import java.util.UUID; +import java.util.stream.Collectors; +import java.util.stream.StreamSupport; import org.openlmis.referencedata.domain.GeographicZone; import org.openlmis.referencedata.domain.RightName; import org.openlmis.referencedata.dto.GeographicZoneDto; @@ -45,12 +49,6 @@ import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.ResponseStatus; -import java.util.List; -import java.util.Map; -import java.util.UUID; -import java.util.stream.Collectors; -import java.util.stream.StreamSupport; - @Controller @Transactional public class GeographicZoneController extends BaseController { diff --git a/src/main/java/org/openlmis/referencedata/web/IdealStockAmountController.java b/src/main/java/org/openlmis/referencedata/web/IdealStockAmountController.java index 03ed73d1c..7096a63fc 100644 --- a/src/main/java/org/openlmis/referencedata/web/IdealStockAmountController.java +++ b/src/main/java/org/openlmis/referencedata/web/IdealStockAmountController.java @@ -5,18 +5,23 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.web; import static org.openlmis.referencedata.util.messagekeys.IdealStockAmountMessageKeys.ERROR_FORMAT_NOT_ALLOWED; +import java.io.IOException; +import java.util.List; +import java.util.stream.Collectors; +import java.util.stream.StreamSupport; +import javax.servlet.http.HttpServletResponse; import org.openlmis.referencedata.domain.IdealStockAmount; import org.openlmis.referencedata.domain.RightName; import org.openlmis.referencedata.dto.IdealStockAmountCsvModel; @@ -54,11 +59,6 @@ import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.ResponseStatus; import org.springframework.web.multipart.MultipartFile; -import java.io.IOException; -import java.util.List; -import java.util.stream.Collectors; -import java.util.stream.StreamSupport; -import javax.servlet.http.HttpServletResponse; @Controller @Transactional diff --git a/src/main/java/org/openlmis/referencedata/web/LocationController.java b/src/main/java/org/openlmis/referencedata/web/LocationController.java index 451ecd219..601f35df0 100644 --- a/src/main/java/org/openlmis/referencedata/web/LocationController.java +++ b/src/main/java/org/openlmis/referencedata/web/LocationController.java @@ -5,18 +5,20 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.web; import static org.openlmis.referencedata.util.Pagination.handlePage; +import java.util.ArrayList; +import java.util.List; import org.openlmis.referencedata.repository.FacilityRepository; import org.openlmis.referencedata.repository.GeographicZoneRepository; import org.openlmis.referencedata.web.fhir.Location; @@ -26,8 +28,6 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.ResponseStatus; import org.springframework.web.bind.annotation.RestController; -import java.util.ArrayList; -import java.util.List; @RestController public class LocationController extends BaseController { diff --git a/src/main/java/org/openlmis/referencedata/web/LotController.java b/src/main/java/org/openlmis/referencedata/web/LotController.java index d57c7500f..6b8a13ae6 100644 --- a/src/main/java/org/openlmis/referencedata/web/LotController.java +++ b/src/main/java/org/openlmis/referencedata/web/LotController.java @@ -5,18 +5,21 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.web; import static org.openlmis.referencedata.domain.RightName.ORDERABLES_MANAGE; +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; import org.openlmis.referencedata.domain.Lot; import org.openlmis.referencedata.domain.TradeItem; import org.openlmis.referencedata.dto.LotDto; @@ -49,10 +52,6 @@ import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.ResponseStatus; -import java.util.ArrayList; -import java.util.List; -import java.util.UUID; - @Controller @Transactional public class LotController extends BaseController { diff --git a/src/main/java/org/openlmis/referencedata/web/MessageController.java b/src/main/java/org/openlmis/referencedata/web/MessageController.java index 4cda2edf8..dc02b3322 100644 --- a/src/main/java/org/openlmis/referencedata/web/MessageController.java +++ b/src/main/java/org/openlmis/referencedata/web/MessageController.java @@ -5,16 +5,17 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.web; +import java.util.Map; import org.openlmis.referencedata.i18n.ExposedMessageSource; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -23,8 +24,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import java.util.Map; - @RestController public class MessageController { diff --git a/src/main/java/org/openlmis/referencedata/web/OrderableDisplayCategoryController.java b/src/main/java/org/openlmis/referencedata/web/OrderableDisplayCategoryController.java index 670c85d45..08bfed14e 100644 --- a/src/main/java/org/openlmis/referencedata/web/OrderableDisplayCategoryController.java +++ b/src/main/java/org/openlmis/referencedata/web/OrderableDisplayCategoryController.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.web; @@ -18,6 +18,8 @@ import static org.openlmis.referencedata.domain.RightName.ORDERABLES_MANAGE; import static org.openlmis.referencedata.dto.OrderableDisplayCategoryDto.newInstance; +import java.util.Collections; +import java.util.UUID; import org.openlmis.referencedata.domain.Code; import org.openlmis.referencedata.domain.OrderableDisplayCategory; import org.openlmis.referencedata.dto.OrderableDisplayCategoryDto; @@ -44,9 +46,6 @@ import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.ResponseStatus; -import java.util.Collections; -import java.util.UUID; - @Controller @Transactional public class OrderableDisplayCategoryController extends BaseController { diff --git a/src/main/java/org/openlmis/referencedata/web/OrderableFulfill.java b/src/main/java/org/openlmis/referencedata/web/OrderableFulfill.java index 9f3f55c1d..030bcf82e 100644 --- a/src/main/java/org/openlmis/referencedata/web/OrderableFulfill.java +++ b/src/main/java/org/openlmis/referencedata/web/OrderableFulfill.java @@ -5,25 +5,24 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.web; import static java.util.Collections.emptyList; -import lombok.AccessLevel; -import lombok.AllArgsConstructor; -import lombok.Getter; - import java.util.Arrays; import java.util.List; import java.util.UUID; +import lombok.AccessLevel; +import lombok.AllArgsConstructor; +import lombok.Getter; @Getter @AllArgsConstructor(access = AccessLevel.PRIVATE) diff --git a/src/main/java/org/openlmis/referencedata/web/OrderableFulfillController.java b/src/main/java/org/openlmis/referencedata/web/OrderableFulfillController.java index 4db6e5c31..950273701 100644 --- a/src/main/java/org/openlmis/referencedata/web/OrderableFulfillController.java +++ b/src/main/java/org/openlmis/referencedata/web/OrderableFulfillController.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.web; @@ -18,7 +18,10 @@ import static org.openlmis.referencedata.util.Pagination.handlePage; import com.google.common.collect.Maps; - +import java.util.Map; +import java.util.Optional; +import java.util.Set; +import java.util.UUID; import org.openlmis.referencedata.domain.Orderable; import org.openlmis.referencedata.repository.OrderableRepository; import org.openlmis.referencedata.util.UuidUtil; @@ -33,11 +36,6 @@ import org.springframework.web.bind.annotation.ResponseStatus; import org.springframework.web.bind.annotation.RestController; -import java.util.Map; -import java.util.Optional; -import java.util.Set; -import java.util.UUID; - @RestController @Transactional public class OrderableFulfillController extends BaseController { diff --git a/src/main/java/org/openlmis/referencedata/web/OrderableFulfillFactory.java b/src/main/java/org/openlmis/referencedata/web/OrderableFulfillFactory.java index 367340ca5..b2bb1cd40 100644 --- a/src/main/java/org/openlmis/referencedata/web/OrderableFulfillFactory.java +++ b/src/main/java/org/openlmis/referencedata/web/OrderableFulfillFactory.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.web; @@ -21,7 +21,8 @@ import static org.openlmis.referencedata.util.Pagination.handlePage; import com.google.common.collect.Lists; - +import java.util.List; +import java.util.UUID; import org.openlmis.referencedata.domain.BaseEntity; import org.openlmis.referencedata.domain.CommodityType; import org.openlmis.referencedata.domain.Dispensable; @@ -33,9 +34,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import java.util.List; -import java.util.UUID; - @Component public class OrderableFulfillFactory { diff --git a/src/main/java/org/openlmis/referencedata/web/ProcessingPeriodController.java b/src/main/java/org/openlmis/referencedata/web/ProcessingPeriodController.java index 3be499b7e..4282d2159 100644 --- a/src/main/java/org/openlmis/referencedata/web/ProcessingPeriodController.java +++ b/src/main/java/org/openlmis/referencedata/web/ProcessingPeriodController.java @@ -5,18 +5,20 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.web; import static java.util.stream.Collectors.toList; +import java.util.List; +import java.util.UUID; import org.openlmis.referencedata.domain.ProcessingPeriod; import org.openlmis.referencedata.domain.RightName; import org.openlmis.referencedata.dto.ProcessingPeriodDto; @@ -51,8 +53,6 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.ResponseStatus; -import java.util.List; -import java.util.UUID; @Controller @Transactional diff --git a/src/main/java/org/openlmis/referencedata/web/ProcessingScheduleController.java b/src/main/java/org/openlmis/referencedata/web/ProcessingScheduleController.java index ad1f5ac67..280e854db 100644 --- a/src/main/java/org/openlmis/referencedata/web/ProcessingScheduleController.java +++ b/src/main/java/org/openlmis/referencedata/web/ProcessingScheduleController.java @@ -5,16 +5,20 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.web; +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; +import java.util.stream.Collectors; import org.openlmis.referencedata.domain.Facility; import org.openlmis.referencedata.domain.ProcessingSchedule; import org.openlmis.referencedata.domain.Program; @@ -49,10 +53,6 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.ResponseStatus; -import java.util.ArrayList; -import java.util.List; -import java.util.UUID; -import java.util.stream.Collectors; @Controller @Transactional diff --git a/src/main/java/org/openlmis/referencedata/web/ProgramController.java b/src/main/java/org/openlmis/referencedata/web/ProgramController.java index 8639ce949..62384de5d 100644 --- a/src/main/java/org/openlmis/referencedata/web/ProgramController.java +++ b/src/main/java/org/openlmis/referencedata/web/ProgramController.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.web; diff --git a/src/main/java/org/openlmis/referencedata/web/ProgramSearchParams.java b/src/main/java/org/openlmis/referencedata/web/ProgramSearchParams.java index 14e25407b..a10225cbb 100644 --- a/src/main/java/org/openlmis/referencedata/web/ProgramSearchParams.java +++ b/src/main/java/org/openlmis/referencedata/web/ProgramSearchParams.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.web; diff --git a/src/main/java/org/openlmis/referencedata/web/RequisitionGroupController.java b/src/main/java/org/openlmis/referencedata/web/RequisitionGroupController.java index 7294dfa76..178e35808 100644 --- a/src/main/java/org/openlmis/referencedata/web/RequisitionGroupController.java +++ b/src/main/java/org/openlmis/referencedata/web/RequisitionGroupController.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.web; diff --git a/src/main/java/org/openlmis/referencedata/web/RightController.java b/src/main/java/org/openlmis/referencedata/web/RightController.java index c59d5509c..c62bab5a6 100644 --- a/src/main/java/org/openlmis/referencedata/web/RightController.java +++ b/src/main/java/org/openlmis/referencedata/web/RightController.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.web; @@ -18,7 +18,13 @@ import static java.util.stream.Collectors.toSet; import com.google.common.collect.Sets; - +import java.util.HashSet; +import java.util.Objects; +import java.util.Set; +import java.util.UUID; +import java.util.stream.Collectors; +import java.util.stream.Stream; +import lombok.NoArgsConstructor; import org.openlmis.referencedata.domain.Right; import org.openlmis.referencedata.domain.RightName; import org.openlmis.referencedata.domain.RightType; @@ -44,15 +50,6 @@ import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.ResponseStatus; -import lombok.NoArgsConstructor; - -import java.util.HashSet; -import java.util.Objects; -import java.util.Set; -import java.util.UUID; -import java.util.stream.Collectors; -import java.util.stream.Stream; - @NoArgsConstructor @Controller @Transactional diff --git a/src/main/java/org/openlmis/referencedata/web/RoleController.java b/src/main/java/org/openlmis/referencedata/web/RoleController.java index 8b0666a12..e6ebaa9c4 100644 --- a/src/main/java/org/openlmis/referencedata/web/RoleController.java +++ b/src/main/java/org/openlmis/referencedata/web/RoleController.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.web; diff --git a/src/main/java/org/openlmis/referencedata/web/ServiceAccountController.java b/src/main/java/org/openlmis/referencedata/web/ServiceAccountController.java index 765a29fed..714d85213 100644 --- a/src/main/java/org/openlmis/referencedata/web/ServiceAccountController.java +++ b/src/main/java/org/openlmis/referencedata/web/ServiceAccountController.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.web; @@ -18,6 +18,7 @@ import static org.openlmis.referencedata.domain.RightName.SERVICE_ACCOUNTS_MANAGE; import static org.openlmis.referencedata.util.messagekeys.ServiceAccountMessageKeys.ERROR_TOKEN_MISMATCH; +import java.util.UUID; import org.openlmis.referencedata.domain.CreationDetails; import org.openlmis.referencedata.domain.ServiceAccount; import org.openlmis.referencedata.domain.User; @@ -42,8 +43,6 @@ import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.ResponseStatus; -import java.util.UUID; - @Controller @Transactional public class ServiceAccountController extends BaseController { diff --git a/src/main/java/org/openlmis/referencedata/web/StockAdjustmentReasonController.java b/src/main/java/org/openlmis/referencedata/web/StockAdjustmentReasonController.java index 21c4cc00c..592a15bee 100644 --- a/src/main/java/org/openlmis/referencedata/web/StockAdjustmentReasonController.java +++ b/src/main/java/org/openlmis/referencedata/web/StockAdjustmentReasonController.java @@ -5,18 +5,20 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.web; import static org.openlmis.referencedata.domain.RightName.STOCK_ADJUSTMENT_REASONS_MANAGE; +import java.util.List; +import java.util.UUID; import org.openlmis.referencedata.domain.RightName; import org.openlmis.referencedata.domain.StockAdjustmentReason; import org.openlmis.referencedata.exception.NotFoundException; @@ -40,9 +42,6 @@ import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.ResponseStatus; -import java.util.List; -import java.util.UUID; - @Controller @Transactional public class StockAdjustmentReasonController extends BaseController { @@ -199,7 +198,7 @@ public StockAdjustmentReason updateStockAdjustmentReason( /** - * Retrieves StockAdjustmentReasons for a specified program + * Retrieves StockAdjustmentReasons for a specified program. * * @param programId the program id. * @return a list of StockAdjustmentReasons. diff --git a/src/main/java/org/openlmis/referencedata/web/SupervisoryNodeController.java b/src/main/java/org/openlmis/referencedata/web/SupervisoryNodeController.java index 0132158b4..dada012ec 100644 --- a/src/main/java/org/openlmis/referencedata/web/SupervisoryNodeController.java +++ b/src/main/java/org/openlmis/referencedata/web/SupervisoryNodeController.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.web; diff --git a/src/main/java/org/openlmis/referencedata/web/SupervisoryNodeSearchParams.java b/src/main/java/org/openlmis/referencedata/web/SupervisoryNodeSearchParams.java index a8675e593..431bbee1d 100644 --- a/src/main/java/org/openlmis/referencedata/web/SupervisoryNodeSearchParams.java +++ b/src/main/java/org/openlmis/referencedata/web/SupervisoryNodeSearchParams.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.web; diff --git a/src/main/java/org/openlmis/referencedata/web/SupplyLineController.java b/src/main/java/org/openlmis/referencedata/web/SupplyLineController.java index c19d82c9d..e8f890529 100644 --- a/src/main/java/org/openlmis/referencedata/web/SupplyLineController.java +++ b/src/main/java/org/openlmis/referencedata/web/SupplyLineController.java @@ -5,18 +5,23 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.web; import static org.openlmis.referencedata.domain.RightName.SUPPLY_LINES_MANAGE; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.UUID; +import java.util.stream.Collectors; import org.openlmis.referencedata.domain.Facility; import org.openlmis.referencedata.domain.Program; import org.openlmis.referencedata.domain.SupervisoryNode; @@ -48,12 +53,6 @@ import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.ResponseStatus; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.UUID; -import java.util.stream.Collectors; - @Controller @Transactional public class SupplyLineController extends BaseController { diff --git a/src/main/java/org/openlmis/referencedata/web/TradeItemController.java b/src/main/java/org/openlmis/referencedata/web/TradeItemController.java index 57ca6a144..94bd8c85d 100644 --- a/src/main/java/org/openlmis/referencedata/web/TradeItemController.java +++ b/src/main/java/org/openlmis/referencedata/web/TradeItemController.java @@ -5,18 +5,19 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.web; import static org.openlmis.referencedata.domain.RightName.ORDERABLES_MANAGE; +import java.util.UUID; import org.apache.commons.lang3.StringUtils; import org.openlmis.referencedata.domain.TradeItem; import org.openlmis.referencedata.dto.TradeItemDto; @@ -41,8 +42,6 @@ import org.springframework.web.bind.annotation.ResponseStatus; import org.springframework.web.bind.annotation.RestController; -import java.util.UUID; - @RestController public class TradeItemController extends BaseController { diff --git a/src/main/java/org/openlmis/referencedata/web/UserController.java b/src/main/java/org/openlmis/referencedata/web/UserController.java index 10fd57bc5..dae3e9892 100644 --- a/src/main/java/org/openlmis/referencedata/web/UserController.java +++ b/src/main/java/org/openlmis/referencedata/web/UserController.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.web; @@ -144,7 +144,7 @@ public UserController(UserService userService, RightRepository rightRepository, ProgramRepository programRepository, SupervisoryNodeRepository supervisoryNodeRepository, - FacilityRepository facilityRepository ) { + FacilityRepository facilityRepository) { this.userService = userService; this.userRepository = userRepository; this.roleRepository = roleRepository; @@ -533,16 +533,16 @@ public Set getUserSupervisedFacilities( checkAdminRight(RightName.USERS_MANAGE_RIGHT, true, userId, profiler); profiler.start("GET_USER"); - User user = (User) validateId(userId, userRepository).orElseThrow( () -> + User user = (User) validateId(userId, userRepository).orElseThrow(() -> new NotFoundException(new Message(UserMessageKeys.ERROR_NOT_FOUND_WITH_ID, userId))); profiler.start("GET_RIGHT"); - Right right = (Right) validateId(rightId, rightRepository).orElseThrow( () -> + Right right = (Right) validateId(rightId, rightRepository).orElseThrow(() -> new ValidationMessageException( new Message(RightMessageKeys.ERROR_NOT_FOUND_WITH_ID, rightId))); profiler.start("GET_PROGRAM"); - Program program = (Program) validateId(programId, programRepository).orElseThrow( () -> + Program program = (Program) validateId(programId, programRepository).orElseThrow(() -> new ValidationMessageException( new Message(ProgramMessageKeys.ERROR_NOT_FOUND_WITH_ID, programId))); @@ -577,7 +577,7 @@ public Set getUserFulfillmentFacilities( User user = validateUser(userId); profiler.start("VALIDATE_RIGHT"); - Right right = (Right) validateId(rightId, rightRepository).orElseThrow( () -> + Right right = (Right) validateId(rightId, rightRepository).orElseThrow(() -> new ValidationMessageException( new Message(RightMessageKeys.ERROR_NOT_FOUND_WITH_ID, rightId))); diff --git a/src/main/java/org/openlmis/referencedata/web/VersionController.java b/src/main/java/org/openlmis/referencedata/web/VersionController.java index e43112a2e..5b4c003b8 100644 --- a/src/main/java/org/openlmis/referencedata/web/VersionController.java +++ b/src/main/java/org/openlmis/referencedata/web/VersionController.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.web; diff --git a/src/main/java/org/openlmis/referencedata/web/csv/format/CsvBeanWriter.java b/src/main/java/org/openlmis/referencedata/web/csv/format/CsvBeanWriter.java index d05b0a7dd..5e060617f 100644 --- a/src/main/java/org/openlmis/referencedata/web/csv/format/CsvBeanWriter.java +++ b/src/main/java/org/openlmis/referencedata/web/csv/format/CsvBeanWriter.java @@ -5,16 +5,23 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.web.csv.format; +import static java.util.Arrays.asList; + +import java.io.BufferedWriter; +import java.io.IOException; +import java.io.OutputStream; +import java.io.OutputStreamWriter; +import java.util.List; import lombok.Getter; import org.openlmis.referencedata.dto.BaseDto; import org.openlmis.referencedata.web.csv.model.ModelClass; @@ -27,14 +34,6 @@ import org.supercsv.io.dozer.CsvDozerBeanWriter; import org.supercsv.prefs.CsvPreference; -import java.io.BufferedWriter; -import java.io.IOException; -import java.io.OutputStream; -import java.io.OutputStreamWriter; -import java.util.List; - -import static java.util.Arrays.asList; - /** * This class has responsibility to instantiate a csvDozerBeanWriter from given inputStream. */ diff --git a/src/main/java/org/openlmis/referencedata/web/csv/format/CsvFormatter.java b/src/main/java/org/openlmis/referencedata/web/csv/format/CsvFormatter.java index 1f4dd3dcf..02bdc9946 100644 --- a/src/main/java/org/openlmis/referencedata/web/csv/format/CsvFormatter.java +++ b/src/main/java/org/openlmis/referencedata/web/csv/format/CsvFormatter.java @@ -5,16 +5,21 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.web.csv.format; +import static org.openlmis.referencedata.util.messagekeys.CsvExportMessageKeys.ERROR_EXPORT_RECORD_INVALID; + +import java.io.IOException; +import java.io.OutputStream; +import java.util.List; import lombok.NoArgsConstructor; import org.openlmis.referencedata.dto.BaseDto; import org.openlmis.referencedata.exception.ValidationMessageException; @@ -27,12 +32,6 @@ import org.supercsv.exception.SuperCsvException; import org.supercsv.util.CsvContext; -import java.io.IOException; -import java.io.OutputStream; -import java.util.List; - -import static org.openlmis.referencedata.util.messagekeys.CsvExportMessageKeys.ERROR_EXPORT_RECORD_INVALID; - /** * This class has logic to invoke corresponding respective record handler to parse data from input * stream into the corresponding model. diff --git a/src/main/java/org/openlmis/referencedata/web/csv/model/ImportField.java b/src/main/java/org/openlmis/referencedata/web/csv/model/ImportField.java index abcbce098..cdb6696ec 100644 --- a/src/main/java/org/openlmis/referencedata/web/csv/model/ImportField.java +++ b/src/main/java/org/openlmis/referencedata/web/csv/model/ImportField.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.web.csv.model; @@ -28,22 +28,22 @@ @Retention(RetentionPolicy.RUNTIME) public @interface ImportField { /** - * indicate if field is mandatory + * indicate if field is mandatory. */ boolean mandatory() default false; /** - * indicate field type + * indicate field type. */ String type() default "String"; /** - * indicate field name + * indicate field name. */ String name() default ""; /** - * indicate nested field value + * indicate nested field value. */ String nested() default ""; } diff --git a/src/main/java/org/openlmis/referencedata/web/csv/model/ModelClass.java b/src/main/java/org/openlmis/referencedata/web/csv/model/ModelClass.java index 0d0201901..7664f7498 100644 --- a/src/main/java/org/openlmis/referencedata/web/csv/model/ModelClass.java +++ b/src/main/java/org/openlmis/referencedata/web/csv/model/ModelClass.java @@ -5,23 +5,22 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.web.csv.model; +import java.util.ArrayList; +import java.util.List; import lombok.Data; import lombok.NoArgsConstructor; import org.openlmis.referencedata.dto.BaseDto; -import java.util.ArrayList; -import java.util.List; - /** * This class represents a Java model to which the csv row is mapped. */ diff --git a/src/main/java/org/openlmis/referencedata/web/csv/model/ModelClassHelper.java b/src/main/java/org/openlmis/referencedata/web/csv/model/ModelClassHelper.java index 60c2d71a2..aba8c8694 100644 --- a/src/main/java/org/openlmis/referencedata/web/csv/model/ModelClassHelper.java +++ b/src/main/java/org/openlmis/referencedata/web/csv/model/ModelClassHelper.java @@ -5,23 +5,22 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.web.csv.model; import com.google.common.collect.Maps; -import org.openlmis.referencedata.dto.BaseDto; - import java.util.Arrays; import java.util.List; import java.util.Map; import java.util.stream.Collectors; +import org.openlmis.referencedata.dto.BaseDto; /** * This class contains a list of {@link ModelField} for each dto class. It only retrieve class diff --git a/src/main/java/org/openlmis/referencedata/web/csv/model/ModelField.java b/src/main/java/org/openlmis/referencedata/web/csv/model/ModelField.java index c996822c9..f5dcf90bd 100644 --- a/src/main/java/org/openlmis/referencedata/web/csv/model/ModelField.java +++ b/src/main/java/org/openlmis/referencedata/web/csv/model/ModelField.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.web.csv.model; diff --git a/src/main/java/org/openlmis/referencedata/web/csv/parser/CsvBeanReader.java b/src/main/java/org/openlmis/referencedata/web/csv/parser/CsvBeanReader.java index cd318c620..9642c13d7 100644 --- a/src/main/java/org/openlmis/referencedata/web/csv/parser/CsvBeanReader.java +++ b/src/main/java/org/openlmis/referencedata/web/csv/parser/CsvBeanReader.java @@ -5,16 +5,23 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.web.csv.parser; +import static java.util.Arrays.asList; + +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.util.List; import lombok.Getter; import org.openlmis.referencedata.dto.BaseDto; import org.openlmis.referencedata.validate.CsvHeaderValidator; @@ -24,14 +31,6 @@ import org.supercsv.io.dozer.CsvDozerBeanReader; import org.supercsv.prefs.CsvPreference; -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.util.List; - -import static java.util.Arrays.asList; - /** * This class has responsibility to instantiate a dozerBeanReader from given inputStream, * and CsvPreferences. Also is responsible for validating headers. diff --git a/src/main/java/org/openlmis/referencedata/web/csv/parser/CsvParser.java b/src/main/java/org/openlmis/referencedata/web/csv/parser/CsvParser.java index 2849df6c0..acdc963f2 100644 --- a/src/main/java/org/openlmis/referencedata/web/csv/parser/CsvParser.java +++ b/src/main/java/org/openlmis/referencedata/web/csv/parser/CsvParser.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.web.csv.parser; @@ -18,7 +18,10 @@ import static org.openlmis.referencedata.util.messagekeys.CsvUploadMessageKeys.ERROR_UPLOAD_RECORD_INVALID; import com.google.common.collect.Lists; - +import java.io.IOException; +import java.io.InputStream; +import java.util.List; +import lombok.NoArgsConstructor; import org.openlmis.referencedata.domain.BaseEntity; import org.openlmis.referencedata.dto.BaseDto; import org.openlmis.referencedata.exception.ValidationMessageException; @@ -35,12 +38,6 @@ import org.supercsv.exception.SuperCsvException; import org.supercsv.util.CsvContext; -import lombok.NoArgsConstructor; - -import java.io.IOException; -import java.io.InputStream; -import java.util.List; - /** * This class has logic to invoke corresponding respective record handler to parse data from input * stream into the corresponding model. To speed up the process for huge files the stream is divided diff --git a/src/main/java/org/openlmis/referencedata/web/csv/processor/CsvCellProcessors.java b/src/main/java/org/openlmis/referencedata/web/csv/processor/CsvCellProcessors.java index f3d795369..b354e080e 100644 --- a/src/main/java/org/openlmis/referencedata/web/csv/processor/CsvCellProcessors.java +++ b/src/main/java/org/openlmis/referencedata/web/csv/processor/CsvCellProcessors.java @@ -5,26 +5,26 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.web.csv.processor; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import org.openlmis.referencedata.web.csv.model.ModelClass; import org.openlmis.referencedata.web.csv.model.ModelField; import org.supercsv.cellprocessor.Optional; import org.supercsv.cellprocessor.Trim; import org.supercsv.cellprocessor.constraint.NotNull; import org.supercsv.cellprocessor.ift.CellProcessor; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; /** * This class has mappings from type to cell processors used for parsing value in a cell diff --git a/src/main/java/org/openlmis/referencedata/web/csv/processor/FormatCommodityType.java b/src/main/java/org/openlmis/referencedata/web/csv/processor/FormatCommodityType.java index b9c03e4e5..671cc0b40 100644 --- a/src/main/java/org/openlmis/referencedata/web/csv/processor/FormatCommodityType.java +++ b/src/main/java/org/openlmis/referencedata/web/csv/processor/FormatCommodityType.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.web.csv.processor; diff --git a/src/main/java/org/openlmis/referencedata/web/csv/processor/FormatFacility.java b/src/main/java/org/openlmis/referencedata/web/csv/processor/FormatFacility.java index 7e5bfa2bc..a5d9268c8 100644 --- a/src/main/java/org/openlmis/referencedata/web/csv/processor/FormatFacility.java +++ b/src/main/java/org/openlmis/referencedata/web/csv/processor/FormatFacility.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.web.csv.processor; diff --git a/src/main/java/org/openlmis/referencedata/web/csv/processor/FormatProcessingPeriod.java b/src/main/java/org/openlmis/referencedata/web/csv/processor/FormatProcessingPeriod.java index 4201c0197..756f3dd15 100644 --- a/src/main/java/org/openlmis/referencedata/web/csv/processor/FormatProcessingPeriod.java +++ b/src/main/java/org/openlmis/referencedata/web/csv/processor/FormatProcessingPeriod.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.web.csv.processor; diff --git a/src/main/java/org/openlmis/referencedata/web/csv/processor/ParseCommodityType.java b/src/main/java/org/openlmis/referencedata/web/csv/processor/ParseCommodityType.java index ed41288de..fa99dc827 100644 --- a/src/main/java/org/openlmis/referencedata/web/csv/processor/ParseCommodityType.java +++ b/src/main/java/org/openlmis/referencedata/web/csv/processor/ParseCommodityType.java @@ -5,24 +5,23 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.web.csv.processor; +import java.util.regex.Pattern; import org.openlmis.referencedata.dto.CommodityTypeDto; import org.supercsv.cellprocessor.CellProcessorAdaptor; import org.supercsv.cellprocessor.ift.StringCellProcessor; import org.supercsv.exception.SuperCsvCellProcessorException; import org.supercsv.util.CsvContext; -import java.util.regex.Pattern; - public class ParseCommodityType extends CellProcessorAdaptor implements StringCellProcessor { public static String SEPARATOR; diff --git a/src/main/java/org/openlmis/referencedata/web/csv/processor/ParseFacility.java b/src/main/java/org/openlmis/referencedata/web/csv/processor/ParseFacility.java index cfad26b91..0e9acd825 100644 --- a/src/main/java/org/openlmis/referencedata/web/csv/processor/ParseFacility.java +++ b/src/main/java/org/openlmis/referencedata/web/csv/processor/ParseFacility.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.web.csv.processor; diff --git a/src/main/java/org/openlmis/referencedata/web/csv/processor/ParsePositiveInteger.java b/src/main/java/org/openlmis/referencedata/web/csv/processor/ParsePositiveInteger.java index d109d2b7d..67fb1f216 100644 --- a/src/main/java/org/openlmis/referencedata/web/csv/processor/ParsePositiveInteger.java +++ b/src/main/java/org/openlmis/referencedata/web/csv/processor/ParsePositiveInteger.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.web.csv.processor; diff --git a/src/main/java/org/openlmis/referencedata/web/csv/processor/ParseProcessingPeriod.java b/src/main/java/org/openlmis/referencedata/web/csv/processor/ParseProcessingPeriod.java index eab783bff..e62822082 100644 --- a/src/main/java/org/openlmis/referencedata/web/csv/processor/ParseProcessingPeriod.java +++ b/src/main/java/org/openlmis/referencedata/web/csv/processor/ParseProcessingPeriod.java @@ -5,16 +5,17 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.web.csv.processor; +import java.util.regex.Pattern; import org.openlmis.referencedata.dto.ProcessingPeriodDto; import org.openlmis.referencedata.dto.ProcessingScheduleDto; import org.supercsv.cellprocessor.CellProcessorAdaptor; @@ -22,8 +23,6 @@ import org.supercsv.exception.SuperCsvCellProcessorException; import org.supercsv.util.CsvContext; -import java.util.regex.Pattern; - /** * This is a custom cell processor used to parse schedule_code|period_name to processing period dto. * This is used in CsvCellProcessors. diff --git a/src/main/java/org/openlmis/referencedata/web/csv/recordhandler/IdealStockAmountProcessor.java b/src/main/java/org/openlmis/referencedata/web/csv/recordhandler/IdealStockAmountProcessor.java index 0a6cdf28e..f86597dae 100644 --- a/src/main/java/org/openlmis/referencedata/web/csv/recordhandler/IdealStockAmountProcessor.java +++ b/src/main/java/org/openlmis/referencedata/web/csv/recordhandler/IdealStockAmountProcessor.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.web.csv.recordhandler; @@ -19,6 +19,11 @@ import static org.openlmis.referencedata.util.messagekeys.IdealStockAmountMessageKeys.ERROR_FACILITY_NOT_FOUND; import static org.openlmis.referencedata.util.messagekeys.IdealStockAmountMessageKeys.ERROR_PROCESSING_PERIOD_NOT_FOUND; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; import org.openlmis.referencedata.domain.Code; import org.openlmis.referencedata.domain.CommodityType; import org.openlmis.referencedata.domain.Facility; @@ -39,11 +44,6 @@ import org.slf4j.profiler.Profiler; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Objects; /** * IdealStockAmountProcessor is used for uploads of Ideal Stock Amount. diff --git a/src/main/java/org/openlmis/referencedata/web/csv/recordhandler/IdealStockAmountWriter.java b/src/main/java/org/openlmis/referencedata/web/csv/recordhandler/IdealStockAmountWriter.java index 9e96713f0..6e85ac8ce 100644 --- a/src/main/java/org/openlmis/referencedata/web/csv/recordhandler/IdealStockAmountWriter.java +++ b/src/main/java/org/openlmis/referencedata/web/csv/recordhandler/IdealStockAmountWriter.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.web.csv.recordhandler; diff --git a/src/main/java/org/openlmis/referencedata/web/csv/recordhandler/RecordProcessor.java b/src/main/java/org/openlmis/referencedata/web/csv/recordhandler/RecordProcessor.java index 1d6931c47..d54551aa0 100644 --- a/src/main/java/org/openlmis/referencedata/web/csv/recordhandler/RecordProcessor.java +++ b/src/main/java/org/openlmis/referencedata/web/csv/recordhandler/RecordProcessor.java @@ -5,21 +5,20 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.web.csv.recordhandler; +import java.util.List; import org.openlmis.referencedata.domain.BaseEntity; import org.openlmis.referencedata.dto.BaseDto; -import java.util.List; - /** * This interface is implemented by all record processors. */ diff --git a/src/main/java/org/openlmis/referencedata/web/csv/recordhandler/RecordWriter.java b/src/main/java/org/openlmis/referencedata/web/csv/recordhandler/RecordWriter.java index 35be718ed..4eab769b7 100644 --- a/src/main/java/org/openlmis/referencedata/web/csv/recordhandler/RecordWriter.java +++ b/src/main/java/org/openlmis/referencedata/web/csv/recordhandler/RecordWriter.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.web.csv.recordhandler; diff --git a/src/main/java/org/openlmis/referencedata/web/fhir/Coding.java b/src/main/java/org/openlmis/referencedata/web/fhir/Coding.java index 11c4e417f..24152222e 100644 --- a/src/main/java/org/openlmis/referencedata/web/fhir/Coding.java +++ b/src/main/java/org/openlmis/referencedata/web/fhir/Coding.java @@ -5,18 +5,17 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.web.fhir; import com.fasterxml.jackson.annotation.JsonFormat; - import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/org/openlmis/referencedata/web/fhir/Element.java b/src/main/java/org/openlmis/referencedata/web/fhir/Element.java index c0b39b7bc..3e2d87f12 100644 --- a/src/main/java/org/openlmis/referencedata/web/fhir/Element.java +++ b/src/main/java/org/openlmis/referencedata/web/fhir/Element.java @@ -5,22 +5,21 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.web.fhir; +import java.util.UUID; import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Getter; -import java.util.UUID; - @Getter @AllArgsConstructor(access = AccessLevel.PACKAGE) public abstract class Element { diff --git a/src/main/java/org/openlmis/referencedata/web/fhir/Identifier.java b/src/main/java/org/openlmis/referencedata/web/fhir/Identifier.java index e752dc512..a227a5219 100644 --- a/src/main/java/org/openlmis/referencedata/web/fhir/Identifier.java +++ b/src/main/java/org/openlmis/referencedata/web/fhir/Identifier.java @@ -5,20 +5,20 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.web.fhir; import static org.apache.commons.lang3.StringUtils.joinWith; -import lombok.Getter; import java.util.UUID; +import lombok.Getter; @Getter public final class Identifier { diff --git a/src/main/java/org/openlmis/referencedata/web/fhir/Location.java b/src/main/java/org/openlmis/referencedata/web/fhir/Location.java index 7cedd5e27..79af6eee6 100644 --- a/src/main/java/org/openlmis/referencedata/web/fhir/Location.java +++ b/src/main/java/org/openlmis/referencedata/web/fhir/Location.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.web.fhir; @@ -21,6 +21,10 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.google.common.collect.ImmutableList; import com.vividsolutions.jts.geom.Point; +import java.util.ArrayList; +import java.util.List; +import java.util.Set; +import java.util.UUID; import lombok.Getter; import org.openlmis.referencedata.domain.Facility; import org.openlmis.referencedata.domain.FacilityOperator; @@ -31,10 +35,6 @@ import org.openlmis.referencedata.web.GeographicLevelController; import org.openlmis.referencedata.web.LocationController; import org.openlmis.referencedata.web.ProgramController; -import java.util.ArrayList; -import java.util.List; -import java.util.Set; -import java.util.UUID; @Getter @JsonInclude(JsonInclude.Include.NON_NULL) diff --git a/src/main/java/org/openlmis/referencedata/web/fhir/LocationFactory.java b/src/main/java/org/openlmis/referencedata/web/fhir/LocationFactory.java index ec59d7486..2536e00a8 100644 --- a/src/main/java/org/openlmis/referencedata/web/fhir/LocationFactory.java +++ b/src/main/java/org/openlmis/referencedata/web/fhir/LocationFactory.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.web.fhir; diff --git a/src/main/java/org/openlmis/referencedata/web/fhir/PhysicalType.java b/src/main/java/org/openlmis/referencedata/web/fhir/PhysicalType.java index ecf612033..dc3cae04d 100644 --- a/src/main/java/org/openlmis/referencedata/web/fhir/PhysicalType.java +++ b/src/main/java/org/openlmis/referencedata/web/fhir/PhysicalType.java @@ -5,20 +5,19 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.web.fhir; -import lombok.Getter; - import java.util.Arrays; import java.util.List; +import lombok.Getter; @Getter public final class PhysicalType { diff --git a/src/main/java/org/openlmis/referencedata/web/fhir/Position.java b/src/main/java/org/openlmis/referencedata/web/fhir/Position.java index a5b07a823..49cb6a5d1 100644 --- a/src/main/java/org/openlmis/referencedata/web/fhir/Position.java +++ b/src/main/java/org/openlmis/referencedata/web/fhir/Position.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.web.fhir; diff --git a/src/main/java/org/openlmis/referencedata/web/fhir/Reference.java b/src/main/java/org/openlmis/referencedata/web/fhir/Reference.java index b4b7c5926..89a3da4dd 100644 --- a/src/main/java/org/openlmis/referencedata/web/fhir/Reference.java +++ b/src/main/java/org/openlmis/referencedata/web/fhir/Reference.java @@ -5,21 +5,20 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.web.fhir; import static org.openlmis.referencedata.web.BaseController.API_PATH; -import lombok.Getter; - import java.util.UUID; +import lombok.Getter; @Getter public class Reference { diff --git a/src/main/java/org/openlmis/referencedata/web/fhir/Resource.java b/src/main/java/org/openlmis/referencedata/web/fhir/Resource.java index 1564c3e6a..d8db18514 100644 --- a/src/main/java/org/openlmis/referencedata/web/fhir/Resource.java +++ b/src/main/java/org/openlmis/referencedata/web/fhir/Resource.java @@ -5,19 +5,18 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.web.fhir; -import lombok.Getter; - import java.util.UUID; +import lombok.Getter; @Getter public abstract class Resource extends Element { diff --git a/src/main/java/org/openlmis/referencedata/web/fhir/Status.java b/src/main/java/org/openlmis/referencedata/web/fhir/Status.java index ae9993018..2c88c017b 100644 --- a/src/main/java/org/openlmis/referencedata/web/fhir/Status.java +++ b/src/main/java/org/openlmis/referencedata/web/fhir/Status.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.web.fhir; diff --git a/src/test/java/org/openlmis/referencedata/ExportSchemaFlywayCallbackTest.java b/src/test/java/org/openlmis/referencedata/ExportSchemaFlywayCallbackTest.java index 96f83a0f4..e587cf6c3 100644 --- a/src/test/java/org/openlmis/referencedata/ExportSchemaFlywayCallbackTest.java +++ b/src/test/java/org/openlmis/referencedata/ExportSchemaFlywayCallbackTest.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata; diff --git a/src/test/java/org/openlmis/referencedata/TestDataInitializerTest.java b/src/test/java/org/openlmis/referencedata/TestDataInitializerTest.java index 5863c855b..02bee72ac 100644 --- a/src/test/java/org/openlmis/referencedata/TestDataInitializerTest.java +++ b/src/test/java/org/openlmis/referencedata/TestDataInitializerTest.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata; diff --git a/src/test/java/org/openlmis/referencedata/ToStringTestUtils.java b/src/test/java/org/openlmis/referencedata/ToStringTestUtils.java index c0b3ebb61..ff44cdb44 100644 --- a/src/test/java/org/openlmis/referencedata/ToStringTestUtils.java +++ b/src/test/java/org/openlmis/referencedata/ToStringTestUtils.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata; diff --git a/src/test/java/org/openlmis/referencedata/WireMockTest.java b/src/test/java/org/openlmis/referencedata/WireMockTest.java index 0bd1aa5dc..001ea32af 100644 --- a/src/test/java/org/openlmis/referencedata/WireMockTest.java +++ b/src/test/java/org/openlmis/referencedata/WireMockTest.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata; @@ -25,7 +25,6 @@ import static com.github.tomakehurst.wiremock.client.WireMock.verify; import com.github.tomakehurst.wiremock.junit.WireMockRule; - import org.junit.Assert; import org.junit.Rule; import org.junit.Test; diff --git a/src/test/java/org/openlmis/referencedata/domain/CodeTest.java b/src/test/java/org/openlmis/referencedata/domain/CodeTest.java index 522ed7f8a..60f7d3221 100644 --- a/src/test/java/org/openlmis/referencedata/domain/CodeTest.java +++ b/src/test/java/org/openlmis/referencedata/domain/CodeTest.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.domain; diff --git a/src/test/java/org/openlmis/referencedata/domain/CommodityTypeTest.java b/src/test/java/org/openlmis/referencedata/domain/CommodityTypeTest.java index 8c82ba4a0..2e6e7d876 100644 --- a/src/test/java/org/openlmis/referencedata/domain/CommodityTypeTest.java +++ b/src/test/java/org/openlmis/referencedata/domain/CommodityTypeTest.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.domain; @@ -20,9 +20,9 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; +import java.util.ArrayList; import org.junit.Test; import org.openlmis.referencedata.exception.ValidationMessageException; -import java.util.ArrayList; public class CommodityTypeTest { private static final String CLASSIFICATION_SYS = "cSys"; diff --git a/src/test/java/org/openlmis/referencedata/domain/ContainerDispensableTest.java b/src/test/java/org/openlmis/referencedata/domain/ContainerDispensableTest.java index e46d6d4d9..ab58368d6 100644 --- a/src/test/java/org/openlmis/referencedata/domain/ContainerDispensableTest.java +++ b/src/test/java/org/openlmis/referencedata/domain/ContainerDispensableTest.java @@ -5,23 +5,23 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.domain; -import org.junit.Before; -import org.junit.Test; - import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; +import org.junit.Before; +import org.junit.Test; + public class ContainerDispensableTest { private Dispensable containerDispensable; diff --git a/src/test/java/org/openlmis/referencedata/domain/CreationDetailsTest.java b/src/test/java/org/openlmis/referencedata/domain/CreationDetailsTest.java index 1e61fb832..7771c33ed 100644 --- a/src/test/java/org/openlmis/referencedata/domain/CreationDetailsTest.java +++ b/src/test/java/org/openlmis/referencedata/domain/CreationDetailsTest.java @@ -5,18 +5,17 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.domain; import nl.jqno.equalsverifier.EqualsVerifier; - import org.junit.Test; import org.openlmis.referencedata.ToStringTestUtils; import org.openlmis.referencedata.testbuilder.ServiceAccountDataBuilder; diff --git a/src/test/java/org/openlmis/referencedata/domain/DefaultDispensableTest.java b/src/test/java/org/openlmis/referencedata/domain/DefaultDispensableTest.java index 68fbd1c9d..ae6b8e42f 100644 --- a/src/test/java/org/openlmis/referencedata/domain/DefaultDispensableTest.java +++ b/src/test/java/org/openlmis/referencedata/domain/DefaultDispensableTest.java @@ -5,23 +5,23 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.domain; -import org.junit.Before; -import org.junit.Test; - import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; +import org.junit.Before; +import org.junit.Test; + public class DefaultDispensableTest { private Dispensable defaultDispensable; diff --git a/src/test/java/org/openlmis/referencedata/domain/FacilityTest.java b/src/test/java/org/openlmis/referencedata/domain/FacilityTest.java index 837d85eb7..f7281ee2e 100644 --- a/src/test/java/org/openlmis/referencedata/domain/FacilityTest.java +++ b/src/test/java/org/openlmis/referencedata/domain/FacilityTest.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.domain; diff --git a/src/test/java/org/openlmis/referencedata/domain/FulfillmentRoleAssignmentTest.java b/src/test/java/org/openlmis/referencedata/domain/FulfillmentRoleAssignmentTest.java index 341b4d9cb..055b927cc 100644 --- a/src/test/java/org/openlmis/referencedata/domain/FulfillmentRoleAssignmentTest.java +++ b/src/test/java/org/openlmis/referencedata/domain/FulfillmentRoleAssignmentTest.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.domain; diff --git a/src/test/java/org/openlmis/referencedata/domain/GtinTest.java b/src/test/java/org/openlmis/referencedata/domain/GtinTest.java index 92b6cabab..7759bbd9d 100644 --- a/src/test/java/org/openlmis/referencedata/domain/GtinTest.java +++ b/src/test/java/org/openlmis/referencedata/domain/GtinTest.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.domain; diff --git a/src/test/java/org/openlmis/referencedata/domain/OrderableTest.java b/src/test/java/org/openlmis/referencedata/domain/OrderableTest.java index 9262f7aa6..b20904355 100644 --- a/src/test/java/org/openlmis/referencedata/domain/OrderableTest.java +++ b/src/test/java/org/openlmis/referencedata/domain/OrderableTest.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.domain; diff --git a/src/test/java/org/openlmis/referencedata/domain/OrderedDisplayValueTest.java b/src/test/java/org/openlmis/referencedata/domain/OrderedDisplayValueTest.java index c39cbe4d8..67875378b 100644 --- a/src/test/java/org/openlmis/referencedata/domain/OrderedDisplayValueTest.java +++ b/src/test/java/org/openlmis/referencedata/domain/OrderedDisplayValueTest.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.domain; diff --git a/src/test/java/org/openlmis/referencedata/domain/ProcessingPeriodTest.java b/src/test/java/org/openlmis/referencedata/domain/ProcessingPeriodTest.java index a5c0438fd..89fbdaedf 100644 --- a/src/test/java/org/openlmis/referencedata/domain/ProcessingPeriodTest.java +++ b/src/test/java/org/openlmis/referencedata/domain/ProcessingPeriodTest.java @@ -5,24 +5,22 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.domain; - import static org.junit.Assert.assertTrue; +import java.time.LocalDate; import org.junit.Before; import org.junit.Test; -import java.time.LocalDate; - public class ProcessingPeriodTest { private static ProcessingSchedule schedule; diff --git a/src/test/java/org/openlmis/referencedata/domain/ProcessingScheduleTest.java b/src/test/java/org/openlmis/referencedata/domain/ProcessingScheduleTest.java index 5e6faa9fe..506c5a444 100644 --- a/src/test/java/org/openlmis/referencedata/domain/ProcessingScheduleTest.java +++ b/src/test/java/org/openlmis/referencedata/domain/ProcessingScheduleTest.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.domain; diff --git a/src/test/java/org/openlmis/referencedata/domain/ProgramOrderableTest.java b/src/test/java/org/openlmis/referencedata/domain/ProgramOrderableTest.java index f1c1fe149..d45f4a3e6 100644 --- a/src/test/java/org/openlmis/referencedata/domain/ProgramOrderableTest.java +++ b/src/test/java/org/openlmis/referencedata/domain/ProgramOrderableTest.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.domain; diff --git a/src/test/java/org/openlmis/referencedata/domain/ProgramTest.java b/src/test/java/org/openlmis/referencedata/domain/ProgramTest.java index 2c629e16b..b5c302454 100644 --- a/src/test/java/org/openlmis/referencedata/domain/ProgramTest.java +++ b/src/test/java/org/openlmis/referencedata/domain/ProgramTest.java @@ -5,17 +5,16 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.domain; - import static org.junit.Assert.assertTrue; import org.junit.Test; diff --git a/src/test/java/org/openlmis/referencedata/domain/RequisitionGroupTest.java b/src/test/java/org/openlmis/referencedata/domain/RequisitionGroupTest.java index 79125124b..ec869ca82 100644 --- a/src/test/java/org/openlmis/referencedata/domain/RequisitionGroupTest.java +++ b/src/test/java/org/openlmis/referencedata/domain/RequisitionGroupTest.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.domain; @@ -21,12 +21,11 @@ import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.mock; +import java.util.Collections; import org.junit.Before; import org.junit.Test; import org.openlmis.referencedata.dto.RequisitionGroupDto; -import java.util.Collections; - public class RequisitionGroupTest { RequisitionGroup requisitionGroup; diff --git a/src/test/java/org/openlmis/referencedata/domain/RightAssignmentTest.java b/src/test/java/org/openlmis/referencedata/domain/RightAssignmentTest.java index bf4a83f84..cc82baff4 100644 --- a/src/test/java/org/openlmis/referencedata/domain/RightAssignmentTest.java +++ b/src/test/java/org/openlmis/referencedata/domain/RightAssignmentTest.java @@ -5,26 +5,25 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.domain; -import org.junit.Before; -import org.junit.Test; - -import java.util.UUID; - import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertTrue; +import java.util.UUID; +import org.junit.Before; +import org.junit.Test; + public class RightAssignmentTest { private RightAssignment rightAssignmentA; diff --git a/src/test/java/org/openlmis/referencedata/domain/RightTest.java b/src/test/java/org/openlmis/referencedata/domain/RightTest.java index e396e00c0..7ae1e97a6 100644 --- a/src/test/java/org/openlmis/referencedata/domain/RightTest.java +++ b/src/test/java/org/openlmis/referencedata/domain/RightTest.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.domain; @@ -18,9 +18,8 @@ import static org.hamcrest.core.Is.is; import static org.junit.Assert.assertThat; -import org.junit.Test; - import java.util.Set; +import org.junit.Test; public class RightTest { @Test diff --git a/src/test/java/org/openlmis/referencedata/domain/RoleAssignmentTest.java b/src/test/java/org/openlmis/referencedata/domain/RoleAssignmentTest.java index c73a1edd9..36f045562 100644 --- a/src/test/java/org/openlmis/referencedata/domain/RoleAssignmentTest.java +++ b/src/test/java/org/openlmis/referencedata/domain/RoleAssignmentTest.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.domain; @@ -20,14 +20,14 @@ import static org.openlmis.referencedata.domain.RightType.ORDER_FULFILLMENT; import static org.openlmis.referencedata.util.messagekeys.RoleAssignmentMessageKeys.ERROR_TYPE_NOT_ACCEPTABLE; +import java.util.Collections; +import java.util.HashSet; +import java.util.Set; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; import org.openlmis.referencedata.exception.ValidationMessageException; import org.openlmis.referencedata.util.Message; -import java.util.Collections; -import java.util.HashSet; -import java.util.Set; public class RoleAssignmentTest { diff --git a/src/test/java/org/openlmis/referencedata/domain/RoleTest.java b/src/test/java/org/openlmis/referencedata/domain/RoleTest.java index 412313fee..5535104cc 100644 --- a/src/test/java/org/openlmis/referencedata/domain/RoleTest.java +++ b/src/test/java/org/openlmis/referencedata/domain/RoleTest.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.domain; @@ -20,13 +20,12 @@ import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; +import java.util.Set; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; import org.openlmis.referencedata.exception.ValidationMessageException; -import java.util.Set; - public class RoleTest { @Rule diff --git a/src/test/java/org/openlmis/referencedata/domain/ServiceAccountTest.java b/src/test/java/org/openlmis/referencedata/domain/ServiceAccountTest.java index 733c89138..62f80f66f 100644 --- a/src/test/java/org/openlmis/referencedata/domain/ServiceAccountTest.java +++ b/src/test/java/org/openlmis/referencedata/domain/ServiceAccountTest.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.domain; @@ -21,17 +21,14 @@ import static org.junit.Assert.assertThat; import com.google.common.collect.Maps; - +import java.time.ZonedDateTime; +import java.util.Map; +import java.util.UUID; import nl.jqno.equalsverifier.EqualsVerifier; - import org.junit.Test; import org.openlmis.referencedata.ToStringTestUtils; import org.openlmis.referencedata.testbuilder.ServiceAccountDataBuilder; -import java.time.ZonedDateTime; -import java.util.Map; -import java.util.UUID; - public class ServiceAccountTest { @Test diff --git a/src/test/java/org/openlmis/referencedata/domain/SupervisionRoleAssignmentTest.java b/src/test/java/org/openlmis/referencedata/domain/SupervisionRoleAssignmentTest.java index ca17ab328..038a8b3c3 100644 --- a/src/test/java/org/openlmis/referencedata/domain/SupervisionRoleAssignmentTest.java +++ b/src/test/java/org/openlmis/referencedata/domain/SupervisionRoleAssignmentTest.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.domain; diff --git a/src/test/java/org/openlmis/referencedata/domain/SupervisoryNodeTest.java b/src/test/java/org/openlmis/referencedata/domain/SupervisoryNodeTest.java index 10dd02dc3..96ba645ad 100644 --- a/src/test/java/org/openlmis/referencedata/domain/SupervisoryNodeTest.java +++ b/src/test/java/org/openlmis/referencedata/domain/SupervisoryNodeTest.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.domain; @@ -23,16 +23,14 @@ import static org.junit.Assert.assertTrue; import com.google.common.collect.Sets; - +import java.util.Collections; +import java.util.Set; import org.junit.Before; import org.junit.Test; import org.openlmis.referencedata.dto.SupervisoryNodeDto; import org.openlmis.referencedata.testbuilder.SupervisoryNodeDataBuilder; import org.openlmis.referencedata.testbuilder.SupportedProgramDataBuilder; -import java.util.Collections; -import java.util.Set; - @SuppressWarnings({"PMD.TooManyMethods"}) public class SupervisoryNodeTest { diff --git a/src/test/java/org/openlmis/referencedata/domain/SupportedProgramTest.java b/src/test/java/org/openlmis/referencedata/domain/SupportedProgramTest.java index 3ab6cf58a..66f0a7b13 100644 --- a/src/test/java/org/openlmis/referencedata/domain/SupportedProgramTest.java +++ b/src/test/java/org/openlmis/referencedata/domain/SupportedProgramTest.java @@ -5,18 +5,17 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.domain; import nl.jqno.equalsverifier.EqualsVerifier; - import org.junit.Test; import org.openlmis.referencedata.testbuilder.FacilityDataBuilder; diff --git a/src/test/java/org/openlmis/referencedata/domain/TradeItemTest.java b/src/test/java/org/openlmis/referencedata/domain/TradeItemTest.java index f1acbfa88..ed80f81b0 100644 --- a/src/test/java/org/openlmis/referencedata/domain/TradeItemTest.java +++ b/src/test/java/org/openlmis/referencedata/domain/TradeItemTest.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.domain; @@ -22,9 +22,9 @@ import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; -import org.junit.Test; import java.util.ArrayList; import java.util.Collections; +import org.junit.Test; public class TradeItemTest { diff --git a/src/test/java/org/openlmis/referencedata/domain/UserTest.java b/src/test/java/org/openlmis/referencedata/domain/UserTest.java index f333d6665..9a74e7349 100644 --- a/src/test/java/org/openlmis/referencedata/domain/UserTest.java +++ b/src/test/java/org/openlmis/referencedata/domain/UserTest.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.domain; diff --git a/src/test/java/org/openlmis/referencedata/domain/VaccineDispensableTest.java b/src/test/java/org/openlmis/referencedata/domain/VaccineDispensableTest.java index 765640fe3..c2c85a4e6 100644 --- a/src/test/java/org/openlmis/referencedata/domain/VaccineDispensableTest.java +++ b/src/test/java/org/openlmis/referencedata/domain/VaccineDispensableTest.java @@ -5,23 +5,23 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.domain; -import org.junit.Before; -import org.junit.Test; - import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; +import org.junit.Before; +import org.junit.Test; + public class VaccineDispensableTest { private Dispensable vaccineDispensable; diff --git a/src/test/java/org/openlmis/referencedata/dto/ApprovedProductDtoTest.java b/src/test/java/org/openlmis/referencedata/dto/ApprovedProductDtoTest.java index b4d666543..555300066 100644 --- a/src/test/java/org/openlmis/referencedata/dto/ApprovedProductDtoTest.java +++ b/src/test/java/org/openlmis/referencedata/dto/ApprovedProductDtoTest.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.dto; diff --git a/src/test/java/org/openlmis/referencedata/dto/BasicFacilityDtoTest.java b/src/test/java/org/openlmis/referencedata/dto/BasicFacilityDtoTest.java index ef1342129..276de0db5 100644 --- a/src/test/java/org/openlmis/referencedata/dto/BasicFacilityDtoTest.java +++ b/src/test/java/org/openlmis/referencedata/dto/BasicFacilityDtoTest.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.dto; @@ -19,7 +19,6 @@ import nl.jqno.equalsverifier.EqualsVerifier; import nl.jqno.equalsverifier.Warning; - import org.junit.Test; public class BasicFacilityDtoTest { diff --git a/src/test/java/org/openlmis/referencedata/dto/FacilityDtoTest.java b/src/test/java/org/openlmis/referencedata/dto/FacilityDtoTest.java index 13b1f2071..1d6116359 100644 --- a/src/test/java/org/openlmis/referencedata/dto/FacilityDtoTest.java +++ b/src/test/java/org/openlmis/referencedata/dto/FacilityDtoTest.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.dto; @@ -18,10 +18,8 @@ import static org.mockito.Mockito.mock; import com.vividsolutions.jts.geom.Point; - import nl.jqno.equalsverifier.EqualsVerifier; import nl.jqno.equalsverifier.Warning; - import org.junit.Test; public class FacilityDtoTest { diff --git a/src/test/java/org/openlmis/referencedata/dto/LotDtoTest.java b/src/test/java/org/openlmis/referencedata/dto/LotDtoTest.java index bd9fa0961..1c867c9dc 100644 --- a/src/test/java/org/openlmis/referencedata/dto/LotDtoTest.java +++ b/src/test/java/org/openlmis/referencedata/dto/LotDtoTest.java @@ -5,30 +5,28 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.dto; import static org.junit.Assert.assertEquals; +import java.util.Arrays; +import java.util.List; import nl.jqno.equalsverifier.EqualsVerifier; import nl.jqno.equalsverifier.Warning; - import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.runners.MockitoJUnitRunner; import org.openlmis.referencedata.domain.Lot; import org.openlmis.referencedata.testbuilder.LotDataBuilder; -import java.util.Arrays; -import java.util.List; - @RunWith(MockitoJUnitRunner.class) public class LotDtoTest { diff --git a/src/test/java/org/openlmis/referencedata/dto/MinimalFacilityDtoTest.java b/src/test/java/org/openlmis/referencedata/dto/MinimalFacilityDtoTest.java index 2387dca2a..116370f62 100644 --- a/src/test/java/org/openlmis/referencedata/dto/MinimalFacilityDtoTest.java +++ b/src/test/java/org/openlmis/referencedata/dto/MinimalFacilityDtoTest.java @@ -5,19 +5,18 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.dto; import nl.jqno.equalsverifier.EqualsVerifier; import nl.jqno.equalsverifier.Warning; - import org.junit.Test; public class MinimalFacilityDtoTest { diff --git a/src/test/java/org/openlmis/referencedata/dto/ProcessingScheduleDtoTest.java b/src/test/java/org/openlmis/referencedata/dto/ProcessingScheduleDtoTest.java index 062e655bd..7614e3c20 100644 --- a/src/test/java/org/openlmis/referencedata/dto/ProcessingScheduleDtoTest.java +++ b/src/test/java/org/openlmis/referencedata/dto/ProcessingScheduleDtoTest.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.dto; diff --git a/src/test/java/org/openlmis/referencedata/dto/ServiceAccountCreationBodyTest.java b/src/test/java/org/openlmis/referencedata/dto/ServiceAccountCreationBodyTest.java index c41af6791..234974637 100644 --- a/src/test/java/org/openlmis/referencedata/dto/ServiceAccountCreationBodyTest.java +++ b/src/test/java/org/openlmis/referencedata/dto/ServiceAccountCreationBodyTest.java @@ -5,24 +5,22 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.dto; +import java.util.UUID; import nl.jqno.equalsverifier.EqualsVerifier; import nl.jqno.equalsverifier.Warning; - import org.junit.Test; import org.openlmis.referencedata.ToStringTestUtils; -import java.util.UUID; - public class ServiceAccountCreationBodyTest { @Test diff --git a/src/test/java/org/openlmis/referencedata/dto/ServiceAccountDtoTest.java b/src/test/java/org/openlmis/referencedata/dto/ServiceAccountDtoTest.java index 656dd1757..8ce532b59 100644 --- a/src/test/java/org/openlmis/referencedata/dto/ServiceAccountDtoTest.java +++ b/src/test/java/org/openlmis/referencedata/dto/ServiceAccountDtoTest.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.dto; @@ -21,7 +21,6 @@ import nl.jqno.equalsverifier.EqualsVerifier; import nl.jqno.equalsverifier.Warning; - import org.junit.Test; import org.openlmis.referencedata.ToStringTestUtils; import org.openlmis.referencedata.domain.ServiceAccount; diff --git a/src/test/java/org/openlmis/referencedata/dto/SupportedProgramDtoTest.java b/src/test/java/org/openlmis/referencedata/dto/SupportedProgramDtoTest.java index 756375a4f..6ea54f0fc 100644 --- a/src/test/java/org/openlmis/referencedata/dto/SupportedProgramDtoTest.java +++ b/src/test/java/org/openlmis/referencedata/dto/SupportedProgramDtoTest.java @@ -5,19 +5,18 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.dto; import nl.jqno.equalsverifier.EqualsVerifier; import nl.jqno.equalsverifier.Warning; - import org.junit.Test; public class SupportedProgramDtoTest { diff --git a/src/test/java/org/openlmis/referencedata/dto/UserDtoTest.java b/src/test/java/org/openlmis/referencedata/dto/UserDtoTest.java index fffbfc4b2..63b132f93 100644 --- a/src/test/java/org/openlmis/referencedata/dto/UserDtoTest.java +++ b/src/test/java/org/openlmis/referencedata/dto/UserDtoTest.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.dto; diff --git a/src/test/java/org/openlmis/referencedata/errorhandling/RefDataErrorHandlingTest.java b/src/test/java/org/openlmis/referencedata/errorhandling/RefDataErrorHandlingTest.java index 766cb13f6..3d37c20a6 100644 --- a/src/test/java/org/openlmis/referencedata/errorhandling/RefDataErrorHandlingTest.java +++ b/src/test/java/org/openlmis/referencedata/errorhandling/RefDataErrorHandlingTest.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.errorhandling; diff --git a/src/test/java/org/openlmis/referencedata/repository/CountResourceTest.java b/src/test/java/org/openlmis/referencedata/repository/CountResourceTest.java index c8f160942..0a92e58ad 100644 --- a/src/test/java/org/openlmis/referencedata/repository/CountResourceTest.java +++ b/src/test/java/org/openlmis/referencedata/repository/CountResourceTest.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.repository; diff --git a/src/test/java/org/openlmis/referencedata/repository/UserSearchParamsTest.java b/src/test/java/org/openlmis/referencedata/repository/UserSearchParamsTest.java index c38978f20..f21ca1d5c 100644 --- a/src/test/java/org/openlmis/referencedata/repository/UserSearchParamsTest.java +++ b/src/test/java/org/openlmis/referencedata/repository/UserSearchParamsTest.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.repository; diff --git a/src/test/java/org/openlmis/referencedata/repository/custom/impl/PageableUtilTest.java b/src/test/java/org/openlmis/referencedata/repository/custom/impl/PageableUtilTest.java index 9c8458b96..877c0cf28 100644 --- a/src/test/java/org/openlmis/referencedata/repository/custom/impl/PageableUtilTest.java +++ b/src/test/java/org/openlmis/referencedata/repository/custom/impl/PageableUtilTest.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.repository.custom.impl; diff --git a/src/test/java/org/openlmis/referencedata/security/CustomUserAuthenticationConverterTest.java b/src/test/java/org/openlmis/referencedata/security/CustomUserAuthenticationConverterTest.java index 7a36c8f69..2a492cdb4 100644 --- a/src/test/java/org/openlmis/referencedata/security/CustomUserAuthenticationConverterTest.java +++ b/src/test/java/org/openlmis/referencedata/security/CustomUserAuthenticationConverterTest.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.security; @@ -22,13 +22,13 @@ import static org.openlmis.referencedata.security.CustomUserAuthenticationConverter.REFERENCE_DATA_USER_ID; import com.google.common.collect.ImmutableMap; +import java.util.Arrays; +import java.util.Collections; +import java.util.UUID; import org.junit.Before; import org.junit.Test; import org.springframework.security.core.Authentication; import org.springframework.security.oauth2.provider.token.UserAuthenticationConverter; -import java.util.Arrays; -import java.util.Collections; -import java.util.UUID; public class CustomUserAuthenticationConverterTest { diff --git a/src/test/java/org/openlmis/referencedata/serializer/MoneyDeserializerTest.java b/src/test/java/org/openlmis/referencedata/serializer/MoneyDeserializerTest.java index e46df123a..00c8ddebf 100644 --- a/src/test/java/org/openlmis/referencedata/serializer/MoneyDeserializerTest.java +++ b/src/test/java/org/openlmis/referencedata/serializer/MoneyDeserializerTest.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.serializer; @@ -20,17 +20,15 @@ import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.ObjectMapper; - -import org.joda.money.CurrencyUnit; -import org.joda.money.Money; -import org.junit.Before; -import org.junit.Test; - import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; import java.math.BigDecimal; import java.nio.charset.StandardCharsets; +import org.joda.money.CurrencyUnit; +import org.joda.money.Money; +import org.junit.Before; +import org.junit.Test; public class MoneyDeserializerTest { diff --git a/src/test/java/org/openlmis/referencedata/serializer/MoneySerializerTest.java b/src/test/java/org/openlmis/referencedata/serializer/MoneySerializerTest.java index 12b761bac..3ffc5907b 100644 --- a/src/test/java/org/openlmis/referencedata/serializer/MoneySerializerTest.java +++ b/src/test/java/org/openlmis/referencedata/serializer/MoneySerializerTest.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.serializer; @@ -21,14 +21,12 @@ import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.SerializerProvider; - -import org.joda.money.CurrencyUnit; -import org.joda.money.Money; -import org.junit.Test; - import java.io.IOException; import java.io.StringWriter; import java.io.Writer; +import org.joda.money.CurrencyUnit; +import org.joda.money.Money; +import org.junit.Test; public class MoneySerializerTest { diff --git a/src/test/java/org/openlmis/referencedata/service/FacilityServiceTest.java b/src/test/java/org/openlmis/referencedata/service/FacilityServiceTest.java index d2f8acc7e..90df1ce53 100644 --- a/src/test/java/org/openlmis/referencedata/service/FacilityServiceTest.java +++ b/src/test/java/org/openlmis/referencedata/service/FacilityServiceTest.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.service; diff --git a/src/test/java/org/openlmis/referencedata/service/FacilityTypeApprovedProductServiceTest.java b/src/test/java/org/openlmis/referencedata/service/FacilityTypeApprovedProductServiceTest.java index 7489b8b34..3b512644c 100644 --- a/src/test/java/org/openlmis/referencedata/service/FacilityTypeApprovedProductServiceTest.java +++ b/src/test/java/org/openlmis/referencedata/service/FacilityTypeApprovedProductServiceTest.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.service; @@ -24,6 +24,9 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; import org.junit.Before; import org.junit.Test; import org.mockito.InjectMocks; @@ -35,9 +38,6 @@ import org.openlmis.referencedata.util.Pagination; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; -import java.util.Collections; -import java.util.HashMap; -import java.util.Map; public class FacilityTypeApprovedProductServiceTest { diff --git a/src/test/java/org/openlmis/referencedata/service/FacilityTypeServiceTest.java b/src/test/java/org/openlmis/referencedata/service/FacilityTypeServiceTest.java index 0cec7ceb9..66e81dcc3 100644 --- a/src/test/java/org/openlmis/referencedata/service/FacilityTypeServiceTest.java +++ b/src/test/java/org/openlmis/referencedata/service/FacilityTypeServiceTest.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.service; diff --git a/src/test/java/org/openlmis/referencedata/service/GeographicZoneServiceTest.java b/src/test/java/org/openlmis/referencedata/service/GeographicZoneServiceTest.java index 9f112faf4..b48c8ec8d 100644 --- a/src/test/java/org/openlmis/referencedata/service/GeographicZoneServiceTest.java +++ b/src/test/java/org/openlmis/referencedata/service/GeographicZoneServiceTest.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.service; @@ -30,7 +30,11 @@ import com.google.common.collect.Lists; import com.google.common.collect.Sets; - +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.UUID; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -47,12 +51,6 @@ import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.UUID; - @RunWith(MockitoJUnitRunner.class) @SuppressWarnings("PMD.TooManyMethods") public class GeographicZoneServiceTest { diff --git a/src/test/java/org/openlmis/referencedata/service/IdealStockAmountServiceTest.java b/src/test/java/org/openlmis/referencedata/service/IdealStockAmountServiceTest.java index 4223bd51f..8c46093d8 100644 --- a/src/test/java/org/openlmis/referencedata/service/IdealStockAmountServiceTest.java +++ b/src/test/java/org/openlmis/referencedata/service/IdealStockAmountServiceTest.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.service; @@ -20,6 +20,8 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import java.util.Collections; +import java.util.UUID; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -30,9 +32,6 @@ import org.openlmis.referencedata.domain.IdealStockAmount; import org.openlmis.referencedata.repository.IdealStockAmountRepository; -import java.util.Collections; -import java.util.UUID; - @RunWith(MockitoJUnitRunner.class) public class IdealStockAmountServiceTest { diff --git a/src/test/java/org/openlmis/referencedata/service/LotServiceTest.java b/src/test/java/org/openlmis/referencedata/service/LotServiceTest.java index cf7b7939a..099423d58 100644 --- a/src/test/java/org/openlmis/referencedata/service/LotServiceTest.java +++ b/src/test/java/org/openlmis/referencedata/service/LotServiceTest.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.service; diff --git a/src/test/java/org/openlmis/referencedata/service/ProcessingPeriodSearchParamsTest.java b/src/test/java/org/openlmis/referencedata/service/ProcessingPeriodSearchParamsTest.java index 9d96e5db7..3530d775c 100644 --- a/src/test/java/org/openlmis/referencedata/service/ProcessingPeriodSearchParamsTest.java +++ b/src/test/java/org/openlmis/referencedata/service/ProcessingPeriodSearchParamsTest.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.service; diff --git a/src/test/java/org/openlmis/referencedata/service/ProcessingPeriodServiceTest.java b/src/test/java/org/openlmis/referencedata/service/ProcessingPeriodServiceTest.java index 65fbff600..50f71a205 100644 --- a/src/test/java/org/openlmis/referencedata/service/ProcessingPeriodServiceTest.java +++ b/src/test/java/org/openlmis/referencedata/service/ProcessingPeriodServiceTest.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.service; diff --git a/src/test/java/org/openlmis/referencedata/service/RequestHelperTest.java b/src/test/java/org/openlmis/referencedata/service/RequestHelperTest.java index 81f4aa143..64349750d 100644 --- a/src/test/java/org/openlmis/referencedata/service/RequestHelperTest.java +++ b/src/test/java/org/openlmis/referencedata/service/RequestHelperTest.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.service; @@ -20,12 +20,11 @@ import static org.hamcrest.Matchers.nullValue; import static org.junit.Assert.assertThat; +import java.net.URI; import org.junit.Test; import org.springframework.http.HttpEntity; import org.springframework.http.HttpHeaders; -import java.net.URI; - public class RequestHelperTest { private static final String URL = "http://localhost"; diff --git a/src/test/java/org/openlmis/referencedata/service/RequestParametersTest.java b/src/test/java/org/openlmis/referencedata/service/RequestParametersTest.java index 10c7d6c19..53dd7059d 100644 --- a/src/test/java/org/openlmis/referencedata/service/RequestParametersTest.java +++ b/src/test/java/org/openlmis/referencedata/service/RequestParametersTest.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.service; @@ -21,10 +21,8 @@ import static org.junit.Assert.assertThat; import com.google.common.collect.Maps; - -import org.junit.Test; - import java.util.Map; +import org.junit.Test; public class RequestParametersTest { diff --git a/src/test/java/org/openlmis/referencedata/service/RequisitionGroupServiceTest.java b/src/test/java/org/openlmis/referencedata/service/RequisitionGroupServiceTest.java index 0c9307b60..b9f2c894f 100644 --- a/src/test/java/org/openlmis/referencedata/service/RequisitionGroupServiceTest.java +++ b/src/test/java/org/openlmis/referencedata/service/RequisitionGroupServiceTest.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.service; diff --git a/src/test/java/org/openlmis/referencedata/service/RightAssignmentExecutorTest.java b/src/test/java/org/openlmis/referencedata/service/RightAssignmentExecutorTest.java index b5be39c5b..4d389a04b 100644 --- a/src/test/java/org/openlmis/referencedata/service/RightAssignmentExecutorTest.java +++ b/src/test/java/org/openlmis/referencedata/service/RightAssignmentExecutorTest.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.service; diff --git a/src/test/java/org/openlmis/referencedata/service/RightAssignmentServiceTest.java b/src/test/java/org/openlmis/referencedata/service/RightAssignmentServiceTest.java index d22720b14..a40c287ec 100644 --- a/src/test/java/org/openlmis/referencedata/service/RightAssignmentServiceTest.java +++ b/src/test/java/org/openlmis/referencedata/service/RightAssignmentServiceTest.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.service; diff --git a/src/test/java/org/openlmis/referencedata/service/RightServiceTest.java b/src/test/java/org/openlmis/referencedata/service/RightServiceTest.java index b53c5fc0a..c01169bf5 100644 --- a/src/test/java/org/openlmis/referencedata/service/RightServiceTest.java +++ b/src/test/java/org/openlmis/referencedata/service/RightServiceTest.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.service; diff --git a/src/test/java/org/openlmis/referencedata/service/SupplyLineServiceTest.java b/src/test/java/org/openlmis/referencedata/service/SupplyLineServiceTest.java index e145534de..4104019d0 100644 --- a/src/test/java/org/openlmis/referencedata/service/SupplyLineServiceTest.java +++ b/src/test/java/org/openlmis/referencedata/service/SupplyLineServiceTest.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.service; @@ -26,6 +26,10 @@ import static org.openlmis.referencedata.service.SupplyLineService.SUPPLYING_FACILITY; import com.google.common.collect.Lists; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -47,11 +51,6 @@ import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - @SuppressWarnings("PMD.TooManyMethods") @RunWith(MockitoJUnitRunner.class) public class SupplyLineServiceTest { diff --git a/src/test/java/org/openlmis/referencedata/service/UserServiceTest.java b/src/test/java/org/openlmis/referencedata/service/UserServiceTest.java index 9243039b8..8cd3db204 100644 --- a/src/test/java/org/openlmis/referencedata/service/UserServiceTest.java +++ b/src/test/java/org/openlmis/referencedata/service/UserServiceTest.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.service; diff --git a/src/test/java/org/openlmis/referencedata/testbuilder/CommodityTypeDataBuilder.java b/src/test/java/org/openlmis/referencedata/testbuilder/CommodityTypeDataBuilder.java index 448819ae5..11aabca7d 100644 --- a/src/test/java/org/openlmis/referencedata/testbuilder/CommodityTypeDataBuilder.java +++ b/src/test/java/org/openlmis/referencedata/testbuilder/CommodityTypeDataBuilder.java @@ -5,23 +5,21 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.testbuilder; import com.google.common.collect.Lists; - -import org.apache.commons.lang.RandomStringUtils; -import org.openlmis.referencedata.domain.CommodityType; - import java.util.List; import java.util.UUID; +import org.apache.commons.lang.RandomStringUtils; +import org.openlmis.referencedata.domain.CommodityType; public class CommodityTypeDataBuilder { private UUID id = UUID.randomUUID(); diff --git a/src/test/java/org/openlmis/referencedata/testbuilder/DirectRoleAssignmentDataBuilder.java b/src/test/java/org/openlmis/referencedata/testbuilder/DirectRoleAssignmentDataBuilder.java index 73a34d7cc..231f4d3dc 100644 --- a/src/test/java/org/openlmis/referencedata/testbuilder/DirectRoleAssignmentDataBuilder.java +++ b/src/test/java/org/openlmis/referencedata/testbuilder/DirectRoleAssignmentDataBuilder.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.testbuilder; diff --git a/src/test/java/org/openlmis/referencedata/testbuilder/ExtraDataBuilder.java b/src/test/java/org/openlmis/referencedata/testbuilder/ExtraDataBuilder.java index 544369646..e9653c59d 100644 --- a/src/test/java/org/openlmis/referencedata/testbuilder/ExtraDataBuilder.java +++ b/src/test/java/org/openlmis/referencedata/testbuilder/ExtraDataBuilder.java @@ -5,18 +5,17 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.testbuilder; import com.google.common.collect.Maps; - import java.util.Map; public class ExtraDataBuilder { diff --git a/src/test/java/org/openlmis/referencedata/testbuilder/FacilityDataBuilder.java b/src/test/java/org/openlmis/referencedata/testbuilder/FacilityDataBuilder.java index 6d7ccf7d7..34e908535 100644 --- a/src/test/java/org/openlmis/referencedata/testbuilder/FacilityDataBuilder.java +++ b/src/test/java/org/openlmis/referencedata/testbuilder/FacilityDataBuilder.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.testbuilder; @@ -18,17 +18,17 @@ import com.vividsolutions.jts.geom.Coordinate; import com.vividsolutions.jts.geom.GeometryFactory; import com.vividsolutions.jts.geom.Point; -import org.openlmis.referencedata.domain.Facility; -import org.openlmis.referencedata.domain.FacilityOperator; -import org.openlmis.referencedata.domain.FacilityType; -import org.openlmis.referencedata.domain.GeographicZone; -import org.openlmis.referencedata.domain.Program; import java.time.LocalDate; import java.util.HashSet; import java.util.Map; import java.util.Set; import java.util.UUID; import java.util.stream.Collectors; +import org.openlmis.referencedata.domain.Facility; +import org.openlmis.referencedata.domain.FacilityOperator; +import org.openlmis.referencedata.domain.FacilityType; +import org.openlmis.referencedata.domain.GeographicZone; +import org.openlmis.referencedata.domain.Program; @SuppressWarnings("PMD.TooManyMethods") public class FacilityDataBuilder { diff --git a/src/test/java/org/openlmis/referencedata/testbuilder/FacilityOperatorDataBuilder.java b/src/test/java/org/openlmis/referencedata/testbuilder/FacilityOperatorDataBuilder.java index 215a89965..5e93095a6 100644 --- a/src/test/java/org/openlmis/referencedata/testbuilder/FacilityOperatorDataBuilder.java +++ b/src/test/java/org/openlmis/referencedata/testbuilder/FacilityOperatorDataBuilder.java @@ -5,18 +5,18 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.testbuilder; -import org.openlmis.referencedata.domain.FacilityOperator; import java.util.UUID; +import org.openlmis.referencedata.domain.FacilityOperator; public class FacilityOperatorDataBuilder { diff --git a/src/test/java/org/openlmis/referencedata/testbuilder/FacilityTypeApprovedProductsDataBuilder.java b/src/test/java/org/openlmis/referencedata/testbuilder/FacilityTypeApprovedProductsDataBuilder.java index 8b0142dc1..76d4eb743 100644 --- a/src/test/java/org/openlmis/referencedata/testbuilder/FacilityTypeApprovedProductsDataBuilder.java +++ b/src/test/java/org/openlmis/referencedata/testbuilder/FacilityTypeApprovedProductsDataBuilder.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.testbuilder; diff --git a/src/test/java/org/openlmis/referencedata/testbuilder/FacilityTypeDataBuilder.java b/src/test/java/org/openlmis/referencedata/testbuilder/FacilityTypeDataBuilder.java index a865be649..076e6911c 100644 --- a/src/test/java/org/openlmis/referencedata/testbuilder/FacilityTypeDataBuilder.java +++ b/src/test/java/org/openlmis/referencedata/testbuilder/FacilityTypeDataBuilder.java @@ -5,18 +5,18 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.testbuilder; -import org.openlmis.referencedata.domain.FacilityType; import java.util.UUID; +import org.openlmis.referencedata.domain.FacilityType; public class FacilityTypeDataBuilder { diff --git a/src/test/java/org/openlmis/referencedata/testbuilder/GeographicLevelDataBuilder.java b/src/test/java/org/openlmis/referencedata/testbuilder/GeographicLevelDataBuilder.java index 5c1579bf3..526954f13 100644 --- a/src/test/java/org/openlmis/referencedata/testbuilder/GeographicLevelDataBuilder.java +++ b/src/test/java/org/openlmis/referencedata/testbuilder/GeographicLevelDataBuilder.java @@ -5,21 +5,20 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.testbuilder; +import java.util.UUID; import org.openlmis.referencedata.domain.GeographicLevel; import org.openlmis.referencedata.domain.GeographicZone; -import java.util.UUID; - public class GeographicLevelDataBuilder { private static int instanceNumber = 0; diff --git a/src/test/java/org/openlmis/referencedata/testbuilder/GeographicZoneDataBuilder.java b/src/test/java/org/openlmis/referencedata/testbuilder/GeographicZoneDataBuilder.java index 094b1e647..fa87ad9ce 100644 --- a/src/test/java/org/openlmis/referencedata/testbuilder/GeographicZoneDataBuilder.java +++ b/src/test/java/org/openlmis/referencedata/testbuilder/GeographicZoneDataBuilder.java @@ -5,24 +5,22 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.testbuilder; import com.vividsolutions.jts.geom.Polygon; - +import java.util.UUID; import org.apache.commons.lang3.RandomUtils; import org.openlmis.referencedata.domain.GeographicLevel; import org.openlmis.referencedata.domain.GeographicZone; -import java.util.UUID; - public class GeographicZoneDataBuilder { private static int instanceNumber = 0; diff --git a/src/test/java/org/openlmis/referencedata/testbuilder/LotDataBuilder.java b/src/test/java/org/openlmis/referencedata/testbuilder/LotDataBuilder.java index 64718bcf0..7e264af42 100644 --- a/src/test/java/org/openlmis/referencedata/testbuilder/LotDataBuilder.java +++ b/src/test/java/org/openlmis/referencedata/testbuilder/LotDataBuilder.java @@ -5,21 +5,20 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.testbuilder; -import org.openlmis.referencedata.domain.Lot; -import org.openlmis.referencedata.domain.TradeItem; - import java.time.LocalDate; import java.util.UUID; +import org.openlmis.referencedata.domain.Lot; +import org.openlmis.referencedata.domain.TradeItem; public class LotDataBuilder { private static int instanceNumber = 0; diff --git a/src/test/java/org/openlmis/referencedata/testbuilder/OAuth2AuthenticationDataBuilder.java b/src/test/java/org/openlmis/referencedata/testbuilder/OAuth2AuthenticationDataBuilder.java index 77f2091ad..9e6fd22fe 100644 --- a/src/test/java/org/openlmis/referencedata/testbuilder/OAuth2AuthenticationDataBuilder.java +++ b/src/test/java/org/openlmis/referencedata/testbuilder/OAuth2AuthenticationDataBuilder.java @@ -5,23 +5,21 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.testbuilder; +import java.util.UUID; +import lombok.EqualsAndHashCode; import org.springframework.security.oauth2.provider.OAuth2Authentication; import org.springframework.security.oauth2.provider.OAuth2Request; -import lombok.EqualsAndHashCode; - -import java.util.UUID; - public class OAuth2AuthenticationDataBuilder { public static final String API_KEY_PREFIX = "api-key-client-"; diff --git a/src/test/java/org/openlmis/referencedata/testbuilder/OrderableDataBuilder.java b/src/test/java/org/openlmis/referencedata/testbuilder/OrderableDataBuilder.java index 0129ea5d0..abe59e223 100644 --- a/src/test/java/org/openlmis/referencedata/testbuilder/OrderableDataBuilder.java +++ b/src/test/java/org/openlmis/referencedata/testbuilder/OrderableDataBuilder.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.testbuilder; diff --git a/src/test/java/org/openlmis/referencedata/testbuilder/ProcessingPeriodDataBuilder.java b/src/test/java/org/openlmis/referencedata/testbuilder/ProcessingPeriodDataBuilder.java index d54e16b80..e07825cff 100644 --- a/src/test/java/org/openlmis/referencedata/testbuilder/ProcessingPeriodDataBuilder.java +++ b/src/test/java/org/openlmis/referencedata/testbuilder/ProcessingPeriodDataBuilder.java @@ -5,25 +5,24 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.testbuilder; import static org.openlmis.referencedata.domain.ProcessingPeriod.newPeriod; +import java.time.LocalDate; +import java.util.UUID; import org.apache.commons.lang.RandomStringUtils; import org.openlmis.referencedata.domain.ProcessingPeriod; import org.openlmis.referencedata.domain.ProcessingSchedule; -import java.time.LocalDate; -import java.util.UUID; - public class ProcessingPeriodDataBuilder { private UUID id = UUID.randomUUID(); private ProcessingSchedule processingSchedule = new ProcessingScheduleDataBuilder().build(); diff --git a/src/test/java/org/openlmis/referencedata/testbuilder/ProcessingScheduleDataBuilder.java b/src/test/java/org/openlmis/referencedata/testbuilder/ProcessingScheduleDataBuilder.java index 01befbfd8..95df444b8 100644 --- a/src/test/java/org/openlmis/referencedata/testbuilder/ProcessingScheduleDataBuilder.java +++ b/src/test/java/org/openlmis/referencedata/testbuilder/ProcessingScheduleDataBuilder.java @@ -5,21 +5,20 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.testbuilder; -import org.openlmis.referencedata.domain.Code; -import org.openlmis.referencedata.domain.ProcessingSchedule; - import java.time.ZonedDateTime; import java.util.UUID; +import org.openlmis.referencedata.domain.Code; +import org.openlmis.referencedata.domain.ProcessingSchedule; public class ProcessingScheduleDataBuilder { diff --git a/src/test/java/org/openlmis/referencedata/testbuilder/ProgramDataBuilder.java b/src/test/java/org/openlmis/referencedata/testbuilder/ProgramDataBuilder.java index f5268af83..e647c6a64 100644 --- a/src/test/java/org/openlmis/referencedata/testbuilder/ProgramDataBuilder.java +++ b/src/test/java/org/openlmis/referencedata/testbuilder/ProgramDataBuilder.java @@ -5,19 +5,19 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.testbuilder; +import java.util.UUID; import org.openlmis.referencedata.domain.Code; import org.openlmis.referencedata.domain.Program; -import java.util.UUID; public class ProgramDataBuilder { diff --git a/src/test/java/org/openlmis/referencedata/testbuilder/RequisitionGroupDataBuilder.java b/src/test/java/org/openlmis/referencedata/testbuilder/RequisitionGroupDataBuilder.java index 5c598630c..ecdeb7caa 100644 --- a/src/test/java/org/openlmis/referencedata/testbuilder/RequisitionGroupDataBuilder.java +++ b/src/test/java/org/openlmis/referencedata/testbuilder/RequisitionGroupDataBuilder.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.testbuilder; diff --git a/src/test/java/org/openlmis/referencedata/testbuilder/RightDataBuilder.java b/src/test/java/org/openlmis/referencedata/testbuilder/RightDataBuilder.java index 0a7b32ea0..18e606fbf 100644 --- a/src/test/java/org/openlmis/referencedata/testbuilder/RightDataBuilder.java +++ b/src/test/java/org/openlmis/referencedata/testbuilder/RightDataBuilder.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.testbuilder; diff --git a/src/test/java/org/openlmis/referencedata/testbuilder/RoleDataBuilder.java b/src/test/java/org/openlmis/referencedata/testbuilder/RoleDataBuilder.java index 04dba5dc1..2dd6d3c1a 100644 --- a/src/test/java/org/openlmis/referencedata/testbuilder/RoleDataBuilder.java +++ b/src/test/java/org/openlmis/referencedata/testbuilder/RoleDataBuilder.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.testbuilder; diff --git a/src/test/java/org/openlmis/referencedata/testbuilder/ServiceAccountDataBuilder.java b/src/test/java/org/openlmis/referencedata/testbuilder/ServiceAccountDataBuilder.java index 825d0aea2..256cec9bd 100644 --- a/src/test/java/org/openlmis/referencedata/testbuilder/ServiceAccountDataBuilder.java +++ b/src/test/java/org/openlmis/referencedata/testbuilder/ServiceAccountDataBuilder.java @@ -5,22 +5,21 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.testbuilder; -import org.openlmis.referencedata.domain.CreationDetails; -import org.openlmis.referencedata.domain.ServiceAccount; - import java.time.Clock; import java.time.ZonedDateTime; import java.util.UUID; +import org.openlmis.referencedata.domain.CreationDetails; +import org.openlmis.referencedata.domain.ServiceAccount; public class ServiceAccountDataBuilder { private UUID token = UUID.randomUUID(); diff --git a/src/test/java/org/openlmis/referencedata/testbuilder/SupervisoryNodeDataBuilder.java b/src/test/java/org/openlmis/referencedata/testbuilder/SupervisoryNodeDataBuilder.java index 7b8d42ef8..c45662520 100644 --- a/src/test/java/org/openlmis/referencedata/testbuilder/SupervisoryNodeDataBuilder.java +++ b/src/test/java/org/openlmis/referencedata/testbuilder/SupervisoryNodeDataBuilder.java @@ -5,22 +5,22 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.testbuilder; -import org.openlmis.referencedata.domain.Facility; -import org.openlmis.referencedata.domain.RequisitionGroup; -import org.openlmis.referencedata.domain.SupervisoryNode; import java.util.HashSet; import java.util.Set; import java.util.UUID; +import org.openlmis.referencedata.domain.Facility; +import org.openlmis.referencedata.domain.RequisitionGroup; +import org.openlmis.referencedata.domain.SupervisoryNode; public class SupervisoryNodeDataBuilder { diff --git a/src/test/java/org/openlmis/referencedata/testbuilder/SupplyLineDataBuilder.java b/src/test/java/org/openlmis/referencedata/testbuilder/SupplyLineDataBuilder.java index df134cca4..5a0d1ab3a 100644 --- a/src/test/java/org/openlmis/referencedata/testbuilder/SupplyLineDataBuilder.java +++ b/src/test/java/org/openlmis/referencedata/testbuilder/SupplyLineDataBuilder.java @@ -5,21 +5,21 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.testbuilder; +import java.util.UUID; import org.openlmis.referencedata.domain.Facility; import org.openlmis.referencedata.domain.Program; import org.openlmis.referencedata.domain.SupervisoryNode; import org.openlmis.referencedata.domain.SupplyLine; -import java.util.UUID; public class SupplyLineDataBuilder { diff --git a/src/test/java/org/openlmis/referencedata/testbuilder/SupportedProgramDataBuilder.java b/src/test/java/org/openlmis/referencedata/testbuilder/SupportedProgramDataBuilder.java index a46829640..42c56f752 100644 --- a/src/test/java/org/openlmis/referencedata/testbuilder/SupportedProgramDataBuilder.java +++ b/src/test/java/org/openlmis/referencedata/testbuilder/SupportedProgramDataBuilder.java @@ -5,23 +5,22 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.testbuilder; +import java.time.LocalDate; import org.openlmis.referencedata.domain.Facility; import org.openlmis.referencedata.domain.Program; import org.openlmis.referencedata.domain.SupportedProgram; import org.openlmis.referencedata.domain.SupportedProgramPrimaryKey; -import java.time.LocalDate; - public class SupportedProgramDataBuilder { private Facility facility; private Program program; diff --git a/src/test/java/org/openlmis/referencedata/testbuilder/TradeItemDataBuilder.java b/src/test/java/org/openlmis/referencedata/testbuilder/TradeItemDataBuilder.java index 61b28067e..a860a73f6 100644 --- a/src/test/java/org/openlmis/referencedata/testbuilder/TradeItemDataBuilder.java +++ b/src/test/java/org/openlmis/referencedata/testbuilder/TradeItemDataBuilder.java @@ -5,26 +5,24 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.testbuilder; import com.google.common.collect.Lists; - +import java.util.List; +import java.util.UUID; import org.apache.commons.lang.RandomStringUtils; import org.openlmis.referencedata.domain.CommodityType; import org.openlmis.referencedata.domain.TradeItem; import org.openlmis.referencedata.domain.TradeItemClassification; -import java.util.List; -import java.util.UUID; - public class TradeItemDataBuilder { private UUID id = UUID.randomUUID(); private String manufacturerOfTradeItem = RandomStringUtils.randomAlphanumeric(5); diff --git a/src/test/java/org/openlmis/referencedata/testbuilder/UserDataBuilder.java b/src/test/java/org/openlmis/referencedata/testbuilder/UserDataBuilder.java index d15fc2810..c0131bde2 100644 --- a/src/test/java/org/openlmis/referencedata/testbuilder/UserDataBuilder.java +++ b/src/test/java/org/openlmis/referencedata/testbuilder/UserDataBuilder.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.testbuilder; diff --git a/src/test/java/org/openlmis/referencedata/util/CustomSortDeserializerTest.java b/src/test/java/org/openlmis/referencedata/util/CustomSortDeserializerTest.java index 7e37ee3e7..48fd1ee14 100644 --- a/src/test/java/org/openlmis/referencedata/util/CustomSortDeserializerTest.java +++ b/src/test/java/org/openlmis/referencedata/util/CustomSortDeserializerTest.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.util; @@ -21,10 +21,10 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.node.ArrayNode; import com.fasterxml.jackson.databind.node.ObjectNode; +import java.io.IOException; import lombok.AllArgsConstructor; import org.junit.Test; import org.springframework.data.domain.Sort; -import java.io.IOException; public class CustomSortDeserializerTest { diff --git a/src/test/java/org/openlmis/referencedata/util/MessageTest.java b/src/test/java/org/openlmis/referencedata/util/MessageTest.java index b683f651c..3f7de8468 100644 --- a/src/test/java/org/openlmis/referencedata/util/MessageTest.java +++ b/src/test/java/org/openlmis/referencedata/util/MessageTest.java @@ -5,26 +5,25 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.util; import static org.junit.Assert.assertEquals; +import java.util.Date; +import java.util.Locale; import org.junit.Test; import org.mockito.Mockito; import org.springframework.context.MessageSource; import org.springframework.context.NoSuchMessageException; -import java.util.Date; -import java.util.Locale; - public class MessageTest { @Test(expected = NullPointerException.class) diff --git a/src/test/java/org/openlmis/referencedata/util/OrderableBuilderTest.java b/src/test/java/org/openlmis/referencedata/util/OrderableBuilderTest.java index 615dd2f01..0816d65e9 100644 --- a/src/test/java/org/openlmis/referencedata/util/OrderableBuilderTest.java +++ b/src/test/java/org/openlmis/referencedata/util/OrderableBuilderTest.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.util; @@ -22,7 +22,8 @@ import static org.mockito.Mockito.when; import com.google.common.collect.Sets; - +import java.util.Set; +import java.util.UUID; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.InjectMocks; @@ -37,9 +38,6 @@ import org.openlmis.referencedata.dto.ProgramOrderableDto; import org.openlmis.referencedata.repository.ProgramRepository; -import java.util.Set; -import java.util.UUID; - @RunWith(MockitoJUnitRunner.class) public class OrderableBuilderTest { diff --git a/src/test/java/org/openlmis/referencedata/util/Resource2DbTest.java b/src/test/java/org/openlmis/referencedata/util/Resource2DbTest.java index 88a7f50d7..d657f79d5 100644 --- a/src/test/java/org/openlmis/referencedata/util/Resource2DbTest.java +++ b/src/test/java/org/openlmis/referencedata/util/Resource2DbTest.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.util; diff --git a/src/test/java/org/openlmis/referencedata/util/UserSearchParamsDataBuilder.java b/src/test/java/org/openlmis/referencedata/util/UserSearchParamsDataBuilder.java index 40721a0d0..9f4e83a15 100644 --- a/src/test/java/org/openlmis/referencedata/util/UserSearchParamsDataBuilder.java +++ b/src/test/java/org/openlmis/referencedata/util/UserSearchParamsDataBuilder.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.util; diff --git a/src/test/java/org/openlmis/referencedata/util/messagekeys/IdealStockAmountMessageKeysTest.java b/src/test/java/org/openlmis/referencedata/util/messagekeys/IdealStockAmountMessageKeysTest.java index d65e3ba57..b7b59d210 100644 --- a/src/test/java/org/openlmis/referencedata/util/messagekeys/IdealStockAmountMessageKeysTest.java +++ b/src/test/java/org/openlmis/referencedata/util/messagekeys/IdealStockAmountMessageKeysTest.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.util.messagekeys; diff --git a/src/test/java/org/openlmis/referencedata/util/messagekeys/ProcessingPeriodMessageKeysTest.java b/src/test/java/org/openlmis/referencedata/util/messagekeys/ProcessingPeriodMessageKeysTest.java index a038dbb39..43ae37b6a 100644 --- a/src/test/java/org/openlmis/referencedata/util/messagekeys/ProcessingPeriodMessageKeysTest.java +++ b/src/test/java/org/openlmis/referencedata/util/messagekeys/ProcessingPeriodMessageKeysTest.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.util.messagekeys; diff --git a/src/test/java/org/openlmis/referencedata/util/messagekeys/RoleAssignmentMessageKeysTest.java b/src/test/java/org/openlmis/referencedata/util/messagekeys/RoleAssignmentMessageKeysTest.java index d4d992ecf..640b5bf55 100644 --- a/src/test/java/org/openlmis/referencedata/util/messagekeys/RoleAssignmentMessageKeysTest.java +++ b/src/test/java/org/openlmis/referencedata/util/messagekeys/RoleAssignmentMessageKeysTest.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.util.messagekeys; diff --git a/src/test/java/org/openlmis/referencedata/util/messagekeys/SupervisoryNodeMessageKeysTest.java b/src/test/java/org/openlmis/referencedata/util/messagekeys/SupervisoryNodeMessageKeysTest.java index 3efb10eff..40db8724a 100644 --- a/src/test/java/org/openlmis/referencedata/util/messagekeys/SupervisoryNodeMessageKeysTest.java +++ b/src/test/java/org/openlmis/referencedata/util/messagekeys/SupervisoryNodeMessageKeysTest.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.util.messagekeys; diff --git a/src/test/java/org/openlmis/referencedata/util/messagekeys/SupplyLineMessageKeysTest.java b/src/test/java/org/openlmis/referencedata/util/messagekeys/SupplyLineMessageKeysTest.java index fccef16b6..971e00511 100644 --- a/src/test/java/org/openlmis/referencedata/util/messagekeys/SupplyLineMessageKeysTest.java +++ b/src/test/java/org/openlmis/referencedata/util/messagekeys/SupplyLineMessageKeysTest.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.util.messagekeys; diff --git a/src/test/java/org/openlmis/referencedata/validate/CsvHeaderValidatorTest.java b/src/test/java/org/openlmis/referencedata/validate/CsvHeaderValidatorTest.java index 21dbebd0f..be2bec75a 100644 --- a/src/test/java/org/openlmis/referencedata/validate/CsvHeaderValidatorTest.java +++ b/src/test/java/org/openlmis/referencedata/validate/CsvHeaderValidatorTest.java @@ -5,16 +5,24 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.validate; +import static org.openlmis.referencedata.util.messagekeys.CsvUploadMessageKeys.ERROR_UPLOAD_HEADER_INVALID; +import static org.openlmis.referencedata.util.messagekeys.CsvUploadMessageKeys.ERROR_UPLOAD_HEADER_MISSING; +import static org.openlmis.referencedata.util.messagekeys.CsvUploadMessageKeys.ERROR_UPLOAD_MISSING_MANDATORY_COLUMNS; +import static org.openlmis.referencedata.web.dummy.DummyTransferObject.MANDATORY_STRING_FIELD; + +import java.util.Arrays; +import java.util.Collections; +import java.util.List; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; @@ -26,15 +34,6 @@ import org.openlmis.referencedata.web.csv.model.ModelClass; import org.openlmis.referencedata.web.dummy.DummyTransferObject; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; - -import static org.openlmis.referencedata.util.messagekeys.CsvUploadMessageKeys.ERROR_UPLOAD_HEADER_INVALID; -import static org.openlmis.referencedata.util.messagekeys.CsvUploadMessageKeys.ERROR_UPLOAD_HEADER_MISSING; -import static org.openlmis.referencedata.util.messagekeys.CsvUploadMessageKeys.ERROR_UPLOAD_MISSING_MANDATORY_COLUMNS; -import static org.openlmis.referencedata.web.dummy.DummyTransferObject.MANDATORY_STRING_FIELD; - @RunWith(MockitoJUnitRunner.class) public class CsvHeaderValidatorTest { diff --git a/src/test/java/org/openlmis/referencedata/validate/FacilityValidatorTest.java b/src/test/java/org/openlmis/referencedata/validate/FacilityValidatorTest.java index f48a05918..02c0b7682 100644 --- a/src/test/java/org/openlmis/referencedata/validate/FacilityValidatorTest.java +++ b/src/test/java/org/openlmis/referencedata/validate/FacilityValidatorTest.java @@ -5,16 +5,23 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.validate; +import static org.junit.Assert.assertEquals; +import static org.mockito.Matchers.any; +import static org.mockito.Mockito.when; +import static org.openlmis.referencedata.validate.FacilityValidator.CODE; +import static org.openlmis.referencedata.validate.ValidationTestUtils.assertErrorMessage; + +import java.util.UUID; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -29,14 +36,6 @@ import org.springframework.validation.Errors; import org.springframework.validation.Validator; -import java.util.UUID; - -import static org.junit.Assert.assertEquals; -import static org.mockito.Matchers.any; -import static org.mockito.Mockito.when; -import static org.openlmis.referencedata.validate.FacilityValidator.CODE; -import static org.openlmis.referencedata.validate.ValidationTestUtils.assertErrorMessage; - @RunWith(MockitoJUnitRunner.class) public class FacilityValidatorTest { diff --git a/src/test/java/org/openlmis/referencedata/validate/IdealStockAmountValidatorTest.java b/src/test/java/org/openlmis/referencedata/validate/IdealStockAmountValidatorTest.java index fdfbd1b4a..13bef400f 100644 --- a/src/test/java/org/openlmis/referencedata/validate/IdealStockAmountValidatorTest.java +++ b/src/test/java/org/openlmis/referencedata/validate/IdealStockAmountValidatorTest.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.validate; diff --git a/src/test/java/org/openlmis/referencedata/validate/LotValidatorTest.java b/src/test/java/org/openlmis/referencedata/validate/LotValidatorTest.java index eb02219ca..3cbcacc3d 100644 --- a/src/test/java/org/openlmis/referencedata/validate/LotValidatorTest.java +++ b/src/test/java/org/openlmis/referencedata/validate/LotValidatorTest.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.validate; @@ -21,6 +21,11 @@ import static org.openlmis.referencedata.validate.LotValidator.TRADE_ITEM_ID; import static org.openlmis.referencedata.validate.ValidationTestUtils.assertErrorMessage; +import java.time.LocalDate; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.UUID; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -38,11 +43,6 @@ import org.springframework.validation.BeanPropertyBindingResult; import org.springframework.validation.Errors; import org.springframework.validation.Validator; -import java.time.LocalDate; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.UUID; @RunWith(MockitoJUnitRunner.class) @SuppressWarnings("PMD.TooManyMethods") diff --git a/src/test/java/org/openlmis/referencedata/validate/ProcessingPeriodValidatorTest.java b/src/test/java/org/openlmis/referencedata/validate/ProcessingPeriodValidatorTest.java index 3582e02de..c3ed49e8b 100644 --- a/src/test/java/org/openlmis/referencedata/validate/ProcessingPeriodValidatorTest.java +++ b/src/test/java/org/openlmis/referencedata/validate/ProcessingPeriodValidatorTest.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.validate; @@ -21,6 +21,9 @@ import static org.mockito.Mockito.when; import static org.openlmis.referencedata.validate.ValidationTestUtils.assertErrorMessage; +import java.time.LocalDate; +import java.util.Collections; +import java.util.UUID; import org.junit.Before; import org.junit.Test; import org.mockito.InjectMocks; @@ -34,9 +37,6 @@ import org.springframework.validation.BeanPropertyBindingResult; import org.springframework.validation.Errors; import org.springframework.validation.Validator; -import java.time.LocalDate; -import java.util.Collections; -import java.util.UUID; public class ProcessingPeriodValidatorTest { diff --git a/src/test/java/org/openlmis/referencedata/validate/ProgramValidatorTest.java b/src/test/java/org/openlmis/referencedata/validate/ProgramValidatorTest.java index a2cfdc307..470fa5a4d 100644 --- a/src/test/java/org/openlmis/referencedata/validate/ProgramValidatorTest.java +++ b/src/test/java/org/openlmis/referencedata/validate/ProgramValidatorTest.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.validate; @@ -21,6 +21,7 @@ import static org.openlmis.referencedata.validate.ProgramValidator.CODE; import static org.openlmis.referencedata.validate.ValidationTestUtils.assertErrorMessage; +import java.util.UUID; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -31,7 +32,6 @@ import org.springframework.validation.BeanPropertyBindingResult; import org.springframework.validation.Errors; import org.springframework.validation.Validator; -import java.util.UUID; @RunWith(MockitoJUnitRunner.class) public class ProgramValidatorTest { diff --git a/src/test/java/org/openlmis/referencedata/validate/RequisitionGroupValidatorParameterizedTest.java b/src/test/java/org/openlmis/referencedata/validate/RequisitionGroupValidatorParameterizedTest.java index 7d00d2f81..5ae5fed51 100644 --- a/src/test/java/org/openlmis/referencedata/validate/RequisitionGroupValidatorParameterizedTest.java +++ b/src/test/java/org/openlmis/referencedata/validate/RequisitionGroupValidatorParameterizedTest.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.validate; @@ -21,6 +21,8 @@ import static org.openlmis.referencedata.validate.RequisitionGroupValidator.NAME; import static org.openlmis.referencedata.validate.ValidationTestUtils.assertErrorMessage; +import java.util.Arrays; +import java.util.Collection; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -37,9 +39,6 @@ import org.springframework.validation.Errors; import org.springframework.validation.Validator; -import java.util.Arrays; -import java.util.Collection; - @RunWith(Parameterized.class) public class RequisitionGroupValidatorParameterizedTest { diff --git a/src/test/java/org/openlmis/referencedata/validate/RequisitionGroupValidatorTest.java b/src/test/java/org/openlmis/referencedata/validate/RequisitionGroupValidatorTest.java index 89b604071..5ebd12ddd 100644 --- a/src/test/java/org/openlmis/referencedata/validate/RequisitionGroupValidatorTest.java +++ b/src/test/java/org/openlmis/referencedata/validate/RequisitionGroupValidatorTest.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.validate; @@ -30,7 +30,9 @@ import static org.openlmis.referencedata.validate.ValidationTestUtils.assertErrorMessage; import com.google.common.collect.Sets; - +import java.util.Arrays; +import java.util.Collections; +import java.util.UUID; import org.apache.commons.lang3.RandomStringUtils; import org.junit.Before; import org.junit.Test; @@ -55,10 +57,6 @@ import org.springframework.validation.Errors; import org.springframework.validation.Validator; -import java.util.Arrays; -import java.util.Collections; -import java.util.UUID; - @RunWith(MockitoJUnitRunner.class) @SuppressWarnings({"PMD.TooManyMethods"}) public class RequisitionGroupValidatorTest { diff --git a/src/test/java/org/openlmis/referencedata/validate/SupervisoryNodeValidatorTest.java b/src/test/java/org/openlmis/referencedata/validate/SupervisoryNodeValidatorTest.java index eea9a2968..2289443b5 100644 --- a/src/test/java/org/openlmis/referencedata/validate/SupervisoryNodeValidatorTest.java +++ b/src/test/java/org/openlmis/referencedata/validate/SupervisoryNodeValidatorTest.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.validate; diff --git a/src/test/java/org/openlmis/referencedata/validate/UserValidatorTest.java b/src/test/java/org/openlmis/referencedata/validate/UserValidatorTest.java index eedd7ec54..99158b0ef 100644 --- a/src/test/java/org/openlmis/referencedata/validate/UserValidatorTest.java +++ b/src/test/java/org/openlmis/referencedata/validate/UserValidatorTest.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.validate; diff --git a/src/test/java/org/openlmis/referencedata/validate/ValidationTestUtils.java b/src/test/java/org/openlmis/referencedata/validate/ValidationTestUtils.java index 919ca5e4f..b05ffed0e 100644 --- a/src/test/java/org/openlmis/referencedata/validate/ValidationTestUtils.java +++ b/src/test/java/org/openlmis/referencedata/validate/ValidationTestUtils.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.validate; diff --git a/src/test/java/org/openlmis/referencedata/web/DummyPage.java b/src/test/java/org/openlmis/referencedata/web/DummyPage.java index f5358b3ad..05cf54068 100644 --- a/src/test/java/org/openlmis/referencedata/web/DummyPage.java +++ b/src/test/java/org/openlmis/referencedata/web/DummyPage.java @@ -5,16 +5,18 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.web; +import java.util.Iterator; +import java.util.List; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.Setter; @@ -22,8 +24,6 @@ import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Sort; -import java.util.Iterator; -import java.util.List; @Getter @Setter diff --git a/src/test/java/org/openlmis/referencedata/web/FacilitySearchParamsTest.java b/src/test/java/org/openlmis/referencedata/web/FacilitySearchParamsTest.java index 1d606880d..7e71ac162 100644 --- a/src/test/java/org/openlmis/referencedata/web/FacilitySearchParamsTest.java +++ b/src/test/java/org/openlmis/referencedata/web/FacilitySearchParamsTest.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.web; diff --git a/src/test/java/org/openlmis/referencedata/web/OrderableDisplayCategoryControllerTest.java b/src/test/java/org/openlmis/referencedata/web/OrderableDisplayCategoryControllerTest.java index 6189e9566..2c46a9d5d 100644 --- a/src/test/java/org/openlmis/referencedata/web/OrderableDisplayCategoryControllerTest.java +++ b/src/test/java/org/openlmis/referencedata/web/OrderableDisplayCategoryControllerTest.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.web; @@ -20,6 +20,7 @@ import static org.mockito.MockitoAnnotations.initMocks; import com.google.common.collect.Sets; +import java.util.Set; import org.junit.Before; import org.junit.Test; import org.mockito.InjectMocks; @@ -30,7 +31,6 @@ import org.openlmis.referencedata.dto.OrderableDisplayCategoryDto; import org.openlmis.referencedata.repository.OrderableDisplayCategoryRepository; import org.openlmis.referencedata.service.RightService; -import java.util.Set; @SuppressWarnings({"PMD.UnusedPrivateField"}) public class OrderableDisplayCategoryControllerTest { diff --git a/src/test/java/org/openlmis/referencedata/web/OrderableFulfillFactoryTest.java b/src/test/java/org/openlmis/referencedata/web/OrderableFulfillFactoryTest.java index 307c30390..ca7829e9a 100644 --- a/src/test/java/org/openlmis/referencedata/web/OrderableFulfillFactoryTest.java +++ b/src/test/java/org/openlmis/referencedata/web/OrderableFulfillFactoryTest.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.web; @@ -26,7 +26,6 @@ import static org.openlmis.referencedata.util.Pagination.DEFAULT_PAGE_NUMBER; import com.google.common.collect.Lists; - import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.InjectMocks; diff --git a/src/test/java/org/openlmis/referencedata/web/ProgramSearchParamsTest.java b/src/test/java/org/openlmis/referencedata/web/ProgramSearchParamsTest.java index 6e1ac8efc..9b59c472c 100644 --- a/src/test/java/org/openlmis/referencedata/web/ProgramSearchParamsTest.java +++ b/src/test/java/org/openlmis/referencedata/web/ProgramSearchParamsTest.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.web; diff --git a/src/test/java/org/openlmis/referencedata/web/RoleControllerTest.java b/src/test/java/org/openlmis/referencedata/web/RoleControllerTest.java index e658efb2c..aacd5ad85 100644 --- a/src/test/java/org/openlmis/referencedata/web/RoleControllerTest.java +++ b/src/test/java/org/openlmis/referencedata/web/RoleControllerTest.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.web; diff --git a/src/test/java/org/openlmis/referencedata/web/SupervisoryNodeSearchParamsTest.java b/src/test/java/org/openlmis/referencedata/web/SupervisoryNodeSearchParamsTest.java index 18ce79103..660cb7451 100644 --- a/src/test/java/org/openlmis/referencedata/web/SupervisoryNodeSearchParamsTest.java +++ b/src/test/java/org/openlmis/referencedata/web/SupervisoryNodeSearchParamsTest.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.web; diff --git a/src/test/java/org/openlmis/referencedata/web/SupplyLineControllerTest.java b/src/test/java/org/openlmis/referencedata/web/SupplyLineControllerTest.java index 5899f2f17..a7ac0b64c 100644 --- a/src/test/java/org/openlmis/referencedata/web/SupplyLineControllerTest.java +++ b/src/test/java/org/openlmis/referencedata/web/SupplyLineControllerTest.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.web; @@ -23,6 +23,11 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.UUID; +import java.util.stream.Collectors; import org.junit.Before; import org.junit.Test; import org.mockito.InjectMocks; @@ -40,11 +45,6 @@ import org.openlmis.referencedata.service.SupplyLineService; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; -import java.util.UUID; -import java.util.stream.Collectors; @SuppressWarnings({"PMD.UnusedPrivateField"}) public class SupplyLineControllerTest { diff --git a/src/test/java/org/openlmis/referencedata/web/UserControllerTest.java b/src/test/java/org/openlmis/referencedata/web/UserControllerTest.java index 6242bf5ff..f287042bf 100644 --- a/src/test/java/org/openlmis/referencedata/web/UserControllerTest.java +++ b/src/test/java/org/openlmis/referencedata/web/UserControllerTest.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.web; @@ -54,8 +54,8 @@ import org.openlmis.referencedata.repository.RoleRepository; import org.openlmis.referencedata.repository.SupervisoryNodeRepository; import org.openlmis.referencedata.repository.UserRepository; -import org.openlmis.referencedata.service.RightService; import org.openlmis.referencedata.repository.UserSearchParams; +import org.openlmis.referencedata.service.RightService; import org.openlmis.referencedata.service.UserService; import org.openlmis.referencedata.testbuilder.SupportedProgramDataBuilder; import org.openlmis.referencedata.testbuilder.UserDataBuilder; @@ -457,7 +457,7 @@ public void shouldNotCheckIfUserHasRightForNonExistingUser() { when(repository.findOne(userId)).thenReturn(null); //when - controller.checkIfUserHasRight( userId, + controller.checkIfUserHasRight(userId, UUID.randomUUID(), null, null, diff --git a/src/test/java/org/openlmis/referencedata/web/csv/ModelClassTest.java b/src/test/java/org/openlmis/referencedata/web/csv/ModelClassTest.java index c905617f5..7f718c410 100644 --- a/src/test/java/org/openlmis/referencedata/web/csv/ModelClassTest.java +++ b/src/test/java/org/openlmis/referencedata/web/csv/ModelClassTest.java @@ -5,30 +5,29 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.web.csv; -import org.junit.Test; -import org.openlmis.referencedata.web.csv.model.ModelClass; -import org.openlmis.referencedata.web.csv.model.ModelField; -import org.openlmis.referencedata.web.dummy.DummyTransferObject; - -import java.util.Arrays; -import java.util.List; - import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertThat; import static org.openlmis.referencedata.web.dummy.DummyTransferObject.MANDATORY_STRING_FIELD; import static org.openlmis.referencedata.web.dummy.DummyTransferObject.OPTIONAL_NESTED_FIELD; +import java.util.Arrays; +import java.util.List; +import org.junit.Test; +import org.openlmis.referencedata.web.csv.model.ModelClass; +import org.openlmis.referencedata.web.csv.model.ModelField; +import org.openlmis.referencedata.web.dummy.DummyTransferObject; + public class ModelClassTest { @Test diff --git a/src/test/java/org/openlmis/referencedata/web/csv/ModelFieldTest.java b/src/test/java/org/openlmis/referencedata/web/csv/ModelFieldTest.java index 75f5df2f4..210e3eba4 100644 --- a/src/test/java/org/openlmis/referencedata/web/csv/ModelFieldTest.java +++ b/src/test/java/org/openlmis/referencedata/web/csv/ModelFieldTest.java @@ -5,31 +5,30 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.web.csv; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; +import static org.openlmis.referencedata.web.csv.processor.CsvCellProcessors.FACILITY_TYPE; +import static org.openlmis.referencedata.web.dummy.DummyTransferObject.MANDATORY_STRING_FIELD; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; import org.junit.Before; import org.junit.Test; import org.openlmis.referencedata.web.csv.model.ImportField; import org.openlmis.referencedata.web.csv.model.ModelField; import org.openlmis.referencedata.web.dummy.DummyTransferObject; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; -import static org.openlmis.referencedata.web.csv.processor.CsvCellProcessors.FACILITY_TYPE; -import static org.openlmis.referencedata.web.dummy.DummyTransferObject.MANDATORY_STRING_FIELD; - public class ModelFieldTest { private List result = new ArrayList<>(); diff --git a/src/test/java/org/openlmis/referencedata/web/csv/processor/CsvCellProcessorsTest.java b/src/test/java/org/openlmis/referencedata/web/csv/processor/CsvCellProcessorsTest.java index cd8bf3fc9..7faffc558 100644 --- a/src/test/java/org/openlmis/referencedata/web/csv/processor/CsvCellProcessorsTest.java +++ b/src/test/java/org/openlmis/referencedata/web/csv/processor/CsvCellProcessorsTest.java @@ -5,16 +5,25 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.web.csv.processor; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; +import static org.openlmis.referencedata.web.dummy.DummyTransferObject.MANDATORY_STRING_FIELD; +import static org.openlmis.referencedata.web.dummy.DummyTransferObject.OPTIONAL_FACILITY_FIELD; + +import java.lang.reflect.Field; +import java.util.Arrays; +import java.util.List; import org.junit.Before; import org.junit.Test; import org.openlmis.referencedata.web.csv.model.ModelClass; @@ -26,16 +35,6 @@ import org.supercsv.cellprocessor.constraint.NotNull; import org.supercsv.cellprocessor.ift.CellProcessor; -import java.lang.reflect.Field; -import java.util.Arrays; -import java.util.List; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; -import static org.openlmis.referencedata.web.dummy.DummyTransferObject.MANDATORY_STRING_FIELD; -import static org.openlmis.referencedata.web.dummy.DummyTransferObject.OPTIONAL_FACILITY_FIELD; - public class CsvCellProcessorsTest { private ModelClass dummyImportableClass; diff --git a/src/test/java/org/openlmis/referencedata/web/csv/processor/FormatCommodityTypeTest.java b/src/test/java/org/openlmis/referencedata/web/csv/processor/FormatCommodityTypeTest.java index 82d22b743..cfa6861a7 100644 --- a/src/test/java/org/openlmis/referencedata/web/csv/processor/FormatCommodityTypeTest.java +++ b/src/test/java/org/openlmis/referencedata/web/csv/processor/FormatCommodityTypeTest.java @@ -5,16 +5,18 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.web.csv.processor; +import static org.junit.Assert.assertEquals; + import org.apache.commons.lang3.StringUtils; import org.junit.Before; import org.junit.Rule; @@ -25,8 +27,6 @@ import org.supercsv.exception.SuperCsvCellProcessorException; import org.supercsv.util.CsvContext; -import static org.junit.Assert.assertEquals; - public class FormatCommodityTypeTest { @Rule diff --git a/src/test/java/org/openlmis/referencedata/web/csv/processor/FormatFacilityTest.java b/src/test/java/org/openlmis/referencedata/web/csv/processor/FormatFacilityTest.java index fae05c528..18e40ef56 100644 --- a/src/test/java/org/openlmis/referencedata/web/csv/processor/FormatFacilityTest.java +++ b/src/test/java/org/openlmis/referencedata/web/csv/processor/FormatFacilityTest.java @@ -5,16 +5,18 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.web.csv.processor; +import static org.junit.Assert.assertEquals; + import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -24,8 +26,6 @@ import org.supercsv.exception.SuperCsvCellProcessorException; import org.supercsv.util.CsvContext; -import static org.junit.Assert.assertEquals; - public class FormatFacilityTest { @Rule diff --git a/src/test/java/org/openlmis/referencedata/web/csv/processor/FormatProcessingPeriodTest.java b/src/test/java/org/openlmis/referencedata/web/csv/processor/FormatProcessingPeriodTest.java index 14795e4ec..d1bbec8dc 100644 --- a/src/test/java/org/openlmis/referencedata/web/csv/processor/FormatProcessingPeriodTest.java +++ b/src/test/java/org/openlmis/referencedata/web/csv/processor/FormatProcessingPeriodTest.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.web.csv.processor; diff --git a/src/test/java/org/openlmis/referencedata/web/csv/processor/ParseCommodityTypeTest.java b/src/test/java/org/openlmis/referencedata/web/csv/processor/ParseCommodityTypeTest.java index b443281f7..36d6a3c66 100644 --- a/src/test/java/org/openlmis/referencedata/web/csv/processor/ParseCommodityTypeTest.java +++ b/src/test/java/org/openlmis/referencedata/web/csv/processor/ParseCommodityTypeTest.java @@ -5,16 +5,18 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.web.csv.processor; +import static org.junit.Assert.assertEquals; + import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -24,8 +26,6 @@ import org.supercsv.exception.SuperCsvCellProcessorException; import org.supercsv.util.CsvContext; -import static org.junit.Assert.assertEquals; - public class ParseCommodityTypeTest { @Rule diff --git a/src/test/java/org/openlmis/referencedata/web/csv/processor/ParseFacilityTest.java b/src/test/java/org/openlmis/referencedata/web/csv/processor/ParseFacilityTest.java index b27494b08..9725d8a54 100644 --- a/src/test/java/org/openlmis/referencedata/web/csv/processor/ParseFacilityTest.java +++ b/src/test/java/org/openlmis/referencedata/web/csv/processor/ParseFacilityTest.java @@ -5,16 +5,18 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.web.csv.processor; +import static org.junit.Assert.assertEquals; + import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -24,8 +26,6 @@ import org.supercsv.exception.SuperCsvCellProcessorException; import org.supercsv.util.CsvContext; -import static org.junit.Assert.assertEquals; - public class ParseFacilityTest { @Rule diff --git a/src/test/java/org/openlmis/referencedata/web/csv/processor/ParsePositiveIntegerTest.java b/src/test/java/org/openlmis/referencedata/web/csv/processor/ParsePositiveIntegerTest.java index 60dbd8488..9e3feaec4 100644 --- a/src/test/java/org/openlmis/referencedata/web/csv/processor/ParsePositiveIntegerTest.java +++ b/src/test/java/org/openlmis/referencedata/web/csv/processor/ParsePositiveIntegerTest.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.web.csv.processor; diff --git a/src/test/java/org/openlmis/referencedata/web/csv/processor/ParseProcessingPeriodTest.java b/src/test/java/org/openlmis/referencedata/web/csv/processor/ParseProcessingPeriodTest.java index 671824201..d30c475ec 100644 --- a/src/test/java/org/openlmis/referencedata/web/csv/processor/ParseProcessingPeriodTest.java +++ b/src/test/java/org/openlmis/referencedata/web/csv/processor/ParseProcessingPeriodTest.java @@ -5,16 +5,18 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.web.csv.processor; +import static org.junit.Assert.assertEquals; + import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -24,8 +26,6 @@ import org.supercsv.exception.SuperCsvCellProcessorException; import org.supercsv.util.CsvContext; -import static org.junit.Assert.assertEquals; - public class ParseProcessingPeriodTest { @Rule diff --git a/src/test/java/org/openlmis/referencedata/web/csv/recordhandler/IdealStockAmountProcessorTest.java b/src/test/java/org/openlmis/referencedata/web/csv/recordhandler/IdealStockAmountProcessorTest.java index bd390d3e1..8fc76074a 100644 --- a/src/test/java/org/openlmis/referencedata/web/csv/recordhandler/IdealStockAmountProcessorTest.java +++ b/src/test/java/org/openlmis/referencedata/web/csv/recordhandler/IdealStockAmountProcessorTest.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.web.csv.recordhandler; @@ -20,6 +20,9 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import java.util.Collections; +import java.util.List; +import java.util.Optional; import org.junit.Before; import org.junit.Test; import org.mockito.InjectMocks; @@ -44,10 +47,6 @@ import org.openlmis.referencedata.service.IdealStockAmountService; import org.openlmis.referencedata.validate.IdealStockAmountValidator; -import java.util.Collections; -import java.util.List; -import java.util.Optional; - public class IdealStockAmountProcessorTest { private static final String FACILITY_CODE = "facility-code"; diff --git a/src/test/java/org/openlmis/referencedata/web/csv/recordhandler/IdealStockAmountWriterTest.java b/src/test/java/org/openlmis/referencedata/web/csv/recordhandler/IdealStockAmountWriterTest.java index 9a61c024e..c559772e2 100644 --- a/src/test/java/org/openlmis/referencedata/web/csv/recordhandler/IdealStockAmountWriterTest.java +++ b/src/test/java/org/openlmis/referencedata/web/csv/recordhandler/IdealStockAmountWriterTest.java @@ -5,16 +5,21 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.web.csv.recordhandler; +import static org.mockito.Mockito.verify; + +import java.time.LocalDate; +import java.util.Arrays; +import java.util.UUID; import org.junit.Before; import org.junit.Test; import org.mockito.InjectMocks; @@ -26,12 +31,6 @@ import org.openlmis.referencedata.domain.ProcessingPeriod; import org.openlmis.referencedata.repository.IdealStockAmountRepository; -import java.time.LocalDate; -import java.util.Arrays; -import java.util.UUID; - -import static org.mockito.Mockito.verify; - public class IdealStockAmountWriterTest { @Mock diff --git a/src/test/java/org/openlmis/referencedata/web/dummy/DummyNestedField.java b/src/test/java/org/openlmis/referencedata/web/dummy/DummyNestedField.java index cf0e1ad64..2a7323e37 100644 --- a/src/test/java/org/openlmis/referencedata/web/dummy/DummyNestedField.java +++ b/src/test/java/org/openlmis/referencedata/web/dummy/DummyNestedField.java @@ -5,12 +5,12 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.web.dummy; diff --git a/src/test/java/org/openlmis/referencedata/web/dummy/DummyTransferObject.java b/src/test/java/org/openlmis/referencedata/web/dummy/DummyTransferObject.java index 9a6b1c54d..1bf4abcb1 100644 --- a/src/test/java/org/openlmis/referencedata/web/dummy/DummyTransferObject.java +++ b/src/test/java/org/openlmis/referencedata/web/dummy/DummyTransferObject.java @@ -5,24 +5,24 @@ * This program is free software: you can redistribute it and/or modify it under the terms * of the GNU Affero General Public License as published by the Free Software Foundation, either * version 3 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.  + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. You should have received a copy of * the GNU Affero General Public License along with this program. If not, see - * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org.  + * http://www.gnu.org/licenses.  For additional information contact info@OpenLMIS.org. */ package org.openlmis.referencedata.web.dummy; +import static org.openlmis.referencedata.web.csv.processor.CsvCellProcessors.FACILITY_TYPE; + import lombok.Data; import lombok.EqualsAndHashCode; import org.openlmis.referencedata.dto.BaseDto; import org.openlmis.referencedata.dto.BasicFacilityDto; import org.openlmis.referencedata.web.csv.model.ImportField; -import static org.openlmis.referencedata.web.csv.processor.CsvCellProcessors.FACILITY_TYPE; - @Data @EqualsAndHashCode(callSuper = false) public class DummyTransferObject extends BaseDto {