From 2e96e12e9b29c6dd952bd345bb97221964c6e18f Mon Sep 17 00:00:00 2001 From: devmehtasynopsys Date: Mon, 9 Sep 2024 12:15:49 -0400 Subject: [PATCH 1/7] Update package names and dependency groups --- .gitignore | 2 +- .travis.yml | 2 +- README.md | 2 +- build.gradle | 18 ++-- .../PolicyRuleComponentUsageValueSetType.java | 2 +- .../PolicyRuleConditionOperatorType.java | 2 +- .../enumeration/PolicyRuleConditionType.java | 2 +- .../api/enumeration/RankedSeverityType.java | 2 +- .../api/enumeration/ReviewStatusType.java | 2 +- .../bdio2/Bdio2FileUploadService.java | 18 ++-- .../bdio2/Bdio2RetryAwareStreamUploader.java | 8 +- .../blackduck/bdio2/Bdio2StreamUploader.java | 15 ++-- .../blackduck/bdio2/Bdio2UploadJob.java | 6 +- .../blackduck/bdio2/Bdio2UploadResult.java | 2 +- .../bdio2/RetriableBdioUploadException.java | 2 +- .../blackduck/bdio2/model/Bdio2Document.java | 2 +- .../bdio2/model/BdioFileContent.java | 2 +- .../blackduck/bdio2/model/GitInfo.java | 2 +- .../blackduck/bdio2/model/ProjectInfo.java | 2 +- .../bdio2/util/Bdio2ContentExtractor.java | 4 +- .../blackduck/bdio2/util/Bdio2Factory.java | 6 +- .../blackduck/bdio2/util/Bdio2Writer.java | 4 +- .../codelocation/CodeLocationBatchOutput.java | 2 +- .../CodeLocationCreationData.java | 4 +- .../CodeLocationCreationRequest.java | 4 +- .../CodeLocationCreationService.java | 12 +-- .../codelocation/CodeLocationOutput.java | 2 +- .../codelocation/CodeLocationWaitJob.java | 14 +-- .../CodeLocationWaitJobCondition.java | 16 ++-- .../codelocation/CodeLocationWaitResult.java | 2 +- .../codelocation/CodeLocationWaiter.java | 14 ++- .../codelocation/CodeLocationsRetriever.java | 4 +- .../blackduck/codelocation/Result.java | 2 +- ...dio2UploadCodeLocationCreationRequest.java | 10 +-- .../bdio2legacy/Bdio2UploadService.java | 20 ++--- .../bdio2legacy/UploadBdio2BatchRunner.java | 18 ++-- .../bdio2legacy/UploadBdio2Callable.java | 14 +-- ...BdioUploadCodeLocationCreationRequest.java | 10 +-- .../bdiolegacy/BdioUploadService.java | 18 ++-- .../bdiolegacy/UploadBatchRunner.java | 12 +-- .../bdiolegacy/UploadCallable.java | 12 +-- .../binaryscanner/BinaryScan.java | 2 +- .../binaryscanner/BinaryScanBatch.java | 2 +- .../binaryscanner/BinaryScanBatchOutput.java | 8 +- .../binaryscanner/BinaryScanBatchRunner.java | 6 +- .../binaryscanner/BinaryScanCallable.java | 8 +- ...BinaryScanCodeLocationCreationRequest.java | 6 +- .../binaryscanner/BinaryScanOutput.java | 6 +- .../BinaryScanUploadService.java | 12 +-- .../IntelligentPersistenceBatchRunner.java | 12 +-- .../IntelligentPersistenceCallable.java | 10 +-- ...ersistenceCodeLocationCreationRequest.java | 10 +-- .../IntelligentPersistenceService.java | 18 ++-- .../signaturescanner/ScanBatch.java | 18 ++-- .../signaturescanner/ScanBatchBuilder.java | 14 +-- .../signaturescanner/ScanBatchOutput.java | 6 +- .../signaturescanner/ScanBatchRunner.java | 16 ++-- ...ureScannerCodeLocationCreationRequest.java | 6 +- .../SignatureScannerService.java | 16 ++-- .../command/ApiScannerInstaller.java | 4 +- .../command/BlackDuckOnlineProperties.java | 2 +- .../command/ExistingScannerInstaller.java | 4 +- .../command/IndividualFileMatching.java | 2 +- .../command/ReducedPersistence.java | 2 +- .../signaturescanner/command/ScanCommand.java | 2 +- .../command/ScanCommandArgumentParser.java | 6 +- .../command/ScanCommandCallable.java | 6 +- .../command/ScanCommandOutput.java | 6 +- .../command/ScanCommandQuoteParser.java | 2 +- .../command/ScanCommandRunner.java | 4 +- .../signaturescanner/command/ScanPaths.java | 2 +- .../command/ScanPathsUtility.java | 4 +- .../signaturescanner/command/ScanTarget.java | 4 +- .../command/ScannerInstaller.java | 4 +- .../command/SnippetMatching.java | 2 +- .../command/ToolsApiScannerInstaller.java | 14 +-- .../command/ZipApiScannerInstaller.java | 10 +-- .../codelocation/upload/UploadBatch.java | 2 +- .../upload/UploadBatchOutput.java | 4 +- .../codelocation/upload/UploadOutput.java | 6 +- .../codelocation/upload/UploadTarget.java | 2 +- .../BlackDuckConnectionResult.java | 4 +- .../configuration/BlackDuckServerConfig.java | 16 ++-- .../BlackDuckServerConfigBuilder.java | 8 +- .../BlackDuckServerConfigKeys.java | 49 +++++++++++ .../exception/BlackDuckApiException.java | 2 +- .../BlackDuckIntegrationException.java | 2 +- .../BlackDuckItemTransformException.java | 2 +- .../BlackDuckTimeoutExceededException.java | 2 +- .../exception/FailureConditionException.java | 2 +- .../exception/MismatchedQuotesException.java | 2 +- .../exception/ScanFailedException.java | 2 +- .../SignatureScannerInputException.java | 2 +- .../blackduck/http/BlackDuckMediaTypes.java | 2 +- .../http/BlackDuckPageDefinition.java | 2 +- .../blackduck/http/BlackDuckPageResponse.java | 2 +- .../blackduck/http/BlackDuckQuery.java | 2 +- .../http/BlackDuckRequestBuilder.java | 14 +-- .../http/BlackDuckRequestFilter.java | 2 +- .../blackduck/http/BlackDuckUrl.java | 4 +- .../http/BlackDuckUrlSearchTerm.java | 2 +- .../client/ApiTokenBlackDuckHttpClient.java | 2 +- .../BlackDuckCertificateInterceptor.java | 2 +- .../http/client/BlackDuckHttpClient.java | 4 +- .../client/BlackDuckRedirectStrategy.java | 2 +- .../http/client/CookieHeaderParser.java | 2 +- .../CredentialsBlackDuckHttpClient.java | 2 +- .../client/DefaultBlackDuckHttpClient.java | 12 +-- .../http/client/SignatureScannerClient.java | 2 +- .../http/client/cache/CacheableResponse.java | 2 +- .../http/client/cache/CachingHttpClient.java | 6 +- .../transform/BlackDuckJsonTransformer.java | 8 +- .../BlackDuckResponseTransformer.java | 8 +- .../BlackDuckResponsesTransformer.java | 14 ++- .../adapters/OffsetDateTimeTypeAdapter.java | 2 +- .../subclass/BlackDuckResponseResolver.java | 2 +- .../BlackDuckResponseSubclassResolver.java | 2 +- .../NotificationUserViewSubclassResolver.java | 2 +- .../NotificationViewSubclassResolver.java | 2 +- .../subclass/SimpleNotificationView.java | 2 +- .../blackduck/keystore/KeyStoreHelper.java | 2 +- .../phonehome/BlackDuckPhoneHomeHelper.java | 10 +-- .../blackduck/service/BlackDuckApiClient.java | 20 ++--- .../service/BlackDuckServicesFactory.java | 85 +++++++++---------- .../blackduck/service/DataService.java | 2 +- .../BlackDuckRegistrationService.java | 12 +-- .../BlackDuckScanReadinessService.java | 6 +- .../dataservice/CodeLocationService.java | 12 +-- .../service/dataservice/ComponentService.java | 16 ++-- .../dataservice/IacScanUploadService.java | 8 +- .../service/dataservice/IssueService.java | 6 +- .../service/dataservice/LicenseService.java | 12 +-- .../dataservice/NotificationService.java | 18 ++-- .../dataservice/PolicyRuleService.java | 12 +-- .../dataservice/ProjectBomService.java | 14 +-- .../dataservice/ProjectGetService.java | 12 +-- .../dataservice/ProjectMappingService.java | 8 +- .../service/dataservice/ProjectService.java | 12 +-- .../dataservice/ProjectUsersService.java | 8 +- .../service/dataservice/RoleService.java | 12 +-- .../service/dataservice/TagService.java | 8 +- .../service/dataservice/UserGroupService.java | 11 ++- .../service/dataservice/UserRoleService.java | 6 +- .../service/dataservice/UserService.java | 18 ++-- .../service/model/BlackDuckServerData.java | 2 +- .../ComponentVersionPolicyViolationCount.java | 2 +- .../model/ComponentVersionStatusCount.java | 2 +- .../ComponentVersionVulnerabilities.java | 2 +- .../service/model/MatchedFilesModel.java | 2 +- .../service/model/NotificationTaskRange.java | 2 +- .../model/PolicyRuleExpressionSetBuilder.java | 12 +-- .../model/PolicyStatusDescription.java | 4 +- .../model/ProjectNameVersionGuess.java | 2 +- .../model/ProjectNameVersionGuesser.java | 2 +- .../service/model/ProjectSyncModel.java | 2 +- .../model/ProjectVersionDescription.java | 2 +- .../service/model/ProjectVersionWrapper.java | 2 +- .../service/model/RiskProfileCounts.java | 2 +- .../service/model/ScannerSplitStream.java | 2 +- .../service/model/StreamRedirectThread.java | 2 +- .../model/VersionBomComponentModel.java | 6 +- .../service/request/AcceptHeaderEditor.java | 4 +- .../request/BlackDuckMultipleRequest.java | 4 +- .../service/request/BlackDuckRequest.java | 4 +- .../BlackDuckRequestBuilderEditor.java | 4 +- .../request/BlackDuckResponseRequest.java | 6 +- .../request/BlackDuckSingleRequest.java | 4 +- .../request/BlackDuckStringRequest.java | 6 +- .../service/request/NotificationEditor.java | 6 +- .../service/request/PagingDefaultsEditor.java | 4 +- .../blackduck/useragent/BlackDuckCommon.java | 2 +- .../blackduck/useragent/UserAgentBuilder.java | 2 +- .../blackduck/useragent/UserAgentItem.java | 2 +- .../blackduck/version/BlackDuckVersion.java | 2 +- .../BlackDuckServerConfigKeys.java | 51 ----------- .../blackduck/TimingExtension.java | 2 +- .../integration/blackduck/VersionSupport.java | 2 +- .../enumeration/RankedSeverityTypeTest.java | 4 +- .../Bdio2RetryAwareStreamUploaderTest.java | 11 ++- .../blackduck/bdio2/Bdio2UploadJobTest.java | 13 ++- .../bdio2/util/Bdio2ContentExtractorTest.java | 5 +- .../bdio2/util/Bdio2FactoryTest.java | 3 +- .../codelocation/CodeLocationWaiterTest.java | 14 +-- .../CodeLocationsRetrieverTest.java | 5 +- .../BinaryScanBatchOutputTest.java | 2 +- .../BinaryScanUploadServiceTestIT.java | 26 +++--- .../CodeLocationWaitJobConditionTest.java | 16 ++-- .../ScanBatchBuilderTest.java | 8 +- .../signaturescanner/ScanBatchOutputTest.java | 17 ++-- .../signaturescanner/ScanPathsTest.java | 12 +-- .../ScannerZipInstallerTest.java | 26 +++--- .../ScanCommandArgumentParserTest.java | 5 +- .../command/ScanCommandQuoteParserTest.java | 3 +- .../command/ScanCommandTest.java | 10 +-- .../comprehensive/BlackDuckServices.java | 30 +++---- .../ComprehensiveCookbookTestIT.java | 49 ++++++----- ...CreateProjectWithBdioAndVerifyBOMTest.java | 20 ++--- .../InstallAndRunSignatureScannerTestIT.java | 39 +++++---- .../comprehensive/NotificationsTestIT.java | 23 +++-- .../ProjectBomServiceTestIT.java | 26 +++--- .../ToolsApiScannerInstallerTestIT.java | 26 +++--- .../comprehensive/VerifyNotifications.java | 8 +- .../comprehensive/recipe/BasicRecipe.java | 32 +++---- .../recipe/Bdio2UploadRecipeTest.java | 22 ++--- .../recipe/BdioUploadRecipeTest.java | 22 ++--- ...heckPolicyForProjectVersionRecipeTest.java | 14 +-- .../recipe/ComponentManagementRecipeTest.java | 9 +- .../CreateDetailedProjectRecipeTest.java | 12 +-- .../IntelligentPersistenceRecipeTest.java | 22 ++--- .../recipe/ProjectErrorsRecipeTest.java | 10 +-- .../BlackDuckServerConfigBuilderTest.java | 10 ++- .../BlackDuckServerConfigBuilderTestIT.java | 12 +-- .../http/BlackDuckRequestBuilderTest.java | 4 +- .../blackduck/http/BlackDuckUrlTest.java | 4 +- .../client/BlackDuckHttpClientTestIT.java | 18 ++-- .../client/BlackDuckRedirectStrategyTest.java | 4 +- .../http/client/CookieHeaderParserTest.java | 3 +- .../http/client/IntHttpClientTestHelper.java | 14 +-- .../http/client/MockWebServerUtil.java | 2 +- .../SignatureScannerClientProxyTest.java | 5 +- .../client/SignatureScannerClientTest.java | 6 +- .../http/client/TestingPropertyKey.java | 2 +- .../client/cache/CachingHttpClientTestIT.java | 10 +-- .../BlackDuckJsonTransformerTest.java | 10 +-- .../BlackDuckResponsesTransformerTest.java | 18 ++-- .../BlackDuckResponsesTransformerTestIT.java | 18 ++-- .../ProjectViewWithoutDescription.java | 2 +- .../http/transform/SillyFruitResponse.java | 2 +- .../BlackDuckResponseResolverTest.java | 3 +- .../blackduck/license/LicenseTest.java | 11 ++- .../service/BlackDuckApiClientTest.java | 16 ++-- .../service/BlackDuckApiClientTestIT.java | 32 +++---- ...kDuckRegistrationRequestServiceTestIT.java | 8 +- .../BlackDuckScanReadinessServiceTestIT.java | 8 +- .../CodeLocationServiceTestIT.java | 36 ++++---- .../dataservice/ComponentServiceTestIT.java | 8 +- .../dataservice/IssueServiceTestIT.java | 15 ++-- .../dataservice/LicenseDataServiceTestIT.java | 9 +- .../dataservice/PolicyRuleServiceTestIT.java | 14 +-- .../PolicyStatusDescriptionTest.java | 6 +- .../ProjectAssignmentServiceTestIT.java | 10 +-- .../ProjectMappingServiceTest.java | 14 +-- .../dataservice/ProjectServiceTest.java | 14 +-- .../dataservice/ProjectServiceTestIT.java | 16 ++-- .../dataservice/UserServiceTestIT.java | 14 +-- .../VulnerabilityDataServiceTestIT.java | 10 +-- .../service/model/ProjectSyncModelTest.java | 4 +- .../useragent/BlackDuckCommonTest.java | 4 +- .../util/ProjectNameVersionGuesserTest.java | 8 +- .../version/BlackDuckVersionTest.java | 4 +- 250 files changed, 1101 insertions(+), 1104 deletions(-) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/api/enumeration/PolicyRuleComponentUsageValueSetType.java (86%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/api/enumeration/PolicyRuleConditionOperatorType.java (84%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/api/enumeration/PolicyRuleConditionType.java (95%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/api/enumeration/RankedSeverityType.java (95%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/api/enumeration/ReviewStatusType.java (82%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/bdio2/Bdio2FileUploadService.java (88%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/bdio2/Bdio2RetryAwareStreamUploader.java (94%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/bdio2/Bdio2StreamUploader.java (88%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/bdio2/Bdio2UploadJob.java (94%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/bdio2/Bdio2UploadResult.java (92%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/bdio2/RetriableBdioUploadException.java (84%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/bdio2/model/Bdio2Document.java (95%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/bdio2/model/BdioFileContent.java (91%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/bdio2/model/GitInfo.java (95%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/bdio2/model/ProjectInfo.java (97%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/bdio2/util/Bdio2ContentExtractor.java (96%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/bdio2/util/Bdio2Factory.java (98%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/bdio2/util/Bdio2Writer.java (93%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/codelocation/CodeLocationBatchOutput.java (97%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/codelocation/CodeLocationCreationData.java (84%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/codelocation/CodeLocationCreationRequest.java (72%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/codelocation/CodeLocationCreationService.java (92%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/codelocation/CodeLocationOutput.java (96%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/codelocation/CodeLocationWaitJob.java (92%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/codelocation/CodeLocationWaitJobCondition.java (89%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/codelocation/CodeLocationWaitResult.java (95%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/codelocation/CodeLocationWaiter.java (80%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/codelocation/CodeLocationsRetriever.java (94%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/codelocation/Result.java (81%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/codelocation/bdio2legacy/Bdio2UploadCodeLocationCreationRequest.java (67%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/codelocation/bdio2legacy/Bdio2UploadService.java (78%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/codelocation/bdio2legacy/UploadBdio2BatchRunner.java (81%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/codelocation/bdio2legacy/UploadBdio2Callable.java (84%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/codelocation/bdiolegacy/BdioUploadCodeLocationCreationRequest.java (67%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/codelocation/bdiolegacy/BdioUploadService.java (84%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/codelocation/bdiolegacy/UploadBatchRunner.java (85%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/codelocation/bdiolegacy/UploadCallable.java (87%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/codelocation/binaryscanner/BinaryScan.java (94%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/codelocation/binaryscanner/BinaryScanBatch.java (91%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/codelocation/binaryscanner/BinaryScanBatchOutput.java (77%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/codelocation/binaryscanner/BinaryScanBatchRunner.java (92%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/codelocation/binaryscanner/BinaryScanCallable.java (91%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/codelocation/binaryscanner/BinaryScanCodeLocationCreationRequest.java (78%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/codelocation/binaryscanner/BinaryScanOutput.java (94%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/codelocation/binaryscanner/BinaryScanUploadService.java (89%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/codelocation/intelligentpersistence/IntelligentPersistenceBatchRunner.java (86%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/codelocation/intelligentpersistence/IntelligentPersistenceCallable.java (82%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/codelocation/intelligentpersistence/IntelligentPersistenceCodeLocationCreationRequest.java (72%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/codelocation/intelligentpersistence/IntelligentPersistenceService.java (82%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/codelocation/signaturescanner/ScanBatch.java (90%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/codelocation/signaturescanner/ScanBatchBuilder.java (94%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/codelocation/signaturescanner/ScanBatchOutput.java (63%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/codelocation/signaturescanner/ScanBatchRunner.java (87%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/codelocation/signaturescanner/SignatureScannerCodeLocationCreationRequest.java (76%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/codelocation/signaturescanner/SignatureScannerService.java (81%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/codelocation/signaturescanner/command/ApiScannerInstaller.java (86%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/codelocation/signaturescanner/command/BlackDuckOnlineProperties.java (97%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/codelocation/signaturescanner/command/ExistingScannerInstaller.java (79%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/codelocation/signaturescanner/command/IndividualFileMatching.java (77%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/codelocation/signaturescanner/command/ReducedPersistence.java (77%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/codelocation/signaturescanner/command/ScanCommand.java (99%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/codelocation/signaturescanner/command/ScanCommandArgumentParser.java (91%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/codelocation/signaturescanner/command/ScanCommandCallable.java (97%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/codelocation/signaturescanner/command/ScanCommandOutput.java (95%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/codelocation/signaturescanner/command/ScanCommandQuoteParser.java (89%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/codelocation/signaturescanner/command/ScanCommandRunner.java (94%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/codelocation/signaturescanner/command/ScanPaths.java (95%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/codelocation/signaturescanner/command/ScanPathsUtility.java (98%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/codelocation/signaturescanner/command/ScanTarget.java (96%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/codelocation/signaturescanner/command/ScannerInstaller.java (67%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/codelocation/signaturescanner/command/SnippetMatching.java (81%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/codelocation/signaturescanner/command/ToolsApiScannerInstaller.java (95%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/codelocation/signaturescanner/command/ZipApiScannerInstaller.java (95%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/codelocation/upload/UploadBatch.java (92%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/codelocation/upload/UploadBatchOutput.java (74%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/codelocation/upload/UploadOutput.java (90%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/codelocation/upload/UploadTarget.java (97%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/configuration/BlackDuckConnectionResult.java (90%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/configuration/BlackDuckServerConfig.java (94%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/configuration/BlackDuckServerConfigBuilder.java (98%) create mode 100644 src/main/java/com/blackduck/integration/blackduck/configuration/BlackDuckServerConfigKeys.java rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/exception/BlackDuckApiException.java (95%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/exception/BlackDuckIntegrationException.java (94%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/exception/BlackDuckItemTransformException.java (94%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/exception/BlackDuckTimeoutExceededException.java (93%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/exception/FailureConditionException.java (94%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/exception/MismatchedQuotesException.java (94%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/exception/ScanFailedException.java (94%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/exception/SignatureScannerInputException.java (94%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/http/BlackDuckMediaTypes.java (87%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/http/BlackDuckPageDefinition.java (91%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/http/BlackDuckPageResponse.java (95%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/http/BlackDuckQuery.java (91%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/http/BlackDuckRequestBuilder.java (94%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/http/BlackDuckRequestFilter.java (97%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/http/BlackDuckUrl.java (92%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/http/BlackDuckUrlSearchTerm.java (94%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/http/client/ApiTokenBlackDuckHttpClient.java (97%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/http/client/BlackDuckCertificateInterceptor.java (95%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/http/client/BlackDuckHttpClient.java (92%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/http/client/BlackDuckRedirectStrategy.java (96%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/http/client/CookieHeaderParser.java (96%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/http/client/CredentialsBlackDuckHttpClient.java (98%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/http/client/DefaultBlackDuckHttpClient.java (93%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/http/client/SignatureScannerClient.java (98%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/http/client/cache/CacheableResponse.java (98%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/http/client/cache/CachingHttpClient.java (94%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/http/transform/BlackDuckJsonTransformer.java (95%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/http/transform/BlackDuckResponseTransformer.java (86%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/http/transform/BlackDuckResponsesTransformer.java (92%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/http/transform/adapters/OffsetDateTimeTypeAdapter.java (97%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/http/transform/subclass/BlackDuckResponseResolver.java (96%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/http/transform/subclass/BlackDuckResponseSubclassResolver.java (91%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/http/transform/subclass/NotificationUserViewSubclassResolver.java (97%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/http/transform/subclass/NotificationViewSubclassResolver.java (97%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/http/transform/subclass/SimpleNotificationView.java (86%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/keystore/KeyStoreHelper.java (97%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/phonehome/BlackDuckPhoneHomeHelper.java (94%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/service/BlackDuckApiClient.java (92%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/service/BlackDuckServicesFactory.java (75%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/service/DataService.java (93%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/service/dataservice/BlackDuckRegistrationService.java (84%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/service/dataservice/BlackDuckScanReadinessService.java (82%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/service/dataservice/CodeLocationService.java (92%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/service/dataservice/ComponentService.java (91%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/service/dataservice/IacScanUploadService.java (87%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/service/dataservice/IssueService.java (93%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/service/dataservice/LicenseService.java (91%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/service/dataservice/NotificationService.java (92%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/service/dataservice/PolicyRuleService.java (89%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/service/dataservice/ProjectBomService.java (94%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/service/dataservice/ProjectGetService.java (90%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/service/dataservice/ProjectMappingService.java (89%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/service/dataservice/ProjectService.java (94%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/service/dataservice/ProjectUsersService.java (96%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/service/dataservice/RoleService.java (83%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/service/dataservice/TagService.java (87%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/service/dataservice/UserGroupService.java (93%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/service/dataservice/UserRoleService.java (91%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/service/dataservice/UserService.java (87%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/service/model/BlackDuckServerData.java (93%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/service/model/ComponentVersionPolicyViolationCount.java (96%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/service/model/ComponentVersionStatusCount.java (96%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/service/model/ComponentVersionVulnerabilities.java (94%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/service/model/MatchedFilesModel.java (96%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/service/model/NotificationTaskRange.java (93%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/service/model/PolicyRuleExpressionSetBuilder.java (94%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/service/model/PolicyStatusDescription.java (97%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/service/model/ProjectNameVersionGuess.java (91%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/service/model/ProjectNameVersionGuesser.java (97%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/service/model/ProjectSyncModel.java (99%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/service/model/ProjectVersionDescription.java (93%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/service/model/ProjectVersionWrapper.java (95%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/service/model/RiskProfileCounts.java (95%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/service/model/ScannerSplitStream.java (99%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/service/model/StreamRedirectThread.java (94%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/service/model/VersionBomComponentModel.java (91%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/service/request/AcceptHeaderEditor.java (90%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/service/request/BlackDuckMultipleRequest.java (88%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/service/request/BlackDuckRequest.java (95%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/service/request/BlackDuckRequestBuilderEditor.java (76%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/service/request/BlackDuckResponseRequest.java (81%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/service/request/BlackDuckSingleRequest.java (87%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/service/request/BlackDuckStringRequest.java (81%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/service/request/NotificationEditor.java (93%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/service/request/PagingDefaultsEditor.java (90%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/useragent/BlackDuckCommon.java (97%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/useragent/UserAgentBuilder.java (94%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/useragent/UserAgentItem.java (96%) rename src/main/java/com/{synopsys => blackduck}/integration/blackduck/version/BlackDuckVersion.java (96%) delete mode 100644 src/main/java/com/synopsys/integration/blackduck/configuration/BlackDuckServerConfigKeys.java rename src/test/java/com/{synopsys => blackduck}/integration/blackduck/TimingExtension.java (97%) rename src/test/java/com/{synopsys => blackduck}/integration/blackduck/VersionSupport.java (95%) rename src/test/java/com/{synopsys => blackduck}/integration/blackduck/api/enumeration/RankedSeverityTypeTest.java (87%) rename src/test/java/com/{synopsys => blackduck}/integration/blackduck/bdio2/Bdio2RetryAwareStreamUploaderTest.java (95%) rename src/test/java/com/{synopsys => blackduck}/integration/blackduck/bdio2/Bdio2UploadJobTest.java (92%) rename src/test/java/com/{synopsys => blackduck}/integration/blackduck/bdio2/util/Bdio2ContentExtractorTest.java (89%) rename src/test/java/com/{synopsys => blackduck}/integration/blackduck/bdio2/util/Bdio2FactoryTest.java (95%) rename src/test/java/com/{synopsys => blackduck}/integration/blackduck/codelocation/CodeLocationWaiterTest.java (95%) rename src/test/java/com/{synopsys => blackduck}/integration/blackduck/codelocation/CodeLocationsRetrieverTest.java (95%) rename src/test/java/com/{synopsys => blackduck}/integration/blackduck/codelocation/binaryscanner/BinaryScanBatchOutputTest.java (74%) rename src/test/java/com/{synopsys => blackduck}/integration/blackduck/codelocation/binaryscanner/BinaryScanUploadServiceTestIT.java (81%) rename src/test/java/com/{synopsys => blackduck}/integration/blackduck/codelocation/signaturescanner/CodeLocationWaitJobConditionTest.java (89%) rename src/test/java/com/{synopsys => blackduck}/integration/blackduck/codelocation/signaturescanner/ScanBatchBuilderTest.java (90%) rename src/test/java/com/{synopsys => blackduck}/integration/blackduck/codelocation/signaturescanner/ScanBatchOutputTest.java (84%) rename src/test/java/com/{synopsys => blackduck}/integration/blackduck/codelocation/signaturescanner/ScanPathsTest.java (94%) rename src/test/java/com/{synopsys => blackduck}/integration/blackduck/codelocation/signaturescanner/ScannerZipInstallerTest.java (77%) rename src/test/java/com/{synopsys => blackduck}/integration/blackduck/codelocation/signaturescanner/command/ScanCommandArgumentParserTest.java (87%) rename src/test/java/com/{synopsys => blackduck}/integration/blackduck/codelocation/signaturescanner/command/ScanCommandQuoteParserTest.java (76%) rename src/test/java/com/{synopsys => blackduck}/integration/blackduck/codelocation/signaturescanner/command/ScanCommandTest.java (97%) rename src/test/java/com/{synopsys => blackduck}/integration/blackduck/comprehensive/BlackDuckServices.java (66%) rename src/test/java/com/{synopsys => blackduck}/integration/blackduck/comprehensive/ComprehensiveCookbookTestIT.java (91%) rename src/test/java/com/{synopsys => blackduck}/integration/blackduck/comprehensive/CreateProjectWithBdioAndVerifyBOMTest.java (94%) rename src/test/java/com/{synopsys => blackduck}/integration/blackduck/comprehensive/InstallAndRunSignatureScannerTestIT.java (86%) rename src/test/java/com/{synopsys => blackduck}/integration/blackduck/comprehensive/NotificationsTestIT.java (85%) rename src/test/java/com/{synopsys => blackduck}/integration/blackduck/comprehensive/ProjectBomServiceTestIT.java (91%) rename src/test/java/com/{synopsys => blackduck}/integration/blackduck/comprehensive/ToolsApiScannerInstallerTestIT.java (81%) rename src/test/java/com/{synopsys => blackduck}/integration/blackduck/comprehensive/VerifyNotifications.java (93%) rename src/test/java/com/{synopsys => blackduck}/integration/blackduck/comprehensive/recipe/BasicRecipe.java (84%) rename src/test/java/com/{synopsys => blackduck}/integration/blackduck/comprehensive/recipe/Bdio2UploadRecipeTest.java (86%) rename src/test/java/com/{synopsys => blackduck}/integration/blackduck/comprehensive/recipe/BdioUploadRecipeTest.java (90%) rename src/test/java/com/{synopsys => blackduck}/integration/blackduck/comprehensive/recipe/CheckPolicyForProjectVersionRecipeTest.java (90%) rename src/test/java/com/{synopsys => blackduck}/integration/blackduck/comprehensive/recipe/ComponentManagementRecipeTest.java (90%) rename src/test/java/com/{synopsys => blackduck}/integration/blackduck/comprehensive/recipe/CreateDetailedProjectRecipeTest.java (86%) rename src/test/java/com/{synopsys => blackduck}/integration/blackduck/comprehensive/recipe/IntelligentPersistenceRecipeTest.java (83%) rename src/test/java/com/{synopsys => blackduck}/integration/blackduck/comprehensive/recipe/ProjectErrorsRecipeTest.java (86%) rename src/test/java/com/{synopsys => blackduck}/integration/blackduck/configuration/BlackDuckServerConfigBuilderTest.java (98%) rename src/test/java/com/{synopsys => blackduck}/integration/blackduck/configuration/BlackDuckServerConfigBuilderTestIT.java (96%) rename src/test/java/com/{synopsys => blackduck}/integration/blackduck/http/BlackDuckRequestBuilderTest.java (94%) rename src/test/java/com/{synopsys => blackduck}/integration/blackduck/http/BlackDuckUrlTest.java (95%) rename src/test/java/com/{synopsys => blackduck}/integration/blackduck/http/client/BlackDuckHttpClientTestIT.java (93%) rename src/test/java/com/{synopsys => blackduck}/integration/blackduck/http/client/BlackDuckRedirectStrategyTest.java (97%) rename src/test/java/com/{synopsys => blackduck}/integration/blackduck/http/client/CookieHeaderParserTest.java (96%) rename src/test/java/com/{synopsys => blackduck}/integration/blackduck/http/client/IntHttpClientTestHelper.java (92%) rename src/test/java/com/{synopsys => blackduck}/integration/blackduck/http/client/MockWebServerUtil.java (93%) rename src/test/java/com/{synopsys => blackduck}/integration/blackduck/http/client/SignatureScannerClientProxyTest.java (96%) rename src/test/java/com/{synopsys => blackduck}/integration/blackduck/http/client/SignatureScannerClientTest.java (97%) rename src/test/java/com/{synopsys => blackduck}/integration/blackduck/http/client/TestingPropertyKey.java (96%) rename src/test/java/com/{synopsys => blackduck}/integration/blackduck/http/client/cache/CachingHttpClientTestIT.java (84%) rename src/test/java/com/{synopsys => blackduck}/integration/blackduck/http/transform/BlackDuckJsonTransformerTest.java (95%) rename src/test/java/com/{synopsys => blackduck}/integration/blackduck/http/transform/BlackDuckResponsesTransformerTest.java (94%) rename src/test/java/com/{synopsys => blackduck}/integration/blackduck/http/transform/BlackDuckResponsesTransformerTestIT.java (87%) rename src/test/java/com/{synopsys => blackduck}/integration/blackduck/http/transform/ProjectViewWithoutDescription.java (98%) rename src/test/java/com/{synopsys => blackduck}/integration/blackduck/http/transform/SillyFruitResponse.java (89%) rename src/test/java/com/{synopsys => blackduck}/integration/blackduck/http/transform/subclass/BlackDuckResponseResolverTest.java (90%) rename src/test/java/com/{synopsys => blackduck}/integration/blackduck/license/LicenseTest.java (84%) rename src/test/java/com/{synopsys => blackduck}/integration/blackduck/service/BlackDuckApiClientTest.java (89%) rename src/test/java/com/{synopsys => blackduck}/integration/blackduck/service/BlackDuckApiClientTestIT.java (80%) rename src/test/java/com/{synopsys => blackduck}/integration/blackduck/service/dataservice/BlackDuckRegistrationRequestServiceTestIT.java (77%) rename src/test/java/com/{synopsys => blackduck}/integration/blackduck/service/dataservice/BlackDuckScanReadinessServiceTestIT.java (81%) rename src/test/java/com/{synopsys => blackduck}/integration/blackduck/service/dataservice/CodeLocationServiceTestIT.java (89%) rename src/test/java/com/{synopsys => blackduck}/integration/blackduck/service/dataservice/ComponentServiceTestIT.java (93%) rename src/test/java/com/{synopsys => blackduck}/integration/blackduck/service/dataservice/IssueServiceTestIT.java (92%) rename src/test/java/com/{synopsys => blackduck}/integration/blackduck/service/dataservice/LicenseDataServiceTestIT.java (91%) rename src/test/java/com/{synopsys => blackduck}/integration/blackduck/service/dataservice/PolicyRuleServiceTestIT.java (87%) rename src/test/java/com/{synopsys => blackduck}/integration/blackduck/service/dataservice/PolicyStatusDescriptionTest.java (95%) rename src/test/java/com/{synopsys => blackduck}/integration/blackduck/service/dataservice/ProjectAssignmentServiceTestIT.java (87%) rename src/test/java/com/{synopsys => blackduck}/integration/blackduck/service/dataservice/ProjectMappingServiceTest.java (86%) rename src/test/java/com/{synopsys => blackduck}/integration/blackduck/service/dataservice/ProjectServiceTest.java (82%) rename src/test/java/com/{synopsys => blackduck}/integration/blackduck/service/dataservice/ProjectServiceTestIT.java (97%) rename src/test/java/com/{synopsys => blackduck}/integration/blackduck/service/dataservice/UserServiceTestIT.java (94%) rename src/test/java/com/{synopsys => blackduck}/integration/blackduck/service/dataservice/VulnerabilityDataServiceTestIT.java (88%) rename src/test/java/com/{synopsys => blackduck}/integration/blackduck/service/model/ProjectSyncModelTest.java (98%) rename src/test/java/com/{synopsys => blackduck}/integration/blackduck/useragent/BlackDuckCommonTest.java (90%) rename src/test/java/com/{synopsys => blackduck}/integration/blackduck/util/ProjectNameVersionGuesserTest.java (93%) rename src/test/java/com/{synopsys => blackduck}/integration/blackduck/version/BlackDuckVersionTest.java (89%) diff --git a/.gitignore b/.gitignore index 7dc7540d5..cfcb7c055 100644 --- a/.gitignore +++ b/.gitignore @@ -15,4 +15,4 @@ out/ build/ src/test/resources/test.properties -src/main/resources/com/synopsys/integration/blackduck/version.txt +src/main/resources/com/blackduck/integration/blackduck/version.txt diff --git a/.travis.yml b/.travis.yml index 6c3e1e57a..22db02d94 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,7 @@ jdk: notifications: email: recipients: - - starlabs@synopsys.com + - starlabs@blackduck.com script: - "./gradlew clean build" diff --git a/README.md b/README.md index b473e1a05..0042a35be 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ To run integration tests, create a test.properties file under src/test/resources [![Coverage Status](https://coveralls.io/repos/github/blackducksoftware/blackduck-common/badge.svg?branch=master)](https://coveralls.io/github/blackducksoftware/blackduck-common?branch=master) [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0) [![Black Duck Security Risk](https://copilot.blackducksoftware.com/github/repos/blackducksoftware/blackduck-common/branches/master/badge-risk.svg)](https://copilot.blackducksoftware.com/github/repos/blackducksoftware/blackduck-common/branches/master) -[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=com.synopsys.integration%3Ablackduck-common&metric=alert_status)](https://sonarcloud.io/dashboard?id=com.synopsys.integration%3Ablackduck-common) +[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=com.blackduck.integration%3Ablackduck-common&metric=alert_status)](https://sonarcloud.io/dashboard?id=com.blackduck.integration%3Ablackduck-common) ## Where can I get the latest release? ## You can download the latest release from Maven Central. diff --git a/build.gradle b/build.gradle index 6f354c376..ab66dd9ff 100644 --- a/build.gradle +++ b/build.gradle @@ -7,10 +7,10 @@ buildscript { javaSourceCompatibility = 8 } - dependencies { classpath "com.synopsys.integration:common-gradle-plugin:${managedCgpVersion}" } + dependencies { classpath "com.blackduck.integration:common-gradle-plugin:${managedCgpVersion}" } } -project.ext.moduleName = 'com.synopsys.integration.blackduck-common' +project.ext.moduleName = 'com.blackduck.integration.blackduck-common' project.ext.javaUseAutoModuleName = 'true' project.ext.junitShowStandardStreams = 'true' @@ -18,9 +18,9 @@ version = '66.2.32-SNAPSHOT' description = 'A library for using various capabilities of Black Duck, notably the REST API and signature scanning.' -apply plugin: 'com.synopsys.integration.library' +apply plugin: 'com.blackduck.integration.library' -final def versionFile = new File("${projectDir}/src/main/resources/com/synopsys/integration/blackduck/version.txt") +final def versionFile = new File("${projectDir}/src/main/resources/com/blackduck/integration/blackduck/version.txt") versionFile.mkdirs() versionFile.delete() versionFile << version @@ -29,14 +29,14 @@ final def internalRepoHost = System.getenv('SNPS_INTERNAL_ARTIFACTORY') repositories { maven { url "${internalRepoHost}/artifactory/jcenter" } - maven { url "https://sig-repo.synopsys.com/bds-bdio-release" } - maven { url "https://sig-repo.synopsys.com/artifactory/bds-integrations-snapshot/" } + maven { url "https://repo.blackduck.com/bds-bdio-release" } + maven { url "https://repo.blackduck.com/artifactory/bds-integrations-snapshot/" } } dependencies { - api 'com.synopsys.integration:blackduck-common-api:2023.4.2.5' - api 'com.synopsys.integration:phone-home-client:6.0.1' - api 'com.synopsys.integration:integration-bdio:26.0.13' + api 'com.blackduck.integration:blackduck-common-api:2023.4.2.5' + api 'com.blackduck.integration:phone-home-client:6.0.1' + api 'com.blackduck.integration:integration-bdio:26.0.13' api 'com.blackducksoftware.bdio:bdio2:3.2.5' testImplementation 'com.google.guava:guava:31.1-jre' diff --git a/src/main/java/com/synopsys/integration/blackduck/api/enumeration/PolicyRuleComponentUsageValueSetType.java b/src/main/java/com/blackduck/integration/blackduck/api/enumeration/PolicyRuleComponentUsageValueSetType.java similarity index 86% rename from src/main/java/com/synopsys/integration/blackduck/api/enumeration/PolicyRuleComponentUsageValueSetType.java rename to src/main/java/com/blackduck/integration/blackduck/api/enumeration/PolicyRuleComponentUsageValueSetType.java index a394606c0..0c5004b8b 100644 --- a/src/main/java/com/synopsys/integration/blackduck/api/enumeration/PolicyRuleComponentUsageValueSetType.java +++ b/src/main/java/com/blackduck/integration/blackduck/api/enumeration/PolicyRuleComponentUsageValueSetType.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.api.enumeration; +package com.blackduck.integration.blackduck.api.enumeration; public enum PolicyRuleComponentUsageValueSetType { DYNAMICALLY_LINKED, diff --git a/src/main/java/com/synopsys/integration/blackduck/api/enumeration/PolicyRuleConditionOperatorType.java b/src/main/java/com/blackduck/integration/blackduck/api/enumeration/PolicyRuleConditionOperatorType.java similarity index 84% rename from src/main/java/com/synopsys/integration/blackduck/api/enumeration/PolicyRuleConditionOperatorType.java rename to src/main/java/com/blackduck/integration/blackduck/api/enumeration/PolicyRuleConditionOperatorType.java index 792dd560b..bca572e3f 100644 --- a/src/main/java/com/synopsys/integration/blackduck/api/enumeration/PolicyRuleConditionOperatorType.java +++ b/src/main/java/com/blackduck/integration/blackduck/api/enumeration/PolicyRuleConditionOperatorType.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.api.enumeration; +package com.blackduck.integration.blackduck.api.enumeration; public enum PolicyRuleConditionOperatorType { EQ, diff --git a/src/main/java/com/synopsys/integration/blackduck/api/enumeration/PolicyRuleConditionType.java b/src/main/java/com/blackduck/integration/blackduck/api/enumeration/PolicyRuleConditionType.java similarity index 95% rename from src/main/java/com/synopsys/integration/blackduck/api/enumeration/PolicyRuleConditionType.java rename to src/main/java/com/blackduck/integration/blackduck/api/enumeration/PolicyRuleConditionType.java index 0ab43f729..4d9180f31 100644 --- a/src/main/java/com/synopsys/integration/blackduck/api/enumeration/PolicyRuleConditionType.java +++ b/src/main/java/com/blackduck/integration/blackduck/api/enumeration/PolicyRuleConditionType.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.api.enumeration; +package com.blackduck.integration.blackduck.api.enumeration; public enum PolicyRuleConditionType { PROJECT_NAME("Project Name"), diff --git a/src/main/java/com/synopsys/integration/blackduck/api/enumeration/RankedSeverityType.java b/src/main/java/com/blackduck/integration/blackduck/api/enumeration/RankedSeverityType.java similarity index 95% rename from src/main/java/com/synopsys/integration/blackduck/api/enumeration/RankedSeverityType.java rename to src/main/java/com/blackduck/integration/blackduck/api/enumeration/RankedSeverityType.java index 51b1263c6..16583d4de 100644 --- a/src/main/java/com/synopsys/integration/blackduck/api/enumeration/RankedSeverityType.java +++ b/src/main/java/com/blackduck/integration/blackduck/api/enumeration/RankedSeverityType.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.api.enumeration; +package com.blackduck.integration.blackduck.api.enumeration; import java.util.Arrays; import java.util.List; diff --git a/src/main/java/com/synopsys/integration/blackduck/api/enumeration/ReviewStatusType.java b/src/main/java/com/blackduck/integration/blackduck/api/enumeration/ReviewStatusType.java similarity index 82% rename from src/main/java/com/synopsys/integration/blackduck/api/enumeration/ReviewStatusType.java rename to src/main/java/com/blackduck/integration/blackduck/api/enumeration/ReviewStatusType.java index 6a1cabc55..f9f5c1e61 100644 --- a/src/main/java/com/synopsys/integration/blackduck/api/enumeration/ReviewStatusType.java +++ b/src/main/java/com/blackduck/integration/blackduck/api/enumeration/ReviewStatusType.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.api.enumeration; +package com.blackduck.integration.blackduck.api.enumeration; public enum ReviewStatusType { NOT_REVIEWED, diff --git a/src/main/java/com/synopsys/integration/blackduck/bdio2/Bdio2FileUploadService.java b/src/main/java/com/blackduck/integration/blackduck/bdio2/Bdio2FileUploadService.java similarity index 88% rename from src/main/java/com/synopsys/integration/blackduck/bdio2/Bdio2FileUploadService.java rename to src/main/java/com/blackduck/integration/blackduck/bdio2/Bdio2FileUploadService.java index e06082778..b5a341754 100644 --- a/src/main/java/com/synopsys/integration/blackduck/bdio2/Bdio2FileUploadService.java +++ b/src/main/java/com/blackduck/integration/blackduck/bdio2/Bdio2FileUploadService.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.bdio2; +package com.blackduck.integration.blackduck.bdio2; import java.util.List; import java.util.stream.Collectors; @@ -13,14 +13,14 @@ import org.jetbrains.annotations.Nullable; import com.synopsys.integration.blackduck.api.generated.discovery.ApiDiscovery; -import com.synopsys.integration.blackduck.bdio2.model.BdioFileContent; -import com.synopsys.integration.blackduck.bdio2.util.Bdio2ContentExtractor; -import com.synopsys.integration.blackduck.codelocation.upload.UploadTarget; -import com.synopsys.integration.blackduck.exception.BlackDuckIntegrationException; -import com.synopsys.integration.blackduck.service.BlackDuckApiClient; -import com.synopsys.integration.blackduck.service.DataService; -import com.synopsys.integration.blackduck.service.request.BlackDuckRequestBuilderEditor; -import com.synopsys.integration.blackduck.version.BlackDuckVersion; +import com.blackduck.integration.blackduck.bdio2.model.BdioFileContent; +import com.blackduck.integration.blackduck.bdio2.util.Bdio2ContentExtractor; +import com.blackduck.integration.blackduck.codelocation.upload.UploadTarget; +import com.blackduck.integration.blackduck.exception.BlackDuckIntegrationException; +import com.blackduck.integration.blackduck.service.BlackDuckApiClient; +import com.blackduck.integration.blackduck.service.DataService; +import com.blackduck.integration.blackduck.service.request.BlackDuckRequestBuilderEditor; +import com.blackduck.integration.blackduck.version.BlackDuckVersion; import com.synopsys.integration.exception.IntegrationException; import com.synopsys.integration.log.IntLogger; import com.synopsys.integration.util.NameVersion; diff --git a/src/main/java/com/synopsys/integration/blackduck/bdio2/Bdio2RetryAwareStreamUploader.java b/src/main/java/com/blackduck/integration/blackduck/bdio2/Bdio2RetryAwareStreamUploader.java similarity index 94% rename from src/main/java/com/synopsys/integration/blackduck/bdio2/Bdio2RetryAwareStreamUploader.java rename to src/main/java/com/blackduck/integration/blackduck/bdio2/Bdio2RetryAwareStreamUploader.java index 75933b317..ed8d56faf 100644 --- a/src/main/java/com/synopsys/integration/blackduck/bdio2/Bdio2RetryAwareStreamUploader.java +++ b/src/main/java/com/blackduck/integration/blackduck/bdio2/Bdio2RetryAwareStreamUploader.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.bdio2; +package com.blackduck.integration.blackduck.bdio2; import java.util.Arrays; import java.util.List; @@ -13,9 +13,9 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.synopsys.integration.blackduck.bdio2.model.BdioFileContent; -import com.synopsys.integration.blackduck.exception.BlackDuckIntegrationException; -import com.synopsys.integration.blackduck.service.request.BlackDuckRequestBuilderEditor; +import com.blackduck.integration.blackduck.bdio2.model.BdioFileContent; +import com.blackduck.integration.blackduck.exception.BlackDuckIntegrationException; +import com.blackduck.integration.blackduck.service.request.BlackDuckRequestBuilderEditor; import com.synopsys.integration.exception.IntegrationException; import com.synopsys.integration.rest.HttpUrl; import com.synopsys.integration.rest.exception.IntegrationRestException; diff --git a/src/main/java/com/synopsys/integration/blackduck/bdio2/Bdio2StreamUploader.java b/src/main/java/com/blackduck/integration/blackduck/bdio2/Bdio2StreamUploader.java similarity index 88% rename from src/main/java/com/synopsys/integration/blackduck/bdio2/Bdio2StreamUploader.java rename to src/main/java/com/blackduck/integration/blackduck/bdio2/Bdio2StreamUploader.java index c61e829e5..1ee9c7a4a 100644 --- a/src/main/java/com/synopsys/integration/blackduck/bdio2/Bdio2StreamUploader.java +++ b/src/main/java/com/blackduck/integration/blackduck/bdio2/Bdio2StreamUploader.java @@ -5,24 +5,21 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.bdio2; +package com.blackduck.integration.blackduck.bdio2; import java.nio.charset.StandardCharsets; -import java.time.Duration; -import java.util.Arrays; -import java.util.List; +import com.blackduck.integration.blackduck.http.BlackDuckRequestBuilder; +import com.blackduck.integration.blackduck.service.BlackDuckApiClient; import org.apache.commons.lang3.StringUtils; import org.apache.http.entity.ContentType; import com.synopsys.integration.blackduck.api.core.BlackDuckPath; import com.synopsys.integration.blackduck.api.core.BlackDuckResponse; import com.synopsys.integration.blackduck.api.generated.discovery.ApiDiscovery; -import com.synopsys.integration.blackduck.bdio2.model.BdioFileContent; -import com.synopsys.integration.blackduck.http.BlackDuckRequestBuilder; -import com.synopsys.integration.blackduck.service.BlackDuckApiClient; -import com.synopsys.integration.blackduck.service.request.BlackDuckRequestBuilderEditor; -import com.synopsys.integration.blackduck.service.request.BlackDuckResponseRequest; +import com.blackduck.integration.blackduck.bdio2.model.BdioFileContent; +import com.blackduck.integration.blackduck.service.request.BlackDuckRequestBuilderEditor; +import com.blackduck.integration.blackduck.service.request.BlackDuckResponseRequest; import com.synopsys.integration.exception.IntegrationException; import com.synopsys.integration.log.IntLogger; import com.synopsys.integration.rest.HttpUrl; diff --git a/src/main/java/com/synopsys/integration/blackduck/bdio2/Bdio2UploadJob.java b/src/main/java/com/blackduck/integration/blackduck/bdio2/Bdio2UploadJob.java similarity index 94% rename from src/main/java/com/synopsys/integration/blackduck/bdio2/Bdio2UploadJob.java rename to src/main/java/com/blackduck/integration/blackduck/bdio2/Bdio2UploadJob.java index 851a55728..3e6044feb 100644 --- a/src/main/java/com/synopsys/integration/blackduck/bdio2/Bdio2UploadJob.java +++ b/src/main/java/com/blackduck/integration/blackduck/bdio2/Bdio2UploadJob.java @@ -5,15 +5,15 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.bdio2; +package com.blackduck.integration.blackduck.bdio2; import java.util.List; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.synopsys.integration.blackduck.bdio2.model.BdioFileContent; -import com.synopsys.integration.blackduck.service.request.BlackDuckRequestBuilderEditor; +import com.blackduck.integration.blackduck.bdio2.model.BdioFileContent; +import com.blackduck.integration.blackduck.service.request.BlackDuckRequestBuilderEditor; import com.synopsys.integration.exception.IntegrationException; import com.synopsys.integration.exception.IntegrationTimeoutException; import com.synopsys.integration.rest.HttpUrl; diff --git a/src/main/java/com/synopsys/integration/blackduck/bdio2/Bdio2UploadResult.java b/src/main/java/com/blackduck/integration/blackduck/bdio2/Bdio2UploadResult.java similarity index 92% rename from src/main/java/com/synopsys/integration/blackduck/bdio2/Bdio2UploadResult.java rename to src/main/java/com/blackduck/integration/blackduck/bdio2/Bdio2UploadResult.java index 2ffadadd4..4c79573b8 100644 --- a/src/main/java/com/synopsys/integration/blackduck/bdio2/Bdio2UploadResult.java +++ b/src/main/java/com/blackduck/integration/blackduck/bdio2/Bdio2UploadResult.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.bdio2; +package com.blackduck.integration.blackduck.bdio2; import com.synopsys.integration.rest.HttpUrl; diff --git a/src/main/java/com/synopsys/integration/blackduck/bdio2/RetriableBdioUploadException.java b/src/main/java/com/blackduck/integration/blackduck/bdio2/RetriableBdioUploadException.java similarity index 84% rename from src/main/java/com/synopsys/integration/blackduck/bdio2/RetriableBdioUploadException.java rename to src/main/java/com/blackduck/integration/blackduck/bdio2/RetriableBdioUploadException.java index d837a51b9..4b53fd34a 100644 --- a/src/main/java/com/synopsys/integration/blackduck/bdio2/RetriableBdioUploadException.java +++ b/src/main/java/com/blackduck/integration/blackduck/bdio2/RetriableBdioUploadException.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.bdio2; +package com.blackduck.integration.blackduck.bdio2; public class RetriableBdioUploadException extends Exception { } diff --git a/src/main/java/com/synopsys/integration/blackduck/bdio2/model/Bdio2Document.java b/src/main/java/com/blackduck/integration/blackduck/bdio2/model/Bdio2Document.java similarity index 95% rename from src/main/java/com/synopsys/integration/blackduck/bdio2/model/Bdio2Document.java rename to src/main/java/com/blackduck/integration/blackduck/bdio2/model/Bdio2Document.java index 34e4d719a..3174eb063 100644 --- a/src/main/java/com/synopsys/integration/blackduck/bdio2/model/Bdio2Document.java +++ b/src/main/java/com/blackduck/integration/blackduck/bdio2/model/Bdio2Document.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.bdio2.model; +package com.blackduck.integration.blackduck.bdio2.model; import java.util.List; diff --git a/src/main/java/com/synopsys/integration/blackduck/bdio2/model/BdioFileContent.java b/src/main/java/com/blackduck/integration/blackduck/bdio2/model/BdioFileContent.java similarity index 91% rename from src/main/java/com/synopsys/integration/blackduck/bdio2/model/BdioFileContent.java rename to src/main/java/com/blackduck/integration/blackduck/bdio2/model/BdioFileContent.java index cf3eade0f..936970c31 100644 --- a/src/main/java/com/synopsys/integration/blackduck/bdio2/model/BdioFileContent.java +++ b/src/main/java/com/blackduck/integration/blackduck/bdio2/model/BdioFileContent.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.bdio2.model; +package com.blackduck.integration.blackduck.bdio2.model; import com.synopsys.integration.util.Stringable; diff --git a/src/main/java/com/synopsys/integration/blackduck/bdio2/model/GitInfo.java b/src/main/java/com/blackduck/integration/blackduck/bdio2/model/GitInfo.java similarity index 95% rename from src/main/java/com/synopsys/integration/blackduck/bdio2/model/GitInfo.java rename to src/main/java/com/blackduck/integration/blackduck/bdio2/model/GitInfo.java index 77f21a5f8..f6f7d120c 100644 --- a/src/main/java/com/synopsys/integration/blackduck/bdio2/model/GitInfo.java +++ b/src/main/java/com/blackduck/integration/blackduck/bdio2/model/GitInfo.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.bdio2.model; +package com.blackduck.integration.blackduck.bdio2.model; import java.util.Optional; diff --git a/src/main/java/com/synopsys/integration/blackduck/bdio2/model/ProjectInfo.java b/src/main/java/com/blackduck/integration/blackduck/bdio2/model/ProjectInfo.java similarity index 97% rename from src/main/java/com/synopsys/integration/blackduck/bdio2/model/ProjectInfo.java rename to src/main/java/com/blackduck/integration/blackduck/bdio2/model/ProjectInfo.java index d78471eec..d7e5bbc28 100644 --- a/src/main/java/com/synopsys/integration/blackduck/bdio2/model/ProjectInfo.java +++ b/src/main/java/com/blackduck/integration/blackduck/bdio2/model/ProjectInfo.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.bdio2.model; +package com.blackduck.integration.blackduck.bdio2.model; import java.util.Optional; diff --git a/src/main/java/com/synopsys/integration/blackduck/bdio2/util/Bdio2ContentExtractor.java b/src/main/java/com/blackduck/integration/blackduck/bdio2/util/Bdio2ContentExtractor.java similarity index 96% rename from src/main/java/com/synopsys/integration/blackduck/bdio2/util/Bdio2ContentExtractor.java rename to src/main/java/com/blackduck/integration/blackduck/bdio2/util/Bdio2ContentExtractor.java index 09597a5c6..e89700602 100644 --- a/src/main/java/com/synopsys/integration/blackduck/bdio2/util/Bdio2ContentExtractor.java +++ b/src/main/java/com/blackduck/integration/blackduck/bdio2/util/Bdio2ContentExtractor.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.bdio2.util; +package com.blackduck.integration.blackduck.bdio2.util; import java.io.BufferedOutputStream; import java.io.ByteArrayOutputStream; @@ -21,7 +21,7 @@ import org.apache.commons.io.FilenameUtils; -import com.synopsys.integration.blackduck.bdio2.model.BdioFileContent; +import com.blackduck.integration.blackduck.bdio2.model.BdioFileContent; import com.synopsys.integration.exception.IntegrationException; public class Bdio2ContentExtractor { diff --git a/src/main/java/com/synopsys/integration/blackduck/bdio2/util/Bdio2Factory.java b/src/main/java/com/blackduck/integration/blackduck/bdio2/util/Bdio2Factory.java similarity index 98% rename from src/main/java/com/synopsys/integration/blackduck/bdio2/util/Bdio2Factory.java rename to src/main/java/com/blackduck/integration/blackduck/bdio2/util/Bdio2Factory.java index 738844dae..16c1a64ea 100644 --- a/src/main/java/com/synopsys/integration/blackduck/bdio2/util/Bdio2Factory.java +++ b/src/main/java/com/blackduck/integration/blackduck/bdio2/util/Bdio2Factory.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.bdio2.util; +package com.blackduck.integration.blackduck.bdio2.util; import java.time.ZonedDateTime; import java.util.ArrayList; @@ -35,8 +35,8 @@ import com.synopsys.integration.bdio.model.dependency.Dependency; import com.synopsys.integration.bdio.model.dependency.ProjectDependency; import com.synopsys.integration.bdio.model.externalid.ExternalId; -import com.synopsys.integration.blackduck.bdio2.model.Bdio2Document; -import com.synopsys.integration.blackduck.bdio2.model.ProjectInfo; +import com.blackduck.integration.blackduck.bdio2.model.Bdio2Document; +import com.blackduck.integration.blackduck.bdio2.model.ProjectInfo; import com.synopsys.integration.util.NameVersion; public class Bdio2Factory { diff --git a/src/main/java/com/synopsys/integration/blackduck/bdio2/util/Bdio2Writer.java b/src/main/java/com/blackduck/integration/blackduck/bdio2/util/Bdio2Writer.java similarity index 93% rename from src/main/java/com/synopsys/integration/blackduck/bdio2/util/Bdio2Writer.java rename to src/main/java/com/blackduck/integration/blackduck/bdio2/util/Bdio2Writer.java index 5fe165471..6d2259c09 100644 --- a/src/main/java/com/synopsys/integration/blackduck/bdio2/util/Bdio2Writer.java +++ b/src/main/java/com/blackduck/integration/blackduck/bdio2/util/Bdio2Writer.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.bdio2.util; +package com.blackduck.integration.blackduck.bdio2.util; import java.io.IOException; import java.io.OutputStream; @@ -15,7 +15,7 @@ import com.blackducksoftware.bdio2.BdioWriter; import com.blackducksoftware.bdio2.model.Component; import com.blackducksoftware.bdio2.model.Project; -import com.synopsys.integration.blackduck.bdio2.model.Bdio2Document; +import com.blackduck.integration.blackduck.bdio2.model.Bdio2Document; public class Bdio2Writer { public BdioWriter createBdioWriter(OutputStream outputStream, BdioMetadata bdioMetadata) { diff --git a/src/main/java/com/synopsys/integration/blackduck/codelocation/CodeLocationBatchOutput.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/CodeLocationBatchOutput.java similarity index 97% rename from src/main/java/com/synopsys/integration/blackduck/codelocation/CodeLocationBatchOutput.java rename to src/main/java/com/blackduck/integration/blackduck/codelocation/CodeLocationBatchOutput.java index c9738c522..fb960a69c 100644 --- a/src/main/java/com/synopsys/integration/blackduck/codelocation/CodeLocationBatchOutput.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/CodeLocationBatchOutput.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.codelocation; +package com.blackduck.integration.blackduck.codelocation; import java.util.ArrayList; import java.util.Iterator; diff --git a/src/main/java/com/synopsys/integration/blackduck/codelocation/CodeLocationCreationData.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/CodeLocationCreationData.java similarity index 84% rename from src/main/java/com/synopsys/integration/blackduck/codelocation/CodeLocationCreationData.java rename to src/main/java/com/blackduck/integration/blackduck/codelocation/CodeLocationCreationData.java index 270ee1937..5e873a9f2 100644 --- a/src/main/java/com/synopsys/integration/blackduck/codelocation/CodeLocationCreationData.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/CodeLocationCreationData.java @@ -5,9 +5,9 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.codelocation; +package com.blackduck.integration.blackduck.codelocation; -import com.synopsys.integration.blackduck.service.model.NotificationTaskRange; +import com.blackduck.integration.blackduck.service.model.NotificationTaskRange; public class CodeLocationCreationData { private final NotificationTaskRange notificationTaskRange; diff --git a/src/main/java/com/synopsys/integration/blackduck/codelocation/CodeLocationCreationRequest.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/CodeLocationCreationRequest.java similarity index 72% rename from src/main/java/com/synopsys/integration/blackduck/codelocation/CodeLocationCreationRequest.java rename to src/main/java/com/blackduck/integration/blackduck/codelocation/CodeLocationCreationRequest.java index b0199485a..a47a4b54d 100644 --- a/src/main/java/com/synopsys/integration/blackduck/codelocation/CodeLocationCreationRequest.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/CodeLocationCreationRequest.java @@ -5,9 +5,9 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.codelocation; +package com.blackduck.integration.blackduck.codelocation; -import com.synopsys.integration.blackduck.exception.BlackDuckIntegrationException; +import com.blackduck.integration.blackduck.exception.BlackDuckIntegrationException; public abstract class CodeLocationCreationRequest { public abstract T executeRequest() throws BlackDuckIntegrationException; diff --git a/src/main/java/com/synopsys/integration/blackduck/codelocation/CodeLocationCreationService.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/CodeLocationCreationService.java similarity index 92% rename from src/main/java/com/synopsys/integration/blackduck/codelocation/CodeLocationCreationService.java rename to src/main/java/com/blackduck/integration/blackduck/codelocation/CodeLocationCreationService.java index 8d0940638..41c2ae8b6 100644 --- a/src/main/java/com/synopsys/integration/blackduck/codelocation/CodeLocationCreationService.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/CodeLocationCreationService.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.codelocation; +package com.blackduck.integration.blackduck.codelocation; import java.time.Instant; import java.time.LocalDateTime; @@ -14,14 +14,14 @@ import java.util.Optional; import java.util.Set; +import com.blackduck.integration.blackduck.service.BlackDuckApiClient; +import com.blackduck.integration.blackduck.service.DataService; +import com.blackduck.integration.blackduck.service.dataservice.NotificationService; +import com.blackduck.integration.blackduck.service.dataservice.UserService; +import com.blackduck.integration.blackduck.service.model.NotificationTaskRange; import com.synopsys.integration.blackduck.api.core.response.UrlSingleResponse; import com.synopsys.integration.blackduck.api.generated.discovery.ApiDiscovery; import com.synopsys.integration.blackduck.api.generated.view.UserView; -import com.synopsys.integration.blackduck.service.BlackDuckApiClient; -import com.synopsys.integration.blackduck.service.DataService; -import com.synopsys.integration.blackduck.service.dataservice.NotificationService; -import com.synopsys.integration.blackduck.service.dataservice.UserService; -import com.synopsys.integration.blackduck.service.model.NotificationTaskRange; import com.synopsys.integration.exception.IntegrationException; import com.synopsys.integration.log.IntLogger; import com.synopsys.integration.util.NameVersion; diff --git a/src/main/java/com/synopsys/integration/blackduck/codelocation/CodeLocationOutput.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/CodeLocationOutput.java similarity index 96% rename from src/main/java/com/synopsys/integration/blackduck/codelocation/CodeLocationOutput.java rename to src/main/java/com/blackduck/integration/blackduck/codelocation/CodeLocationOutput.java index e2e8ae50e..5228098d1 100644 --- a/src/main/java/com/synopsys/integration/blackduck/codelocation/CodeLocationOutput.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/CodeLocationOutput.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.codelocation; +package com.blackduck.integration.blackduck.codelocation; import java.util.Optional; diff --git a/src/main/java/com/synopsys/integration/blackduck/codelocation/CodeLocationWaitJob.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/CodeLocationWaitJob.java similarity index 92% rename from src/main/java/com/synopsys/integration/blackduck/codelocation/CodeLocationWaitJob.java rename to src/main/java/com/blackduck/integration/blackduck/codelocation/CodeLocationWaitJob.java index 040002543..1c729bc0e 100644 --- a/src/main/java/com/synopsys/integration/blackduck/codelocation/CodeLocationWaitJob.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/CodeLocationWaitJob.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.codelocation; +package com.blackduck.integration.blackduck.codelocation; import java.util.Arrays; import java.util.Date; @@ -16,17 +16,17 @@ import java.util.Set; import java.util.stream.Collectors; +import com.blackduck.integration.blackduck.service.BlackDuckApiClient; +import com.blackduck.integration.blackduck.service.dataservice.NotificationService; +import com.blackduck.integration.blackduck.service.dataservice.ProjectService; +import com.blackduck.integration.blackduck.service.model.NotificationTaskRange; +import com.blackduck.integration.blackduck.service.model.ProjectVersionWrapper; +import com.blackduck.integration.blackduck.service.request.NotificationEditor; import com.synopsys.integration.blackduck.api.generated.view.ProjectVersionView; import com.synopsys.integration.blackduck.api.generated.view.UserView; import com.synopsys.integration.blackduck.api.manual.enumeration.NotificationType; import com.synopsys.integration.blackduck.api.manual.view.NotificationUserView; import com.synopsys.integration.blackduck.api.manual.view.VersionBomCodeLocationBomComputedNotificationUserView; -import com.synopsys.integration.blackduck.service.BlackDuckApiClient; -import com.synopsys.integration.blackduck.service.dataservice.NotificationService; -import com.synopsys.integration.blackduck.service.dataservice.ProjectService; -import com.synopsys.integration.blackduck.service.model.NotificationTaskRange; -import com.synopsys.integration.blackduck.service.model.ProjectVersionWrapper; -import com.synopsys.integration.blackduck.service.request.NotificationEditor; import com.synopsys.integration.exception.IntegrationException; import com.synopsys.integration.exception.IntegrationTimeoutException; import com.synopsys.integration.log.IntLogger; diff --git a/src/main/java/com/synopsys/integration/blackduck/codelocation/CodeLocationWaitJobCondition.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/CodeLocationWaitJobCondition.java similarity index 89% rename from src/main/java/com/synopsys/integration/blackduck/codelocation/CodeLocationWaitJobCondition.java rename to src/main/java/com/blackduck/integration/blackduck/codelocation/CodeLocationWaitJobCondition.java index e3be338f4..8f1f98d68 100644 --- a/src/main/java/com/synopsys/integration/blackduck/codelocation/CodeLocationWaitJobCondition.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/CodeLocationWaitJobCondition.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.codelocation; +package com.blackduck.integration.blackduck.codelocation; import java.util.Arrays; import java.util.Date; @@ -16,17 +16,17 @@ import java.util.Set; import java.util.stream.Collectors; +import com.blackduck.integration.blackduck.service.BlackDuckApiClient; +import com.blackduck.integration.blackduck.service.dataservice.NotificationService; +import com.blackduck.integration.blackduck.service.dataservice.ProjectService; +import com.blackduck.integration.blackduck.service.model.NotificationTaskRange; +import com.blackduck.integration.blackduck.service.model.ProjectVersionWrapper; +import com.blackduck.integration.blackduck.service.request.NotificationEditor; import com.synopsys.integration.blackduck.api.generated.view.ProjectVersionView; import com.synopsys.integration.blackduck.api.generated.view.UserView; import com.synopsys.integration.blackduck.api.manual.enumeration.NotificationType; import com.synopsys.integration.blackduck.api.manual.view.NotificationUserView; import com.synopsys.integration.blackduck.api.manual.view.VersionBomCodeLocationBomComputedNotificationUserView; -import com.synopsys.integration.blackduck.service.BlackDuckApiClient; -import com.synopsys.integration.blackduck.service.dataservice.NotificationService; -import com.synopsys.integration.blackduck.service.dataservice.ProjectService; -import com.synopsys.integration.blackduck.service.model.NotificationTaskRange; -import com.synopsys.integration.blackduck.service.model.ProjectVersionWrapper; -import com.synopsys.integration.blackduck.service.request.NotificationEditor; import com.synopsys.integration.exception.IntegrationException; import com.synopsys.integration.log.IntLogger; import com.synopsys.integration.util.NameVersion; @@ -47,7 +47,7 @@ public class CodeLocationWaitJobCondition implements WaitJobCondition { private final Set foundCodeLocationNames = new HashSet<>(); public CodeLocationWaitJobCondition(IntLogger logger, BlackDuckApiClient blackDuckApiClient, ProjectService projectService, NotificationService notificationService, UserView userView, NotificationTaskRange notificationTaskRange, - NameVersion projectAndVersion, Set codeLocationNames, int expectedNotificationCount) { + NameVersion projectAndVersion, Set codeLocationNames, int expectedNotificationCount) { this.logger = logger; this.projectService = projectService; this.notificationService = notificationService; diff --git a/src/main/java/com/synopsys/integration/blackduck/codelocation/CodeLocationWaitResult.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/CodeLocationWaitResult.java similarity index 95% rename from src/main/java/com/synopsys/integration/blackduck/codelocation/CodeLocationWaitResult.java rename to src/main/java/com/blackduck/integration/blackduck/codelocation/CodeLocationWaitResult.java index b8a72580d..c711255fd 100644 --- a/src/main/java/com/synopsys/integration/blackduck/codelocation/CodeLocationWaitResult.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/CodeLocationWaitResult.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.codelocation; +package com.blackduck.integration.blackduck.codelocation; import java.util.Optional; import java.util.Set; diff --git a/src/main/java/com/synopsys/integration/blackduck/codelocation/CodeLocationWaiter.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/CodeLocationWaiter.java similarity index 80% rename from src/main/java/com/synopsys/integration/blackduck/codelocation/CodeLocationWaiter.java rename to src/main/java/com/blackduck/integration/blackduck/codelocation/CodeLocationWaiter.java index a3e4c4833..0bff6907a 100644 --- a/src/main/java/com/synopsys/integration/blackduck/codelocation/CodeLocationWaiter.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/CodeLocationWaiter.java @@ -5,22 +5,20 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.codelocation; +package com.blackduck.integration.blackduck.codelocation; import java.util.Set; +import com.blackduck.integration.blackduck.service.BlackDuckApiClient; +import com.blackduck.integration.blackduck.service.dataservice.NotificationService; +import com.blackduck.integration.blackduck.service.dataservice.ProjectService; +import com.blackduck.integration.blackduck.service.model.NotificationTaskRange; import com.synopsys.integration.blackduck.api.generated.view.UserView; -import com.synopsys.integration.blackduck.service.BlackDuckApiClient; -import com.synopsys.integration.blackduck.service.dataservice.NotificationService; -import com.synopsys.integration.blackduck.service.dataservice.ProjectService; -import com.synopsys.integration.blackduck.service.model.NotificationTaskRange; import com.synopsys.integration.exception.IntegrationException; -import com.synopsys.integration.exception.IntegrationTimeoutException; import com.synopsys.integration.log.IntLogger; import com.synopsys.integration.util.NameVersion; import com.synopsys.integration.wait.ResilientJobConfig; import com.synopsys.integration.wait.ResilientJobExecutor; -import com.synopsys.integration.wait.WaitJob; import com.synopsys.integration.wait.tracker.WaitIntervalTracker; import com.synopsys.integration.wait.tracker.WaitIntervalTrackerFactory; @@ -38,7 +36,7 @@ public CodeLocationWaiter(IntLogger logger, BlackDuckApiClient blackDuckApiClien } public CodeLocationWaitResult checkCodeLocationsAddedToBom(UserView userView, NotificationTaskRange notificationTaskRange, NameVersion projectAndVersion, Set codeLocationNames, int expectedNotificationCount, - long timeoutInSeconds, int waitIntervalInSeconds) throws IntegrationException, InterruptedException { + long timeoutInSeconds, int waitIntervalInSeconds) throws IntegrationException, InterruptedException { logger.debug("Expected notification count " + expectedNotificationCount); logger.debug("Expected code locations:"); codeLocationNames.forEach(codeLocation -> logger.debug(String.format(" Code Location -> %s", codeLocation))); diff --git a/src/main/java/com/synopsys/integration/blackduck/codelocation/CodeLocationsRetriever.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/CodeLocationsRetriever.java similarity index 94% rename from src/main/java/com/synopsys/integration/blackduck/codelocation/CodeLocationsRetriever.java rename to src/main/java/com/blackduck/integration/blackduck/codelocation/CodeLocationsRetriever.java index 68184740c..0469d6eb6 100644 --- a/src/main/java/com/synopsys/integration/blackduck/codelocation/CodeLocationsRetriever.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/CodeLocationsRetriever.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.codelocation; +package com.blackduck.integration.blackduck.codelocation; import java.util.List; import java.util.Map; @@ -13,9 +13,9 @@ import java.util.function.BinaryOperator; import java.util.stream.Collectors; +import com.blackduck.integration.blackduck.service.BlackDuckApiClient; import com.synopsys.integration.blackduck.api.generated.view.CodeLocationView; import com.synopsys.integration.blackduck.api.generated.view.ProjectVersionView; -import com.synopsys.integration.blackduck.service.BlackDuckApiClient; import com.synopsys.integration.exception.IntegrationException; public class CodeLocationsRetriever { diff --git a/src/main/java/com/synopsys/integration/blackduck/codelocation/Result.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/Result.java similarity index 81% rename from src/main/java/com/synopsys/integration/blackduck/codelocation/Result.java rename to src/main/java/com/blackduck/integration/blackduck/codelocation/Result.java index e1fb8213d..d655a2ea5 100644 --- a/src/main/java/com/synopsys/integration/blackduck/codelocation/Result.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/Result.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.codelocation; +package com.blackduck.integration.blackduck.codelocation; public enum Result { SUCCESS, diff --git a/src/main/java/com/synopsys/integration/blackduck/codelocation/bdio2legacy/Bdio2UploadCodeLocationCreationRequest.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/bdio2legacy/Bdio2UploadCodeLocationCreationRequest.java similarity index 67% rename from src/main/java/com/synopsys/integration/blackduck/codelocation/bdio2legacy/Bdio2UploadCodeLocationCreationRequest.java rename to src/main/java/com/blackduck/integration/blackduck/codelocation/bdio2legacy/Bdio2UploadCodeLocationCreationRequest.java index 159e22f75..18c708a4d 100644 --- a/src/main/java/com/synopsys/integration/blackduck/codelocation/bdio2legacy/Bdio2UploadCodeLocationCreationRequest.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/bdio2legacy/Bdio2UploadCodeLocationCreationRequest.java @@ -5,12 +5,12 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.codelocation.bdio2legacy; +package com.blackduck.integration.blackduck.codelocation.bdio2legacy; -import com.synopsys.integration.blackduck.codelocation.CodeLocationCreationRequest; -import com.synopsys.integration.blackduck.codelocation.upload.UploadBatch; -import com.synopsys.integration.blackduck.codelocation.upload.UploadBatchOutput; -import com.synopsys.integration.blackduck.exception.BlackDuckIntegrationException; +import com.blackduck.integration.blackduck.codelocation.upload.UploadBatch; +import com.blackduck.integration.blackduck.codelocation.CodeLocationCreationRequest; +import com.blackduck.integration.blackduck.codelocation.upload.UploadBatchOutput; +import com.blackduck.integration.blackduck.exception.BlackDuckIntegrationException; public class Bdio2UploadCodeLocationCreationRequest extends CodeLocationCreationRequest { private final UploadBdio2BatchRunner uploadBdio2BatchRunner; diff --git a/src/main/java/com/synopsys/integration/blackduck/codelocation/bdio2legacy/Bdio2UploadService.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/bdio2legacy/Bdio2UploadService.java similarity index 78% rename from src/main/java/com/synopsys/integration/blackduck/codelocation/bdio2legacy/Bdio2UploadService.java rename to src/main/java/com/blackduck/integration/blackduck/codelocation/bdio2legacy/Bdio2UploadService.java index 2c4397032..d04db9ba8 100644 --- a/src/main/java/com/synopsys/integration/blackduck/codelocation/bdio2legacy/Bdio2UploadService.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/bdio2legacy/Bdio2UploadService.java @@ -5,19 +5,19 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.codelocation.bdio2legacy; +package com.blackduck.integration.blackduck.codelocation.bdio2legacy; import java.util.Set; +import com.blackduck.integration.blackduck.codelocation.upload.UploadBatch; +import com.blackduck.integration.blackduck.service.BlackDuckApiClient; +import com.blackduck.integration.blackduck.service.DataService; import com.synopsys.integration.blackduck.api.generated.discovery.ApiDiscovery; -import com.synopsys.integration.blackduck.codelocation.CodeLocationCreationData; -import com.synopsys.integration.blackduck.codelocation.CodeLocationCreationRequest; -import com.synopsys.integration.blackduck.codelocation.CodeLocationCreationService; -import com.synopsys.integration.blackduck.codelocation.upload.UploadBatch; -import com.synopsys.integration.blackduck.codelocation.upload.UploadBatchOutput; -import com.synopsys.integration.blackduck.service.BlackDuckApiClient; -import com.synopsys.integration.blackduck.service.DataService; -import com.synopsys.integration.blackduck.service.model.NotificationTaskRange; +import com.blackduck.integration.blackduck.codelocation.CodeLocationCreationData; +import com.blackduck.integration.blackduck.codelocation.CodeLocationCreationRequest; +import com.blackduck.integration.blackduck.codelocation.CodeLocationCreationService; +import com.blackduck.integration.blackduck.codelocation.upload.UploadBatchOutput; +import com.blackduck.integration.blackduck.service.model.NotificationTaskRange; import com.synopsys.integration.exception.IntegrationException; import com.synopsys.integration.log.IntLogger; import com.synopsys.integration.util.NameVersion; @@ -27,7 +27,7 @@ public class Bdio2UploadService extends DataService { private final CodeLocationCreationService codeLocationCreationService; public Bdio2UploadService(BlackDuckApiClient blackDuckApiClient, ApiDiscovery apiDiscovery, IntLogger logger, UploadBdio2BatchRunner uploadBdio2BatchRunner, - CodeLocationCreationService codeLocationCreationService) { + CodeLocationCreationService codeLocationCreationService) { super(blackDuckApiClient, apiDiscovery, logger); this.uploadBdio2BatchRunner = uploadBdio2BatchRunner; this.codeLocationCreationService = codeLocationCreationService; diff --git a/src/main/java/com/synopsys/integration/blackduck/codelocation/bdio2legacy/UploadBdio2BatchRunner.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/bdio2legacy/UploadBdio2BatchRunner.java similarity index 81% rename from src/main/java/com/synopsys/integration/blackduck/codelocation/bdio2legacy/UploadBdio2BatchRunner.java rename to src/main/java/com/blackduck/integration/blackduck/codelocation/bdio2legacy/UploadBdio2BatchRunner.java index 9332663f9..5615ac5b6 100644 --- a/src/main/java/com/synopsys/integration/blackduck/codelocation/bdio2legacy/UploadBdio2BatchRunner.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/bdio2legacy/UploadBdio2BatchRunner.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.codelocation.bdio2legacy; +package com.blackduck.integration.blackduck.codelocation.bdio2legacy; import java.util.ArrayList; import java.util.List; @@ -13,15 +13,15 @@ import java.util.concurrent.Future; import java.util.stream.Collectors; +import com.blackduck.integration.blackduck.bdio2.Bdio2StreamUploader; +import com.blackduck.integration.blackduck.codelocation.upload.UploadBatch; +import com.blackduck.integration.blackduck.service.BlackDuckApiClient; import com.synopsys.integration.blackduck.api.generated.discovery.ApiDiscovery; -import com.synopsys.integration.blackduck.bdio2.Bdio2StreamUploader; -import com.synopsys.integration.blackduck.codelocation.upload.UploadBatch; -import com.synopsys.integration.blackduck.codelocation.upload.UploadBatchOutput; -import com.synopsys.integration.blackduck.codelocation.upload.UploadOutput; -import com.synopsys.integration.blackduck.codelocation.upload.UploadTarget; -import com.synopsys.integration.blackduck.exception.BlackDuckIntegrationException; -import com.synopsys.integration.blackduck.service.BlackDuckApiClient; -import com.synopsys.integration.blackduck.service.request.BlackDuckRequestBuilderEditor; +import com.blackduck.integration.blackduck.codelocation.upload.UploadBatchOutput; +import com.blackduck.integration.blackduck.codelocation.upload.UploadOutput; +import com.blackduck.integration.blackduck.codelocation.upload.UploadTarget; +import com.blackduck.integration.blackduck.exception.BlackDuckIntegrationException; +import com.blackduck.integration.blackduck.service.request.BlackDuckRequestBuilderEditor; import com.synopsys.integration.log.IntLogger; public class UploadBdio2BatchRunner { diff --git a/src/main/java/com/synopsys/integration/blackduck/codelocation/bdio2legacy/UploadBdio2Callable.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/bdio2legacy/UploadBdio2Callable.java similarity index 84% rename from src/main/java/com/synopsys/integration/blackduck/codelocation/bdio2legacy/UploadBdio2Callable.java rename to src/main/java/com/blackduck/integration/blackduck/codelocation/bdio2legacy/UploadBdio2Callable.java index 975a8fb78..633f75533 100644 --- a/src/main/java/com/synopsys/integration/blackduck/codelocation/bdio2legacy/UploadBdio2Callable.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/bdio2legacy/UploadBdio2Callable.java @@ -5,22 +5,22 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.codelocation.bdio2legacy; +package com.blackduck.integration.blackduck.codelocation.bdio2legacy; import java.io.IOException; import java.nio.charset.StandardCharsets; import java.util.concurrent.Callable; +import com.blackduck.integration.blackduck.http.BlackDuckRequestBuilder; +import com.blackduck.integration.blackduck.service.BlackDuckApiClient; import org.apache.http.entity.ContentType; import org.jetbrains.annotations.Nullable; import com.synopsys.integration.blackduck.api.generated.discovery.ApiDiscovery; -import com.synopsys.integration.blackduck.codelocation.upload.UploadOutput; -import com.synopsys.integration.blackduck.codelocation.upload.UploadTarget; -import com.synopsys.integration.blackduck.http.BlackDuckRequestBuilder; -import com.synopsys.integration.blackduck.service.BlackDuckApiClient; -import com.synopsys.integration.blackduck.service.request.BlackDuckRequestBuilderEditor; -import com.synopsys.integration.blackduck.service.request.BlackDuckResponseRequest; +import com.blackduck.integration.blackduck.codelocation.upload.UploadOutput; +import com.blackduck.integration.blackduck.codelocation.upload.UploadTarget; +import com.blackduck.integration.blackduck.service.request.BlackDuckRequestBuilderEditor; +import com.blackduck.integration.blackduck.service.request.BlackDuckResponseRequest; import com.synopsys.integration.exception.IntegrationException; import com.synopsys.integration.rest.HttpUrl; import com.synopsys.integration.rest.response.Response; diff --git a/src/main/java/com/synopsys/integration/blackduck/codelocation/bdiolegacy/BdioUploadCodeLocationCreationRequest.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/bdiolegacy/BdioUploadCodeLocationCreationRequest.java similarity index 67% rename from src/main/java/com/synopsys/integration/blackduck/codelocation/bdiolegacy/BdioUploadCodeLocationCreationRequest.java rename to src/main/java/com/blackduck/integration/blackduck/codelocation/bdiolegacy/BdioUploadCodeLocationCreationRequest.java index 1c9999914..3f0b99967 100644 --- a/src/main/java/com/synopsys/integration/blackduck/codelocation/bdiolegacy/BdioUploadCodeLocationCreationRequest.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/bdiolegacy/BdioUploadCodeLocationCreationRequest.java @@ -5,12 +5,12 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.codelocation.bdiolegacy; +package com.blackduck.integration.blackduck.codelocation.bdiolegacy; -import com.synopsys.integration.blackduck.codelocation.CodeLocationCreationRequest; -import com.synopsys.integration.blackduck.codelocation.upload.UploadBatch; -import com.synopsys.integration.blackduck.codelocation.upload.UploadBatchOutput; -import com.synopsys.integration.blackduck.exception.BlackDuckIntegrationException; +import com.blackduck.integration.blackduck.codelocation.upload.UploadBatch; +import com.blackduck.integration.blackduck.codelocation.CodeLocationCreationRequest; +import com.blackduck.integration.blackduck.codelocation.upload.UploadBatchOutput; +import com.blackduck.integration.blackduck.exception.BlackDuckIntegrationException; public class BdioUploadCodeLocationCreationRequest extends CodeLocationCreationRequest { private final UploadBatchRunner uploadBatchRunner; diff --git a/src/main/java/com/synopsys/integration/blackduck/codelocation/bdiolegacy/BdioUploadService.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/bdiolegacy/BdioUploadService.java similarity index 84% rename from src/main/java/com/synopsys/integration/blackduck/codelocation/bdiolegacy/BdioUploadService.java rename to src/main/java/com/blackduck/integration/blackduck/codelocation/bdiolegacy/BdioUploadService.java index 0021f76c9..263fb00d2 100644 --- a/src/main/java/com/synopsys/integration/blackduck/codelocation/bdiolegacy/BdioUploadService.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/bdiolegacy/BdioUploadService.java @@ -5,19 +5,19 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.codelocation.bdiolegacy; +package com.blackduck.integration.blackduck.codelocation.bdiolegacy; import java.util.Set; +import com.blackduck.integration.blackduck.service.BlackDuckApiClient; +import com.blackduck.integration.blackduck.service.DataService; import com.synopsys.integration.blackduck.api.generated.discovery.ApiDiscovery; -import com.synopsys.integration.blackduck.codelocation.CodeLocationCreationData; -import com.synopsys.integration.blackduck.codelocation.CodeLocationCreationService; -import com.synopsys.integration.blackduck.codelocation.upload.UploadBatch; -import com.synopsys.integration.blackduck.codelocation.upload.UploadBatchOutput; -import com.synopsys.integration.blackduck.codelocation.upload.UploadTarget; -import com.synopsys.integration.blackduck.service.BlackDuckApiClient; -import com.synopsys.integration.blackduck.service.DataService; -import com.synopsys.integration.blackduck.service.model.NotificationTaskRange; +import com.blackduck.integration.blackduck.codelocation.CodeLocationCreationData; +import com.blackduck.integration.blackduck.codelocation.CodeLocationCreationService; +import com.blackduck.integration.blackduck.codelocation.upload.UploadBatch; +import com.blackduck.integration.blackduck.codelocation.upload.UploadBatchOutput; +import com.blackduck.integration.blackduck.codelocation.upload.UploadTarget; +import com.blackduck.integration.blackduck.service.model.NotificationTaskRange; import com.synopsys.integration.exception.IntegrationException; import com.synopsys.integration.log.IntLogger; import com.synopsys.integration.util.NameVersion; diff --git a/src/main/java/com/synopsys/integration/blackduck/codelocation/bdiolegacy/UploadBatchRunner.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/bdiolegacy/UploadBatchRunner.java similarity index 85% rename from src/main/java/com/synopsys/integration/blackduck/codelocation/bdiolegacy/UploadBatchRunner.java rename to src/main/java/com/blackduck/integration/blackduck/codelocation/bdiolegacy/UploadBatchRunner.java index d677cacae..007180308 100644 --- a/src/main/java/com/synopsys/integration/blackduck/codelocation/bdiolegacy/UploadBatchRunner.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/bdiolegacy/UploadBatchRunner.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.codelocation.bdiolegacy; +package com.blackduck.integration.blackduck.codelocation.bdiolegacy; import java.util.ArrayList; import java.util.List; @@ -13,12 +13,12 @@ import java.util.concurrent.Future; import java.util.stream.Collectors; +import com.blackduck.integration.blackduck.service.BlackDuckApiClient; import com.synopsys.integration.blackduck.api.generated.discovery.ApiDiscovery; -import com.synopsys.integration.blackduck.codelocation.upload.UploadBatch; -import com.synopsys.integration.blackduck.codelocation.upload.UploadBatchOutput; -import com.synopsys.integration.blackduck.codelocation.upload.UploadOutput; -import com.synopsys.integration.blackduck.exception.BlackDuckIntegrationException; -import com.synopsys.integration.blackduck.service.BlackDuckApiClient; +import com.blackduck.integration.blackduck.codelocation.upload.UploadBatch; +import com.blackduck.integration.blackduck.codelocation.upload.UploadBatchOutput; +import com.blackduck.integration.blackduck.codelocation.upload.UploadOutput; +import com.blackduck.integration.blackduck.exception.BlackDuckIntegrationException; import com.synopsys.integration.log.IntLogger; public class UploadBatchRunner { diff --git a/src/main/java/com/synopsys/integration/blackduck/codelocation/bdiolegacy/UploadCallable.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/bdiolegacy/UploadCallable.java similarity index 87% rename from src/main/java/com/synopsys/integration/blackduck/codelocation/bdiolegacy/UploadCallable.java rename to src/main/java/com/blackduck/integration/blackduck/codelocation/bdiolegacy/UploadCallable.java index 5d65515bb..473854d96 100644 --- a/src/main/java/com/synopsys/integration/blackduck/codelocation/bdiolegacy/UploadCallable.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/bdiolegacy/UploadCallable.java @@ -5,12 +5,14 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.codelocation.bdiolegacy; +package com.blackduck.integration.blackduck.codelocation.bdiolegacy; import java.io.IOException; import java.nio.charset.StandardCharsets; import java.util.concurrent.Callable; +import com.blackduck.integration.blackduck.http.BlackDuckRequestBuilder; +import com.blackduck.integration.blackduck.service.BlackDuckApiClient; import org.apache.commons.io.FileUtils; import org.apache.http.entity.ContentType; import org.jetbrains.annotations.Nullable; @@ -18,11 +20,9 @@ import com.synopsys.integration.blackduck.api.core.response.UrlSingleResponse; import com.synopsys.integration.blackduck.api.generated.discovery.ApiDiscovery; import com.synopsys.integration.blackduck.api.manual.response.BlackDuckStringResponse; -import com.synopsys.integration.blackduck.codelocation.upload.UploadOutput; -import com.synopsys.integration.blackduck.codelocation.upload.UploadTarget; -import com.synopsys.integration.blackduck.http.BlackDuckRequestBuilder; -import com.synopsys.integration.blackduck.service.BlackDuckApiClient; -import com.synopsys.integration.blackduck.service.request.BlackDuckResponseRequest; +import com.blackduck.integration.blackduck.codelocation.upload.UploadOutput; +import com.blackduck.integration.blackduck.codelocation.upload.UploadTarget; +import com.blackduck.integration.blackduck.service.request.BlackDuckResponseRequest; import com.synopsys.integration.rest.response.Response; import com.synopsys.integration.util.NameVersion; diff --git a/src/main/java/com/synopsys/integration/blackduck/codelocation/binaryscanner/BinaryScan.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/binaryscanner/BinaryScan.java similarity index 94% rename from src/main/java/com/synopsys/integration/blackduck/codelocation/binaryscanner/BinaryScan.java rename to src/main/java/com/blackduck/integration/blackduck/codelocation/binaryscanner/BinaryScan.java index 9b318636e..fd3e5ab7c 100644 --- a/src/main/java/com/synopsys/integration/blackduck/codelocation/binaryscanner/BinaryScan.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/binaryscanner/BinaryScan.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.codelocation.binaryscanner; +package com.blackduck.integration.blackduck.codelocation.binaryscanner; import java.io.File; diff --git a/src/main/java/com/synopsys/integration/blackduck/codelocation/binaryscanner/BinaryScanBatch.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/binaryscanner/BinaryScanBatch.java similarity index 91% rename from src/main/java/com/synopsys/integration/blackduck/codelocation/binaryscanner/BinaryScanBatch.java rename to src/main/java/com/blackduck/integration/blackduck/codelocation/binaryscanner/BinaryScanBatch.java index da77a588e..3e83893ac 100644 --- a/src/main/java/com/synopsys/integration/blackduck/codelocation/binaryscanner/BinaryScanBatch.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/binaryscanner/BinaryScanBatch.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.codelocation.binaryscanner; +package com.blackduck.integration.blackduck.codelocation.binaryscanner; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/main/java/com/synopsys/integration/blackduck/codelocation/binaryscanner/BinaryScanBatchOutput.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/binaryscanner/BinaryScanBatchOutput.java similarity index 77% rename from src/main/java/com/synopsys/integration/blackduck/codelocation/binaryscanner/BinaryScanBatchOutput.java rename to src/main/java/com/blackduck/integration/blackduck/codelocation/binaryscanner/BinaryScanBatchOutput.java index b01b21f8b..9b90b1d61 100644 --- a/src/main/java/com/synopsys/integration/blackduck/codelocation/binaryscanner/BinaryScanBatchOutput.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/binaryscanner/BinaryScanBatchOutput.java @@ -5,13 +5,13 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.codelocation.binaryscanner; +package com.blackduck.integration.blackduck.codelocation.binaryscanner; import java.util.List; -import com.synopsys.integration.blackduck.codelocation.CodeLocationBatchOutput; -import com.synopsys.integration.blackduck.codelocation.Result; -import com.synopsys.integration.blackduck.exception.BlackDuckIntegrationException; +import com.blackduck.integration.blackduck.codelocation.CodeLocationBatchOutput; +import com.blackduck.integration.blackduck.codelocation.Result; +import com.blackduck.integration.blackduck.exception.BlackDuckIntegrationException; import com.synopsys.integration.log.IntLogger; public class BinaryScanBatchOutput extends CodeLocationBatchOutput { diff --git a/src/main/java/com/synopsys/integration/blackduck/codelocation/binaryscanner/BinaryScanBatchRunner.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/binaryscanner/BinaryScanBatchRunner.java similarity index 92% rename from src/main/java/com/synopsys/integration/blackduck/codelocation/binaryscanner/BinaryScanBatchRunner.java rename to src/main/java/com/blackduck/integration/blackduck/codelocation/binaryscanner/BinaryScanBatchRunner.java index fc261f658..e2b6faa38 100644 --- a/src/main/java/com/synopsys/integration/blackduck/codelocation/binaryscanner/BinaryScanBatchRunner.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/binaryscanner/BinaryScanBatchRunner.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.codelocation.binaryscanner; +package com.blackduck.integration.blackduck.codelocation.binaryscanner; import java.util.ArrayList; import java.util.List; @@ -13,9 +13,9 @@ import java.util.concurrent.Future; import java.util.stream.Collectors; +import com.blackduck.integration.blackduck.service.BlackDuckApiClient; import com.synopsys.integration.blackduck.api.generated.discovery.ApiDiscovery; -import com.synopsys.integration.blackduck.exception.BlackDuckIntegrationException; -import com.synopsys.integration.blackduck.service.BlackDuckApiClient; +import com.blackduck.integration.blackduck.exception.BlackDuckIntegrationException; import com.synopsys.integration.log.IntLogger; public class BinaryScanBatchRunner { diff --git a/src/main/java/com/synopsys/integration/blackduck/codelocation/binaryscanner/BinaryScanCallable.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/binaryscanner/BinaryScanCallable.java similarity index 91% rename from src/main/java/com/synopsys/integration/blackduck/codelocation/binaryscanner/BinaryScanCallable.java rename to src/main/java/com/blackduck/integration/blackduck/codelocation/binaryscanner/BinaryScanCallable.java index 33037cffe..01e1baf91 100644 --- a/src/main/java/com/synopsys/integration/blackduck/codelocation/binaryscanner/BinaryScanCallable.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/binaryscanner/BinaryScanCallable.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.codelocation.binaryscanner; +package com.blackduck.integration.blackduck.codelocation.binaryscanner; import java.io.File; import java.io.IOException; @@ -13,12 +13,12 @@ import java.util.Map; import java.util.concurrent.Callable; +import com.blackduck.integration.blackduck.http.BlackDuckRequestBuilder; +import com.blackduck.integration.blackduck.service.BlackDuckApiClient; import com.synopsys.integration.blackduck.api.core.response.UrlSingleResponse; import com.synopsys.integration.blackduck.api.generated.discovery.ApiDiscovery; import com.synopsys.integration.blackduck.api.manual.response.BlackDuckStringResponse; -import com.synopsys.integration.blackduck.http.BlackDuckRequestBuilder; -import com.synopsys.integration.blackduck.service.BlackDuckApiClient; -import com.synopsys.integration.blackduck.service.request.BlackDuckResponseRequest; +import com.blackduck.integration.blackduck.service.request.BlackDuckResponseRequest; import com.synopsys.integration.exception.IntegrationException; import com.synopsys.integration.rest.exception.IntegrationRestException; import com.synopsys.integration.rest.response.Response; diff --git a/src/main/java/com/synopsys/integration/blackduck/codelocation/binaryscanner/BinaryScanCodeLocationCreationRequest.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/binaryscanner/BinaryScanCodeLocationCreationRequest.java similarity index 78% rename from src/main/java/com/synopsys/integration/blackduck/codelocation/binaryscanner/BinaryScanCodeLocationCreationRequest.java rename to src/main/java/com/blackduck/integration/blackduck/codelocation/binaryscanner/BinaryScanCodeLocationCreationRequest.java index 9ecee0669..58ffff008 100644 --- a/src/main/java/com/synopsys/integration/blackduck/codelocation/binaryscanner/BinaryScanCodeLocationCreationRequest.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/binaryscanner/BinaryScanCodeLocationCreationRequest.java @@ -5,10 +5,10 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.codelocation.binaryscanner; +package com.blackduck.integration.blackduck.codelocation.binaryscanner; -import com.synopsys.integration.blackduck.codelocation.CodeLocationCreationRequest; -import com.synopsys.integration.blackduck.exception.BlackDuckIntegrationException; +import com.blackduck.integration.blackduck.codelocation.CodeLocationCreationRequest; +import com.blackduck.integration.blackduck.exception.BlackDuckIntegrationException; public class BinaryScanCodeLocationCreationRequest extends CodeLocationCreationRequest { private final BinaryScanBatchRunner binaryScanBatchRunner; diff --git a/src/main/java/com/synopsys/integration/blackduck/codelocation/binaryscanner/BinaryScanOutput.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/binaryscanner/BinaryScanOutput.java similarity index 94% rename from src/main/java/com/synopsys/integration/blackduck/codelocation/binaryscanner/BinaryScanOutput.java rename to src/main/java/com/blackduck/integration/blackduck/codelocation/binaryscanner/BinaryScanOutput.java index e807f6656..3b9d7abe5 100644 --- a/src/main/java/com/synopsys/integration/blackduck/codelocation/binaryscanner/BinaryScanOutput.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/binaryscanner/BinaryScanOutput.java @@ -5,12 +5,12 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.codelocation.binaryscanner; +package com.blackduck.integration.blackduck.codelocation.binaryscanner; import org.jetbrains.annotations.Nullable; -import com.synopsys.integration.blackduck.codelocation.CodeLocationOutput; -import com.synopsys.integration.blackduck.codelocation.Result; +import com.blackduck.integration.blackduck.codelocation.CodeLocationOutput; +import com.blackduck.integration.blackduck.codelocation.Result; import com.synopsys.integration.exception.IntegrationException; import com.synopsys.integration.rest.exception.IntegrationRestException; import com.synopsys.integration.rest.response.Response; diff --git a/src/main/java/com/synopsys/integration/blackduck/codelocation/binaryscanner/BinaryScanUploadService.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/binaryscanner/BinaryScanUploadService.java similarity index 89% rename from src/main/java/com/synopsys/integration/blackduck/codelocation/binaryscanner/BinaryScanUploadService.java rename to src/main/java/com/blackduck/integration/blackduck/codelocation/binaryscanner/BinaryScanUploadService.java index 06973a7ed..9f9db5f00 100644 --- a/src/main/java/com/synopsys/integration/blackduck/codelocation/binaryscanner/BinaryScanUploadService.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/binaryscanner/BinaryScanUploadService.java @@ -5,16 +5,16 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.codelocation.binaryscanner; +package com.blackduck.integration.blackduck.codelocation.binaryscanner; import java.util.Set; +import com.blackduck.integration.blackduck.service.BlackDuckApiClient; +import com.blackduck.integration.blackduck.service.DataService; import com.synopsys.integration.blackduck.api.generated.discovery.ApiDiscovery; -import com.synopsys.integration.blackduck.codelocation.CodeLocationCreationData; -import com.synopsys.integration.blackduck.codelocation.CodeLocationCreationService; -import com.synopsys.integration.blackduck.service.BlackDuckApiClient; -import com.synopsys.integration.blackduck.service.DataService; -import com.synopsys.integration.blackduck.service.model.NotificationTaskRange; +import com.blackduck.integration.blackduck.codelocation.CodeLocationCreationData; +import com.blackduck.integration.blackduck.codelocation.CodeLocationCreationService; +import com.blackduck.integration.blackduck.service.model.NotificationTaskRange; import com.synopsys.integration.exception.IntegrationException; import com.synopsys.integration.log.IntLogger; import com.synopsys.integration.util.NameVersion; diff --git a/src/main/java/com/synopsys/integration/blackduck/codelocation/intelligentpersistence/IntelligentPersistenceBatchRunner.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/intelligentpersistence/IntelligentPersistenceBatchRunner.java similarity index 86% rename from src/main/java/com/synopsys/integration/blackduck/codelocation/intelligentpersistence/IntelligentPersistenceBatchRunner.java rename to src/main/java/com/blackduck/integration/blackduck/codelocation/intelligentpersistence/IntelligentPersistenceBatchRunner.java index ec0279220..b2d326bbe 100644 --- a/src/main/java/com/synopsys/integration/blackduck/codelocation/intelligentpersistence/IntelligentPersistenceBatchRunner.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/intelligentpersistence/IntelligentPersistenceBatchRunner.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.codelocation.intelligentpersistence; +package com.blackduck.integration.blackduck.codelocation.intelligentpersistence; import java.util.ArrayList; import java.util.List; @@ -13,11 +13,11 @@ import java.util.concurrent.Future; import java.util.stream.Collectors; -import com.synopsys.integration.blackduck.bdio2.Bdio2FileUploadService; -import com.synopsys.integration.blackduck.codelocation.upload.UploadBatch; -import com.synopsys.integration.blackduck.codelocation.upload.UploadBatchOutput; -import com.synopsys.integration.blackduck.codelocation.upload.UploadOutput; -import com.synopsys.integration.blackduck.exception.BlackDuckIntegrationException; +import com.blackduck.integration.blackduck.bdio2.Bdio2FileUploadService; +import com.blackduck.integration.blackduck.codelocation.upload.UploadBatch; +import com.blackduck.integration.blackduck.codelocation.upload.UploadBatchOutput; +import com.blackduck.integration.blackduck.codelocation.upload.UploadOutput; +import com.blackduck.integration.blackduck.exception.BlackDuckIntegrationException; import com.synopsys.integration.log.IntLogger; public class IntelligentPersistenceBatchRunner { diff --git a/src/main/java/com/synopsys/integration/blackduck/codelocation/intelligentpersistence/IntelligentPersistenceCallable.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/intelligentpersistence/IntelligentPersistenceCallable.java similarity index 82% rename from src/main/java/com/synopsys/integration/blackduck/codelocation/intelligentpersistence/IntelligentPersistenceCallable.java rename to src/main/java/com/blackduck/integration/blackduck/codelocation/intelligentpersistence/IntelligentPersistenceCallable.java index bbc539056..f52559d35 100644 --- a/src/main/java/com/synopsys/integration/blackduck/codelocation/intelligentpersistence/IntelligentPersistenceCallable.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/intelligentpersistence/IntelligentPersistenceCallable.java @@ -5,16 +5,16 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.codelocation.intelligentpersistence; +package com.blackduck.integration.blackduck.codelocation.intelligentpersistence; import java.util.concurrent.Callable; +import com.blackduck.integration.blackduck.bdio2.Bdio2FileUploadService; +import com.blackduck.integration.blackduck.bdio2.Bdio2UploadResult; import org.jetbrains.annotations.Nullable; -import com.synopsys.integration.blackduck.bdio2.Bdio2FileUploadService; -import com.synopsys.integration.blackduck.bdio2.Bdio2UploadResult; -import com.synopsys.integration.blackduck.codelocation.upload.UploadOutput; -import com.synopsys.integration.blackduck.codelocation.upload.UploadTarget; +import com.blackduck.integration.blackduck.codelocation.upload.UploadOutput; +import com.blackduck.integration.blackduck.codelocation.upload.UploadTarget; import com.synopsys.integration.util.NameVersion; public class IntelligentPersistenceCallable implements Callable { diff --git a/src/main/java/com/synopsys/integration/blackduck/codelocation/intelligentpersistence/IntelligentPersistenceCodeLocationCreationRequest.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/intelligentpersistence/IntelligentPersistenceCodeLocationCreationRequest.java similarity index 72% rename from src/main/java/com/synopsys/integration/blackduck/codelocation/intelligentpersistence/IntelligentPersistenceCodeLocationCreationRequest.java rename to src/main/java/com/blackduck/integration/blackduck/codelocation/intelligentpersistence/IntelligentPersistenceCodeLocationCreationRequest.java index 9901d1548..aa7a31026 100644 --- a/src/main/java/com/synopsys/integration/blackduck/codelocation/intelligentpersistence/IntelligentPersistenceCodeLocationCreationRequest.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/intelligentpersistence/IntelligentPersistenceCodeLocationCreationRequest.java @@ -5,12 +5,12 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.codelocation.intelligentpersistence; +package com.blackduck.integration.blackduck.codelocation.intelligentpersistence; -import com.synopsys.integration.blackduck.codelocation.CodeLocationCreationRequest; -import com.synopsys.integration.blackduck.codelocation.upload.UploadBatch; -import com.synopsys.integration.blackduck.codelocation.upload.UploadBatchOutput; -import com.synopsys.integration.blackduck.exception.BlackDuckIntegrationException; +import com.blackduck.integration.blackduck.codelocation.CodeLocationCreationRequest; +import com.blackduck.integration.blackduck.codelocation.upload.UploadBatch; +import com.blackduck.integration.blackduck.codelocation.upload.UploadBatchOutput; +import com.blackduck.integration.blackduck.exception.BlackDuckIntegrationException; public class IntelligentPersistenceCodeLocationCreationRequest extends CodeLocationCreationRequest { private final IntelligentPersistenceBatchRunner uploadBatchRunner; diff --git a/src/main/java/com/synopsys/integration/blackduck/codelocation/intelligentpersistence/IntelligentPersistenceService.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/intelligentpersistence/IntelligentPersistenceService.java similarity index 82% rename from src/main/java/com/synopsys/integration/blackduck/codelocation/intelligentpersistence/IntelligentPersistenceService.java rename to src/main/java/com/blackduck/integration/blackduck/codelocation/intelligentpersistence/IntelligentPersistenceService.java index a76c3d900..996d4de78 100644 --- a/src/main/java/com/synopsys/integration/blackduck/codelocation/intelligentpersistence/IntelligentPersistenceService.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/intelligentpersistence/IntelligentPersistenceService.java @@ -5,19 +5,19 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.codelocation.intelligentpersistence; +package com.blackduck.integration.blackduck.codelocation.intelligentpersistence; import java.util.Set; +import com.blackduck.integration.blackduck.service.BlackDuckApiClient; +import com.blackduck.integration.blackduck.service.DataService; import com.synopsys.integration.blackduck.api.generated.discovery.ApiDiscovery; -import com.synopsys.integration.blackduck.codelocation.CodeLocationCreationData; -import com.synopsys.integration.blackduck.codelocation.CodeLocationCreationRequest; -import com.synopsys.integration.blackduck.codelocation.CodeLocationCreationService; -import com.synopsys.integration.blackduck.codelocation.upload.UploadBatch; -import com.synopsys.integration.blackduck.codelocation.upload.UploadBatchOutput; -import com.synopsys.integration.blackduck.service.BlackDuckApiClient; -import com.synopsys.integration.blackduck.service.DataService; -import com.synopsys.integration.blackduck.service.model.NotificationTaskRange; +import com.blackduck.integration.blackduck.codelocation.CodeLocationCreationData; +import com.blackduck.integration.blackduck.codelocation.CodeLocationCreationRequest; +import com.blackduck.integration.blackduck.codelocation.CodeLocationCreationService; +import com.blackduck.integration.blackduck.codelocation.upload.UploadBatch; +import com.blackduck.integration.blackduck.codelocation.upload.UploadBatchOutput; +import com.blackduck.integration.blackduck.service.model.NotificationTaskRange; import com.synopsys.integration.exception.IntegrationException; import com.synopsys.integration.log.IntLogger; import com.synopsys.integration.util.NameVersion; diff --git a/src/main/java/com/synopsys/integration/blackduck/codelocation/signaturescanner/ScanBatch.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/ScanBatch.java similarity index 90% rename from src/main/java/com/synopsys/integration/blackduck/codelocation/signaturescanner/ScanBatch.java rename to src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/ScanBatch.java index 6b12664cc..d3924f8c0 100644 --- a/src/main/java/com/synopsys/integration/blackduck/codelocation/signaturescanner/ScanBatch.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/ScanBatch.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.codelocation.signaturescanner; +package com.blackduck.integration.blackduck.codelocation.signaturescanner; import java.io.File; import java.net.URL; @@ -15,14 +15,14 @@ import org.apache.commons.lang3.StringUtils; import org.jetbrains.annotations.Nullable; -import com.synopsys.integration.blackduck.codelocation.signaturescanner.command.BlackDuckOnlineProperties; -import com.synopsys.integration.blackduck.codelocation.signaturescanner.command.IndividualFileMatching; -import com.synopsys.integration.blackduck.codelocation.signaturescanner.command.ReducedPersistence; -import com.synopsys.integration.blackduck.codelocation.signaturescanner.command.ScanCommand; -import com.synopsys.integration.blackduck.codelocation.signaturescanner.command.ScanPathsUtility; -import com.synopsys.integration.blackduck.codelocation.signaturescanner.command.ScanTarget; -import com.synopsys.integration.blackduck.codelocation.signaturescanner.command.SnippetMatching; -import com.synopsys.integration.blackduck.exception.BlackDuckIntegrationException; +import com.blackduck.integration.blackduck.codelocation.signaturescanner.command.BlackDuckOnlineProperties; +import com.blackduck.integration.blackduck.codelocation.signaturescanner.command.IndividualFileMatching; +import com.blackduck.integration.blackduck.codelocation.signaturescanner.command.ReducedPersistence; +import com.blackduck.integration.blackduck.codelocation.signaturescanner.command.ScanCommand; +import com.blackduck.integration.blackduck.codelocation.signaturescanner.command.ScanPathsUtility; +import com.blackduck.integration.blackduck.codelocation.signaturescanner.command.ScanTarget; +import com.blackduck.integration.blackduck.codelocation.signaturescanner.command.SnippetMatching; +import com.blackduck.integration.blackduck.exception.BlackDuckIntegrationException; import com.synopsys.integration.builder.Buildable; import com.synopsys.integration.rest.HttpUrl; import com.synopsys.integration.rest.proxy.ProxyInfo; diff --git a/src/main/java/com/synopsys/integration/blackduck/codelocation/signaturescanner/ScanBatchBuilder.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/ScanBatchBuilder.java similarity index 94% rename from src/main/java/com/synopsys/integration/blackduck/codelocation/signaturescanner/ScanBatchBuilder.java rename to src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/ScanBatchBuilder.java index 3cc978d66..e891bdb36 100644 --- a/src/main/java/com/synopsys/integration/blackduck/codelocation/signaturescanner/ScanBatchBuilder.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/ScanBatchBuilder.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.codelocation.signaturescanner; +package com.blackduck.integration.blackduck.codelocation.signaturescanner; import java.io.File; import java.io.IOException; @@ -15,12 +15,12 @@ import org.apache.commons.lang3.StringUtils; import org.jetbrains.annotations.Nullable; -import com.synopsys.integration.blackduck.codelocation.signaturescanner.command.BlackDuckOnlineProperties; -import com.synopsys.integration.blackduck.codelocation.signaturescanner.command.IndividualFileMatching; -import com.synopsys.integration.blackduck.codelocation.signaturescanner.command.ReducedPersistence; -import com.synopsys.integration.blackduck.codelocation.signaturescanner.command.ScanTarget; -import com.synopsys.integration.blackduck.codelocation.signaturescanner.command.SnippetMatching; -import com.synopsys.integration.blackduck.configuration.BlackDuckServerConfig; +import com.blackduck.integration.blackduck.codelocation.signaturescanner.command.BlackDuckOnlineProperties; +import com.blackduck.integration.blackduck.codelocation.signaturescanner.command.IndividualFileMatching; +import com.blackduck.integration.blackduck.codelocation.signaturescanner.command.ReducedPersistence; +import com.blackduck.integration.blackduck.codelocation.signaturescanner.command.ScanTarget; +import com.blackduck.integration.blackduck.codelocation.signaturescanner.command.SnippetMatching; +import com.blackduck.integration.blackduck.configuration.BlackDuckServerConfig; import com.synopsys.integration.builder.BuilderStatus; import com.synopsys.integration.builder.IntegrationBuilder; import com.synopsys.integration.rest.HttpUrl; diff --git a/src/main/java/com/synopsys/integration/blackduck/codelocation/signaturescanner/ScanBatchOutput.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/ScanBatchOutput.java similarity index 63% rename from src/main/java/com/synopsys/integration/blackduck/codelocation/signaturescanner/ScanBatchOutput.java rename to src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/ScanBatchOutput.java index e59bb278e..2ee0d0cff 100644 --- a/src/main/java/com/synopsys/integration/blackduck/codelocation/signaturescanner/ScanBatchOutput.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/ScanBatchOutput.java @@ -5,12 +5,12 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.codelocation.signaturescanner; +package com.blackduck.integration.blackduck.codelocation.signaturescanner; import java.util.List; -import com.synopsys.integration.blackduck.codelocation.CodeLocationBatchOutput; -import com.synopsys.integration.blackduck.codelocation.signaturescanner.command.ScanCommandOutput; +import com.blackduck.integration.blackduck.codelocation.signaturescanner.command.ScanCommandOutput; +import com.blackduck.integration.blackduck.codelocation.CodeLocationBatchOutput; public class ScanBatchOutput extends CodeLocationBatchOutput { public ScanBatchOutput(final List scanCommandOutputs) { diff --git a/src/main/java/com/synopsys/integration/blackduck/codelocation/signaturescanner/ScanBatchRunner.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/ScanBatchRunner.java similarity index 87% rename from src/main/java/com/synopsys/integration/blackduck/codelocation/signaturescanner/ScanBatchRunner.java rename to src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/ScanBatchRunner.java index f1cd34055..1a3516d0d 100644 --- a/src/main/java/com/synopsys/integration/blackduck/codelocation/signaturescanner/ScanBatchRunner.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/ScanBatchRunner.java @@ -5,19 +5,19 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.codelocation.signaturescanner; +package com.blackduck.integration.blackduck.codelocation.signaturescanner; import java.io.File; import java.util.List; import java.util.concurrent.ExecutorService; -import com.synopsys.integration.blackduck.codelocation.signaturescanner.command.*; -import com.synopsys.integration.blackduck.codelocation.signaturescanner.command.ZipApiScannerInstaller; -import com.synopsys.integration.blackduck.exception.BlackDuckIntegrationException; -import com.synopsys.integration.blackduck.http.client.BlackDuckHttpClient; -import com.synopsys.integration.blackduck.http.client.SignatureScannerClient; -import com.synopsys.integration.blackduck.keystore.KeyStoreHelper; -import com.synopsys.integration.blackduck.service.dataservice.BlackDuckRegistrationService; +import com.blackduck.integration.blackduck.codelocation.signaturescanner.command.*; +import com.blackduck.integration.blackduck.codelocation.signaturescanner.command.ZipApiScannerInstaller; +import com.blackduck.integration.blackduck.exception.BlackDuckIntegrationException; +import com.blackduck.integration.blackduck.http.client.BlackDuckHttpClient; +import com.blackduck.integration.blackduck.http.client.SignatureScannerClient; +import com.blackduck.integration.blackduck.keystore.KeyStoreHelper; +import com.blackduck.integration.blackduck.service.dataservice.BlackDuckRegistrationService; import com.synopsys.integration.log.IntLogger; import com.synopsys.integration.util.CleanupZipExpander; import com.synopsys.integration.util.IntEnvironmentVariables; diff --git a/src/main/java/com/synopsys/integration/blackduck/codelocation/signaturescanner/SignatureScannerCodeLocationCreationRequest.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/SignatureScannerCodeLocationCreationRequest.java similarity index 76% rename from src/main/java/com/synopsys/integration/blackduck/codelocation/signaturescanner/SignatureScannerCodeLocationCreationRequest.java rename to src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/SignatureScannerCodeLocationCreationRequest.java index 63b298356..9de179762 100644 --- a/src/main/java/com/synopsys/integration/blackduck/codelocation/signaturescanner/SignatureScannerCodeLocationCreationRequest.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/SignatureScannerCodeLocationCreationRequest.java @@ -5,10 +5,10 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.codelocation.signaturescanner; +package com.blackduck.integration.blackduck.codelocation.signaturescanner; -import com.synopsys.integration.blackduck.codelocation.CodeLocationCreationRequest; -import com.synopsys.integration.blackduck.exception.BlackDuckIntegrationException; +import com.blackduck.integration.blackduck.codelocation.CodeLocationCreationRequest; +import com.blackduck.integration.blackduck.exception.BlackDuckIntegrationException; public class SignatureScannerCodeLocationCreationRequest extends CodeLocationCreationRequest { private final ScanBatchRunner scanBatchRunner; diff --git a/src/main/java/com/synopsys/integration/blackduck/codelocation/signaturescanner/SignatureScannerService.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/SignatureScannerService.java similarity index 81% rename from src/main/java/com/synopsys/integration/blackduck/codelocation/signaturescanner/SignatureScannerService.java rename to src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/SignatureScannerService.java index d778b4c4a..0361121d7 100644 --- a/src/main/java/com/synopsys/integration/blackduck/codelocation/signaturescanner/SignatureScannerService.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/SignatureScannerService.java @@ -5,17 +5,17 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.codelocation.signaturescanner; +package com.blackduck.integration.blackduck.codelocation.signaturescanner; import java.util.Set; +import com.blackduck.integration.blackduck.service.BlackDuckApiClient; +import com.blackduck.integration.blackduck.service.DataService; import com.synopsys.integration.blackduck.api.generated.discovery.ApiDiscovery; -import com.synopsys.integration.blackduck.codelocation.CodeLocationCreationData; -import com.synopsys.integration.blackduck.codelocation.CodeLocationCreationService; -import com.synopsys.integration.blackduck.codelocation.CodeLocationWaitResult; -import com.synopsys.integration.blackduck.service.BlackDuckApiClient; -import com.synopsys.integration.blackduck.service.DataService; -import com.synopsys.integration.blackduck.service.model.NotificationTaskRange; +import com.blackduck.integration.blackduck.codelocation.CodeLocationCreationData; +import com.blackduck.integration.blackduck.codelocation.CodeLocationCreationService; +import com.blackduck.integration.blackduck.codelocation.CodeLocationWaitResult; +import com.blackduck.integration.blackduck.service.model.NotificationTaskRange; import com.synopsys.integration.exception.IntegrationException; import com.synopsys.integration.log.IntLogger; import com.synopsys.integration.util.NameVersion; @@ -25,7 +25,7 @@ public class SignatureScannerService extends DataService { private final CodeLocationCreationService codeLocationCreationService; public SignatureScannerService(BlackDuckApiClient blackDuckApiClient, ApiDiscovery apiDiscovery, IntLogger logger, - ScanBatchRunner scanBatchRunner, CodeLocationCreationService codeLocationCreationService) { + ScanBatchRunner scanBatchRunner, CodeLocationCreationService codeLocationCreationService) { super(blackDuckApiClient, apiDiscovery, logger); this.scanBatchRunner = scanBatchRunner; this.codeLocationCreationService = codeLocationCreationService; diff --git a/src/main/java/com/synopsys/integration/blackduck/codelocation/signaturescanner/command/ApiScannerInstaller.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ApiScannerInstaller.java similarity index 86% rename from src/main/java/com/synopsys/integration/blackduck/codelocation/signaturescanner/command/ApiScannerInstaller.java rename to src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ApiScannerInstaller.java index 99c63279f..73249eaed 100644 --- a/src/main/java/com/synopsys/integration/blackduck/codelocation/signaturescanner/command/ApiScannerInstaller.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ApiScannerInstaller.java @@ -5,9 +5,9 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.codelocation.signaturescanner.command; +package com.blackduck.integration.blackduck.codelocation.signaturescanner.command; -import com.synopsys.integration.blackduck.exception.BlackDuckIntegrationException; +import com.blackduck.integration.blackduck.exception.BlackDuckIntegrationException; import com.synopsys.integration.exception.IntegrationException; import com.synopsys.integration.rest.HttpUrl; import org.apache.commons.compress.archivers.ArchiveException; diff --git a/src/main/java/com/synopsys/integration/blackduck/codelocation/signaturescanner/command/BlackDuckOnlineProperties.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/BlackDuckOnlineProperties.java similarity index 97% rename from src/main/java/com/synopsys/integration/blackduck/codelocation/signaturescanner/command/BlackDuckOnlineProperties.java rename to src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/BlackDuckOnlineProperties.java index c6c5b8c31..ba602461a 100644 --- a/src/main/java/com/synopsys/integration/blackduck/codelocation/signaturescanner/command/BlackDuckOnlineProperties.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/BlackDuckOnlineProperties.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.codelocation.signaturescanner.command; +package com.blackduck.integration.blackduck.codelocation.signaturescanner.command; import java.util.List; import java.util.function.Consumer; diff --git a/src/main/java/com/synopsys/integration/blackduck/codelocation/signaturescanner/command/ExistingScannerInstaller.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ExistingScannerInstaller.java similarity index 79% rename from src/main/java/com/synopsys/integration/blackduck/codelocation/signaturescanner/command/ExistingScannerInstaller.java rename to src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ExistingScannerInstaller.java index 198a1fcad..fa349fab9 100644 --- a/src/main/java/com/synopsys/integration/blackduck/codelocation/signaturescanner/command/ExistingScannerInstaller.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ExistingScannerInstaller.java @@ -5,11 +5,11 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.codelocation.signaturescanner.command; +package com.blackduck.integration.blackduck.codelocation.signaturescanner.command; import java.io.File; -import com.synopsys.integration.blackduck.exception.BlackDuckIntegrationException; +import com.blackduck.integration.blackduck.exception.BlackDuckIntegrationException; public class ExistingScannerInstaller implements ScannerInstaller { private final File existingInstallDirectory; diff --git a/src/main/java/com/synopsys/integration/blackduck/codelocation/signaturescanner/command/IndividualFileMatching.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/IndividualFileMatching.java similarity index 77% rename from src/main/java/com/synopsys/integration/blackduck/codelocation/signaturescanner/command/IndividualFileMatching.java rename to src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/IndividualFileMatching.java index 71bb493cd..1a840cd6d 100644 --- a/src/main/java/com/synopsys/integration/blackduck/codelocation/signaturescanner/command/IndividualFileMatching.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/IndividualFileMatching.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.codelocation.signaturescanner.command; +package com.blackduck.integration.blackduck.codelocation.signaturescanner.command; public enum IndividualFileMatching { SOURCE, diff --git a/src/main/java/com/synopsys/integration/blackduck/codelocation/signaturescanner/command/ReducedPersistence.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ReducedPersistence.java similarity index 77% rename from src/main/java/com/synopsys/integration/blackduck/codelocation/signaturescanner/command/ReducedPersistence.java rename to src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ReducedPersistence.java index 87aa3bdf9..9c79ee8fd 100644 --- a/src/main/java/com/synopsys/integration/blackduck/codelocation/signaturescanner/command/ReducedPersistence.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ReducedPersistence.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.codelocation.signaturescanner.command; +package com.blackduck.integration.blackduck.codelocation.signaturescanner.command; public enum ReducedPersistence { RETAIN_UNMATCHED, diff --git a/src/main/java/com/synopsys/integration/blackduck/codelocation/signaturescanner/command/ScanCommand.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ScanCommand.java similarity index 99% rename from src/main/java/com/synopsys/integration/blackduck/codelocation/signaturescanner/command/ScanCommand.java rename to src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ScanCommand.java index 2850ef0ec..66ced68e4 100644 --- a/src/main/java/com/synopsys/integration/blackduck/codelocation/signaturescanner/command/ScanCommand.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ScanCommand.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.codelocation.signaturescanner.command; +package com.blackduck.integration.blackduck.codelocation.signaturescanner.command; import java.io.File; import java.util.ArrayList; diff --git a/src/main/java/com/synopsys/integration/blackduck/codelocation/signaturescanner/command/ScanCommandArgumentParser.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ScanCommandArgumentParser.java similarity index 91% rename from src/main/java/com/synopsys/integration/blackduck/codelocation/signaturescanner/command/ScanCommandArgumentParser.java rename to src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ScanCommandArgumentParser.java index de8d07886..de11a9412 100644 --- a/src/main/java/com/synopsys/integration/blackduck/codelocation/signaturescanner/command/ScanCommandArgumentParser.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ScanCommandArgumentParser.java @@ -5,15 +5,15 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.codelocation.signaturescanner.command; +package com.blackduck.integration.blackduck.codelocation.signaturescanner.command; import java.util.LinkedList; import java.util.List; import org.apache.commons.lang3.StringUtils; -import com.synopsys.integration.blackduck.exception.MismatchedQuotesException; -import com.synopsys.integration.blackduck.exception.SignatureScannerInputException; +import com.blackduck.integration.blackduck.exception.MismatchedQuotesException; +import com.blackduck.integration.blackduck.exception.SignatureScannerInputException; public class ScanCommandArgumentParser { public List parse(String command) throws SignatureScannerInputException { diff --git a/src/main/java/com/synopsys/integration/blackduck/codelocation/signaturescanner/command/ScanCommandCallable.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ScanCommandCallable.java similarity index 97% rename from src/main/java/com/synopsys/integration/blackduck/codelocation/signaturescanner/command/ScanCommandCallable.java rename to src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ScanCommandCallable.java index b2d278e29..2dea37929 100644 --- a/src/main/java/com/synopsys/integration/blackduck/codelocation/signaturescanner/command/ScanCommandCallable.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ScanCommandCallable.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.codelocation.signaturescanner.command; +package com.blackduck.integration.blackduck.codelocation.signaturescanner.command; import java.io.File; import java.io.FileOutputStream; @@ -20,8 +20,8 @@ import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; -import com.synopsys.integration.blackduck.service.model.ScannerSplitStream; -import com.synopsys.integration.blackduck.service.model.StreamRedirectThread; +import com.blackduck.integration.blackduck.service.model.ScannerSplitStream; +import com.blackduck.integration.blackduck.service.model.StreamRedirectThread; import com.synopsys.integration.log.IntLogger; import com.synopsys.integration.util.IntEnvironmentVariables; import com.synopsys.integration.util.NameVersion; diff --git a/src/main/java/com/synopsys/integration/blackduck/codelocation/signaturescanner/command/ScanCommandOutput.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ScanCommandOutput.java similarity index 95% rename from src/main/java/com/synopsys/integration/blackduck/codelocation/signaturescanner/command/ScanCommandOutput.java rename to src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ScanCommandOutput.java index a1c110ea1..662adf7fc 100644 --- a/src/main/java/com/synopsys/integration/blackduck/codelocation/signaturescanner/command/ScanCommandOutput.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ScanCommandOutput.java @@ -5,15 +5,15 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.codelocation.signaturescanner.command; +package com.blackduck.integration.blackduck.codelocation.signaturescanner.command; import java.io.File; import java.util.Optional; import org.apache.commons.io.FilenameUtils; -import com.synopsys.integration.blackduck.codelocation.CodeLocationOutput; -import com.synopsys.integration.blackduck.codelocation.Result; +import com.blackduck.integration.blackduck.codelocation.CodeLocationOutput; +import com.blackduck.integration.blackduck.codelocation.Result; import com.synopsys.integration.log.IntLogger; import com.synopsys.integration.util.NameVersion; diff --git a/src/main/java/com/synopsys/integration/blackduck/codelocation/signaturescanner/command/ScanCommandQuoteParser.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ScanCommandQuoteParser.java similarity index 89% rename from src/main/java/com/synopsys/integration/blackduck/codelocation/signaturescanner/command/ScanCommandQuoteParser.java rename to src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ScanCommandQuoteParser.java index f29f46e5f..6b9a0da03 100644 --- a/src/main/java/com/synopsys/integration/blackduck/codelocation/signaturescanner/command/ScanCommandQuoteParser.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ScanCommandQuoteParser.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.codelocation.signaturescanner.command; +package com.blackduck.integration.blackduck.codelocation.signaturescanner.command; public class ScanCommandQuoteParser { diff --git a/src/main/java/com/synopsys/integration/blackduck/codelocation/signaturescanner/command/ScanCommandRunner.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ScanCommandRunner.java similarity index 94% rename from src/main/java/com/synopsys/integration/blackduck/codelocation/signaturescanner/command/ScanCommandRunner.java rename to src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ScanCommandRunner.java index 2c1dac323..65f400e58 100644 --- a/src/main/java/com/synopsys/integration/blackduck/codelocation/signaturescanner/command/ScanCommandRunner.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ScanCommandRunner.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.codelocation.signaturescanner.command; +package com.blackduck.integration.blackduck.codelocation.signaturescanner.command; import java.util.ArrayList; import java.util.List; @@ -13,7 +13,7 @@ import java.util.concurrent.Future; import java.util.stream.Collectors; -import com.synopsys.integration.blackduck.exception.ScanFailedException; +import com.blackduck.integration.blackduck.exception.ScanFailedException; import com.synopsys.integration.log.IntLogger; import com.synopsys.integration.util.IntEnvironmentVariables; diff --git a/src/main/java/com/synopsys/integration/blackduck/codelocation/signaturescanner/command/ScanPaths.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ScanPaths.java similarity index 95% rename from src/main/java/com/synopsys/integration/blackduck/codelocation/signaturescanner/command/ScanPaths.java rename to src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ScanPaths.java index bab0a43f5..cb95f2e41 100644 --- a/src/main/java/com/synopsys/integration/blackduck/codelocation/signaturescanner/command/ScanPaths.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ScanPaths.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.codelocation.signaturescanner.command; +package com.blackduck.integration.blackduck.codelocation.signaturescanner.command; import java.util.List; diff --git a/src/main/java/com/synopsys/integration/blackduck/codelocation/signaturescanner/command/ScanPathsUtility.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ScanPathsUtility.java similarity index 98% rename from src/main/java/com/synopsys/integration/blackduck/codelocation/signaturescanner/command/ScanPathsUtility.java rename to src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ScanPathsUtility.java index def19613e..19c5029dd 100644 --- a/src/main/java/com/synopsys/integration/blackduck/codelocation/signaturescanner/command/ScanPathsUtility.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ScanPathsUtility.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.codelocation.signaturescanner.command; +package com.blackduck.integration.blackduck.codelocation.signaturescanner.command; import java.io.File; import java.io.FileFilter; @@ -21,7 +21,7 @@ import org.apache.commons.lang3.StringUtils; import org.jetbrains.annotations.NotNull; -import com.synopsys.integration.blackduck.exception.BlackDuckIntegrationException; +import com.blackduck.integration.blackduck.exception.BlackDuckIntegrationException; import com.synopsys.integration.function.ThrowingSupplier; import com.synopsys.integration.log.IntLogger; import com.synopsys.integration.util.IntEnvironmentVariables; diff --git a/src/main/java/com/synopsys/integration/blackduck/codelocation/signaturescanner/command/ScanTarget.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ScanTarget.java similarity index 96% rename from src/main/java/com/synopsys/integration/blackduck/codelocation/signaturescanner/command/ScanTarget.java rename to src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ScanTarget.java index 097ab1c7e..fbf697a2f 100644 --- a/src/main/java/com/synopsys/integration/blackduck/codelocation/signaturescanner/command/ScanTarget.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ScanTarget.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.codelocation.signaturescanner.command; +package com.blackduck.integration.blackduck.codelocation.signaturescanner.command; import java.io.File; import java.util.Collections; @@ -15,7 +15,7 @@ import org.apache.commons.lang3.StringUtils; -import com.synopsys.integration.blackduck.exception.BlackDuckIntegrationException; +import com.blackduck.integration.blackduck.exception.BlackDuckIntegrationException; public class ScanTarget { private final String path; diff --git a/src/main/java/com/synopsys/integration/blackduck/codelocation/signaturescanner/command/ScannerInstaller.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ScannerInstaller.java similarity index 67% rename from src/main/java/com/synopsys/integration/blackduck/codelocation/signaturescanner/command/ScannerInstaller.java rename to src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ScannerInstaller.java index dd9e38794..a4a1d8802 100644 --- a/src/main/java/com/synopsys/integration/blackduck/codelocation/signaturescanner/command/ScannerInstaller.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ScannerInstaller.java @@ -5,11 +5,11 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.codelocation.signaturescanner.command; +package com.blackduck.integration.blackduck.codelocation.signaturescanner.command; import java.io.File; -import com.synopsys.integration.blackduck.exception.BlackDuckIntegrationException; +import com.blackduck.integration.blackduck.exception.BlackDuckIntegrationException; public interface ScannerInstaller { File installOrUpdateScanner() throws BlackDuckIntegrationException; diff --git a/src/main/java/com/synopsys/integration/blackduck/codelocation/signaturescanner/command/SnippetMatching.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/SnippetMatching.java similarity index 81% rename from src/main/java/com/synopsys/integration/blackduck/codelocation/signaturescanner/command/SnippetMatching.java rename to src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/SnippetMatching.java index ac5815139..439cb8b1d 100644 --- a/src/main/java/com/synopsys/integration/blackduck/codelocation/signaturescanner/command/SnippetMatching.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/SnippetMatching.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.codelocation.signaturescanner.command; +package com.blackduck.integration.blackduck.codelocation.signaturescanner.command; public enum SnippetMatching { SNIPPET_MATCHING, diff --git a/src/main/java/com/synopsys/integration/blackduck/codelocation/signaturescanner/command/ToolsApiScannerInstaller.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ToolsApiScannerInstaller.java similarity index 95% rename from src/main/java/com/synopsys/integration/blackduck/codelocation/signaturescanner/command/ToolsApiScannerInstaller.java rename to src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ToolsApiScannerInstaller.java index c91a48ef7..83e2bbe2f 100644 --- a/src/main/java/com/synopsys/integration/blackduck/codelocation/signaturescanner/command/ToolsApiScannerInstaller.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ToolsApiScannerInstaller.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.codelocation.signaturescanner.command; +package com.blackduck.integration.blackduck.codelocation.signaturescanner.command; import java.io.File; import java.io.IOException; @@ -13,17 +13,17 @@ import java.nio.charset.Charset; import java.security.cert.Certificate; +import com.blackduck.integration.blackduck.http.BlackDuckRequestBuilder; import com.synopsys.integration.blackduck.api.core.BlackDuckResponse; import com.synopsys.integration.blackduck.api.core.response.UrlSingleResponse; -import com.synopsys.integration.blackduck.http.BlackDuckRequestBuilder; -import com.synopsys.integration.blackduck.http.client.BlackDuckHttpClient; -import com.synopsys.integration.blackduck.keystore.KeyStoreHelper; -import com.synopsys.integration.blackduck.service.request.BlackDuckRequest; -import com.synopsys.integration.blackduck.version.BlackDuckVersion; +import com.blackduck.integration.blackduck.http.client.BlackDuckHttpClient; +import com.blackduck.integration.blackduck.keystore.KeyStoreHelper; +import com.blackduck.integration.blackduck.service.request.BlackDuckRequest; +import com.blackduck.integration.blackduck.version.BlackDuckVersion; import org.apache.commons.compress.archivers.ArchiveException; import org.apache.commons.io.FileUtils; -import com.synopsys.integration.blackduck.exception.BlackDuckIntegrationException; +import com.blackduck.integration.blackduck.exception.BlackDuckIntegrationException; import com.synopsys.integration.exception.IntegrationException; import com.synopsys.integration.log.IntLogger; import com.synopsys.integration.rest.HttpUrl; diff --git a/src/main/java/com/synopsys/integration/blackduck/codelocation/signaturescanner/command/ZipApiScannerInstaller.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ZipApiScannerInstaller.java similarity index 95% rename from src/main/java/com/synopsys/integration/blackduck/codelocation/signaturescanner/command/ZipApiScannerInstaller.java rename to src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ZipApiScannerInstaller.java index 06ad501fc..ea712cf0d 100644 --- a/src/main/java/com/synopsys/integration/blackduck/codelocation/signaturescanner/command/ZipApiScannerInstaller.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ZipApiScannerInstaller.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.codelocation.signaturescanner.command; +package com.blackduck.integration.blackduck.codelocation.signaturescanner.command; import java.io.File; import java.io.IOException; @@ -17,10 +17,10 @@ import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.StringUtils; -import com.synopsys.integration.blackduck.exception.BlackDuckIntegrationException; -import com.synopsys.integration.blackduck.http.client.SignatureScannerClient; -import com.synopsys.integration.blackduck.keystore.KeyStoreHelper; -import com.synopsys.integration.blackduck.service.dataservice.BlackDuckRegistrationService; +import com.blackduck.integration.blackduck.exception.BlackDuckIntegrationException; +import com.blackduck.integration.blackduck.http.client.SignatureScannerClient; +import com.blackduck.integration.blackduck.keystore.KeyStoreHelper; +import com.blackduck.integration.blackduck.service.dataservice.BlackDuckRegistrationService; import com.synopsys.integration.exception.IntegrationException; import com.synopsys.integration.log.IntLogger; import com.synopsys.integration.rest.HttpUrl; diff --git a/src/main/java/com/synopsys/integration/blackduck/codelocation/upload/UploadBatch.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/upload/UploadBatch.java similarity index 92% rename from src/main/java/com/synopsys/integration/blackduck/codelocation/upload/UploadBatch.java rename to src/main/java/com/blackduck/integration/blackduck/codelocation/upload/UploadBatch.java index ae3a8e0f0..2b34c4968 100644 --- a/src/main/java/com/synopsys/integration/blackduck/codelocation/upload/UploadBatch.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/upload/UploadBatch.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.codelocation.upload; +package com.blackduck.integration.blackduck.codelocation.upload; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/main/java/com/synopsys/integration/blackduck/codelocation/upload/UploadBatchOutput.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/upload/UploadBatchOutput.java similarity index 74% rename from src/main/java/com/synopsys/integration/blackduck/codelocation/upload/UploadBatchOutput.java rename to src/main/java/com/blackduck/integration/blackduck/codelocation/upload/UploadBatchOutput.java index 812e38424..2879ae8aa 100644 --- a/src/main/java/com/synopsys/integration/blackduck/codelocation/upload/UploadBatchOutput.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/upload/UploadBatchOutput.java @@ -5,11 +5,11 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.codelocation.upload; +package com.blackduck.integration.blackduck.codelocation.upload; import java.util.List; -import com.synopsys.integration.blackduck.codelocation.CodeLocationBatchOutput; +import com.blackduck.integration.blackduck.codelocation.CodeLocationBatchOutput; public class UploadBatchOutput extends CodeLocationBatchOutput { public UploadBatchOutput(final List outputs) { diff --git a/src/main/java/com/synopsys/integration/blackduck/codelocation/upload/UploadOutput.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/upload/UploadOutput.java similarity index 90% rename from src/main/java/com/synopsys/integration/blackduck/codelocation/upload/UploadOutput.java rename to src/main/java/com/blackduck/integration/blackduck/codelocation/upload/UploadOutput.java index 3c5701fe9..5f48d0b01 100644 --- a/src/main/java/com/synopsys/integration/blackduck/codelocation/upload/UploadOutput.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/upload/UploadOutput.java @@ -5,14 +5,14 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.codelocation.upload; +package com.blackduck.integration.blackduck.codelocation.upload; import java.util.Optional; import org.jetbrains.annotations.Nullable; -import com.synopsys.integration.blackduck.codelocation.CodeLocationOutput; -import com.synopsys.integration.blackduck.codelocation.Result; +import com.blackduck.integration.blackduck.codelocation.CodeLocationOutput; +import com.blackduck.integration.blackduck.codelocation.Result; import com.synopsys.integration.util.NameVersion; public class UploadOutput extends CodeLocationOutput { diff --git a/src/main/java/com/synopsys/integration/blackduck/codelocation/upload/UploadTarget.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/upload/UploadTarget.java similarity index 97% rename from src/main/java/com/synopsys/integration/blackduck/codelocation/upload/UploadTarget.java rename to src/main/java/com/blackduck/integration/blackduck/codelocation/upload/UploadTarget.java index d32139be9..ebd9b59d7 100644 --- a/src/main/java/com/synopsys/integration/blackduck/codelocation/upload/UploadTarget.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/upload/UploadTarget.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.codelocation.upload; +package com.blackduck.integration.blackduck.codelocation.upload; import java.io.File; import java.util.Optional; diff --git a/src/main/java/com/synopsys/integration/blackduck/configuration/BlackDuckConnectionResult.java b/src/main/java/com/blackduck/integration/blackduck/configuration/BlackDuckConnectionResult.java similarity index 90% rename from src/main/java/com/synopsys/integration/blackduck/configuration/BlackDuckConnectionResult.java rename to src/main/java/com/blackduck/integration/blackduck/configuration/BlackDuckConnectionResult.java index ebeb031f4..b431809cc 100644 --- a/src/main/java/com/synopsys/integration/blackduck/configuration/BlackDuckConnectionResult.java +++ b/src/main/java/com/blackduck/integration/blackduck/configuration/BlackDuckConnectionResult.java @@ -5,11 +5,11 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.configuration; +package com.blackduck.integration.blackduck.configuration; import java.util.Optional; -import com.synopsys.integration.blackduck.http.client.BlackDuckHttpClient; +import com.blackduck.integration.blackduck.http.client.BlackDuckHttpClient; import com.synopsys.integration.rest.client.ConnectionResult; public class BlackDuckConnectionResult extends ConnectionResult { diff --git a/src/main/java/com/synopsys/integration/blackduck/configuration/BlackDuckServerConfig.java b/src/main/java/com/blackduck/integration/blackduck/configuration/BlackDuckServerConfig.java similarity index 94% rename from src/main/java/com/synopsys/integration/blackduck/configuration/BlackDuckServerConfig.java rename to src/main/java/com/blackduck/integration/blackduck/configuration/BlackDuckServerConfig.java index 89b47988e..9362cc496 100644 --- a/src/main/java/com/synopsys/integration/blackduck/configuration/BlackDuckServerConfig.java +++ b/src/main/java/com/blackduck/integration/blackduck/configuration/BlackDuckServerConfig.java @@ -5,23 +5,23 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.configuration; +package com.blackduck.integration.blackduck.configuration; -import static com.synopsys.integration.blackduck.configuration.BlackDuckServerConfigKeys.KEYS; +import static com.blackduck.integration.blackduck.configuration.BlackDuckServerConfigKeys.KEYS; import java.util.Optional; import java.util.concurrent.ExecutorService; +import com.blackduck.integration.blackduck.http.client.BlackDuckHttpClient; +import com.blackduck.integration.blackduck.http.client.CookieHeaderParser; +import com.blackduck.integration.blackduck.http.client.cache.CachingHttpClient; import org.apache.commons.lang3.StringUtils; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.gson.Gson; -import com.synopsys.integration.blackduck.http.client.ApiTokenBlackDuckHttpClient; -import com.synopsys.integration.blackduck.http.client.BlackDuckHttpClient; -import com.synopsys.integration.blackduck.http.client.CookieHeaderParser; -import com.synopsys.integration.blackduck.http.client.CredentialsBlackDuckHttpClient; -import com.synopsys.integration.blackduck.http.client.cache.CachingHttpClient; -import com.synopsys.integration.blackduck.service.BlackDuckServicesFactory; +import com.blackduck.integration.blackduck.http.client.ApiTokenBlackDuckHttpClient; +import com.blackduck.integration.blackduck.http.client.CredentialsBlackDuckHttpClient; +import com.blackduck.integration.blackduck.service.BlackDuckServicesFactory; import com.synopsys.integration.builder.Buildable; import com.synopsys.integration.log.IntLogger; import com.synopsys.integration.log.SilentIntLogger; diff --git a/src/main/java/com/synopsys/integration/blackduck/configuration/BlackDuckServerConfigBuilder.java b/src/main/java/com/blackduck/integration/blackduck/configuration/BlackDuckServerConfigBuilder.java similarity index 98% rename from src/main/java/com/synopsys/integration/blackduck/configuration/BlackDuckServerConfigBuilder.java rename to src/main/java/com/blackduck/integration/blackduck/configuration/BlackDuckServerConfigBuilder.java index fc8f794e0..13cb1fff4 100644 --- a/src/main/java/com/synopsys/integration/blackduck/configuration/BlackDuckServerConfigBuilder.java +++ b/src/main/java/com/blackduck/integration/blackduck/configuration/BlackDuckServerConfigBuilder.java @@ -5,22 +5,22 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.configuration; +package com.blackduck.integration.blackduck.configuration; -import static com.synopsys.integration.blackduck.configuration.BlackDuckServerConfigKeys.KEYS; +import static com.blackduck.integration.blackduck.configuration.BlackDuckServerConfigKeys.KEYS; import java.util.Map; import java.util.Optional; import java.util.Set; import java.util.concurrent.ExecutorService; +import com.blackduck.integration.blackduck.http.client.CookieHeaderParser; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.math.NumberUtils; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.gson.Gson; -import com.synopsys.integration.blackduck.http.client.CookieHeaderParser; -import com.synopsys.integration.blackduck.service.BlackDuckServicesFactory; +import com.blackduck.integration.blackduck.service.BlackDuckServicesFactory; import com.synopsys.integration.builder.BuilderProperties; import com.synopsys.integration.builder.BuilderPropertyKey; import com.synopsys.integration.builder.BuilderStatus; diff --git a/src/main/java/com/blackduck/integration/blackduck/configuration/BlackDuckServerConfigKeys.java b/src/main/java/com/blackduck/integration/blackduck/configuration/BlackDuckServerConfigKeys.java new file mode 100644 index 000000000..41f7663d0 --- /dev/null +++ b/src/main/java/com/blackduck/integration/blackduck/configuration/BlackDuckServerConfigKeys.java @@ -0,0 +1,49 @@ +/* + * blackduck-common + * + * Copyright (c) 2024 Synopsys, Inc. + * + * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + */ +package com.blackduck.integration.blackduck.configuration; + +import java.util.HashSet; +import java.util.Set; + +import com.synopsys.integration.builder.BuilderPropertyKey; + +public class BlackDuckServerConfigKeys { + public static final BlackDuckServerConfigKeys KEYS = new BlackDuckServerConfigKeys(); + + public final Set common = new HashSet<>(); + public final Set apiToken = new HashSet<>(); + public final Set credentials = new HashSet<>(); + public final Set all = new HashSet<>(); + + public BlackDuckServerConfigKeys() { + common.add(BlackDuckServerConfigBuilder.URL_KEY); + common.add(BlackDuckServerConfigBuilder.SOLUTION_NAME_KEY); + common.add(BlackDuckServerConfigBuilder.SOLUTION_VERSION_KEY); + common.add(BlackDuckServerConfigBuilder.TIMEOUT_KEY); + common.add(BlackDuckServerConfigBuilder.PROXY_HOST_KEY); + common.add(BlackDuckServerConfigBuilder.PROXY_PORT_KEY); + common.add(BlackDuckServerConfigBuilder.PROXY_USERNAME_KEY); + common.add(BlackDuckServerConfigBuilder.PROXY_PASSWORD_KEY); + common.add(BlackDuckServerConfigBuilder.PROXY_NTLM_DOMAIN_KEY); + common.add(BlackDuckServerConfigBuilder.PROXY_NTLM_WORKSTATION_KEY); + common.add(BlackDuckServerConfigBuilder.TRUST_CERT_KEY); + + apiToken.addAll(common); + apiToken.add(BlackDuckServerConfigBuilder.API_TOKEN_KEY); + + credentials.addAll(common); + credentials.add(BlackDuckServerConfigBuilder.USERNAME_KEY); + credentials.add(BlackDuckServerConfigBuilder.PASSWORD_KEY); + + all.addAll(common); + all.add(BlackDuckServerConfigBuilder.API_TOKEN_KEY); + all.add(BlackDuckServerConfigBuilder.USERNAME_KEY); + all.add(BlackDuckServerConfigBuilder.PASSWORD_KEY); + } + +} diff --git a/src/main/java/com/synopsys/integration/blackduck/exception/BlackDuckApiException.java b/src/main/java/com/blackduck/integration/blackduck/exception/BlackDuckApiException.java similarity index 95% rename from src/main/java/com/synopsys/integration/blackduck/exception/BlackDuckApiException.java rename to src/main/java/com/blackduck/integration/blackduck/exception/BlackDuckApiException.java index 7e9542caf..8437fae7c 100644 --- a/src/main/java/com/synopsys/integration/blackduck/exception/BlackDuckApiException.java +++ b/src/main/java/com/blackduck/integration/blackduck/exception/BlackDuckApiException.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.exception; +package com.blackduck.integration.blackduck.exception; import com.synopsys.integration.exception.IntegrationException; import com.synopsys.integration.rest.exception.IntegrationRestException; diff --git a/src/main/java/com/synopsys/integration/blackduck/exception/BlackDuckIntegrationException.java b/src/main/java/com/blackduck/integration/blackduck/exception/BlackDuckIntegrationException.java similarity index 94% rename from src/main/java/com/synopsys/integration/blackduck/exception/BlackDuckIntegrationException.java rename to src/main/java/com/blackduck/integration/blackduck/exception/BlackDuckIntegrationException.java index 601b5762e..8f72cf334 100644 --- a/src/main/java/com/synopsys/integration/blackduck/exception/BlackDuckIntegrationException.java +++ b/src/main/java/com/blackduck/integration/blackduck/exception/BlackDuckIntegrationException.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.exception; +package com.blackduck.integration.blackduck.exception; import com.synopsys.integration.exception.IntegrationException; diff --git a/src/main/java/com/synopsys/integration/blackduck/exception/BlackDuckItemTransformException.java b/src/main/java/com/blackduck/integration/blackduck/exception/BlackDuckItemTransformException.java similarity index 94% rename from src/main/java/com/synopsys/integration/blackduck/exception/BlackDuckItemTransformException.java rename to src/main/java/com/blackduck/integration/blackduck/exception/BlackDuckItemTransformException.java index 05d86fbb7..58b014cbf 100644 --- a/src/main/java/com/synopsys/integration/blackduck/exception/BlackDuckItemTransformException.java +++ b/src/main/java/com/blackduck/integration/blackduck/exception/BlackDuckItemTransformException.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.exception; +package com.blackduck.integration.blackduck.exception; public class BlackDuckItemTransformException extends BlackDuckIntegrationException { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/synopsys/integration/blackduck/exception/BlackDuckTimeoutExceededException.java b/src/main/java/com/blackduck/integration/blackduck/exception/BlackDuckTimeoutExceededException.java similarity index 93% rename from src/main/java/com/synopsys/integration/blackduck/exception/BlackDuckTimeoutExceededException.java rename to src/main/java/com/blackduck/integration/blackduck/exception/BlackDuckTimeoutExceededException.java index 87a776092..3023cb480 100644 --- a/src/main/java/com/synopsys/integration/blackduck/exception/BlackDuckTimeoutExceededException.java +++ b/src/main/java/com/blackduck/integration/blackduck/exception/BlackDuckTimeoutExceededException.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.exception; +package com.blackduck.integration.blackduck.exception; public class BlackDuckTimeoutExceededException extends BlackDuckIntegrationException { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/synopsys/integration/blackduck/exception/FailureConditionException.java b/src/main/java/com/blackduck/integration/blackduck/exception/FailureConditionException.java similarity index 94% rename from src/main/java/com/synopsys/integration/blackduck/exception/FailureConditionException.java rename to src/main/java/com/blackduck/integration/blackduck/exception/FailureConditionException.java index 37b54ebc1..950ec4862 100644 --- a/src/main/java/com/synopsys/integration/blackduck/exception/FailureConditionException.java +++ b/src/main/java/com/blackduck/integration/blackduck/exception/FailureConditionException.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.exception; +package com.blackduck.integration.blackduck.exception; public class FailureConditionException extends BlackDuckIntegrationException { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/synopsys/integration/blackduck/exception/MismatchedQuotesException.java b/src/main/java/com/blackduck/integration/blackduck/exception/MismatchedQuotesException.java similarity index 94% rename from src/main/java/com/synopsys/integration/blackduck/exception/MismatchedQuotesException.java rename to src/main/java/com/blackduck/integration/blackduck/exception/MismatchedQuotesException.java index 526ca1ce4..7d7571714 100644 --- a/src/main/java/com/synopsys/integration/blackduck/exception/MismatchedQuotesException.java +++ b/src/main/java/com/blackduck/integration/blackduck/exception/MismatchedQuotesException.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.exception; +package com.blackduck.integration.blackduck.exception; public class MismatchedQuotesException extends SignatureScannerInputException { public MismatchedQuotesException() { diff --git a/src/main/java/com/synopsys/integration/blackduck/exception/ScanFailedException.java b/src/main/java/com/blackduck/integration/blackduck/exception/ScanFailedException.java similarity index 94% rename from src/main/java/com/synopsys/integration/blackduck/exception/ScanFailedException.java rename to src/main/java/com/blackduck/integration/blackduck/exception/ScanFailedException.java index dfbd47fd3..4f163474b 100644 --- a/src/main/java/com/synopsys/integration/blackduck/exception/ScanFailedException.java +++ b/src/main/java/com/blackduck/integration/blackduck/exception/ScanFailedException.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.exception; +package com.blackduck.integration.blackduck.exception; public class ScanFailedException extends BlackDuckIntegrationException { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/synopsys/integration/blackduck/exception/SignatureScannerInputException.java b/src/main/java/com/blackduck/integration/blackduck/exception/SignatureScannerInputException.java similarity index 94% rename from src/main/java/com/synopsys/integration/blackduck/exception/SignatureScannerInputException.java rename to src/main/java/com/blackduck/integration/blackduck/exception/SignatureScannerInputException.java index dcbdaa127..9119f419b 100644 --- a/src/main/java/com/synopsys/integration/blackduck/exception/SignatureScannerInputException.java +++ b/src/main/java/com/blackduck/integration/blackduck/exception/SignatureScannerInputException.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.exception; +package com.blackduck.integration.blackduck.exception; import com.synopsys.integration.exception.IntegrationException; diff --git a/src/main/java/com/synopsys/integration/blackduck/http/BlackDuckMediaTypes.java b/src/main/java/com/blackduck/integration/blackduck/http/BlackDuckMediaTypes.java similarity index 87% rename from src/main/java/com/synopsys/integration/blackduck/http/BlackDuckMediaTypes.java rename to src/main/java/com/blackduck/integration/blackduck/http/BlackDuckMediaTypes.java index 81a67dbdc..6b467d2ed 100644 --- a/src/main/java/com/synopsys/integration/blackduck/http/BlackDuckMediaTypes.java +++ b/src/main/java/com/blackduck/integration/blackduck/http/BlackDuckMediaTypes.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.http; +package com.blackduck.integration.blackduck.http; public class BlackDuckMediaTypes { public final static String VULNERABILITY_REQUEST_SERVICE_V1 = "application/vnd.blackducksoftware.list-1+json"; diff --git a/src/main/java/com/synopsys/integration/blackduck/http/BlackDuckPageDefinition.java b/src/main/java/com/blackduck/integration/blackduck/http/BlackDuckPageDefinition.java similarity index 91% rename from src/main/java/com/synopsys/integration/blackduck/http/BlackDuckPageDefinition.java rename to src/main/java/com/blackduck/integration/blackduck/http/BlackDuckPageDefinition.java index 52b797dcd..db244c1a2 100644 --- a/src/main/java/com/synopsys/integration/blackduck/http/BlackDuckPageDefinition.java +++ b/src/main/java/com/blackduck/integration/blackduck/http/BlackDuckPageDefinition.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.http; +package com.blackduck.integration.blackduck.http; public class BlackDuckPageDefinition { private final int limit; diff --git a/src/main/java/com/synopsys/integration/blackduck/http/BlackDuckPageResponse.java b/src/main/java/com/blackduck/integration/blackduck/http/BlackDuckPageResponse.java similarity index 95% rename from src/main/java/com/synopsys/integration/blackduck/http/BlackDuckPageResponse.java rename to src/main/java/com/blackduck/integration/blackduck/http/BlackDuckPageResponse.java index 70c966b85..3ae40665c 100644 --- a/src/main/java/com/synopsys/integration/blackduck/http/BlackDuckPageResponse.java +++ b/src/main/java/com/blackduck/integration/blackduck/http/BlackDuckPageResponse.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.http; +package com.blackduck.integration.blackduck.http; import java.util.List; diff --git a/src/main/java/com/synopsys/integration/blackduck/http/BlackDuckQuery.java b/src/main/java/com/blackduck/integration/blackduck/http/BlackDuckQuery.java similarity index 91% rename from src/main/java/com/synopsys/integration/blackduck/http/BlackDuckQuery.java rename to src/main/java/com/blackduck/integration/blackduck/http/BlackDuckQuery.java index 0547bc599..095616cae 100644 --- a/src/main/java/com/synopsys/integration/blackduck/http/BlackDuckQuery.java +++ b/src/main/java/com/blackduck/integration/blackduck/http/BlackDuckQuery.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.http; +package com.blackduck.integration.blackduck.http; public class BlackDuckQuery { private final String q; diff --git a/src/main/java/com/synopsys/integration/blackduck/http/BlackDuckRequestBuilder.java b/src/main/java/com/blackduck/integration/blackduck/http/BlackDuckRequestBuilder.java similarity index 94% rename from src/main/java/com/synopsys/integration/blackduck/http/BlackDuckRequestBuilder.java rename to src/main/java/com/blackduck/integration/blackduck/http/BlackDuckRequestBuilder.java index 57d5888f5..eb9377268 100644 --- a/src/main/java/com/synopsys/integration/blackduck/http/BlackDuckRequestBuilder.java +++ b/src/main/java/com/blackduck/integration/blackduck/http/BlackDuckRequestBuilder.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.http; +package com.blackduck.integration.blackduck.http; import java.io.File; import java.nio.charset.Charset; @@ -21,12 +21,12 @@ import com.synopsys.integration.blackduck.api.core.response.UrlSingleResponse; import com.synopsys.integration.blackduck.api.manual.response.BlackDuckResponseResponse; import com.synopsys.integration.blackduck.api.manual.response.BlackDuckStringResponse; -import com.synopsys.integration.blackduck.service.request.BlackDuckMultipleRequest; -import com.synopsys.integration.blackduck.service.request.BlackDuckRequest; -import com.synopsys.integration.blackduck.service.request.BlackDuckRequestBuilderEditor; -import com.synopsys.integration.blackduck.service.request.BlackDuckResponseRequest; -import com.synopsys.integration.blackduck.service.request.BlackDuckSingleRequest; -import com.synopsys.integration.blackduck.service.request.BlackDuckStringRequest; +import com.blackduck.integration.blackduck.service.request.BlackDuckMultipleRequest; +import com.blackduck.integration.blackduck.service.request.BlackDuckRequest; +import com.blackduck.integration.blackduck.service.request.BlackDuckRequestBuilderEditor; +import com.blackduck.integration.blackduck.service.request.BlackDuckResponseRequest; +import com.blackduck.integration.blackduck.service.request.BlackDuckSingleRequest; +import com.blackduck.integration.blackduck.service.request.BlackDuckStringRequest; import com.synopsys.integration.rest.HttpMethod; import com.synopsys.integration.rest.HttpUrl; import com.synopsys.integration.rest.body.BodyContent; diff --git a/src/main/java/com/synopsys/integration/blackduck/http/BlackDuckRequestFilter.java b/src/main/java/com/blackduck/integration/blackduck/http/BlackDuckRequestFilter.java similarity index 97% rename from src/main/java/com/synopsys/integration/blackduck/http/BlackDuckRequestFilter.java rename to src/main/java/com/blackduck/integration/blackduck/http/BlackDuckRequestFilter.java index 0ea1f256d..7037e5cc0 100644 --- a/src/main/java/com/synopsys/integration/blackduck/http/BlackDuckRequestFilter.java +++ b/src/main/java/com/blackduck/integration/blackduck/http/BlackDuckRequestFilter.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.http; +package com.blackduck.integration.blackduck.http; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/main/java/com/synopsys/integration/blackduck/http/BlackDuckUrl.java b/src/main/java/com/blackduck/integration/blackduck/http/BlackDuckUrl.java similarity index 92% rename from src/main/java/com/synopsys/integration/blackduck/http/BlackDuckUrl.java rename to src/main/java/com/blackduck/integration/blackduck/http/BlackDuckUrl.java index 001f14066..a390a2418 100644 --- a/src/main/java/com/synopsys/integration/blackduck/http/BlackDuckUrl.java +++ b/src/main/java/com/blackduck/integration/blackduck/http/BlackDuckUrl.java @@ -5,12 +5,10 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.http; +package com.blackduck.integration.blackduck.http; import java.util.List; -import org.apache.commons.lang3.StringUtils; - import com.synopsys.integration.rest.HttpUrl; /** diff --git a/src/main/java/com/synopsys/integration/blackduck/http/BlackDuckUrlSearchTerm.java b/src/main/java/com/blackduck/integration/blackduck/http/BlackDuckUrlSearchTerm.java similarity index 94% rename from src/main/java/com/synopsys/integration/blackduck/http/BlackDuckUrlSearchTerm.java rename to src/main/java/com/blackduck/integration/blackduck/http/BlackDuckUrlSearchTerm.java index 26d8decf3..57f38f5ca 100644 --- a/src/main/java/com/synopsys/integration/blackduck/http/BlackDuckUrlSearchTerm.java +++ b/src/main/java/com/blackduck/integration/blackduck/http/BlackDuckUrlSearchTerm.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.http; +package com.blackduck.integration.blackduck.http; public class BlackDuckUrlSearchTerm { public static final BlackDuckUrlSearchTerm PROJECTS = new BlackDuckUrlSearchTerm("projects"); diff --git a/src/main/java/com/synopsys/integration/blackduck/http/client/ApiTokenBlackDuckHttpClient.java b/src/main/java/com/blackduck/integration/blackduck/http/client/ApiTokenBlackDuckHttpClient.java similarity index 97% rename from src/main/java/com/synopsys/integration/blackduck/http/client/ApiTokenBlackDuckHttpClient.java rename to src/main/java/com/blackduck/integration/blackduck/http/client/ApiTokenBlackDuckHttpClient.java index de99d5ce6..32bf7c3b3 100644 --- a/src/main/java/com/synopsys/integration/blackduck/http/client/ApiTokenBlackDuckHttpClient.java +++ b/src/main/java/com/blackduck/integration/blackduck/http/client/ApiTokenBlackDuckHttpClient.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.http.client; +package com.blackduck.integration.blackduck.http.client; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/com/synopsys/integration/blackduck/http/client/BlackDuckCertificateInterceptor.java b/src/main/java/com/blackduck/integration/blackduck/http/client/BlackDuckCertificateInterceptor.java similarity index 95% rename from src/main/java/com/synopsys/integration/blackduck/http/client/BlackDuckCertificateInterceptor.java rename to src/main/java/com/blackduck/integration/blackduck/http/client/BlackDuckCertificateInterceptor.java index 5abfbb2bd..4c22fc46d 100644 --- a/src/main/java/com/synopsys/integration/blackduck/http/client/BlackDuckCertificateInterceptor.java +++ b/src/main/java/com/blackduck/integration/blackduck/http/client/BlackDuckCertificateInterceptor.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.http.client; +package com.blackduck.integration.blackduck.http.client; import java.io.IOException; import java.security.cert.Certificate; diff --git a/src/main/java/com/synopsys/integration/blackduck/http/client/BlackDuckHttpClient.java b/src/main/java/com/blackduck/integration/blackduck/http/client/BlackDuckHttpClient.java similarity index 92% rename from src/main/java/com/synopsys/integration/blackduck/http/client/BlackDuckHttpClient.java rename to src/main/java/com/blackduck/integration/blackduck/http/client/BlackDuckHttpClient.java index f5ff7a2c8..94dacb392 100644 --- a/src/main/java/com/synopsys/integration/blackduck/http/client/BlackDuckHttpClient.java +++ b/src/main/java/com/blackduck/integration/blackduck/http/client/BlackDuckHttpClient.java @@ -5,17 +5,17 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.http.client; +package com.blackduck.integration.blackduck.http.client; import java.util.Optional; +import com.blackduck.integration.blackduck.service.request.BlackDuckRequest; import org.apache.http.client.methods.HttpUriRequest; import org.apache.http.impl.client.HttpClientBuilder; import com.google.gson.Gson; import com.synopsys.integration.blackduck.api.core.BlackDuckResponse; import com.synopsys.integration.blackduck.api.core.response.UrlResponse; -import com.synopsys.integration.blackduck.service.request.BlackDuckRequest; import com.synopsys.integration.exception.IntegrationException; import com.synopsys.integration.log.IntLogger; import com.synopsys.integration.rest.HttpUrl; diff --git a/src/main/java/com/synopsys/integration/blackduck/http/client/BlackDuckRedirectStrategy.java b/src/main/java/com/blackduck/integration/blackduck/http/client/BlackDuckRedirectStrategy.java similarity index 96% rename from src/main/java/com/synopsys/integration/blackduck/http/client/BlackDuckRedirectStrategy.java rename to src/main/java/com/blackduck/integration/blackduck/http/client/BlackDuckRedirectStrategy.java index 79c7cb59f..60a7cd46f 100644 --- a/src/main/java/com/synopsys/integration/blackduck/http/client/BlackDuckRedirectStrategy.java +++ b/src/main/java/com/blackduck/integration/blackduck/http/client/BlackDuckRedirectStrategy.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.http.client; +package com.blackduck.integration.blackduck.http.client; import java.net.URI; diff --git a/src/main/java/com/synopsys/integration/blackduck/http/client/CookieHeaderParser.java b/src/main/java/com/blackduck/integration/blackduck/http/client/CookieHeaderParser.java similarity index 96% rename from src/main/java/com/synopsys/integration/blackduck/http/client/CookieHeaderParser.java rename to src/main/java/com/blackduck/integration/blackduck/http/client/CookieHeaderParser.java index 6bc04c5db..5eeb73b89 100644 --- a/src/main/java/com/synopsys/integration/blackduck/http/client/CookieHeaderParser.java +++ b/src/main/java/com/blackduck/integration/blackduck/http/client/CookieHeaderParser.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.http.client; +package com.blackduck.integration.blackduck.http.client; import java.util.Arrays; import java.util.Optional; diff --git a/src/main/java/com/synopsys/integration/blackduck/http/client/CredentialsBlackDuckHttpClient.java b/src/main/java/com/blackduck/integration/blackduck/http/client/CredentialsBlackDuckHttpClient.java similarity index 98% rename from src/main/java/com/synopsys/integration/blackduck/http/client/CredentialsBlackDuckHttpClient.java rename to src/main/java/com/blackduck/integration/blackduck/http/client/CredentialsBlackDuckHttpClient.java index a17137e97..dd504fe2d 100644 --- a/src/main/java/com/synopsys/integration/blackduck/http/client/CredentialsBlackDuckHttpClient.java +++ b/src/main/java/com/blackduck/integration/blackduck/http/client/CredentialsBlackDuckHttpClient.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.http.client; +package com.blackduck.integration.blackduck.http.client; import java.nio.charset.StandardCharsets; import java.util.ArrayList; diff --git a/src/main/java/com/synopsys/integration/blackduck/http/client/DefaultBlackDuckHttpClient.java b/src/main/java/com/blackduck/integration/blackduck/http/client/DefaultBlackDuckHttpClient.java similarity index 93% rename from src/main/java/com/synopsys/integration/blackduck/http/client/DefaultBlackDuckHttpClient.java rename to src/main/java/com/blackduck/integration/blackduck/http/client/DefaultBlackDuckHttpClient.java index 170069a97..dc796582b 100644 --- a/src/main/java/com/synopsys/integration/blackduck/http/client/DefaultBlackDuckHttpClient.java +++ b/src/main/java/com/blackduck/integration/blackduck/http/client/DefaultBlackDuckHttpClient.java @@ -5,10 +5,11 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.http.client; +package com.blackduck.integration.blackduck.http.client; import java.util.Optional; +import com.blackduck.integration.blackduck.service.request.BlackDuckRequest; import org.apache.http.HttpHeaders; import org.apache.http.client.config.RequestConfig; import org.apache.http.client.methods.HttpUriRequest; @@ -17,11 +18,10 @@ import com.google.gson.Gson; import com.synopsys.integration.blackduck.api.core.BlackDuckResponse; import com.synopsys.integration.blackduck.api.core.response.UrlResponse; -import com.synopsys.integration.blackduck.exception.BlackDuckApiException; -import com.synopsys.integration.blackduck.service.request.BlackDuckRequest; -import com.synopsys.integration.blackduck.useragent.BlackDuckCommon; -import com.synopsys.integration.blackduck.useragent.UserAgentBuilder; -import com.synopsys.integration.blackduck.useragent.UserAgentItem; +import com.blackduck.integration.blackduck.exception.BlackDuckApiException; +import com.blackduck.integration.blackduck.useragent.BlackDuckCommon; +import com.blackduck.integration.blackduck.useragent.UserAgentBuilder; +import com.blackduck.integration.blackduck.useragent.UserAgentItem; import com.synopsys.integration.exception.IntegrationException; import com.synopsys.integration.log.IntLogger; import com.synopsys.integration.rest.HttpUrl; diff --git a/src/main/java/com/synopsys/integration/blackduck/http/client/SignatureScannerClient.java b/src/main/java/com/blackduck/integration/blackduck/http/client/SignatureScannerClient.java similarity index 98% rename from src/main/java/com/synopsys/integration/blackduck/http/client/SignatureScannerClient.java rename to src/main/java/com/blackduck/integration/blackduck/http/client/SignatureScannerClient.java index 0dfa88268..8b06f758c 100644 --- a/src/main/java/com/synopsys/integration/blackduck/http/client/SignatureScannerClient.java +++ b/src/main/java/com/blackduck/integration/blackduck/http/client/SignatureScannerClient.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.http.client; +package com.blackduck.integration.blackduck.http.client; import java.io.IOException; import java.security.cert.Certificate; diff --git a/src/main/java/com/synopsys/integration/blackduck/http/client/cache/CacheableResponse.java b/src/main/java/com/blackduck/integration/blackduck/http/client/cache/CacheableResponse.java similarity index 98% rename from src/main/java/com/synopsys/integration/blackduck/http/client/cache/CacheableResponse.java rename to src/main/java/com/blackduck/integration/blackduck/http/client/cache/CacheableResponse.java index 3d43983c9..a66e01202 100644 --- a/src/main/java/com/synopsys/integration/blackduck/http/client/cache/CacheableResponse.java +++ b/src/main/java/com/blackduck/integration/blackduck/http/client/cache/CacheableResponse.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.http.client.cache; +package com.blackduck.integration.blackduck.http.client.cache; import java.io.IOException; import java.io.InputStream; diff --git a/src/main/java/com/synopsys/integration/blackduck/http/client/cache/CachingHttpClient.java b/src/main/java/com/blackduck/integration/blackduck/http/client/cache/CachingHttpClient.java similarity index 94% rename from src/main/java/com/synopsys/integration/blackduck/http/client/cache/CachingHttpClient.java rename to src/main/java/com/blackduck/integration/blackduck/http/client/cache/CachingHttpClient.java index b5584eb9c..efbd1225e 100644 --- a/src/main/java/com/synopsys/integration/blackduck/http/client/cache/CachingHttpClient.java +++ b/src/main/java/com/blackduck/integration/blackduck/http/client/cache/CachingHttpClient.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.http.client.cache; +package com.blackduck.integration.blackduck.http.client.cache; import java.util.Collections; import java.util.Map; @@ -18,8 +18,8 @@ import com.google.gson.Gson; import com.synopsys.integration.blackduck.api.core.BlackDuckResponse; import com.synopsys.integration.blackduck.api.core.response.UrlResponse; -import com.synopsys.integration.blackduck.http.client.BlackDuckHttpClient; -import com.synopsys.integration.blackduck.service.request.BlackDuckRequest; +import com.blackduck.integration.blackduck.http.client.BlackDuckHttpClient; +import com.blackduck.integration.blackduck.service.request.BlackDuckRequest; import com.synopsys.integration.exception.IntegrationException; import com.synopsys.integration.log.IntLogger; import com.synopsys.integration.rest.HttpMethod; diff --git a/src/main/java/com/synopsys/integration/blackduck/http/transform/BlackDuckJsonTransformer.java b/src/main/java/com/blackduck/integration/blackduck/http/transform/BlackDuckJsonTransformer.java similarity index 95% rename from src/main/java/com/synopsys/integration/blackduck/http/transform/BlackDuckJsonTransformer.java rename to src/main/java/com/blackduck/integration/blackduck/http/transform/BlackDuckJsonTransformer.java index 05724d71c..1645c800c 100644 --- a/src/main/java/com/synopsys/integration/blackduck/http/transform/BlackDuckJsonTransformer.java +++ b/src/main/java/com/blackduck/integration/blackduck/http/transform/BlackDuckJsonTransformer.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.http.transform; +package com.blackduck.integration.blackduck.http.transform; import java.io.IOException; import java.io.StringWriter; @@ -13,6 +13,8 @@ import java.util.Iterator; import java.util.List; +import com.blackduck.integration.blackduck.http.BlackDuckPageResponse; +import com.blackduck.integration.blackduck.http.transform.subclass.BlackDuckResponseResolver; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ArrayNode; @@ -27,9 +29,7 @@ import com.synopsys.integration.blackduck.api.core.BlackDuckResponse; import com.synopsys.integration.blackduck.api.manual.response.BlackDuckResponseResponse; import com.synopsys.integration.blackduck.api.manual.response.BlackDuckStringResponse; -import com.synopsys.integration.blackduck.exception.BlackDuckIntegrationException; -import com.synopsys.integration.blackduck.http.BlackDuckPageResponse; -import com.synopsys.integration.blackduck.http.transform.subclass.BlackDuckResponseResolver; +import com.blackduck.integration.blackduck.exception.BlackDuckIntegrationException; import com.synopsys.integration.exception.IntegrationException; import com.synopsys.integration.log.IntLogger; import com.synopsys.integration.rest.response.Response; diff --git a/src/main/java/com/synopsys/integration/blackduck/http/transform/BlackDuckResponseTransformer.java b/src/main/java/com/blackduck/integration/blackduck/http/transform/BlackDuckResponseTransformer.java similarity index 86% rename from src/main/java/com/synopsys/integration/blackduck/http/transform/BlackDuckResponseTransformer.java rename to src/main/java/com/blackduck/integration/blackduck/http/transform/BlackDuckResponseTransformer.java index b1067bb22..237b7e3b9 100644 --- a/src/main/java/com/synopsys/integration/blackduck/http/transform/BlackDuckResponseTransformer.java +++ b/src/main/java/com/blackduck/integration/blackduck/http/transform/BlackDuckResponseTransformer.java @@ -5,16 +5,16 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.http.transform; +package com.blackduck.integration.blackduck.http.transform; import java.io.IOException; +import com.blackduck.integration.blackduck.http.client.BlackDuckHttpClient; +import com.blackduck.integration.blackduck.service.request.BlackDuckRequest; import com.google.gson.JsonElement; import com.synopsys.integration.blackduck.api.core.BlackDuckResponse; import com.synopsys.integration.blackduck.api.core.response.UrlSingleResponse; -import com.synopsys.integration.blackduck.exception.BlackDuckIntegrationException; -import com.synopsys.integration.blackduck.http.client.BlackDuckHttpClient; -import com.synopsys.integration.blackduck.service.request.BlackDuckRequest; +import com.blackduck.integration.blackduck.exception.BlackDuckIntegrationException; import com.synopsys.integration.exception.IntegrationException; import com.synopsys.integration.rest.response.Response; diff --git a/src/main/java/com/synopsys/integration/blackduck/http/transform/BlackDuckResponsesTransformer.java b/src/main/java/com/blackduck/integration/blackduck/http/transform/BlackDuckResponsesTransformer.java similarity index 92% rename from src/main/java/com/synopsys/integration/blackduck/http/transform/BlackDuckResponsesTransformer.java rename to src/main/java/com/blackduck/integration/blackduck/http/transform/BlackDuckResponsesTransformer.java index ee5bde951..5fb7676b5 100644 --- a/src/main/java/com/synopsys/integration/blackduck/http/transform/BlackDuckResponsesTransformer.java +++ b/src/main/java/com/blackduck/integration/blackduck/http/transform/BlackDuckResponsesTransformer.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.http.transform; +package com.blackduck.integration.blackduck.http.transform; import java.io.IOException; import java.util.LinkedList; @@ -15,18 +15,16 @@ import java.util.function.Predicate; import java.util.stream.Collectors; +import com.blackduck.integration.blackduck.http.BlackDuckPageResponse; +import com.blackduck.integration.blackduck.http.BlackDuckRequestBuilder; +import com.blackduck.integration.blackduck.http.client.BlackDuckHttpClient; +import com.blackduck.integration.blackduck.service.request.BlackDuckRequest; import org.apache.commons.lang3.math.NumberUtils; import org.jetbrains.annotations.NotNull; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import com.synopsys.integration.blackduck.api.core.BlackDuckResponse; import com.synopsys.integration.blackduck.api.core.response.UrlMultipleResponses; -import com.synopsys.integration.blackduck.exception.BlackDuckIntegrationException; -import com.synopsys.integration.blackduck.http.BlackDuckPageResponse; -import com.synopsys.integration.blackduck.http.BlackDuckRequestBuilder; -import com.synopsys.integration.blackduck.http.client.BlackDuckHttpClient; -import com.synopsys.integration.blackduck.service.request.BlackDuckRequest; +import com.blackduck.integration.blackduck.exception.BlackDuckIntegrationException; import com.synopsys.integration.exception.IntegrationException; import com.synopsys.integration.rest.response.Response; diff --git a/src/main/java/com/synopsys/integration/blackduck/http/transform/adapters/OffsetDateTimeTypeAdapter.java b/src/main/java/com/blackduck/integration/blackduck/http/transform/adapters/OffsetDateTimeTypeAdapter.java similarity index 97% rename from src/main/java/com/synopsys/integration/blackduck/http/transform/adapters/OffsetDateTimeTypeAdapter.java rename to src/main/java/com/blackduck/integration/blackduck/http/transform/adapters/OffsetDateTimeTypeAdapter.java index aed3169dc..bafd2e239 100644 --- a/src/main/java/com/synopsys/integration/blackduck/http/transform/adapters/OffsetDateTimeTypeAdapter.java +++ b/src/main/java/com/blackduck/integration/blackduck/http/transform/adapters/OffsetDateTimeTypeAdapter.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.http.transform.adapters; +package com.blackduck.integration.blackduck.http.transform.adapters; import java.io.IOException; import java.lang.reflect.Type; diff --git a/src/main/java/com/synopsys/integration/blackduck/http/transform/subclass/BlackDuckResponseResolver.java b/src/main/java/com/blackduck/integration/blackduck/http/transform/subclass/BlackDuckResponseResolver.java similarity index 96% rename from src/main/java/com/synopsys/integration/blackduck/http/transform/subclass/BlackDuckResponseResolver.java rename to src/main/java/com/blackduck/integration/blackduck/http/transform/subclass/BlackDuckResponseResolver.java index 2842d933d..778c8af87 100644 --- a/src/main/java/com/synopsys/integration/blackduck/http/transform/subclass/BlackDuckResponseResolver.java +++ b/src/main/java/com/blackduck/integration/blackduck/http/transform/subclass/BlackDuckResponseResolver.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.http.transform.subclass; +package com.blackduck.integration.blackduck.http.transform.subclass; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/com/synopsys/integration/blackduck/http/transform/subclass/BlackDuckResponseSubclassResolver.java b/src/main/java/com/blackduck/integration/blackduck/http/transform/subclass/BlackDuckResponseSubclassResolver.java similarity index 91% rename from src/main/java/com/synopsys/integration/blackduck/http/transform/subclass/BlackDuckResponseSubclassResolver.java rename to src/main/java/com/blackduck/integration/blackduck/http/transform/subclass/BlackDuckResponseSubclassResolver.java index 7d35b2f98..29a8c830d 100644 --- a/src/main/java/com/synopsys/integration/blackduck/http/transform/subclass/BlackDuckResponseSubclassResolver.java +++ b/src/main/java/com/blackduck/integration/blackduck/http/transform/subclass/BlackDuckResponseSubclassResolver.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.http.transform.subclass; +package com.blackduck.integration.blackduck.http.transform.subclass; import com.google.gson.Gson; import com.google.gson.JsonElement; diff --git a/src/main/java/com/synopsys/integration/blackduck/http/transform/subclass/NotificationUserViewSubclassResolver.java b/src/main/java/com/blackduck/integration/blackduck/http/transform/subclass/NotificationUserViewSubclassResolver.java similarity index 97% rename from src/main/java/com/synopsys/integration/blackduck/http/transform/subclass/NotificationUserViewSubclassResolver.java rename to src/main/java/com/blackduck/integration/blackduck/http/transform/subclass/NotificationUserViewSubclassResolver.java index 51d7dcb84..4976bf6ec 100644 --- a/src/main/java/com/synopsys/integration/blackduck/http/transform/subclass/NotificationUserViewSubclassResolver.java +++ b/src/main/java/com/blackduck/integration/blackduck/http/transform/subclass/NotificationUserViewSubclassResolver.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.http.transform.subclass; +package com.blackduck.integration.blackduck.http.transform.subclass; import com.google.gson.Gson; import com.google.gson.JsonElement; diff --git a/src/main/java/com/synopsys/integration/blackduck/http/transform/subclass/NotificationViewSubclassResolver.java b/src/main/java/com/blackduck/integration/blackduck/http/transform/subclass/NotificationViewSubclassResolver.java similarity index 97% rename from src/main/java/com/synopsys/integration/blackduck/http/transform/subclass/NotificationViewSubclassResolver.java rename to src/main/java/com/blackduck/integration/blackduck/http/transform/subclass/NotificationViewSubclassResolver.java index 079e94b9f..de8bded72 100644 --- a/src/main/java/com/synopsys/integration/blackduck/http/transform/subclass/NotificationViewSubclassResolver.java +++ b/src/main/java/com/blackduck/integration/blackduck/http/transform/subclass/NotificationViewSubclassResolver.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.http.transform.subclass; +package com.blackduck.integration.blackduck.http.transform.subclass; import com.google.gson.Gson; import com.google.gson.JsonElement; diff --git a/src/main/java/com/synopsys/integration/blackduck/http/transform/subclass/SimpleNotificationView.java b/src/main/java/com/blackduck/integration/blackduck/http/transform/subclass/SimpleNotificationView.java similarity index 86% rename from src/main/java/com/synopsys/integration/blackduck/http/transform/subclass/SimpleNotificationView.java rename to src/main/java/com/blackduck/integration/blackduck/http/transform/subclass/SimpleNotificationView.java index cb6046304..9becc2f11 100644 --- a/src/main/java/com/synopsys/integration/blackduck/http/transform/subclass/SimpleNotificationView.java +++ b/src/main/java/com/blackduck/integration/blackduck/http/transform/subclass/SimpleNotificationView.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.http.transform.subclass; +package com.blackduck.integration.blackduck.http.transform.subclass; import com.synopsys.integration.blackduck.api.core.BlackDuckView; import com.synopsys.integration.blackduck.api.manual.enumeration.NotificationType; diff --git a/src/main/java/com/synopsys/integration/blackduck/keystore/KeyStoreHelper.java b/src/main/java/com/blackduck/integration/blackduck/keystore/KeyStoreHelper.java similarity index 97% rename from src/main/java/com/synopsys/integration/blackduck/keystore/KeyStoreHelper.java rename to src/main/java/com/blackduck/integration/blackduck/keystore/KeyStoreHelper.java index 812d35267..51eec3c9e 100644 --- a/src/main/java/com/synopsys/integration/blackduck/keystore/KeyStoreHelper.java +++ b/src/main/java/com/blackduck/integration/blackduck/keystore/KeyStoreHelper.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.keystore; +package com.blackduck.integration.blackduck.keystore; import java.io.FileInputStream; import java.io.FileOutputStream; diff --git a/src/main/java/com/synopsys/integration/blackduck/phonehome/BlackDuckPhoneHomeHelper.java b/src/main/java/com/blackduck/integration/blackduck/phonehome/BlackDuckPhoneHomeHelper.java similarity index 94% rename from src/main/java/com/synopsys/integration/blackduck/phonehome/BlackDuckPhoneHomeHelper.java rename to src/main/java/com/blackduck/integration/blackduck/phonehome/BlackDuckPhoneHomeHelper.java index 3baa73d67..b41b9fdc5 100644 --- a/src/main/java/com/synopsys/integration/blackduck/phonehome/BlackDuckPhoneHomeHelper.java +++ b/src/main/java/com/blackduck/integration/blackduck/phonehome/BlackDuckPhoneHomeHelper.java @@ -5,19 +5,19 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.phonehome; +package com.blackduck.integration.blackduck.phonehome; import java.util.Collections; import java.util.Map; import java.util.concurrent.ExecutorService; +import com.blackduck.integration.blackduck.http.client.BlackDuckHttpClient; +import com.blackduck.integration.blackduck.service.BlackDuckServicesFactory; +import com.blackduck.integration.blackduck.service.dataservice.BlackDuckRegistrationService; +import com.blackduck.integration.blackduck.service.model.BlackDuckServerData; import org.apache.http.impl.client.HttpClientBuilder; import com.google.gson.Gson; -import com.synopsys.integration.blackduck.http.client.BlackDuckHttpClient; -import com.synopsys.integration.blackduck.service.BlackDuckServicesFactory; -import com.synopsys.integration.blackduck.service.dataservice.BlackDuckRegistrationService; -import com.synopsys.integration.blackduck.service.model.BlackDuckServerData; import com.synopsys.integration.exception.IntegrationException; import com.synopsys.integration.log.IntLogger; import com.synopsys.integration.phonehome.PhoneHomeClient; diff --git a/src/main/java/com/synopsys/integration/blackduck/service/BlackDuckApiClient.java b/src/main/java/com/blackduck/integration/blackduck/service/BlackDuckApiClient.java similarity index 92% rename from src/main/java/com/synopsys/integration/blackduck/service/BlackDuckApiClient.java rename to src/main/java/com/blackduck/integration/blackduck/service/BlackDuckApiClient.java index 9191387d5..755b4b339 100644 --- a/src/main/java/com/synopsys/integration/blackduck/service/BlackDuckApiClient.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/BlackDuckApiClient.java @@ -5,13 +5,14 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.service; +package com.blackduck.integration.blackduck.service; import java.io.IOException; import java.util.List; import java.util.Optional; import java.util.function.Predicate; +import com.blackduck.integration.blackduck.http.BlackDuckRequestBuilder; import org.apache.http.HttpHeaders; import com.synopsys.integration.blackduck.api.core.BlackDuckComponent; @@ -21,15 +22,14 @@ import com.synopsys.integration.blackduck.api.core.response.UrlMultipleResponses; import com.synopsys.integration.blackduck.api.core.response.UrlSingleResponse; import com.synopsys.integration.blackduck.api.generated.discovery.BlackDuckMediaTypeDiscovery; -import com.synopsys.integration.blackduck.http.BlackDuckPageResponse; -import com.synopsys.integration.blackduck.http.BlackDuckRequestBuilder; -import com.synopsys.integration.blackduck.http.client.BlackDuckHttpClient; -import com.synopsys.integration.blackduck.http.transform.BlackDuckJsonTransformer; -import com.synopsys.integration.blackduck.http.transform.BlackDuckResponseTransformer; -import com.synopsys.integration.blackduck.http.transform.BlackDuckResponsesTransformer; -import com.synopsys.integration.blackduck.service.request.BlackDuckRequest; -import com.synopsys.integration.blackduck.service.request.BlackDuckResponseRequest; -import com.synopsys.integration.blackduck.version.BlackDuckVersion; +import com.blackduck.integration.blackduck.http.BlackDuckPageResponse; +import com.blackduck.integration.blackduck.http.client.BlackDuckHttpClient; +import com.blackduck.integration.blackduck.http.transform.BlackDuckJsonTransformer; +import com.blackduck.integration.blackduck.http.transform.BlackDuckResponseTransformer; +import com.blackduck.integration.blackduck.http.transform.BlackDuckResponsesTransformer; +import com.blackduck.integration.blackduck.service.request.BlackDuckRequest; +import com.blackduck.integration.blackduck.service.request.BlackDuckResponseRequest; +import com.blackduck.integration.blackduck.version.BlackDuckVersion; import com.synopsys.integration.exception.IntegrationException; import com.synopsys.integration.rest.HttpMethod; import com.synopsys.integration.rest.HttpUrl; diff --git a/src/main/java/com/synopsys/integration/blackduck/service/BlackDuckServicesFactory.java b/src/main/java/com/blackduck/integration/blackduck/service/BlackDuckServicesFactory.java similarity index 75% rename from src/main/java/com/synopsys/integration/blackduck/service/BlackDuckServicesFactory.java rename to src/main/java/com/blackduck/integration/blackduck/service/BlackDuckServicesFactory.java index 20eff7820..32e77a7ba 100644 --- a/src/main/java/com/synopsys/integration/blackduck/service/BlackDuckServicesFactory.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/BlackDuckServicesFactory.java @@ -5,61 +5,60 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.service; +package com.blackduck.integration.blackduck.service; import java.io.File; import java.time.OffsetDateTime; import java.util.concurrent.ExecutorService; +import com.blackduck.integration.blackduck.bdio2.Bdio2FileUploadService; +import com.blackduck.integration.blackduck.bdio2.Bdio2RetryAwareStreamUploader; +import com.blackduck.integration.blackduck.bdio2.Bdio2StreamUploader; +import com.blackduck.integration.blackduck.bdio2.util.Bdio2ContentExtractor; +import com.blackduck.integration.blackduck.codelocation.CodeLocationCreationService; +import com.blackduck.integration.blackduck.codelocation.CodeLocationWaiter; +import com.blackduck.integration.blackduck.codelocation.bdio2legacy.Bdio2UploadService; +import com.blackduck.integration.blackduck.codelocation.bdio2legacy.UploadBdio2BatchRunner; +import com.blackduck.integration.blackduck.codelocation.bdiolegacy.BdioUploadService; +import com.blackduck.integration.blackduck.codelocation.bdiolegacy.UploadBatchRunner; +import com.blackduck.integration.blackduck.codelocation.binaryscanner.BinaryScanBatchRunner; +import com.blackduck.integration.blackduck.codelocation.binaryscanner.BinaryScanUploadService; +import com.blackduck.integration.blackduck.codelocation.intelligentpersistence.IntelligentPersistenceBatchRunner; +import com.blackduck.integration.blackduck.codelocation.intelligentpersistence.IntelligentPersistenceService; +import com.blackduck.integration.blackduck.codelocation.signaturescanner.ScanBatchRunner; +import com.blackduck.integration.blackduck.codelocation.signaturescanner.SignatureScannerService; +import com.blackduck.integration.blackduck.http.client.BlackDuckHttpClient; +import com.blackduck.integration.blackduck.http.transform.BlackDuckJsonTransformer; +import com.blackduck.integration.blackduck.http.transform.BlackDuckResponseTransformer; +import com.blackduck.integration.blackduck.http.transform.BlackDuckResponsesTransformer; +import com.blackduck.integration.blackduck.http.transform.adapters.OffsetDateTimeTypeAdapter; +import com.blackduck.integration.blackduck.http.transform.subclass.BlackDuckResponseResolver; import org.apache.commons.lang3.builder.ReflectionToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.gson.Gson; import com.google.gson.GsonBuilder; -import com.google.gson.reflect.TypeToken; import com.synopsys.integration.blackduck.api.generated.discovery.ApiDiscovery; -import com.synopsys.integration.blackduck.bdio2.Bdio2FileUploadService; -import com.synopsys.integration.blackduck.bdio2.Bdio2RetryAwareStreamUploader; -import com.synopsys.integration.blackduck.bdio2.Bdio2StreamUploader; -import com.synopsys.integration.blackduck.bdio2.util.Bdio2ContentExtractor; -import com.synopsys.integration.blackduck.codelocation.CodeLocationCreationService; -import com.synopsys.integration.blackduck.codelocation.CodeLocationWaiter; -import com.synopsys.integration.blackduck.codelocation.bdio2legacy.Bdio2UploadService; -import com.synopsys.integration.blackduck.codelocation.bdio2legacy.UploadBdio2BatchRunner; -import com.synopsys.integration.blackduck.codelocation.bdiolegacy.BdioUploadService; -import com.synopsys.integration.blackduck.codelocation.bdiolegacy.UploadBatchRunner; -import com.synopsys.integration.blackduck.codelocation.binaryscanner.BinaryScanBatchRunner; -import com.synopsys.integration.blackduck.codelocation.binaryscanner.BinaryScanUploadService; -import com.synopsys.integration.blackduck.codelocation.intelligentpersistence.IntelligentPersistenceBatchRunner; -import com.synopsys.integration.blackduck.codelocation.intelligentpersistence.IntelligentPersistenceService; -import com.synopsys.integration.blackduck.codelocation.signaturescanner.ScanBatchRunner; -import com.synopsys.integration.blackduck.codelocation.signaturescanner.SignatureScannerService; -import com.synopsys.integration.blackduck.http.client.BlackDuckHttpClient; -import com.synopsys.integration.blackduck.http.transform.BlackDuckJsonTransformer; -import com.synopsys.integration.blackduck.http.transform.BlackDuckResponseTransformer; -import com.synopsys.integration.blackduck.http.transform.BlackDuckResponsesTransformer; -import com.synopsys.integration.blackduck.http.transform.adapters.OffsetDateTimeTypeAdapter; -import com.synopsys.integration.blackduck.http.transform.subclass.BlackDuckResponseResolver; -import com.synopsys.integration.blackduck.service.dataservice.BlackDuckRegistrationService; -import com.synopsys.integration.blackduck.service.dataservice.BlackDuckScanReadinessService; -import com.synopsys.integration.blackduck.service.dataservice.CodeLocationService; -import com.synopsys.integration.blackduck.service.dataservice.ComponentService; -import com.synopsys.integration.blackduck.service.dataservice.IacScanUploadService; -import com.synopsys.integration.blackduck.service.dataservice.IssueService; -import com.synopsys.integration.blackduck.service.dataservice.LicenseService; -import com.synopsys.integration.blackduck.service.dataservice.NotificationService; -import com.synopsys.integration.blackduck.service.dataservice.PolicyRuleService; -import com.synopsys.integration.blackduck.service.dataservice.ProjectBomService; -import com.synopsys.integration.blackduck.service.dataservice.ProjectGetService; -import com.synopsys.integration.blackduck.service.dataservice.ProjectMappingService; -import com.synopsys.integration.blackduck.service.dataservice.ProjectService; -import com.synopsys.integration.blackduck.service.dataservice.ProjectUsersService; -import com.synopsys.integration.blackduck.service.dataservice.RoleService; -import com.synopsys.integration.blackduck.service.dataservice.TagService; -import com.synopsys.integration.blackduck.service.dataservice.UserGroupService; -import com.synopsys.integration.blackduck.service.dataservice.UserRoleService; -import com.synopsys.integration.blackduck.service.dataservice.UserService; +import com.blackduck.integration.blackduck.service.dataservice.BlackDuckRegistrationService; +import com.blackduck.integration.blackduck.service.dataservice.BlackDuckScanReadinessService; +import com.blackduck.integration.blackduck.service.dataservice.CodeLocationService; +import com.blackduck.integration.blackduck.service.dataservice.ComponentService; +import com.blackduck.integration.blackduck.service.dataservice.IacScanUploadService; +import com.blackduck.integration.blackduck.service.dataservice.IssueService; +import com.blackduck.integration.blackduck.service.dataservice.LicenseService; +import com.blackduck.integration.blackduck.service.dataservice.NotificationService; +import com.blackduck.integration.blackduck.service.dataservice.PolicyRuleService; +import com.blackduck.integration.blackduck.service.dataservice.ProjectBomService; +import com.blackduck.integration.blackduck.service.dataservice.ProjectGetService; +import com.blackduck.integration.blackduck.service.dataservice.ProjectMappingService; +import com.blackduck.integration.blackduck.service.dataservice.ProjectService; +import com.blackduck.integration.blackduck.service.dataservice.ProjectUsersService; +import com.blackduck.integration.blackduck.service.dataservice.RoleService; +import com.blackduck.integration.blackduck.service.dataservice.TagService; +import com.blackduck.integration.blackduck.service.dataservice.UserGroupService; +import com.blackduck.integration.blackduck.service.dataservice.UserRoleService; +import com.blackduck.integration.blackduck.service.dataservice.UserService; import com.synopsys.integration.log.IntLogger; import com.synopsys.integration.rest.RestConstants; import com.synopsys.integration.util.IntEnvironmentVariables; diff --git a/src/main/java/com/synopsys/integration/blackduck/service/DataService.java b/src/main/java/com/blackduck/integration/blackduck/service/DataService.java similarity index 93% rename from src/main/java/com/synopsys/integration/blackduck/service/DataService.java rename to src/main/java/com/blackduck/integration/blackduck/service/DataService.java index d133616e0..5c1cdff7c 100644 --- a/src/main/java/com/synopsys/integration/blackduck/service/DataService.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/DataService.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.service; +package com.blackduck.integration.blackduck.service; import com.synopsys.integration.blackduck.api.generated.discovery.ApiDiscovery; import com.synopsys.integration.log.IntLogger; diff --git a/src/main/java/com/synopsys/integration/blackduck/service/dataservice/BlackDuckRegistrationService.java b/src/main/java/com/blackduck/integration/blackduck/service/dataservice/BlackDuckRegistrationService.java similarity index 84% rename from src/main/java/com/synopsys/integration/blackduck/service/dataservice/BlackDuckRegistrationService.java rename to src/main/java/com/blackduck/integration/blackduck/service/dataservice/BlackDuckRegistrationService.java index 3373b2a63..2007a6812 100644 --- a/src/main/java/com/synopsys/integration/blackduck/service/dataservice/BlackDuckRegistrationService.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/dataservice/BlackDuckRegistrationService.java @@ -5,17 +5,17 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.service.dataservice; +package com.blackduck.integration.blackduck.service.dataservice; +import com.blackduck.integration.blackduck.http.BlackDuckRequestBuilder; +import com.blackduck.integration.blackduck.service.BlackDuckApiClient; +import com.blackduck.integration.blackduck.service.DataService; +import com.blackduck.integration.blackduck.service.request.BlackDuckSingleRequest; import com.synopsys.integration.blackduck.api.core.response.UrlSingleResponse; import com.synopsys.integration.blackduck.api.generated.discovery.ApiDiscovery; import com.synopsys.integration.blackduck.api.generated.response.CurrentVersionView; import com.synopsys.integration.blackduck.api.generated.view.RegistrationView; -import com.synopsys.integration.blackduck.http.BlackDuckRequestBuilder; -import com.synopsys.integration.blackduck.service.BlackDuckApiClient; -import com.synopsys.integration.blackduck.service.DataService; -import com.synopsys.integration.blackduck.service.model.BlackDuckServerData; -import com.synopsys.integration.blackduck.service.request.BlackDuckSingleRequest; +import com.blackduck.integration.blackduck.service.model.BlackDuckServerData; import com.synopsys.integration.exception.IntegrationException; import com.synopsys.integration.log.IntLogger; import com.synopsys.integration.rest.HttpUrl; diff --git a/src/main/java/com/synopsys/integration/blackduck/service/dataservice/BlackDuckScanReadinessService.java b/src/main/java/com/blackduck/integration/blackduck/service/dataservice/BlackDuckScanReadinessService.java similarity index 82% rename from src/main/java/com/synopsys/integration/blackduck/service/dataservice/BlackDuckScanReadinessService.java rename to src/main/java/com/blackduck/integration/blackduck/service/dataservice/BlackDuckScanReadinessService.java index e77d2177a..bc48cfc97 100644 --- a/src/main/java/com/synopsys/integration/blackduck/service/dataservice/BlackDuckScanReadinessService.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/dataservice/BlackDuckScanReadinessService.java @@ -5,12 +5,12 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.service.dataservice; +package com.blackduck.integration.blackduck.service.dataservice; +import com.blackduck.integration.blackduck.service.BlackDuckApiClient; +import com.blackduck.integration.blackduck.service.DataService; import com.synopsys.integration.blackduck.api.generated.discovery.ApiDiscovery; import com.synopsys.integration.blackduck.api.generated.view.ScanReadinessView; -import com.synopsys.integration.blackduck.service.BlackDuckApiClient; -import com.synopsys.integration.blackduck.service.DataService; import com.synopsys.integration.exception.IntegrationException; import com.synopsys.integration.log.IntLogger; diff --git a/src/main/java/com/synopsys/integration/blackduck/service/dataservice/CodeLocationService.java b/src/main/java/com/blackduck/integration/blackduck/service/dataservice/CodeLocationService.java similarity index 92% rename from src/main/java/com/synopsys/integration/blackduck/service/dataservice/CodeLocationService.java rename to src/main/java/com/blackduck/integration/blackduck/service/dataservice/CodeLocationService.java index 145d70d76..42d807182 100644 --- a/src/main/java/com/synopsys/integration/blackduck/service/dataservice/CodeLocationService.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/dataservice/CodeLocationService.java @@ -5,13 +5,17 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.service.dataservice; +package com.blackduck.integration.blackduck.service.dataservice; import java.util.List; import java.util.Optional; import java.util.function.BiPredicate; import java.util.function.Predicate; +import com.blackduck.integration.blackduck.http.BlackDuckQuery; +import com.blackduck.integration.blackduck.http.BlackDuckRequestBuilder; +import com.blackduck.integration.blackduck.service.BlackDuckApiClient; +import com.blackduck.integration.blackduck.service.DataService; import com.fasterxml.jackson.databind.node.JsonNodeFactory; import com.fasterxml.jackson.databind.node.NullNode; import com.synopsys.integration.blackduck.api.core.BlackDuckPath; @@ -22,11 +26,7 @@ import com.synopsys.integration.blackduck.api.generated.view.CodeLocationView; import com.synopsys.integration.blackduck.api.generated.view.ProjectVersionView; import com.synopsys.integration.blackduck.api.manual.view.ScanSummaryView; -import com.synopsys.integration.blackduck.http.BlackDuckQuery; -import com.synopsys.integration.blackduck.http.BlackDuckRequestBuilder; -import com.synopsys.integration.blackduck.service.BlackDuckApiClient; -import com.synopsys.integration.blackduck.service.DataService; -import com.synopsys.integration.blackduck.service.request.BlackDuckMultipleRequest; +import com.blackduck.integration.blackduck.service.request.BlackDuckMultipleRequest; import com.synopsys.integration.exception.IntegrationException; import com.synopsys.integration.log.IntLogger; import com.synopsys.integration.rest.HttpUrl; diff --git a/src/main/java/com/synopsys/integration/blackduck/service/dataservice/ComponentService.java b/src/main/java/com/blackduck/integration/blackduck/service/dataservice/ComponentService.java similarity index 91% rename from src/main/java/com/synopsys/integration/blackduck/service/dataservice/ComponentService.java rename to src/main/java/com/blackduck/integration/blackduck/service/dataservice/ComponentService.java index 9c6599777..f84efeda1 100644 --- a/src/main/java/com/synopsys/integration/blackduck/service/dataservice/ComponentService.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/dataservice/ComponentService.java @@ -5,13 +5,18 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.service.dataservice; +package com.blackduck.integration.blackduck.service.dataservice; import java.util.List; import java.util.Optional; import java.util.function.BiFunction; import java.util.function.Function; +import com.blackduck.integration.blackduck.http.BlackDuckMediaTypes; +import com.blackduck.integration.blackduck.http.BlackDuckQuery; +import com.blackduck.integration.blackduck.http.BlackDuckRequestBuilder; +import com.blackduck.integration.blackduck.service.BlackDuckApiClient; +import com.blackduck.integration.blackduck.service.DataService; import org.apache.commons.lang3.StringUtils; import com.synopsys.integration.bdio.model.externalid.ExternalId; @@ -22,13 +27,8 @@ import com.synopsys.integration.blackduck.api.generated.view.ComponentVersionView; import com.synopsys.integration.blackduck.api.generated.view.ComponentView; import com.synopsys.integration.blackduck.api.generated.view.VulnerabilityView; -import com.synopsys.integration.blackduck.http.BlackDuckMediaTypes; -import com.synopsys.integration.blackduck.http.BlackDuckQuery; -import com.synopsys.integration.blackduck.http.BlackDuckRequestBuilder; -import com.synopsys.integration.blackduck.service.BlackDuckApiClient; -import com.synopsys.integration.blackduck.service.DataService; -import com.synopsys.integration.blackduck.service.model.ComponentVersionVulnerabilities; -import com.synopsys.integration.blackduck.service.request.BlackDuckMultipleRequest; +import com.blackduck.integration.blackduck.service.model.ComponentVersionVulnerabilities; +import com.blackduck.integration.blackduck.service.request.BlackDuckMultipleRequest; import com.synopsys.integration.exception.IntegrationException; import com.synopsys.integration.log.IntLogger; import com.synopsys.integration.rest.HttpUrl; diff --git a/src/main/java/com/synopsys/integration/blackduck/service/dataservice/IacScanUploadService.java b/src/main/java/com/blackduck/integration/blackduck/service/dataservice/IacScanUploadService.java similarity index 87% rename from src/main/java/com/synopsys/integration/blackduck/service/dataservice/IacScanUploadService.java rename to src/main/java/com/blackduck/integration/blackduck/service/dataservice/IacScanUploadService.java index d51b64107..ef79f3b09 100644 --- a/src/main/java/com/synopsys/integration/blackduck/service/dataservice/IacScanUploadService.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/dataservice/IacScanUploadService.java @@ -5,16 +5,16 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.service.dataservice; +package com.blackduck.integration.blackduck.service.dataservice; +import com.blackduck.integration.blackduck.http.BlackDuckRequestBuilder; +import com.blackduck.integration.blackduck.service.BlackDuckApiClient; import org.apache.http.entity.ContentType; import com.synopsys.integration.blackduck.api.core.BlackDuckPath; import com.synopsys.integration.blackduck.api.core.BlackDuckResponse; import com.synopsys.integration.blackduck.api.generated.discovery.ApiDiscovery; -import com.synopsys.integration.blackduck.http.BlackDuckRequestBuilder; -import com.synopsys.integration.blackduck.service.BlackDuckApiClient; -import com.synopsys.integration.blackduck.service.request.BlackDuckResponseRequest; +import com.blackduck.integration.blackduck.service.request.BlackDuckResponseRequest; import com.synopsys.integration.exception.IntegrationException; import com.synopsys.integration.rest.HttpUrl; import com.synopsys.integration.rest.response.Response; diff --git a/src/main/java/com/synopsys/integration/blackduck/service/dataservice/IssueService.java b/src/main/java/com/blackduck/integration/blackduck/service/dataservice/IssueService.java similarity index 93% rename from src/main/java/com/synopsys/integration/blackduck/service/dataservice/IssueService.java rename to src/main/java/com/blackduck/integration/blackduck/service/dataservice/IssueService.java index 0718370fd..1b3c013ee 100644 --- a/src/main/java/com/synopsys/integration/blackduck/service/dataservice/IssueService.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/dataservice/IssueService.java @@ -5,12 +5,14 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.service.dataservice; +package com.blackduck.integration.blackduck.service.dataservice; import java.util.List; import java.util.Optional; import java.util.function.Predicate; +import com.blackduck.integration.blackduck.service.BlackDuckApiClient; +import com.blackduck.integration.blackduck.service.DataService; import com.synopsys.integration.blackduck.api.generated.discovery.ApiDiscovery; import com.synopsys.integration.blackduck.api.generated.view.IssueView; import com.synopsys.integration.blackduck.api.generated.view.ProjectVersionComponentVersionView; @@ -18,8 +20,6 @@ import com.synopsys.integration.blackduck.api.generated.view.ProjectVersionIssuesView; import com.synopsys.integration.blackduck.api.generated.view.ProjectVersionView; import com.synopsys.integration.blackduck.api.manual.temporary.component.IssueRequest; -import com.synopsys.integration.blackduck.service.BlackDuckApiClient; -import com.synopsys.integration.blackduck.service.DataService; import com.synopsys.integration.exception.IntegrationException; import com.synopsys.integration.log.IntLogger; import com.synopsys.integration.rest.HttpUrl; diff --git a/src/main/java/com/synopsys/integration/blackduck/service/dataservice/LicenseService.java b/src/main/java/com/blackduck/integration/blackduck/service/dataservice/LicenseService.java similarity index 91% rename from src/main/java/com/synopsys/integration/blackduck/service/dataservice/LicenseService.java rename to src/main/java/com/blackduck/integration/blackduck/service/dataservice/LicenseService.java index 06f668523..a79664617 100644 --- a/src/main/java/com/synopsys/integration/blackduck/service/dataservice/LicenseService.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/dataservice/LicenseService.java @@ -5,12 +5,16 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.service.dataservice; +package com.blackduck.integration.blackduck.service.dataservice; import java.io.IOException; import java.util.List; import java.util.Optional; +import com.blackduck.integration.blackduck.http.BlackDuckQuery; +import com.blackduck.integration.blackduck.http.BlackDuckRequestBuilder; +import com.blackduck.integration.blackduck.service.BlackDuckApiClient; +import com.blackduck.integration.blackduck.service.DataService; import com.synopsys.integration.bdio.model.externalid.ExternalId; import com.synopsys.integration.blackduck.api.core.response.UrlMultipleResponses; import com.synopsys.integration.blackduck.api.generated.discovery.ApiDiscovery; @@ -20,11 +24,7 @@ import com.synopsys.integration.blackduck.api.generated.view.ComponentVersionView; import com.synopsys.integration.blackduck.api.generated.view.LicenseView; import com.synopsys.integration.blackduck.api.manual.temporary.component.VersionBomLicenseView; -import com.synopsys.integration.blackduck.http.BlackDuckQuery; -import com.synopsys.integration.blackduck.http.BlackDuckRequestBuilder; -import com.synopsys.integration.blackduck.service.BlackDuckApiClient; -import com.synopsys.integration.blackduck.service.DataService; -import com.synopsys.integration.blackduck.service.request.BlackDuckRequest; +import com.blackduck.integration.blackduck.service.request.BlackDuckRequest; import com.synopsys.integration.exception.IntegrationException; import com.synopsys.integration.log.IntLogger; import com.synopsys.integration.rest.HttpUrl; diff --git a/src/main/java/com/synopsys/integration/blackduck/service/dataservice/NotificationService.java b/src/main/java/com/blackduck/integration/blackduck/service/dataservice/NotificationService.java similarity index 92% rename from src/main/java/com/synopsys/integration/blackduck/service/dataservice/NotificationService.java rename to src/main/java/com/blackduck/integration/blackduck/service/dataservice/NotificationService.java index 655fc3049..8a2fd6b4c 100644 --- a/src/main/java/com/synopsys/integration/blackduck/service/dataservice/NotificationService.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/dataservice/NotificationService.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.service.dataservice; +package com.blackduck.integration.blackduck.service.dataservice; import java.util.Date; import java.util.List; @@ -13,20 +13,20 @@ import java.util.stream.Collectors; import java.util.stream.Stream; +import com.blackduck.integration.blackduck.http.BlackDuckPageDefinition; +import com.blackduck.integration.blackduck.http.BlackDuckPageResponse; +import com.blackduck.integration.blackduck.http.BlackDuckRequestBuilder; +import com.blackduck.integration.blackduck.http.BlackDuckRequestFilter; +import com.blackduck.integration.blackduck.service.BlackDuckApiClient; +import com.blackduck.integration.blackduck.service.DataService; import com.synopsys.integration.blackduck.api.core.response.UrlMultipleResponses; import com.synopsys.integration.blackduck.api.generated.discovery.ApiDiscovery; import com.synopsys.integration.blackduck.api.generated.view.UserView; import com.synopsys.integration.blackduck.api.manual.temporary.enumeration.NotificationType; import com.synopsys.integration.blackduck.api.manual.view.NotificationUserView; import com.synopsys.integration.blackduck.api.manual.view.NotificationView; -import com.synopsys.integration.blackduck.http.BlackDuckPageDefinition; -import com.synopsys.integration.blackduck.http.BlackDuckPageResponse; -import com.synopsys.integration.blackduck.http.BlackDuckRequestBuilder; -import com.synopsys.integration.blackduck.http.BlackDuckRequestFilter; -import com.synopsys.integration.blackduck.service.BlackDuckApiClient; -import com.synopsys.integration.blackduck.service.DataService; -import com.synopsys.integration.blackduck.service.request.BlackDuckMultipleRequest; -import com.synopsys.integration.blackduck.service.request.NotificationEditor; +import com.blackduck.integration.blackduck.service.request.BlackDuckMultipleRequest; +import com.blackduck.integration.blackduck.service.request.NotificationEditor; import com.synopsys.integration.exception.IntegrationException; import com.synopsys.integration.log.IntLogger; diff --git a/src/main/java/com/synopsys/integration/blackduck/service/dataservice/PolicyRuleService.java b/src/main/java/com/blackduck/integration/blackduck/service/dataservice/PolicyRuleService.java similarity index 89% rename from src/main/java/com/synopsys/integration/blackduck/service/dataservice/PolicyRuleService.java rename to src/main/java/com/blackduck/integration/blackduck/service/dataservice/PolicyRuleService.java index 97e151b69..6af9d1e9b 100644 --- a/src/main/java/com/synopsys/integration/blackduck/service/dataservice/PolicyRuleService.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/dataservice/PolicyRuleService.java @@ -5,24 +5,24 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.service.dataservice; +package com.blackduck.integration.blackduck.service.dataservice; import java.util.List; import java.util.Optional; import java.util.function.Predicate; +import com.blackduck.integration.blackduck.service.BlackDuckApiClient; +import com.blackduck.integration.blackduck.service.DataService; import com.synopsys.integration.bdio.model.externalid.ExternalId; import com.synopsys.integration.blackduck.api.core.response.UrlMultipleResponses; -import com.synopsys.integration.blackduck.api.enumeration.PolicyRuleConditionOperatorType; +import com.blackduck.integration.blackduck.api.enumeration.PolicyRuleConditionOperatorType; import com.synopsys.integration.blackduck.api.generated.component.PolicyRuleExpressionView; import com.synopsys.integration.blackduck.api.generated.discovery.ApiDiscovery; import com.synopsys.integration.blackduck.api.generated.response.ComponentsView; import com.synopsys.integration.blackduck.api.generated.view.ComponentVersionView; import com.synopsys.integration.blackduck.api.generated.view.PolicyRuleView; -import com.synopsys.integration.blackduck.exception.BlackDuckIntegrationException; -import com.synopsys.integration.blackduck.service.BlackDuckApiClient; -import com.synopsys.integration.blackduck.service.DataService; -import com.synopsys.integration.blackduck.service.model.PolicyRuleExpressionSetBuilder; +import com.blackduck.integration.blackduck.exception.BlackDuckIntegrationException; +import com.blackduck.integration.blackduck.service.model.PolicyRuleExpressionSetBuilder; import com.synopsys.integration.exception.IntegrationException; import com.synopsys.integration.log.IntLogger; import com.synopsys.integration.rest.HttpUrl; diff --git a/src/main/java/com/synopsys/integration/blackduck/service/dataservice/ProjectBomService.java b/src/main/java/com/blackduck/integration/blackduck/service/dataservice/ProjectBomService.java similarity index 94% rename from src/main/java/com/synopsys/integration/blackduck/service/dataservice/ProjectBomService.java rename to src/main/java/com/blackduck/integration/blackduck/service/dataservice/ProjectBomService.java index 574c4d43c..02d003265 100644 --- a/src/main/java/com/synopsys/integration/blackduck/service/dataservice/ProjectBomService.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/dataservice/ProjectBomService.java @@ -5,13 +5,16 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.service.dataservice; +package com.blackduck.integration.blackduck.service.dataservice; import java.io.IOException; import java.util.ArrayList; import java.util.List; import java.util.Optional; +import com.blackduck.integration.blackduck.http.BlackDuckRequestBuilder; +import com.blackduck.integration.blackduck.service.BlackDuckApiClient; +import com.blackduck.integration.blackduck.service.DataService; import org.apache.commons.lang3.StringUtils; import com.synopsys.integration.bdio.model.externalid.ExternalId; @@ -25,12 +28,9 @@ import com.synopsys.integration.blackduck.api.generated.view.ProjectVersionPolicyStatusView; import com.synopsys.integration.blackduck.api.generated.view.ProjectVersionView; import com.synopsys.integration.blackduck.api.generated.view.ProjectVersionVulnerableBomComponentsView; -import com.synopsys.integration.blackduck.http.BlackDuckRequestBuilder; -import com.synopsys.integration.blackduck.service.BlackDuckApiClient; -import com.synopsys.integration.blackduck.service.DataService; -import com.synopsys.integration.blackduck.service.model.ComponentVersionVulnerabilities; -import com.synopsys.integration.blackduck.service.model.VersionBomComponentModel; -import com.synopsys.integration.blackduck.service.request.BlackDuckResponseRequest; +import com.blackduck.integration.blackduck.service.model.ComponentVersionVulnerabilities; +import com.blackduck.integration.blackduck.service.model.VersionBomComponentModel; +import com.blackduck.integration.blackduck.service.request.BlackDuckResponseRequest; import com.synopsys.integration.exception.IntegrationException; import com.synopsys.integration.log.IntLogger; import com.synopsys.integration.rest.HttpUrl; diff --git a/src/main/java/com/synopsys/integration/blackduck/service/dataservice/ProjectGetService.java b/src/main/java/com/blackduck/integration/blackduck/service/dataservice/ProjectGetService.java similarity index 90% rename from src/main/java/com/synopsys/integration/blackduck/service/dataservice/ProjectGetService.java rename to src/main/java/com/blackduck/integration/blackduck/service/dataservice/ProjectGetService.java index 28178f112..f2fc355c4 100644 --- a/src/main/java/com/synopsys/integration/blackduck/service/dataservice/ProjectGetService.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/dataservice/ProjectGetService.java @@ -5,21 +5,21 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.service.dataservice; +package com.blackduck.integration.blackduck.service.dataservice; import java.util.List; import java.util.Optional; import java.util.function.Predicate; +import com.blackduck.integration.blackduck.http.BlackDuckQuery; +import com.blackduck.integration.blackduck.http.BlackDuckRequestBuilder; +import com.blackduck.integration.blackduck.service.BlackDuckApiClient; +import com.blackduck.integration.blackduck.service.DataService; import com.synopsys.integration.blackduck.api.core.response.UrlMultipleResponses; import com.synopsys.integration.blackduck.api.generated.discovery.ApiDiscovery; import com.synopsys.integration.blackduck.api.generated.view.ProjectVersionView; import com.synopsys.integration.blackduck.api.manual.view.ProjectView; -import com.synopsys.integration.blackduck.http.BlackDuckQuery; -import com.synopsys.integration.blackduck.http.BlackDuckRequestBuilder; -import com.synopsys.integration.blackduck.service.BlackDuckApiClient; -import com.synopsys.integration.blackduck.service.DataService; -import com.synopsys.integration.blackduck.service.request.BlackDuckMultipleRequest; +import com.blackduck.integration.blackduck.service.request.BlackDuckMultipleRequest; import com.synopsys.integration.exception.IntegrationException; import com.synopsys.integration.log.IntLogger; diff --git a/src/main/java/com/synopsys/integration/blackduck/service/dataservice/ProjectMappingService.java b/src/main/java/com/blackduck/integration/blackduck/service/dataservice/ProjectMappingService.java similarity index 89% rename from src/main/java/com/synopsys/integration/blackduck/service/dataservice/ProjectMappingService.java rename to src/main/java/com/blackduck/integration/blackduck/service/dataservice/ProjectMappingService.java index 5a4852c03..c1ede53ac 100644 --- a/src/main/java/com/synopsys/integration/blackduck/service/dataservice/ProjectMappingService.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/dataservice/ProjectMappingService.java @@ -5,16 +5,16 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.service.dataservice; +package com.blackduck.integration.blackduck.service.dataservice; import java.util.List; +import com.blackduck.integration.blackduck.service.BlackDuckApiClient; +import com.blackduck.integration.blackduck.service.DataService; import com.synopsys.integration.blackduck.api.generated.discovery.ApiDiscovery; import com.synopsys.integration.blackduck.api.manual.view.ProjectView; import com.synopsys.integration.blackduck.api.manual.view.ProjectMappingView; -import com.synopsys.integration.blackduck.exception.BlackDuckIntegrationException; -import com.synopsys.integration.blackduck.service.BlackDuckApiClient; -import com.synopsys.integration.blackduck.service.DataService; +import com.blackduck.integration.blackduck.exception.BlackDuckIntegrationException; import com.synopsys.integration.exception.IntegrationException; import com.synopsys.integration.log.IntLogger; import com.synopsys.integration.rest.HttpUrl; diff --git a/src/main/java/com/synopsys/integration/blackduck/service/dataservice/ProjectService.java b/src/main/java/com/blackduck/integration/blackduck/service/dataservice/ProjectService.java similarity index 94% rename from src/main/java/com/synopsys/integration/blackduck/service/dataservice/ProjectService.java rename to src/main/java/com/blackduck/integration/blackduck/service/dataservice/ProjectService.java index e4c010b48..2b7ca5026 100644 --- a/src/main/java/com/synopsys/integration/blackduck/service/dataservice/ProjectService.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/dataservice/ProjectService.java @@ -5,23 +5,23 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.service.dataservice; +package com.blackduck.integration.blackduck.service.dataservice; import java.util.Comparator; import java.util.List; import java.util.Optional; +import com.blackduck.integration.blackduck.service.BlackDuckApiClient; +import com.blackduck.integration.blackduck.service.DataService; import com.synopsys.integration.blackduck.api.core.response.UrlMultipleResponses; import com.synopsys.integration.blackduck.api.generated.discovery.ApiDiscovery; import com.synopsys.integration.blackduck.api.generated.view.ProjectVersionView; import com.synopsys.integration.blackduck.api.manual.view.ProjectView; import com.synopsys.integration.blackduck.api.manual.temporary.component.ProjectRequest; import com.synopsys.integration.blackduck.api.manual.temporary.component.ProjectVersionRequest; -import com.synopsys.integration.blackduck.exception.BlackDuckIntegrationException; -import com.synopsys.integration.blackduck.service.BlackDuckApiClient; -import com.synopsys.integration.blackduck.service.DataService; -import com.synopsys.integration.blackduck.service.model.ProjectSyncModel; -import com.synopsys.integration.blackduck.service.model.ProjectVersionWrapper; +import com.blackduck.integration.blackduck.exception.BlackDuckIntegrationException; +import com.blackduck.integration.blackduck.service.model.ProjectSyncModel; +import com.blackduck.integration.blackduck.service.model.ProjectVersionWrapper; import com.synopsys.integration.exception.IntegrationException; import com.synopsys.integration.log.IntLogger; import com.synopsys.integration.rest.HttpUrl; diff --git a/src/main/java/com/synopsys/integration/blackduck/service/dataservice/ProjectUsersService.java b/src/main/java/com/blackduck/integration/blackduck/service/dataservice/ProjectUsersService.java similarity index 96% rename from src/main/java/com/synopsys/integration/blackduck/service/dataservice/ProjectUsersService.java rename to src/main/java/com/blackduck/integration/blackduck/service/dataservice/ProjectUsersService.java index d4780d50d..9764ad478 100644 --- a/src/main/java/com/synopsys/integration/blackduck/service/dataservice/ProjectUsersService.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/dataservice/ProjectUsersService.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.service.dataservice; +package com.blackduck.integration.blackduck.service.dataservice; import java.util.ArrayList; import java.util.HashSet; @@ -14,6 +14,8 @@ import java.util.Set; import java.util.stream.Collectors; +import com.blackduck.integration.blackduck.service.BlackDuckApiClient; +import com.blackduck.integration.blackduck.service.DataService; import com.synopsys.integration.blackduck.api.core.response.UrlMultipleResponses; import com.synopsys.integration.blackduck.api.generated.discovery.ApiDiscovery; import com.synopsys.integration.blackduck.api.manual.view.ProjectView; @@ -23,9 +25,7 @@ import com.synopsys.integration.blackduck.api.manual.temporary.component.AssignedUserRequest; import com.synopsys.integration.blackduck.api.manual.temporary.response.AssignedUserGroupView; import com.synopsys.integration.blackduck.api.manual.temporary.view.AssignedUserView; -import com.synopsys.integration.blackduck.exception.BlackDuckIntegrationException; -import com.synopsys.integration.blackduck.service.BlackDuckApiClient; -import com.synopsys.integration.blackduck.service.DataService; +import com.blackduck.integration.blackduck.exception.BlackDuckIntegrationException; import com.synopsys.integration.exception.IntegrationException; import com.synopsys.integration.log.IntLogger; import com.synopsys.integration.rest.HttpUrl; diff --git a/src/main/java/com/synopsys/integration/blackduck/service/dataservice/RoleService.java b/src/main/java/com/blackduck/integration/blackduck/service/dataservice/RoleService.java similarity index 83% rename from src/main/java/com/synopsys/integration/blackduck/service/dataservice/RoleService.java rename to src/main/java/com/blackduck/integration/blackduck/service/dataservice/RoleService.java index 353a8e6bc..f5299670d 100644 --- a/src/main/java/com/synopsys/integration/blackduck/service/dataservice/RoleService.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/dataservice/RoleService.java @@ -5,18 +5,18 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.service.dataservice; +package com.blackduck.integration.blackduck.service.dataservice; import java.util.List; +import com.blackduck.integration.blackduck.http.BlackDuckRequestBuilder; +import com.blackduck.integration.blackduck.http.BlackDuckRequestFilter; +import com.blackduck.integration.blackduck.service.BlackDuckApiClient; +import com.blackduck.integration.blackduck.service.DataService; import com.synopsys.integration.blackduck.api.core.response.UrlMultipleResponses; import com.synopsys.integration.blackduck.api.generated.discovery.ApiDiscovery; import com.synopsys.integration.blackduck.api.generated.view.RoleView; -import com.synopsys.integration.blackduck.http.BlackDuckRequestBuilder; -import com.synopsys.integration.blackduck.http.BlackDuckRequestFilter; -import com.synopsys.integration.blackduck.service.BlackDuckApiClient; -import com.synopsys.integration.blackduck.service.DataService; -import com.synopsys.integration.blackduck.service.request.BlackDuckMultipleRequest; +import com.blackduck.integration.blackduck.service.request.BlackDuckMultipleRequest; import com.synopsys.integration.exception.IntegrationException; import com.synopsys.integration.log.IntLogger; diff --git a/src/main/java/com/synopsys/integration/blackduck/service/dataservice/TagService.java b/src/main/java/com/blackduck/integration/blackduck/service/dataservice/TagService.java similarity index 87% rename from src/main/java/com/synopsys/integration/blackduck/service/dataservice/TagService.java rename to src/main/java/com/blackduck/integration/blackduck/service/dataservice/TagService.java index 78f0a374f..e972bb05a 100644 --- a/src/main/java/com/synopsys/integration/blackduck/service/dataservice/TagService.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/dataservice/TagService.java @@ -5,17 +5,17 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.service.dataservice; +package com.blackduck.integration.blackduck.service.dataservice; import java.util.List; import java.util.Optional; +import com.blackduck.integration.blackduck.service.BlackDuckApiClient; +import com.blackduck.integration.blackduck.service.DataService; import com.synopsys.integration.blackduck.api.generated.discovery.ApiDiscovery; import com.synopsys.integration.blackduck.api.manual.view.ProjectView; import com.synopsys.integration.blackduck.api.generated.view.TagView; -import com.synopsys.integration.blackduck.exception.BlackDuckIntegrationException; -import com.synopsys.integration.blackduck.service.BlackDuckApiClient; -import com.synopsys.integration.blackduck.service.DataService; +import com.blackduck.integration.blackduck.exception.BlackDuckIntegrationException; import com.synopsys.integration.exception.IntegrationException; import com.synopsys.integration.log.IntLogger; import com.synopsys.integration.rest.HttpUrl; diff --git a/src/main/java/com/synopsys/integration/blackduck/service/dataservice/UserGroupService.java b/src/main/java/com/blackduck/integration/blackduck/service/dataservice/UserGroupService.java similarity index 93% rename from src/main/java/com/synopsys/integration/blackduck/service/dataservice/UserGroupService.java rename to src/main/java/com/blackduck/integration/blackduck/service/dataservice/UserGroupService.java index 28934137a..53596f00b 100644 --- a/src/main/java/com/synopsys/integration/blackduck/service/dataservice/UserGroupService.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/dataservice/UserGroupService.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.service.dataservice; +package com.blackduck.integration.blackduck.service.dataservice; import java.util.ArrayList; import java.util.Collections; @@ -16,18 +16,17 @@ import java.util.function.BiPredicate; import java.util.function.Predicate; +import com.blackduck.integration.blackduck.http.BlackDuckRequestBuilder; +import com.blackduck.integration.blackduck.service.BlackDuckApiClient; +import com.blackduck.integration.blackduck.service.DataService; +import com.blackduck.integration.blackduck.service.request.BlackDuckMultipleRequest; import com.synopsys.integration.blackduck.api.generated.discovery.ApiDiscovery; import com.synopsys.integration.blackduck.api.generated.response.AssignedProjectView; import com.synopsys.integration.blackduck.api.manual.view.ProjectView; -import com.synopsys.integration.blackduck.http.BlackDuckRequestBuilder; import com.synopsys.integration.blackduck.api.generated.view.RoleAssignmentView; -import com.synopsys.integration.blackduck.api.generated.view.RoleView; import com.synopsys.integration.blackduck.api.generated.view.UserGroupView; import com.synopsys.integration.blackduck.api.generated.view.UserView; import com.synopsys.integration.blackduck.api.manual.temporary.component.UserGroupRequest; -import com.synopsys.integration.blackduck.service.BlackDuckApiClient; -import com.synopsys.integration.blackduck.service.DataService; -import com.synopsys.integration.blackduck.service.request.BlackDuckMultipleRequest; import com.synopsys.integration.exception.IntegrationException; import com.synopsys.integration.log.IntLogger; import com.synopsys.integration.rest.HttpUrl; diff --git a/src/main/java/com/synopsys/integration/blackduck/service/dataservice/UserRoleService.java b/src/main/java/com/blackduck/integration/blackduck/service/dataservice/UserRoleService.java similarity index 91% rename from src/main/java/com/synopsys/integration/blackduck/service/dataservice/UserRoleService.java rename to src/main/java/com/blackduck/integration/blackduck/service/dataservice/UserRoleService.java index a4077a6f8..9d9e86b95 100644 --- a/src/main/java/com/synopsys/integration/blackduck/service/dataservice/UserRoleService.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/dataservice/UserRoleService.java @@ -5,8 +5,10 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.service.dataservice; +package com.blackduck.integration.blackduck.service.dataservice; +import com.blackduck.integration.blackduck.service.BlackDuckApiClient; +import com.blackduck.integration.blackduck.service.DataService; import org.jetbrains.annotations.NotNull; import com.synopsys.integration.blackduck.api.generated.discovery.ApiDiscovery; @@ -14,8 +16,6 @@ import com.synopsys.integration.blackduck.api.generated.view.RoleView; import com.synopsys.integration.blackduck.api.generated.view.UserView; import com.synopsys.integration.blackduck.api.manual.temporary.component.RoleAssignmentRequest; -import com.synopsys.integration.blackduck.service.BlackDuckApiClient; -import com.synopsys.integration.blackduck.service.DataService; import com.synopsys.integration.exception.IntegrationException; import com.synopsys.integration.log.IntLogger; import com.synopsys.integration.rest.HttpUrl; diff --git a/src/main/java/com/synopsys/integration/blackduck/service/dataservice/UserService.java b/src/main/java/com/blackduck/integration/blackduck/service/dataservice/UserService.java similarity index 87% rename from src/main/java/com/synopsys/integration/blackduck/service/dataservice/UserService.java rename to src/main/java/com/blackduck/integration/blackduck/service/dataservice/UserService.java index df8ede3f4..e29866073 100644 --- a/src/main/java/com/synopsys/integration/blackduck/service/dataservice/UserService.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/dataservice/UserService.java @@ -5,24 +5,24 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.service.dataservice; +package com.blackduck.integration.blackduck.service.dataservice; import java.util.List; import java.util.Optional; +import com.blackduck.integration.blackduck.http.BlackDuckPageDefinition; +import com.blackduck.integration.blackduck.http.BlackDuckPageResponse; +import com.blackduck.integration.blackduck.http.BlackDuckQuery; +import com.blackduck.integration.blackduck.http.BlackDuckRequestBuilder; +import com.blackduck.integration.blackduck.service.BlackDuckApiClient; +import com.blackduck.integration.blackduck.service.DataService; +import com.blackduck.integration.blackduck.service.request.BlackDuckMultipleRequest; +import com.blackduck.integration.blackduck.service.request.BlackDuckRequest; import com.synopsys.integration.blackduck.api.core.response.UrlMultipleResponses; import com.synopsys.integration.blackduck.api.core.response.UrlSingleResponse; import com.synopsys.integration.blackduck.api.generated.discovery.ApiDiscovery; import com.synopsys.integration.blackduck.api.generated.view.UserView; import com.synopsys.integration.blackduck.api.manual.temporary.component.UserRequest; -import com.synopsys.integration.blackduck.http.BlackDuckPageDefinition; -import com.synopsys.integration.blackduck.http.BlackDuckPageResponse; -import com.synopsys.integration.blackduck.http.BlackDuckQuery; -import com.synopsys.integration.blackduck.http.BlackDuckRequestBuilder; -import com.synopsys.integration.blackduck.service.BlackDuckApiClient; -import com.synopsys.integration.blackduck.service.DataService; -import com.synopsys.integration.blackduck.service.request.BlackDuckMultipleRequest; -import com.synopsys.integration.blackduck.service.request.BlackDuckRequest; import com.synopsys.integration.exception.IntegrationException; import com.synopsys.integration.log.IntLogger; import com.synopsys.integration.rest.HttpUrl; diff --git a/src/main/java/com/synopsys/integration/blackduck/service/model/BlackDuckServerData.java b/src/main/java/com/blackduck/integration/blackduck/service/model/BlackDuckServerData.java similarity index 93% rename from src/main/java/com/synopsys/integration/blackduck/service/model/BlackDuckServerData.java rename to src/main/java/com/blackduck/integration/blackduck/service/model/BlackDuckServerData.java index 2c09b848c..07c0156ad 100644 --- a/src/main/java/com/synopsys/integration/blackduck/service/model/BlackDuckServerData.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/model/BlackDuckServerData.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.service.model; +package com.blackduck.integration.blackduck.service.model; import java.util.Optional; diff --git a/src/main/java/com/synopsys/integration/blackduck/service/model/ComponentVersionPolicyViolationCount.java b/src/main/java/com/blackduck/integration/blackduck/service/model/ComponentVersionPolicyViolationCount.java similarity index 96% rename from src/main/java/com/synopsys/integration/blackduck/service/model/ComponentVersionPolicyViolationCount.java rename to src/main/java/com/blackduck/integration/blackduck/service/model/ComponentVersionPolicyViolationCount.java index db54beb79..a168ae60d 100644 --- a/src/main/java/com/synopsys/integration/blackduck/service/model/ComponentVersionPolicyViolationCount.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/model/ComponentVersionPolicyViolationCount.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.service.model; +package com.blackduck.integration.blackduck.service.model; import java.util.EnumSet; import java.util.Set; diff --git a/src/main/java/com/synopsys/integration/blackduck/service/model/ComponentVersionStatusCount.java b/src/main/java/com/blackduck/integration/blackduck/service/model/ComponentVersionStatusCount.java similarity index 96% rename from src/main/java/com/synopsys/integration/blackduck/service/model/ComponentVersionStatusCount.java rename to src/main/java/com/blackduck/integration/blackduck/service/model/ComponentVersionStatusCount.java index 0f52f9ccb..577d6a105 100644 --- a/src/main/java/com/synopsys/integration/blackduck/service/model/ComponentVersionStatusCount.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/model/ComponentVersionStatusCount.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.service.model; +package com.blackduck.integration.blackduck.service.model; import java.util.EnumSet; import java.util.Set; diff --git a/src/main/java/com/synopsys/integration/blackduck/service/model/ComponentVersionVulnerabilities.java b/src/main/java/com/blackduck/integration/blackduck/service/model/ComponentVersionVulnerabilities.java similarity index 94% rename from src/main/java/com/synopsys/integration/blackduck/service/model/ComponentVersionVulnerabilities.java rename to src/main/java/com/blackduck/integration/blackduck/service/model/ComponentVersionVulnerabilities.java index 623fd761f..ed80ea97c 100644 --- a/src/main/java/com/synopsys/integration/blackduck/service/model/ComponentVersionVulnerabilities.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/model/ComponentVersionVulnerabilities.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.service.model; +package com.blackduck.integration.blackduck.service.model; import java.util.List; diff --git a/src/main/java/com/synopsys/integration/blackduck/service/model/MatchedFilesModel.java b/src/main/java/com/blackduck/integration/blackduck/service/model/MatchedFilesModel.java similarity index 96% rename from src/main/java/com/synopsys/integration/blackduck/service/model/MatchedFilesModel.java rename to src/main/java/com/blackduck/integration/blackduck/service/model/MatchedFilesModel.java index d9756d931..dfeca9411 100644 --- a/src/main/java/com/synopsys/integration/blackduck/service/model/MatchedFilesModel.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/model/MatchedFilesModel.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.service.model; +package com.blackduck.integration.blackduck.service.model; import java.util.HashSet; import java.util.Set; diff --git a/src/main/java/com/synopsys/integration/blackduck/service/model/NotificationTaskRange.java b/src/main/java/com/blackduck/integration/blackduck/service/model/NotificationTaskRange.java similarity index 93% rename from src/main/java/com/synopsys/integration/blackduck/service/model/NotificationTaskRange.java rename to src/main/java/com/blackduck/integration/blackduck/service/model/NotificationTaskRange.java index 17ed0bcca..6d8f3e35c 100644 --- a/src/main/java/com/synopsys/integration/blackduck/service/model/NotificationTaskRange.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/model/NotificationTaskRange.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.service.model; +package com.blackduck.integration.blackduck.service.model; import java.util.Date; diff --git a/src/main/java/com/synopsys/integration/blackduck/service/model/PolicyRuleExpressionSetBuilder.java b/src/main/java/com/blackduck/integration/blackduck/service/model/PolicyRuleExpressionSetBuilder.java similarity index 94% rename from src/main/java/com/synopsys/integration/blackduck/service/model/PolicyRuleExpressionSetBuilder.java rename to src/main/java/com/blackduck/integration/blackduck/service/model/PolicyRuleExpressionSetBuilder.java index b70d4d015..cc7ffd414 100644 --- a/src/main/java/com/synopsys/integration/blackduck/service/model/PolicyRuleExpressionSetBuilder.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/model/PolicyRuleExpressionSetBuilder.java @@ -5,17 +5,17 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.service.model; +package com.blackduck.integration.blackduck.service.model; import java.math.BigDecimal; import java.util.ArrayList; import java.util.Date; import java.util.List; -import com.synopsys.integration.blackduck.api.enumeration.PolicyRuleComponentUsageValueSetType; -import com.synopsys.integration.blackduck.api.enumeration.PolicyRuleConditionOperatorType; -import com.synopsys.integration.blackduck.api.enumeration.PolicyRuleConditionType; -import com.synopsys.integration.blackduck.api.enumeration.ReviewStatusType; +import com.blackduck.integration.blackduck.api.enumeration.PolicyRuleComponentUsageValueSetType; +import com.blackduck.integration.blackduck.api.enumeration.PolicyRuleConditionOperatorType; +import com.blackduck.integration.blackduck.api.enumeration.PolicyRuleConditionType; +import com.blackduck.integration.blackduck.api.enumeration.ReviewStatusType; import com.synopsys.integration.blackduck.api.generated.component.PolicyRuleExpressionExpressionsParametersView; import com.synopsys.integration.blackduck.api.generated.component.PolicyRuleExpressionExpressionsView; import com.synopsys.integration.blackduck.api.generated.component.PolicyRuleExpressionView; @@ -26,7 +26,7 @@ import com.synopsys.integration.blackduck.api.generated.view.LicenseView; import com.synopsys.integration.blackduck.api.manual.view.ProjectView; import com.synopsys.integration.blackduck.api.manual.temporary.enumeration.ProjectVersionPhaseType; -import com.synopsys.integration.blackduck.exception.BlackDuckIntegrationException; +import com.blackduck.integration.blackduck.exception.BlackDuckIntegrationException; import com.synopsys.integration.rest.HttpUrl; import com.synopsys.integration.rest.RestConstants; diff --git a/src/main/java/com/synopsys/integration/blackduck/service/model/PolicyStatusDescription.java b/src/main/java/com/blackduck/integration/blackduck/service/model/PolicyStatusDescription.java similarity index 97% rename from src/main/java/com/synopsys/integration/blackduck/service/model/PolicyStatusDescription.java rename to src/main/java/com/blackduck/integration/blackduck/service/model/PolicyStatusDescription.java index d81f1ae9f..99f505a87 100644 --- a/src/main/java/com/synopsys/integration/blackduck/service/model/PolicyStatusDescription.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/model/PolicyStatusDescription.java @@ -5,14 +5,14 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.service.model; +package com.blackduck.integration.blackduck.service.model; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import com.synopsys.integration.blackduck.api.enumeration.RankedSeverityType; +import com.blackduck.integration.blackduck.api.enumeration.RankedSeverityType; import com.synopsys.integration.blackduck.api.generated.component.ProjectVersionPolicyStatusComponentVersionPolicyViolationDetailsView; import com.synopsys.integration.blackduck.api.generated.enumeration.PolicyRuleSeverityType; import com.synopsys.integration.blackduck.api.generated.enumeration.ProjectVersionComponentPolicyStatusType; diff --git a/src/main/java/com/synopsys/integration/blackduck/service/model/ProjectNameVersionGuess.java b/src/main/java/com/blackduck/integration/blackduck/service/model/ProjectNameVersionGuess.java similarity index 91% rename from src/main/java/com/synopsys/integration/blackduck/service/model/ProjectNameVersionGuess.java rename to src/main/java/com/blackduck/integration/blackduck/service/model/ProjectNameVersionGuess.java index f3a039969..da2233f31 100644 --- a/src/main/java/com/synopsys/integration/blackduck/service/model/ProjectNameVersionGuess.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/model/ProjectNameVersionGuess.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.service.model; +package com.blackduck.integration.blackduck.service.model; public class ProjectNameVersionGuess { private final String projectName; diff --git a/src/main/java/com/synopsys/integration/blackduck/service/model/ProjectNameVersionGuesser.java b/src/main/java/com/blackduck/integration/blackduck/service/model/ProjectNameVersionGuesser.java similarity index 97% rename from src/main/java/com/synopsys/integration/blackduck/service/model/ProjectNameVersionGuesser.java rename to src/main/java/com/blackduck/integration/blackduck/service/model/ProjectNameVersionGuesser.java index 134cb4b83..e4bb1673f 100644 --- a/src/main/java/com/synopsys/integration/blackduck/service/model/ProjectNameVersionGuesser.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/model/ProjectNameVersionGuesser.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.service.model; +package com.blackduck.integration.blackduck.service.model; import java.text.SimpleDateFormat; import java.util.Date; diff --git a/src/main/java/com/synopsys/integration/blackduck/service/model/ProjectSyncModel.java b/src/main/java/com/blackduck/integration/blackduck/service/model/ProjectSyncModel.java similarity index 99% rename from src/main/java/com/synopsys/integration/blackduck/service/model/ProjectSyncModel.java rename to src/main/java/com/blackduck/integration/blackduck/service/model/ProjectSyncModel.java index ccbbac3ac..687be410d 100644 --- a/src/main/java/com/synopsys/integration/blackduck/service/model/ProjectSyncModel.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/model/ProjectSyncModel.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.service.model; +package com.blackduck.integration.blackduck.service.model; import java.lang.reflect.Field; import java.util.Arrays; diff --git a/src/main/java/com/synopsys/integration/blackduck/service/model/ProjectVersionDescription.java b/src/main/java/com/blackduck/integration/blackduck/service/model/ProjectVersionDescription.java similarity index 93% rename from src/main/java/com/synopsys/integration/blackduck/service/model/ProjectVersionDescription.java rename to src/main/java/com/blackduck/integration/blackduck/service/model/ProjectVersionDescription.java index 64ed5d4e3..c6056efb7 100644 --- a/src/main/java/com/synopsys/integration/blackduck/service/model/ProjectVersionDescription.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/model/ProjectVersionDescription.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.service.model; +package com.blackduck.integration.blackduck.service.model; public class ProjectVersionDescription { private final String projectName; diff --git a/src/main/java/com/synopsys/integration/blackduck/service/model/ProjectVersionWrapper.java b/src/main/java/com/blackduck/integration/blackduck/service/model/ProjectVersionWrapper.java similarity index 95% rename from src/main/java/com/synopsys/integration/blackduck/service/model/ProjectVersionWrapper.java rename to src/main/java/com/blackduck/integration/blackduck/service/model/ProjectVersionWrapper.java index 30884a09c..687543d2c 100644 --- a/src/main/java/com/synopsys/integration/blackduck/service/model/ProjectVersionWrapper.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/model/ProjectVersionWrapper.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.service.model; +package com.blackduck.integration.blackduck.service.model; import com.synopsys.integration.blackduck.api.generated.view.ProjectVersionView; import com.synopsys.integration.blackduck.api.manual.view.ProjectView; diff --git a/src/main/java/com/synopsys/integration/blackduck/service/model/RiskProfileCounts.java b/src/main/java/com/blackduck/integration/blackduck/service/model/RiskProfileCounts.java similarity index 95% rename from src/main/java/com/synopsys/integration/blackduck/service/model/RiskProfileCounts.java rename to src/main/java/com/blackduck/integration/blackduck/service/model/RiskProfileCounts.java index 7135e9afb..7f2b83196 100644 --- a/src/main/java/com/synopsys/integration/blackduck/service/model/RiskProfileCounts.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/model/RiskProfileCounts.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.service.model; +package com.blackduck.integration.blackduck.service.model; import java.math.BigDecimal; import java.util.HashMap; diff --git a/src/main/java/com/synopsys/integration/blackduck/service/model/ScannerSplitStream.java b/src/main/java/com/blackduck/integration/blackduck/service/model/ScannerSplitStream.java similarity index 99% rename from src/main/java/com/synopsys/integration/blackduck/service/model/ScannerSplitStream.java rename to src/main/java/com/blackduck/integration/blackduck/service/model/ScannerSplitStream.java index ed0b7550d..6efd5cc53 100644 --- a/src/main/java/com/synopsys/integration/blackduck/service/model/ScannerSplitStream.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/model/ScannerSplitStream.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.service.model; +package com.blackduck.integration.blackduck.service.model; import java.io.EOFException; import java.io.IOException; diff --git a/src/main/java/com/synopsys/integration/blackduck/service/model/StreamRedirectThread.java b/src/main/java/com/blackduck/integration/blackduck/service/model/StreamRedirectThread.java similarity index 94% rename from src/main/java/com/synopsys/integration/blackduck/service/model/StreamRedirectThread.java rename to src/main/java/com/blackduck/integration/blackduck/service/model/StreamRedirectThread.java index 127c949eb..39ffc2a39 100644 --- a/src/main/java/com/synopsys/integration/blackduck/service/model/StreamRedirectThread.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/model/StreamRedirectThread.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.service.model; +package com.blackduck.integration.blackduck.service.model; import java.io.IOException; import java.io.InputStream; diff --git a/src/main/java/com/synopsys/integration/blackduck/service/model/VersionBomComponentModel.java b/src/main/java/com/blackduck/integration/blackduck/service/model/VersionBomComponentModel.java similarity index 91% rename from src/main/java/com/synopsys/integration/blackduck/service/model/VersionBomComponentModel.java rename to src/main/java/com/blackduck/integration/blackduck/service/model/VersionBomComponentModel.java index 7f0b1cfd6..658a1d0d3 100644 --- a/src/main/java/com/synopsys/integration/blackduck/service/model/VersionBomComponentModel.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/model/VersionBomComponentModel.java @@ -5,15 +5,12 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.service.model; +package com.blackduck.integration.blackduck.service.model; import java.util.ArrayList; import java.util.Date; import java.util.List; -import com.synopsys.integration.blackduck.api.generated.component.ProjectVersionComponentActivityDataView; -import com.synopsys.integration.blackduck.api.generated.component.ProjectVersionComponentLicensesView; -import com.synopsys.integration.blackduck.api.generated.component.ProjectVersionComponentReviewedDetailsView; import com.synopsys.integration.blackduck.api.generated.component.ProjectVersionComponentVersionActivityDataView; import com.synopsys.integration.blackduck.api.generated.component.ProjectVersionComponentVersionLicensesView; import com.synopsys.integration.blackduck.api.generated.component.ProjectVersionComponentVersionReviewedDetailsView; @@ -24,7 +21,6 @@ import com.synopsys.integration.blackduck.api.generated.enumeration.ProjectVersionComponentReviewStatusType; import com.synopsys.integration.blackduck.api.generated.view.ComponentMatchedFilesView; import com.synopsys.integration.blackduck.api.generated.view.ProjectVersionComponentVersionView; -import com.synopsys.integration.blackduck.api.generated.view.ProjectVersionComponentView; import com.synopsys.integration.blackduck.api.manual.temporary.component.VersionBomOriginView; public class VersionBomComponentModel { diff --git a/src/main/java/com/synopsys/integration/blackduck/service/request/AcceptHeaderEditor.java b/src/main/java/com/blackduck/integration/blackduck/service/request/AcceptHeaderEditor.java similarity index 90% rename from src/main/java/com/synopsys/integration/blackduck/service/request/AcceptHeaderEditor.java rename to src/main/java/com/blackduck/integration/blackduck/service/request/AcceptHeaderEditor.java index b980d0d69..2d3e0d110 100644 --- a/src/main/java/com/synopsys/integration/blackduck/service/request/AcceptHeaderEditor.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/request/AcceptHeaderEditor.java @@ -5,10 +5,10 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.service.request; +package com.blackduck.integration.blackduck.service.request; +import com.blackduck.integration.blackduck.http.BlackDuckRequestBuilder; import com.synopsys.integration.blackduck.api.generated.discovery.BlackDuckMediaTypeDiscovery; -import com.synopsys.integration.blackduck.http.BlackDuckRequestBuilder; import com.synopsys.integration.rest.HttpUrl; /** diff --git a/src/main/java/com/synopsys/integration/blackduck/service/request/BlackDuckMultipleRequest.java b/src/main/java/com/blackduck/integration/blackduck/service/request/BlackDuckMultipleRequest.java similarity index 88% rename from src/main/java/com/synopsys/integration/blackduck/service/request/BlackDuckMultipleRequest.java rename to src/main/java/com/blackduck/integration/blackduck/service/request/BlackDuckMultipleRequest.java index d6eda06c1..31c63fd79 100644 --- a/src/main/java/com/synopsys/integration/blackduck/service/request/BlackDuckMultipleRequest.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/request/BlackDuckMultipleRequest.java @@ -5,11 +5,11 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.service.request; +package com.blackduck.integration.blackduck.service.request; +import com.blackduck.integration.blackduck.http.BlackDuckRequestBuilder; import com.synopsys.integration.blackduck.api.core.BlackDuckResponse; import com.synopsys.integration.blackduck.api.core.response.UrlMultipleResponses; -import com.synopsys.integration.blackduck.http.BlackDuckRequestBuilder; public class BlackDuckMultipleRequest extends BlackDuckRequest> { public BlackDuckMultipleRequest(BlackDuckRequestBuilder blackDuckRequestBuilder, UrlMultipleResponses urlResponse) { diff --git a/src/main/java/com/synopsys/integration/blackduck/service/request/BlackDuckRequest.java b/src/main/java/com/blackduck/integration/blackduck/service/request/BlackDuckRequest.java similarity index 95% rename from src/main/java/com/synopsys/integration/blackduck/service/request/BlackDuckRequest.java rename to src/main/java/com/blackduck/integration/blackduck/service/request/BlackDuckRequest.java index 027dd5ffb..75cf4a97b 100644 --- a/src/main/java/com/synopsys/integration/blackduck/service/request/BlackDuckRequest.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/request/BlackDuckRequest.java @@ -5,14 +5,14 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.service.request; +package com.blackduck.integration.blackduck.service.request; +import com.blackduck.integration.blackduck.http.BlackDuckRequestBuilder; import com.synopsys.integration.blackduck.api.core.BlackDuckResponse; import com.synopsys.integration.blackduck.api.core.response.UrlMultipleResponses; import com.synopsys.integration.blackduck.api.core.response.UrlResponse; import com.synopsys.integration.blackduck.api.core.response.UrlSingleResponse; import com.synopsys.integration.blackduck.api.generated.discovery.BlackDuckMediaTypeDiscovery; -import com.synopsys.integration.blackduck.http.BlackDuckRequestBuilder; import com.synopsys.integration.rest.HttpMethod; import com.synopsys.integration.rest.HttpUrl; import com.synopsys.integration.rest.request.Request; diff --git a/src/main/java/com/synopsys/integration/blackduck/service/request/BlackDuckRequestBuilderEditor.java b/src/main/java/com/blackduck/integration/blackduck/service/request/BlackDuckRequestBuilderEditor.java similarity index 76% rename from src/main/java/com/synopsys/integration/blackduck/service/request/BlackDuckRequestBuilderEditor.java rename to src/main/java/com/blackduck/integration/blackduck/service/request/BlackDuckRequestBuilderEditor.java index 041bb65e2..7fcfa293c 100644 --- a/src/main/java/com/synopsys/integration/blackduck/service/request/BlackDuckRequestBuilderEditor.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/request/BlackDuckRequestBuilderEditor.java @@ -5,9 +5,9 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.service.request; +package com.blackduck.integration.blackduck.service.request; -import com.synopsys.integration.blackduck.http.BlackDuckRequestBuilder; +import com.blackduck.integration.blackduck.http.BlackDuckRequestBuilder; /** * This will allow for encapsulating multiple related changes to the diff --git a/src/main/java/com/synopsys/integration/blackduck/service/request/BlackDuckResponseRequest.java b/src/main/java/com/blackduck/integration/blackduck/service/request/BlackDuckResponseRequest.java similarity index 81% rename from src/main/java/com/synopsys/integration/blackduck/service/request/BlackDuckResponseRequest.java rename to src/main/java/com/blackduck/integration/blackduck/service/request/BlackDuckResponseRequest.java index cf3b400f8..a46886d11 100644 --- a/src/main/java/com/synopsys/integration/blackduck/service/request/BlackDuckResponseRequest.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/request/BlackDuckResponseRequest.java @@ -5,15 +5,15 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.service.request; +package com.blackduck.integration.blackduck.service.request; +import com.blackduck.integration.blackduck.http.BlackDuckRequestBuilder; import com.synopsys.integration.blackduck.api.core.response.UrlSingleResponse; import com.synopsys.integration.blackduck.api.manual.response.BlackDuckResponseResponse; -import com.synopsys.integration.blackduck.http.BlackDuckRequestBuilder; public class BlackDuckResponseRequest extends BlackDuckRequest> { public BlackDuckResponseRequest(BlackDuckRequestBuilder blackDuckRequestBuilder, - UrlSingleResponse urlResponse) { + UrlSingleResponse urlResponse) { super(blackDuckRequestBuilder, urlResponse); } diff --git a/src/main/java/com/synopsys/integration/blackduck/service/request/BlackDuckSingleRequest.java b/src/main/java/com/blackduck/integration/blackduck/service/request/BlackDuckSingleRequest.java similarity index 87% rename from src/main/java/com/synopsys/integration/blackduck/service/request/BlackDuckSingleRequest.java rename to src/main/java/com/blackduck/integration/blackduck/service/request/BlackDuckSingleRequest.java index 9c8536fa3..dd818d667 100644 --- a/src/main/java/com/synopsys/integration/blackduck/service/request/BlackDuckSingleRequest.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/request/BlackDuckSingleRequest.java @@ -5,11 +5,11 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.service.request; +package com.blackduck.integration.blackduck.service.request; +import com.blackduck.integration.blackduck.http.BlackDuckRequestBuilder; import com.synopsys.integration.blackduck.api.core.BlackDuckResponse; import com.synopsys.integration.blackduck.api.core.response.UrlSingleResponse; -import com.synopsys.integration.blackduck.http.BlackDuckRequestBuilder; public class BlackDuckSingleRequest extends BlackDuckRequest> { public BlackDuckSingleRequest(BlackDuckRequestBuilder blackDuckRequestBuilder, UrlSingleResponse urlResponse) { diff --git a/src/main/java/com/synopsys/integration/blackduck/service/request/BlackDuckStringRequest.java b/src/main/java/com/blackduck/integration/blackduck/service/request/BlackDuckStringRequest.java similarity index 81% rename from src/main/java/com/synopsys/integration/blackduck/service/request/BlackDuckStringRequest.java rename to src/main/java/com/blackduck/integration/blackduck/service/request/BlackDuckStringRequest.java index 1f34cbd07..1dfdc4f09 100644 --- a/src/main/java/com/synopsys/integration/blackduck/service/request/BlackDuckStringRequest.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/request/BlackDuckStringRequest.java @@ -5,15 +5,15 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.service.request; +package com.blackduck.integration.blackduck.service.request; +import com.blackduck.integration.blackduck.http.BlackDuckRequestBuilder; import com.synopsys.integration.blackduck.api.core.response.UrlSingleResponse; import com.synopsys.integration.blackduck.api.manual.response.BlackDuckStringResponse; -import com.synopsys.integration.blackduck.http.BlackDuckRequestBuilder; public class BlackDuckStringRequest extends BlackDuckRequest> { public BlackDuckStringRequest(BlackDuckRequestBuilder blackDuckRequestBuilder, - UrlSingleResponse urlResponse) { + UrlSingleResponse urlResponse) { super(blackDuckRequestBuilder, urlResponse); } diff --git a/src/main/java/com/synopsys/integration/blackduck/service/request/NotificationEditor.java b/src/main/java/com/blackduck/integration/blackduck/service/request/NotificationEditor.java similarity index 93% rename from src/main/java/com/synopsys/integration/blackduck/service/request/NotificationEditor.java rename to src/main/java/com/blackduck/integration/blackduck/service/request/NotificationEditor.java index 79a256721..186e49b02 100644 --- a/src/main/java/com/synopsys/integration/blackduck/service/request/NotificationEditor.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/request/NotificationEditor.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.service.request; +package com.blackduck.integration.blackduck.service.request; import java.text.SimpleDateFormat; import java.time.OffsetDateTime; @@ -15,9 +15,9 @@ import java.util.stream.Collectors; import java.util.stream.Stream; +import com.blackduck.integration.blackduck.http.BlackDuckRequestBuilder; +import com.blackduck.integration.blackduck.http.BlackDuckRequestFilter; import com.synopsys.integration.blackduck.api.manual.temporary.enumeration.NotificationType; -import com.synopsys.integration.blackduck.http.BlackDuckRequestBuilder; -import com.synopsys.integration.blackduck.http.BlackDuckRequestFilter; import com.synopsys.integration.rest.RestConstants; import com.synopsys.integration.util.Stringable; diff --git a/src/main/java/com/synopsys/integration/blackduck/service/request/PagingDefaultsEditor.java b/src/main/java/com/blackduck/integration/blackduck/service/request/PagingDefaultsEditor.java similarity index 90% rename from src/main/java/com/synopsys/integration/blackduck/service/request/PagingDefaultsEditor.java rename to src/main/java/com/blackduck/integration/blackduck/service/request/PagingDefaultsEditor.java index d3769d4d1..21890dfa3 100644 --- a/src/main/java/com/synopsys/integration/blackduck/service/request/PagingDefaultsEditor.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/request/PagingDefaultsEditor.java @@ -5,12 +5,12 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.service.request; +package com.blackduck.integration.blackduck.service.request; import java.util.function.Consumer; import java.util.function.Function; -import com.synopsys.integration.blackduck.http.BlackDuckRequestBuilder; +import com.blackduck.integration.blackduck.http.BlackDuckRequestBuilder; /** * Often, a request to Black Duck will need to have defaults set for paging. If diff --git a/src/main/java/com/synopsys/integration/blackduck/useragent/BlackDuckCommon.java b/src/main/java/com/blackduck/integration/blackduck/useragent/BlackDuckCommon.java similarity index 97% rename from src/main/java/com/synopsys/integration/blackduck/useragent/BlackDuckCommon.java rename to src/main/java/com/blackduck/integration/blackduck/useragent/BlackDuckCommon.java index 3bd57c175..b297dc71a 100644 --- a/src/main/java/com/synopsys/integration/blackduck/useragent/BlackDuckCommon.java +++ b/src/main/java/com/blackduck/integration/blackduck/useragent/BlackDuckCommon.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.useragent; +package com.blackduck.integration.blackduck.useragent; import java.io.IOException; import java.io.InputStream; diff --git a/src/main/java/com/synopsys/integration/blackduck/useragent/UserAgentBuilder.java b/src/main/java/com/blackduck/integration/blackduck/useragent/UserAgentBuilder.java similarity index 94% rename from src/main/java/com/synopsys/integration/blackduck/useragent/UserAgentBuilder.java rename to src/main/java/com/blackduck/integration/blackduck/useragent/UserAgentBuilder.java index f3064eb1e..80b75e702 100644 --- a/src/main/java/com/synopsys/integration/blackduck/useragent/UserAgentBuilder.java +++ b/src/main/java/com/blackduck/integration/blackduck/useragent/UserAgentBuilder.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.useragent; +package com.blackduck.integration.blackduck.useragent; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/synopsys/integration/blackduck/useragent/UserAgentItem.java b/src/main/java/com/blackduck/integration/blackduck/useragent/UserAgentItem.java similarity index 96% rename from src/main/java/com/synopsys/integration/blackduck/useragent/UserAgentItem.java rename to src/main/java/com/blackduck/integration/blackduck/useragent/UserAgentItem.java index 176358567..b696008fe 100644 --- a/src/main/java/com/synopsys/integration/blackduck/useragent/UserAgentItem.java +++ b/src/main/java/com/blackduck/integration/blackduck/useragent/UserAgentItem.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.useragent; +package com.blackduck.integration.blackduck.useragent; import java.util.Optional; import java.util.function.Supplier; diff --git a/src/main/java/com/synopsys/integration/blackduck/version/BlackDuckVersion.java b/src/main/java/com/blackduck/integration/blackduck/version/BlackDuckVersion.java similarity index 96% rename from src/main/java/com/synopsys/integration/blackduck/version/BlackDuckVersion.java rename to src/main/java/com/blackduck/integration/blackduck/version/BlackDuckVersion.java index 1485cb094..460cf6dd5 100644 --- a/src/main/java/com/synopsys/integration/blackduck/version/BlackDuckVersion.java +++ b/src/main/java/com/blackduck/integration/blackduck/version/BlackDuckVersion.java @@ -5,7 +5,7 @@ * * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. */ -package com.synopsys.integration.blackduck.version; +package com.blackduck.integration.blackduck.version; import com.synopsys.integration.util.Stringable; diff --git a/src/main/java/com/synopsys/integration/blackduck/configuration/BlackDuckServerConfigKeys.java b/src/main/java/com/synopsys/integration/blackduck/configuration/BlackDuckServerConfigKeys.java deleted file mode 100644 index 10f262928..000000000 --- a/src/main/java/com/synopsys/integration/blackduck/configuration/BlackDuckServerConfigKeys.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * blackduck-common - * - * Copyright (c) 2024 Synopsys, Inc. - * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. - */ -package com.synopsys.integration.blackduck.configuration; - -import static com.synopsys.integration.blackduck.configuration.BlackDuckServerConfigBuilder.*; - -import java.util.HashSet; -import java.util.Set; - -import com.synopsys.integration.builder.BuilderPropertyKey; - -public class BlackDuckServerConfigKeys { - public static final BlackDuckServerConfigKeys KEYS = new BlackDuckServerConfigKeys(); - - public final Set common = new HashSet<>(); - public final Set apiToken = new HashSet<>(); - public final Set credentials = new HashSet<>(); - public final Set all = new HashSet<>(); - - public BlackDuckServerConfigKeys() { - common.add(URL_KEY); - common.add(SOLUTION_NAME_KEY); - common.add(SOLUTION_VERSION_KEY); - common.add(TIMEOUT_KEY); - common.add(PROXY_HOST_KEY); - common.add(PROXY_PORT_KEY); - common.add(PROXY_USERNAME_KEY); - common.add(PROXY_PASSWORD_KEY); - common.add(PROXY_NTLM_DOMAIN_KEY); - common.add(PROXY_NTLM_WORKSTATION_KEY); - common.add(TRUST_CERT_KEY); - - apiToken.addAll(common); - apiToken.add(API_TOKEN_KEY); - - credentials.addAll(common); - credentials.add(USERNAME_KEY); - credentials.add(PASSWORD_KEY); - - all.addAll(common); - all.add(API_TOKEN_KEY); - all.add(USERNAME_KEY); - all.add(PASSWORD_KEY); - } - -} diff --git a/src/test/java/com/synopsys/integration/blackduck/TimingExtension.java b/src/test/java/com/blackduck/integration/blackduck/TimingExtension.java similarity index 97% rename from src/test/java/com/synopsys/integration/blackduck/TimingExtension.java rename to src/test/java/com/blackduck/integration/blackduck/TimingExtension.java index b38ece4f3..479b90963 100644 --- a/src/test/java/com/synopsys/integration/blackduck/TimingExtension.java +++ b/src/test/java/com/blackduck/integration/blackduck/TimingExtension.java @@ -1,4 +1,4 @@ -package com.synopsys.integration.blackduck; +package com.blackduck.integration.blackduck; import java.lang.reflect.Method; import java.util.Date; diff --git a/src/test/java/com/synopsys/integration/blackduck/VersionSupport.java b/src/test/java/com/blackduck/integration/blackduck/VersionSupport.java similarity index 95% rename from src/test/java/com/synopsys/integration/blackduck/VersionSupport.java rename to src/test/java/com/blackduck/integration/blackduck/VersionSupport.java index 76be338f9..ca6c50dd8 100644 --- a/src/test/java/com/synopsys/integration/blackduck/VersionSupport.java +++ b/src/test/java/com/blackduck/integration/blackduck/VersionSupport.java @@ -1,4 +1,4 @@ -package com.synopsys.integration.blackduck; +package com.blackduck.integration.blackduck; import java.text.ParseException; import java.text.SimpleDateFormat; diff --git a/src/test/java/com/synopsys/integration/blackduck/api/enumeration/RankedSeverityTypeTest.java b/src/test/java/com/blackduck/integration/blackduck/api/enumeration/RankedSeverityTypeTest.java similarity index 87% rename from src/test/java/com/synopsys/integration/blackduck/api/enumeration/RankedSeverityTypeTest.java rename to src/test/java/com/blackduck/integration/blackduck/api/enumeration/RankedSeverityTypeTest.java index 885e6d3cf..7a9691a2c 100644 --- a/src/test/java/com/synopsys/integration/blackduck/api/enumeration/RankedSeverityTypeTest.java +++ b/src/test/java/com/blackduck/integration/blackduck/api/enumeration/RankedSeverityTypeTest.java @@ -1,14 +1,14 @@ -package com.synopsys.integration.blackduck.api.enumeration; +package com.blackduck.integration.blackduck.api.enumeration; import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.Arrays; import java.util.List; +import com.blackduck.integration.blackduck.TimingExtension; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import com.synopsys.integration.blackduck.TimingExtension; import com.synopsys.integration.blackduck.api.generated.enumeration.PolicyRuleSeverityType; @ExtendWith(TimingExtension.class) diff --git a/src/test/java/com/synopsys/integration/blackduck/bdio2/Bdio2RetryAwareStreamUploaderTest.java b/src/test/java/com/blackduck/integration/blackduck/bdio2/Bdio2RetryAwareStreamUploaderTest.java similarity index 95% rename from src/test/java/com/synopsys/integration/blackduck/bdio2/Bdio2RetryAwareStreamUploaderTest.java rename to src/test/java/com/blackduck/integration/blackduck/bdio2/Bdio2RetryAwareStreamUploaderTest.java index 5c5bb0e03..3ce4281fb 100644 --- a/src/test/java/com/synopsys/integration/blackduck/bdio2/Bdio2RetryAwareStreamUploaderTest.java +++ b/src/test/java/com/blackduck/integration/blackduck/bdio2/Bdio2RetryAwareStreamUploaderTest.java @@ -1,13 +1,16 @@ -package com.synopsys.integration.blackduck.bdio2; +package com.blackduck.integration.blackduck.bdio2; +import com.blackduck.integration.blackduck.bdio2.Bdio2RetryAwareStreamUploader; +import com.blackduck.integration.blackduck.bdio2.Bdio2StreamUploader; +import com.blackduck.integration.blackduck.bdio2.RetriableBdioUploadException; import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.mockito.Mockito; -import com.synopsys.integration.blackduck.bdio2.model.BdioFileContent; -import com.synopsys.integration.blackduck.exception.BlackDuckIntegrationException; -import com.synopsys.integration.blackduck.service.request.BlackDuckRequestBuilderEditor; +import com.blackduck.integration.blackduck.bdio2.model.BdioFileContent; +import com.blackduck.integration.blackduck.exception.BlackDuckIntegrationException; +import com.blackduck.integration.blackduck.service.request.BlackDuckRequestBuilderEditor; import com.synopsys.integration.exception.IntegrationException; import com.synopsys.integration.rest.HttpUrl; import com.synopsys.integration.rest.exception.IntegrationRestException; diff --git a/src/test/java/com/synopsys/integration/blackduck/bdio2/Bdio2UploadJobTest.java b/src/test/java/com/blackduck/integration/blackduck/bdio2/Bdio2UploadJobTest.java similarity index 92% rename from src/test/java/com/synopsys/integration/blackduck/bdio2/Bdio2UploadJobTest.java rename to src/test/java/com/blackduck/integration/blackduck/bdio2/Bdio2UploadJobTest.java index cb2add2cf..f6efc5bc3 100644 --- a/src/test/java/com/synopsys/integration/blackduck/bdio2/Bdio2UploadJobTest.java +++ b/src/test/java/com/blackduck/integration/blackduck/bdio2/Bdio2UploadJobTest.java @@ -1,23 +1,22 @@ -package com.synopsys.integration.blackduck.bdio2; +package com.blackduck.integration.blackduck.bdio2; import java.util.Collections; +import com.blackduck.integration.blackduck.bdio2.Bdio2RetryAwareStreamUploader; +import com.blackduck.integration.blackduck.bdio2.Bdio2UploadJob; +import com.blackduck.integration.blackduck.bdio2.RetriableBdioUploadException; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.mockito.Mockito; import org.slf4j.LoggerFactory; -import com.synopsys.integration.blackduck.bdio2.model.BdioFileContent; -import com.synopsys.integration.blackduck.exception.BlackDuckApiException; -import com.synopsys.integration.blackduck.service.request.BlackDuckRequestBuilderEditor; +import com.blackduck.integration.blackduck.bdio2.model.BdioFileContent; +import com.blackduck.integration.blackduck.service.request.BlackDuckRequestBuilderEditor; import com.synopsys.integration.exception.IntegrationException; import com.synopsys.integration.exception.IntegrationTimeoutException; import com.synopsys.integration.log.IntLogger; import com.synopsys.integration.log.Slf4jIntLogger; -import com.synopsys.integration.rest.HttpMethod; import com.synopsys.integration.rest.HttpUrl; -import com.synopsys.integration.rest.exception.IntegrationRestException; -import com.synopsys.integration.rest.response.DefaultResponse; import com.synopsys.integration.rest.response.Response; import com.synopsys.integration.wait.ResilientJobConfig; import com.synopsys.integration.wait.ResilientJobExecutor; diff --git a/src/test/java/com/synopsys/integration/blackduck/bdio2/util/Bdio2ContentExtractorTest.java b/src/test/java/com/blackduck/integration/blackduck/bdio2/util/Bdio2ContentExtractorTest.java similarity index 89% rename from src/test/java/com/synopsys/integration/blackduck/bdio2/util/Bdio2ContentExtractorTest.java rename to src/test/java/com/blackduck/integration/blackduck/bdio2/util/Bdio2ContentExtractorTest.java index ea8b72739..854e1a834 100644 --- a/src/test/java/com/synopsys/integration/blackduck/bdio2/util/Bdio2ContentExtractorTest.java +++ b/src/test/java/com/blackduck/integration/blackduck/bdio2/util/Bdio2ContentExtractorTest.java @@ -1,4 +1,4 @@ -package com.synopsys.integration.blackduck.bdio2.util; +package com.blackduck.integration.blackduck.bdio2.util; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.fail; @@ -7,9 +7,10 @@ import java.nio.file.Files; import java.util.List; +import com.blackduck.integration.blackduck.bdio2.util.Bdio2ContentExtractor; import org.junit.jupiter.api.Test; -import com.synopsys.integration.blackduck.bdio2.model.BdioFileContent; +import com.blackduck.integration.blackduck.bdio2.model.BdioFileContent; public class Bdio2ContentExtractorTest { @Test diff --git a/src/test/java/com/synopsys/integration/blackduck/bdio2/util/Bdio2FactoryTest.java b/src/test/java/com/blackduck/integration/blackduck/bdio2/util/Bdio2FactoryTest.java similarity index 95% rename from src/test/java/com/synopsys/integration/blackduck/bdio2/util/Bdio2FactoryTest.java rename to src/test/java/com/blackduck/integration/blackduck/bdio2/util/Bdio2FactoryTest.java index e76b606da..c740a3060 100644 --- a/src/test/java/com/synopsys/integration/blackduck/bdio2/util/Bdio2FactoryTest.java +++ b/src/test/java/com/blackduck/integration/blackduck/bdio2/util/Bdio2FactoryTest.java @@ -1,4 +1,4 @@ -package com.synopsys.integration.blackduck.bdio2.util; +package com.blackduck.integration.blackduck.bdio2.util; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -6,6 +6,7 @@ import java.util.List; import java.util.Set; +import com.blackduck.integration.blackduck.bdio2.util.Bdio2Factory; import org.apache.commons.lang3.tuple.Pair; import org.junit.jupiter.api.Test; import org.mockito.Mockito; diff --git a/src/test/java/com/synopsys/integration/blackduck/codelocation/CodeLocationWaiterTest.java b/src/test/java/com/blackduck/integration/blackduck/codelocation/CodeLocationWaiterTest.java similarity index 95% rename from src/test/java/com/synopsys/integration/blackduck/codelocation/CodeLocationWaiterTest.java rename to src/test/java/com/blackduck/integration/blackduck/codelocation/CodeLocationWaiterTest.java index a05190c8c..242692058 100644 --- a/src/test/java/com/synopsys/integration/blackduck/codelocation/CodeLocationWaiterTest.java +++ b/src/test/java/com/blackduck/integration/blackduck/codelocation/CodeLocationWaiterTest.java @@ -1,4 +1,4 @@ -package com.synopsys.integration.blackduck.codelocation; +package com.blackduck.integration.blackduck.codelocation; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -25,7 +25,7 @@ import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; -import com.synopsys.integration.blackduck.TimingExtension; +import com.blackduck.integration.blackduck.TimingExtension; import com.synopsys.integration.blackduck.api.core.ResourceMetadata; import com.synopsys.integration.blackduck.api.generated.view.CodeLocationView; import com.synopsys.integration.blackduck.api.generated.view.ProjectVersionView; @@ -33,11 +33,11 @@ import com.synopsys.integration.blackduck.api.manual.component.VersionBomCodeLocationBomComputedNotificationContent; import com.synopsys.integration.blackduck.api.manual.view.NotificationUserView; import com.synopsys.integration.blackduck.api.manual.view.VersionBomCodeLocationBomComputedNotificationUserView; -import com.synopsys.integration.blackduck.service.BlackDuckApiClient; -import com.synopsys.integration.blackduck.service.dataservice.NotificationService; -import com.synopsys.integration.blackduck.service.dataservice.ProjectService; -import com.synopsys.integration.blackduck.service.model.NotificationTaskRange; -import com.synopsys.integration.blackduck.service.model.ProjectVersionWrapper; +import com.blackduck.integration.blackduck.service.BlackDuckApiClient; +import com.blackduck.integration.blackduck.service.dataservice.NotificationService; +import com.blackduck.integration.blackduck.service.dataservice.ProjectService; +import com.blackduck.integration.blackduck.service.model.NotificationTaskRange; +import com.blackduck.integration.blackduck.service.model.ProjectVersionWrapper; import com.synopsys.integration.exception.IntegrationException; import com.synopsys.integration.log.BufferedIntLogger; import com.synopsys.integration.log.LogLevel; diff --git a/src/test/java/com/synopsys/integration/blackduck/codelocation/CodeLocationsRetrieverTest.java b/src/test/java/com/blackduck/integration/blackduck/codelocation/CodeLocationsRetrieverTest.java similarity index 95% rename from src/test/java/com/synopsys/integration/blackduck/codelocation/CodeLocationsRetrieverTest.java rename to src/test/java/com/blackduck/integration/blackduck/codelocation/CodeLocationsRetrieverTest.java index 6515fa7f1..1eddaa44b 100644 --- a/src/test/java/com/synopsys/integration/blackduck/codelocation/CodeLocationsRetrieverTest.java +++ b/src/test/java/com/blackduck/integration/blackduck/codelocation/CodeLocationsRetrieverTest.java @@ -1,4 +1,4 @@ -package com.synopsys.integration.blackduck.codelocation; +package com.blackduck.integration.blackduck.codelocation; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.fail; @@ -11,6 +11,7 @@ import java.util.Map; import java.util.Set; +import com.blackduck.integration.blackduck.codelocation.CodeLocationsRetriever; import org.junit.jupiter.api.Test; import org.mockito.Mockito; @@ -19,7 +20,7 @@ import com.synopsys.integration.blackduck.api.core.response.UrlMultipleResponses; import com.synopsys.integration.blackduck.api.generated.view.CodeLocationView; import com.synopsys.integration.blackduck.api.generated.view.ProjectVersionView; -import com.synopsys.integration.blackduck.service.BlackDuckApiClient; +import com.blackduck.integration.blackduck.service.BlackDuckApiClient; import com.synopsys.integration.exception.IntegrationException; import com.synopsys.integration.rest.HttpUrl; diff --git a/src/test/java/com/synopsys/integration/blackduck/codelocation/binaryscanner/BinaryScanBatchOutputTest.java b/src/test/java/com/blackduck/integration/blackduck/codelocation/binaryscanner/BinaryScanBatchOutputTest.java similarity index 74% rename from src/test/java/com/synopsys/integration/blackduck/codelocation/binaryscanner/BinaryScanBatchOutputTest.java rename to src/test/java/com/blackduck/integration/blackduck/codelocation/binaryscanner/BinaryScanBatchOutputTest.java index 48958889c..367219819 100644 --- a/src/test/java/com/synopsys/integration/blackduck/codelocation/binaryscanner/BinaryScanBatchOutputTest.java +++ b/src/test/java/com/blackduck/integration/blackduck/codelocation/binaryscanner/BinaryScanBatchOutputTest.java @@ -1,4 +1,4 @@ -package com.synopsys.integration.blackduck.codelocation.binaryscanner; +package com.blackduck.integration.blackduck.codelocation.binaryscanner; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/synopsys/integration/blackduck/codelocation/binaryscanner/BinaryScanUploadServiceTestIT.java b/src/test/java/com/blackduck/integration/blackduck/codelocation/binaryscanner/BinaryScanUploadServiceTestIT.java similarity index 81% rename from src/test/java/com/synopsys/integration/blackduck/codelocation/binaryscanner/BinaryScanUploadServiceTestIT.java rename to src/test/java/com/blackduck/integration/blackduck/codelocation/binaryscanner/BinaryScanUploadServiceTestIT.java index 9da88ea86..600169059 100644 --- a/src/test/java/com/synopsys/integration/blackduck/codelocation/binaryscanner/BinaryScanUploadServiceTestIT.java +++ b/src/test/java/com/blackduck/integration/blackduck/codelocation/binaryscanner/BinaryScanUploadServiceTestIT.java @@ -1,8 +1,5 @@ -package com.synopsys.integration.blackduck.codelocation.binaryscanner; +package com.blackduck.integration.blackduck.codelocation.binaryscanner; -import static com.synopsys.integration.blackduck.service.dataservice.ProjectServiceTestIT.JAPANESE_CODE_LOCATION_NAME; -import static com.synopsys.integration.blackduck.service.dataservice.ProjectServiceTestIT.JAPANESE_PROJECT_NAME; -import static com.synopsys.integration.blackduck.service.dataservice.ProjectServiceTestIT.JAPANESE_VERSION_NAME; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -10,21 +7,22 @@ import java.util.Date; import java.util.Optional; +import com.blackduck.integration.blackduck.TimingExtension; +import com.blackduck.integration.blackduck.service.dataservice.ProjectServiceTestIT; import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import com.synopsys.integration.blackduck.TimingExtension; import com.synopsys.integration.blackduck.api.generated.view.CodeLocationView; import com.synopsys.integration.blackduck.api.generated.view.UserView; -import com.synopsys.integration.blackduck.codelocation.Result; -import com.synopsys.integration.blackduck.comprehensive.BlackDuckServices; -import com.synopsys.integration.blackduck.comprehensive.VerifyNotifications; -import com.synopsys.integration.blackduck.exception.BlackDuckIntegrationException; -import com.synopsys.integration.blackduck.http.client.IntHttpClientTestHelper; -import com.synopsys.integration.blackduck.service.model.ProjectVersionWrapper; +import com.blackduck.integration.blackduck.codelocation.Result; +import com.blackduck.integration.blackduck.comprehensive.BlackDuckServices; +import com.blackduck.integration.blackduck.comprehensive.VerifyNotifications; +import com.blackduck.integration.blackduck.exception.BlackDuckIntegrationException; +import com.blackduck.integration.blackduck.http.client.IntHttpClientTestHelper; +import com.blackduck.integration.blackduck.service.model.ProjectVersionWrapper; import com.synopsys.integration.exception.IntegrationException; import com.synopsys.integration.log.BufferedIntLogger; import com.synopsys.integration.log.LogLevel; @@ -69,13 +67,13 @@ public void testJapaneseCharactersForBinaryUpload() throws IntegrationException, BlackDuckServices blackDuckServices = new BlackDuckServices(intHttpClientTestHelper); File binaryFile = getTestBinaryFile(); - BinaryScan binaryScan = new BinaryScan(binaryFile, JAPANESE_PROJECT_NAME, JAPANESE_VERSION_NAME, JAPANESE_CODE_LOCATION_NAME); + BinaryScan binaryScan = new BinaryScan(binaryFile, ProjectServiceTestIT.JAPANESE_PROJECT_NAME, ProjectServiceTestIT.JAPANESE_VERSION_NAME, ProjectServiceTestIT.JAPANESE_CODE_LOCATION_NAME); BinaryScanData binaryScanData = createBinaryScanData(blackDuckServices, binaryScan); assertBinaryUploadCompleted(blackDuckServices, binaryScanData); - Optional optionalProjectVersionWrapper = blackDuckServices.projectService.getProjectVersion(JAPANESE_PROJECT_NAME, JAPANESE_VERSION_NAME); - Optional optionalCodeLocationView = blackDuckServices.codeLocationService.getCodeLocationByName(JAPANESE_CODE_LOCATION_NAME); + Optional optionalProjectVersionWrapper = blackDuckServices.projectService.getProjectVersion(ProjectServiceTestIT.JAPANESE_PROJECT_NAME, ProjectServiceTestIT.JAPANESE_VERSION_NAME); + Optional optionalCodeLocationView = blackDuckServices.codeLocationService.getCodeLocationByName(ProjectServiceTestIT.JAPANESE_CODE_LOCATION_NAME); assertTrue(optionalProjectVersionWrapper.isPresent()); assertTrue(optionalCodeLocationView.isPresent()); diff --git a/src/test/java/com/synopsys/integration/blackduck/codelocation/signaturescanner/CodeLocationWaitJobConditionTest.java b/src/test/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/CodeLocationWaitJobConditionTest.java similarity index 89% rename from src/test/java/com/synopsys/integration/blackduck/codelocation/signaturescanner/CodeLocationWaitJobConditionTest.java rename to src/test/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/CodeLocationWaitJobConditionTest.java index 1c13a1f48..cdb8089bd 100644 --- a/src/test/java/com/synopsys/integration/blackduck/codelocation/signaturescanner/CodeLocationWaitJobConditionTest.java +++ b/src/test/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/CodeLocationWaitJobConditionTest.java @@ -1,4 +1,4 @@ -package com.synopsys.integration.blackduck.codelocation.signaturescanner; +package com.blackduck.integration.blackduck.codelocation.signaturescanner; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -25,13 +25,13 @@ import com.synopsys.integration.blackduck.api.manual.enumeration.NotificationType; import com.synopsys.integration.blackduck.api.manual.view.NotificationUserView; import com.synopsys.integration.blackduck.api.manual.view.VersionBomCodeLocationBomComputedNotificationUserView; -import com.synopsys.integration.blackduck.codelocation.CodeLocationWaitJobCondition; -import com.synopsys.integration.blackduck.service.BlackDuckApiClient; -import com.synopsys.integration.blackduck.service.dataservice.NotificationService; -import com.synopsys.integration.blackduck.service.dataservice.ProjectService; -import com.synopsys.integration.blackduck.service.model.NotificationTaskRange; -import com.synopsys.integration.blackduck.service.model.ProjectVersionWrapper; -import com.synopsys.integration.blackduck.service.request.NotificationEditor; +import com.blackduck.integration.blackduck.codelocation.CodeLocationWaitJobCondition; +import com.blackduck.integration.blackduck.service.BlackDuckApiClient; +import com.blackduck.integration.blackduck.service.dataservice.NotificationService; +import com.blackduck.integration.blackduck.service.dataservice.ProjectService; +import com.blackduck.integration.blackduck.service.model.NotificationTaskRange; +import com.blackduck.integration.blackduck.service.model.ProjectVersionWrapper; +import com.blackduck.integration.blackduck.service.request.NotificationEditor; import com.synopsys.integration.exception.IntegrationException; import com.synopsys.integration.log.BufferedIntLogger; import com.synopsys.integration.log.IntLogger; diff --git a/src/test/java/com/synopsys/integration/blackduck/codelocation/signaturescanner/ScanBatchBuilderTest.java b/src/test/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/ScanBatchBuilderTest.java similarity index 90% rename from src/test/java/com/synopsys/integration/blackduck/codelocation/signaturescanner/ScanBatchBuilderTest.java rename to src/test/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/ScanBatchBuilderTest.java index 19a402d8e..9347821d8 100644 --- a/src/test/java/com/synopsys/integration/blackduck/codelocation/signaturescanner/ScanBatchBuilderTest.java +++ b/src/test/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/ScanBatchBuilderTest.java @@ -1,4 +1,4 @@ -package com.synopsys.integration.blackduck.codelocation.signaturescanner; +package com.blackduck.integration.blackduck.codelocation.signaturescanner; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -7,12 +7,12 @@ import java.io.File; import java.io.IOException; +import com.blackduck.integration.blackduck.TimingExtension; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import com.synopsys.integration.blackduck.TimingExtension; -import com.synopsys.integration.blackduck.codelocation.signaturescanner.command.ScanTarget; -import com.synopsys.integration.blackduck.codelocation.signaturescanner.command.SnippetMatching; +import com.blackduck.integration.blackduck.codelocation.signaturescanner.command.ScanTarget; +import com.blackduck.integration.blackduck.codelocation.signaturescanner.command.SnippetMatching; import com.synopsys.integration.exception.IntegrationException; import com.synopsys.integration.rest.HttpUrl; import com.synopsys.integration.rest.proxy.ProxyInfo; diff --git a/src/test/java/com/synopsys/integration/blackduck/codelocation/signaturescanner/ScanBatchOutputTest.java b/src/test/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/ScanBatchOutputTest.java similarity index 84% rename from src/test/java/com/synopsys/integration/blackduck/codelocation/signaturescanner/ScanBatchOutputTest.java rename to src/test/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/ScanBatchOutputTest.java index eb422d81f..dfc481b83 100644 --- a/src/test/java/com/synopsys/integration/blackduck/codelocation/signaturescanner/ScanBatchOutputTest.java +++ b/src/test/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/ScanBatchOutputTest.java @@ -1,4 +1,4 @@ -package com.synopsys.integration.blackduck.codelocation.signaturescanner; +package com.blackduck.integration.blackduck.codelocation.signaturescanner; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -8,15 +8,18 @@ import java.util.HashSet; import java.util.List; +import com.blackduck.integration.blackduck.codelocation.signaturescanner.ScanBatch; +import com.blackduck.integration.blackduck.codelocation.signaturescanner.ScanBatchBuilder; +import com.blackduck.integration.blackduck.codelocation.signaturescanner.ScanBatchOutput; import org.junit.jupiter.api.Test; import org.mockito.Mockito; -import com.synopsys.integration.blackduck.codelocation.signaturescanner.command.ScanCommand; -import com.synopsys.integration.blackduck.codelocation.signaturescanner.command.ScanCommandOutput; -import com.synopsys.integration.blackduck.codelocation.signaturescanner.command.ScanPathsUtility; -import com.synopsys.integration.blackduck.codelocation.signaturescanner.command.ScanTarget; -import com.synopsys.integration.blackduck.codelocation.signaturescanner.command.SnippetMatching; -import com.synopsys.integration.blackduck.exception.BlackDuckIntegrationException; +import com.blackduck.integration.blackduck.codelocation.signaturescanner.command.ScanCommand; +import com.blackduck.integration.blackduck.codelocation.signaturescanner.command.ScanCommandOutput; +import com.blackduck.integration.blackduck.codelocation.signaturescanner.command.ScanPathsUtility; +import com.blackduck.integration.blackduck.codelocation.signaturescanner.command.ScanTarget; +import com.blackduck.integration.blackduck.codelocation.signaturescanner.command.SnippetMatching; +import com.blackduck.integration.blackduck.exception.BlackDuckIntegrationException; import com.synopsys.integration.log.IntLogger; import com.synopsys.integration.log.SilentIntLogger; import com.synopsys.integration.util.IntEnvironmentVariables; diff --git a/src/test/java/com/synopsys/integration/blackduck/codelocation/signaturescanner/ScanPathsTest.java b/src/test/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/ScanPathsTest.java similarity index 94% rename from src/test/java/com/synopsys/integration/blackduck/codelocation/signaturescanner/ScanPathsTest.java rename to src/test/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/ScanPathsTest.java index 9e9935ffe..8aa02626f 100644 --- a/src/test/java/com/synopsys/integration/blackduck/codelocation/signaturescanner/ScanPathsTest.java +++ b/src/test/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/ScanPathsTest.java @@ -1,6 +1,6 @@ -package com.synopsys.integration.blackduck.codelocation.signaturescanner; +package com.blackduck.integration.blackduck.codelocation.signaturescanner; -import static com.synopsys.integration.blackduck.codelocation.signaturescanner.command.ScanPathsUtility.BDS_JAVA_HOME; +import static com.blackduck.integration.blackduck.codelocation.signaturescanner.command.ScanPathsUtility.BDS_JAVA_HOME; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.startsWith; import static org.hamcrest.MatcherAssert.assertThat; @@ -12,7 +12,8 @@ import java.nio.file.Files; import java.nio.file.Path; -import com.synopsys.integration.blackduck.codelocation.signaturescanner.command.ZipApiScannerInstaller; +import com.blackduck.integration.blackduck.TimingExtension; +import com.blackduck.integration.blackduck.codelocation.signaturescanner.command.ZipApiScannerInstaller; import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.StringUtils; import org.junit.jupiter.api.AfterEach; @@ -20,9 +21,8 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import com.synopsys.integration.blackduck.TimingExtension; -import com.synopsys.integration.blackduck.codelocation.signaturescanner.command.ScanPaths; -import com.synopsys.integration.blackduck.codelocation.signaturescanner.command.ScanPathsUtility; +import com.blackduck.integration.blackduck.codelocation.signaturescanner.command.ScanPaths; +import com.blackduck.integration.blackduck.codelocation.signaturescanner.command.ScanPathsUtility; import com.synopsys.integration.log.BufferedIntLogger; import com.synopsys.integration.util.IntEnvironmentVariables; import com.synopsys.integration.util.OperatingSystemType; diff --git a/src/test/java/com/synopsys/integration/blackduck/codelocation/signaturescanner/ScannerZipInstallerTest.java b/src/test/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/ScannerZipInstallerTest.java similarity index 77% rename from src/test/java/com/synopsys/integration/blackduck/codelocation/signaturescanner/ScannerZipInstallerTest.java rename to src/test/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/ScannerZipInstallerTest.java index 60bdecaa1..87708dda0 100644 --- a/src/test/java/com/synopsys/integration/blackduck/codelocation/signaturescanner/ScannerZipInstallerTest.java +++ b/src/test/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/ScannerZipInstallerTest.java @@ -1,26 +1,26 @@ -package com.synopsys.integration.blackduck.codelocation.signaturescanner; +package com.blackduck.integration.blackduck.codelocation.signaturescanner; import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.File; -import com.synopsys.integration.blackduck.codelocation.signaturescanner.command.ZipApiScannerInstaller; +import com.blackduck.integration.blackduck.TimingExtension; +import com.blackduck.integration.blackduck.codelocation.signaturescanner.command.ZipApiScannerInstaller; import org.apache.commons.lang3.StringUtils; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import com.synopsys.integration.blackduck.TimingExtension; -import com.synopsys.integration.blackduck.codelocation.signaturescanner.command.ScanPaths; -import com.synopsys.integration.blackduck.codelocation.signaturescanner.command.ScanPathsUtility; -import com.synopsys.integration.blackduck.configuration.BlackDuckServerConfig; -import com.synopsys.integration.blackduck.configuration.BlackDuckServerConfigBuilder; -import com.synopsys.integration.blackduck.http.client.BlackDuckHttpClient; -import com.synopsys.integration.blackduck.http.client.SignatureScannerClient; -import com.synopsys.integration.blackduck.http.client.TestingPropertyKey; -import com.synopsys.integration.blackduck.keystore.KeyStoreHelper; -import com.synopsys.integration.blackduck.service.BlackDuckServicesFactory; -import com.synopsys.integration.blackduck.service.dataservice.BlackDuckRegistrationService; +import com.blackduck.integration.blackduck.codelocation.signaturescanner.command.ScanPaths; +import com.blackduck.integration.blackduck.codelocation.signaturescanner.command.ScanPathsUtility; +import com.blackduck.integration.blackduck.configuration.BlackDuckServerConfig; +import com.blackduck.integration.blackduck.configuration.BlackDuckServerConfigBuilder; +import com.blackduck.integration.blackduck.http.client.BlackDuckHttpClient; +import com.blackduck.integration.blackduck.http.client.SignatureScannerClient; +import com.blackduck.integration.blackduck.http.client.TestingPropertyKey; +import com.blackduck.integration.blackduck.keystore.KeyStoreHelper; +import com.blackduck.integration.blackduck.service.BlackDuckServicesFactory; +import com.blackduck.integration.blackduck.service.dataservice.BlackDuckRegistrationService; import com.synopsys.integration.log.BufferedIntLogger; import com.synopsys.integration.log.IntLogger; import com.synopsys.integration.rest.HttpUrl; diff --git a/src/test/java/com/synopsys/integration/blackduck/codelocation/signaturescanner/command/ScanCommandArgumentParserTest.java b/src/test/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ScanCommandArgumentParserTest.java similarity index 87% rename from src/test/java/com/synopsys/integration/blackduck/codelocation/signaturescanner/command/ScanCommandArgumentParserTest.java rename to src/test/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ScanCommandArgumentParserTest.java index 55a7702e7..498070d06 100644 --- a/src/test/java/com/synopsys/integration/blackduck/codelocation/signaturescanner/command/ScanCommandArgumentParserTest.java +++ b/src/test/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ScanCommandArgumentParserTest.java @@ -1,15 +1,16 @@ -package com.synopsys.integration.blackduck.codelocation.signaturescanner.command; +package com.blackduck.integration.blackduck.codelocation.signaturescanner.command; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.List; +import com.blackduck.integration.blackduck.codelocation.signaturescanner.command.ScanCommandArgumentParser; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.CsvFileSource; -import com.synopsys.integration.blackduck.exception.SignatureScannerInputException; +import com.blackduck.integration.blackduck.exception.SignatureScannerInputException; public class ScanCommandArgumentParserTest { private ScanCommandArgumentParser parser = new ScanCommandArgumentParser(); diff --git a/src/test/java/com/synopsys/integration/blackduck/codelocation/signaturescanner/command/ScanCommandQuoteParserTest.java b/src/test/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ScanCommandQuoteParserTest.java similarity index 76% rename from src/test/java/com/synopsys/integration/blackduck/codelocation/signaturescanner/command/ScanCommandQuoteParserTest.java rename to src/test/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ScanCommandQuoteParserTest.java index 9d8b6c679..486f06bb5 100644 --- a/src/test/java/com/synopsys/integration/blackduck/codelocation/signaturescanner/command/ScanCommandQuoteParserTest.java +++ b/src/test/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ScanCommandQuoteParserTest.java @@ -1,7 +1,8 @@ -package com.synopsys.integration.blackduck.codelocation.signaturescanner.command; +package com.blackduck.integration.blackduck.codelocation.signaturescanner.command; import static org.junit.jupiter.api.Assertions.assertEquals; +import com.blackduck.integration.blackduck.codelocation.signaturescanner.command.ScanCommandQuoteParser; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.CsvFileSource; diff --git a/src/test/java/com/synopsys/integration/blackduck/codelocation/signaturescanner/command/ScanCommandTest.java b/src/test/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ScanCommandTest.java similarity index 97% rename from src/test/java/com/synopsys/integration/blackduck/codelocation/signaturescanner/command/ScanCommandTest.java rename to src/test/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ScanCommandTest.java index 5c0cd53b9..e51dc8bb6 100644 --- a/src/test/java/com/synopsys/integration/blackduck/codelocation/signaturescanner/command/ScanCommandTest.java +++ b/src/test/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ScanCommandTest.java @@ -1,4 +1,4 @@ -package com.synopsys.integration.blackduck.codelocation.signaturescanner.command; +package com.blackduck.integration.blackduck.codelocation.signaturescanner.command; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -11,6 +11,7 @@ import java.util.Set; import java.util.HashSet; +import com.blackduck.integration.blackduck.TimingExtension; import org.apache.commons.io.FileUtils; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; @@ -18,10 +19,9 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mockito; -import com.synopsys.integration.blackduck.TimingExtension; -import com.synopsys.integration.blackduck.codelocation.signaturescanner.ScanBatch; -import com.synopsys.integration.blackduck.codelocation.signaturescanner.ScanBatchBuilder; -import com.synopsys.integration.blackduck.exception.BlackDuckIntegrationException; +import com.blackduck.integration.blackduck.codelocation.signaturescanner.ScanBatch; +import com.blackduck.integration.blackduck.codelocation.signaturescanner.ScanBatchBuilder; +import com.blackduck.integration.blackduck.exception.BlackDuckIntegrationException; import com.synopsys.integration.exception.IntegrationException; import com.synopsys.integration.log.BufferedIntLogger; import com.synopsys.integration.log.IntLogger; diff --git a/src/test/java/com/synopsys/integration/blackduck/comprehensive/BlackDuckServices.java b/src/test/java/com/blackduck/integration/blackduck/comprehensive/BlackDuckServices.java similarity index 66% rename from src/test/java/com/synopsys/integration/blackduck/comprehensive/BlackDuckServices.java rename to src/test/java/com/blackduck/integration/blackduck/comprehensive/BlackDuckServices.java index 867c1eb34..3853801c3 100644 --- a/src/test/java/com/synopsys/integration/blackduck/comprehensive/BlackDuckServices.java +++ b/src/test/java/com/blackduck/integration/blackduck/comprehensive/BlackDuckServices.java @@ -1,20 +1,20 @@ -package com.synopsys.integration.blackduck.comprehensive; +package com.blackduck.integration.blackduck.comprehensive; +import com.blackduck.integration.blackduck.http.client.IntHttpClientTestHelper; import com.synopsys.integration.blackduck.api.generated.discovery.ApiDiscovery; -import com.synopsys.integration.blackduck.codelocation.CodeLocationCreationService; -import com.synopsys.integration.blackduck.configuration.BlackDuckServerConfig; -import com.synopsys.integration.blackduck.http.client.IntHttpClientTestHelper; -import com.synopsys.integration.blackduck.service.BlackDuckApiClient; -import com.synopsys.integration.blackduck.service.BlackDuckServicesFactory; -import com.synopsys.integration.blackduck.service.dataservice.BlackDuckRegistrationService; -import com.synopsys.integration.blackduck.service.dataservice.CodeLocationService; -import com.synopsys.integration.blackduck.service.dataservice.ComponentService; -import com.synopsys.integration.blackduck.service.dataservice.NotificationService; -import com.synopsys.integration.blackduck.service.dataservice.PolicyRuleService; -import com.synopsys.integration.blackduck.service.dataservice.ProjectBomService; -import com.synopsys.integration.blackduck.service.dataservice.ProjectService; -import com.synopsys.integration.blackduck.service.dataservice.ProjectUsersService; -import com.synopsys.integration.blackduck.service.dataservice.UserService; +import com.blackduck.integration.blackduck.codelocation.CodeLocationCreationService; +import com.blackduck.integration.blackduck.configuration.BlackDuckServerConfig; +import com.blackduck.integration.blackduck.service.BlackDuckApiClient; +import com.blackduck.integration.blackduck.service.BlackDuckServicesFactory; +import com.blackduck.integration.blackduck.service.dataservice.BlackDuckRegistrationService; +import com.blackduck.integration.blackduck.service.dataservice.CodeLocationService; +import com.blackduck.integration.blackduck.service.dataservice.ComponentService; +import com.blackduck.integration.blackduck.service.dataservice.NotificationService; +import com.blackduck.integration.blackduck.service.dataservice.PolicyRuleService; +import com.blackduck.integration.blackduck.service.dataservice.ProjectBomService; +import com.blackduck.integration.blackduck.service.dataservice.ProjectService; +import com.blackduck.integration.blackduck.service.dataservice.ProjectUsersService; +import com.blackduck.integration.blackduck.service.dataservice.UserService; import com.synopsys.integration.exception.IntegrationException; import com.synopsys.integration.log.IntLogger; import com.synopsys.integration.log.LogLevel; diff --git a/src/test/java/com/synopsys/integration/blackduck/comprehensive/ComprehensiveCookbookTestIT.java b/src/test/java/com/blackduck/integration/blackduck/comprehensive/ComprehensiveCookbookTestIT.java similarity index 91% rename from src/test/java/com/synopsys/integration/blackduck/comprehensive/ComprehensiveCookbookTestIT.java rename to src/test/java/com/blackduck/integration/blackduck/comprehensive/ComprehensiveCookbookTestIT.java index 46e4e4eb0..44b2c4cf2 100644 --- a/src/test/java/com/synopsys/integration/blackduck/comprehensive/ComprehensiveCookbookTestIT.java +++ b/src/test/java/com/blackduck/integration/blackduck/comprehensive/ComprehensiveCookbookTestIT.java @@ -1,4 +1,4 @@ -package com.synopsys.integration.blackduck.comprehensive; +package com.blackduck.integration.blackduck.comprehensive; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -10,13 +10,14 @@ import java.util.List; import java.util.Optional; +import com.blackduck.integration.blackduck.TimingExtension; +import com.blackduck.integration.blackduck.http.client.IntHttpClientTestHelper; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import com.synopsys.integration.bdio.model.externalid.ExternalId; import com.synopsys.integration.bdio.model.externalid.ExternalIdFactory; -import com.synopsys.integration.blackduck.TimingExtension; import com.synopsys.integration.blackduck.api.core.BlackDuckResponse; import com.synopsys.integration.blackduck.api.core.response.UrlMultipleResponses; import com.synopsys.integration.blackduck.api.generated.discovery.ApiDiscovery; @@ -25,7 +26,6 @@ import com.synopsys.integration.blackduck.api.generated.view.CodeLocationView; import com.synopsys.integration.blackduck.api.generated.view.PolicyRuleView; import com.synopsys.integration.blackduck.api.generated.view.ProjectVersionComponentVersionView; -import com.synopsys.integration.blackduck.api.generated.view.ProjectVersionComponentView; import com.synopsys.integration.blackduck.api.generated.view.ProjectVersionPolicyStatusView; import com.synopsys.integration.blackduck.api.generated.view.ProjectVersionView; import com.synopsys.integration.blackduck.api.manual.view.ProjectView; @@ -33,28 +33,27 @@ import com.synopsys.integration.blackduck.api.manual.temporary.component.ProjectRequest; import com.synopsys.integration.blackduck.api.manual.temporary.component.ProjectVersionRequest; import com.synopsys.integration.blackduck.api.manual.temporary.enumeration.ProjectVersionPhaseType; -import com.synopsys.integration.blackduck.codelocation.Result; -import com.synopsys.integration.blackduck.codelocation.bdiolegacy.BdioUploadService; -import com.synopsys.integration.blackduck.codelocation.signaturescanner.ScanBatch; -import com.synopsys.integration.blackduck.codelocation.signaturescanner.ScanBatchBuilder; -import com.synopsys.integration.blackduck.codelocation.signaturescanner.ScanBatchOutput; -import com.synopsys.integration.blackduck.codelocation.signaturescanner.SignatureScannerService; -import com.synopsys.integration.blackduck.codelocation.signaturescanner.command.ScanCommandOutput; -import com.synopsys.integration.blackduck.codelocation.signaturescanner.command.ScanTarget; -import com.synopsys.integration.blackduck.codelocation.upload.UploadBatch; -import com.synopsys.integration.blackduck.codelocation.upload.UploadBatchOutput; -import com.synopsys.integration.blackduck.codelocation.upload.UploadOutput; -import com.synopsys.integration.blackduck.codelocation.upload.UploadTarget; -import com.synopsys.integration.blackduck.http.BlackDuckPageResponse; -import com.synopsys.integration.blackduck.http.BlackDuckRequestBuilder; -import com.synopsys.integration.blackduck.http.client.IntHttpClientTestHelper; -import com.synopsys.integration.blackduck.http.transform.BlackDuckResponsesTransformer; -import com.synopsys.integration.blackduck.service.BlackDuckApiClient; -import com.synopsys.integration.blackduck.service.BlackDuckServicesFactory; -import com.synopsys.integration.blackduck.service.dataservice.ProjectService; -import com.synopsys.integration.blackduck.service.model.ProjectSyncModel; -import com.synopsys.integration.blackduck.service.model.ProjectVersionWrapper; -import com.synopsys.integration.blackduck.service.request.BlackDuckMultipleRequest; +import com.blackduck.integration.blackduck.codelocation.Result; +import com.blackduck.integration.blackduck.codelocation.bdiolegacy.BdioUploadService; +import com.blackduck.integration.blackduck.codelocation.signaturescanner.ScanBatch; +import com.blackduck.integration.blackduck.codelocation.signaturescanner.ScanBatchBuilder; +import com.blackduck.integration.blackduck.codelocation.signaturescanner.ScanBatchOutput; +import com.blackduck.integration.blackduck.codelocation.signaturescanner.SignatureScannerService; +import com.blackduck.integration.blackduck.codelocation.signaturescanner.command.ScanCommandOutput; +import com.blackduck.integration.blackduck.codelocation.signaturescanner.command.ScanTarget; +import com.blackduck.integration.blackduck.codelocation.upload.UploadBatch; +import com.blackduck.integration.blackduck.codelocation.upload.UploadBatchOutput; +import com.blackduck.integration.blackduck.codelocation.upload.UploadOutput; +import com.blackduck.integration.blackduck.codelocation.upload.UploadTarget; +import com.blackduck.integration.blackduck.http.BlackDuckPageResponse; +import com.blackduck.integration.blackduck.http.BlackDuckRequestBuilder; +import com.blackduck.integration.blackduck.http.transform.BlackDuckResponsesTransformer; +import com.blackduck.integration.blackduck.service.BlackDuckApiClient; +import com.blackduck.integration.blackduck.service.BlackDuckServicesFactory; +import com.blackduck.integration.blackduck.service.dataservice.ProjectService; +import com.blackduck.integration.blackduck.service.model.ProjectSyncModel; +import com.blackduck.integration.blackduck.service.model.ProjectVersionWrapper; +import com.blackduck.integration.blackduck.service.request.BlackDuckMultipleRequest; import com.synopsys.integration.exception.IntegrationException; import com.synopsys.integration.log.IntLogger; import com.synopsys.integration.log.SilentIntLogger; diff --git a/src/test/java/com/synopsys/integration/blackduck/comprehensive/CreateProjectWithBdioAndVerifyBOMTest.java b/src/test/java/com/blackduck/integration/blackduck/comprehensive/CreateProjectWithBdioAndVerifyBOMTest.java similarity index 94% rename from src/test/java/com/synopsys/integration/blackduck/comprehensive/CreateProjectWithBdioAndVerifyBOMTest.java rename to src/test/java/com/blackduck/integration/blackduck/comprehensive/CreateProjectWithBdioAndVerifyBOMTest.java index 9ebeaadc9..be3a9165a 100644 --- a/src/test/java/com/synopsys/integration/blackduck/comprehensive/CreateProjectWithBdioAndVerifyBOMTest.java +++ b/src/test/java/com/blackduck/integration/blackduck/comprehensive/CreateProjectWithBdioAndVerifyBOMTest.java @@ -1,4 +1,4 @@ -package com.synopsys.integration.blackduck.comprehensive; +package com.blackduck.integration.blackduck.comprehensive; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -12,13 +12,14 @@ import java.util.function.Predicate; import java.util.stream.Collectors; +import com.blackduck.integration.blackduck.TimingExtension; +import com.blackduck.integration.blackduck.http.client.IntHttpClientTestHelper; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import com.synopsys.integration.blackduck.TimingExtension; import com.synopsys.integration.blackduck.api.generated.view.CodeLocationView; import com.synopsys.integration.blackduck.api.generated.view.ProjectVersionView; import com.synopsys.integration.blackduck.api.manual.view.ProjectView; @@ -27,14 +28,13 @@ import com.synopsys.integration.blackduck.api.manual.temporary.enumeration.NotificationType; import com.synopsys.integration.blackduck.api.manual.view.NotificationUserView; import com.synopsys.integration.blackduck.api.manual.view.VersionBomCodeLocationBomComputedNotificationUserView; -import com.synopsys.integration.blackduck.codelocation.CodeLocationCreationData; -import com.synopsys.integration.blackduck.codelocation.bdiolegacy.BdioUploadService; -import com.synopsys.integration.blackduck.codelocation.upload.UploadBatch; -import com.synopsys.integration.blackduck.codelocation.upload.UploadBatchOutput; -import com.synopsys.integration.blackduck.codelocation.upload.UploadTarget; -import com.synopsys.integration.blackduck.http.client.IntHttpClientTestHelper; -import com.synopsys.integration.blackduck.service.model.ProjectVersionWrapper; -import com.synopsys.integration.blackduck.service.request.NotificationEditor; +import com.blackduck.integration.blackduck.codelocation.CodeLocationCreationData; +import com.blackduck.integration.blackduck.codelocation.bdiolegacy.BdioUploadService; +import com.blackduck.integration.blackduck.codelocation.upload.UploadBatch; +import com.blackduck.integration.blackduck.codelocation.upload.UploadBatchOutput; +import com.blackduck.integration.blackduck.codelocation.upload.UploadTarget; +import com.blackduck.integration.blackduck.service.model.ProjectVersionWrapper; +import com.blackduck.integration.blackduck.service.request.NotificationEditor; import com.synopsys.integration.exception.IntegrationException; import com.synopsys.integration.log.IntLogger; import com.synopsys.integration.log.LogLevel; diff --git a/src/test/java/com/synopsys/integration/blackduck/comprehensive/InstallAndRunSignatureScannerTestIT.java b/src/test/java/com/blackduck/integration/blackduck/comprehensive/InstallAndRunSignatureScannerTestIT.java similarity index 86% rename from src/test/java/com/synopsys/integration/blackduck/comprehensive/InstallAndRunSignatureScannerTestIT.java rename to src/test/java/com/blackduck/integration/blackduck/comprehensive/InstallAndRunSignatureScannerTestIT.java index 7ad5945a9..50a3af2f7 100644 --- a/src/test/java/com/synopsys/integration/blackduck/comprehensive/InstallAndRunSignatureScannerTestIT.java +++ b/src/test/java/com/blackduck/integration/blackduck/comprehensive/InstallAndRunSignatureScannerTestIT.java @@ -1,4 +1,4 @@ -package com.synopsys.integration.blackduck.comprehensive; +package com.blackduck.integration.blackduck.comprehensive; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -12,7 +12,9 @@ import java.util.Optional; import java.util.concurrent.ExecutorService; -import com.synopsys.integration.blackduck.codelocation.signaturescanner.command.*; +import com.blackduck.integration.blackduck.TimingExtension; +import com.blackduck.integration.blackduck.http.client.IntHttpClientTestHelper; +import com.blackduck.integration.blackduck.codelocation.signaturescanner.command.*; import org.apache.commons.io.FileUtils; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; @@ -20,25 +22,22 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import com.synopsys.integration.blackduck.TimingExtension; import com.synopsys.integration.blackduck.api.generated.view.CodeLocationView; -import com.synopsys.integration.blackduck.codelocation.Result; -import com.synopsys.integration.blackduck.codelocation.signaturescanner.ScanBatch; -import com.synopsys.integration.blackduck.codelocation.signaturescanner.ScanBatchBuilder; -import com.synopsys.integration.blackduck.codelocation.signaturescanner.ScanBatchOutput; -import com.synopsys.integration.blackduck.codelocation.signaturescanner.ScanBatchRunner; -import com.synopsys.integration.blackduck.codelocation.signaturescanner.SignatureScannerService; -import com.synopsys.integration.blackduck.codelocation.signaturescanner.command.ZipApiScannerInstaller; -import com.synopsys.integration.blackduck.configuration.BlackDuckServerConfig; -import com.synopsys.integration.blackduck.configuration.BlackDuckServerConfigBuilder; -import com.synopsys.integration.blackduck.http.client.BlackDuckHttpClient; -import com.synopsys.integration.blackduck.http.client.IntHttpClientTestHelper; -import com.synopsys.integration.blackduck.http.client.SignatureScannerClient; -import com.synopsys.integration.blackduck.keystore.KeyStoreHelper; -import com.synopsys.integration.blackduck.service.BlackDuckApiClient; -import com.synopsys.integration.blackduck.service.BlackDuckServicesFactory; -import com.synopsys.integration.blackduck.service.dataservice.BlackDuckRegistrationService; -import com.synopsys.integration.blackduck.service.dataservice.CodeLocationService; +import com.blackduck.integration.blackduck.codelocation.Result; +import com.blackduck.integration.blackduck.codelocation.signaturescanner.ScanBatch; +import com.blackduck.integration.blackduck.codelocation.signaturescanner.ScanBatchBuilder; +import com.blackduck.integration.blackduck.codelocation.signaturescanner.ScanBatchOutput; +import com.blackduck.integration.blackduck.codelocation.signaturescanner.ScanBatchRunner; +import com.blackduck.integration.blackduck.codelocation.signaturescanner.SignatureScannerService; +import com.blackduck.integration.blackduck.configuration.BlackDuckServerConfig; +import com.blackduck.integration.blackduck.configuration.BlackDuckServerConfigBuilder; +import com.blackduck.integration.blackduck.http.client.BlackDuckHttpClient; +import com.blackduck.integration.blackduck.http.client.SignatureScannerClient; +import com.blackduck.integration.blackduck.keystore.KeyStoreHelper; +import com.blackduck.integration.blackduck.service.BlackDuckApiClient; +import com.blackduck.integration.blackduck.service.BlackDuckServicesFactory; +import com.blackduck.integration.blackduck.service.dataservice.BlackDuckRegistrationService; +import com.blackduck.integration.blackduck.service.dataservice.CodeLocationService; import com.synopsys.integration.exception.IntegrationException; import com.synopsys.integration.log.BufferedIntLogger; import com.synopsys.integration.log.LogLevel; diff --git a/src/test/java/com/synopsys/integration/blackduck/comprehensive/NotificationsTestIT.java b/src/test/java/com/blackduck/integration/blackduck/comprehensive/NotificationsTestIT.java similarity index 85% rename from src/test/java/com/synopsys/integration/blackduck/comprehensive/NotificationsTestIT.java rename to src/test/java/com/blackduck/integration/blackduck/comprehensive/NotificationsTestIT.java index c9920e3c3..e840edd43 100644 --- a/src/test/java/com/synopsys/integration/blackduck/comprehensive/NotificationsTestIT.java +++ b/src/test/java/com/blackduck/integration/blackduck/comprehensive/NotificationsTestIT.java @@ -1,4 +1,4 @@ -package com.synopsys.integration.blackduck.comprehensive; +package com.blackduck.integration.blackduck.comprehensive; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -10,12 +10,12 @@ import java.util.List; import java.util.Set; +import com.blackduck.integration.blackduck.TimingExtension; +import com.blackduck.integration.blackduck.http.client.IntHttpClientTestHelper; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import com.synopsys.integration.blackduck.TimingExtension; -import com.synopsys.integration.blackduck.api.generated.discovery.ApiDiscovery; import com.synopsys.integration.blackduck.api.generated.view.UserView; import com.synopsys.integration.blackduck.api.manual.component.ProjectNotificationContent; import com.synopsys.integration.blackduck.api.manual.component.ProjectVersionNotificationContent; @@ -23,15 +23,14 @@ import com.synopsys.integration.blackduck.api.manual.view.NotificationUserView; import com.synopsys.integration.blackduck.api.manual.view.ProjectNotificationUserView; import com.synopsys.integration.blackduck.api.manual.view.ProjectVersionNotificationUserView; -import com.synopsys.integration.blackduck.http.client.IntHttpClientTestHelper; -import com.synopsys.integration.blackduck.service.BlackDuckApiClient; -import com.synopsys.integration.blackduck.service.BlackDuckServicesFactory; -import com.synopsys.integration.blackduck.service.dataservice.NotificationService; -import com.synopsys.integration.blackduck.service.dataservice.ProjectService; -import com.synopsys.integration.blackduck.service.dataservice.UserService; -import com.synopsys.integration.blackduck.service.model.ProjectSyncModel; -import com.synopsys.integration.blackduck.service.model.ProjectVersionWrapper; -import com.synopsys.integration.blackduck.service.request.NotificationEditor; +import com.blackduck.integration.blackduck.service.BlackDuckApiClient; +import com.blackduck.integration.blackduck.service.BlackDuckServicesFactory; +import com.blackduck.integration.blackduck.service.dataservice.NotificationService; +import com.blackduck.integration.blackduck.service.dataservice.ProjectService; +import com.blackduck.integration.blackduck.service.dataservice.UserService; +import com.blackduck.integration.blackduck.service.model.ProjectSyncModel; +import com.blackduck.integration.blackduck.service.model.ProjectVersionWrapper; +import com.blackduck.integration.blackduck.service.request.NotificationEditor; import com.synopsys.integration.exception.IntegrationException; @Tag("integration") diff --git a/src/test/java/com/synopsys/integration/blackduck/comprehensive/ProjectBomServiceTestIT.java b/src/test/java/com/blackduck/integration/blackduck/comprehensive/ProjectBomServiceTestIT.java similarity index 91% rename from src/test/java/com/synopsys/integration/blackduck/comprehensive/ProjectBomServiceTestIT.java rename to src/test/java/com/blackduck/integration/blackduck/comprehensive/ProjectBomServiceTestIT.java index 2adf5c14e..8828115e2 100644 --- a/src/test/java/com/synopsys/integration/blackduck/comprehensive/ProjectBomServiceTestIT.java +++ b/src/test/java/com/blackduck/integration/blackduck/comprehensive/ProjectBomServiceTestIT.java @@ -1,4 +1,4 @@ -package com.synopsys.integration.blackduck.comprehensive; +package com.blackduck.integration.blackduck.comprehensive; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -6,6 +6,8 @@ import java.util.NoSuchElementException; import java.util.Optional; +import com.blackduck.integration.blackduck.TimingExtension; +import com.blackduck.integration.blackduck.http.client.IntHttpClientTestHelper; import org.junit.Assume; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Tag; @@ -14,8 +16,7 @@ import com.synopsys.integration.bdio.model.externalid.ExternalId; import com.synopsys.integration.bdio.model.externalid.ExternalIdFactory; -import com.synopsys.integration.blackduck.TimingExtension; -import com.synopsys.integration.blackduck.api.enumeration.PolicyRuleConditionOperatorType; +import com.blackduck.integration.blackduck.api.enumeration.PolicyRuleConditionOperatorType; import com.synopsys.integration.blackduck.api.generated.component.PolicyRuleExpressionView; import com.synopsys.integration.blackduck.api.generated.enumeration.PolicyRuleCategoryType; import com.synopsys.integration.blackduck.api.generated.enumeration.ProjectVersionComponentPolicyStatusType; @@ -25,16 +26,15 @@ import com.synopsys.integration.blackduck.api.generated.view.ProjectVersionPolicyRulesView; import com.synopsys.integration.blackduck.api.generated.view.ProjectVersionView; import com.synopsys.integration.blackduck.api.manual.view.ProjectView; -import com.synopsys.integration.blackduck.exception.BlackDuckIntegrationException; -import com.synopsys.integration.blackduck.http.client.IntHttpClientTestHelper; -import com.synopsys.integration.blackduck.service.BlackDuckApiClient; -import com.synopsys.integration.blackduck.service.BlackDuckServicesFactory; -import com.synopsys.integration.blackduck.service.dataservice.PolicyRuleService; -import com.synopsys.integration.blackduck.service.dataservice.ProjectBomService; -import com.synopsys.integration.blackduck.service.dataservice.ProjectService; -import com.synopsys.integration.blackduck.service.model.PolicyRuleExpressionSetBuilder; -import com.synopsys.integration.blackduck.service.model.ProjectSyncModel; -import com.synopsys.integration.blackduck.service.model.ProjectVersionWrapper; +import com.blackduck.integration.blackduck.exception.BlackDuckIntegrationException; +import com.blackduck.integration.blackduck.service.BlackDuckApiClient; +import com.blackduck.integration.blackduck.service.BlackDuckServicesFactory; +import com.blackduck.integration.blackduck.service.dataservice.PolicyRuleService; +import com.blackduck.integration.blackduck.service.dataservice.ProjectBomService; +import com.blackduck.integration.blackduck.service.dataservice.ProjectService; +import com.blackduck.integration.blackduck.service.model.PolicyRuleExpressionSetBuilder; +import com.blackduck.integration.blackduck.service.model.ProjectSyncModel; +import com.blackduck.integration.blackduck.service.model.ProjectVersionWrapper; import com.synopsys.integration.log.IntLogger; import com.synopsys.integration.rest.HttpUrl; diff --git a/src/test/java/com/synopsys/integration/blackduck/comprehensive/ToolsApiScannerInstallerTestIT.java b/src/test/java/com/blackduck/integration/blackduck/comprehensive/ToolsApiScannerInstallerTestIT.java similarity index 81% rename from src/test/java/com/synopsys/integration/blackduck/comprehensive/ToolsApiScannerInstallerTestIT.java rename to src/test/java/com/blackduck/integration/blackduck/comprehensive/ToolsApiScannerInstallerTestIT.java index fd8c83a7d..bed0ee191 100644 --- a/src/test/java/com/synopsys/integration/blackduck/comprehensive/ToolsApiScannerInstallerTestIT.java +++ b/src/test/java/com/blackduck/integration/blackduck/comprehensive/ToolsApiScannerInstallerTestIT.java @@ -1,15 +1,17 @@ -package com.synopsys.integration.blackduck.comprehensive; +package com.blackduck.integration.blackduck.comprehensive; -import com.synopsys.integration.blackduck.TimingExtension; -import com.synopsys.integration.blackduck.codelocation.signaturescanner.command.ToolsApiScannerInstaller; -import com.synopsys.integration.blackduck.codelocation.signaturescanner.command.ScanPaths; -import com.synopsys.integration.blackduck.codelocation.signaturescanner.command.ScanPathsUtility; -import com.synopsys.integration.blackduck.configuration.BlackDuckServerConfig; -import com.synopsys.integration.blackduck.exception.BlackDuckIntegrationException; -import com.synopsys.integration.blackduck.http.client.BlackDuckHttpClient; -import com.synopsys.integration.blackduck.configuration.BlackDuckServerConfigBuilder; +import com.blackduck.integration.blackduck.TimingExtension; +import com.blackduck.integration.blackduck.http.client.IntHttpClientTestHelper; +import com.blackduck.integration.blackduck.http.client.TestingPropertyKey; +import com.blackduck.integration.blackduck.codelocation.signaturescanner.command.ToolsApiScannerInstaller; +import com.blackduck.integration.blackduck.codelocation.signaturescanner.command.ScanPaths; +import com.blackduck.integration.blackduck.codelocation.signaturescanner.command.ScanPathsUtility; +import com.blackduck.integration.blackduck.configuration.BlackDuckServerConfig; +import com.blackduck.integration.blackduck.exception.BlackDuckIntegrationException; +import com.blackduck.integration.blackduck.http.client.BlackDuckHttpClient; +import com.blackduck.integration.blackduck.configuration.BlackDuckServerConfigBuilder; import com.synopsys.integration.blackduck.http.client.*; -import com.synopsys.integration.blackduck.keystore.KeyStoreHelper; +import com.blackduck.integration.blackduck.keystore.KeyStoreHelper; import com.synopsys.integration.log.BufferedIntLogger; import com.synopsys.integration.log.IntLogger; import com.synopsys.integration.rest.HttpUrl; @@ -25,9 +27,9 @@ import java.io.IOException; import java.nio.charset.Charset; -import static com.synopsys.integration.blackduck.codelocation.signaturescanner.command.ApiScannerInstaller.BLACK_DUCK_SIGNATURE_SCANNER_INSTALL_DIRECTORY; +import static com.blackduck.integration.blackduck.codelocation.signaturescanner.command.ApiScannerInstaller.BLACK_DUCK_SIGNATURE_SCANNER_INSTALL_DIRECTORY; import static org.junit.jupiter.api.Assertions.assertTrue; -import static com.synopsys.integration.blackduck.codelocation.signaturescanner.command.ApiScannerInstaller.VERSION_FILENAME; +import static com.blackduck.integration.blackduck.codelocation.signaturescanner.command.ApiScannerInstaller.VERSION_FILENAME; @Tag("integration") @ExtendWith(TimingExtension.class) diff --git a/src/test/java/com/synopsys/integration/blackduck/comprehensive/VerifyNotifications.java b/src/test/java/com/blackduck/integration/blackduck/comprehensive/VerifyNotifications.java similarity index 93% rename from src/test/java/com/synopsys/integration/blackduck/comprehensive/VerifyNotifications.java rename to src/test/java/com/blackduck/integration/blackduck/comprehensive/VerifyNotifications.java index 8572d0049..e32d38e3c 100644 --- a/src/test/java/com/synopsys/integration/blackduck/comprehensive/VerifyNotifications.java +++ b/src/test/java/com/blackduck/integration/blackduck/comprehensive/VerifyNotifications.java @@ -1,4 +1,4 @@ -package com.synopsys.integration.blackduck.comprehensive; +package com.blackduck.integration.blackduck.comprehensive; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -17,9 +17,9 @@ import com.synopsys.integration.blackduck.api.manual.view.NotificationView; import com.synopsys.integration.blackduck.api.manual.view.VersionBomCodeLocationBomComputedNotificationUserView; import com.synopsys.integration.blackduck.api.manual.view.VersionBomCodeLocationBomComputedNotificationView; -import com.synopsys.integration.blackduck.service.dataservice.BlackDuckRegistrationService; -import com.synopsys.integration.blackduck.service.dataservice.NotificationService; -import com.synopsys.integration.blackduck.service.request.NotificationEditor; +import com.blackduck.integration.blackduck.service.dataservice.BlackDuckRegistrationService; +import com.blackduck.integration.blackduck.service.dataservice.NotificationService; +import com.blackduck.integration.blackduck.service.request.NotificationEditor; import com.synopsys.integration.exception.IntegrationException; public class VerifyNotifications { diff --git a/src/test/java/com/synopsys/integration/blackduck/comprehensive/recipe/BasicRecipe.java b/src/test/java/com/blackduck/integration/blackduck/comprehensive/recipe/BasicRecipe.java similarity index 84% rename from src/test/java/com/synopsys/integration/blackduck/comprehensive/recipe/BasicRecipe.java rename to src/test/java/com/blackduck/integration/blackduck/comprehensive/recipe/BasicRecipe.java index 414dcf38b..3ecc2a816 100644 --- a/src/test/java/com/synopsys/integration/blackduck/comprehensive/recipe/BasicRecipe.java +++ b/src/test/java/com/blackduck/integration/blackduck/comprehensive/recipe/BasicRecipe.java @@ -1,4 +1,4 @@ -package com.synopsys.integration.blackduck.comprehensive.recipe; +package com.blackduck.integration.blackduck.comprehensive.recipe; import java.util.LinkedHashSet; import java.util.Optional; @@ -12,21 +12,21 @@ import com.synopsys.integration.blackduck.api.manual.view.ProjectView; import com.synopsys.integration.blackduck.api.manual.temporary.component.ProjectRequest; import com.synopsys.integration.blackduck.api.manual.temporary.enumeration.ProjectVersionPhaseType; -import com.synopsys.integration.blackduck.codelocation.CodeLocationCreationService; -import com.synopsys.integration.blackduck.codelocation.bdio2legacy.Bdio2UploadService; -import com.synopsys.integration.blackduck.codelocation.bdiolegacy.UploadBatchRunner; -import com.synopsys.integration.blackduck.configuration.BlackDuckServerConfig; -import com.synopsys.integration.blackduck.http.client.BlackDuckHttpClient; -import com.synopsys.integration.blackduck.http.client.IntHttpClientTestHelper; -import com.synopsys.integration.blackduck.service.BlackDuckApiClient; -import com.synopsys.integration.blackduck.service.BlackDuckServicesFactory; -import com.synopsys.integration.blackduck.service.dataservice.CodeLocationService; -import com.synopsys.integration.blackduck.service.dataservice.NotificationService; -import com.synopsys.integration.blackduck.service.dataservice.PolicyRuleService; -import com.synopsys.integration.blackduck.service.dataservice.ProjectBomService; -import com.synopsys.integration.blackduck.service.dataservice.ProjectService; -import com.synopsys.integration.blackduck.service.dataservice.ProjectUsersService; -import com.synopsys.integration.blackduck.service.model.ProjectSyncModel; +import com.blackduck.integration.blackduck.codelocation.CodeLocationCreationService; +import com.blackduck.integration.blackduck.codelocation.bdio2legacy.Bdio2UploadService; +import com.blackduck.integration.blackduck.codelocation.bdiolegacy.UploadBatchRunner; +import com.blackduck.integration.blackduck.configuration.BlackDuckServerConfig; +import com.blackduck.integration.blackduck.http.client.BlackDuckHttpClient; +import com.blackduck.integration.blackduck.http.client.IntHttpClientTestHelper; +import com.blackduck.integration.blackduck.service.BlackDuckApiClient; +import com.blackduck.integration.blackduck.service.BlackDuckServicesFactory; +import com.blackduck.integration.blackduck.service.dataservice.CodeLocationService; +import com.blackduck.integration.blackduck.service.dataservice.NotificationService; +import com.blackduck.integration.blackduck.service.dataservice.PolicyRuleService; +import com.blackduck.integration.blackduck.service.dataservice.ProjectBomService; +import com.blackduck.integration.blackduck.service.dataservice.ProjectService; +import com.blackduck.integration.blackduck.service.dataservice.ProjectUsersService; +import com.blackduck.integration.blackduck.service.model.ProjectSyncModel; import com.synopsys.integration.exception.IntegrationException; import com.synopsys.integration.log.BufferedIntLogger; import com.synopsys.integration.log.IntLogger; diff --git a/src/test/java/com/synopsys/integration/blackduck/comprehensive/recipe/Bdio2UploadRecipeTest.java b/src/test/java/com/blackduck/integration/blackduck/comprehensive/recipe/Bdio2UploadRecipeTest.java similarity index 86% rename from src/test/java/com/synopsys/integration/blackduck/comprehensive/recipe/Bdio2UploadRecipeTest.java rename to src/test/java/com/blackduck/integration/blackduck/comprehensive/recipe/Bdio2UploadRecipeTest.java index 5ed0733ed..15eb2e785 100644 --- a/src/test/java/com/synopsys/integration/blackduck/comprehensive/recipe/Bdio2UploadRecipeTest.java +++ b/src/test/java/com/blackduck/integration/blackduck/comprehensive/recipe/Bdio2UploadRecipeTest.java @@ -1,4 +1,4 @@ -package com.synopsys.integration.blackduck.comprehensive.recipe; +package com.blackduck.integration.blackduck.comprehensive.recipe; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -14,6 +14,7 @@ import java.util.Optional; import java.util.UUID; +import com.blackduck.integration.blackduck.TimingExtension; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; @@ -23,17 +24,16 @@ import com.blackducksoftware.bdio2.BdioMetadata; import com.synopsys.integration.bdio.graph.ProjectDependencyGraph; import com.synopsys.integration.bdio.model.dependency.Dependency; -import com.synopsys.integration.blackduck.TimingExtension; import com.synopsys.integration.blackduck.api.generated.view.ProjectVersionComponentVersionView; -import com.synopsys.integration.blackduck.bdio2.model.Bdio2Document; -import com.synopsys.integration.blackduck.bdio2.model.GitInfo; -import com.synopsys.integration.blackduck.bdio2.model.ProjectInfo; -import com.synopsys.integration.blackduck.bdio2.util.Bdio2Factory; -import com.synopsys.integration.blackduck.bdio2.util.Bdio2Writer; -import com.synopsys.integration.blackduck.codelocation.upload.UploadBatch; -import com.synopsys.integration.blackduck.codelocation.upload.UploadBatchOutput; -import com.synopsys.integration.blackduck.codelocation.upload.UploadTarget; -import com.synopsys.integration.blackduck.service.model.ProjectVersionWrapper; +import com.blackduck.integration.blackduck.bdio2.model.Bdio2Document; +import com.blackduck.integration.blackduck.bdio2.model.GitInfo; +import com.blackduck.integration.blackduck.bdio2.model.ProjectInfo; +import com.blackduck.integration.blackduck.bdio2.util.Bdio2Factory; +import com.blackduck.integration.blackduck.bdio2.util.Bdio2Writer; +import com.blackduck.integration.blackduck.codelocation.upload.UploadBatch; +import com.blackduck.integration.blackduck.codelocation.upload.UploadBatchOutput; +import com.blackduck.integration.blackduck.codelocation.upload.UploadTarget; +import com.blackduck.integration.blackduck.service.model.ProjectVersionWrapper; import com.synopsys.integration.exception.IntegrationException; import com.synopsys.integration.util.NameVersion; diff --git a/src/test/java/com/synopsys/integration/blackduck/comprehensive/recipe/BdioUploadRecipeTest.java b/src/test/java/com/blackduck/integration/blackduck/comprehensive/recipe/BdioUploadRecipeTest.java similarity index 90% rename from src/test/java/com/synopsys/integration/blackduck/comprehensive/recipe/BdioUploadRecipeTest.java rename to src/test/java/com/blackduck/integration/blackduck/comprehensive/recipe/BdioUploadRecipeTest.java index 737d67c0f..b6b1bfcdb 100644 --- a/src/test/java/com/synopsys/integration/blackduck/comprehensive/recipe/BdioUploadRecipeTest.java +++ b/src/test/java/com/blackduck/integration/blackduck/comprehensive/recipe/BdioUploadRecipeTest.java @@ -1,4 +1,4 @@ -package com.synopsys.integration.blackduck.comprehensive.recipe; +package com.blackduck.integration.blackduck.comprehensive.recipe; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -9,22 +9,22 @@ import java.util.List; import java.util.Optional; +import com.blackduck.integration.blackduck.TimingExtension; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import com.synopsys.integration.blackduck.TimingExtension; import com.synopsys.integration.blackduck.api.generated.view.CodeLocationView; -import com.synopsys.integration.blackduck.codelocation.CodeLocationWaitResult; -import com.synopsys.integration.blackduck.codelocation.bdiolegacy.BdioUploadCodeLocationCreationRequest; -import com.synopsys.integration.blackduck.codelocation.bdiolegacy.UploadBatchRunner; -import com.synopsys.integration.blackduck.codelocation.upload.UploadBatch; -import com.synopsys.integration.blackduck.codelocation.upload.UploadTarget; -import com.synopsys.integration.blackduck.service.BlackDuckServicesFactory; -import com.synopsys.integration.blackduck.service.model.NotificationTaskRange; -import com.synopsys.integration.blackduck.service.model.ProjectSyncModel; -import com.synopsys.integration.blackduck.service.model.ProjectVersionWrapper; +import com.blackduck.integration.blackduck.codelocation.CodeLocationWaitResult; +import com.blackduck.integration.blackduck.codelocation.bdiolegacy.BdioUploadCodeLocationCreationRequest; +import com.blackduck.integration.blackduck.codelocation.bdiolegacy.UploadBatchRunner; +import com.blackduck.integration.blackduck.codelocation.upload.UploadBatch; +import com.blackduck.integration.blackduck.codelocation.upload.UploadTarget; +import com.blackduck.integration.blackduck.service.BlackDuckServicesFactory; +import com.blackduck.integration.blackduck.service.model.NotificationTaskRange; +import com.blackduck.integration.blackduck.service.model.ProjectSyncModel; +import com.blackduck.integration.blackduck.service.model.ProjectVersionWrapper; import com.synopsys.integration.exception.IntegrationException; import com.synopsys.integration.log.BufferedIntLogger; import com.synopsys.integration.log.IntLogger; diff --git a/src/test/java/com/synopsys/integration/blackduck/comprehensive/recipe/CheckPolicyForProjectVersionRecipeTest.java b/src/test/java/com/blackduck/integration/blackduck/comprehensive/recipe/CheckPolicyForProjectVersionRecipeTest.java similarity index 90% rename from src/test/java/com/synopsys/integration/blackduck/comprehensive/recipe/CheckPolicyForProjectVersionRecipeTest.java rename to src/test/java/com/blackduck/integration/blackduck/comprehensive/recipe/CheckPolicyForProjectVersionRecipeTest.java index abac21275..003a4559e 100644 --- a/src/test/java/com/synopsys/integration/blackduck/comprehensive/recipe/CheckPolicyForProjectVersionRecipeTest.java +++ b/src/test/java/com/blackduck/integration/blackduck/comprehensive/recipe/CheckPolicyForProjectVersionRecipeTest.java @@ -1,7 +1,8 @@ -package com.synopsys.integration.blackduck.comprehensive.recipe; +package com.blackduck.integration.blackduck.comprehensive.recipe; import java.util.Optional; +import com.blackduck.integration.blackduck.TimingExtension; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; @@ -11,18 +12,17 @@ import com.synopsys.integration.bdio.model.Forge; import com.synopsys.integration.bdio.model.externalid.ExternalId; -import com.synopsys.integration.blackduck.TimingExtension; -import com.synopsys.integration.blackduck.api.enumeration.PolicyRuleConditionOperatorType; +import com.blackduck.integration.blackduck.api.enumeration.PolicyRuleConditionOperatorType; import com.synopsys.integration.blackduck.api.generated.component.PolicyRuleExpressionView; import com.synopsys.integration.blackduck.api.generated.enumeration.ProjectVersionComponentPolicyStatusType; import com.synopsys.integration.blackduck.api.generated.response.ComponentsView; import com.synopsys.integration.blackduck.api.generated.view.ComponentVersionView; import com.synopsys.integration.blackduck.api.generated.view.PolicyRuleView; import com.synopsys.integration.blackduck.api.generated.view.ProjectVersionPolicyStatusView; -import com.synopsys.integration.blackduck.service.dataservice.ComponentService; -import com.synopsys.integration.blackduck.service.model.PolicyRuleExpressionSetBuilder; -import com.synopsys.integration.blackduck.service.model.ProjectSyncModel; -import com.synopsys.integration.blackduck.service.model.ProjectVersionWrapper; +import com.blackduck.integration.blackduck.service.dataservice.ComponentService; +import com.blackduck.integration.blackduck.service.model.PolicyRuleExpressionSetBuilder; +import com.blackduck.integration.blackduck.service.model.ProjectSyncModel; +import com.blackduck.integration.blackduck.service.model.ProjectVersionWrapper; import com.synopsys.integration.exception.IntegrationException; import com.synopsys.integration.rest.HttpUrl; diff --git a/src/test/java/com/synopsys/integration/blackduck/comprehensive/recipe/ComponentManagementRecipeTest.java b/src/test/java/com/blackduck/integration/blackduck/comprehensive/recipe/ComponentManagementRecipeTest.java similarity index 90% rename from src/test/java/com/synopsys/integration/blackduck/comprehensive/recipe/ComponentManagementRecipeTest.java rename to src/test/java/com/blackduck/integration/blackduck/comprehensive/recipe/ComponentManagementRecipeTest.java index 0b1a935d3..10388d2a5 100644 --- a/src/test/java/com/synopsys/integration/blackduck/comprehensive/recipe/ComponentManagementRecipeTest.java +++ b/src/test/java/com/blackduck/integration/blackduck/comprehensive/recipe/ComponentManagementRecipeTest.java @@ -1,10 +1,11 @@ -package com.synopsys.integration.blackduck.comprehensive.recipe; +package com.blackduck.integration.blackduck.comprehensive.recipe; import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.List; import java.util.Optional; +import com.blackduck.integration.blackduck.TimingExtension; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Tag; @@ -13,13 +14,11 @@ import com.synopsys.integration.bdio.model.Forge; import com.synopsys.integration.bdio.model.externalid.ExternalId; -import com.synopsys.integration.blackduck.TimingExtension; import com.synopsys.integration.blackduck.api.generated.view.ProjectVersionComponentVersionView; -import com.synopsys.integration.blackduck.api.generated.view.ProjectVersionComponentView; import com.synopsys.integration.blackduck.api.generated.view.ProjectVersionView; import com.synopsys.integration.blackduck.api.manual.view.ProjectView; -import com.synopsys.integration.blackduck.service.model.ProjectSyncModel; -import com.synopsys.integration.blackduck.service.model.ProjectVersionWrapper; +import com.blackduck.integration.blackduck.service.model.ProjectSyncModel; +import com.blackduck.integration.blackduck.service.model.ProjectVersionWrapper; import com.synopsys.integration.exception.IntegrationException; @Tag("integration") diff --git a/src/test/java/com/synopsys/integration/blackduck/comprehensive/recipe/CreateDetailedProjectRecipeTest.java b/src/test/java/com/blackduck/integration/blackduck/comprehensive/recipe/CreateDetailedProjectRecipeTest.java similarity index 86% rename from src/test/java/com/synopsys/integration/blackduck/comprehensive/recipe/CreateDetailedProjectRecipeTest.java rename to src/test/java/com/blackduck/integration/blackduck/comprehensive/recipe/CreateDetailedProjectRecipeTest.java index 75d1a5527..4de3f9029 100644 --- a/src/test/java/com/synopsys/integration/blackduck/comprehensive/recipe/CreateDetailedProjectRecipeTest.java +++ b/src/test/java/com/blackduck/integration/blackduck/comprehensive/recipe/CreateDetailedProjectRecipeTest.java @@ -1,20 +1,20 @@ -package com.synopsys.integration.blackduck.comprehensive.recipe; +package com.blackduck.integration.blackduck.comprehensive.recipe; +import com.blackduck.integration.blackduck.TimingExtension; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import com.synopsys.integration.blackduck.TimingExtension; import com.synopsys.integration.blackduck.api.generated.enumeration.ProjectVersionDistributionType; import com.synopsys.integration.blackduck.api.generated.view.ProjectVersionView; import com.synopsys.integration.blackduck.api.manual.view.ProjectView; import com.synopsys.integration.blackduck.api.manual.temporary.enumeration.ProjectVersionPhaseType; -import com.synopsys.integration.blackduck.service.BlackDuckApiClient; -import com.synopsys.integration.blackduck.service.dataservice.ProjectService; -import com.synopsys.integration.blackduck.service.model.ProjectSyncModel; -import com.synopsys.integration.blackduck.service.model.ProjectVersionWrapper; +import com.blackduck.integration.blackduck.service.BlackDuckApiClient; +import com.blackduck.integration.blackduck.service.dataservice.ProjectService; +import com.blackduck.integration.blackduck.service.model.ProjectSyncModel; +import com.blackduck.integration.blackduck.service.model.ProjectVersionWrapper; import com.synopsys.integration.exception.IntegrationException; import com.synopsys.integration.rest.HttpUrl; diff --git a/src/test/java/com/synopsys/integration/blackduck/comprehensive/recipe/IntelligentPersistenceRecipeTest.java b/src/test/java/com/blackduck/integration/blackduck/comprehensive/recipe/IntelligentPersistenceRecipeTest.java similarity index 83% rename from src/test/java/com/synopsys/integration/blackduck/comprehensive/recipe/IntelligentPersistenceRecipeTest.java rename to src/test/java/com/blackduck/integration/blackduck/comprehensive/recipe/IntelligentPersistenceRecipeTest.java index 81f97f36b..3a6477c7f 100644 --- a/src/test/java/com/synopsys/integration/blackduck/comprehensive/recipe/IntelligentPersistenceRecipeTest.java +++ b/src/test/java/com/blackduck/integration/blackduck/comprehensive/recipe/IntelligentPersistenceRecipeTest.java @@ -1,4 +1,4 @@ -package com.synopsys.integration.blackduck.comprehensive.recipe; +package com.blackduck.integration.blackduck.comprehensive.recipe; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -14,6 +14,7 @@ import java.util.Optional; import java.util.UUID; +import com.blackduck.integration.blackduck.TimingExtension; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; @@ -22,17 +23,16 @@ import com.blackducksoftware.bdio2.BdioMetadata; import com.synopsys.integration.bdio.graph.ProjectDependencyGraph; import com.synopsys.integration.bdio.model.dependency.Dependency; -import com.synopsys.integration.blackduck.TimingExtension; import com.synopsys.integration.blackduck.api.generated.view.ProjectVersionComponentVersionView; -import com.synopsys.integration.blackduck.bdio2.model.Bdio2Document; -import com.synopsys.integration.blackduck.bdio2.model.ProjectInfo; -import com.synopsys.integration.blackduck.bdio2.util.Bdio2Factory; -import com.synopsys.integration.blackduck.bdio2.util.Bdio2Writer; -import com.synopsys.integration.blackduck.codelocation.intelligentpersistence.IntelligentPersistenceService; -import com.synopsys.integration.blackduck.codelocation.upload.UploadBatch; -import com.synopsys.integration.blackduck.codelocation.upload.UploadBatchOutput; -import com.synopsys.integration.blackduck.codelocation.upload.UploadTarget; -import com.synopsys.integration.blackduck.service.model.ProjectVersionWrapper; +import com.blackduck.integration.blackduck.bdio2.model.Bdio2Document; +import com.blackduck.integration.blackduck.bdio2.model.ProjectInfo; +import com.blackduck.integration.blackduck.bdio2.util.Bdio2Factory; +import com.blackduck.integration.blackduck.bdio2.util.Bdio2Writer; +import com.blackduck.integration.blackduck.codelocation.intelligentpersistence.IntelligentPersistenceService; +import com.blackduck.integration.blackduck.codelocation.upload.UploadBatch; +import com.blackduck.integration.blackduck.codelocation.upload.UploadBatchOutput; +import com.blackduck.integration.blackduck.codelocation.upload.UploadTarget; +import com.blackduck.integration.blackduck.service.model.ProjectVersionWrapper; import com.synopsys.integration.exception.IntegrationException; import com.synopsys.integration.util.NameVersion; diff --git a/src/test/java/com/synopsys/integration/blackduck/comprehensive/recipe/ProjectErrorsRecipeTest.java b/src/test/java/com/blackduck/integration/blackduck/comprehensive/recipe/ProjectErrorsRecipeTest.java similarity index 86% rename from src/test/java/com/synopsys/integration/blackduck/comprehensive/recipe/ProjectErrorsRecipeTest.java rename to src/test/java/com/blackduck/integration/blackduck/comprehensive/recipe/ProjectErrorsRecipeTest.java index 3ec49a32c..d2906b921 100644 --- a/src/test/java/com/synopsys/integration/blackduck/comprehensive/recipe/ProjectErrorsRecipeTest.java +++ b/src/test/java/com/blackduck/integration/blackduck/comprehensive/recipe/ProjectErrorsRecipeTest.java @@ -1,18 +1,18 @@ -package com.synopsys.integration.blackduck.comprehensive.recipe; +package com.blackduck.integration.blackduck.comprehensive.recipe; import java.util.Optional; +import com.blackduck.integration.blackduck.TimingExtension; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import com.synopsys.integration.blackduck.TimingExtension; import com.synopsys.integration.blackduck.api.manual.view.ProjectView; -import com.synopsys.integration.blackduck.exception.BlackDuckApiException; -import com.synopsys.integration.blackduck.service.model.ProjectSyncModel; -import com.synopsys.integration.blackduck.service.model.ProjectVersionWrapper; +import com.blackduck.integration.blackduck.exception.BlackDuckApiException; +import com.blackduck.integration.blackduck.service.model.ProjectSyncModel; +import com.blackduck.integration.blackduck.service.model.ProjectVersionWrapper; import com.synopsys.integration.exception.IntegrationException; @Tag("integration") diff --git a/src/test/java/com/synopsys/integration/blackduck/configuration/BlackDuckServerConfigBuilderTest.java b/src/test/java/com/blackduck/integration/blackduck/configuration/BlackDuckServerConfigBuilderTest.java similarity index 98% rename from src/test/java/com/synopsys/integration/blackduck/configuration/BlackDuckServerConfigBuilderTest.java rename to src/test/java/com/blackduck/integration/blackduck/configuration/BlackDuckServerConfigBuilderTest.java index 408898198..735130146 100644 --- a/src/test/java/com/synopsys/integration/blackduck/configuration/BlackDuckServerConfigBuilderTest.java +++ b/src/test/java/com/blackduck/integration/blackduck/configuration/BlackDuckServerConfigBuilderTest.java @@ -1,6 +1,6 @@ -package com.synopsys.integration.blackduck.configuration; +package com.blackduck.integration.blackduck.configuration; -import static com.synopsys.integration.blackduck.configuration.BlackDuckServerConfigKeys.KEYS; +import static com.blackduck.integration.blackduck.configuration.BlackDuckServerConfigKeys.KEYS; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -16,13 +16,15 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; +import com.blackduck.integration.blackduck.configuration.BlackDuckServerConfig; +import com.blackduck.integration.blackduck.configuration.BlackDuckServerConfigBuilder; import org.apache.commons.lang3.StringUtils; import org.junit.jupiter.api.Test; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.gson.Gson; -import com.synopsys.integration.blackduck.http.client.CookieHeaderParser; -import com.synopsys.integration.blackduck.service.BlackDuckServicesFactory; +import com.blackduck.integration.blackduck.http.client.CookieHeaderParser; +import com.blackduck.integration.blackduck.service.BlackDuckServicesFactory; import com.synopsys.integration.builder.BuilderProperties; import com.synopsys.integration.builder.BuilderPropertyKey; import com.synopsys.integration.builder.BuilderStatus; diff --git a/src/test/java/com/synopsys/integration/blackduck/configuration/BlackDuckServerConfigBuilderTestIT.java b/src/test/java/com/blackduck/integration/blackduck/configuration/BlackDuckServerConfigBuilderTestIT.java similarity index 96% rename from src/test/java/com/synopsys/integration/blackduck/configuration/BlackDuckServerConfigBuilderTestIT.java rename to src/test/java/com/blackduck/integration/blackduck/configuration/BlackDuckServerConfigBuilderTestIT.java index e003a4c7e..77b1ac5a9 100644 --- a/src/test/java/com/synopsys/integration/blackduck/configuration/BlackDuckServerConfigBuilderTestIT.java +++ b/src/test/java/com/blackduck/integration/blackduck/configuration/BlackDuckServerConfigBuilderTestIT.java @@ -1,4 +1,4 @@ -package com.synopsys.integration.blackduck.configuration; +package com.blackduck.integration.blackduck.configuration; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -7,17 +7,17 @@ import java.net.URL; +import com.blackduck.integration.blackduck.TimingExtension; +import com.blackduck.integration.blackduck.http.client.IntHttpClientTestHelper; +import com.blackduck.integration.blackduck.http.client.TestingPropertyKey; import org.apache.commons.lang3.math.NumberUtils; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import com.synopsys.integration.blackduck.TimingExtension; -import com.synopsys.integration.blackduck.http.client.BlackDuckHttpClient; -import com.synopsys.integration.blackduck.http.client.IntHttpClientTestHelper; -import com.synopsys.integration.blackduck.http.client.TestingPropertyKey; -import com.synopsys.integration.blackduck.useragent.BlackDuckCommon; +import com.blackduck.integration.blackduck.http.client.BlackDuckHttpClient; +import com.blackduck.integration.blackduck.useragent.BlackDuckCommon; import com.synopsys.integration.exception.IntegrationException; import com.synopsys.integration.log.SilentIntLogger; import com.synopsys.integration.rest.HttpUrl; diff --git a/src/test/java/com/synopsys/integration/blackduck/http/BlackDuckRequestBuilderTest.java b/src/test/java/com/blackduck/integration/blackduck/http/BlackDuckRequestBuilderTest.java similarity index 94% rename from src/test/java/com/synopsys/integration/blackduck/http/BlackDuckRequestBuilderTest.java rename to src/test/java/com/blackduck/integration/blackduck/http/BlackDuckRequestBuilderTest.java index 1a457d11f..77c09bba1 100644 --- a/src/test/java/com/synopsys/integration/blackduck/http/BlackDuckRequestBuilderTest.java +++ b/src/test/java/com/blackduck/integration/blackduck/http/BlackDuckRequestBuilderTest.java @@ -1,4 +1,4 @@ -package com.synopsys.integration.blackduck.http; +package com.blackduck.integration.blackduck.http; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -6,10 +6,10 @@ import java.util.Arrays; import java.util.Set; +import com.blackduck.integration.blackduck.TimingExtension; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import com.synopsys.integration.blackduck.TimingExtension; import com.synopsys.integration.exception.IntegrationException; import com.synopsys.integration.rest.HttpUrl; import com.synopsys.integration.rest.request.Request; diff --git a/src/test/java/com/synopsys/integration/blackduck/http/BlackDuckUrlTest.java b/src/test/java/com/blackduck/integration/blackduck/http/BlackDuckUrlTest.java similarity index 95% rename from src/test/java/com/synopsys/integration/blackduck/http/BlackDuckUrlTest.java rename to src/test/java/com/blackduck/integration/blackduck/http/BlackDuckUrlTest.java index 5fe9b7002..06525c94a 100644 --- a/src/test/java/com/synopsys/integration/blackduck/http/BlackDuckUrlTest.java +++ b/src/test/java/com/blackduck/integration/blackduck/http/BlackDuckUrlTest.java @@ -1,4 +1,4 @@ -package com.synopsys.integration.blackduck.http; +package com.blackduck.integration.blackduck.http; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -6,6 +6,8 @@ import java.util.List; import java.util.stream.Collectors; +import com.blackduck.integration.blackduck.http.BlackDuckUrl; +import com.blackduck.integration.blackduck.http.BlackDuckUrlSearchTerm; import org.junit.jupiter.api.Test; import com.synopsys.integration.exception.IntegrationException; diff --git a/src/test/java/com/synopsys/integration/blackduck/http/client/BlackDuckHttpClientTestIT.java b/src/test/java/com/blackduck/integration/blackduck/http/client/BlackDuckHttpClientTestIT.java similarity index 93% rename from src/test/java/com/synopsys/integration/blackduck/http/client/BlackDuckHttpClientTestIT.java rename to src/test/java/com/blackduck/integration/blackduck/http/client/BlackDuckHttpClientTestIT.java index 58176dfb8..32c2db7db 100644 --- a/src/test/java/com/synopsys/integration/blackduck/http/client/BlackDuckHttpClientTestIT.java +++ b/src/test/java/com/blackduck/integration/blackduck/http/client/BlackDuckHttpClientTestIT.java @@ -1,4 +1,4 @@ -package com.synopsys.integration.blackduck.http.client; +package com.blackduck.integration.blackduck.http.client; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; @@ -9,25 +9,25 @@ import java.util.ArrayList; import java.util.List; +import com.blackduck.integration.blackduck.TimingExtension; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import com.synopsys.integration.blackduck.TimingExtension; import com.synopsys.integration.blackduck.api.core.BlackDuckComponent; import com.synopsys.integration.blackduck.api.core.BlackDuckPath; import com.synopsys.integration.blackduck.api.core.BlackDuckView; import com.synopsys.integration.blackduck.api.core.response.UrlSingleResponse; import com.synopsys.integration.blackduck.api.generated.discovery.ApiDiscovery; import com.synopsys.integration.blackduck.api.generated.view.UserView; -import com.synopsys.integration.blackduck.configuration.BlackDuckServerConfig; -import com.synopsys.integration.blackduck.configuration.BlackDuckServerConfigBuilder; -import com.synopsys.integration.blackduck.http.BlackDuckRequestBuilder; -import com.synopsys.integration.blackduck.service.BlackDuckApiClient; -import com.synopsys.integration.blackduck.service.BlackDuckServicesFactory; -import com.synopsys.integration.blackduck.service.dataservice.UserService; -import com.synopsys.integration.blackduck.service.request.BlackDuckSingleRequest; +import com.blackduck.integration.blackduck.configuration.BlackDuckServerConfig; +import com.blackduck.integration.blackduck.configuration.BlackDuckServerConfigBuilder; +import com.blackduck.integration.blackduck.http.BlackDuckRequestBuilder; +import com.blackduck.integration.blackduck.service.BlackDuckApiClient; +import com.blackduck.integration.blackduck.service.BlackDuckServicesFactory; +import com.blackduck.integration.blackduck.service.dataservice.UserService; +import com.blackduck.integration.blackduck.service.request.BlackDuckSingleRequest; import com.synopsys.integration.exception.IntegrationException; import com.synopsys.integration.log.IntLogger; import com.synopsys.integration.log.LogLevel; diff --git a/src/test/java/com/synopsys/integration/blackduck/http/client/BlackDuckRedirectStrategyTest.java b/src/test/java/com/blackduck/integration/blackduck/http/client/BlackDuckRedirectStrategyTest.java similarity index 97% rename from src/test/java/com/synopsys/integration/blackduck/http/client/BlackDuckRedirectStrategyTest.java rename to src/test/java/com/blackduck/integration/blackduck/http/client/BlackDuckRedirectStrategyTest.java index 3fc0e10dc..d02813af8 100644 --- a/src/test/java/com/synopsys/integration/blackduck/http/client/BlackDuckRedirectStrategyTest.java +++ b/src/test/java/com/blackduck/integration/blackduck/http/client/BlackDuckRedirectStrategyTest.java @@ -1,17 +1,17 @@ -package com.synopsys.integration.blackduck.http.client; +package com.blackduck.integration.blackduck.http.client; import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.IOException; import java.nio.charset.StandardCharsets; +import com.blackduck.integration.blackduck.TimingExtension; import org.apache.http.client.config.RequestConfig; import org.apache.http.impl.client.HttpClientBuilder; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import com.google.gson.Gson; -import com.synopsys.integration.blackduck.TimingExtension; import com.synopsys.integration.exception.IntegrationException; import com.synopsys.integration.log.BufferedIntLogger; import com.synopsys.integration.log.IntLogger; diff --git a/src/test/java/com/synopsys/integration/blackduck/http/client/CookieHeaderParserTest.java b/src/test/java/com/blackduck/integration/blackduck/http/client/CookieHeaderParserTest.java similarity index 96% rename from src/test/java/com/synopsys/integration/blackduck/http/client/CookieHeaderParserTest.java rename to src/test/java/com/blackduck/integration/blackduck/http/client/CookieHeaderParserTest.java index fd313ac5e..a13a50356 100644 --- a/src/test/java/com/synopsys/integration/blackduck/http/client/CookieHeaderParserTest.java +++ b/src/test/java/com/blackduck/integration/blackduck/http/client/CookieHeaderParserTest.java @@ -1,7 +1,8 @@ -package com.synopsys.integration.blackduck.http.client; +package com.blackduck.integration.blackduck.http.client; import static org.junit.jupiter.api.Assertions.assertEquals; +import com.blackduck.integration.blackduck.http.client.CookieHeaderParser; import org.apache.http.Header; import org.apache.http.message.BasicHeader; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/synopsys/integration/blackduck/http/client/IntHttpClientTestHelper.java b/src/test/java/com/blackduck/integration/blackduck/http/client/IntHttpClientTestHelper.java similarity index 92% rename from src/test/java/com/synopsys/integration/blackduck/http/client/IntHttpClientTestHelper.java rename to src/test/java/com/blackduck/integration/blackduck/http/client/IntHttpClientTestHelper.java index 0caaaddbd..2151aa08c 100644 --- a/src/test/java/com/synopsys/integration/blackduck/http/client/IntHttpClientTestHelper.java +++ b/src/test/java/com/blackduck/integration/blackduck/http/client/IntHttpClientTestHelper.java @@ -1,4 +1,4 @@ -package com.synopsys.integration.blackduck.http.client; +package com.blackduck.integration.blackduck.http.client; import static org.junit.Assert.fail; @@ -15,12 +15,12 @@ import org.apache.http.client.HttpClient; import com.synopsys.integration.blackduck.api.manual.view.ProjectView; -import com.synopsys.integration.blackduck.configuration.BlackDuckServerConfig; -import com.synopsys.integration.blackduck.configuration.BlackDuckServerConfigBuilder; -import com.synopsys.integration.blackduck.exception.BlackDuckIntegrationException; -import com.synopsys.integration.blackduck.service.BlackDuckApiClient; -import com.synopsys.integration.blackduck.service.BlackDuckServicesFactory; -import com.synopsys.integration.blackduck.service.dataservice.ProjectService; +import com.blackduck.integration.blackduck.configuration.BlackDuckServerConfig; +import com.blackduck.integration.blackduck.configuration.BlackDuckServerConfigBuilder; +import com.blackduck.integration.blackduck.exception.BlackDuckIntegrationException; +import com.blackduck.integration.blackduck.service.BlackDuckApiClient; +import com.blackduck.integration.blackduck.service.BlackDuckServicesFactory; +import com.blackduck.integration.blackduck.service.dataservice.ProjectService; import com.synopsys.integration.exception.IntegrationException; import com.synopsys.integration.log.IntLogger; import com.synopsys.integration.log.LogLevel; diff --git a/src/test/java/com/synopsys/integration/blackduck/http/client/MockWebServerUtil.java b/src/test/java/com/blackduck/integration/blackduck/http/client/MockWebServerUtil.java similarity index 93% rename from src/test/java/com/synopsys/integration/blackduck/http/client/MockWebServerUtil.java rename to src/test/java/com/blackduck/integration/blackduck/http/client/MockWebServerUtil.java index 0c7d0c92d..258c65b54 100644 --- a/src/test/java/com/synopsys/integration/blackduck/http/client/MockWebServerUtil.java +++ b/src/test/java/com/blackduck/integration/blackduck/http/client/MockWebServerUtil.java @@ -1,4 +1,4 @@ -package com.synopsys.integration.blackduck.http.client; +package com.blackduck.integration.blackduck.http.client; import org.apache.http.HttpHeaders; diff --git a/src/test/java/com/synopsys/integration/blackduck/http/client/SignatureScannerClientProxyTest.java b/src/test/java/com/blackduck/integration/blackduck/http/client/SignatureScannerClientProxyTest.java similarity index 96% rename from src/test/java/com/synopsys/integration/blackduck/http/client/SignatureScannerClientProxyTest.java rename to src/test/java/com/blackduck/integration/blackduck/http/client/SignatureScannerClientProxyTest.java index ba9943593..10da076a3 100644 --- a/src/test/java/com/synopsys/integration/blackduck/http/client/SignatureScannerClientProxyTest.java +++ b/src/test/java/com/blackduck/integration/blackduck/http/client/SignatureScannerClientProxyTest.java @@ -1,4 +1,4 @@ -package com.synopsys.integration.blackduck.http.client; +package com.blackduck.integration.blackduck.http.client; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -11,6 +11,7 @@ import java.util.Map; import java.util.concurrent.TimeUnit; +import com.blackduck.integration.blackduck.http.client.SignatureScannerClient; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; @@ -19,7 +20,7 @@ import org.mockserver.model.Header; import com.google.gson.Gson; -import com.synopsys.integration.blackduck.http.BlackDuckRequestBuilder; +import com.blackduck.integration.blackduck.http.BlackDuckRequestBuilder; import com.synopsys.integration.exception.IntegrationException; import com.synopsys.integration.log.BufferedIntLogger; import com.synopsys.integration.rest.HttpUrl; diff --git a/src/test/java/com/synopsys/integration/blackduck/http/client/SignatureScannerClientTest.java b/src/test/java/com/blackduck/integration/blackduck/http/client/SignatureScannerClientTest.java similarity index 97% rename from src/test/java/com/synopsys/integration/blackduck/http/client/SignatureScannerClientTest.java rename to src/test/java/com/blackduck/integration/blackduck/http/client/SignatureScannerClientTest.java index b5acfe3c1..2ab840635 100644 --- a/src/test/java/com/synopsys/integration/blackduck/http/client/SignatureScannerClientTest.java +++ b/src/test/java/com/blackduck/integration/blackduck/http/client/SignatureScannerClientTest.java @@ -1,4 +1,4 @@ -package com.synopsys.integration.blackduck.http.client; +package com.blackduck.integration.blackduck.http.client; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -19,6 +19,7 @@ import javax.net.ssl.SSLContext; +import com.blackduck.integration.blackduck.TimingExtension; import org.apache.http.ssl.SSLContexts; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; @@ -26,8 +27,7 @@ import org.junit.jupiter.api.extension.ExtendWith; import com.google.gson.Gson; -import com.synopsys.integration.blackduck.TimingExtension; -import com.synopsys.integration.blackduck.http.BlackDuckRequestBuilder; +import com.blackduck.integration.blackduck.http.BlackDuckRequestBuilder; import com.synopsys.integration.exception.IntegrationException; import com.synopsys.integration.log.BufferedIntLogger; import com.synopsys.integration.rest.HttpUrl; diff --git a/src/test/java/com/synopsys/integration/blackduck/http/client/TestingPropertyKey.java b/src/test/java/com/blackduck/integration/blackduck/http/client/TestingPropertyKey.java similarity index 96% rename from src/test/java/com/synopsys/integration/blackduck/http/client/TestingPropertyKey.java rename to src/test/java/com/blackduck/integration/blackduck/http/client/TestingPropertyKey.java index e8d7f46a4..13da789b9 100644 --- a/src/test/java/com/synopsys/integration/blackduck/http/client/TestingPropertyKey.java +++ b/src/test/java/com/blackduck/integration/blackduck/http/client/TestingPropertyKey.java @@ -1,4 +1,4 @@ -package com.synopsys.integration.blackduck.http.client; +package com.blackduck.integration.blackduck.http.client; public enum TestingPropertyKey { TEST_BLACKDUCK_SIGNATURE_SCANNER_DOWNLOAD_PATH, diff --git a/src/test/java/com/synopsys/integration/blackduck/http/client/cache/CachingHttpClientTestIT.java b/src/test/java/com/blackduck/integration/blackduck/http/client/cache/CachingHttpClientTestIT.java similarity index 84% rename from src/test/java/com/synopsys/integration/blackduck/http/client/cache/CachingHttpClientTestIT.java rename to src/test/java/com/blackduck/integration/blackduck/http/client/cache/CachingHttpClientTestIT.java index a711eb158..efa5387fa 100644 --- a/src/test/java/com/synopsys/integration/blackduck/http/client/cache/CachingHttpClientTestIT.java +++ b/src/test/java/com/blackduck/integration/blackduck/http/client/cache/CachingHttpClientTestIT.java @@ -1,4 +1,4 @@ -package com.synopsys.integration.blackduck.http.client.cache; +package com.blackduck.integration.blackduck.http.client.cache; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -12,10 +12,10 @@ import org.junit.jupiter.api.Test; import com.synopsys.integration.blackduck.api.manual.view.ProjectView; -import com.synopsys.integration.blackduck.configuration.BlackDuckServerConfig; -import com.synopsys.integration.blackduck.http.client.IntHttpClientTestHelper; -import com.synopsys.integration.blackduck.service.BlackDuckServicesFactory; -import com.synopsys.integration.blackduck.service.dataservice.ProjectService; +import com.blackduck.integration.blackduck.configuration.BlackDuckServerConfig; +import com.blackduck.integration.blackduck.http.client.IntHttpClientTestHelper; +import com.blackduck.integration.blackduck.service.BlackDuckServicesFactory; +import com.blackduck.integration.blackduck.service.dataservice.ProjectService; import com.synopsys.integration.exception.IntegrationException; import com.synopsys.integration.log.IntLogger; diff --git a/src/test/java/com/synopsys/integration/blackduck/http/transform/BlackDuckJsonTransformerTest.java b/src/test/java/com/blackduck/integration/blackduck/http/transform/BlackDuckJsonTransformerTest.java similarity index 95% rename from src/test/java/com/synopsys/integration/blackduck/http/transform/BlackDuckJsonTransformerTest.java rename to src/test/java/com/blackduck/integration/blackduck/http/transform/BlackDuckJsonTransformerTest.java index a1985606e..875505ff8 100644 --- a/src/test/java/com/synopsys/integration/blackduck/http/transform/BlackDuckJsonTransformerTest.java +++ b/src/test/java/com/blackduck/integration/blackduck/http/transform/BlackDuckJsonTransformerTest.java @@ -1,4 +1,4 @@ -package com.synopsys.integration.blackduck.http.transform; +package com.blackduck.integration.blackduck.http.transform; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -11,6 +11,7 @@ import java.util.Iterator; import java.util.Set; +import com.blackduck.integration.blackduck.TimingExtension; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; import org.junit.jupiter.api.BeforeAll; @@ -21,13 +22,12 @@ import com.google.gson.Gson; import com.google.gson.JsonArray; import com.google.gson.JsonElement; -import com.synopsys.integration.blackduck.TimingExtension; import com.synopsys.integration.blackduck.api.core.BlackDuckView; import com.synopsys.integration.blackduck.api.generated.view.ProjectVersionView; import com.synopsys.integration.blackduck.api.manual.view.ProjectView; -import com.synopsys.integration.blackduck.http.BlackDuckPageResponse; -import com.synopsys.integration.blackduck.http.transform.subclass.BlackDuckResponseResolver; -import com.synopsys.integration.blackduck.service.BlackDuckServicesFactory; +import com.blackduck.integration.blackduck.http.BlackDuckPageResponse; +import com.blackduck.integration.blackduck.http.transform.subclass.BlackDuckResponseResolver; +import com.blackduck.integration.blackduck.service.BlackDuckServicesFactory; import com.synopsys.integration.log.BufferedIntLogger; import com.synopsys.integration.log.IntLogger; diff --git a/src/test/java/com/synopsys/integration/blackduck/http/transform/BlackDuckResponsesTransformerTest.java b/src/test/java/com/blackduck/integration/blackduck/http/transform/BlackDuckResponsesTransformerTest.java similarity index 94% rename from src/test/java/com/synopsys/integration/blackduck/http/transform/BlackDuckResponsesTransformerTest.java rename to src/test/java/com/blackduck/integration/blackduck/http/transform/BlackDuckResponsesTransformerTest.java index 52d1a6f51..2a223fcda 100644 --- a/src/test/java/com/synopsys/integration/blackduck/http/transform/BlackDuckResponsesTransformerTest.java +++ b/src/test/java/com/blackduck/integration/blackduck/http/transform/BlackDuckResponsesTransformerTest.java @@ -1,4 +1,4 @@ -package com.synopsys.integration.blackduck.http.transform; +package com.blackduck.integration.blackduck.http.transform; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -9,6 +9,7 @@ import java.util.Set; import java.util.function.Predicate; +import com.blackduck.integration.blackduck.TimingExtension; import org.apache.commons.io.IOUtils; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -16,15 +17,14 @@ import org.mockito.Mockito; import com.google.gson.Gson; -import com.synopsys.integration.blackduck.TimingExtension; import com.synopsys.integration.blackduck.api.manual.view.ProjectView; -import com.synopsys.integration.blackduck.http.BlackDuckPageResponse; -import com.synopsys.integration.blackduck.http.BlackDuckRequestBuilder; -import com.synopsys.integration.blackduck.http.client.BlackDuckHttpClient; -import com.synopsys.integration.blackduck.http.transform.subclass.BlackDuckResponseResolver; -import com.synopsys.integration.blackduck.service.BlackDuckServicesFactory; -import com.synopsys.integration.blackduck.service.request.BlackDuckMultipleRequest; -import com.synopsys.integration.blackduck.service.request.BlackDuckRequest; +import com.blackduck.integration.blackduck.http.BlackDuckPageResponse; +import com.blackduck.integration.blackduck.http.BlackDuckRequestBuilder; +import com.blackduck.integration.blackduck.http.client.BlackDuckHttpClient; +import com.blackduck.integration.blackduck.http.transform.subclass.BlackDuckResponseResolver; +import com.blackduck.integration.blackduck.service.BlackDuckServicesFactory; +import com.blackduck.integration.blackduck.service.request.BlackDuckMultipleRequest; +import com.blackduck.integration.blackduck.service.request.BlackDuckRequest; import com.synopsys.integration.exception.IntegrationException; import com.synopsys.integration.log.LogLevel; import com.synopsys.integration.log.PrintStreamIntLogger; diff --git a/src/test/java/com/synopsys/integration/blackduck/http/transform/BlackDuckResponsesTransformerTestIT.java b/src/test/java/com/blackduck/integration/blackduck/http/transform/BlackDuckResponsesTransformerTestIT.java similarity index 87% rename from src/test/java/com/synopsys/integration/blackduck/http/transform/BlackDuckResponsesTransformerTestIT.java rename to src/test/java/com/blackduck/integration/blackduck/http/transform/BlackDuckResponsesTransformerTestIT.java index 9054704cf..9e71a0dca 100644 --- a/src/test/java/com/synopsys/integration/blackduck/http/transform/BlackDuckResponsesTransformerTestIT.java +++ b/src/test/java/com/blackduck/integration/blackduck/http/transform/BlackDuckResponsesTransformerTestIT.java @@ -1,5 +1,8 @@ -package com.synopsys.integration.blackduck.http.transform; +package com.blackduck.integration.blackduck.http.transform; +import com.blackduck.integration.blackduck.TimingExtension; +import com.blackduck.integration.blackduck.comprehensive.recipe.BasicRecipe; +import com.blackduck.integration.blackduck.http.client.IntHttpClientTestHelper; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Tag; @@ -7,16 +10,13 @@ import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.extension.ExtendWith; -import com.synopsys.integration.blackduck.TimingExtension; import com.synopsys.integration.blackduck.api.generated.discovery.ApiDiscovery; import com.synopsys.integration.blackduck.api.manual.view.ProjectView; -import com.synopsys.integration.blackduck.comprehensive.recipe.BasicRecipe; -import com.synopsys.integration.blackduck.http.BlackDuckPageDefinition; -import com.synopsys.integration.blackduck.http.BlackDuckPageResponse; -import com.synopsys.integration.blackduck.http.BlackDuckRequestBuilder; -import com.synopsys.integration.blackduck.http.client.IntHttpClientTestHelper; -import com.synopsys.integration.blackduck.service.BlackDuckServicesFactory; -import com.synopsys.integration.blackduck.service.request.BlackDuckMultipleRequest; +import com.blackduck.integration.blackduck.http.BlackDuckPageDefinition; +import com.blackduck.integration.blackduck.http.BlackDuckPageResponse; +import com.blackduck.integration.blackduck.http.BlackDuckRequestBuilder; +import com.blackduck.integration.blackduck.service.BlackDuckServicesFactory; +import com.blackduck.integration.blackduck.service.request.BlackDuckMultipleRequest; import com.synopsys.integration.exception.IntegrationException; @Tag("integration") diff --git a/src/test/java/com/synopsys/integration/blackduck/http/transform/ProjectViewWithoutDescription.java b/src/test/java/com/blackduck/integration/blackduck/http/transform/ProjectViewWithoutDescription.java similarity index 98% rename from src/test/java/com/synopsys/integration/blackduck/http/transform/ProjectViewWithoutDescription.java rename to src/test/java/com/blackduck/integration/blackduck/http/transform/ProjectViewWithoutDescription.java index 6b3cfa1ed..60361d043 100644 --- a/src/test/java/com/synopsys/integration/blackduck/http/transform/ProjectViewWithoutDescription.java +++ b/src/test/java/com/blackduck/integration/blackduck/http/transform/ProjectViewWithoutDescription.java @@ -1,4 +1,4 @@ -package com.synopsys.integration.blackduck.http.transform; +package com.blackduck.integration.blackduck.http.transform; import com.synopsys.integration.blackduck.api.core.BlackDuckView; import com.synopsys.integration.blackduck.api.generated.enumeration.OriginSourceType; diff --git a/src/test/java/com/synopsys/integration/blackduck/http/transform/SillyFruitResponse.java b/src/test/java/com/blackduck/integration/blackduck/http/transform/SillyFruitResponse.java similarity index 89% rename from src/test/java/com/synopsys/integration/blackduck/http/transform/SillyFruitResponse.java rename to src/test/java/com/blackduck/integration/blackduck/http/transform/SillyFruitResponse.java index 086beb20b..1083d060b 100644 --- a/src/test/java/com/synopsys/integration/blackduck/http/transform/SillyFruitResponse.java +++ b/src/test/java/com/blackduck/integration/blackduck/http/transform/SillyFruitResponse.java @@ -1,4 +1,4 @@ -package com.synopsys.integration.blackduck.http.transform; +package com.blackduck.integration.blackduck.http.transform; import java.util.List; diff --git a/src/test/java/com/synopsys/integration/blackduck/http/transform/subclass/BlackDuckResponseResolverTest.java b/src/test/java/com/blackduck/integration/blackduck/http/transform/subclass/BlackDuckResponseResolverTest.java similarity index 90% rename from src/test/java/com/synopsys/integration/blackduck/http/transform/subclass/BlackDuckResponseResolverTest.java rename to src/test/java/com/blackduck/integration/blackduck/http/transform/subclass/BlackDuckResponseResolverTest.java index 9879f10ee..a67973a3e 100644 --- a/src/test/java/com/synopsys/integration/blackduck/http/transform/subclass/BlackDuckResponseResolverTest.java +++ b/src/test/java/com/blackduck/integration/blackduck/http/transform/subclass/BlackDuckResponseResolverTest.java @@ -1,10 +1,11 @@ -package com.synopsys.integration.blackduck.http.transform.subclass; +package com.blackduck.integration.blackduck.http.transform.subclass; import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.IOException; import java.nio.charset.StandardCharsets; +import com.blackduck.integration.blackduck.http.transform.subclass.BlackDuckResponseResolver; import org.apache.commons.io.IOUtils; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/synopsys/integration/blackduck/license/LicenseTest.java b/src/test/java/com/blackduck/integration/blackduck/license/LicenseTest.java similarity index 84% rename from src/test/java/com/synopsys/integration/blackduck/license/LicenseTest.java rename to src/test/java/com/blackduck/integration/blackduck/license/LicenseTest.java index 59931e9e7..55a48b478 100644 --- a/src/test/java/com/synopsys/integration/blackduck/license/LicenseTest.java +++ b/src/test/java/com/blackduck/integration/blackduck/license/LicenseTest.java @@ -1,25 +1,24 @@ -package com.synopsys.integration.blackduck.license; +package com.blackduck.integration.blackduck.license; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.List; -import java.util.Optional; import java.util.function.Predicate; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import com.synopsys.integration.blackduck.TimingExtension; +import com.blackduck.integration.blackduck.TimingExtension; import com.synopsys.integration.blackduck.api.core.response.UrlMultipleResponses; import com.synopsys.integration.blackduck.api.generated.discovery.ApiDiscovery; import com.synopsys.integration.blackduck.api.generated.view.LicenseView; import com.synopsys.integration.blackduck.api.manual.response.BlackDuckStringResponse; -import com.synopsys.integration.blackduck.http.client.IntHttpClientTestHelper; -import com.synopsys.integration.blackduck.service.BlackDuckApiClient; -import com.synopsys.integration.blackduck.service.BlackDuckServicesFactory; +import com.blackduck.integration.blackduck.http.client.IntHttpClientTestHelper; +import com.blackduck.integration.blackduck.service.BlackDuckApiClient; +import com.blackduck.integration.blackduck.service.BlackDuckServicesFactory; import com.synopsys.integration.exception.IntegrationException; @Tag("integration") diff --git a/src/test/java/com/synopsys/integration/blackduck/service/BlackDuckApiClientTest.java b/src/test/java/com/blackduck/integration/blackduck/service/BlackDuckApiClientTest.java similarity index 89% rename from src/test/java/com/synopsys/integration/blackduck/service/BlackDuckApiClientTest.java rename to src/test/java/com/blackduck/integration/blackduck/service/BlackDuckApiClientTest.java index e3771e77c..2bd7c4aa3 100644 --- a/src/test/java/com/synopsys/integration/blackduck/service/BlackDuckApiClientTest.java +++ b/src/test/java/com/blackduck/integration/blackduck/service/BlackDuckApiClientTest.java @@ -1,4 +1,4 @@ -package com.synopsys.integration.blackduck.service; +package com.blackduck.integration.blackduck.service; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -16,16 +16,16 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.google.gson.Gson; -import com.synopsys.integration.blackduck.TimingExtension; +import com.blackduck.integration.blackduck.TimingExtension; import com.synopsys.integration.blackduck.api.generated.enumeration.ProjectVersionComponentPolicyStatusType; import com.synopsys.integration.blackduck.api.generated.view.ProjectVersionPolicyStatusView; import com.synopsys.integration.blackduck.api.generated.view.ProjectVersionView; -import com.synopsys.integration.blackduck.http.client.BlackDuckHttpClient; -import com.synopsys.integration.blackduck.http.transform.BlackDuckJsonTransformer; -import com.synopsys.integration.blackduck.http.transform.BlackDuckResponseTransformer; -import com.synopsys.integration.blackduck.http.transform.BlackDuckResponsesTransformer; -import com.synopsys.integration.blackduck.http.transform.subclass.BlackDuckResponseResolver; -import com.synopsys.integration.blackduck.service.request.BlackDuckRequest; +import com.blackduck.integration.blackduck.http.client.BlackDuckHttpClient; +import com.blackduck.integration.blackduck.http.transform.BlackDuckJsonTransformer; +import com.blackduck.integration.blackduck.http.transform.BlackDuckResponseTransformer; +import com.blackduck.integration.blackduck.http.transform.BlackDuckResponsesTransformer; +import com.blackduck.integration.blackduck.http.transform.subclass.BlackDuckResponseResolver; +import com.blackduck.integration.blackduck.service.request.BlackDuckRequest; import com.synopsys.integration.exception.IntegrationException; import com.synopsys.integration.log.BufferedIntLogger; import com.synopsys.integration.log.IntLogger; diff --git a/src/test/java/com/synopsys/integration/blackduck/service/BlackDuckApiClientTestIT.java b/src/test/java/com/blackduck/integration/blackduck/service/BlackDuckApiClientTestIT.java similarity index 80% rename from src/test/java/com/synopsys/integration/blackduck/service/BlackDuckApiClientTestIT.java rename to src/test/java/com/blackduck/integration/blackduck/service/BlackDuckApiClientTestIT.java index dc19fcbc6..ba1eda92a 100644 --- a/src/test/java/com/synopsys/integration/blackduck/service/BlackDuckApiClientTestIT.java +++ b/src/test/java/com/blackduck/integration/blackduck/service/BlackDuckApiClientTestIT.java @@ -1,4 +1,4 @@ -package com.synopsys.integration.blackduck.service; +package com.blackduck.integration.blackduck.service; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; @@ -12,25 +12,25 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.google.gson.Gson; -import com.synopsys.integration.blackduck.TimingExtension; +import com.blackduck.integration.blackduck.TimingExtension; import com.synopsys.integration.blackduck.api.core.response.UrlSingleResponse; import com.synopsys.integration.blackduck.api.generated.discovery.ApiDiscovery; import com.synopsys.integration.blackduck.api.generated.discovery.BlackDuckMediaTypeDiscovery; import com.synopsys.integration.blackduck.api.manual.view.ProjectView; -import com.synopsys.integration.blackduck.configuration.BlackDuckServerConfig; -import com.synopsys.integration.blackduck.configuration.BlackDuckServerConfigBuilder; -import com.synopsys.integration.blackduck.http.BlackDuckRequestBuilder; -import com.synopsys.integration.blackduck.http.client.BlackDuckHttpClient; -import com.synopsys.integration.blackduck.http.client.IntHttpClientTestHelper; -import com.synopsys.integration.blackduck.http.client.TestingPropertyKey; -import com.synopsys.integration.blackduck.http.transform.BlackDuckJsonTransformer; -import com.synopsys.integration.blackduck.http.transform.BlackDuckResponseTransformer; -import com.synopsys.integration.blackduck.http.transform.BlackDuckResponsesTransformer; -import com.synopsys.integration.blackduck.http.transform.subclass.BlackDuckResponseResolver; -import com.synopsys.integration.blackduck.service.request.AcceptHeaderEditor; -import com.synopsys.integration.blackduck.service.request.BlackDuckMultipleRequest; -import com.synopsys.integration.blackduck.service.request.BlackDuckSingleRequest; -import com.synopsys.integration.blackduck.service.request.PagingDefaultsEditor; +import com.blackduck.integration.blackduck.configuration.BlackDuckServerConfig; +import com.blackduck.integration.blackduck.configuration.BlackDuckServerConfigBuilder; +import com.blackduck.integration.blackduck.http.BlackDuckRequestBuilder; +import com.blackduck.integration.blackduck.http.client.BlackDuckHttpClient; +import com.blackduck.integration.blackduck.http.client.IntHttpClientTestHelper; +import com.blackduck.integration.blackduck.http.client.TestingPropertyKey; +import com.blackduck.integration.blackduck.http.transform.BlackDuckJsonTransformer; +import com.blackduck.integration.blackduck.http.transform.BlackDuckResponseTransformer; +import com.blackduck.integration.blackduck.http.transform.BlackDuckResponsesTransformer; +import com.blackduck.integration.blackduck.http.transform.subclass.BlackDuckResponseResolver; +import com.blackduck.integration.blackduck.service.request.AcceptHeaderEditor; +import com.blackduck.integration.blackduck.service.request.BlackDuckMultipleRequest; +import com.blackduck.integration.blackduck.service.request.BlackDuckSingleRequest; +import com.blackduck.integration.blackduck.service.request.PagingDefaultsEditor; import com.synopsys.integration.exception.IntegrationException; import com.synopsys.integration.log.IntLogger; import com.synopsys.integration.log.LogLevel; diff --git a/src/test/java/com/synopsys/integration/blackduck/service/dataservice/BlackDuckRegistrationRequestServiceTestIT.java b/src/test/java/com/blackduck/integration/blackduck/service/dataservice/BlackDuckRegistrationRequestServiceTestIT.java similarity index 77% rename from src/test/java/com/synopsys/integration/blackduck/service/dataservice/BlackDuckRegistrationRequestServiceTestIT.java rename to src/test/java/com/blackduck/integration/blackduck/service/dataservice/BlackDuckRegistrationRequestServiceTestIT.java index b6b9e2f55..b772d5986 100644 --- a/src/test/java/com/synopsys/integration/blackduck/service/dataservice/BlackDuckRegistrationRequestServiceTestIT.java +++ b/src/test/java/com/blackduck/integration/blackduck/service/dataservice/BlackDuckRegistrationRequestServiceTestIT.java @@ -1,15 +1,15 @@ -package com.synopsys.integration.blackduck.service.dataservice; +package com.blackduck.integration.blackduck.service.dataservice; import static org.junit.jupiter.api.Assertions.assertTrue; +import com.blackduck.integration.blackduck.TimingExtension; +import com.blackduck.integration.blackduck.http.client.IntHttpClientTestHelper; import org.apache.commons.lang3.StringUtils; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import com.synopsys.integration.blackduck.TimingExtension; -import com.synopsys.integration.blackduck.http.client.IntHttpClientTestHelper; -import com.synopsys.integration.blackduck.service.BlackDuckServicesFactory; +import com.blackduck.integration.blackduck.service.BlackDuckServicesFactory; @Tag("integration") @ExtendWith(TimingExtension.class) diff --git a/src/test/java/com/synopsys/integration/blackduck/service/dataservice/BlackDuckScanReadinessServiceTestIT.java b/src/test/java/com/blackduck/integration/blackduck/service/dataservice/BlackDuckScanReadinessServiceTestIT.java similarity index 81% rename from src/test/java/com/synopsys/integration/blackduck/service/dataservice/BlackDuckScanReadinessServiceTestIT.java rename to src/test/java/com/blackduck/integration/blackduck/service/dataservice/BlackDuckScanReadinessServiceTestIT.java index 8f5df43e6..934a0b5a2 100644 --- a/src/test/java/com/synopsys/integration/blackduck/service/dataservice/BlackDuckScanReadinessServiceTestIT.java +++ b/src/test/java/com/blackduck/integration/blackduck/service/dataservice/BlackDuckScanReadinessServiceTestIT.java @@ -1,15 +1,15 @@ -package com.synopsys.integration.blackduck.service.dataservice; +package com.blackduck.integration.blackduck.service.dataservice; +import com.blackduck.integration.blackduck.TimingExtension; import org.junit.Assume; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import com.synopsys.integration.blackduck.TimingExtension; import com.synopsys.integration.blackduck.api.generated.view.ScanReadinessView; -import com.synopsys.integration.blackduck.http.client.IntHttpClientTestHelper; -import com.synopsys.integration.blackduck.service.BlackDuckServicesFactory; +import com.blackduck.integration.blackduck.http.client.IntHttpClientTestHelper; +import com.blackduck.integration.blackduck.service.BlackDuckServicesFactory; import com.synopsys.integration.exception.IntegrationException; @Tag("integration") diff --git a/src/test/java/com/synopsys/integration/blackduck/service/dataservice/CodeLocationServiceTestIT.java b/src/test/java/com/blackduck/integration/blackduck/service/dataservice/CodeLocationServiceTestIT.java similarity index 89% rename from src/test/java/com/synopsys/integration/blackduck/service/dataservice/CodeLocationServiceTestIT.java rename to src/test/java/com/blackduck/integration/blackduck/service/dataservice/CodeLocationServiceTestIT.java index b14b2cbff..094a2ea53 100644 --- a/src/test/java/com/synopsys/integration/blackduck/service/dataservice/CodeLocationServiceTestIT.java +++ b/src/test/java/com/blackduck/integration/blackduck/service/dataservice/CodeLocationServiceTestIT.java @@ -1,4 +1,4 @@ -package com.synopsys.integration.blackduck.service.dataservice; +package com.blackduck.integration.blackduck.service.dataservice; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -12,6 +12,7 @@ import java.util.stream.Collectors; import java.util.stream.IntStream; +import com.blackduck.integration.blackduck.TimingExtension; import org.apache.commons.lang3.StringUtils; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Tag; @@ -22,26 +23,25 @@ import com.synopsys.integration.bdio.graph.ProjectDependencyGraph; import com.synopsys.integration.bdio.model.SimpleBdioDocument; import com.synopsys.integration.bdio.model.dependency.Dependency; -import com.synopsys.integration.blackduck.TimingExtension; import com.synopsys.integration.blackduck.api.generated.view.CodeLocationView; import com.synopsys.integration.blackduck.api.manual.view.ProjectView; import com.synopsys.integration.blackduck.api.generated.view.UserView; -import com.synopsys.integration.blackduck.codelocation.Result; -import com.synopsys.integration.blackduck.codelocation.bdiolegacy.BdioUploadCodeLocationCreationRequest; -import com.synopsys.integration.blackduck.codelocation.bdiolegacy.BdioUploadService; -import com.synopsys.integration.blackduck.codelocation.upload.UploadBatch; -import com.synopsys.integration.blackduck.codelocation.upload.UploadBatchOutput; -import com.synopsys.integration.blackduck.codelocation.upload.UploadOutput; -import com.synopsys.integration.blackduck.codelocation.upload.UploadTarget; -import com.synopsys.integration.blackduck.comprehensive.BlackDuckServices; -import com.synopsys.integration.blackduck.configuration.BlackDuckServerConfig; -import com.synopsys.integration.blackduck.configuration.BlackDuckServerConfigBuilder; -import com.synopsys.integration.blackduck.http.BlackDuckRequestBuilder; -import com.synopsys.integration.blackduck.http.client.IntHttpClientTestHelper; -import com.synopsys.integration.blackduck.http.client.TestingPropertyKey; -import com.synopsys.integration.blackduck.service.BlackDuckServicesFactory; -import com.synopsys.integration.blackduck.service.model.ProjectVersionWrapper; -import com.synopsys.integration.blackduck.service.request.BlackDuckMultipleRequest; +import com.blackduck.integration.blackduck.codelocation.Result; +import com.blackduck.integration.blackduck.codelocation.bdiolegacy.BdioUploadCodeLocationCreationRequest; +import com.blackduck.integration.blackduck.codelocation.bdiolegacy.BdioUploadService; +import com.blackduck.integration.blackduck.codelocation.upload.UploadBatch; +import com.blackduck.integration.blackduck.codelocation.upload.UploadBatchOutput; +import com.blackduck.integration.blackduck.codelocation.upload.UploadOutput; +import com.blackduck.integration.blackduck.codelocation.upload.UploadTarget; +import com.blackduck.integration.blackduck.comprehensive.BlackDuckServices; +import com.blackduck.integration.blackduck.configuration.BlackDuckServerConfig; +import com.blackduck.integration.blackduck.configuration.BlackDuckServerConfigBuilder; +import com.blackduck.integration.blackduck.http.BlackDuckRequestBuilder; +import com.blackduck.integration.blackduck.http.client.IntHttpClientTestHelper; +import com.blackduck.integration.blackduck.http.client.TestingPropertyKey; +import com.blackduck.integration.blackduck.service.BlackDuckServicesFactory; +import com.blackduck.integration.blackduck.service.model.ProjectVersionWrapper; +import com.blackduck.integration.blackduck.service.request.BlackDuckMultipleRequest; import com.synopsys.integration.exception.IntegrationException; import com.synopsys.integration.log.BufferedIntLogger; import com.synopsys.integration.rest.HttpUrl; diff --git a/src/test/java/com/synopsys/integration/blackduck/service/dataservice/ComponentServiceTestIT.java b/src/test/java/com/blackduck/integration/blackduck/service/dataservice/ComponentServiceTestIT.java similarity index 93% rename from src/test/java/com/synopsys/integration/blackduck/service/dataservice/ComponentServiceTestIT.java rename to src/test/java/com/blackduck/integration/blackduck/service/dataservice/ComponentServiceTestIT.java index 483b01d2f..c4acefefe 100644 --- a/src/test/java/com/synopsys/integration/blackduck/service/dataservice/ComponentServiceTestIT.java +++ b/src/test/java/com/blackduck/integration/blackduck/service/dataservice/ComponentServiceTestIT.java @@ -1,4 +1,4 @@ -package com.synopsys.integration.blackduck.service.dataservice; +package com.blackduck.integration.blackduck.service.dataservice; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -8,6 +8,8 @@ import java.util.List; import java.util.Optional; +import com.blackduck.integration.blackduck.TimingExtension; +import com.blackduck.integration.blackduck.http.client.IntHttpClientTestHelper; import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; @@ -16,11 +18,9 @@ import com.synopsys.integration.bdio.model.Forge; import com.synopsys.integration.bdio.model.externalid.ExternalId; import com.synopsys.integration.bdio.model.externalid.ExternalIdFactory; -import com.synopsys.integration.blackduck.TimingExtension; import com.synopsys.integration.blackduck.api.generated.response.ComponentsView; import com.synopsys.integration.blackduck.api.generated.view.ComponentVersionView; -import com.synopsys.integration.blackduck.http.client.IntHttpClientTestHelper; -import com.synopsys.integration.blackduck.service.BlackDuckServicesFactory; +import com.blackduck.integration.blackduck.service.BlackDuckServicesFactory; import com.synopsys.integration.exception.IntegrationException; @Tag("integration") diff --git a/src/test/java/com/synopsys/integration/blackduck/service/dataservice/IssueServiceTestIT.java b/src/test/java/com/blackduck/integration/blackduck/service/dataservice/IssueServiceTestIT.java similarity index 92% rename from src/test/java/com/synopsys/integration/blackduck/service/dataservice/IssueServiceTestIT.java rename to src/test/java/com/blackduck/integration/blackduck/service/dataservice/IssueServiceTestIT.java index 8e898b2fb..74ccb2b56 100644 --- a/src/test/java/com/synopsys/integration/blackduck/service/dataservice/IssueServiceTestIT.java +++ b/src/test/java/com/blackduck/integration/blackduck/service/dataservice/IssueServiceTestIT.java @@ -1,4 +1,4 @@ -package com.synopsys.integration.blackduck.service.dataservice; +package com.blackduck.integration.blackduck.service.dataservice; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -11,6 +11,7 @@ import java.util.Set; import java.util.stream.Collectors; +import com.blackduck.integration.blackduck.TimingExtension; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Tag; @@ -19,18 +20,16 @@ import com.synopsys.integration.bdio.model.externalid.ExternalId; import com.synopsys.integration.bdio.model.externalid.ExternalIdFactory; -import com.synopsys.integration.blackduck.TimingExtension; import com.synopsys.integration.blackduck.api.generated.view.IssueView; import com.synopsys.integration.blackduck.api.generated.view.ProjectVersionComponentVersionView; -import com.synopsys.integration.blackduck.api.generated.view.ProjectVersionComponentView; import com.synopsys.integration.blackduck.api.generated.view.ProjectVersionIssuesView; import com.synopsys.integration.blackduck.api.manual.view.ProjectView; import com.synopsys.integration.blackduck.api.manual.temporary.component.IssueRequest; -import com.synopsys.integration.blackduck.http.client.IntHttpClientTestHelper; -import com.synopsys.integration.blackduck.service.BlackDuckApiClient; -import com.synopsys.integration.blackduck.service.BlackDuckServicesFactory; -import com.synopsys.integration.blackduck.service.model.ProjectSyncModel; -import com.synopsys.integration.blackduck.service.model.ProjectVersionWrapper; +import com.blackduck.integration.blackduck.http.client.IntHttpClientTestHelper; +import com.blackduck.integration.blackduck.service.BlackDuckApiClient; +import com.blackduck.integration.blackduck.service.BlackDuckServicesFactory; +import com.blackduck.integration.blackduck.service.model.ProjectSyncModel; +import com.blackduck.integration.blackduck.service.model.ProjectVersionWrapper; import com.synopsys.integration.exception.IntegrationException; @Tag("integration") diff --git a/src/test/java/com/synopsys/integration/blackduck/service/dataservice/LicenseDataServiceTestIT.java b/src/test/java/com/blackduck/integration/blackduck/service/dataservice/LicenseDataServiceTestIT.java similarity index 91% rename from src/test/java/com/synopsys/integration/blackduck/service/dataservice/LicenseDataServiceTestIT.java rename to src/test/java/com/blackduck/integration/blackduck/service/dataservice/LicenseDataServiceTestIT.java index fc59ee69c..a3bf25d61 100644 --- a/src/test/java/com/synopsys/integration/blackduck/service/dataservice/LicenseDataServiceTestIT.java +++ b/src/test/java/com/blackduck/integration/blackduck/service/dataservice/LicenseDataServiceTestIT.java @@ -1,4 +1,4 @@ -package com.synopsys.integration.blackduck.service.dataservice; +package com.blackduck.integration.blackduck.service.dataservice; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; @@ -6,7 +6,7 @@ import java.util.Optional; -import org.apache.commons.lang3.StringUtils; +import com.blackduck.integration.blackduck.TimingExtension; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; @@ -15,12 +15,11 @@ import com.synopsys.integration.bdio.SimpleBdioFactory; import com.synopsys.integration.bdio.model.externalid.ExternalId; import com.synopsys.integration.bdio.model.externalid.ExternalIdFactory; -import com.synopsys.integration.blackduck.TimingExtension; import com.synopsys.integration.blackduck.api.generated.enumeration.LicenseType; import com.synopsys.integration.blackduck.api.generated.view.ComponentVersionLicenseLicensesView; import com.synopsys.integration.blackduck.api.generated.view.ComponentVersionLicenseView; -import com.synopsys.integration.blackduck.http.client.IntHttpClientTestHelper; -import com.synopsys.integration.blackduck.service.BlackDuckServicesFactory; +import com.blackduck.integration.blackduck.http.client.IntHttpClientTestHelper; +import com.blackduck.integration.blackduck.service.BlackDuckServicesFactory; import com.synopsys.integration.exception.IntegrationException; @Tag("integration") diff --git a/src/test/java/com/synopsys/integration/blackduck/service/dataservice/PolicyRuleServiceTestIT.java b/src/test/java/com/blackduck/integration/blackduck/service/dataservice/PolicyRuleServiceTestIT.java similarity index 87% rename from src/test/java/com/synopsys/integration/blackduck/service/dataservice/PolicyRuleServiceTestIT.java rename to src/test/java/com/blackduck/integration/blackduck/service/dataservice/PolicyRuleServiceTestIT.java index 88d5c0327..4f094f178 100644 --- a/src/test/java/com/synopsys/integration/blackduck/service/dataservice/PolicyRuleServiceTestIT.java +++ b/src/test/java/com/blackduck/integration/blackduck/service/dataservice/PolicyRuleServiceTestIT.java @@ -1,4 +1,4 @@ -package com.synopsys.integration.blackduck.service.dataservice; +package com.blackduck.integration.blackduck.service.dataservice; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -11,15 +11,15 @@ import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; -import com.synopsys.integration.blackduck.api.enumeration.PolicyRuleConditionOperatorType; +import com.blackduck.integration.blackduck.api.enumeration.PolicyRuleConditionOperatorType; import com.synopsys.integration.blackduck.api.generated.component.PolicyRuleExpressionView; import com.synopsys.integration.blackduck.api.generated.enumeration.PolicyRuleCategoryType; import com.synopsys.integration.blackduck.api.generated.view.PolicyRuleView; -import com.synopsys.integration.blackduck.exception.BlackDuckIntegrationException; -import com.synopsys.integration.blackduck.http.client.IntHttpClientTestHelper; -import com.synopsys.integration.blackduck.service.BlackDuckApiClient; -import com.synopsys.integration.blackduck.service.BlackDuckServicesFactory; -import com.synopsys.integration.blackduck.service.model.PolicyRuleExpressionSetBuilder; +import com.blackduck.integration.blackduck.exception.BlackDuckIntegrationException; +import com.blackduck.integration.blackduck.http.client.IntHttpClientTestHelper; +import com.blackduck.integration.blackduck.service.BlackDuckApiClient; +import com.blackduck.integration.blackduck.service.BlackDuckServicesFactory; +import com.blackduck.integration.blackduck.service.model.PolicyRuleExpressionSetBuilder; import com.synopsys.integration.exception.IntegrationException; import com.synopsys.integration.rest.HttpUrl; diff --git a/src/test/java/com/synopsys/integration/blackduck/service/dataservice/PolicyStatusDescriptionTest.java b/src/test/java/com/blackduck/integration/blackduck/service/dataservice/PolicyStatusDescriptionTest.java similarity index 95% rename from src/test/java/com/synopsys/integration/blackduck/service/dataservice/PolicyStatusDescriptionTest.java rename to src/test/java/com/blackduck/integration/blackduck/service/dataservice/PolicyStatusDescriptionTest.java index eb391b37d..ebf612689 100644 --- a/src/test/java/com/synopsys/integration/blackduck/service/dataservice/PolicyStatusDescriptionTest.java +++ b/src/test/java/com/blackduck/integration/blackduck/service/dataservice/PolicyStatusDescriptionTest.java @@ -1,19 +1,19 @@ -package com.synopsys.integration.blackduck.service.dataservice; +package com.blackduck.integration.blackduck.service.dataservice; import java.util.ArrayList; import java.util.List; +import com.blackduck.integration.blackduck.TimingExtension; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import com.synopsys.integration.blackduck.TimingExtension; import com.synopsys.integration.blackduck.api.generated.component.ProjectVersionPolicyStatusComponentVersionPolicyViolationDetailsView; import com.synopsys.integration.blackduck.api.generated.enumeration.PolicyRuleSeverityType; import com.synopsys.integration.blackduck.api.generated.enumeration.ProjectVersionComponentPolicyStatusType; import com.synopsys.integration.blackduck.api.generated.view.ProjectVersionPolicyStatusView; import com.synopsys.integration.blackduck.api.manual.temporary.component.NameValuePairView; -import com.synopsys.integration.blackduck.service.model.PolicyStatusDescription; +import com.blackduck.integration.blackduck.service.model.PolicyStatusDescription; @ExtendWith(TimingExtension.class) public class PolicyStatusDescriptionTest { diff --git a/src/test/java/com/synopsys/integration/blackduck/service/dataservice/ProjectAssignmentServiceTestIT.java b/src/test/java/com/blackduck/integration/blackduck/service/dataservice/ProjectAssignmentServiceTestIT.java similarity index 87% rename from src/test/java/com/synopsys/integration/blackduck/service/dataservice/ProjectAssignmentServiceTestIT.java rename to src/test/java/com/blackduck/integration/blackduck/service/dataservice/ProjectAssignmentServiceTestIT.java index 87d7f1eef..b05af940f 100644 --- a/src/test/java/com/synopsys/integration/blackduck/service/dataservice/ProjectAssignmentServiceTestIT.java +++ b/src/test/java/com/blackduck/integration/blackduck/service/dataservice/ProjectAssignmentServiceTestIT.java @@ -1,4 +1,4 @@ -package com.synopsys.integration.blackduck.service.dataservice; +package com.blackduck.integration.blackduck.service.dataservice; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -6,19 +6,19 @@ import java.util.Date; import java.util.List; +import com.blackduck.integration.blackduck.TimingExtension; +import com.blackduck.integration.blackduck.http.client.IntHttpClientTestHelper; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import com.synopsys.integration.blackduck.TimingExtension; import com.synopsys.integration.blackduck.api.manual.view.ProjectView; import com.synopsys.integration.blackduck.api.manual.temporary.component.ProjectRequest; import com.synopsys.integration.blackduck.api.manual.temporary.view.AssignedUserView; -import com.synopsys.integration.blackduck.http.client.IntHttpClientTestHelper; -import com.synopsys.integration.blackduck.service.BlackDuckServicesFactory; -import com.synopsys.integration.blackduck.service.model.ProjectVersionWrapper; +import com.blackduck.integration.blackduck.service.BlackDuckServicesFactory; +import com.blackduck.integration.blackduck.service.model.ProjectVersionWrapper; import com.synopsys.integration.exception.IntegrationException; @Tag("integration") diff --git a/src/test/java/com/synopsys/integration/blackduck/service/dataservice/ProjectMappingServiceTest.java b/src/test/java/com/blackduck/integration/blackduck/service/dataservice/ProjectMappingServiceTest.java similarity index 86% rename from src/test/java/com/synopsys/integration/blackduck/service/dataservice/ProjectMappingServiceTest.java rename to src/test/java/com/blackduck/integration/blackduck/service/dataservice/ProjectMappingServiceTest.java index 3a63254a1..b00bb5628 100644 --- a/src/test/java/com/synopsys/integration/blackduck/service/dataservice/ProjectMappingServiceTest.java +++ b/src/test/java/com/blackduck/integration/blackduck/service/dataservice/ProjectMappingServiceTest.java @@ -1,23 +1,23 @@ -package com.synopsys.integration.blackduck.service.dataservice; +package com.blackduck.integration.blackduck.service.dataservice; import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.List; +import com.blackduck.integration.blackduck.TimingExtension; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import com.synopsys.integration.blackduck.TimingExtension; import com.synopsys.integration.blackduck.api.manual.view.ProjectView; import com.synopsys.integration.blackduck.api.manual.view.ProjectMappingView; -import com.synopsys.integration.blackduck.http.client.IntHttpClientTestHelper; -import com.synopsys.integration.blackduck.service.BlackDuckApiClient; -import com.synopsys.integration.blackduck.service.BlackDuckServicesFactory; -import com.synopsys.integration.blackduck.service.model.ProjectSyncModel; -import com.synopsys.integration.blackduck.service.model.ProjectVersionWrapper; +import com.blackduck.integration.blackduck.http.client.IntHttpClientTestHelper; +import com.blackduck.integration.blackduck.service.BlackDuckApiClient; +import com.blackduck.integration.blackduck.service.BlackDuckServicesFactory; +import com.blackduck.integration.blackduck.service.model.ProjectSyncModel; +import com.blackduck.integration.blackduck.service.model.ProjectVersionWrapper; import com.synopsys.integration.exception.IntegrationException; @Tag("integration") diff --git a/src/test/java/com/synopsys/integration/blackduck/service/dataservice/ProjectServiceTest.java b/src/test/java/com/blackduck/integration/blackduck/service/dataservice/ProjectServiceTest.java similarity index 82% rename from src/test/java/com/synopsys/integration/blackduck/service/dataservice/ProjectServiceTest.java rename to src/test/java/com/blackduck/integration/blackduck/service/dataservice/ProjectServiceTest.java index 23e4fe66a..7c47fdb98 100644 --- a/src/test/java/com/synopsys/integration/blackduck/service/dataservice/ProjectServiceTest.java +++ b/src/test/java/com/blackduck/integration/blackduck/service/dataservice/ProjectServiceTest.java @@ -1,4 +1,4 @@ -package com.synopsys.integration.blackduck.service.dataservice; +package com.blackduck.integration.blackduck.service.dataservice; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -9,6 +9,8 @@ import java.util.List; import java.util.Optional; +import com.blackduck.integration.blackduck.service.dataservice.ProjectGetService; +import com.blackduck.integration.blackduck.service.dataservice.ProjectService; import org.apache.commons.io.IOUtils; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; @@ -19,11 +21,11 @@ import com.synopsys.integration.blackduck.api.generated.discovery.ApiDiscovery; import com.synopsys.integration.blackduck.api.generated.view.ProjectVersionView; import com.synopsys.integration.blackduck.api.manual.view.ProjectView; -import com.synopsys.integration.blackduck.http.BlackDuckPageResponse; -import com.synopsys.integration.blackduck.http.transform.BlackDuckJsonTransformer; -import com.synopsys.integration.blackduck.http.transform.subclass.BlackDuckResponseResolver; -import com.synopsys.integration.blackduck.service.BlackDuckApiClient; -import com.synopsys.integration.blackduck.service.BlackDuckServicesFactory; +import com.blackduck.integration.blackduck.http.BlackDuckPageResponse; +import com.blackduck.integration.blackduck.http.transform.BlackDuckJsonTransformer; +import com.blackduck.integration.blackduck.http.transform.subclass.BlackDuckResponseResolver; +import com.blackduck.integration.blackduck.service.BlackDuckApiClient; +import com.blackduck.integration.blackduck.service.BlackDuckServicesFactory; import com.synopsys.integration.exception.IntegrationException; import com.synopsys.integration.log.BufferedIntLogger; import com.synopsys.integration.log.IntLogger; diff --git a/src/test/java/com/synopsys/integration/blackduck/service/dataservice/ProjectServiceTestIT.java b/src/test/java/com/blackduck/integration/blackduck/service/dataservice/ProjectServiceTestIT.java similarity index 97% rename from src/test/java/com/synopsys/integration/blackduck/service/dataservice/ProjectServiceTestIT.java rename to src/test/java/com/blackduck/integration/blackduck/service/dataservice/ProjectServiceTestIT.java index 03af0e1d6..01e24c39b 100644 --- a/src/test/java/com/synopsys/integration/blackduck/service/dataservice/ProjectServiceTestIT.java +++ b/src/test/java/com/blackduck/integration/blackduck/service/dataservice/ProjectServiceTestIT.java @@ -1,4 +1,4 @@ -package com.synopsys.integration.blackduck.service.dataservice; +package com.blackduck.integration.blackduck.service.dataservice; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -11,6 +11,7 @@ import java.util.List; import java.util.Optional; +import com.blackduck.integration.blackduck.TimingExtension; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; @@ -18,7 +19,6 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import com.synopsys.integration.blackduck.TimingExtension; import com.synopsys.integration.blackduck.api.generated.enumeration.ProjectCloneCategoriesType; import com.synopsys.integration.blackduck.api.generated.enumeration.ProjectVersionDistributionType; import com.synopsys.integration.blackduck.api.generated.view.ProjectVersionView; @@ -27,12 +27,12 @@ import com.synopsys.integration.blackduck.api.manual.temporary.component.ProjectRequest; import com.synopsys.integration.blackduck.api.manual.temporary.component.ProjectVersionRequest; import com.synopsys.integration.blackduck.api.manual.temporary.enumeration.ProjectVersionPhaseType; -import com.synopsys.integration.blackduck.exception.BlackDuckApiException; -import com.synopsys.integration.blackduck.http.client.IntHttpClientTestHelper; -import com.synopsys.integration.blackduck.service.BlackDuckApiClient; -import com.synopsys.integration.blackduck.service.BlackDuckServicesFactory; -import com.synopsys.integration.blackduck.service.model.ProjectSyncModel; -import com.synopsys.integration.blackduck.service.model.ProjectVersionWrapper; +import com.blackduck.integration.blackduck.exception.BlackDuckApiException; +import com.blackduck.integration.blackduck.http.client.IntHttpClientTestHelper; +import com.blackduck.integration.blackduck.service.BlackDuckApiClient; +import com.blackduck.integration.blackduck.service.BlackDuckServicesFactory; +import com.blackduck.integration.blackduck.service.model.ProjectSyncModel; +import com.blackduck.integration.blackduck.service.model.ProjectVersionWrapper; import com.synopsys.integration.exception.IntegrationException; import com.synopsys.integration.rest.HttpUrl; import com.synopsys.integration.rest.RestConstants; diff --git a/src/test/java/com/synopsys/integration/blackduck/service/dataservice/UserServiceTestIT.java b/src/test/java/com/blackduck/integration/blackduck/service/dataservice/UserServiceTestIT.java similarity index 94% rename from src/test/java/com/synopsys/integration/blackduck/service/dataservice/UserServiceTestIT.java rename to src/test/java/com/blackduck/integration/blackduck/service/dataservice/UserServiceTestIT.java index 4f5a642ef..ad96cc3bc 100644 --- a/src/test/java/com/synopsys/integration/blackduck/service/dataservice/UserServiceTestIT.java +++ b/src/test/java/com/blackduck/integration/blackduck/service/dataservice/UserServiceTestIT.java @@ -1,4 +1,4 @@ -package com.synopsys.integration.blackduck.service.dataservice; +package com.blackduck.integration.blackduck.service.dataservice; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -9,11 +9,11 @@ import java.util.List; import java.util.Set; +import com.blackduck.integration.blackduck.TimingExtension; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import com.synopsys.integration.blackduck.TimingExtension; import com.synopsys.integration.blackduck.api.core.BlackDuckView; import com.synopsys.integration.blackduck.api.generated.discovery.ApiDiscovery; import com.synopsys.integration.blackduck.api.manual.view.ProjectView; @@ -22,11 +22,11 @@ import com.synopsys.integration.blackduck.api.generated.view.UserView; import com.synopsys.integration.blackduck.api.manual.temporary.component.UserGroupRequest; import com.synopsys.integration.blackduck.api.manual.temporary.component.UserRequest; -import com.synopsys.integration.blackduck.exception.BlackDuckIntegrationException; -import com.synopsys.integration.blackduck.http.client.IntHttpClientTestHelper; -import com.synopsys.integration.blackduck.service.BlackDuckApiClient; -import com.synopsys.integration.blackduck.service.BlackDuckServicesFactory; -import com.synopsys.integration.blackduck.service.model.ProjectSyncModel; +import com.blackduck.integration.blackduck.exception.BlackDuckIntegrationException; +import com.blackduck.integration.blackduck.http.client.IntHttpClientTestHelper; +import com.blackduck.integration.blackduck.service.BlackDuckApiClient; +import com.blackduck.integration.blackduck.service.BlackDuckServicesFactory; +import com.blackduck.integration.blackduck.service.model.ProjectSyncModel; import com.synopsys.integration.exception.IntegrationException; import com.synopsys.integration.rest.HttpUrl; diff --git a/src/test/java/com/synopsys/integration/blackduck/service/dataservice/VulnerabilityDataServiceTestIT.java b/src/test/java/com/blackduck/integration/blackduck/service/dataservice/VulnerabilityDataServiceTestIT.java similarity index 88% rename from src/test/java/com/synopsys/integration/blackduck/service/dataservice/VulnerabilityDataServiceTestIT.java rename to src/test/java/com/blackduck/integration/blackduck/service/dataservice/VulnerabilityDataServiceTestIT.java index 1193479db..d524f7a4f 100644 --- a/src/test/java/com/synopsys/integration/blackduck/service/dataservice/VulnerabilityDataServiceTestIT.java +++ b/src/test/java/com/blackduck/integration/blackduck/service/dataservice/VulnerabilityDataServiceTestIT.java @@ -1,4 +1,4 @@ -package com.synopsys.integration.blackduck.service.dataservice; +package com.blackduck.integration.blackduck.service.dataservice; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -7,6 +7,7 @@ import java.util.List; import java.util.Optional; +import com.blackduck.integration.blackduck.TimingExtension; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -14,13 +15,12 @@ import com.synopsys.integration.bdio.SimpleBdioFactory; import com.synopsys.integration.bdio.model.externalid.ExternalId; import com.synopsys.integration.bdio.model.externalid.ExternalIdFactory; -import com.synopsys.integration.blackduck.TimingExtension; import com.synopsys.integration.blackduck.api.generated.response.ComponentsView; import com.synopsys.integration.blackduck.api.generated.view.ComponentVersionView; import com.synopsys.integration.blackduck.api.generated.view.VulnerabilityView; -import com.synopsys.integration.blackduck.http.client.IntHttpClientTestHelper; -import com.synopsys.integration.blackduck.service.BlackDuckServicesFactory; -import com.synopsys.integration.blackduck.service.model.ComponentVersionVulnerabilities; +import com.blackduck.integration.blackduck.http.client.IntHttpClientTestHelper; +import com.blackduck.integration.blackduck.service.BlackDuckServicesFactory; +import com.blackduck.integration.blackduck.service.model.ComponentVersionVulnerabilities; @Tag("integration") @ExtendWith(TimingExtension.class) diff --git a/src/test/java/com/synopsys/integration/blackduck/service/model/ProjectSyncModelTest.java b/src/test/java/com/blackduck/integration/blackduck/service/model/ProjectSyncModelTest.java similarity index 98% rename from src/test/java/com/synopsys/integration/blackduck/service/model/ProjectSyncModelTest.java rename to src/test/java/com/blackduck/integration/blackduck/service/model/ProjectSyncModelTest.java index ec4b59e47..6b2c4c575 100644 --- a/src/test/java/com/synopsys/integration/blackduck/service/model/ProjectSyncModelTest.java +++ b/src/test/java/com/blackduck/integration/blackduck/service/model/ProjectSyncModelTest.java @@ -1,4 +1,4 @@ -package com.synopsys.integration.blackduck.service.model; +package com.blackduck.integration.blackduck.service.model; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -8,7 +8,6 @@ import java.lang.reflect.Modifier; import java.util.ArrayList; import java.util.Arrays; -import java.util.Collections; import java.util.Date; import java.util.HashMap; import java.util.List; @@ -16,6 +15,7 @@ import java.util.Set; import java.util.stream.Collectors; +import com.blackduck.integration.blackduck.service.model.ProjectSyncModel; import org.junit.jupiter.api.Test; import com.synopsys.integration.blackduck.api.generated.enumeration.ProjectVersionDistributionType; diff --git a/src/test/java/com/synopsys/integration/blackduck/useragent/BlackDuckCommonTest.java b/src/test/java/com/blackduck/integration/blackduck/useragent/BlackDuckCommonTest.java similarity index 90% rename from src/test/java/com/synopsys/integration/blackduck/useragent/BlackDuckCommonTest.java rename to src/test/java/com/blackduck/integration/blackduck/useragent/BlackDuckCommonTest.java index 9c75c19d2..8640113bb 100644 --- a/src/test/java/com/synopsys/integration/blackduck/useragent/BlackDuckCommonTest.java +++ b/src/test/java/com/blackduck/integration/blackduck/useragent/BlackDuckCommonTest.java @@ -1,4 +1,4 @@ -package com.synopsys.integration.blackduck.useragent; +package com.blackduck.integration.blackduck.useragent; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -7,6 +7,8 @@ import java.util.function.Function; import java.util.stream.Collectors; +import com.blackduck.integration.blackduck.useragent.BlackDuckCommon; +import com.blackduck.integration.blackduck.useragent.UserAgentItem; import org.junit.jupiter.api.Test; public class BlackDuckCommonTest { diff --git a/src/test/java/com/synopsys/integration/blackduck/util/ProjectNameVersionGuesserTest.java b/src/test/java/com/blackduck/integration/blackduck/util/ProjectNameVersionGuesserTest.java similarity index 93% rename from src/test/java/com/synopsys/integration/blackduck/util/ProjectNameVersionGuesserTest.java rename to src/test/java/com/blackduck/integration/blackduck/util/ProjectNameVersionGuesserTest.java index 7fccd3304..231f4e0e6 100644 --- a/src/test/java/com/synopsys/integration/blackduck/util/ProjectNameVersionGuesserTest.java +++ b/src/test/java/com/blackduck/integration/blackduck/util/ProjectNameVersionGuesserTest.java @@ -1,13 +1,13 @@ -package com.synopsys.integration.blackduck.util; +package com.blackduck.integration.blackduck.util; import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import com.synopsys.integration.blackduck.TimingExtension; -import com.synopsys.integration.blackduck.service.model.ProjectNameVersionGuess; -import com.synopsys.integration.blackduck.service.model.ProjectNameVersionGuesser; +import com.blackduck.integration.blackduck.TimingExtension; +import com.blackduck.integration.blackduck.service.model.ProjectNameVersionGuess; +import com.blackduck.integration.blackduck.service.model.ProjectNameVersionGuesser; @ExtendWith(TimingExtension.class) public class ProjectNameVersionGuesserTest { diff --git a/src/test/java/com/synopsys/integration/blackduck/version/BlackDuckVersionTest.java b/src/test/java/com/blackduck/integration/blackduck/version/BlackDuckVersionTest.java similarity index 89% rename from src/test/java/com/synopsys/integration/blackduck/version/BlackDuckVersionTest.java rename to src/test/java/com/blackduck/integration/blackduck/version/BlackDuckVersionTest.java index 23e1b2c76..6a8e0841b 100644 --- a/src/test/java/com/synopsys/integration/blackduck/version/BlackDuckVersionTest.java +++ b/src/test/java/com/blackduck/integration/blackduck/version/BlackDuckVersionTest.java @@ -1,9 +1,9 @@ -package com.synopsys.integration.blackduck.version; +package com.blackduck.integration.blackduck.version; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; -import com.synopsys.integration.blackduck.version.BlackDuckVersion; +import com.blackduck.integration.blackduck.version.BlackDuckVersion; import org.junit.jupiter.api.Test; From 529367c14d557c1994ace552bda59e0cd02d4aa4 Mon Sep 17 00:00:00 2001 From: Dana Maxfield Date: Mon, 9 Sep 2024 12:26:52 -0400 Subject: [PATCH 2/7] IDETECT-4487 - Rebranding for test resources --- .../projectViews_all_on_one_page.json | 10 +-- .../projectViews_page_3_of_4.json | 2 +- .../projectViews_page_4_of_4.json | 8 +- ...rt_common_6_1_0_SNAPSHOT_gradle_bom.jsonld | 90 +++++++++---------- ...uck_alert_6_1_0_SNAPSHOT_gradle_bom.jsonld | 8 +- 5 files changed, 59 insertions(+), 59 deletions(-) diff --git a/src/test/resources/BlackDuckResponsesTransformer/projectViews_all_on_one_page.json b/src/test/resources/BlackDuckResponsesTransformer/projectViews_all_on_one_page.json index c6f6cd09c..074cd7dbb 100644 --- a/src/test/resources/BlackDuckResponsesTransformer/projectViews_all_on_one_page.json +++ b/src/test/resources/BlackDuckResponsesTransformer/projectViews_all_on_one_page.json @@ -3835,7 +3835,7 @@ } }, { - "name": "SB_synopsys-detect-junit", + "name": "SB_blackduck-detect-junit", "projectLevelAdjustments": true, "cloneCategories": [ "VULN_DATA", @@ -3968,7 +3968,7 @@ } }, { - "name": "Synopsys", + "name": "Black Duck", "projectLevelAdjustments": true, "cloneCategories": [ "VULN_DATA", @@ -4034,7 +4034,7 @@ } }, { - "name": "Synopsys Detect", + "name": "Black Duck Detect", "projectLevelAdjustments": true, "cloneCategories": [ "VULN_DATA", @@ -4100,7 +4100,7 @@ } }, { - "name": "synopsys-detect", + "name": "blackduck-detect", "projectLevelAdjustments": true, "cloneCategories": [ "VULN_DATA", @@ -4166,7 +4166,7 @@ } }, { - "name": "synopsys-detect-junit", + "name": "blackduck-detect-junit", "projectLevelAdjustments": false, "cloneCategories": [], "customSignatureEnabled": false, diff --git a/src/test/resources/BlackDuckResponsesTransformer/projectViews_page_3_of_4.json b/src/test/resources/BlackDuckResponsesTransformer/projectViews_page_3_of_4.json index 9b285ed4b..2a69fcaf7 100644 --- a/src/test/resources/BlackDuckResponsesTransformer/projectViews_page_3_of_4.json +++ b/src/test/resources/BlackDuckResponsesTransformer/projectViews_page_3_of_4.json @@ -1191,7 +1191,7 @@ } }, { - "name": "SB_synopsys-detect-junit", + "name": "SB_blackduck-detect-junit", "projectLevelAdjustments": true, "cloneCategories": [ "VULN_DATA", diff --git a/src/test/resources/BlackDuckResponsesTransformer/projectViews_page_4_of_4.json b/src/test/resources/BlackDuckResponsesTransformer/projectViews_page_4_of_4.json index 4bd271342..ad29c662c 100644 --- a/src/test/resources/BlackDuckResponsesTransformer/projectViews_page_4_of_4.json +++ b/src/test/resources/BlackDuckResponsesTransformer/projectViews_page_4_of_4.json @@ -2,7 +2,7 @@ "totalCount": 69, "items": [ { - "name": "Synopsys", + "name": "Black Duck", "projectLevelAdjustments": true, "cloneCategories": [ "VULN_DATA", @@ -68,7 +68,7 @@ } }, { - "name": "Synopsys Detect", + "name": "Black Duck Detect", "projectLevelAdjustments": true, "cloneCategories": [ "VULN_DATA", @@ -134,7 +134,7 @@ } }, { - "name": "synopsys-detect", + "name": "blackduck-detect", "projectLevelAdjustments": true, "cloneCategories": [ "VULN_DATA", @@ -200,7 +200,7 @@ } }, { - "name": "synopsys-detect-junit", + "name": "blackduck-detect-junit", "projectLevelAdjustments": false, "cloneCategories": [], "customSignatureEnabled": false, diff --git a/src/test/resources/bdio/alert/blackduck_alert_6_1_0_SNAPSHOT_alert_common_blackduck_alert_alert_common_6_1_0_SNAPSHOT_gradle_bom.jsonld b/src/test/resources/bdio/alert/blackduck_alert_6_1_0_SNAPSHOT_alert_common_blackduck_alert_alert_common_6_1_0_SNAPSHOT_gradle_bom.jsonld index b7ff412fe..2eefe4826 100644 --- a/src/test/resources/bdio/alert/blackduck_alert_6_1_0_SNAPSHOT_alert_common_blackduck_alert_alert_common_6_1_0_SNAPSHOT_gradle_bom.jsonld +++ b/src/test/resources/bdio/alert/blackduck_alert_6_1_0_SNAPSHOT_alert_common_blackduck_alert_alert_common_6_1_0_SNAPSHOT_gradle_bom.jsonld @@ -65,7 +65,7 @@ "relationshipType": "DYNAMIC_LINK" }, { - "related": "http:maven/com.synopsys.integration/blackduck-common/47.1.1", + "related": "http:maven/com.blackduck.integration/blackduck-common/47.1.1", "relationshipType": "DYNAMIC_LINK" }, { @@ -101,7 +101,7 @@ "relationshipType": "DYNAMIC_LINK" }, { - "related": "http:maven/com.synopsys.integration/issuetracker-jira/0.0.12", + "related": "http:maven/com.blackduck.integration/issuetracker-jira/0.0.12", "relationshipType": "DYNAMIC_LINK" }, { @@ -1909,17 +1909,17 @@ { "name": "blackduck-common", "revision": "47.1.1", - "@id": "http:maven/com.synopsys.integration/blackduck-common/47.1.1", + "@id": "http:maven/com.blackduck.integration/blackduck-common/47.1.1", "@type": "Component", "externalIdentifier": { "externalSystemTypeId": "maven", - "externalId": "com.synopsys.integration:blackduck-common:47.1.1", + "externalId": "com.blackduck.integration:blackduck-common:47.1.1", "externalIdMetaData": { "forge": { "name": "maven", "separator": ":" }, - "group": "com.synopsys.integration", + "group": "com.blackduck.integration", "name": "blackduck-common", "version": "47.1.1" } @@ -1930,19 +1930,19 @@ "relationshipType": "DYNAMIC_LINK" }, { - "related": "http:maven/com.synopsys.integration/integration-reporting/1.0.2", + "related": "http:maven/com.blackduck.integration/integration-reporting/1.0.2", "relationshipType": "DYNAMIC_LINK" }, { - "related": "http:maven/com.synopsys.integration/integration-bdio/21.0.1", + "related": "http:maven/com.blackduck.integration/integration-bdio/21.0.1", "relationshipType": "DYNAMIC_LINK" }, { - "related": "http:maven/com.synopsys.integration/phone-home-client/1.0.2", + "related": "http:maven/com.blackduck.integration/phone-home-client/1.0.2", "relationshipType": "DYNAMIC_LINK" }, { - "related": "http:maven/com.synopsys.integration/blackduck-common-api/2019.12.0.7", + "related": "http:maven/com.blackduck.integration/blackduck-common-api/2019.12.0.7", "relationshipType": "DYNAMIC_LINK" } ] @@ -2667,24 +2667,24 @@ { "name": "integration-reporting", "revision": "1.0.2", - "@id": "http:maven/com.synopsys.integration/integration-reporting/1.0.2", + "@id": "http:maven/com.blackduck.integration/integration-reporting/1.0.2", "@type": "Component", "externalIdentifier": { "externalSystemTypeId": "maven", - "externalId": "com.synopsys.integration:integration-reporting:1.0.2", + "externalId": "com.blackduck.integration:integration-reporting:1.0.2", "externalIdMetaData": { "forge": { "name": "maven", "separator": ":" }, - "group": "com.synopsys.integration", + "group": "com.blackduck.integration", "name": "integration-reporting", "version": "1.0.2" } }, "relationship": [ { - "related": "http:maven/com.synopsys.integration/integration-common/20.1.1", + "related": "http:maven/com.blackduck.integration/integration-common/20.1.1", "relationshipType": "DYNAMIC_LINK" }, { @@ -2696,17 +2696,17 @@ { "name": "integration-common", "revision": "20.1.1", - "@id": "http:maven/com.synopsys.integration/integration-common/20.1.1", + "@id": "http:maven/com.blackduck.integration/integration-common/20.1.1", "@type": "Component", "externalIdentifier": { "externalSystemTypeId": "maven", - "externalId": "com.synopsys.integration:integration-common:20.1.1", + "externalId": "com.blackduck.integration:integration-common:20.1.1", "externalIdMetaData": { "forge": { "name": "maven", "separator": ":" }, - "group": "com.synopsys.integration", + "group": "com.blackduck.integration", "name": "integration-common", "version": "20.1.1" } @@ -3002,24 +3002,24 @@ { "name": "integration-bdio", "revision": "21.0.1", - "@id": "http:maven/com.synopsys.integration/integration-bdio/21.0.1", + "@id": "http:maven/com.blackduck.integration/integration-bdio/21.0.1", "@type": "Component", "externalIdentifier": { "externalSystemTypeId": "maven", - "externalId": "com.synopsys.integration:integration-bdio:21.0.1", + "externalId": "com.blackduck.integration:integration-bdio:21.0.1", "externalIdMetaData": { "forge": { "name": "maven", "separator": ":" }, - "group": "com.synopsys.integration", + "group": "com.blackduck.integration", "name": "integration-bdio", "version": "21.0.1" } }, "relationship": [ { - "related": "http:maven/com.synopsys.integration/integration-common/20.1.1", + "related": "http:maven/com.blackduck.integration/integration-common/20.1.1", "relationshipType": "DYNAMIC_LINK" } ] @@ -3027,24 +3027,24 @@ { "name": "phone-home-client", "revision": "1.0.2", - "@id": "http:maven/com.synopsys.integration/phone-home-client/1.0.2", + "@id": "http:maven/com.blackduck.integration/phone-home-client/1.0.2", "@type": "Component", "externalIdentifier": { "externalSystemTypeId": "maven", - "externalId": "com.synopsys.integration:phone-home-client:1.0.2", + "externalId": "com.blackduck.integration:phone-home-client:1.0.2", "externalIdMetaData": { "forge": { "name": "maven", "separator": ":" }, - "group": "com.synopsys.integration", + "group": "com.blackduck.integration", "name": "phone-home-client", "version": "1.0.2" } }, "relationship": [ { - "related": "http:maven/com.synopsys.integration/integration-common/20.1.1", + "related": "http:maven/com.blackduck.integration/integration-common/20.1.1", "relationshipType": "DYNAMIC_LINK" } ] @@ -3052,24 +3052,24 @@ { "name": "blackduck-common-api", "revision": "2019.12.0.7", - "@id": "http:maven/com.synopsys.integration/blackduck-common-api/2019.12.0.7", + "@id": "http:maven/com.blackduck.integration/blackduck-common-api/2019.12.0.7", "@type": "Component", "externalIdentifier": { "externalSystemTypeId": "maven", - "externalId": "com.synopsys.integration:blackduck-common-api:2019.12.0.7", + "externalId": "com.blackduck.integration:blackduck-common-api:2019.12.0.7", "externalIdMetaData": { "forge": { "name": "maven", "separator": ":" }, - "group": "com.synopsys.integration", + "group": "com.blackduck.integration", "name": "blackduck-common-api", "version": "2019.12.0.7" } }, "relationship": [ { - "related": "http:maven/com.synopsys.integration/integration-rest/1.0.5", + "related": "http:maven/com.blackduck.integration/integration-rest/1.0.5", "relationshipType": "DYNAMIC_LINK" } ] @@ -3077,24 +3077,24 @@ { "name": "integration-rest", "revision": "1.0.5", - "@id": "http:maven/com.synopsys.integration/integration-rest/1.0.5", + "@id": "http:maven/com.blackduck.integration/integration-rest/1.0.5", "@type": "Component", "externalIdentifier": { "externalSystemTypeId": "maven", - "externalId": "com.synopsys.integration:integration-rest:1.0.5", + "externalId": "com.blackduck.integration:integration-rest:1.0.5", "externalIdMetaData": { "forge": { "name": "maven", "separator": ":" }, - "group": "com.synopsys.integration", + "group": "com.blackduck.integration", "name": "integration-rest", "version": "1.0.5" } }, "relationship": [ { - "related": "http:maven/com.synopsys.integration/integration-common/20.1.1", + "related": "http:maven/com.blackduck.integration/integration-common/20.1.1", "relationshipType": "DYNAMIC_LINK" } ] @@ -4635,28 +4635,28 @@ { "name": "issuetracker-jira", "revision": "0.0.12", - "@id": "http:maven/com.synopsys.integration/issuetracker-jira/0.0.12", + "@id": "http:maven/com.blackduck.integration/issuetracker-jira/0.0.12", "@type": "Component", "externalIdentifier": { "externalSystemTypeId": "maven", - "externalId": "com.synopsys.integration:issuetracker-jira:0.0.12", + "externalId": "com.blackduck.integration:issuetracker-jira:0.0.12", "externalIdMetaData": { "forge": { "name": "maven", "separator": ":" }, - "group": "com.synopsys.integration", + "group": "com.blackduck.integration", "name": "issuetracker-jira", "version": "0.0.12" } }, "relationship": [ { - "related": "http:maven/com.synopsys.integration/int-jira-common/0.7.1", + "related": "http:maven/com.blackduck.integration/int-jira-common/0.7.1", "relationshipType": "DYNAMIC_LINK" }, { - "related": "http:maven/com.synopsys.integration/issuetracker-common/0.0.5", + "related": "http:maven/com.blackduck.integration/issuetracker-common/0.0.5", "relationshipType": "DYNAMIC_LINK" } ] @@ -4664,24 +4664,24 @@ { "name": "int-jira-common", "revision": "0.7.1", - "@id": "http:maven/com.synopsys.integration/int-jira-common/0.7.1", + "@id": "http:maven/com.blackduck.integration/int-jira-common/0.7.1", "@type": "Component", "externalIdentifier": { "externalSystemTypeId": "maven", - "externalId": "com.synopsys.integration:int-jira-common:0.7.1", + "externalId": "com.blackduck.integration:int-jira-common:0.7.1", "externalIdMetaData": { "forge": { "name": "maven", "separator": ":" }, - "group": "com.synopsys.integration", + "group": "com.blackduck.integration", "name": "int-jira-common", "version": "0.7.1" } }, "relationship": [ { - "related": "http:maven/com.synopsys.integration/integration-rest/1.0.5", + "related": "http:maven/com.blackduck.integration/integration-rest/1.0.5", "relationshipType": "DYNAMIC_LINK" } ] @@ -4689,24 +4689,24 @@ { "name": "issuetracker-common", "revision": "0.0.5", - "@id": "http:maven/com.synopsys.integration/issuetracker-common/0.0.5", + "@id": "http:maven/com.blackduck.integration/issuetracker-common/0.0.5", "@type": "Component", "externalIdentifier": { "externalSystemTypeId": "maven", - "externalId": "com.synopsys.integration:issuetracker-common:0.0.5", + "externalId": "com.blackduck.integration:issuetracker-common:0.0.5", "externalIdMetaData": { "forge": { "name": "maven", "separator": ":" }, - "group": "com.synopsys.integration", + "group": "com.blackduck.integration", "name": "issuetracker-common", "version": "0.0.5" } }, "relationship": [ { - "related": "http:maven/com.synopsys.integration/blackduck-common/47.1.1", + "related": "http:maven/com.blackduck.integration/blackduck-common/47.1.1", "relationshipType": "DYNAMIC_LINK" } ] diff --git a/src/test/resources/bdio/alert/blackduck_alert_6_1_0_SNAPSHOT_com_synopsys_integration_blackduck_alert_6_1_0_SNAPSHOT_gradle_bom.jsonld b/src/test/resources/bdio/alert/blackduck_alert_6_1_0_SNAPSHOT_com_synopsys_integration_blackduck_alert_6_1_0_SNAPSHOT_gradle_bom.jsonld index 215322402..6307205f8 100644 --- a/src/test/resources/bdio/alert/blackduck_alert_6_1_0_SNAPSHOT_com_synopsys_integration_blackduck_alert_6_1_0_SNAPSHOT_gradle_bom.jsonld +++ b/src/test/resources/bdio/alert/blackduck_alert_6_1_0_SNAPSHOT_com_synopsys_integration_blackduck_alert_6_1_0_SNAPSHOT_gradle_bom.jsonld @@ -1,7 +1,7 @@ [ { "specVersion": "1.1.0", - "spdx:name": "blackduck-alert/6.1.0-SNAPSHOT/com.synopsys.integration/blackduck-alert/6.1.0-SNAPSHOT gradle/bom", + "spdx:name": "blackduck-alert/6.1.0-SNAPSHOT/com.blackduck.integration/blackduck-alert/6.1.0-SNAPSHOT gradle/bom", "creationInfo": { "spdx:creator": [ "Tool: Detect-6.2.1", @@ -16,17 +16,17 @@ { "name": "blackduck-alert-junit", "revision": "6.1.0-SNAPSHOT", - "@id": "http:maven/com.synopsys.integration/blackduck-alert/6.1.0-SNAPSHOT", + "@id": "http:maven/com.blackduck.integration/blackduck-alert/6.1.0-SNAPSHOT", "@type": "Project", "externalIdentifier": { "externalSystemTypeId": "maven", - "externalId": "com.synopsys.integration:blackduck-alert:6.1.0-SNAPSHOT", + "externalId": "com.blackduck.integration:blackduck-alert:6.1.0-SNAPSHOT", "externalIdMetaData": { "forge": { "name": "maven", "separator": ":" }, - "group": "com.synopsys.integration", + "group": "com.blackduck.integration", "name": "blackduck-alert", "version": "6.1.0-SNAPSHOT" } From 59496be1437edbf782b691c6c49090d13f36d371 Mon Sep 17 00:00:00 2001 From: devmehtasynopsys Date: Wed, 11 Sep 2024 12:06:20 -0400 Subject: [PATCH 3/7] Update Copyright for Sierra --- .../api/enumeration/PolicyRuleComponentUsageValueSetType.java | 4 ++-- .../api/enumeration/PolicyRuleConditionOperatorType.java | 4 ++-- .../blackduck/api/enumeration/PolicyRuleConditionType.java | 4 ++-- .../blackduck/api/enumeration/RankedSeverityType.java | 4 ++-- .../blackduck/api/enumeration/ReviewStatusType.java | 4 ++-- .../integration/blackduck/bdio2/Bdio2FileUploadService.java | 4 ++-- .../blackduck/bdio2/Bdio2RetryAwareStreamUploader.java | 4 ++-- .../integration/blackduck/bdio2/Bdio2StreamUploader.java | 4 ++-- .../blackduck/integration/blackduck/bdio2/Bdio2UploadJob.java | 4 ++-- .../integration/blackduck/bdio2/Bdio2UploadResult.java | 4 ++-- .../blackduck/bdio2/RetriableBdioUploadException.java | 4 ++-- .../integration/blackduck/bdio2/model/Bdio2Document.java | 4 ++-- .../integration/blackduck/bdio2/model/BdioFileContent.java | 4 ++-- .../blackduck/integration/blackduck/bdio2/model/GitInfo.java | 4 ++-- .../integration/blackduck/bdio2/model/ProjectInfo.java | 4 ++-- .../blackduck/bdio2/util/Bdio2ContentExtractor.java | 4 ++-- .../integration/blackduck/bdio2/util/Bdio2Factory.java | 4 ++-- .../integration/blackduck/bdio2/util/Bdio2Writer.java | 4 ++-- .../blackduck/codelocation/CodeLocationBatchOutput.java | 4 ++-- .../blackduck/codelocation/CodeLocationCreationData.java | 4 ++-- .../blackduck/codelocation/CodeLocationCreationRequest.java | 4 ++-- .../blackduck/codelocation/CodeLocationCreationService.java | 4 ++-- .../blackduck/codelocation/CodeLocationOutput.java | 4 ++-- .../blackduck/codelocation/CodeLocationWaitJob.java | 4 ++-- .../blackduck/codelocation/CodeLocationWaitJobCondition.java | 4 ++-- .../blackduck/codelocation/CodeLocationWaitResult.java | 4 ++-- .../blackduck/codelocation/CodeLocationWaiter.java | 4 ++-- .../blackduck/codelocation/CodeLocationsRetriever.java | 4 ++-- .../blackduck/integration/blackduck/codelocation/Result.java | 4 ++-- .../bdio2legacy/Bdio2UploadCodeLocationCreationRequest.java | 4 ++-- .../codelocation/bdio2legacy/Bdio2UploadService.java | 4 ++-- .../codelocation/bdio2legacy/UploadBdio2BatchRunner.java | 4 ++-- .../codelocation/bdio2legacy/UploadBdio2Callable.java | 4 ++-- .../bdiolegacy/BdioUploadCodeLocationCreationRequest.java | 4 ++-- .../blackduck/codelocation/bdiolegacy/BdioUploadService.java | 4 ++-- .../blackduck/codelocation/bdiolegacy/UploadBatchRunner.java | 4 ++-- .../blackduck/codelocation/bdiolegacy/UploadCallable.java | 4 ++-- .../blackduck/codelocation/binaryscanner/BinaryScan.java | 4 ++-- .../blackduck/codelocation/binaryscanner/BinaryScanBatch.java | 4 ++-- .../codelocation/binaryscanner/BinaryScanBatchOutput.java | 4 ++-- .../codelocation/binaryscanner/BinaryScanBatchRunner.java | 4 ++-- .../codelocation/binaryscanner/BinaryScanCallable.java | 4 ++-- .../binaryscanner/BinaryScanCodeLocationCreationRequest.java | 4 ++-- .../codelocation/binaryscanner/BinaryScanOutput.java | 4 ++-- .../codelocation/binaryscanner/BinaryScanUploadService.java | 4 ++-- .../IntelligentPersistenceBatchRunner.java | 4 ++-- .../IntelligentPersistenceCallable.java | 4 ++-- .../IntelligentPersistenceCodeLocationCreationRequest.java | 4 ++-- .../intelligentpersistence/IntelligentPersistenceService.java | 4 ++-- .../blackduck/codelocation/signaturescanner/ScanBatch.java | 4 ++-- .../codelocation/signaturescanner/ScanBatchBuilder.java | 4 ++-- .../codelocation/signaturescanner/ScanBatchOutput.java | 4 ++-- .../codelocation/signaturescanner/ScanBatchRunner.java | 4 ++-- .../SignatureScannerCodeLocationCreationRequest.java | 4 ++-- .../signaturescanner/SignatureScannerService.java | 4 ++-- .../signaturescanner/command/ApiScannerInstaller.java | 4 ++-- .../signaturescanner/command/BlackDuckOnlineProperties.java | 4 ++-- .../signaturescanner/command/ExistingScannerInstaller.java | 4 ++-- .../signaturescanner/command/IndividualFileMatching.java | 4 ++-- .../signaturescanner/command/ReducedPersistence.java | 4 ++-- .../codelocation/signaturescanner/command/ScanCommand.java | 4 ++-- .../signaturescanner/command/ScanCommandArgumentParser.java | 4 ++-- .../signaturescanner/command/ScanCommandCallable.java | 4 ++-- .../signaturescanner/command/ScanCommandOutput.java | 4 ++-- .../signaturescanner/command/ScanCommandQuoteParser.java | 4 ++-- .../signaturescanner/command/ScanCommandRunner.java | 4 ++-- .../codelocation/signaturescanner/command/ScanPaths.java | 4 ++-- .../signaturescanner/command/ScanPathsUtility.java | 4 ++-- .../codelocation/signaturescanner/command/ScanTarget.java | 4 ++-- .../signaturescanner/command/ScannerInstaller.java | 4 ++-- .../signaturescanner/command/SnippetMatching.java | 4 ++-- .../signaturescanner/command/ToolsApiScannerInstaller.java | 4 ++-- .../signaturescanner/command/ZipApiScannerInstaller.java | 4 ++-- .../blackduck/codelocation/upload/UploadBatch.java | 4 ++-- .../blackduck/codelocation/upload/UploadBatchOutput.java | 4 ++-- .../blackduck/codelocation/upload/UploadOutput.java | 4 ++-- .../blackduck/codelocation/upload/UploadTarget.java | 4 ++-- .../blackduck/configuration/BlackDuckConnectionResult.java | 4 ++-- .../blackduck/configuration/BlackDuckServerConfig.java | 4 ++-- .../blackduck/configuration/BlackDuckServerConfigBuilder.java | 4 ++-- .../blackduck/configuration/BlackDuckServerConfigKeys.java | 4 ++-- .../blackduck/exception/BlackDuckApiException.java | 4 ++-- .../blackduck/exception/BlackDuckIntegrationException.java | 4 ++-- .../blackduck/exception/BlackDuckItemTransformException.java | 4 ++-- .../exception/BlackDuckTimeoutExceededException.java | 4 ++-- .../blackduck/exception/FailureConditionException.java | 4 ++-- .../blackduck/exception/MismatchedQuotesException.java | 4 ++-- .../integration/blackduck/exception/ScanFailedException.java | 4 ++-- .../blackduck/exception/SignatureScannerInputException.java | 4 ++-- .../integration/blackduck/http/BlackDuckMediaTypes.java | 4 ++-- .../integration/blackduck/http/BlackDuckPageDefinition.java | 4 ++-- .../integration/blackduck/http/BlackDuckPageResponse.java | 4 ++-- .../blackduck/integration/blackduck/http/BlackDuckQuery.java | 4 ++-- .../integration/blackduck/http/BlackDuckRequestBuilder.java | 4 ++-- .../integration/blackduck/http/BlackDuckRequestFilter.java | 4 ++-- .../blackduck/integration/blackduck/http/BlackDuckUrl.java | 4 ++-- .../integration/blackduck/http/BlackDuckUrlSearchTerm.java | 4 ++-- .../blackduck/http/client/ApiTokenBlackDuckHttpClient.java | 4 ++-- .../http/client/BlackDuckCertificateInterceptor.java | 4 ++-- .../blackduck/http/client/BlackDuckHttpClient.java | 4 ++-- .../blackduck/http/client/BlackDuckRedirectStrategy.java | 4 ++-- .../integration/blackduck/http/client/CookieHeaderParser.java | 4 ++-- .../blackduck/http/client/CredentialsBlackDuckHttpClient.java | 4 ++-- .../blackduck/http/client/DefaultBlackDuckHttpClient.java | 4 ++-- .../blackduck/http/client/SignatureScannerClient.java | 4 ++-- .../blackduck/http/client/cache/CacheableResponse.java | 4 ++-- .../blackduck/http/client/cache/CachingHttpClient.java | 4 ++-- .../blackduck/http/transform/BlackDuckJsonTransformer.java | 4 ++-- .../http/transform/BlackDuckResponseTransformer.java | 4 ++-- .../http/transform/BlackDuckResponsesTransformer.java | 4 ++-- .../http/transform/adapters/OffsetDateTimeTypeAdapter.java | 4 ++-- .../http/transform/subclass/BlackDuckResponseResolver.java | 4 ++-- .../transform/subclass/BlackDuckResponseSubclassResolver.java | 4 ++-- .../subclass/NotificationUserViewSubclassResolver.java | 4 ++-- .../transform/subclass/NotificationViewSubclassResolver.java | 4 ++-- .../http/transform/subclass/SimpleNotificationView.java | 4 ++-- .../integration/blackduck/keystore/KeyStoreHelper.java | 4 ++-- .../blackduck/phonehome/BlackDuckPhoneHomeHelper.java | 4 ++-- .../integration/blackduck/service/BlackDuckApiClient.java | 4 ++-- .../blackduck/service/BlackDuckServicesFactory.java | 4 ++-- .../blackduck/integration/blackduck/service/DataService.java | 4 ++-- .../service/dataservice/BlackDuckRegistrationService.java | 4 ++-- .../service/dataservice/BlackDuckScanReadinessService.java | 4 ++-- .../blackduck/service/dataservice/CodeLocationService.java | 4 ++-- .../blackduck/service/dataservice/ComponentService.java | 4 ++-- .../blackduck/service/dataservice/IacScanUploadService.java | 4 ++-- .../blackduck/service/dataservice/IssueService.java | 4 ++-- .../blackduck/service/dataservice/LicenseService.java | 4 ++-- .../blackduck/service/dataservice/NotificationService.java | 4 ++-- .../blackduck/service/dataservice/PolicyRuleService.java | 4 ++-- .../blackduck/service/dataservice/ProjectBomService.java | 4 ++-- .../blackduck/service/dataservice/ProjectGetService.java | 4 ++-- .../blackduck/service/dataservice/ProjectMappingService.java | 4 ++-- .../blackduck/service/dataservice/ProjectService.java | 4 ++-- .../blackduck/service/dataservice/ProjectUsersService.java | 4 ++-- .../blackduck/service/dataservice/RoleService.java | 4 ++-- .../integration/blackduck/service/dataservice/TagService.java | 4 ++-- .../blackduck/service/dataservice/UserGroupService.java | 4 ++-- .../blackduck/service/dataservice/UserRoleService.java | 4 ++-- .../blackduck/service/dataservice/UserService.java | 4 ++-- .../blackduck/service/model/BlackDuckServerData.java | 4 ++-- .../service/model/ComponentVersionPolicyViolationCount.java | 4 ++-- .../blackduck/service/model/ComponentVersionStatusCount.java | 4 ++-- .../service/model/ComponentVersionVulnerabilities.java | 4 ++-- .../blackduck/service/model/MatchedFilesModel.java | 4 ++-- .../blackduck/service/model/NotificationTaskRange.java | 4 ++-- .../service/model/PolicyRuleExpressionSetBuilder.java | 4 ++-- .../blackduck/service/model/PolicyStatusDescription.java | 4 ++-- .../blackduck/service/model/ProjectNameVersionGuess.java | 4 ++-- .../blackduck/service/model/ProjectNameVersionGuesser.java | 4 ++-- .../integration/blackduck/service/model/ProjectSyncModel.java | 4 ++-- .../blackduck/service/model/ProjectVersionDescription.java | 4 ++-- .../blackduck/service/model/ProjectVersionWrapper.java | 4 ++-- .../blackduck/service/model/RiskProfileCounts.java | 4 ++-- .../blackduck/service/model/ScannerSplitStream.java | 4 ++-- .../blackduck/service/model/StreamRedirectThread.java | 4 ++-- .../blackduck/service/model/VersionBomComponentModel.java | 4 ++-- .../blackduck/service/request/AcceptHeaderEditor.java | 4 ++-- .../blackduck/service/request/BlackDuckMultipleRequest.java | 4 ++-- .../blackduck/service/request/BlackDuckRequest.java | 4 ++-- .../service/request/BlackDuckRequestBuilderEditor.java | 4 ++-- .../blackduck/service/request/BlackDuckResponseRequest.java | 4 ++-- .../blackduck/service/request/BlackDuckSingleRequest.java | 4 ++-- .../blackduck/service/request/BlackDuckStringRequest.java | 4 ++-- .../blackduck/service/request/NotificationEditor.java | 4 ++-- .../blackduck/service/request/PagingDefaultsEditor.java | 4 ++-- .../integration/blackduck/useragent/BlackDuckCommon.java | 4 ++-- .../integration/blackduck/useragent/UserAgentBuilder.java | 4 ++-- .../integration/blackduck/useragent/UserAgentItem.java | 4 ++-- .../integration/blackduck/version/BlackDuckVersion.java | 4 ++-- .../riskreport/web/js/BlackDuckBomReportFunctions.js | 4 ++-- src/main/resources/riskreport/web/js/BlackDuckRiskReport.js | 4 ++-- src/main/resources/riskreport/web/js/Sortable.js | 4 ++-- src/main/resources/riskreport/web/js/jquery-3.6.4.min.js | 4 ++-- 174 files changed, 348 insertions(+), 348 deletions(-) diff --git a/src/main/java/com/blackduck/integration/blackduck/api/enumeration/PolicyRuleComponentUsageValueSetType.java b/src/main/java/com/blackduck/integration/blackduck/api/enumeration/PolicyRuleComponentUsageValueSetType.java index 0c5004b8b..cbb75961b 100644 --- a/src/main/java/com/blackduck/integration/blackduck/api/enumeration/PolicyRuleComponentUsageValueSetType.java +++ b/src/main/java/com/blackduck/integration/blackduck/api/enumeration/PolicyRuleComponentUsageValueSetType.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.api.enumeration; diff --git a/src/main/java/com/blackduck/integration/blackduck/api/enumeration/PolicyRuleConditionOperatorType.java b/src/main/java/com/blackduck/integration/blackduck/api/enumeration/PolicyRuleConditionOperatorType.java index bca572e3f..ac7066ffd 100644 --- a/src/main/java/com/blackduck/integration/blackduck/api/enumeration/PolicyRuleConditionOperatorType.java +++ b/src/main/java/com/blackduck/integration/blackduck/api/enumeration/PolicyRuleConditionOperatorType.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.api.enumeration; diff --git a/src/main/java/com/blackduck/integration/blackduck/api/enumeration/PolicyRuleConditionType.java b/src/main/java/com/blackduck/integration/blackduck/api/enumeration/PolicyRuleConditionType.java index 4d9180f31..d51f1206c 100644 --- a/src/main/java/com/blackduck/integration/blackduck/api/enumeration/PolicyRuleConditionType.java +++ b/src/main/java/com/blackduck/integration/blackduck/api/enumeration/PolicyRuleConditionType.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.api.enumeration; diff --git a/src/main/java/com/blackduck/integration/blackduck/api/enumeration/RankedSeverityType.java b/src/main/java/com/blackduck/integration/blackduck/api/enumeration/RankedSeverityType.java index 16583d4de..eaccd899d 100644 --- a/src/main/java/com/blackduck/integration/blackduck/api/enumeration/RankedSeverityType.java +++ b/src/main/java/com/blackduck/integration/blackduck/api/enumeration/RankedSeverityType.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.api.enumeration; diff --git a/src/main/java/com/blackduck/integration/blackduck/api/enumeration/ReviewStatusType.java b/src/main/java/com/blackduck/integration/blackduck/api/enumeration/ReviewStatusType.java index f9f5c1e61..8b39bf010 100644 --- a/src/main/java/com/blackduck/integration/blackduck/api/enumeration/ReviewStatusType.java +++ b/src/main/java/com/blackduck/integration/blackduck/api/enumeration/ReviewStatusType.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.api.enumeration; diff --git a/src/main/java/com/blackduck/integration/blackduck/bdio2/Bdio2FileUploadService.java b/src/main/java/com/blackduck/integration/blackduck/bdio2/Bdio2FileUploadService.java index b5a341754..26e5cfaa4 100644 --- a/src/main/java/com/blackduck/integration/blackduck/bdio2/Bdio2FileUploadService.java +++ b/src/main/java/com/blackduck/integration/blackduck/bdio2/Bdio2FileUploadService.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.bdio2; diff --git a/src/main/java/com/blackduck/integration/blackduck/bdio2/Bdio2RetryAwareStreamUploader.java b/src/main/java/com/blackduck/integration/blackduck/bdio2/Bdio2RetryAwareStreamUploader.java index ed8d56faf..a75e7f02b 100644 --- a/src/main/java/com/blackduck/integration/blackduck/bdio2/Bdio2RetryAwareStreamUploader.java +++ b/src/main/java/com/blackduck/integration/blackduck/bdio2/Bdio2RetryAwareStreamUploader.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.bdio2; diff --git a/src/main/java/com/blackduck/integration/blackduck/bdio2/Bdio2StreamUploader.java b/src/main/java/com/blackduck/integration/blackduck/bdio2/Bdio2StreamUploader.java index 1ee9c7a4a..e7c3a79aa 100644 --- a/src/main/java/com/blackduck/integration/blackduck/bdio2/Bdio2StreamUploader.java +++ b/src/main/java/com/blackduck/integration/blackduck/bdio2/Bdio2StreamUploader.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.bdio2; diff --git a/src/main/java/com/blackduck/integration/blackduck/bdio2/Bdio2UploadJob.java b/src/main/java/com/blackduck/integration/blackduck/bdio2/Bdio2UploadJob.java index 3e6044feb..71e5f6fa8 100644 --- a/src/main/java/com/blackduck/integration/blackduck/bdio2/Bdio2UploadJob.java +++ b/src/main/java/com/blackduck/integration/blackduck/bdio2/Bdio2UploadJob.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.bdio2; diff --git a/src/main/java/com/blackduck/integration/blackduck/bdio2/Bdio2UploadResult.java b/src/main/java/com/blackduck/integration/blackduck/bdio2/Bdio2UploadResult.java index 4c79573b8..4c002832d 100644 --- a/src/main/java/com/blackduck/integration/blackduck/bdio2/Bdio2UploadResult.java +++ b/src/main/java/com/blackduck/integration/blackduck/bdio2/Bdio2UploadResult.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.bdio2; diff --git a/src/main/java/com/blackduck/integration/blackduck/bdio2/RetriableBdioUploadException.java b/src/main/java/com/blackduck/integration/blackduck/bdio2/RetriableBdioUploadException.java index 4b53fd34a..da2734daa 100644 --- a/src/main/java/com/blackduck/integration/blackduck/bdio2/RetriableBdioUploadException.java +++ b/src/main/java/com/blackduck/integration/blackduck/bdio2/RetriableBdioUploadException.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.bdio2; diff --git a/src/main/java/com/blackduck/integration/blackduck/bdio2/model/Bdio2Document.java b/src/main/java/com/blackduck/integration/blackduck/bdio2/model/Bdio2Document.java index 3174eb063..0a6c5e81c 100644 --- a/src/main/java/com/blackduck/integration/blackduck/bdio2/model/Bdio2Document.java +++ b/src/main/java/com/blackduck/integration/blackduck/bdio2/model/Bdio2Document.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.bdio2.model; diff --git a/src/main/java/com/blackduck/integration/blackduck/bdio2/model/BdioFileContent.java b/src/main/java/com/blackduck/integration/blackduck/bdio2/model/BdioFileContent.java index 936970c31..8ba6910ad 100644 --- a/src/main/java/com/blackduck/integration/blackduck/bdio2/model/BdioFileContent.java +++ b/src/main/java/com/blackduck/integration/blackduck/bdio2/model/BdioFileContent.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.bdio2.model; diff --git a/src/main/java/com/blackduck/integration/blackduck/bdio2/model/GitInfo.java b/src/main/java/com/blackduck/integration/blackduck/bdio2/model/GitInfo.java index f6f7d120c..a5d2fa28d 100644 --- a/src/main/java/com/blackduck/integration/blackduck/bdio2/model/GitInfo.java +++ b/src/main/java/com/blackduck/integration/blackduck/bdio2/model/GitInfo.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.bdio2.model; diff --git a/src/main/java/com/blackduck/integration/blackduck/bdio2/model/ProjectInfo.java b/src/main/java/com/blackduck/integration/blackduck/bdio2/model/ProjectInfo.java index d7e5bbc28..ea63fc1ac 100644 --- a/src/main/java/com/blackduck/integration/blackduck/bdio2/model/ProjectInfo.java +++ b/src/main/java/com/blackduck/integration/blackduck/bdio2/model/ProjectInfo.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.bdio2.model; diff --git a/src/main/java/com/blackduck/integration/blackduck/bdio2/util/Bdio2ContentExtractor.java b/src/main/java/com/blackduck/integration/blackduck/bdio2/util/Bdio2ContentExtractor.java index e89700602..a315166cf 100644 --- a/src/main/java/com/blackduck/integration/blackduck/bdio2/util/Bdio2ContentExtractor.java +++ b/src/main/java/com/blackduck/integration/blackduck/bdio2/util/Bdio2ContentExtractor.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.bdio2.util; diff --git a/src/main/java/com/blackduck/integration/blackduck/bdio2/util/Bdio2Factory.java b/src/main/java/com/blackduck/integration/blackduck/bdio2/util/Bdio2Factory.java index 16c1a64ea..800fd0a1c 100644 --- a/src/main/java/com/blackduck/integration/blackduck/bdio2/util/Bdio2Factory.java +++ b/src/main/java/com/blackduck/integration/blackduck/bdio2/util/Bdio2Factory.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.bdio2.util; diff --git a/src/main/java/com/blackduck/integration/blackduck/bdio2/util/Bdio2Writer.java b/src/main/java/com/blackduck/integration/blackduck/bdio2/util/Bdio2Writer.java index 6d2259c09..f896038ee 100644 --- a/src/main/java/com/blackduck/integration/blackduck/bdio2/util/Bdio2Writer.java +++ b/src/main/java/com/blackduck/integration/blackduck/bdio2/util/Bdio2Writer.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.bdio2.util; diff --git a/src/main/java/com/blackduck/integration/blackduck/codelocation/CodeLocationBatchOutput.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/CodeLocationBatchOutput.java index fb960a69c..296bbdbbc 100644 --- a/src/main/java/com/blackduck/integration/blackduck/codelocation/CodeLocationBatchOutput.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/CodeLocationBatchOutput.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.codelocation; diff --git a/src/main/java/com/blackduck/integration/blackduck/codelocation/CodeLocationCreationData.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/CodeLocationCreationData.java index 5e873a9f2..b67e8f73c 100644 --- a/src/main/java/com/blackduck/integration/blackduck/codelocation/CodeLocationCreationData.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/CodeLocationCreationData.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.codelocation; diff --git a/src/main/java/com/blackduck/integration/blackduck/codelocation/CodeLocationCreationRequest.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/CodeLocationCreationRequest.java index a47a4b54d..f19b995fa 100644 --- a/src/main/java/com/blackduck/integration/blackduck/codelocation/CodeLocationCreationRequest.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/CodeLocationCreationRequest.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.codelocation; diff --git a/src/main/java/com/blackduck/integration/blackduck/codelocation/CodeLocationCreationService.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/CodeLocationCreationService.java index 41c2ae8b6..d61bb808e 100644 --- a/src/main/java/com/blackduck/integration/blackduck/codelocation/CodeLocationCreationService.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/CodeLocationCreationService.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.codelocation; diff --git a/src/main/java/com/blackduck/integration/blackduck/codelocation/CodeLocationOutput.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/CodeLocationOutput.java index 5228098d1..d67325d18 100644 --- a/src/main/java/com/blackduck/integration/blackduck/codelocation/CodeLocationOutput.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/CodeLocationOutput.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.codelocation; diff --git a/src/main/java/com/blackduck/integration/blackduck/codelocation/CodeLocationWaitJob.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/CodeLocationWaitJob.java index 1c729bc0e..5e663353a 100644 --- a/src/main/java/com/blackduck/integration/blackduck/codelocation/CodeLocationWaitJob.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/CodeLocationWaitJob.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.codelocation; diff --git a/src/main/java/com/blackduck/integration/blackduck/codelocation/CodeLocationWaitJobCondition.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/CodeLocationWaitJobCondition.java index 8f1f98d68..ca7880b00 100644 --- a/src/main/java/com/blackduck/integration/blackduck/codelocation/CodeLocationWaitJobCondition.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/CodeLocationWaitJobCondition.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.codelocation; diff --git a/src/main/java/com/blackduck/integration/blackduck/codelocation/CodeLocationWaitResult.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/CodeLocationWaitResult.java index c711255fd..210b6f24e 100644 --- a/src/main/java/com/blackduck/integration/blackduck/codelocation/CodeLocationWaitResult.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/CodeLocationWaitResult.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.codelocation; diff --git a/src/main/java/com/blackduck/integration/blackduck/codelocation/CodeLocationWaiter.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/CodeLocationWaiter.java index 0bff6907a..236acfa1a 100644 --- a/src/main/java/com/blackduck/integration/blackduck/codelocation/CodeLocationWaiter.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/CodeLocationWaiter.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.codelocation; diff --git a/src/main/java/com/blackduck/integration/blackduck/codelocation/CodeLocationsRetriever.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/CodeLocationsRetriever.java index 0469d6eb6..e64cb9cbd 100644 --- a/src/main/java/com/blackduck/integration/blackduck/codelocation/CodeLocationsRetriever.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/CodeLocationsRetriever.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.codelocation; diff --git a/src/main/java/com/blackduck/integration/blackduck/codelocation/Result.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/Result.java index d655a2ea5..8195128c1 100644 --- a/src/main/java/com/blackduck/integration/blackduck/codelocation/Result.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/Result.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.codelocation; diff --git a/src/main/java/com/blackduck/integration/blackduck/codelocation/bdio2legacy/Bdio2UploadCodeLocationCreationRequest.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/bdio2legacy/Bdio2UploadCodeLocationCreationRequest.java index 18c708a4d..7527b10fb 100644 --- a/src/main/java/com/blackduck/integration/blackduck/codelocation/bdio2legacy/Bdio2UploadCodeLocationCreationRequest.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/bdio2legacy/Bdio2UploadCodeLocationCreationRequest.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.codelocation.bdio2legacy; diff --git a/src/main/java/com/blackduck/integration/blackduck/codelocation/bdio2legacy/Bdio2UploadService.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/bdio2legacy/Bdio2UploadService.java index d04db9ba8..305d4f9f9 100644 --- a/src/main/java/com/blackduck/integration/blackduck/codelocation/bdio2legacy/Bdio2UploadService.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/bdio2legacy/Bdio2UploadService.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.codelocation.bdio2legacy; diff --git a/src/main/java/com/blackduck/integration/blackduck/codelocation/bdio2legacy/UploadBdio2BatchRunner.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/bdio2legacy/UploadBdio2BatchRunner.java index 5615ac5b6..89acf7121 100644 --- a/src/main/java/com/blackduck/integration/blackduck/codelocation/bdio2legacy/UploadBdio2BatchRunner.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/bdio2legacy/UploadBdio2BatchRunner.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.codelocation.bdio2legacy; diff --git a/src/main/java/com/blackduck/integration/blackduck/codelocation/bdio2legacy/UploadBdio2Callable.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/bdio2legacy/UploadBdio2Callable.java index 633f75533..29d43a2ba 100644 --- a/src/main/java/com/blackduck/integration/blackduck/codelocation/bdio2legacy/UploadBdio2Callable.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/bdio2legacy/UploadBdio2Callable.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.codelocation.bdio2legacy; diff --git a/src/main/java/com/blackduck/integration/blackduck/codelocation/bdiolegacy/BdioUploadCodeLocationCreationRequest.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/bdiolegacy/BdioUploadCodeLocationCreationRequest.java index 3f0b99967..2eec9184b 100644 --- a/src/main/java/com/blackduck/integration/blackduck/codelocation/bdiolegacy/BdioUploadCodeLocationCreationRequest.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/bdiolegacy/BdioUploadCodeLocationCreationRequest.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.codelocation.bdiolegacy; diff --git a/src/main/java/com/blackduck/integration/blackduck/codelocation/bdiolegacy/BdioUploadService.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/bdiolegacy/BdioUploadService.java index 263fb00d2..f23d877f1 100644 --- a/src/main/java/com/blackduck/integration/blackduck/codelocation/bdiolegacy/BdioUploadService.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/bdiolegacy/BdioUploadService.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.codelocation.bdiolegacy; diff --git a/src/main/java/com/blackduck/integration/blackduck/codelocation/bdiolegacy/UploadBatchRunner.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/bdiolegacy/UploadBatchRunner.java index 007180308..3e6361bcf 100644 --- a/src/main/java/com/blackduck/integration/blackduck/codelocation/bdiolegacy/UploadBatchRunner.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/bdiolegacy/UploadBatchRunner.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.codelocation.bdiolegacy; diff --git a/src/main/java/com/blackduck/integration/blackduck/codelocation/bdiolegacy/UploadCallable.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/bdiolegacy/UploadCallable.java index 473854d96..a057254f5 100644 --- a/src/main/java/com/blackduck/integration/blackduck/codelocation/bdiolegacy/UploadCallable.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/bdiolegacy/UploadCallable.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.codelocation.bdiolegacy; diff --git a/src/main/java/com/blackduck/integration/blackduck/codelocation/binaryscanner/BinaryScan.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/binaryscanner/BinaryScan.java index fd3e5ab7c..517e98dde 100644 --- a/src/main/java/com/blackduck/integration/blackduck/codelocation/binaryscanner/BinaryScan.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/binaryscanner/BinaryScan.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.codelocation.binaryscanner; diff --git a/src/main/java/com/blackduck/integration/blackduck/codelocation/binaryscanner/BinaryScanBatch.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/binaryscanner/BinaryScanBatch.java index 3e83893ac..12cafe803 100644 --- a/src/main/java/com/blackduck/integration/blackduck/codelocation/binaryscanner/BinaryScanBatch.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/binaryscanner/BinaryScanBatch.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.codelocation.binaryscanner; diff --git a/src/main/java/com/blackduck/integration/blackduck/codelocation/binaryscanner/BinaryScanBatchOutput.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/binaryscanner/BinaryScanBatchOutput.java index 9b90b1d61..b50055ec7 100644 --- a/src/main/java/com/blackduck/integration/blackduck/codelocation/binaryscanner/BinaryScanBatchOutput.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/binaryscanner/BinaryScanBatchOutput.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.codelocation.binaryscanner; diff --git a/src/main/java/com/blackduck/integration/blackduck/codelocation/binaryscanner/BinaryScanBatchRunner.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/binaryscanner/BinaryScanBatchRunner.java index e2b6faa38..61d8304bb 100644 --- a/src/main/java/com/blackduck/integration/blackduck/codelocation/binaryscanner/BinaryScanBatchRunner.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/binaryscanner/BinaryScanBatchRunner.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.codelocation.binaryscanner; diff --git a/src/main/java/com/blackduck/integration/blackduck/codelocation/binaryscanner/BinaryScanCallable.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/binaryscanner/BinaryScanCallable.java index 01e1baf91..8a752da56 100644 --- a/src/main/java/com/blackduck/integration/blackduck/codelocation/binaryscanner/BinaryScanCallable.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/binaryscanner/BinaryScanCallable.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.codelocation.binaryscanner; diff --git a/src/main/java/com/blackduck/integration/blackduck/codelocation/binaryscanner/BinaryScanCodeLocationCreationRequest.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/binaryscanner/BinaryScanCodeLocationCreationRequest.java index 58ffff008..a8cf6699b 100644 --- a/src/main/java/com/blackduck/integration/blackduck/codelocation/binaryscanner/BinaryScanCodeLocationCreationRequest.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/binaryscanner/BinaryScanCodeLocationCreationRequest.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.codelocation.binaryscanner; diff --git a/src/main/java/com/blackduck/integration/blackduck/codelocation/binaryscanner/BinaryScanOutput.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/binaryscanner/BinaryScanOutput.java index 3b9d7abe5..b3bb53605 100644 --- a/src/main/java/com/blackduck/integration/blackduck/codelocation/binaryscanner/BinaryScanOutput.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/binaryscanner/BinaryScanOutput.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.codelocation.binaryscanner; diff --git a/src/main/java/com/blackduck/integration/blackduck/codelocation/binaryscanner/BinaryScanUploadService.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/binaryscanner/BinaryScanUploadService.java index 9f9db5f00..47a751cb7 100644 --- a/src/main/java/com/blackduck/integration/blackduck/codelocation/binaryscanner/BinaryScanUploadService.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/binaryscanner/BinaryScanUploadService.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.codelocation.binaryscanner; diff --git a/src/main/java/com/blackduck/integration/blackduck/codelocation/intelligentpersistence/IntelligentPersistenceBatchRunner.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/intelligentpersistence/IntelligentPersistenceBatchRunner.java index b2d326bbe..9e82496b6 100644 --- a/src/main/java/com/blackduck/integration/blackduck/codelocation/intelligentpersistence/IntelligentPersistenceBatchRunner.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/intelligentpersistence/IntelligentPersistenceBatchRunner.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.codelocation.intelligentpersistence; diff --git a/src/main/java/com/blackduck/integration/blackduck/codelocation/intelligentpersistence/IntelligentPersistenceCallable.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/intelligentpersistence/IntelligentPersistenceCallable.java index f52559d35..f61d0a3a4 100644 --- a/src/main/java/com/blackduck/integration/blackduck/codelocation/intelligentpersistence/IntelligentPersistenceCallable.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/intelligentpersistence/IntelligentPersistenceCallable.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.codelocation.intelligentpersistence; diff --git a/src/main/java/com/blackduck/integration/blackduck/codelocation/intelligentpersistence/IntelligentPersistenceCodeLocationCreationRequest.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/intelligentpersistence/IntelligentPersistenceCodeLocationCreationRequest.java index aa7a31026..43aade5bc 100644 --- a/src/main/java/com/blackduck/integration/blackduck/codelocation/intelligentpersistence/IntelligentPersistenceCodeLocationCreationRequest.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/intelligentpersistence/IntelligentPersistenceCodeLocationCreationRequest.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.codelocation.intelligentpersistence; diff --git a/src/main/java/com/blackduck/integration/blackduck/codelocation/intelligentpersistence/IntelligentPersistenceService.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/intelligentpersistence/IntelligentPersistenceService.java index 996d4de78..513dc7ca8 100644 --- a/src/main/java/com/blackduck/integration/blackduck/codelocation/intelligentpersistence/IntelligentPersistenceService.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/intelligentpersistence/IntelligentPersistenceService.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.codelocation.intelligentpersistence; diff --git a/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/ScanBatch.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/ScanBatch.java index d3924f8c0..23ba0df43 100644 --- a/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/ScanBatch.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/ScanBatch.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.codelocation.signaturescanner; diff --git a/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/ScanBatchBuilder.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/ScanBatchBuilder.java index e891bdb36..b4ba6195f 100644 --- a/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/ScanBatchBuilder.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/ScanBatchBuilder.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.codelocation.signaturescanner; diff --git a/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/ScanBatchOutput.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/ScanBatchOutput.java index 2ee0d0cff..0f10ec1d6 100644 --- a/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/ScanBatchOutput.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/ScanBatchOutput.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.codelocation.signaturescanner; diff --git a/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/ScanBatchRunner.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/ScanBatchRunner.java index 1a3516d0d..541e97fd5 100644 --- a/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/ScanBatchRunner.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/ScanBatchRunner.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.codelocation.signaturescanner; diff --git a/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/SignatureScannerCodeLocationCreationRequest.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/SignatureScannerCodeLocationCreationRequest.java index 9de179762..1da306fa7 100644 --- a/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/SignatureScannerCodeLocationCreationRequest.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/SignatureScannerCodeLocationCreationRequest.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.codelocation.signaturescanner; diff --git a/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/SignatureScannerService.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/SignatureScannerService.java index 0361121d7..c56b61736 100644 --- a/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/SignatureScannerService.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/SignatureScannerService.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.codelocation.signaturescanner; diff --git a/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ApiScannerInstaller.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ApiScannerInstaller.java index 73249eaed..28bf012af 100644 --- a/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ApiScannerInstaller.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ApiScannerInstaller.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.codelocation.signaturescanner.command; diff --git a/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/BlackDuckOnlineProperties.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/BlackDuckOnlineProperties.java index ba602461a..30fa13714 100644 --- a/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/BlackDuckOnlineProperties.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/BlackDuckOnlineProperties.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.codelocation.signaturescanner.command; diff --git a/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ExistingScannerInstaller.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ExistingScannerInstaller.java index fa349fab9..ba5c7a2bc 100644 --- a/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ExistingScannerInstaller.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ExistingScannerInstaller.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.codelocation.signaturescanner.command; diff --git a/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/IndividualFileMatching.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/IndividualFileMatching.java index 1a840cd6d..6dea1b772 100644 --- a/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/IndividualFileMatching.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/IndividualFileMatching.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.codelocation.signaturescanner.command; diff --git a/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ReducedPersistence.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ReducedPersistence.java index 9c79ee8fd..7a56eeb2b 100644 --- a/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ReducedPersistence.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ReducedPersistence.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.codelocation.signaturescanner.command; diff --git a/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ScanCommand.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ScanCommand.java index 66ced68e4..adc19bdc3 100644 --- a/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ScanCommand.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ScanCommand.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.codelocation.signaturescanner.command; diff --git a/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ScanCommandArgumentParser.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ScanCommandArgumentParser.java index de11a9412..5136af4c3 100644 --- a/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ScanCommandArgumentParser.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ScanCommandArgumentParser.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.codelocation.signaturescanner.command; diff --git a/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ScanCommandCallable.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ScanCommandCallable.java index 2dea37929..f0f631b0d 100644 --- a/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ScanCommandCallable.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ScanCommandCallable.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.codelocation.signaturescanner.command; diff --git a/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ScanCommandOutput.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ScanCommandOutput.java index 662adf7fc..76313d447 100644 --- a/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ScanCommandOutput.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ScanCommandOutput.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.codelocation.signaturescanner.command; diff --git a/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ScanCommandQuoteParser.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ScanCommandQuoteParser.java index 6b9a0da03..f13931dc3 100644 --- a/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ScanCommandQuoteParser.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ScanCommandQuoteParser.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.codelocation.signaturescanner.command; diff --git a/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ScanCommandRunner.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ScanCommandRunner.java index 65f400e58..79290d8a4 100644 --- a/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ScanCommandRunner.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ScanCommandRunner.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.codelocation.signaturescanner.command; diff --git a/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ScanPaths.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ScanPaths.java index cb95f2e41..2d1d2375a 100644 --- a/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ScanPaths.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ScanPaths.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.codelocation.signaturescanner.command; diff --git a/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ScanPathsUtility.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ScanPathsUtility.java index 19c5029dd..6702c2cc6 100644 --- a/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ScanPathsUtility.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ScanPathsUtility.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.codelocation.signaturescanner.command; diff --git a/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ScanTarget.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ScanTarget.java index fbf697a2f..866166a3d 100644 --- a/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ScanTarget.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ScanTarget.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.codelocation.signaturescanner.command; diff --git a/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ScannerInstaller.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ScannerInstaller.java index a4a1d8802..c24fbdf1a 100644 --- a/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ScannerInstaller.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ScannerInstaller.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.codelocation.signaturescanner.command; diff --git a/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/SnippetMatching.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/SnippetMatching.java index 439cb8b1d..0d32ae189 100644 --- a/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/SnippetMatching.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/SnippetMatching.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.codelocation.signaturescanner.command; diff --git a/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ToolsApiScannerInstaller.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ToolsApiScannerInstaller.java index 83e2bbe2f..2c99457f8 100644 --- a/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ToolsApiScannerInstaller.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ToolsApiScannerInstaller.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.codelocation.signaturescanner.command; diff --git a/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ZipApiScannerInstaller.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ZipApiScannerInstaller.java index ea712cf0d..42d7d3637 100644 --- a/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ZipApiScannerInstaller.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ZipApiScannerInstaller.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.codelocation.signaturescanner.command; diff --git a/src/main/java/com/blackduck/integration/blackduck/codelocation/upload/UploadBatch.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/upload/UploadBatch.java index 2b34c4968..29b82f30f 100644 --- a/src/main/java/com/blackduck/integration/blackduck/codelocation/upload/UploadBatch.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/upload/UploadBatch.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.codelocation.upload; diff --git a/src/main/java/com/blackduck/integration/blackduck/codelocation/upload/UploadBatchOutput.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/upload/UploadBatchOutput.java index 2879ae8aa..a362e040b 100644 --- a/src/main/java/com/blackduck/integration/blackduck/codelocation/upload/UploadBatchOutput.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/upload/UploadBatchOutput.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.codelocation.upload; diff --git a/src/main/java/com/blackduck/integration/blackduck/codelocation/upload/UploadOutput.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/upload/UploadOutput.java index 5f48d0b01..64be38d8e 100644 --- a/src/main/java/com/blackduck/integration/blackduck/codelocation/upload/UploadOutput.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/upload/UploadOutput.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.codelocation.upload; diff --git a/src/main/java/com/blackduck/integration/blackduck/codelocation/upload/UploadTarget.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/upload/UploadTarget.java index ebd9b59d7..dd9f74b6a 100644 --- a/src/main/java/com/blackduck/integration/blackduck/codelocation/upload/UploadTarget.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/upload/UploadTarget.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.codelocation.upload; diff --git a/src/main/java/com/blackduck/integration/blackduck/configuration/BlackDuckConnectionResult.java b/src/main/java/com/blackduck/integration/blackduck/configuration/BlackDuckConnectionResult.java index b431809cc..ae96eb38d 100644 --- a/src/main/java/com/blackduck/integration/blackduck/configuration/BlackDuckConnectionResult.java +++ b/src/main/java/com/blackduck/integration/blackduck/configuration/BlackDuckConnectionResult.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.configuration; diff --git a/src/main/java/com/blackduck/integration/blackduck/configuration/BlackDuckServerConfig.java b/src/main/java/com/blackduck/integration/blackduck/configuration/BlackDuckServerConfig.java index 9362cc496..e195cbdf1 100644 --- a/src/main/java/com/blackduck/integration/blackduck/configuration/BlackDuckServerConfig.java +++ b/src/main/java/com/blackduck/integration/blackduck/configuration/BlackDuckServerConfig.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.configuration; diff --git a/src/main/java/com/blackduck/integration/blackduck/configuration/BlackDuckServerConfigBuilder.java b/src/main/java/com/blackduck/integration/blackduck/configuration/BlackDuckServerConfigBuilder.java index 13cb1fff4..cce02dfd9 100644 --- a/src/main/java/com/blackduck/integration/blackduck/configuration/BlackDuckServerConfigBuilder.java +++ b/src/main/java/com/blackduck/integration/blackduck/configuration/BlackDuckServerConfigBuilder.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.configuration; diff --git a/src/main/java/com/blackduck/integration/blackduck/configuration/BlackDuckServerConfigKeys.java b/src/main/java/com/blackduck/integration/blackduck/configuration/BlackDuckServerConfigKeys.java index 41f7663d0..316678e63 100644 --- a/src/main/java/com/blackduck/integration/blackduck/configuration/BlackDuckServerConfigKeys.java +++ b/src/main/java/com/blackduck/integration/blackduck/configuration/BlackDuckServerConfigKeys.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.configuration; diff --git a/src/main/java/com/blackduck/integration/blackduck/exception/BlackDuckApiException.java b/src/main/java/com/blackduck/integration/blackduck/exception/BlackDuckApiException.java index 8437fae7c..c72271bd4 100644 --- a/src/main/java/com/blackduck/integration/blackduck/exception/BlackDuckApiException.java +++ b/src/main/java/com/blackduck/integration/blackduck/exception/BlackDuckApiException.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.exception; diff --git a/src/main/java/com/blackduck/integration/blackduck/exception/BlackDuckIntegrationException.java b/src/main/java/com/blackduck/integration/blackduck/exception/BlackDuckIntegrationException.java index 8f72cf334..c76f75d5a 100644 --- a/src/main/java/com/blackduck/integration/blackduck/exception/BlackDuckIntegrationException.java +++ b/src/main/java/com/blackduck/integration/blackduck/exception/BlackDuckIntegrationException.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.exception; diff --git a/src/main/java/com/blackduck/integration/blackduck/exception/BlackDuckItemTransformException.java b/src/main/java/com/blackduck/integration/blackduck/exception/BlackDuckItemTransformException.java index 58b014cbf..97849cf8a 100644 --- a/src/main/java/com/blackduck/integration/blackduck/exception/BlackDuckItemTransformException.java +++ b/src/main/java/com/blackduck/integration/blackduck/exception/BlackDuckItemTransformException.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.exception; diff --git a/src/main/java/com/blackduck/integration/blackduck/exception/BlackDuckTimeoutExceededException.java b/src/main/java/com/blackduck/integration/blackduck/exception/BlackDuckTimeoutExceededException.java index 3023cb480..8147cfff7 100644 --- a/src/main/java/com/blackduck/integration/blackduck/exception/BlackDuckTimeoutExceededException.java +++ b/src/main/java/com/blackduck/integration/blackduck/exception/BlackDuckTimeoutExceededException.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.exception; diff --git a/src/main/java/com/blackduck/integration/blackduck/exception/FailureConditionException.java b/src/main/java/com/blackduck/integration/blackduck/exception/FailureConditionException.java index 950ec4862..1decc0666 100644 --- a/src/main/java/com/blackduck/integration/blackduck/exception/FailureConditionException.java +++ b/src/main/java/com/blackduck/integration/blackduck/exception/FailureConditionException.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.exception; diff --git a/src/main/java/com/blackduck/integration/blackduck/exception/MismatchedQuotesException.java b/src/main/java/com/blackduck/integration/blackduck/exception/MismatchedQuotesException.java index 7d7571714..8ef59ff09 100644 --- a/src/main/java/com/blackduck/integration/blackduck/exception/MismatchedQuotesException.java +++ b/src/main/java/com/blackduck/integration/blackduck/exception/MismatchedQuotesException.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.exception; diff --git a/src/main/java/com/blackduck/integration/blackduck/exception/ScanFailedException.java b/src/main/java/com/blackduck/integration/blackduck/exception/ScanFailedException.java index 4f163474b..333d619fb 100644 --- a/src/main/java/com/blackduck/integration/blackduck/exception/ScanFailedException.java +++ b/src/main/java/com/blackduck/integration/blackduck/exception/ScanFailedException.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.exception; diff --git a/src/main/java/com/blackduck/integration/blackduck/exception/SignatureScannerInputException.java b/src/main/java/com/blackduck/integration/blackduck/exception/SignatureScannerInputException.java index 9119f419b..965cfb826 100644 --- a/src/main/java/com/blackduck/integration/blackduck/exception/SignatureScannerInputException.java +++ b/src/main/java/com/blackduck/integration/blackduck/exception/SignatureScannerInputException.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.exception; diff --git a/src/main/java/com/blackduck/integration/blackduck/http/BlackDuckMediaTypes.java b/src/main/java/com/blackduck/integration/blackduck/http/BlackDuckMediaTypes.java index 6b467d2ed..8cc153d5e 100644 --- a/src/main/java/com/blackduck/integration/blackduck/http/BlackDuckMediaTypes.java +++ b/src/main/java/com/blackduck/integration/blackduck/http/BlackDuckMediaTypes.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.http; diff --git a/src/main/java/com/blackduck/integration/blackduck/http/BlackDuckPageDefinition.java b/src/main/java/com/blackduck/integration/blackduck/http/BlackDuckPageDefinition.java index db244c1a2..9b239d1dc 100644 --- a/src/main/java/com/blackduck/integration/blackduck/http/BlackDuckPageDefinition.java +++ b/src/main/java/com/blackduck/integration/blackduck/http/BlackDuckPageDefinition.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.http; diff --git a/src/main/java/com/blackduck/integration/blackduck/http/BlackDuckPageResponse.java b/src/main/java/com/blackduck/integration/blackduck/http/BlackDuckPageResponse.java index 3ae40665c..c0fe51d97 100644 --- a/src/main/java/com/blackduck/integration/blackduck/http/BlackDuckPageResponse.java +++ b/src/main/java/com/blackduck/integration/blackduck/http/BlackDuckPageResponse.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.http; diff --git a/src/main/java/com/blackduck/integration/blackduck/http/BlackDuckQuery.java b/src/main/java/com/blackduck/integration/blackduck/http/BlackDuckQuery.java index 095616cae..7abc17cc8 100644 --- a/src/main/java/com/blackduck/integration/blackduck/http/BlackDuckQuery.java +++ b/src/main/java/com/blackduck/integration/blackduck/http/BlackDuckQuery.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.http; diff --git a/src/main/java/com/blackduck/integration/blackduck/http/BlackDuckRequestBuilder.java b/src/main/java/com/blackduck/integration/blackduck/http/BlackDuckRequestBuilder.java index eb9377268..88637acc9 100644 --- a/src/main/java/com/blackduck/integration/blackduck/http/BlackDuckRequestBuilder.java +++ b/src/main/java/com/blackduck/integration/blackduck/http/BlackDuckRequestBuilder.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.http; diff --git a/src/main/java/com/blackduck/integration/blackduck/http/BlackDuckRequestFilter.java b/src/main/java/com/blackduck/integration/blackduck/http/BlackDuckRequestFilter.java index 7037e5cc0..63f4e2689 100644 --- a/src/main/java/com/blackduck/integration/blackduck/http/BlackDuckRequestFilter.java +++ b/src/main/java/com/blackduck/integration/blackduck/http/BlackDuckRequestFilter.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.http; diff --git a/src/main/java/com/blackduck/integration/blackduck/http/BlackDuckUrl.java b/src/main/java/com/blackduck/integration/blackduck/http/BlackDuckUrl.java index a390a2418..e5ac989ca 100644 --- a/src/main/java/com/blackduck/integration/blackduck/http/BlackDuckUrl.java +++ b/src/main/java/com/blackduck/integration/blackduck/http/BlackDuckUrl.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.http; diff --git a/src/main/java/com/blackduck/integration/blackduck/http/BlackDuckUrlSearchTerm.java b/src/main/java/com/blackduck/integration/blackduck/http/BlackDuckUrlSearchTerm.java index 57f38f5ca..8b74a31ad 100644 --- a/src/main/java/com/blackduck/integration/blackduck/http/BlackDuckUrlSearchTerm.java +++ b/src/main/java/com/blackduck/integration/blackduck/http/BlackDuckUrlSearchTerm.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.http; diff --git a/src/main/java/com/blackduck/integration/blackduck/http/client/ApiTokenBlackDuckHttpClient.java b/src/main/java/com/blackduck/integration/blackduck/http/client/ApiTokenBlackDuckHttpClient.java index 32bf7c3b3..85b2f3064 100644 --- a/src/main/java/com/blackduck/integration/blackduck/http/client/ApiTokenBlackDuckHttpClient.java +++ b/src/main/java/com/blackduck/integration/blackduck/http/client/ApiTokenBlackDuckHttpClient.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.http.client; diff --git a/src/main/java/com/blackduck/integration/blackduck/http/client/BlackDuckCertificateInterceptor.java b/src/main/java/com/blackduck/integration/blackduck/http/client/BlackDuckCertificateInterceptor.java index 4c22fc46d..14c6761fd 100644 --- a/src/main/java/com/blackduck/integration/blackduck/http/client/BlackDuckCertificateInterceptor.java +++ b/src/main/java/com/blackduck/integration/blackduck/http/client/BlackDuckCertificateInterceptor.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.http.client; diff --git a/src/main/java/com/blackduck/integration/blackduck/http/client/BlackDuckHttpClient.java b/src/main/java/com/blackduck/integration/blackduck/http/client/BlackDuckHttpClient.java index 94dacb392..30a556545 100644 --- a/src/main/java/com/blackduck/integration/blackduck/http/client/BlackDuckHttpClient.java +++ b/src/main/java/com/blackduck/integration/blackduck/http/client/BlackDuckHttpClient.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.http.client; diff --git a/src/main/java/com/blackduck/integration/blackduck/http/client/BlackDuckRedirectStrategy.java b/src/main/java/com/blackduck/integration/blackduck/http/client/BlackDuckRedirectStrategy.java index 60a7cd46f..e81b213eb 100644 --- a/src/main/java/com/blackduck/integration/blackduck/http/client/BlackDuckRedirectStrategy.java +++ b/src/main/java/com/blackduck/integration/blackduck/http/client/BlackDuckRedirectStrategy.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.http.client; diff --git a/src/main/java/com/blackduck/integration/blackduck/http/client/CookieHeaderParser.java b/src/main/java/com/blackduck/integration/blackduck/http/client/CookieHeaderParser.java index 5eeb73b89..a4c947a9c 100644 --- a/src/main/java/com/blackduck/integration/blackduck/http/client/CookieHeaderParser.java +++ b/src/main/java/com/blackduck/integration/blackduck/http/client/CookieHeaderParser.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.http.client; diff --git a/src/main/java/com/blackduck/integration/blackduck/http/client/CredentialsBlackDuckHttpClient.java b/src/main/java/com/blackduck/integration/blackduck/http/client/CredentialsBlackDuckHttpClient.java index dd504fe2d..dca93831f 100644 --- a/src/main/java/com/blackduck/integration/blackduck/http/client/CredentialsBlackDuckHttpClient.java +++ b/src/main/java/com/blackduck/integration/blackduck/http/client/CredentialsBlackDuckHttpClient.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.http.client; diff --git a/src/main/java/com/blackduck/integration/blackduck/http/client/DefaultBlackDuckHttpClient.java b/src/main/java/com/blackduck/integration/blackduck/http/client/DefaultBlackDuckHttpClient.java index dc796582b..8e33211bf 100644 --- a/src/main/java/com/blackduck/integration/blackduck/http/client/DefaultBlackDuckHttpClient.java +++ b/src/main/java/com/blackduck/integration/blackduck/http/client/DefaultBlackDuckHttpClient.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.http.client; diff --git a/src/main/java/com/blackduck/integration/blackduck/http/client/SignatureScannerClient.java b/src/main/java/com/blackduck/integration/blackduck/http/client/SignatureScannerClient.java index 8b06f758c..65a10f893 100644 --- a/src/main/java/com/blackduck/integration/blackduck/http/client/SignatureScannerClient.java +++ b/src/main/java/com/blackduck/integration/blackduck/http/client/SignatureScannerClient.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.http.client; diff --git a/src/main/java/com/blackduck/integration/blackduck/http/client/cache/CacheableResponse.java b/src/main/java/com/blackduck/integration/blackduck/http/client/cache/CacheableResponse.java index a66e01202..e9679a422 100644 --- a/src/main/java/com/blackduck/integration/blackduck/http/client/cache/CacheableResponse.java +++ b/src/main/java/com/blackduck/integration/blackduck/http/client/cache/CacheableResponse.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.http.client.cache; diff --git a/src/main/java/com/blackduck/integration/blackduck/http/client/cache/CachingHttpClient.java b/src/main/java/com/blackduck/integration/blackduck/http/client/cache/CachingHttpClient.java index efbd1225e..61e9de8bb 100644 --- a/src/main/java/com/blackduck/integration/blackduck/http/client/cache/CachingHttpClient.java +++ b/src/main/java/com/blackduck/integration/blackduck/http/client/cache/CachingHttpClient.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.http.client.cache; diff --git a/src/main/java/com/blackduck/integration/blackduck/http/transform/BlackDuckJsonTransformer.java b/src/main/java/com/blackduck/integration/blackduck/http/transform/BlackDuckJsonTransformer.java index 1645c800c..e03945350 100644 --- a/src/main/java/com/blackduck/integration/blackduck/http/transform/BlackDuckJsonTransformer.java +++ b/src/main/java/com/blackduck/integration/blackduck/http/transform/BlackDuckJsonTransformer.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.http.transform; diff --git a/src/main/java/com/blackduck/integration/blackduck/http/transform/BlackDuckResponseTransformer.java b/src/main/java/com/blackduck/integration/blackduck/http/transform/BlackDuckResponseTransformer.java index 237b7e3b9..9341f159d 100644 --- a/src/main/java/com/blackduck/integration/blackduck/http/transform/BlackDuckResponseTransformer.java +++ b/src/main/java/com/blackduck/integration/blackduck/http/transform/BlackDuckResponseTransformer.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.http.transform; diff --git a/src/main/java/com/blackduck/integration/blackduck/http/transform/BlackDuckResponsesTransformer.java b/src/main/java/com/blackduck/integration/blackduck/http/transform/BlackDuckResponsesTransformer.java index 5fb7676b5..73bee9597 100644 --- a/src/main/java/com/blackduck/integration/blackduck/http/transform/BlackDuckResponsesTransformer.java +++ b/src/main/java/com/blackduck/integration/blackduck/http/transform/BlackDuckResponsesTransformer.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.http.transform; diff --git a/src/main/java/com/blackduck/integration/blackduck/http/transform/adapters/OffsetDateTimeTypeAdapter.java b/src/main/java/com/blackduck/integration/blackduck/http/transform/adapters/OffsetDateTimeTypeAdapter.java index bafd2e239..c04b5a1d7 100644 --- a/src/main/java/com/blackduck/integration/blackduck/http/transform/adapters/OffsetDateTimeTypeAdapter.java +++ b/src/main/java/com/blackduck/integration/blackduck/http/transform/adapters/OffsetDateTimeTypeAdapter.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.http.transform.adapters; diff --git a/src/main/java/com/blackduck/integration/blackduck/http/transform/subclass/BlackDuckResponseResolver.java b/src/main/java/com/blackduck/integration/blackduck/http/transform/subclass/BlackDuckResponseResolver.java index 778c8af87..5acea67fa 100644 --- a/src/main/java/com/blackduck/integration/blackduck/http/transform/subclass/BlackDuckResponseResolver.java +++ b/src/main/java/com/blackduck/integration/blackduck/http/transform/subclass/BlackDuckResponseResolver.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.http.transform.subclass; diff --git a/src/main/java/com/blackduck/integration/blackduck/http/transform/subclass/BlackDuckResponseSubclassResolver.java b/src/main/java/com/blackduck/integration/blackduck/http/transform/subclass/BlackDuckResponseSubclassResolver.java index 29a8c830d..936e37bb0 100644 --- a/src/main/java/com/blackduck/integration/blackduck/http/transform/subclass/BlackDuckResponseSubclassResolver.java +++ b/src/main/java/com/blackduck/integration/blackduck/http/transform/subclass/BlackDuckResponseSubclassResolver.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.http.transform.subclass; diff --git a/src/main/java/com/blackduck/integration/blackduck/http/transform/subclass/NotificationUserViewSubclassResolver.java b/src/main/java/com/blackduck/integration/blackduck/http/transform/subclass/NotificationUserViewSubclassResolver.java index 4976bf6ec..779d81cba 100644 --- a/src/main/java/com/blackduck/integration/blackduck/http/transform/subclass/NotificationUserViewSubclassResolver.java +++ b/src/main/java/com/blackduck/integration/blackduck/http/transform/subclass/NotificationUserViewSubclassResolver.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.http.transform.subclass; diff --git a/src/main/java/com/blackduck/integration/blackduck/http/transform/subclass/NotificationViewSubclassResolver.java b/src/main/java/com/blackduck/integration/blackduck/http/transform/subclass/NotificationViewSubclassResolver.java index de8bded72..ab0f0ef4a 100644 --- a/src/main/java/com/blackduck/integration/blackduck/http/transform/subclass/NotificationViewSubclassResolver.java +++ b/src/main/java/com/blackduck/integration/blackduck/http/transform/subclass/NotificationViewSubclassResolver.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.http.transform.subclass; diff --git a/src/main/java/com/blackduck/integration/blackduck/http/transform/subclass/SimpleNotificationView.java b/src/main/java/com/blackduck/integration/blackduck/http/transform/subclass/SimpleNotificationView.java index 9becc2f11..a9372f80f 100644 --- a/src/main/java/com/blackduck/integration/blackduck/http/transform/subclass/SimpleNotificationView.java +++ b/src/main/java/com/blackduck/integration/blackduck/http/transform/subclass/SimpleNotificationView.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.http.transform.subclass; diff --git a/src/main/java/com/blackduck/integration/blackduck/keystore/KeyStoreHelper.java b/src/main/java/com/blackduck/integration/blackduck/keystore/KeyStoreHelper.java index 51eec3c9e..8d8e1c2ef 100644 --- a/src/main/java/com/blackduck/integration/blackduck/keystore/KeyStoreHelper.java +++ b/src/main/java/com/blackduck/integration/blackduck/keystore/KeyStoreHelper.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.keystore; diff --git a/src/main/java/com/blackduck/integration/blackduck/phonehome/BlackDuckPhoneHomeHelper.java b/src/main/java/com/blackduck/integration/blackduck/phonehome/BlackDuckPhoneHomeHelper.java index b41b9fdc5..0d731c4d2 100644 --- a/src/main/java/com/blackduck/integration/blackduck/phonehome/BlackDuckPhoneHomeHelper.java +++ b/src/main/java/com/blackduck/integration/blackduck/phonehome/BlackDuckPhoneHomeHelper.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.phonehome; diff --git a/src/main/java/com/blackduck/integration/blackduck/service/BlackDuckApiClient.java b/src/main/java/com/blackduck/integration/blackduck/service/BlackDuckApiClient.java index 755b4b339..46e6ff709 100644 --- a/src/main/java/com/blackduck/integration/blackduck/service/BlackDuckApiClient.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/BlackDuckApiClient.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.service; diff --git a/src/main/java/com/blackduck/integration/blackduck/service/BlackDuckServicesFactory.java b/src/main/java/com/blackduck/integration/blackduck/service/BlackDuckServicesFactory.java index 32e77a7ba..a18568796 100644 --- a/src/main/java/com/blackduck/integration/blackduck/service/BlackDuckServicesFactory.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/BlackDuckServicesFactory.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.service; diff --git a/src/main/java/com/blackduck/integration/blackduck/service/DataService.java b/src/main/java/com/blackduck/integration/blackduck/service/DataService.java index 5c1cdff7c..780d8e5d1 100644 --- a/src/main/java/com/blackduck/integration/blackduck/service/DataService.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/DataService.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.service; diff --git a/src/main/java/com/blackduck/integration/blackduck/service/dataservice/BlackDuckRegistrationService.java b/src/main/java/com/blackduck/integration/blackduck/service/dataservice/BlackDuckRegistrationService.java index 2007a6812..5382f08ae 100644 --- a/src/main/java/com/blackduck/integration/blackduck/service/dataservice/BlackDuckRegistrationService.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/dataservice/BlackDuckRegistrationService.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.service.dataservice; diff --git a/src/main/java/com/blackduck/integration/blackduck/service/dataservice/BlackDuckScanReadinessService.java b/src/main/java/com/blackduck/integration/blackduck/service/dataservice/BlackDuckScanReadinessService.java index bc48cfc97..981695fad 100644 --- a/src/main/java/com/blackduck/integration/blackduck/service/dataservice/BlackDuckScanReadinessService.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/dataservice/BlackDuckScanReadinessService.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.service.dataservice; diff --git a/src/main/java/com/blackduck/integration/blackduck/service/dataservice/CodeLocationService.java b/src/main/java/com/blackduck/integration/blackduck/service/dataservice/CodeLocationService.java index 42d807182..df147a092 100644 --- a/src/main/java/com/blackduck/integration/blackduck/service/dataservice/CodeLocationService.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/dataservice/CodeLocationService.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.service.dataservice; diff --git a/src/main/java/com/blackduck/integration/blackduck/service/dataservice/ComponentService.java b/src/main/java/com/blackduck/integration/blackduck/service/dataservice/ComponentService.java index f84efeda1..843d05b84 100644 --- a/src/main/java/com/blackduck/integration/blackduck/service/dataservice/ComponentService.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/dataservice/ComponentService.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.service.dataservice; diff --git a/src/main/java/com/blackduck/integration/blackduck/service/dataservice/IacScanUploadService.java b/src/main/java/com/blackduck/integration/blackduck/service/dataservice/IacScanUploadService.java index ef79f3b09..6e2cdce4a 100644 --- a/src/main/java/com/blackduck/integration/blackduck/service/dataservice/IacScanUploadService.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/dataservice/IacScanUploadService.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.service.dataservice; diff --git a/src/main/java/com/blackduck/integration/blackduck/service/dataservice/IssueService.java b/src/main/java/com/blackduck/integration/blackduck/service/dataservice/IssueService.java index 1b3c013ee..f8df90b13 100644 --- a/src/main/java/com/blackduck/integration/blackduck/service/dataservice/IssueService.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/dataservice/IssueService.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.service.dataservice; diff --git a/src/main/java/com/blackduck/integration/blackduck/service/dataservice/LicenseService.java b/src/main/java/com/blackduck/integration/blackduck/service/dataservice/LicenseService.java index a79664617..c06c29900 100644 --- a/src/main/java/com/blackduck/integration/blackduck/service/dataservice/LicenseService.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/dataservice/LicenseService.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.service.dataservice; diff --git a/src/main/java/com/blackduck/integration/blackduck/service/dataservice/NotificationService.java b/src/main/java/com/blackduck/integration/blackduck/service/dataservice/NotificationService.java index 8a2fd6b4c..fd95b4d99 100644 --- a/src/main/java/com/blackduck/integration/blackduck/service/dataservice/NotificationService.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/dataservice/NotificationService.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.service.dataservice; diff --git a/src/main/java/com/blackduck/integration/blackduck/service/dataservice/PolicyRuleService.java b/src/main/java/com/blackduck/integration/blackduck/service/dataservice/PolicyRuleService.java index 6af9d1e9b..1c1207c14 100644 --- a/src/main/java/com/blackduck/integration/blackduck/service/dataservice/PolicyRuleService.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/dataservice/PolicyRuleService.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.service.dataservice; diff --git a/src/main/java/com/blackduck/integration/blackduck/service/dataservice/ProjectBomService.java b/src/main/java/com/blackduck/integration/blackduck/service/dataservice/ProjectBomService.java index 02d003265..e267fac65 100644 --- a/src/main/java/com/blackduck/integration/blackduck/service/dataservice/ProjectBomService.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/dataservice/ProjectBomService.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.service.dataservice; diff --git a/src/main/java/com/blackduck/integration/blackduck/service/dataservice/ProjectGetService.java b/src/main/java/com/blackduck/integration/blackduck/service/dataservice/ProjectGetService.java index f2fc355c4..9a2aa182c 100644 --- a/src/main/java/com/blackduck/integration/blackduck/service/dataservice/ProjectGetService.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/dataservice/ProjectGetService.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.service.dataservice; diff --git a/src/main/java/com/blackduck/integration/blackduck/service/dataservice/ProjectMappingService.java b/src/main/java/com/blackduck/integration/blackduck/service/dataservice/ProjectMappingService.java index c1ede53ac..f776d6290 100644 --- a/src/main/java/com/blackduck/integration/blackduck/service/dataservice/ProjectMappingService.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/dataservice/ProjectMappingService.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.service.dataservice; diff --git a/src/main/java/com/blackduck/integration/blackduck/service/dataservice/ProjectService.java b/src/main/java/com/blackduck/integration/blackduck/service/dataservice/ProjectService.java index 2b7ca5026..5d54d4436 100644 --- a/src/main/java/com/blackduck/integration/blackduck/service/dataservice/ProjectService.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/dataservice/ProjectService.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.service.dataservice; diff --git a/src/main/java/com/blackduck/integration/blackduck/service/dataservice/ProjectUsersService.java b/src/main/java/com/blackduck/integration/blackduck/service/dataservice/ProjectUsersService.java index 9764ad478..a61dd7377 100644 --- a/src/main/java/com/blackduck/integration/blackduck/service/dataservice/ProjectUsersService.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/dataservice/ProjectUsersService.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.service.dataservice; diff --git a/src/main/java/com/blackduck/integration/blackduck/service/dataservice/RoleService.java b/src/main/java/com/blackduck/integration/blackduck/service/dataservice/RoleService.java index f5299670d..ce56a3546 100644 --- a/src/main/java/com/blackduck/integration/blackduck/service/dataservice/RoleService.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/dataservice/RoleService.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.service.dataservice; diff --git a/src/main/java/com/blackduck/integration/blackduck/service/dataservice/TagService.java b/src/main/java/com/blackduck/integration/blackduck/service/dataservice/TagService.java index e972bb05a..9254222b4 100644 --- a/src/main/java/com/blackduck/integration/blackduck/service/dataservice/TagService.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/dataservice/TagService.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.service.dataservice; diff --git a/src/main/java/com/blackduck/integration/blackduck/service/dataservice/UserGroupService.java b/src/main/java/com/blackduck/integration/blackduck/service/dataservice/UserGroupService.java index 53596f00b..2d586d926 100644 --- a/src/main/java/com/blackduck/integration/blackduck/service/dataservice/UserGroupService.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/dataservice/UserGroupService.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.service.dataservice; diff --git a/src/main/java/com/blackduck/integration/blackduck/service/dataservice/UserRoleService.java b/src/main/java/com/blackduck/integration/blackduck/service/dataservice/UserRoleService.java index 9d9e86b95..1282dc796 100644 --- a/src/main/java/com/blackduck/integration/blackduck/service/dataservice/UserRoleService.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/dataservice/UserRoleService.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.service.dataservice; diff --git a/src/main/java/com/blackduck/integration/blackduck/service/dataservice/UserService.java b/src/main/java/com/blackduck/integration/blackduck/service/dataservice/UserService.java index e29866073..76fbfcd4a 100644 --- a/src/main/java/com/blackduck/integration/blackduck/service/dataservice/UserService.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/dataservice/UserService.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.service.dataservice; diff --git a/src/main/java/com/blackduck/integration/blackduck/service/model/BlackDuckServerData.java b/src/main/java/com/blackduck/integration/blackduck/service/model/BlackDuckServerData.java index 07c0156ad..73607863f 100644 --- a/src/main/java/com/blackduck/integration/blackduck/service/model/BlackDuckServerData.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/model/BlackDuckServerData.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.service.model; diff --git a/src/main/java/com/blackduck/integration/blackduck/service/model/ComponentVersionPolicyViolationCount.java b/src/main/java/com/blackduck/integration/blackduck/service/model/ComponentVersionPolicyViolationCount.java index a168ae60d..bc76daeaf 100644 --- a/src/main/java/com/blackduck/integration/blackduck/service/model/ComponentVersionPolicyViolationCount.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/model/ComponentVersionPolicyViolationCount.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.service.model; diff --git a/src/main/java/com/blackduck/integration/blackduck/service/model/ComponentVersionStatusCount.java b/src/main/java/com/blackduck/integration/blackduck/service/model/ComponentVersionStatusCount.java index 577d6a105..1c5b3f139 100644 --- a/src/main/java/com/blackduck/integration/blackduck/service/model/ComponentVersionStatusCount.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/model/ComponentVersionStatusCount.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.service.model; diff --git a/src/main/java/com/blackduck/integration/blackduck/service/model/ComponentVersionVulnerabilities.java b/src/main/java/com/blackduck/integration/blackduck/service/model/ComponentVersionVulnerabilities.java index ed80ea97c..0b2c9a3b9 100644 --- a/src/main/java/com/blackduck/integration/blackduck/service/model/ComponentVersionVulnerabilities.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/model/ComponentVersionVulnerabilities.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.service.model; diff --git a/src/main/java/com/blackduck/integration/blackduck/service/model/MatchedFilesModel.java b/src/main/java/com/blackduck/integration/blackduck/service/model/MatchedFilesModel.java index dfeca9411..0601eac64 100644 --- a/src/main/java/com/blackduck/integration/blackduck/service/model/MatchedFilesModel.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/model/MatchedFilesModel.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.service.model; diff --git a/src/main/java/com/blackduck/integration/blackduck/service/model/NotificationTaskRange.java b/src/main/java/com/blackduck/integration/blackduck/service/model/NotificationTaskRange.java index 6d8f3e35c..e6594a0c3 100644 --- a/src/main/java/com/blackduck/integration/blackduck/service/model/NotificationTaskRange.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/model/NotificationTaskRange.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.service.model; diff --git a/src/main/java/com/blackduck/integration/blackduck/service/model/PolicyRuleExpressionSetBuilder.java b/src/main/java/com/blackduck/integration/blackduck/service/model/PolicyRuleExpressionSetBuilder.java index cc7ffd414..a0e1f5435 100644 --- a/src/main/java/com/blackduck/integration/blackduck/service/model/PolicyRuleExpressionSetBuilder.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/model/PolicyRuleExpressionSetBuilder.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.service.model; diff --git a/src/main/java/com/blackduck/integration/blackduck/service/model/PolicyStatusDescription.java b/src/main/java/com/blackduck/integration/blackduck/service/model/PolicyStatusDescription.java index 99f505a87..9282f56cb 100644 --- a/src/main/java/com/blackduck/integration/blackduck/service/model/PolicyStatusDescription.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/model/PolicyStatusDescription.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.service.model; diff --git a/src/main/java/com/blackduck/integration/blackduck/service/model/ProjectNameVersionGuess.java b/src/main/java/com/blackduck/integration/blackduck/service/model/ProjectNameVersionGuess.java index da2233f31..3fee9ef69 100644 --- a/src/main/java/com/blackduck/integration/blackduck/service/model/ProjectNameVersionGuess.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/model/ProjectNameVersionGuess.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.service.model; diff --git a/src/main/java/com/blackduck/integration/blackduck/service/model/ProjectNameVersionGuesser.java b/src/main/java/com/blackduck/integration/blackduck/service/model/ProjectNameVersionGuesser.java index e4bb1673f..144b87fe8 100644 --- a/src/main/java/com/blackduck/integration/blackduck/service/model/ProjectNameVersionGuesser.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/model/ProjectNameVersionGuesser.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.service.model; diff --git a/src/main/java/com/blackduck/integration/blackduck/service/model/ProjectSyncModel.java b/src/main/java/com/blackduck/integration/blackduck/service/model/ProjectSyncModel.java index 687be410d..21ecd30d8 100644 --- a/src/main/java/com/blackduck/integration/blackduck/service/model/ProjectSyncModel.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/model/ProjectSyncModel.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.service.model; diff --git a/src/main/java/com/blackduck/integration/blackduck/service/model/ProjectVersionDescription.java b/src/main/java/com/blackduck/integration/blackduck/service/model/ProjectVersionDescription.java index c6056efb7..270abe71d 100644 --- a/src/main/java/com/blackduck/integration/blackduck/service/model/ProjectVersionDescription.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/model/ProjectVersionDescription.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.service.model; diff --git a/src/main/java/com/blackduck/integration/blackduck/service/model/ProjectVersionWrapper.java b/src/main/java/com/blackduck/integration/blackduck/service/model/ProjectVersionWrapper.java index 687543d2c..e07ddce95 100644 --- a/src/main/java/com/blackduck/integration/blackduck/service/model/ProjectVersionWrapper.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/model/ProjectVersionWrapper.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.service.model; diff --git a/src/main/java/com/blackduck/integration/blackduck/service/model/RiskProfileCounts.java b/src/main/java/com/blackduck/integration/blackduck/service/model/RiskProfileCounts.java index 7f2b83196..c46ac1ea7 100644 --- a/src/main/java/com/blackduck/integration/blackduck/service/model/RiskProfileCounts.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/model/RiskProfileCounts.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.service.model; diff --git a/src/main/java/com/blackduck/integration/blackduck/service/model/ScannerSplitStream.java b/src/main/java/com/blackduck/integration/blackduck/service/model/ScannerSplitStream.java index 6efd5cc53..eb51c4e90 100644 --- a/src/main/java/com/blackduck/integration/blackduck/service/model/ScannerSplitStream.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/model/ScannerSplitStream.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.service.model; diff --git a/src/main/java/com/blackduck/integration/blackduck/service/model/StreamRedirectThread.java b/src/main/java/com/blackduck/integration/blackduck/service/model/StreamRedirectThread.java index 39ffc2a39..a5a2cab77 100644 --- a/src/main/java/com/blackduck/integration/blackduck/service/model/StreamRedirectThread.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/model/StreamRedirectThread.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.service.model; diff --git a/src/main/java/com/blackduck/integration/blackduck/service/model/VersionBomComponentModel.java b/src/main/java/com/blackduck/integration/blackduck/service/model/VersionBomComponentModel.java index 658a1d0d3..acd801d95 100644 --- a/src/main/java/com/blackduck/integration/blackduck/service/model/VersionBomComponentModel.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/model/VersionBomComponentModel.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.service.model; diff --git a/src/main/java/com/blackduck/integration/blackduck/service/request/AcceptHeaderEditor.java b/src/main/java/com/blackduck/integration/blackduck/service/request/AcceptHeaderEditor.java index 2d3e0d110..24833f669 100644 --- a/src/main/java/com/blackduck/integration/blackduck/service/request/AcceptHeaderEditor.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/request/AcceptHeaderEditor.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.service.request; diff --git a/src/main/java/com/blackduck/integration/blackduck/service/request/BlackDuckMultipleRequest.java b/src/main/java/com/blackduck/integration/blackduck/service/request/BlackDuckMultipleRequest.java index 31c63fd79..1a7136d19 100644 --- a/src/main/java/com/blackduck/integration/blackduck/service/request/BlackDuckMultipleRequest.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/request/BlackDuckMultipleRequest.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.service.request; diff --git a/src/main/java/com/blackduck/integration/blackduck/service/request/BlackDuckRequest.java b/src/main/java/com/blackduck/integration/blackduck/service/request/BlackDuckRequest.java index 75cf4a97b..21cab608b 100644 --- a/src/main/java/com/blackduck/integration/blackduck/service/request/BlackDuckRequest.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/request/BlackDuckRequest.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.service.request; diff --git a/src/main/java/com/blackduck/integration/blackduck/service/request/BlackDuckRequestBuilderEditor.java b/src/main/java/com/blackduck/integration/blackduck/service/request/BlackDuckRequestBuilderEditor.java index 7fcfa293c..84a85c360 100644 --- a/src/main/java/com/blackduck/integration/blackduck/service/request/BlackDuckRequestBuilderEditor.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/request/BlackDuckRequestBuilderEditor.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.service.request; diff --git a/src/main/java/com/blackduck/integration/blackduck/service/request/BlackDuckResponseRequest.java b/src/main/java/com/blackduck/integration/blackduck/service/request/BlackDuckResponseRequest.java index a46886d11..10e3d0d5e 100644 --- a/src/main/java/com/blackduck/integration/blackduck/service/request/BlackDuckResponseRequest.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/request/BlackDuckResponseRequest.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.service.request; diff --git a/src/main/java/com/blackduck/integration/blackduck/service/request/BlackDuckSingleRequest.java b/src/main/java/com/blackduck/integration/blackduck/service/request/BlackDuckSingleRequest.java index dd818d667..b3f61ad96 100644 --- a/src/main/java/com/blackduck/integration/blackduck/service/request/BlackDuckSingleRequest.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/request/BlackDuckSingleRequest.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.service.request; diff --git a/src/main/java/com/blackduck/integration/blackduck/service/request/BlackDuckStringRequest.java b/src/main/java/com/blackduck/integration/blackduck/service/request/BlackDuckStringRequest.java index 1dfdc4f09..bb5c1b77b 100644 --- a/src/main/java/com/blackduck/integration/blackduck/service/request/BlackDuckStringRequest.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/request/BlackDuckStringRequest.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.service.request; diff --git a/src/main/java/com/blackduck/integration/blackduck/service/request/NotificationEditor.java b/src/main/java/com/blackduck/integration/blackduck/service/request/NotificationEditor.java index 186e49b02..b67706d31 100644 --- a/src/main/java/com/blackduck/integration/blackduck/service/request/NotificationEditor.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/request/NotificationEditor.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.service.request; diff --git a/src/main/java/com/blackduck/integration/blackduck/service/request/PagingDefaultsEditor.java b/src/main/java/com/blackduck/integration/blackduck/service/request/PagingDefaultsEditor.java index 21890dfa3..9954911d9 100644 --- a/src/main/java/com/blackduck/integration/blackduck/service/request/PagingDefaultsEditor.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/request/PagingDefaultsEditor.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.service.request; diff --git a/src/main/java/com/blackduck/integration/blackduck/useragent/BlackDuckCommon.java b/src/main/java/com/blackduck/integration/blackduck/useragent/BlackDuckCommon.java index b297dc71a..5721466d7 100644 --- a/src/main/java/com/blackduck/integration/blackduck/useragent/BlackDuckCommon.java +++ b/src/main/java/com/blackduck/integration/blackduck/useragent/BlackDuckCommon.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.useragent; diff --git a/src/main/java/com/blackduck/integration/blackduck/useragent/UserAgentBuilder.java b/src/main/java/com/blackduck/integration/blackduck/useragent/UserAgentBuilder.java index 80b75e702..66cb374b1 100644 --- a/src/main/java/com/blackduck/integration/blackduck/useragent/UserAgentBuilder.java +++ b/src/main/java/com/blackduck/integration/blackduck/useragent/UserAgentBuilder.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.useragent; diff --git a/src/main/java/com/blackduck/integration/blackduck/useragent/UserAgentItem.java b/src/main/java/com/blackduck/integration/blackduck/useragent/UserAgentItem.java index b696008fe..bf35e129f 100644 --- a/src/main/java/com/blackduck/integration/blackduck/useragent/UserAgentItem.java +++ b/src/main/java/com/blackduck/integration/blackduck/useragent/UserAgentItem.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.useragent; diff --git a/src/main/java/com/blackduck/integration/blackduck/version/BlackDuckVersion.java b/src/main/java/com/blackduck/integration/blackduck/version/BlackDuckVersion.java index 460cf6dd5..ad808554f 100644 --- a/src/main/java/com/blackduck/integration/blackduck/version/BlackDuckVersion.java +++ b/src/main/java/com/blackduck/integration/blackduck/version/BlackDuckVersion.java @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ package com.blackduck.integration.blackduck.version; diff --git a/src/main/resources/riskreport/web/js/BlackDuckBomReportFunctions.js b/src/main/resources/riskreport/web/js/BlackDuckBomReportFunctions.js index 779092360..bc2f70fdf 100644 --- a/src/main/resources/riskreport/web/js/BlackDuckBomReportFunctions.js +++ b/src/main/resources/riskreport/web/js/BlackDuckBomReportFunctions.js @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ var filteredSecurityClassName = " rowFilteredSecurity"; var filteredLicenseClassName = " rowFilteredLicense"; diff --git a/src/main/resources/riskreport/web/js/BlackDuckRiskReport.js b/src/main/resources/riskreport/web/js/BlackDuckRiskReport.js index 003f3e9c3..ab2397d3b 100644 --- a/src/main/resources/riskreport/web/js/BlackDuckRiskReport.js +++ b/src/main/resources/riskreport/web/js/BlackDuckRiskReport.js @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ var RiskReport = function (myJQuery, jsonData) { this.myJQuery = myJQuery; diff --git a/src/main/resources/riskreport/web/js/Sortable.js b/src/main/resources/riskreport/web/js/Sortable.js index e5811f2fd..b7c0c4944 100644 --- a/src/main/resources/riskreport/web/js/Sortable.js +++ b/src/main/resources/riskreport/web/js/Sortable.js @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ /* SortTable diff --git a/src/main/resources/riskreport/web/js/jquery-3.6.4.min.js b/src/main/resources/riskreport/web/js/jquery-3.6.4.min.js index 9c1c0a582..6498334eb 100644 --- a/src/main/resources/riskreport/web/js/jquery-3.6.4.min.js +++ b/src/main/resources/riskreport/web/js/jquery-3.6.4.min.js @@ -1,9 +1,9 @@ /* * blackduck-common * - * Copyright (c) 2024 Synopsys, Inc. + * Copyright (c) 2024 Black Duck Software, Inc. * - * Use subject to the terms and conditions of the Synopsys End User Software License and Maintenance Agreement. All rights reserved worldwide. + * Use subject to the terms and conditions of the Black Duck Software End User Software License and Maintenance Agreement. All rights reserved worldwide. */ /*! jQuery v3.6.4 | (c) OpenJS Foundation and other contributors | jquery.org/license */ !function(e,t){"use strict";"object"==typeof module&&"object"==typeof module.exports?module.exports=e.document?t(e,!0):function(e){if(!e.document)throw new Error("jQuery requires a window with a document");return t(e)}:t(e)}("undefined"!=typeof window?window:this,function(C,e){"use strict";var t=[],r=Object.getPrototypeOf,s=t.slice,g=t.flat?function(e){return t.flat.call(e)}:function(e){return t.concat.apply([],e)},u=t.push,i=t.indexOf,n={},o=n.toString,y=n.hasOwnProperty,a=y.toString,l=a.call(Object),v={},m=function(e){return"function"==typeof e&&"number"!=typeof e.nodeType&&"function"!=typeof e.item},x=function(e){return null!=e&&e===e.window},E=C.document,c={type:!0,src:!0,nonce:!0,noModule:!0};function b(e,t,n){var r,i,o=(n=n||E).createElement("script");if(o.text=e,t)for(r in c)(i=t[r]||t.getAttribute&&t.getAttribute(r))&&o.setAttribute(r,i);n.head.appendChild(o).parentNode.removeChild(o)}function w(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?n[o.call(e)]||"object":typeof e}var f="3.6.4",S=function(e,t){return new S.fn.init(e,t)};function p(e){var t=!!e&&"length"in e&&e.length,n=w(e);return!m(e)&&!x(e)&&("array"===n||0===t||"number"==typeof t&&0+~]|"+M+")"+M+"*"),U=new RegExp(M+"|>"),X=new RegExp(F),V=new RegExp("^"+I+"$"),G={ID:new RegExp("^#("+I+")"),CLASS:new RegExp("^\\.("+I+")"),TAG:new RegExp("^("+I+"|[*])"),ATTR:new RegExp("^"+W),PSEUDO:new RegExp("^"+F),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+M+"*(even|odd|(([+-]|)(\\d*)n|)"+M+"*(?:([+-]|)"+M+"*(\\d+)|))"+M+"*\\)|)","i"),bool:new RegExp("^(?:"+R+")$","i"),needsContext:new RegExp("^"+M+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+M+"*((?:-\\d)?\\d*)"+M+"*\\)|)(?=[^-]|$)","i")},Y=/HTML$/i,Q=/^(?:input|select|textarea|button)$/i,J=/^h\d$/i,K=/^[^{]+\{\s*\[native \w/,Z=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,ee=/[+~]/,te=new RegExp("\\\\[\\da-fA-F]{1,6}"+M+"?|\\\\([^\\r\\n\\f])","g"),ne=function(e,t){var n="0x"+e.slice(1)-65536;return t||(n<0?String.fromCharCode(n+65536):String.fromCharCode(n>>10|55296,1023&n|56320))},re=/([\0-\x1f\x7f]|^-?\d)|^-$|[^\0-\x1f\x7f-\uFFFF\w-]/g,ie=function(e,t){return t?"\0"===e?"\ufffd":e.slice(0,-1)+"\\"+e.charCodeAt(e.length-1).toString(16)+" ":"\\"+e},oe=function(){T()},ae=be(function(e){return!0===e.disabled&&"fieldset"===e.nodeName.toLowerCase()},{dir:"parentNode",next:"legend"});try{H.apply(t=O.call(p.childNodes),p.childNodes),t[p.childNodes.length].nodeType}catch(e){H={apply:t.length?function(e,t){L.apply(e,O.call(t))}:function(e,t){var n=e.length,r=0;while(e[n++]=t[r++]);e.length=n-1}}}function se(t,e,n,r){var i,o,a,s,u,l,c,f=e&&e.ownerDocument,p=e?e.nodeType:9;if(n=n||[],"string"!=typeof t||!t||1!==p&&9!==p&&11!==p)return n;if(!r&&(T(e),e=e||C,E)){if(11!==p&&(u=Z.exec(t)))if(i=u[1]){if(9===p){if(!(a=e.getElementById(i)))return n;if(a.id===i)return n.push(a),n}else if(f&&(a=f.getElementById(i))&&v(e,a)&&a.id===i)return n.push(a),n}else{if(u[2])return H.apply(n,e.getElementsByTagName(t)),n;if((i=u[3])&&d.getElementsByClassName&&e.getElementsByClassName)return H.apply(n,e.getElementsByClassName(i)),n}if(d.qsa&&!N[t+" "]&&(!y||!y.test(t))&&(1!==p||"object"!==e.nodeName.toLowerCase())){if(c=t,f=e,1===p&&(U.test(t)||z.test(t))){(f=ee.test(t)&&ve(e.parentNode)||e)===e&&d.scope||((s=e.getAttribute("id"))?s=s.replace(re,ie):e.setAttribute("id",s=S)),o=(l=h(t)).length;while(o--)l[o]=(s?"#"+s:":scope")+" "+xe(l[o]);c=l.join(",")}try{return H.apply(n,f.querySelectorAll(c)),n}catch(e){N(t,!0)}finally{s===S&&e.removeAttribute("id")}}}return g(t.replace(B,"$1"),e,n,r)}function ue(){var r=[];return function e(t,n){return r.push(t+" ")>b.cacheLength&&delete e[r.shift()],e[t+" "]=n}}function le(e){return e[S]=!0,e}function ce(e){var t=C.createElement("fieldset");try{return!!e(t)}catch(e){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function fe(e,t){var n=e.split("|"),r=n.length;while(r--)b.attrHandle[n[r]]=t}function pe(e,t){var n=t&&e,r=n&&1===e.nodeType&&1===t.nodeType&&e.sourceIndex-t.sourceIndex;if(r)return r;if(n)while(n=n.nextSibling)if(n===t)return-1;return e?1:-1}function de(t){return function(e){return"input"===e.nodeName.toLowerCase()&&e.type===t}}function he(n){return function(e){var t=e.nodeName.toLowerCase();return("input"===t||"button"===t)&&e.type===n}}function ge(t){return function(e){return"form"in e?e.parentNode&&!1===e.disabled?"label"in e?"label"in e.parentNode?e.parentNode.disabled===t:e.disabled===t:e.isDisabled===t||e.isDisabled!==!t&&ae(e)===t:e.disabled===t:"label"in e&&e.disabled===t}}function ye(a){return le(function(o){return o=+o,le(function(e,t){var n,r=a([],e.length,o),i=r.length;while(i--)e[n=r[i]]&&(e[n]=!(t[n]=e[n]))})})}function ve(e){return e&&"undefined"!=typeof e.getElementsByTagName&&e}for(e in d=se.support={},i=se.isXML=function(e){var t=e&&e.namespaceURI,n=e&&(e.ownerDocument||e).documentElement;return!Y.test(t||n&&n.nodeName||"HTML")},T=se.setDocument=function(e){var t,n,r=e?e.ownerDocument||e:p;return r!=C&&9===r.nodeType&&r.documentElement&&(a=(C=r).documentElement,E=!i(C),p!=C&&(n=C.defaultView)&&n.top!==n&&(n.addEventListener?n.addEventListener("unload",oe,!1):n.attachEvent&&n.attachEvent("onunload",oe)),d.scope=ce(function(e){return a.appendChild(e).appendChild(C.createElement("div")),"undefined"!=typeof e.querySelectorAll&&!e.querySelectorAll(":scope fieldset div").length}),d.cssHas=ce(function(){try{return C.querySelector(":has(*,:jqfake)"),!1}catch(e){return!0}}),d.attributes=ce(function(e){return e.className="i",!e.getAttribute("className")}),d.getElementsByTagName=ce(function(e){return e.appendChild(C.createComment("")),!e.getElementsByTagName("*").length}),d.getElementsByClassName=K.test(C.getElementsByClassName),d.getById=ce(function(e){return a.appendChild(e).id=S,!C.getElementsByName||!C.getElementsByName(S).length}),d.getById?(b.filter.ID=function(e){var t=e.replace(te,ne);return function(e){return e.getAttribute("id")===t}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&E){var n=t.getElementById(e);return n?[n]:[]}}):(b.filter.ID=function(e){var n=e.replace(te,ne);return function(e){var t="undefined"!=typeof e.getAttributeNode&&e.getAttributeNode("id");return t&&t.value===n}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&E){var n,r,i,o=t.getElementById(e);if(o){if((n=o.getAttributeNode("id"))&&n.value===e)return[o];i=t.getElementsByName(e),r=0;while(o=i[r++])if((n=o.getAttributeNode("id"))&&n.value===e)return[o]}return[]}}),b.find.TAG=d.getElementsByTagName?function(e,t){return"undefined"!=typeof t.getElementsByTagName?t.getElementsByTagName(e):d.qsa?t.querySelectorAll(e):void 0}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){while(n=o[i++])1===n.nodeType&&r.push(n);return r}return o},b.find.CLASS=d.getElementsByClassName&&function(e,t){if("undefined"!=typeof t.getElementsByClassName&&E)return t.getElementsByClassName(e)},s=[],y=[],(d.qsa=K.test(C.querySelectorAll))&&(ce(function(e){var t;a.appendChild(e).innerHTML="",e.querySelectorAll("[msallowcapture^='']").length&&y.push("[*^$]="+M+"*(?:''|\"\")"),e.querySelectorAll("[selected]").length||y.push("\\["+M+"*(?:value|"+R+")"),e.querySelectorAll("[id~="+S+"-]").length||y.push("~="),(t=C.createElement("input")).setAttribute("name",""),e.appendChild(t),e.querySelectorAll("[name='']").length||y.push("\\["+M+"*name"+M+"*="+M+"*(?:''|\"\")"),e.querySelectorAll(":checked").length||y.push(":checked"),e.querySelectorAll("a#"+S+"+*").length||y.push(".#.+[+~]"),e.querySelectorAll("\\\f"),y.push("[\\r\\n\\f]")}),ce(function(e){e.innerHTML="";var t=C.createElement("input");t.setAttribute("type","hidden"),e.appendChild(t).setAttribute("name","D"),e.querySelectorAll("[name=d]").length&&y.push("name"+M+"*[*^$|!~]?="),2!==e.querySelectorAll(":enabled").length&&y.push(":enabled",":disabled"),a.appendChild(e).disabled=!0,2!==e.querySelectorAll(":disabled").length&&y.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),y.push(",.*:")})),(d.matchesSelector=K.test(c=a.matches||a.webkitMatchesSelector||a.mozMatchesSelector||a.oMatchesSelector||a.msMatchesSelector))&&ce(function(e){d.disconnectedMatch=c.call(e,"*"),c.call(e,"[s!='']:x"),s.push("!=",F)}),d.cssHas||y.push(":has"),y=y.length&&new RegExp(y.join("|")),s=s.length&&new RegExp(s.join("|")),t=K.test(a.compareDocumentPosition),v=t||K.test(a.contains)?function(e,t){var n=9===e.nodeType&&e.documentElement||e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)while(t=t.parentNode)if(t===e)return!0;return!1},j=t?function(e,t){if(e===t)return l=!0,0;var n=!e.compareDocumentPosition-!t.compareDocumentPosition;return n||(1&(n=(e.ownerDocument||e)==(t.ownerDocument||t)?e.compareDocumentPosition(t):1)||!d.sortDetached&&t.compareDocumentPosition(e)===n?e==C||e.ownerDocument==p&&v(p,e)?-1:t==C||t.ownerDocument==p&&v(p,t)?1:u?P(u,e)-P(u,t):0:4&n?-1:1)}:function(e,t){if(e===t)return l=!0,0;var n,r=0,i=e.parentNode,o=t.parentNode,a=[e],s=[t];if(!i||!o)return e==C?-1:t==C?1:i?-1:o?1:u?P(u,e)-P(u,t):0;if(i===o)return pe(e,t);n=e;while(n=n.parentNode)a.unshift(n);n=t;while(n=n.parentNode)s.unshift(n);while(a[r]===s[r])r++;return r?pe(a[r],s[r]):a[r]==p?-1:s[r]==p?1:0}),C},se.matches=function(e,t){return se(e,null,null,t)},se.matchesSelector=function(e,t){if(T(e),d.matchesSelector&&E&&!N[t+" "]&&(!s||!s.test(t))&&(!y||!y.test(t)))try{var n=c.call(e,t);if(n||d.disconnectedMatch||e.document&&11!==e.document.nodeType)return n}catch(e){N(t,!0)}return 0":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(te,ne),e[3]=(e[3]||e[4]||e[5]||"").replace(te,ne),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||se.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&se.error(e[0]),e},PSEUDO:function(e){var t,n=!e[6]&&e[2];return G.CHILD.test(e[0])?null:(e[3]?e[2]=e[4]||e[5]||"":n&&X.test(n)&&(t=h(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(te,ne).toLowerCase();return"*"===e?function(){return!0}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=m[e+" "];return t||(t=new RegExp("(^|"+M+")"+e+"("+M+"|$)"))&&m(e,function(e){return t.test("string"==typeof e.className&&e.className||"undefined"!=typeof e.getAttribute&&e.getAttribute("class")||"")})},ATTR:function(n,r,i){return function(e){var t=se.attr(e,n);return null==t?"!="===r:!r||(t+="","="===r?t===i:"!="===r?t!==i:"^="===r?i&&0===t.indexOf(i):"*="===r?i&&-1:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i;function j(e,n,r){return m(n)?S.grep(e,function(e,t){return!!n.call(e,t,e)!==r}):n.nodeType?S.grep(e,function(e){return e===n!==r}):"string"!=typeof n?S.grep(e,function(e){return-1)[^>]*|#([\w-]+))$/;(S.fn.init=function(e,t,n){var r,i;if(!e)return this;if(n=n||D,"string"==typeof e){if(!(r="<"===e[0]&&">"===e[e.length-1]&&3<=e.length?[null,e,null]:q.exec(e))||!r[1]&&t)return!t||t.jquery?(t||n).find(e):this.constructor(t).find(e);if(r[1]){if(t=t instanceof S?t[0]:t,S.merge(this,S.parseHTML(r[1],t&&t.nodeType?t.ownerDocument||t:E,!0)),N.test(r[1])&&S.isPlainObject(t))for(r in t)m(this[r])?this[r](t[r]):this.attr(r,t[r]);return this}return(i=E.getElementById(r[2]))&&(this[0]=i,this.length=1),this}return e.nodeType?(this[0]=e,this.length=1,this):m(e)?void 0!==n.ready?n.ready(e):e(S):S.makeArray(e,this)}).prototype=S.fn,D=S(E);var L=/^(?:parents|prev(?:Until|All))/,H={children:!0,contents:!0,next:!0,prev:!0};function O(e,t){while((e=e[t])&&1!==e.nodeType);return e}S.fn.extend({has:function(e){var t=S(e,this),n=t.length;return this.filter(function(){for(var e=0;e\x20\t\r\n\f]*)/i,he=/^$|^module$|\/(?:java|ecma)script/i;ce=E.createDocumentFragment().appendChild(E.createElement("div")),(fe=E.createElement("input")).setAttribute("type","radio"),fe.setAttribute("checked","checked"),fe.setAttribute("name","t"),ce.appendChild(fe),v.checkClone=ce.cloneNode(!0).cloneNode(!0).lastChild.checked,ce.innerHTML="",v.noCloneChecked=!!ce.cloneNode(!0).lastChild.defaultValue,ce.innerHTML="",v.option=!!ce.lastChild;var ge={thead:[1,"","
"],col:[2,"","
"],tr:[2,"","
"],td:[3,"","
"],_default:[0,"",""]};function ye(e,t){var n;return n="undefined"!=typeof e.getElementsByTagName?e.getElementsByTagName(t||"*"):"undefined"!=typeof e.querySelectorAll?e.querySelectorAll(t||"*"):[],void 0===t||t&&A(e,t)?S.merge([e],n):n}function ve(e,t){for(var n=0,r=e.length;n",""]);var me=/<|&#?\w+;/;function xe(e,t,n,r,i){for(var o,a,s,u,l,c,f=t.createDocumentFragment(),p=[],d=0,h=e.length;d\s*$/g;function je(e,t){return A(e,"table")&&A(11!==t.nodeType?t:t.firstChild,"tr")&&S(e).children("tbody")[0]||e}function De(e){return e.type=(null!==e.getAttribute("type"))+"/"+e.type,e}function qe(e){return"true/"===(e.type||"").slice(0,5)?e.type=e.type.slice(5):e.removeAttribute("type"),e}function Le(e,t){var n,r,i,o,a,s;if(1===t.nodeType){if(Y.hasData(e)&&(s=Y.get(e).events))for(i in Y.remove(t,"handle events"),s)for(n=0,r=s[i].length;n").attr(n.scriptAttrs||{}).prop({charset:n.scriptCharset,src:n.url}).on("load error",i=function(e){r.remove(),i=null,e&&t("error"===e.type?404:200,e.type)}),E.head.appendChild(r[0])},abort:function(){i&&i()}}});var Ut,Xt=[],Vt=/(=)\?(?=&|$)|\?\?/;S.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=Xt.pop()||S.expando+"_"+Ct.guid++;return this[e]=!0,e}}),S.ajaxPrefilter("json jsonp",function(e,t,n){var r,i,o,a=!1!==e.jsonp&&(Vt.test(e.url)?"url":"string"==typeof e.data&&0===(e.contentType||"").indexOf("application/x-www-form-urlencoded")&&Vt.test(e.data)&&"data");if(a||"jsonp"===e.dataTypes[0])return r=e.jsonpCallback=m(e.jsonpCallback)?e.jsonpCallback():e.jsonpCallback,a?e[a]=e[a].replace(Vt,"$1"+r):!1!==e.jsonp&&(e.url+=(Et.test(e.url)?"&":"?")+e.jsonp+"="+r),e.converters["script json"]=function(){return o||S.error(r+" was not called"),o[0]},e.dataTypes[0]="json",i=C[r],C[r]=function(){o=arguments},n.always(function(){void 0===i?S(C).removeProp(r):C[r]=i,e[r]&&(e.jsonpCallback=t.jsonpCallback,Xt.push(r)),o&&m(i)&&i(o[0]),o=i=void 0}),"script"}),v.createHTMLDocument=((Ut=E.implementation.createHTMLDocument("").body).innerHTML="
",2===Ut.childNodes.length),S.parseHTML=function(e,t,n){return"string"!=typeof e?[]:("boolean"==typeof t&&(n=t,t=!1),t||(v.createHTMLDocument?((r=(t=E.implementation.createHTMLDocument("")).createElement("base")).href=E.location.href,t.head.appendChild(r)):t=E),o=!n&&[],(i=N.exec(e))?[t.createElement(i[1])]:(i=xe([e],t,o),o&&o.length&&S(o).remove(),S.merge([],i.childNodes)));var r,i,o},S.fn.load=function(e,t,n){var r,i,o,a=this,s=e.indexOf(" ");return-1").append(S.parseHTML(e)).find(r):e)}).always(n&&function(e,t){a.each(function(){n.apply(this,o||[e.responseText,t,e])})}),this},S.expr.pseudos.animated=function(t){return S.grep(S.timers,function(e){return t===e.elem}).length},S.offset={setOffset:function(e,t,n){var r,i,o,a,s,u,l=S.css(e,"position"),c=S(e),f={};"static"===l&&(e.style.position="relative"),s=c.offset(),o=S.css(e,"top"),u=S.css(e,"left"),("absolute"===l||"fixed"===l)&&-1<(o+u).indexOf("auto")?(a=(r=c.position()).top,i=r.left):(a=parseFloat(o)||0,i=parseFloat(u)||0),m(t)&&(t=t.call(e,n,S.extend({},s))),null!=t.top&&(f.top=t.top-s.top+a),null!=t.left&&(f.left=t.left-s.left+i),"using"in t?t.using.call(e,f):c.css(f)}},S.fn.extend({offset:function(t){if(arguments.length)return void 0===t?this:this.each(function(e){S.offset.setOffset(this,t,e)});var e,n,r=this[0];return r?r.getClientRects().length?(e=r.getBoundingClientRect(),n=r.ownerDocument.defaultView,{top:e.top+n.pageYOffset,left:e.left+n.pageXOffset}):{top:0,left:0}:void 0},position:function(){if(this[0]){var e,t,n,r=this[0],i={top:0,left:0};if("fixed"===S.css(r,"position"))t=r.getBoundingClientRect();else{t=this.offset(),n=r.ownerDocument,e=r.offsetParent||n.documentElement;while(e&&(e===n.body||e===n.documentElement)&&"static"===S.css(e,"position"))e=e.parentNode;e&&e!==r&&1===e.nodeType&&((i=S(e).offset()).top+=S.css(e,"borderTopWidth",!0),i.left+=S.css(e,"borderLeftWidth",!0))}return{top:t.top-i.top-S.css(r,"marginTop",!0),left:t.left-i.left-S.css(r,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var e=this.offsetParent;while(e&&"static"===S.css(e,"position"))e=e.offsetParent;return e||re})}}),S.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(t,i){var o="pageYOffset"===i;S.fn[t]=function(e){return B(this,function(e,t,n){var r;if(x(e)?r=e:9===e.nodeType&&(r=e.defaultView),void 0===n)return r?r[i]:e[t];r?r.scrollTo(o?r.pageXOffset:n,o?n:r.pageYOffset):e[t]=n},t,e,arguments.length)}}),S.each(["top","left"],function(e,n){S.cssHooks[n]=_e(v.pixelPosition,function(e,t){if(t)return t=Be(e,n),Pe.test(t)?S(e).position()[n]+"px":t})}),S.each({Height:"height",Width:"width"},function(a,s){S.each({padding:"inner"+a,content:s,"":"outer"+a},function(r,o){S.fn[o]=function(e,t){var n=arguments.length&&(r||"boolean"!=typeof e),i=r||(!0===e||!0===t?"margin":"border");return B(this,function(e,t,n){var r;return x(e)?0===o.indexOf("outer")?e["inner"+a]:e.document.documentElement["client"+a]:9===e.nodeType?(r=e.documentElement,Math.max(e.body["scroll"+a],r["scroll"+a],e.body["offset"+a],r["offset"+a],r["client"+a])):void 0===n?S.css(e,t,i):S.style(e,t,n,i)},s,n?e:void 0,n)}})}),S.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(e,t){S.fn[t]=function(e){return this.on(t,e)}}),S.fn.extend({bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return 1===arguments.length?this.off(e,"**"):this.off(t,e||"**",n)},hover:function(e,t){return this.mouseenter(e).mouseleave(t||e)}}),S.each("blur focus focusin focusout resize scroll click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup contextmenu".split(" "),function(e,n){S.fn[n]=function(e,t){return 0 Date: Fri, 13 Sep 2024 15:11:41 -0400 Subject: [PATCH 4/7] Updates for rebranding --- build.gradle | 8 +- .../api/enumeration/RankedSeverityType.java | 4 +- .../bdio2/Bdio2FileUploadService.java | 25 +++--- .../bdio2/Bdio2RetryAwareStreamUploader.java | 19 ++--- .../blackduck/bdio2/Bdio2StreamUploader.java | 23 +++--- .../blackduck/bdio2/Bdio2UploadJob.java | 17 ++-- .../blackduck/bdio2/Bdio2UploadResult.java | 2 +- .../blackduck/bdio2/model/Bdio2Document.java | 4 +- .../bdio2/model/BdioFileContent.java | 2 +- .../blackduck/bdio2/model/GitInfo.java | 4 +- .../blackduck/bdio2/model/ProjectInfo.java | 7 +- .../bdio2/util/Bdio2ContentExtractor.java | 15 ++-- .../blackduck/bdio2/util/Bdio2Factory.java | 43 ++++------ .../blackduck/bdio2/util/Bdio2Writer.java | 10 +-- .../codelocation/CodeLocationBatchOutput.java | 12 +-- .../CodeLocationCreationService.java | 24 +++--- .../codelocation/CodeLocationOutput.java | 5 +- .../codelocation/CodeLocationWaitJob.java | 32 +++----- .../CodeLocationWaitJobCondition.java | 30 +++---- .../codelocation/CodeLocationWaiter.java | 20 ++--- .../codelocation/CodeLocationsRetriever.java | 10 +-- ...dio2UploadCodeLocationCreationRequest.java | 2 +- .../bdio2legacy/Bdio2UploadService.java | 18 ++-- .../bdio2legacy/UploadBdio2BatchRunner.java | 18 ++-- .../bdio2legacy/UploadBdio2Callable.java | 25 +++--- ...BdioUploadCodeLocationCreationRequest.java | 2 +- .../bdiolegacy/BdioUploadService.java | 16 ++-- .../bdiolegacy/UploadBatchRunner.java | 16 ++-- .../bdiolegacy/UploadCallable.java | 23 +++--- .../binaryscanner/BinaryScan.java | 4 +- .../binaryscanner/BinaryScanBatchOutput.java | 6 +- .../binaryscanner/BinaryScanBatchRunner.java | 10 +-- .../binaryscanner/BinaryScanCallable.java | 22 ++--- .../binaryscanner/BinaryScanOutput.java | 11 ++- .../BinaryScanUploadService.java | 16 ++-- .../IntelligentPersistenceBatchRunner.java | 14 ++-- .../IntelligentPersistenceCallable.java | 9 +- .../IntelligentPersistenceService.java | 16 ++-- .../signaturescanner/ScanBatch.java | 27 +++--- .../signaturescanner/ScanBatchBuilder.java | 23 ++---- .../signaturescanner/ScanBatchOutput.java | 6 +- .../signaturescanner/ScanBatchRunner.java | 17 ++-- .../SignatureScannerService.java | 16 ++-- .../command/ApiScannerInstaller.java | 4 +- .../command/ExistingScannerInstaller.java | 4 +- .../signaturescanner/command/ScanCommand.java | 16 ++-- .../command/ScanCommandArgumentParser.java | 9 +- .../command/ScanCommandCallable.java | 19 ++--- .../command/ScanCommandOutput.java | 13 ++- .../command/ScanCommandRunner.java | 8 +- .../command/ScanPathsUtility.java | 17 ++-- .../signaturescanner/command/ScanTarget.java | 7 +- .../command/ScannerInstaller.java | 4 +- .../command/ToolsApiScannerInstaller.java | 30 ++++--- .../command/ZipApiScannerInstaller.java | 31 ++++--- .../upload/UploadBatchOutput.java | 4 +- .../codelocation/upload/UploadOutput.java | 9 +- .../codelocation/upload/UploadTarget.java | 7 +- .../BlackDuckConnectionResult.java | 6 +- .../configuration/BlackDuckServerConfig.java | 43 +++++----- .../BlackDuckServerConfigBuilder.java | 49 ++++++----- .../BlackDuckServerConfigKeys.java | 4 +- .../exception/BlackDuckApiException.java | 4 +- .../BlackDuckIntegrationException.java | 2 +- .../SignatureScannerInputException.java | 2 +- .../blackduck/http/BlackDuckPageResponse.java | 6 +- .../http/BlackDuckRequestBuilder.java | 37 +++------ .../http/BlackDuckRequestFilter.java | 7 +- .../blackduck/http/BlackDuckUrl.java | 4 +- .../client/ApiTokenBlackDuckHttpClient.java | 21 +++-- .../BlackDuckCertificateInterceptor.java | 9 +- .../http/client/BlackDuckHttpClient.java | 21 +++-- .../client/BlackDuckRedirectStrategy.java | 4 +- .../http/client/CookieHeaderParser.java | 6 +- .../CredentialsBlackDuckHttpClient.java | 27 +++--- .../client/DefaultBlackDuckHttpClient.java | 39 +++++---- .../http/client/SignatureScannerClient.java | 24 +++--- .../http/client/cache/CacheableResponse.java | 15 ++-- .../http/client/cache/CachingHttpClient.java | 33 ++++---- .../transform/BlackDuckJsonTransformer.java | 32 ++++---- .../BlackDuckResponseTransformer.java | 14 ++-- .../BlackDuckResponsesTransformer.java | 25 +++--- .../adapters/OffsetDateTimeTypeAdapter.java | 21 ++--- .../subclass/BlackDuckResponseResolver.java | 12 +-- .../BlackDuckResponseSubclassResolver.java | 2 +- .../NotificationUserViewSubclassResolver.java | 15 +--- .../NotificationViewSubclassResolver.java | 15 +--- .../subclass/SimpleNotificationView.java | 4 +- .../blackduck/keystore/KeyStoreHelper.java | 10 +-- .../phonehome/BlackDuckPhoneHomeHelper.java | 27 +++--- .../blackduck/service/BlackDuckApiClient.java | 39 +++++---- .../service/BlackDuckServicesFactory.java | 45 +++------- .../blackduck/service/DataService.java | 4 +- .../BlackDuckRegistrationService.java | 16 ++-- .../BlackDuckScanReadinessService.java | 8 +- .../dataservice/CodeLocationService.java | 34 ++++---- .../service/dataservice/ComponentService.java | 35 ++++---- .../dataservice/IacScanUploadService.java | 15 ++-- .../service/dataservice/IssueService.java | 22 ++--- .../service/dataservice/LicenseService.java | 34 ++++---- .../dataservice/NotificationService.java | 28 +++---- .../dataservice/PolicyRuleService.java | 32 ++++---- .../dataservice/ProjectBomService.java | 39 ++++----- .../dataservice/ProjectGetService.java | 20 ++--- .../dataservice/ProjectMappingService.java | 18 ++-- .../service/dataservice/ProjectService.java | 30 +++---- .../dataservice/ProjectUsersService.java | 36 ++++---- .../service/dataservice/RoleService.java | 14 ++-- .../service/dataservice/TagService.java | 20 ++--- .../service/dataservice/UserGroupService.java | 33 ++++---- .../service/dataservice/UserRoleService.java | 17 ++-- .../service/dataservice/UserService.java | 22 ++--- .../service/model/BlackDuckServerData.java | 4 +- .../ComponentVersionPolicyViolationCount.java | 11 ++- .../model/ComponentVersionStatusCount.java | 11 ++- .../ComponentVersionVulnerabilities.java | 6 +- .../service/model/MatchedFilesModel.java | 8 +- .../model/PolicyRuleExpressionSetBuilder.java | 34 ++++---- .../model/PolicyStatusDescription.java | 14 ++-- .../model/ProjectNameVersionGuesser.java | 4 +- .../service/model/ProjectSyncModel.java | 33 +++----- .../service/model/ProjectVersionWrapper.java | 4 +- .../service/model/RiskProfileCounts.java | 8 +- .../service/model/ScannerSplitStream.java | 7 +- .../model/VersionBomComponentModel.java | 20 ++--- .../service/request/AcceptHeaderEditor.java | 4 +- .../request/BlackDuckMultipleRequest.java | 4 +- .../service/request/BlackDuckRequest.java | 16 ++-- .../request/BlackDuckResponseRequest.java | 4 +- .../request/BlackDuckSingleRequest.java | 4 +- .../request/BlackDuckStringRequest.java | 4 +- .../service/request/NotificationEditor.java | 12 +-- .../service/request/PagingDefaultsEditor.java | 4 +- .../blackduck/useragent/BlackDuckCommon.java | 11 ++- .../blackduck/useragent/UserAgentBuilder.java | 4 +- .../blackduck/useragent/UserAgentItem.java | 6 +- .../blackduck/version/BlackDuckVersion.java | 2 +- .../riskreport/web/images/Synopsys_logo.png | Bin 16487 -> 0 bytes .../blackduck/TimingExtension.java | 7 +- .../enumeration/RankedSeverityTypeTest.java | 11 ++- .../Bdio2RetryAwareStreamUploaderTest.java | 18 ++-- .../blackduck/bdio2/Bdio2UploadJobTest.java | 30 +++---- .../bdio2/util/Bdio2ContentExtractorTest.java | 10 +-- .../bdio2/util/Bdio2FactoryTest.java | 24 +++--- .../codelocation/CodeLocationWaiterTest.java | 59 ++++++-------- .../CodeLocationsRetrieverTest.java | 44 ++++------ .../BinaryScanUploadServiceTestIT.java | 35 ++++---- .../CodeLocationWaitJobConditionTest.java | 58 ++++++------- .../ScanBatchBuilderTest.java | 21 ++--- .../signaturescanner/ScanBatchOutputTest.java | 26 ++---- .../signaturescanner/ScanPathsTest.java | 33 ++++---- .../ScannerZipInstallerTest.java | 31 ++++--- .../ScanCommandArgumentParserTest.java | 11 +-- .../command/ScanCommandQuoteParserTest.java | 5 +- .../command/ScanCommandTest.java | 47 +++++------ .../comprehensive/BlackDuckServices.java | 22 ++--- .../ComprehensiveCookbookTestIT.java | 63 ++++++-------- ...CreateProjectWithBdioAndVerifyBOMTest.java | 77 ++++++++---------- .../InstallAndRunSignatureScannerTestIT.java | 73 ++++++++--------- .../comprehensive/NotificationsTestIT.java | 38 ++++----- .../ProjectBomServiceTestIT.java | 51 ++++++------ .../ToolsApiScannerInstallerTestIT.java | 27 +++--- .../comprehensive/VerifyNotifications.java | 26 +++--- .../comprehensive/recipe/BasicRecipe.java | 38 ++++----- .../recipe/Bdio2UploadRecipeTest.java | 49 ++++++----- .../recipe/BdioUploadRecipeTest.java | 47 ++++++----- ...heckPolicyForProjectVersionRecipeTest.java | 33 ++++---- .../recipe/ComponentManagementRecipeTest.java | 25 +++--- .../CreateDetailedProjectRecipeTest.java | 21 +++-- .../IntelligentPersistenceRecipeTest.java | 47 +++++------ .../recipe/ProjectErrorsRecipeTest.java | 13 ++- .../BlackDuckServerConfigBuilderTest.java | 56 ++++++------- .../BlackDuckServerConfigBuilderTestIT.java | 26 +++--- .../http/BlackDuckRequestBuilderTest.java | 17 ++-- .../blackduck/http/BlackDuckUrlTest.java | 11 +-- .../client/BlackDuckHttpClientTestIT.java | 58 +++++++------ .../client/BlackDuckRedirectStrategyTest.java | 38 ++++----- .../http/client/CookieHeaderParserTest.java | 5 +- .../http/client/IntHttpClientTestHelper.java | 33 ++++---- .../http/client/MockWebServerUtil.java | 3 +- .../SignatureScannerClientProxyTest.java | 38 ++++----- .../client/SignatureScannerClientTest.java | 45 +++++----- .../client/cache/CachingHttpClientTestIT.java | 23 +++--- .../BlackDuckJsonTransformerTest.java | 42 +++++----- .../BlackDuckResponsesTransformerTest.java | 43 +++++----- .../BlackDuckResponsesTransformerTestIT.java | 17 ++-- .../ProjectViewWithoutDescription.java | 6 +- .../http/transform/SillyFruitResponse.java | 4 +- .../BlackDuckResponseResolverTest.java | 16 ++-- .../blackduck/license/LicenseTest.java | 29 +++---- .../service/BlackDuckApiClientTest.java | 43 +++++----- .../service/BlackDuckApiClientTestIT.java | 39 ++++----- ...kDuckRegistrationRequestServiceTestIT.java | 5 +- .../BlackDuckScanReadinessServiceTestIT.java | 9 +- .../CodeLocationServiceTestIT.java | 55 ++++++------- .../dataservice/ComponentServiceTestIT.java | 26 +++--- .../dataservice/IssueServiceTestIT.java | 45 +++++----- .../dataservice/LicenseDataServiceTestIT.java | 27 +++--- .../dataservice/PolicyRuleServiceTestIT.java | 31 ++++--- .../PolicyStatusDescriptionTest.java | 17 ++-- .../ProjectAssignmentServiceTestIT.java | 23 +++--- .../ProjectMappingServiceTest.java | 23 +++--- .../dataservice/ProjectServiceTest.java | 45 +++++----- .../dataservice/ProjectServiceTestIT.java | 50 +++++------- .../dataservice/UserServiceTestIT.java | 43 +++++----- .../VulnerabilityDataServiceTestIT.java | 29 +++---- .../service/model/ProjectSyncModelTest.java | 28 ++----- .../useragent/BlackDuckCommonTest.java | 8 +- .../util/ProjectNameVersionGuesserTest.java | 9 +- .../version/BlackDuckVersionTest.java | 6 +- ...ck_alert_6_1_0_SNAPSHOT_gradle_bom.jsonld} | 0 211 files changed, 1962 insertions(+), 2384 deletions(-) delete mode 100644 src/main/resources/riskreport/web/images/Synopsys_logo.png rename src/test/resources/bdio/alert/{blackduck_alert_6_1_0_SNAPSHOT_com_synopsys_integration_blackduck_alert_6_1_0_SNAPSHOT_gradle_bom.jsonld => blackduck_alert_6_1_0_SNAPSHOT_com_blackduck_integration_blackduck_alert_6_1_0_SNAPSHOT_gradle_bom.jsonld} (100%) diff --git a/build.gradle b/build.gradle index ab66dd9ff..dc74ad662 100644 --- a/build.gradle +++ b/build.gradle @@ -14,7 +14,7 @@ project.ext.moduleName = 'com.blackduck.integration.blackduck-common' project.ext.javaUseAutoModuleName = 'true' project.ext.junitShowStandardStreams = 'true' -version = '66.2.32-SNAPSHOT' +version = '67.0.0-SNAPSHOT' description = 'A library for using various capabilities of Black Duck, notably the REST API and signature scanning.' @@ -34,9 +34,9 @@ repositories { } dependencies { - api 'com.blackduck.integration:blackduck-common-api:2023.4.2.5' - api 'com.blackduck.integration:phone-home-client:6.0.1' - api 'com.blackduck.integration:integration-bdio:26.0.13' + api 'com.blackduck.integration:blackduck-common-api:2023.10.0.5' + api 'com.blackduck.integration:phone-home-client:7.0.0' + api 'com.blackduck.integration:integration-bdio:27.0.0' api 'com.blackducksoftware.bdio:bdio2:3.2.5' testImplementation 'com.google.guava:guava:31.1-jre' diff --git a/src/main/java/com/blackduck/integration/blackduck/api/enumeration/RankedSeverityType.java b/src/main/java/com/blackduck/integration/blackduck/api/enumeration/RankedSeverityType.java index eaccd899d..82517b2c4 100644 --- a/src/main/java/com/blackduck/integration/blackduck/api/enumeration/RankedSeverityType.java +++ b/src/main/java/com/blackduck/integration/blackduck/api/enumeration/RankedSeverityType.java @@ -7,12 +7,12 @@ */ package com.blackduck.integration.blackduck.api.enumeration; +import com.blackduck.integration.blackduck.api.generated.enumeration.PolicyRuleSeverityType; + import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; -import com.synopsys.integration.blackduck.api.generated.enumeration.PolicyRuleSeverityType; - public enum RankedSeverityType { UNSPECIFIED(PolicyRuleSeverityType.UNSPECIFIED), TRIVIAL(PolicyRuleSeverityType.TRIVIAL), diff --git a/src/main/java/com/blackduck/integration/blackduck/bdio2/Bdio2FileUploadService.java b/src/main/java/com/blackduck/integration/blackduck/bdio2/Bdio2FileUploadService.java index 26e5cfaa4..9f9804a32 100644 --- a/src/main/java/com/blackduck/integration/blackduck/bdio2/Bdio2FileUploadService.java +++ b/src/main/java/com/blackduck/integration/blackduck/bdio2/Bdio2FileUploadService.java @@ -7,12 +7,7 @@ */ package com.blackduck.integration.blackduck.bdio2; -import java.util.List; -import java.util.stream.Collectors; - -import org.jetbrains.annotations.Nullable; - -import com.synopsys.integration.blackduck.api.generated.discovery.ApiDiscovery; +import com.blackduck.integration.blackduck.api.generated.discovery.ApiDiscovery; import com.blackduck.integration.blackduck.bdio2.model.BdioFileContent; import com.blackduck.integration.blackduck.bdio2.util.Bdio2ContentExtractor; import com.blackduck.integration.blackduck.codelocation.upload.UploadTarget; @@ -21,13 +16,17 @@ import com.blackduck.integration.blackduck.service.DataService; import com.blackduck.integration.blackduck.service.request.BlackDuckRequestBuilderEditor; import com.blackduck.integration.blackduck.version.BlackDuckVersion; -import com.synopsys.integration.exception.IntegrationException; -import com.synopsys.integration.log.IntLogger; -import com.synopsys.integration.util.NameVersion; -import com.synopsys.integration.wait.ResilientJobConfig; -import com.synopsys.integration.wait.ResilientJobExecutor; -import com.synopsys.integration.wait.tracker.WaitIntervalTracker; -import com.synopsys.integration.wait.tracker.WaitIntervalTrackerFactory; +import com.blackduck.integration.exception.IntegrationException; +import com.blackduck.integration.log.IntLogger; +import com.blackduck.integration.util.NameVersion; +import com.blackduck.integration.wait.ResilientJobConfig; +import com.blackduck.integration.wait.ResilientJobExecutor; +import com.blackduck.integration.wait.tracker.WaitIntervalTracker; +import com.blackduck.integration.wait.tracker.WaitIntervalTrackerFactory; +import org.jetbrains.annotations.Nullable; + +import java.util.List; +import java.util.stream.Collectors; public class Bdio2FileUploadService extends DataService { private static final String FILE_NAME_BDIO_HEADER_JSONLD = "bdio-header.jsonld"; diff --git a/src/main/java/com/blackduck/integration/blackduck/bdio2/Bdio2RetryAwareStreamUploader.java b/src/main/java/com/blackduck/integration/blackduck/bdio2/Bdio2RetryAwareStreamUploader.java index a75e7f02b..95429ebdc 100644 --- a/src/main/java/com/blackduck/integration/blackduck/bdio2/Bdio2RetryAwareStreamUploader.java +++ b/src/main/java/com/blackduck/integration/blackduck/bdio2/Bdio2RetryAwareStreamUploader.java @@ -7,19 +7,18 @@ */ package com.blackduck.integration.blackduck.bdio2; -import java.util.Arrays; -import java.util.List; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.blackduck.integration.blackduck.bdio2.model.BdioFileContent; import com.blackduck.integration.blackduck.exception.BlackDuckIntegrationException; import com.blackduck.integration.blackduck.service.request.BlackDuckRequestBuilderEditor; -import com.synopsys.integration.exception.IntegrationException; -import com.synopsys.integration.rest.HttpUrl; -import com.synopsys.integration.rest.exception.IntegrationRestException; -import com.synopsys.integration.rest.response.Response; +import com.blackduck.integration.exception.IntegrationException; +import com.blackduck.integration.rest.HttpUrl; +import com.blackduck.integration.rest.exception.IntegrationRestException; +import com.blackduck.integration.rest.response.Response; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.util.Arrays; +import java.util.List; public class Bdio2RetryAwareStreamUploader { private static final List NON_RETRYABLE_EXIT_CODES = Arrays.asList(401, 402, 403, 404, 409); diff --git a/src/main/java/com/blackduck/integration/blackduck/bdio2/Bdio2StreamUploader.java b/src/main/java/com/blackduck/integration/blackduck/bdio2/Bdio2StreamUploader.java index e7c3a79aa..97e5bc4aa 100644 --- a/src/main/java/com/blackduck/integration/blackduck/bdio2/Bdio2StreamUploader.java +++ b/src/main/java/com/blackduck/integration/blackduck/bdio2/Bdio2StreamUploader.java @@ -7,23 +7,22 @@ */ package com.blackduck.integration.blackduck.bdio2; -import java.nio.charset.StandardCharsets; - +import com.blackduck.integration.blackduck.api.core.BlackDuckPath; +import com.blackduck.integration.blackduck.api.core.BlackDuckResponse; +import com.blackduck.integration.blackduck.api.generated.discovery.ApiDiscovery; +import com.blackduck.integration.blackduck.bdio2.model.BdioFileContent; import com.blackduck.integration.blackduck.http.BlackDuckRequestBuilder; import com.blackduck.integration.blackduck.service.BlackDuckApiClient; +import com.blackduck.integration.blackduck.service.request.BlackDuckRequestBuilderEditor; +import com.blackduck.integration.blackduck.service.request.BlackDuckResponseRequest; +import com.blackduck.integration.exception.IntegrationException; +import com.blackduck.integration.log.IntLogger; +import com.blackduck.integration.rest.HttpUrl; +import com.blackduck.integration.rest.response.Response; import org.apache.commons.lang3.StringUtils; import org.apache.http.entity.ContentType; -import com.synopsys.integration.blackduck.api.core.BlackDuckPath; -import com.synopsys.integration.blackduck.api.core.BlackDuckResponse; -import com.synopsys.integration.blackduck.api.generated.discovery.ApiDiscovery; -import com.blackduck.integration.blackduck.bdio2.model.BdioFileContent; -import com.blackduck.integration.blackduck.service.request.BlackDuckRequestBuilderEditor; -import com.blackduck.integration.blackduck.service.request.BlackDuckResponseRequest; -import com.synopsys.integration.exception.IntegrationException; -import com.synopsys.integration.log.IntLogger; -import com.synopsys.integration.rest.HttpUrl; -import com.synopsys.integration.rest.response.Response; +import java.nio.charset.StandardCharsets; public class Bdio2StreamUploader { // IDETECT-2756 diff --git a/src/main/java/com/blackduck/integration/blackduck/bdio2/Bdio2UploadJob.java b/src/main/java/com/blackduck/integration/blackduck/bdio2/Bdio2UploadJob.java index 71e5f6fa8..21619b300 100644 --- a/src/main/java/com/blackduck/integration/blackduck/bdio2/Bdio2UploadJob.java +++ b/src/main/java/com/blackduck/integration/blackduck/bdio2/Bdio2UploadJob.java @@ -7,18 +7,17 @@ */ package com.blackduck.integration.blackduck.bdio2; -import java.util.List; - +import com.blackduck.integration.blackduck.bdio2.model.BdioFileContent; +import com.blackduck.integration.blackduck.service.request.BlackDuckRequestBuilderEditor; +import com.blackduck.integration.exception.IntegrationException; +import com.blackduck.integration.exception.IntegrationTimeoutException; +import com.blackduck.integration.rest.HttpUrl; +import com.blackduck.integration.rest.response.Response; +import com.blackduck.integration.wait.ResilientJob; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.blackduck.integration.blackduck.bdio2.model.BdioFileContent; -import com.blackduck.integration.blackduck.service.request.BlackDuckRequestBuilderEditor; -import com.synopsys.integration.exception.IntegrationException; -import com.synopsys.integration.exception.IntegrationTimeoutException; -import com.synopsys.integration.rest.HttpUrl; -import com.synopsys.integration.rest.response.Response; -import com.synopsys.integration.wait.ResilientJob; +import java.util.List; public class Bdio2UploadJob implements ResilientJob { private final Logger logger = LoggerFactory.getLogger(this.getClass()); diff --git a/src/main/java/com/blackduck/integration/blackduck/bdio2/Bdio2UploadResult.java b/src/main/java/com/blackduck/integration/blackduck/bdio2/Bdio2UploadResult.java index 4c002832d..8e4847b18 100644 --- a/src/main/java/com/blackduck/integration/blackduck/bdio2/Bdio2UploadResult.java +++ b/src/main/java/com/blackduck/integration/blackduck/bdio2/Bdio2UploadResult.java @@ -7,7 +7,7 @@ */ package com.blackduck.integration.blackduck.bdio2; -import com.synopsys.integration.rest.HttpUrl; +import com.blackduck.integration.rest.HttpUrl; public class Bdio2UploadResult { private final HttpUrl uploadUrl; diff --git a/src/main/java/com/blackduck/integration/blackduck/bdio2/model/Bdio2Document.java b/src/main/java/com/blackduck/integration/blackduck/bdio2/model/Bdio2Document.java index 0a6c5e81c..d8f549f9b 100644 --- a/src/main/java/com/blackduck/integration/blackduck/bdio2/model/Bdio2Document.java +++ b/src/main/java/com/blackduck/integration/blackduck/bdio2/model/Bdio2Document.java @@ -7,12 +7,12 @@ */ package com.blackduck.integration.blackduck.bdio2.model; -import java.util.List; - import com.blackducksoftware.bdio2.BdioMetadata; import com.blackducksoftware.bdio2.model.Component; import com.blackducksoftware.bdio2.model.Project; +import java.util.List; + public class Bdio2Document { private final BdioMetadata bdioMetadata; private final Project project; diff --git a/src/main/java/com/blackduck/integration/blackduck/bdio2/model/BdioFileContent.java b/src/main/java/com/blackduck/integration/blackduck/bdio2/model/BdioFileContent.java index 8ba6910ad..98b0f3de9 100644 --- a/src/main/java/com/blackduck/integration/blackduck/bdio2/model/BdioFileContent.java +++ b/src/main/java/com/blackduck/integration/blackduck/bdio2/model/BdioFileContent.java @@ -7,7 +7,7 @@ */ package com.blackduck.integration.blackduck.bdio2.model; -import com.synopsys.integration.util.Stringable; +import com.blackduck.integration.util.Stringable; public class BdioFileContent extends Stringable { private final String fileName; diff --git a/src/main/java/com/blackduck/integration/blackduck/bdio2/model/GitInfo.java b/src/main/java/com/blackduck/integration/blackduck/bdio2/model/GitInfo.java index a5d2fa28d..24689e55a 100644 --- a/src/main/java/com/blackduck/integration/blackduck/bdio2/model/GitInfo.java +++ b/src/main/java/com/blackduck/integration/blackduck/bdio2/model/GitInfo.java @@ -7,10 +7,10 @@ */ package com.blackduck.integration.blackduck.bdio2.model; -import java.util.Optional; - import org.jetbrains.annotations.Nullable; +import java.util.Optional; + public class GitInfo { @Nullable private final String sourceRepository; diff --git a/src/main/java/com/blackduck/integration/blackduck/bdio2/model/ProjectInfo.java b/src/main/java/com/blackduck/integration/blackduck/bdio2/model/ProjectInfo.java index ea63fc1ac..13e3865c9 100644 --- a/src/main/java/com/blackduck/integration/blackduck/bdio2/model/ProjectInfo.java +++ b/src/main/java/com/blackduck/integration/blackduck/bdio2/model/ProjectInfo.java @@ -7,13 +7,12 @@ */ package com.blackduck.integration.blackduck.bdio2.model; -import java.util.Optional; - +import com.blackduck.integration.bdio.model.dependency.ProjectDependency; +import com.blackduck.integration.util.NameVersion; import org.apache.commons.lang3.StringUtils; import org.jetbrains.annotations.Nullable; -import com.synopsys.integration.bdio.model.dependency.ProjectDependency; -import com.synopsys.integration.util.NameVersion; +import java.util.Optional; // Additional fields for the bdio-header.jsonld file public class ProjectInfo { diff --git a/src/main/java/com/blackduck/integration/blackduck/bdio2/util/Bdio2ContentExtractor.java b/src/main/java/com/blackduck/integration/blackduck/bdio2/util/Bdio2ContentExtractor.java index a315166cf..b622b017f 100644 --- a/src/main/java/com/blackduck/integration/blackduck/bdio2/util/Bdio2ContentExtractor.java +++ b/src/main/java/com/blackduck/integration/blackduck/bdio2/util/Bdio2ContentExtractor.java @@ -7,11 +7,11 @@ */ package com.blackduck.integration.blackduck.bdio2.util; -import java.io.BufferedOutputStream; -import java.io.ByteArrayOutputStream; -import java.io.File; -import java.io.IOException; -import java.io.InputStream; +import com.blackduck.integration.blackduck.bdio2.model.BdioFileContent; +import com.blackduck.integration.exception.IntegrationException; +import org.apache.commons.io.FilenameUtils; + +import java.io.*; import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.Enumeration; @@ -19,11 +19,6 @@ import java.util.zip.ZipEntry; import java.util.zip.ZipFile; -import org.apache.commons.io.FilenameUtils; - -import com.blackduck.integration.blackduck.bdio2.model.BdioFileContent; -import com.synopsys.integration.exception.IntegrationException; - public class Bdio2ContentExtractor { public List extractContent(File bdio2File) throws IntegrationException { diff --git a/src/main/java/com/blackduck/integration/blackduck/bdio2/util/Bdio2Factory.java b/src/main/java/com/blackduck/integration/blackduck/bdio2/util/Bdio2Factory.java index 800fd0a1c..975f2f59c 100644 --- a/src/main/java/com/blackduck/integration/blackduck/bdio2/util/Bdio2Factory.java +++ b/src/main/java/com/blackduck/integration/blackduck/bdio2/util/Bdio2Factory.java @@ -7,22 +7,14 @@ */ package com.blackduck.integration.blackduck.bdio2.util; -import java.time.ZonedDateTime; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.stream.Collectors; -import java.util.stream.Stream; - -import org.apache.commons.lang3.tuple.Pair; -import org.jetbrains.annotations.Nullable; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - +import com.blackduck.integration.bdio.graph.DependencyGraph; +import com.blackduck.integration.bdio.graph.ProjectDependencyGraph; +import com.blackduck.integration.bdio.model.dependency.Dependency; +import com.blackduck.integration.bdio.model.dependency.ProjectDependency; +import com.blackduck.integration.bdio.model.externalid.ExternalId; +import com.blackduck.integration.blackduck.bdio2.model.Bdio2Document; +import com.blackduck.integration.blackduck.bdio2.model.ProjectInfo; +import com.blackduck.integration.util.NameVersion; import com.blackducksoftware.bdio2.BdioMetadata; import com.blackducksoftware.bdio2.BdioObject; import com.blackducksoftware.bdio2.LegacyUtilities; @@ -30,14 +22,15 @@ import com.blackducksoftware.bdio2.model.Project; import com.blackducksoftware.common.value.Product; import com.blackducksoftware.common.value.ProductList; -import com.synopsys.integration.bdio.graph.DependencyGraph; -import com.synopsys.integration.bdio.graph.ProjectDependencyGraph; -import com.synopsys.integration.bdio.model.dependency.Dependency; -import com.synopsys.integration.bdio.model.dependency.ProjectDependency; -import com.synopsys.integration.bdio.model.externalid.ExternalId; -import com.blackduck.integration.blackduck.bdio2.model.Bdio2Document; -import com.blackduck.integration.blackduck.bdio2.model.ProjectInfo; -import com.synopsys.integration.util.NameVersion; +import org.apache.commons.lang3.tuple.Pair; +import org.jetbrains.annotations.Nullable; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.time.ZonedDateTime; +import java.util.*; +import java.util.stream.Collectors; +import java.util.stream.Stream; public class Bdio2Factory { private final Logger logger = LoggerFactory.getLogger(getClass()); @@ -152,7 +145,7 @@ private Pair, List> createAndLinkComponentsFromGraph( // passing subProjectFunction: component::dependency on line 124 might look better (but be more nonsensical?) String subprojectExternalId = dependency.getExternalId().toString(); logger.warn( - "Sipping subproject {}. Failed to add the subproject to the graph because subprojects cannot be dependencies of components. Please contact Synopsys support.", + "Sipping subproject {}. Failed to add the subproject to the graph because subprojects cannot be dependencies of components. Please contact Black Duck support.", subprojectExternalId ); continue; diff --git a/src/main/java/com/blackduck/integration/blackduck/bdio2/util/Bdio2Writer.java b/src/main/java/com/blackduck/integration/blackduck/bdio2/util/Bdio2Writer.java index f896038ee..33af67d3f 100644 --- a/src/main/java/com/blackduck/integration/blackduck/bdio2/util/Bdio2Writer.java +++ b/src/main/java/com/blackduck/integration/blackduck/bdio2/util/Bdio2Writer.java @@ -7,15 +7,15 @@ */ package com.blackduck.integration.blackduck.bdio2.util; -import java.io.IOException; -import java.io.OutputStream; -import java.util.List; - +import com.blackduck.integration.blackduck.bdio2.model.Bdio2Document; import com.blackducksoftware.bdio2.BdioMetadata; import com.blackducksoftware.bdio2.BdioWriter; import com.blackducksoftware.bdio2.model.Component; import com.blackducksoftware.bdio2.model.Project; -import com.blackduck.integration.blackduck.bdio2.model.Bdio2Document; + +import java.io.IOException; +import java.io.OutputStream; +import java.util.List; public class Bdio2Writer { public BdioWriter createBdioWriter(OutputStream outputStream, BdioMetadata bdioMetadata) { diff --git a/src/main/java/com/blackduck/integration/blackduck/codelocation/CodeLocationBatchOutput.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/CodeLocationBatchOutput.java index 296bbdbbc..e3202487f 100644 --- a/src/main/java/com/blackduck/integration/blackduck/codelocation/CodeLocationBatchOutput.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/CodeLocationBatchOutput.java @@ -7,17 +7,11 @@ */ package com.blackduck.integration.blackduck.codelocation; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.Set; -import java.util.stream.Collectors; - +import com.blackduck.integration.util.NameVersion; import org.apache.commons.lang3.StringUtils; -import com.synopsys.integration.util.NameVersion; +import java.util.*; +import java.util.stream.Collectors; public abstract class CodeLocationBatchOutput implements Iterable { private final Map successfulCodeLocationNamesToExpectedNotificationCounts; diff --git a/src/main/java/com/blackduck/integration/blackduck/codelocation/CodeLocationCreationService.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/CodeLocationCreationService.java index d61bb808e..457f43d30 100644 --- a/src/main/java/com/blackduck/integration/blackduck/codelocation/CodeLocationCreationService.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/CodeLocationCreationService.java @@ -7,6 +7,18 @@ */ package com.blackduck.integration.blackduck.codelocation; +import com.blackduck.integration.blackduck.api.core.response.UrlSingleResponse; +import com.blackduck.integration.blackduck.api.generated.discovery.ApiDiscovery; +import com.blackduck.integration.blackduck.api.generated.view.UserView; +import com.blackduck.integration.blackduck.service.BlackDuckApiClient; +import com.blackduck.integration.blackduck.service.DataService; +import com.blackduck.integration.blackduck.service.dataservice.NotificationService; +import com.blackduck.integration.blackduck.service.dataservice.UserService; +import com.blackduck.integration.blackduck.service.model.NotificationTaskRange; +import com.blackduck.integration.exception.IntegrationException; +import com.blackduck.integration.log.IntLogger; +import com.blackduck.integration.util.NameVersion; + import java.time.Instant; import java.time.LocalDateTime; import java.time.ZoneOffset; @@ -14,18 +26,6 @@ import java.util.Optional; import java.util.Set; -import com.blackduck.integration.blackduck.service.BlackDuckApiClient; -import com.blackduck.integration.blackduck.service.DataService; -import com.blackduck.integration.blackduck.service.dataservice.NotificationService; -import com.blackduck.integration.blackduck.service.dataservice.UserService; -import com.blackduck.integration.blackduck.service.model.NotificationTaskRange; -import com.synopsys.integration.blackduck.api.core.response.UrlSingleResponse; -import com.synopsys.integration.blackduck.api.generated.discovery.ApiDiscovery; -import com.synopsys.integration.blackduck.api.generated.view.UserView; -import com.synopsys.integration.exception.IntegrationException; -import com.synopsys.integration.log.IntLogger; -import com.synopsys.integration.util.NameVersion; - public class CodeLocationCreationService extends DataService { public static final int DEFAULT_WAIT_INTERVAL_IN_SECONDS = 60; diff --git a/src/main/java/com/blackduck/integration/blackduck/codelocation/CodeLocationOutput.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/CodeLocationOutput.java index d67325d18..bd75c0d01 100644 --- a/src/main/java/com/blackduck/integration/blackduck/codelocation/CodeLocationOutput.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/CodeLocationOutput.java @@ -7,11 +7,10 @@ */ package com.blackduck.integration.blackduck.codelocation; -import java.util.Optional; - +import com.blackduck.integration.util.NameVersion; import org.jetbrains.annotations.Nullable; -import com.synopsys.integration.util.NameVersion; +import java.util.Optional; public abstract class CodeLocationOutput { private final Result result; diff --git a/src/main/java/com/blackduck/integration/blackduck/codelocation/CodeLocationWaitJob.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/CodeLocationWaitJob.java index 5e663353a..68aae371d 100644 --- a/src/main/java/com/blackduck/integration/blackduck/codelocation/CodeLocationWaitJob.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/CodeLocationWaitJob.java @@ -7,31 +7,25 @@ */ package com.blackduck.integration.blackduck.codelocation; -import java.util.Arrays; -import java.util.Date; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.Set; -import java.util.stream.Collectors; - +import com.blackduck.integration.blackduck.api.generated.view.ProjectVersionView; +import com.blackduck.integration.blackduck.api.generated.view.UserView; +import com.blackduck.integration.blackduck.api.manual.enumeration.NotificationType; +import com.blackduck.integration.blackduck.api.manual.view.NotificationUserView; +import com.blackduck.integration.blackduck.api.manual.view.VersionBomCodeLocationBomComputedNotificationUserView; import com.blackduck.integration.blackduck.service.BlackDuckApiClient; import com.blackduck.integration.blackduck.service.dataservice.NotificationService; import com.blackduck.integration.blackduck.service.dataservice.ProjectService; import com.blackduck.integration.blackduck.service.model.NotificationTaskRange; import com.blackduck.integration.blackduck.service.model.ProjectVersionWrapper; import com.blackduck.integration.blackduck.service.request.NotificationEditor; -import com.synopsys.integration.blackduck.api.generated.view.ProjectVersionView; -import com.synopsys.integration.blackduck.api.generated.view.UserView; -import com.synopsys.integration.blackduck.api.manual.enumeration.NotificationType; -import com.synopsys.integration.blackduck.api.manual.view.NotificationUserView; -import com.synopsys.integration.blackduck.api.manual.view.VersionBomCodeLocationBomComputedNotificationUserView; -import com.synopsys.integration.exception.IntegrationException; -import com.synopsys.integration.exception.IntegrationTimeoutException; -import com.synopsys.integration.log.IntLogger; -import com.synopsys.integration.util.NameVersion; -import com.synopsys.integration.wait.ResilientJob; +import com.blackduck.integration.exception.IntegrationException; +import com.blackduck.integration.exception.IntegrationTimeoutException; +import com.blackduck.integration.log.IntLogger; +import com.blackduck.integration.util.NameVersion; +import com.blackduck.integration.wait.ResilientJob; + +import java.util.*; +import java.util.stream.Collectors; public class CodeLocationWaitJob implements ResilientJob { private final IntLogger logger; diff --git a/src/main/java/com/blackduck/integration/blackduck/codelocation/CodeLocationWaitJobCondition.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/CodeLocationWaitJobCondition.java index ca7880b00..1343f3d7e 100644 --- a/src/main/java/com/blackduck/integration/blackduck/codelocation/CodeLocationWaitJobCondition.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/CodeLocationWaitJobCondition.java @@ -7,30 +7,24 @@ */ package com.blackduck.integration.blackduck.codelocation; -import java.util.Arrays; -import java.util.Date; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.Set; -import java.util.stream.Collectors; - +import com.blackduck.integration.blackduck.api.generated.view.ProjectVersionView; +import com.blackduck.integration.blackduck.api.generated.view.UserView; +import com.blackduck.integration.blackduck.api.manual.enumeration.NotificationType; +import com.blackduck.integration.blackduck.api.manual.view.NotificationUserView; +import com.blackduck.integration.blackduck.api.manual.view.VersionBomCodeLocationBomComputedNotificationUserView; import com.blackduck.integration.blackduck.service.BlackDuckApiClient; import com.blackduck.integration.blackduck.service.dataservice.NotificationService; import com.blackduck.integration.blackduck.service.dataservice.ProjectService; import com.blackduck.integration.blackduck.service.model.NotificationTaskRange; import com.blackduck.integration.blackduck.service.model.ProjectVersionWrapper; import com.blackduck.integration.blackduck.service.request.NotificationEditor; -import com.synopsys.integration.blackduck.api.generated.view.ProjectVersionView; -import com.synopsys.integration.blackduck.api.generated.view.UserView; -import com.synopsys.integration.blackduck.api.manual.enumeration.NotificationType; -import com.synopsys.integration.blackduck.api.manual.view.NotificationUserView; -import com.synopsys.integration.blackduck.api.manual.view.VersionBomCodeLocationBomComputedNotificationUserView; -import com.synopsys.integration.exception.IntegrationException; -import com.synopsys.integration.log.IntLogger; -import com.synopsys.integration.util.NameVersion; -import com.synopsys.integration.wait.WaitJobCondition; +import com.blackduck.integration.exception.IntegrationException; +import com.blackduck.integration.log.IntLogger; +import com.blackduck.integration.util.NameVersion; +import com.blackduck.integration.wait.WaitJobCondition; + +import java.util.*; +import java.util.stream.Collectors; public class CodeLocationWaitJobCondition implements WaitJobCondition { private final IntLogger logger; diff --git a/src/main/java/com/blackduck/integration/blackduck/codelocation/CodeLocationWaiter.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/CodeLocationWaiter.java index 236acfa1a..fd7d59c05 100644 --- a/src/main/java/com/blackduck/integration/blackduck/codelocation/CodeLocationWaiter.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/CodeLocationWaiter.java @@ -7,20 +7,20 @@ */ package com.blackduck.integration.blackduck.codelocation; -import java.util.Set; - +import com.blackduck.integration.blackduck.api.generated.view.UserView; import com.blackduck.integration.blackduck.service.BlackDuckApiClient; import com.blackduck.integration.blackduck.service.dataservice.NotificationService; import com.blackduck.integration.blackduck.service.dataservice.ProjectService; import com.blackduck.integration.blackduck.service.model.NotificationTaskRange; -import com.synopsys.integration.blackduck.api.generated.view.UserView; -import com.synopsys.integration.exception.IntegrationException; -import com.synopsys.integration.log.IntLogger; -import com.synopsys.integration.util.NameVersion; -import com.synopsys.integration.wait.ResilientJobConfig; -import com.synopsys.integration.wait.ResilientJobExecutor; -import com.synopsys.integration.wait.tracker.WaitIntervalTracker; -import com.synopsys.integration.wait.tracker.WaitIntervalTrackerFactory; +import com.blackduck.integration.exception.IntegrationException; +import com.blackduck.integration.log.IntLogger; +import com.blackduck.integration.util.NameVersion; +import com.blackduck.integration.wait.ResilientJobConfig; +import com.blackduck.integration.wait.ResilientJobExecutor; +import com.blackduck.integration.wait.tracker.WaitIntervalTracker; +import com.blackduck.integration.wait.tracker.WaitIntervalTrackerFactory; + +import java.util.Set; public class CodeLocationWaiter { private final IntLogger logger; diff --git a/src/main/java/com/blackduck/integration/blackduck/codelocation/CodeLocationsRetriever.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/CodeLocationsRetriever.java index e64cb9cbd..ac206dc4d 100644 --- a/src/main/java/com/blackduck/integration/blackduck/codelocation/CodeLocationsRetriever.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/CodeLocationsRetriever.java @@ -7,17 +7,17 @@ */ package com.blackduck.integration.blackduck.codelocation; +import com.blackduck.integration.blackduck.api.generated.view.CodeLocationView; +import com.blackduck.integration.blackduck.api.generated.view.ProjectVersionView; +import com.blackduck.integration.blackduck.service.BlackDuckApiClient; +import com.blackduck.integration.exception.IntegrationException; + import java.util.List; import java.util.Map; import java.util.Set; import java.util.function.BinaryOperator; import java.util.stream.Collectors; -import com.blackduck.integration.blackduck.service.BlackDuckApiClient; -import com.synopsys.integration.blackduck.api.generated.view.CodeLocationView; -import com.synopsys.integration.blackduck.api.generated.view.ProjectVersionView; -import com.synopsys.integration.exception.IntegrationException; - public class CodeLocationsRetriever { /* ejk - This is needed because codelocations are being created and retrieved diff --git a/src/main/java/com/blackduck/integration/blackduck/codelocation/bdio2legacy/Bdio2UploadCodeLocationCreationRequest.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/bdio2legacy/Bdio2UploadCodeLocationCreationRequest.java index 7527b10fb..8ed9fdc03 100644 --- a/src/main/java/com/blackduck/integration/blackduck/codelocation/bdio2legacy/Bdio2UploadCodeLocationCreationRequest.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/bdio2legacy/Bdio2UploadCodeLocationCreationRequest.java @@ -7,8 +7,8 @@ */ package com.blackduck.integration.blackduck.codelocation.bdio2legacy; -import com.blackduck.integration.blackduck.codelocation.upload.UploadBatch; import com.blackduck.integration.blackduck.codelocation.CodeLocationCreationRequest; +import com.blackduck.integration.blackduck.codelocation.upload.UploadBatch; import com.blackduck.integration.blackduck.codelocation.upload.UploadBatchOutput; import com.blackduck.integration.blackduck.exception.BlackDuckIntegrationException; diff --git a/src/main/java/com/blackduck/integration/blackduck/codelocation/bdio2legacy/Bdio2UploadService.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/bdio2legacy/Bdio2UploadService.java index 305d4f9f9..12cb9b653 100644 --- a/src/main/java/com/blackduck/integration/blackduck/codelocation/bdio2legacy/Bdio2UploadService.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/bdio2legacy/Bdio2UploadService.java @@ -7,20 +7,20 @@ */ package com.blackduck.integration.blackduck.codelocation.bdio2legacy; -import java.util.Set; - -import com.blackduck.integration.blackduck.codelocation.upload.UploadBatch; -import com.blackduck.integration.blackduck.service.BlackDuckApiClient; -import com.blackduck.integration.blackduck.service.DataService; -import com.synopsys.integration.blackduck.api.generated.discovery.ApiDiscovery; +import com.blackduck.integration.blackduck.api.generated.discovery.ApiDiscovery; import com.blackduck.integration.blackduck.codelocation.CodeLocationCreationData; import com.blackduck.integration.blackduck.codelocation.CodeLocationCreationRequest; import com.blackduck.integration.blackduck.codelocation.CodeLocationCreationService; +import com.blackduck.integration.blackduck.codelocation.upload.UploadBatch; import com.blackduck.integration.blackduck.codelocation.upload.UploadBatchOutput; +import com.blackduck.integration.blackduck.service.BlackDuckApiClient; +import com.blackduck.integration.blackduck.service.DataService; import com.blackduck.integration.blackduck.service.model.NotificationTaskRange; -import com.synopsys.integration.exception.IntegrationException; -import com.synopsys.integration.log.IntLogger; -import com.synopsys.integration.util.NameVersion; +import com.blackduck.integration.exception.IntegrationException; +import com.blackduck.integration.log.IntLogger; +import com.blackduck.integration.util.NameVersion; + +import java.util.Set; public class Bdio2UploadService extends DataService { private final UploadBdio2BatchRunner uploadBdio2BatchRunner; diff --git a/src/main/java/com/blackduck/integration/blackduck/codelocation/bdio2legacy/UploadBdio2BatchRunner.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/bdio2legacy/UploadBdio2BatchRunner.java index 89acf7121..07c22b90e 100644 --- a/src/main/java/com/blackduck/integration/blackduck/codelocation/bdio2legacy/UploadBdio2BatchRunner.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/bdio2legacy/UploadBdio2BatchRunner.java @@ -7,22 +7,22 @@ */ package com.blackduck.integration.blackduck.codelocation.bdio2legacy; -import java.util.ArrayList; -import java.util.List; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Future; -import java.util.stream.Collectors; - +import com.blackduck.integration.blackduck.api.generated.discovery.ApiDiscovery; import com.blackduck.integration.blackduck.bdio2.Bdio2StreamUploader; import com.blackduck.integration.blackduck.codelocation.upload.UploadBatch; -import com.blackduck.integration.blackduck.service.BlackDuckApiClient; -import com.synopsys.integration.blackduck.api.generated.discovery.ApiDiscovery; import com.blackduck.integration.blackduck.codelocation.upload.UploadBatchOutput; import com.blackduck.integration.blackduck.codelocation.upload.UploadOutput; import com.blackduck.integration.blackduck.codelocation.upload.UploadTarget; import com.blackduck.integration.blackduck.exception.BlackDuckIntegrationException; +import com.blackduck.integration.blackduck.service.BlackDuckApiClient; import com.blackduck.integration.blackduck.service.request.BlackDuckRequestBuilderEditor; -import com.synopsys.integration.log.IntLogger; +import com.blackduck.integration.log.IntLogger; + +import java.util.ArrayList; +import java.util.List; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Future; +import java.util.stream.Collectors; public class UploadBdio2BatchRunner { private final IntLogger logger; diff --git a/src/main/java/com/blackduck/integration/blackduck/codelocation/bdio2legacy/UploadBdio2Callable.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/bdio2legacy/UploadBdio2Callable.java index 29d43a2ba..3cba06e3f 100644 --- a/src/main/java/com/blackduck/integration/blackduck/codelocation/bdio2legacy/UploadBdio2Callable.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/bdio2legacy/UploadBdio2Callable.java @@ -7,24 +7,23 @@ */ package com.blackduck.integration.blackduck.codelocation.bdio2legacy; -import java.io.IOException; -import java.nio.charset.StandardCharsets; -import java.util.concurrent.Callable; - +import com.blackduck.integration.blackduck.api.generated.discovery.ApiDiscovery; +import com.blackduck.integration.blackduck.codelocation.upload.UploadOutput; +import com.blackduck.integration.blackduck.codelocation.upload.UploadTarget; import com.blackduck.integration.blackduck.http.BlackDuckRequestBuilder; import com.blackduck.integration.blackduck.service.BlackDuckApiClient; +import com.blackduck.integration.blackduck.service.request.BlackDuckRequestBuilderEditor; +import com.blackduck.integration.blackduck.service.request.BlackDuckResponseRequest; +import com.blackduck.integration.exception.IntegrationException; +import com.blackduck.integration.rest.HttpUrl; +import com.blackduck.integration.rest.response.Response; +import com.blackduck.integration.util.NameVersion; import org.apache.http.entity.ContentType; import org.jetbrains.annotations.Nullable; -import com.synopsys.integration.blackduck.api.generated.discovery.ApiDiscovery; -import com.blackduck.integration.blackduck.codelocation.upload.UploadOutput; -import com.blackduck.integration.blackduck.codelocation.upload.UploadTarget; -import com.blackduck.integration.blackduck.service.request.BlackDuckRequestBuilderEditor; -import com.blackduck.integration.blackduck.service.request.BlackDuckResponseRequest; -import com.synopsys.integration.exception.IntegrationException; -import com.synopsys.integration.rest.HttpUrl; -import com.synopsys.integration.rest.response.Response; -import com.synopsys.integration.util.NameVersion; +import java.io.IOException; +import java.nio.charset.StandardCharsets; +import java.util.concurrent.Callable; public class UploadBdio2Callable implements Callable { private final BlackDuckApiClient blackDuckApiClient; diff --git a/src/main/java/com/blackduck/integration/blackduck/codelocation/bdiolegacy/BdioUploadCodeLocationCreationRequest.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/bdiolegacy/BdioUploadCodeLocationCreationRequest.java index 2eec9184b..1f6774749 100644 --- a/src/main/java/com/blackduck/integration/blackduck/codelocation/bdiolegacy/BdioUploadCodeLocationCreationRequest.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/bdiolegacy/BdioUploadCodeLocationCreationRequest.java @@ -7,8 +7,8 @@ */ package com.blackduck.integration.blackduck.codelocation.bdiolegacy; -import com.blackduck.integration.blackduck.codelocation.upload.UploadBatch; import com.blackduck.integration.blackduck.codelocation.CodeLocationCreationRequest; +import com.blackduck.integration.blackduck.codelocation.upload.UploadBatch; import com.blackduck.integration.blackduck.codelocation.upload.UploadBatchOutput; import com.blackduck.integration.blackduck.exception.BlackDuckIntegrationException; diff --git a/src/main/java/com/blackduck/integration/blackduck/codelocation/bdiolegacy/BdioUploadService.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/bdiolegacy/BdioUploadService.java index f23d877f1..e9622b18e 100644 --- a/src/main/java/com/blackduck/integration/blackduck/codelocation/bdiolegacy/BdioUploadService.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/bdiolegacy/BdioUploadService.java @@ -7,20 +7,20 @@ */ package com.blackduck.integration.blackduck.codelocation.bdiolegacy; -import java.util.Set; - -import com.blackduck.integration.blackduck.service.BlackDuckApiClient; -import com.blackduck.integration.blackduck.service.DataService; -import com.synopsys.integration.blackduck.api.generated.discovery.ApiDiscovery; +import com.blackduck.integration.blackduck.api.generated.discovery.ApiDiscovery; import com.blackduck.integration.blackduck.codelocation.CodeLocationCreationData; import com.blackduck.integration.blackduck.codelocation.CodeLocationCreationService; import com.blackduck.integration.blackduck.codelocation.upload.UploadBatch; import com.blackduck.integration.blackduck.codelocation.upload.UploadBatchOutput; import com.blackduck.integration.blackduck.codelocation.upload.UploadTarget; +import com.blackduck.integration.blackduck.service.BlackDuckApiClient; +import com.blackduck.integration.blackduck.service.DataService; import com.blackduck.integration.blackduck.service.model.NotificationTaskRange; -import com.synopsys.integration.exception.IntegrationException; -import com.synopsys.integration.log.IntLogger; -import com.synopsys.integration.util.NameVersion; +import com.blackduck.integration.exception.IntegrationException; +import com.blackduck.integration.log.IntLogger; +import com.blackduck.integration.util.NameVersion; + +import java.util.Set; public class BdioUploadService extends DataService { private final UploadBatchRunner uploadBatchRunner; diff --git a/src/main/java/com/blackduck/integration/blackduck/codelocation/bdiolegacy/UploadBatchRunner.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/bdiolegacy/UploadBatchRunner.java index 3e6361bcf..681c224d8 100644 --- a/src/main/java/com/blackduck/integration/blackduck/codelocation/bdiolegacy/UploadBatchRunner.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/bdiolegacy/UploadBatchRunner.java @@ -7,20 +7,20 @@ */ package com.blackduck.integration.blackduck.codelocation.bdiolegacy; +import com.blackduck.integration.blackduck.api.generated.discovery.ApiDiscovery; +import com.blackduck.integration.blackduck.codelocation.upload.UploadBatch; +import com.blackduck.integration.blackduck.codelocation.upload.UploadBatchOutput; +import com.blackduck.integration.blackduck.codelocation.upload.UploadOutput; +import com.blackduck.integration.blackduck.exception.BlackDuckIntegrationException; +import com.blackduck.integration.blackduck.service.BlackDuckApiClient; +import com.blackduck.integration.log.IntLogger; + import java.util.ArrayList; import java.util.List; import java.util.concurrent.ExecutorService; import java.util.concurrent.Future; import java.util.stream.Collectors; -import com.blackduck.integration.blackduck.service.BlackDuckApiClient; -import com.synopsys.integration.blackduck.api.generated.discovery.ApiDiscovery; -import com.blackduck.integration.blackduck.codelocation.upload.UploadBatch; -import com.blackduck.integration.blackduck.codelocation.upload.UploadBatchOutput; -import com.blackduck.integration.blackduck.codelocation.upload.UploadOutput; -import com.blackduck.integration.blackduck.exception.BlackDuckIntegrationException; -import com.synopsys.integration.log.IntLogger; - public class UploadBatchRunner { private final IntLogger logger; private final BlackDuckApiClient blackDuckApiClient; diff --git a/src/main/java/com/blackduck/integration/blackduck/codelocation/bdiolegacy/UploadCallable.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/bdiolegacy/UploadCallable.java index a057254f5..d5f1eabce 100644 --- a/src/main/java/com/blackduck/integration/blackduck/codelocation/bdiolegacy/UploadCallable.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/bdiolegacy/UploadCallable.java @@ -7,24 +7,23 @@ */ package com.blackduck.integration.blackduck.codelocation.bdiolegacy; -import java.io.IOException; -import java.nio.charset.StandardCharsets; -import java.util.concurrent.Callable; - +import com.blackduck.integration.blackduck.api.core.response.UrlSingleResponse; +import com.blackduck.integration.blackduck.api.generated.discovery.ApiDiscovery; +import com.blackduck.integration.blackduck.api.manual.response.BlackDuckStringResponse; +import com.blackduck.integration.blackduck.codelocation.upload.UploadOutput; +import com.blackduck.integration.blackduck.codelocation.upload.UploadTarget; import com.blackduck.integration.blackduck.http.BlackDuckRequestBuilder; import com.blackduck.integration.blackduck.service.BlackDuckApiClient; +import com.blackduck.integration.blackduck.service.request.BlackDuckResponseRequest; +import com.blackduck.integration.rest.response.Response; +import com.blackduck.integration.util.NameVersion; import org.apache.commons.io.FileUtils; import org.apache.http.entity.ContentType; import org.jetbrains.annotations.Nullable; -import com.synopsys.integration.blackduck.api.core.response.UrlSingleResponse; -import com.synopsys.integration.blackduck.api.generated.discovery.ApiDiscovery; -import com.synopsys.integration.blackduck.api.manual.response.BlackDuckStringResponse; -import com.blackduck.integration.blackduck.codelocation.upload.UploadOutput; -import com.blackduck.integration.blackduck.codelocation.upload.UploadTarget; -import com.blackduck.integration.blackduck.service.request.BlackDuckResponseRequest; -import com.synopsys.integration.rest.response.Response; -import com.synopsys.integration.util.NameVersion; +import java.io.IOException; +import java.nio.charset.StandardCharsets; +import java.util.concurrent.Callable; public class UploadCallable implements Callable { private final BlackDuckApiClient blackDuckApiClient; diff --git a/src/main/java/com/blackduck/integration/blackduck/codelocation/binaryscanner/BinaryScan.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/binaryscanner/BinaryScan.java index 517e98dde..1acbe0890 100644 --- a/src/main/java/com/blackduck/integration/blackduck/codelocation/binaryscanner/BinaryScan.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/binaryscanner/BinaryScan.java @@ -7,9 +7,9 @@ */ package com.blackduck.integration.blackduck.codelocation.binaryscanner; -import java.io.File; +import com.blackduck.integration.util.NameVersion; -import com.synopsys.integration.util.NameVersion; +import java.io.File; public class BinaryScan { private final File binaryFile; diff --git a/src/main/java/com/blackduck/integration/blackduck/codelocation/binaryscanner/BinaryScanBatchOutput.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/binaryscanner/BinaryScanBatchOutput.java index b50055ec7..0cf1a0b0b 100644 --- a/src/main/java/com/blackduck/integration/blackduck/codelocation/binaryscanner/BinaryScanBatchOutput.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/binaryscanner/BinaryScanBatchOutput.java @@ -7,12 +7,12 @@ */ package com.blackduck.integration.blackduck.codelocation.binaryscanner; -import java.util.List; - import com.blackduck.integration.blackduck.codelocation.CodeLocationBatchOutput; import com.blackduck.integration.blackduck.codelocation.Result; import com.blackduck.integration.blackduck.exception.BlackDuckIntegrationException; -import com.synopsys.integration.log.IntLogger; +import com.blackduck.integration.log.IntLogger; + +import java.util.List; public class BinaryScanBatchOutput extends CodeLocationBatchOutput { public BinaryScanBatchOutput(List outputs) { diff --git a/src/main/java/com/blackduck/integration/blackduck/codelocation/binaryscanner/BinaryScanBatchRunner.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/binaryscanner/BinaryScanBatchRunner.java index 61d8304bb..69a233600 100644 --- a/src/main/java/com/blackduck/integration/blackduck/codelocation/binaryscanner/BinaryScanBatchRunner.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/binaryscanner/BinaryScanBatchRunner.java @@ -7,17 +7,17 @@ */ package com.blackduck.integration.blackduck.codelocation.binaryscanner; +import com.blackduck.integration.blackduck.api.generated.discovery.ApiDiscovery; +import com.blackduck.integration.blackduck.exception.BlackDuckIntegrationException; +import com.blackduck.integration.blackduck.service.BlackDuckApiClient; +import com.blackduck.integration.log.IntLogger; + import java.util.ArrayList; import java.util.List; import java.util.concurrent.ExecutorService; import java.util.concurrent.Future; import java.util.stream.Collectors; -import com.blackduck.integration.blackduck.service.BlackDuckApiClient; -import com.synopsys.integration.blackduck.api.generated.discovery.ApiDiscovery; -import com.blackduck.integration.blackduck.exception.BlackDuckIntegrationException; -import com.synopsys.integration.log.IntLogger; - public class BinaryScanBatchRunner { private final IntLogger logger; private final BlackDuckApiClient blackDuckApiClient; diff --git a/src/main/java/com/blackduck/integration/blackduck/codelocation/binaryscanner/BinaryScanCallable.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/binaryscanner/BinaryScanCallable.java index 8a752da56..645a45fc4 100644 --- a/src/main/java/com/blackduck/integration/blackduck/codelocation/binaryscanner/BinaryScanCallable.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/binaryscanner/BinaryScanCallable.java @@ -7,23 +7,23 @@ */ package com.blackduck.integration.blackduck.codelocation.binaryscanner; +import com.blackduck.integration.blackduck.api.core.response.UrlSingleResponse; +import com.blackduck.integration.blackduck.api.generated.discovery.ApiDiscovery; +import com.blackduck.integration.blackduck.api.manual.response.BlackDuckStringResponse; +import com.blackduck.integration.blackduck.http.BlackDuckRequestBuilder; +import com.blackduck.integration.blackduck.service.BlackDuckApiClient; +import com.blackduck.integration.blackduck.service.request.BlackDuckResponseRequest; +import com.blackduck.integration.exception.IntegrationException; +import com.blackduck.integration.rest.exception.IntegrationRestException; +import com.blackduck.integration.rest.response.Response; +import com.blackduck.integration.util.NameVersion; + import java.io.File; import java.io.IOException; import java.util.HashMap; import java.util.Map; import java.util.concurrent.Callable; -import com.blackduck.integration.blackduck.http.BlackDuckRequestBuilder; -import com.blackduck.integration.blackduck.service.BlackDuckApiClient; -import com.synopsys.integration.blackduck.api.core.response.UrlSingleResponse; -import com.synopsys.integration.blackduck.api.generated.discovery.ApiDiscovery; -import com.synopsys.integration.blackduck.api.manual.response.BlackDuckStringResponse; -import com.blackduck.integration.blackduck.service.request.BlackDuckResponseRequest; -import com.synopsys.integration.exception.IntegrationException; -import com.synopsys.integration.rest.exception.IntegrationRestException; -import com.synopsys.integration.rest.response.Response; -import com.synopsys.integration.util.NameVersion; - public class BinaryScanCallable implements Callable { private final BlackDuckApiClient blackDuckApiClient; private final ApiDiscovery apiDiscovery; diff --git a/src/main/java/com/blackduck/integration/blackduck/codelocation/binaryscanner/BinaryScanOutput.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/binaryscanner/BinaryScanOutput.java index b3bb53605..2e4afc492 100644 --- a/src/main/java/com/blackduck/integration/blackduck/codelocation/binaryscanner/BinaryScanOutput.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/binaryscanner/BinaryScanOutput.java @@ -7,14 +7,13 @@ */ package com.blackduck.integration.blackduck.codelocation.binaryscanner; -import org.jetbrains.annotations.Nullable; - import com.blackduck.integration.blackduck.codelocation.CodeLocationOutput; import com.blackduck.integration.blackduck.codelocation.Result; -import com.synopsys.integration.exception.IntegrationException; -import com.synopsys.integration.rest.exception.IntegrationRestException; -import com.synopsys.integration.rest.response.Response; -import com.synopsys.integration.util.NameVersion; +import com.blackduck.integration.exception.IntegrationException; +import com.blackduck.integration.rest.exception.IntegrationRestException; +import com.blackduck.integration.rest.response.Response; +import com.blackduck.integration.util.NameVersion; +import org.jetbrains.annotations.Nullable; public class BinaryScanOutput extends CodeLocationOutput { private final String response; diff --git a/src/main/java/com/blackduck/integration/blackduck/codelocation/binaryscanner/BinaryScanUploadService.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/binaryscanner/BinaryScanUploadService.java index 47a751cb7..0d39e7f55 100644 --- a/src/main/java/com/blackduck/integration/blackduck/codelocation/binaryscanner/BinaryScanUploadService.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/binaryscanner/BinaryScanUploadService.java @@ -7,17 +7,17 @@ */ package com.blackduck.integration.blackduck.codelocation.binaryscanner; -import java.util.Set; - -import com.blackduck.integration.blackduck.service.BlackDuckApiClient; -import com.blackduck.integration.blackduck.service.DataService; -import com.synopsys.integration.blackduck.api.generated.discovery.ApiDiscovery; +import com.blackduck.integration.blackduck.api.generated.discovery.ApiDiscovery; import com.blackduck.integration.blackduck.codelocation.CodeLocationCreationData; import com.blackduck.integration.blackduck.codelocation.CodeLocationCreationService; +import com.blackduck.integration.blackduck.service.BlackDuckApiClient; +import com.blackduck.integration.blackduck.service.DataService; import com.blackduck.integration.blackduck.service.model.NotificationTaskRange; -import com.synopsys.integration.exception.IntegrationException; -import com.synopsys.integration.log.IntLogger; -import com.synopsys.integration.util.NameVersion; +import com.blackduck.integration.exception.IntegrationException; +import com.blackduck.integration.log.IntLogger; +import com.blackduck.integration.util.NameVersion; + +import java.util.Set; public class BinaryScanUploadService extends DataService { private final BinaryScanBatchRunner binaryScanBatchRunner; diff --git a/src/main/java/com/blackduck/integration/blackduck/codelocation/intelligentpersistence/IntelligentPersistenceBatchRunner.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/intelligentpersistence/IntelligentPersistenceBatchRunner.java index 9e82496b6..607fd1953 100644 --- a/src/main/java/com/blackduck/integration/blackduck/codelocation/intelligentpersistence/IntelligentPersistenceBatchRunner.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/intelligentpersistence/IntelligentPersistenceBatchRunner.java @@ -7,18 +7,18 @@ */ package com.blackduck.integration.blackduck.codelocation.intelligentpersistence; -import java.util.ArrayList; -import java.util.List; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Future; -import java.util.stream.Collectors; - import com.blackduck.integration.blackduck.bdio2.Bdio2FileUploadService; import com.blackduck.integration.blackduck.codelocation.upload.UploadBatch; import com.blackduck.integration.blackduck.codelocation.upload.UploadBatchOutput; import com.blackduck.integration.blackduck.codelocation.upload.UploadOutput; import com.blackduck.integration.blackduck.exception.BlackDuckIntegrationException; -import com.synopsys.integration.log.IntLogger; +import com.blackduck.integration.log.IntLogger; + +import java.util.ArrayList; +import java.util.List; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Future; +import java.util.stream.Collectors; public class IntelligentPersistenceBatchRunner { private final IntLogger logger; diff --git a/src/main/java/com/blackduck/integration/blackduck/codelocation/intelligentpersistence/IntelligentPersistenceCallable.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/intelligentpersistence/IntelligentPersistenceCallable.java index f61d0a3a4..77ee763e2 100644 --- a/src/main/java/com/blackduck/integration/blackduck/codelocation/intelligentpersistence/IntelligentPersistenceCallable.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/intelligentpersistence/IntelligentPersistenceCallable.java @@ -7,15 +7,14 @@ */ package com.blackduck.integration.blackduck.codelocation.intelligentpersistence; -import java.util.concurrent.Callable; - import com.blackduck.integration.blackduck.bdio2.Bdio2FileUploadService; import com.blackduck.integration.blackduck.bdio2.Bdio2UploadResult; -import org.jetbrains.annotations.Nullable; - import com.blackduck.integration.blackduck.codelocation.upload.UploadOutput; import com.blackduck.integration.blackduck.codelocation.upload.UploadTarget; -import com.synopsys.integration.util.NameVersion; +import com.blackduck.integration.util.NameVersion; +import org.jetbrains.annotations.Nullable; + +import java.util.concurrent.Callable; public class IntelligentPersistenceCallable implements Callable { private final Bdio2FileUploadService bdio2FileUploadService; diff --git a/src/main/java/com/blackduck/integration/blackduck/codelocation/intelligentpersistence/IntelligentPersistenceService.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/intelligentpersistence/IntelligentPersistenceService.java index 513dc7ca8..fa38a9913 100644 --- a/src/main/java/com/blackduck/integration/blackduck/codelocation/intelligentpersistence/IntelligentPersistenceService.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/intelligentpersistence/IntelligentPersistenceService.java @@ -7,20 +7,20 @@ */ package com.blackduck.integration.blackduck.codelocation.intelligentpersistence; -import java.util.Set; - -import com.blackduck.integration.blackduck.service.BlackDuckApiClient; -import com.blackduck.integration.blackduck.service.DataService; -import com.synopsys.integration.blackduck.api.generated.discovery.ApiDiscovery; +import com.blackduck.integration.blackduck.api.generated.discovery.ApiDiscovery; import com.blackduck.integration.blackduck.codelocation.CodeLocationCreationData; import com.blackduck.integration.blackduck.codelocation.CodeLocationCreationRequest; import com.blackduck.integration.blackduck.codelocation.CodeLocationCreationService; import com.blackduck.integration.blackduck.codelocation.upload.UploadBatch; import com.blackduck.integration.blackduck.codelocation.upload.UploadBatchOutput; +import com.blackduck.integration.blackduck.service.BlackDuckApiClient; +import com.blackduck.integration.blackduck.service.DataService; import com.blackduck.integration.blackduck.service.model.NotificationTaskRange; -import com.synopsys.integration.exception.IntegrationException; -import com.synopsys.integration.log.IntLogger; -import com.synopsys.integration.util.NameVersion; +import com.blackduck.integration.exception.IntegrationException; +import com.blackduck.integration.log.IntLogger; +import com.blackduck.integration.util.NameVersion; + +import java.util.Set; public class IntelligentPersistenceService extends DataService { public static final String CONTENT_TYPE = "application/vnd.blackducksoftware.intelligent-persistence-scan-1-ld-2+json"; diff --git a/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/ScanBatch.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/ScanBatch.java index 23ba0df43..29e16fe2f 100644 --- a/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/ScanBatch.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/ScanBatch.java @@ -7,28 +7,21 @@ */ package com.blackduck.integration.blackduck.codelocation.signaturescanner; +import com.blackduck.integration.blackduck.codelocation.signaturescanner.command.*; +import com.blackduck.integration.blackduck.exception.BlackDuckIntegrationException; +import com.blackduck.integration.builder.Buildable; +import com.blackduck.integration.rest.HttpUrl; +import com.blackduck.integration.rest.proxy.ProxyInfo; +import com.blackduck.integration.util.IntEnvironmentVariables; +import com.blackduck.integration.util.Stringable; +import org.apache.commons.lang3.StringUtils; +import org.jetbrains.annotations.Nullable; + import java.io.File; import java.net.URL; import java.util.ArrayList; import java.util.List; -import org.apache.commons.lang3.StringUtils; -import org.jetbrains.annotations.Nullable; - -import com.blackduck.integration.blackduck.codelocation.signaturescanner.command.BlackDuckOnlineProperties; -import com.blackduck.integration.blackduck.codelocation.signaturescanner.command.IndividualFileMatching; -import com.blackduck.integration.blackduck.codelocation.signaturescanner.command.ReducedPersistence; -import com.blackduck.integration.blackduck.codelocation.signaturescanner.command.ScanCommand; -import com.blackduck.integration.blackduck.codelocation.signaturescanner.command.ScanPathsUtility; -import com.blackduck.integration.blackduck.codelocation.signaturescanner.command.ScanTarget; -import com.blackduck.integration.blackduck.codelocation.signaturescanner.command.SnippetMatching; -import com.blackduck.integration.blackduck.exception.BlackDuckIntegrationException; -import com.synopsys.integration.builder.Buildable; -import com.synopsys.integration.rest.HttpUrl; -import com.synopsys.integration.rest.proxy.ProxyInfo; -import com.synopsys.integration.util.IntEnvironmentVariables; -import com.synopsys.integration.util.Stringable; - public class ScanBatch extends Stringable implements Buildable { public static ScanBatchBuilder newBuilder() { return new ScanBatchBuilder(); diff --git a/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/ScanBatchBuilder.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/ScanBatchBuilder.java index b4ba6195f..1d0132825 100644 --- a/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/ScanBatchBuilder.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/ScanBatchBuilder.java @@ -7,25 +7,20 @@ */ package com.blackduck.integration.blackduck.codelocation.signaturescanner; +import com.blackduck.integration.blackduck.codelocation.signaturescanner.command.*; +import com.blackduck.integration.blackduck.configuration.BlackDuckServerConfig; +import com.blackduck.integration.builder.BuilderStatus; +import com.blackduck.integration.builder.IntegrationBuilder; +import com.blackduck.integration.rest.HttpUrl; +import com.blackduck.integration.rest.proxy.ProxyInfo; +import org.apache.commons.lang3.StringUtils; +import org.jetbrains.annotations.Nullable; + import java.io.File; import java.io.IOException; import java.util.ArrayList; import java.util.List; -import org.apache.commons.lang3.StringUtils; -import org.jetbrains.annotations.Nullable; - -import com.blackduck.integration.blackduck.codelocation.signaturescanner.command.BlackDuckOnlineProperties; -import com.blackduck.integration.blackduck.codelocation.signaturescanner.command.IndividualFileMatching; -import com.blackduck.integration.blackduck.codelocation.signaturescanner.command.ReducedPersistence; -import com.blackduck.integration.blackduck.codelocation.signaturescanner.command.ScanTarget; -import com.blackduck.integration.blackduck.codelocation.signaturescanner.command.SnippetMatching; -import com.blackduck.integration.blackduck.configuration.BlackDuckServerConfig; -import com.synopsys.integration.builder.BuilderStatus; -import com.synopsys.integration.builder.IntegrationBuilder; -import com.synopsys.integration.rest.HttpUrl; -import com.synopsys.integration.rest.proxy.ProxyInfo; - public class ScanBatchBuilder extends IntegrationBuilder { public static final int DEFAULT_MEMORY_IN_MEGABYTES = 4096; public static final int MINIMUM_MEMORY_IN_MEGABYTES = 256; diff --git a/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/ScanBatchOutput.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/ScanBatchOutput.java index 0f10ec1d6..4fd203ee2 100644 --- a/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/ScanBatchOutput.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/ScanBatchOutput.java @@ -7,10 +7,10 @@ */ package com.blackduck.integration.blackduck.codelocation.signaturescanner; -import java.util.List; - -import com.blackduck.integration.blackduck.codelocation.signaturescanner.command.ScanCommandOutput; import com.blackduck.integration.blackduck.codelocation.CodeLocationBatchOutput; +import com.blackduck.integration.blackduck.codelocation.signaturescanner.command.ScanCommandOutput; + +import java.util.List; public class ScanBatchOutput extends CodeLocationBatchOutput { public ScanBatchOutput(final List scanCommandOutputs) { diff --git a/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/ScanBatchRunner.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/ScanBatchRunner.java index 541e97fd5..7752051cf 100644 --- a/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/ScanBatchRunner.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/ScanBatchRunner.java @@ -7,21 +7,20 @@ */ package com.blackduck.integration.blackduck.codelocation.signaturescanner; -import java.io.File; -import java.util.List; -import java.util.concurrent.ExecutorService; - import com.blackduck.integration.blackduck.codelocation.signaturescanner.command.*; -import com.blackduck.integration.blackduck.codelocation.signaturescanner.command.ZipApiScannerInstaller; import com.blackduck.integration.blackduck.exception.BlackDuckIntegrationException; import com.blackduck.integration.blackduck.http.client.BlackDuckHttpClient; import com.blackduck.integration.blackduck.http.client.SignatureScannerClient; import com.blackduck.integration.blackduck.keystore.KeyStoreHelper; import com.blackduck.integration.blackduck.service.dataservice.BlackDuckRegistrationService; -import com.synopsys.integration.log.IntLogger; -import com.synopsys.integration.util.CleanupZipExpander; -import com.synopsys.integration.util.IntEnvironmentVariables; -import com.synopsys.integration.util.OperatingSystemType; +import com.blackduck.integration.log.IntLogger; +import com.blackduck.integration.util.CleanupZipExpander; +import com.blackduck.integration.util.IntEnvironmentVariables; +import com.blackduck.integration.util.OperatingSystemType; + +import java.io.File; +import java.util.List; +import java.util.concurrent.ExecutorService; public class ScanBatchRunner { private final IntEnvironmentVariables intEnvironmentVariables; diff --git a/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/SignatureScannerService.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/SignatureScannerService.java index c56b61736..11fed48fe 100644 --- a/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/SignatureScannerService.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/SignatureScannerService.java @@ -7,18 +7,18 @@ */ package com.blackduck.integration.blackduck.codelocation.signaturescanner; -import java.util.Set; - -import com.blackduck.integration.blackduck.service.BlackDuckApiClient; -import com.blackduck.integration.blackduck.service.DataService; -import com.synopsys.integration.blackduck.api.generated.discovery.ApiDiscovery; +import com.blackduck.integration.blackduck.api.generated.discovery.ApiDiscovery; import com.blackduck.integration.blackduck.codelocation.CodeLocationCreationData; import com.blackduck.integration.blackduck.codelocation.CodeLocationCreationService; import com.blackduck.integration.blackduck.codelocation.CodeLocationWaitResult; +import com.blackduck.integration.blackduck.service.BlackDuckApiClient; +import com.blackduck.integration.blackduck.service.DataService; import com.blackduck.integration.blackduck.service.model.NotificationTaskRange; -import com.synopsys.integration.exception.IntegrationException; -import com.synopsys.integration.log.IntLogger; -import com.synopsys.integration.util.NameVersion; +import com.blackduck.integration.exception.IntegrationException; +import com.blackduck.integration.log.IntLogger; +import com.blackduck.integration.util.NameVersion; + +import java.util.Set; public class SignatureScannerService extends DataService { private final ScanBatchRunner scanBatchRunner; diff --git a/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ApiScannerInstaller.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ApiScannerInstaller.java index 28bf012af..8c419c148 100644 --- a/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ApiScannerInstaller.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ApiScannerInstaller.java @@ -8,8 +8,8 @@ package com.blackduck.integration.blackduck.codelocation.signaturescanner.command; import com.blackduck.integration.blackduck.exception.BlackDuckIntegrationException; -import com.synopsys.integration.exception.IntegrationException; -import com.synopsys.integration.rest.HttpUrl; +import com.blackduck.integration.exception.IntegrationException; +import com.blackduck.integration.rest.HttpUrl; import org.apache.commons.compress.archivers.ArchiveException; import java.io.File; diff --git a/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ExistingScannerInstaller.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ExistingScannerInstaller.java index ba5c7a2bc..27d6380ff 100644 --- a/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ExistingScannerInstaller.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ExistingScannerInstaller.java @@ -7,10 +7,10 @@ */ package com.blackduck.integration.blackduck.codelocation.signaturescanner.command; -import java.io.File; - import com.blackduck.integration.blackduck.exception.BlackDuckIntegrationException; +import java.io.File; + public class ExistingScannerInstaller implements ScannerInstaller { private final File existingInstallDirectory; diff --git a/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ScanCommand.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ScanCommand.java index adc19bdc3..d0c4701c4 100644 --- a/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ScanCommand.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ScanCommand.java @@ -7,20 +7,14 @@ */ package com.blackduck.integration.blackduck.codelocation.signaturescanner.command; -import java.io.File; -import java.util.ArrayList; -import java.util.List; -import java.util.Set; -import java.util.HashSet; -import java.util.Map; -import java.util.HashMap; - +import com.blackduck.integration.exception.IntegrationException; +import com.blackduck.integration.log.IntLogger; +import com.blackduck.integration.rest.proxy.ProxyInfo; import org.apache.commons.lang3.StringUtils; import org.jetbrains.annotations.Nullable; -import com.synopsys.integration.exception.IntegrationException; -import com.synopsys.integration.log.IntLogger; -import com.synopsys.integration.rest.proxy.ProxyInfo; +import java.io.File; +import java.util.*; public class ScanCommand { diff --git a/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ScanCommandArgumentParser.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ScanCommandArgumentParser.java index 5136af4c3..3eee7c5fd 100644 --- a/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ScanCommandArgumentParser.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ScanCommandArgumentParser.java @@ -7,13 +7,12 @@ */ package com.blackduck.integration.blackduck.codelocation.signaturescanner.command; -import java.util.LinkedList; -import java.util.List; - -import org.apache.commons.lang3.StringUtils; - import com.blackduck.integration.blackduck.exception.MismatchedQuotesException; import com.blackduck.integration.blackduck.exception.SignatureScannerInputException; +import org.apache.commons.lang3.StringUtils; + +import java.util.LinkedList; +import java.util.List; public class ScanCommandArgumentParser { public List parse(String command) throws SignatureScannerInputException { diff --git a/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ScanCommandCallable.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ScanCommandCallable.java index f0f631b0d..9568ac7a7 100644 --- a/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ScanCommandCallable.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ScanCommandCallable.java @@ -7,6 +7,15 @@ */ package com.blackduck.integration.blackduck.codelocation.signaturescanner.command; +import com.blackduck.integration.blackduck.service.model.ScannerSplitStream; +import com.blackduck.integration.blackduck.service.model.StreamRedirectThread; +import com.blackduck.integration.log.IntLogger; +import com.blackduck.integration.util.IntEnvironmentVariables; +import com.blackduck.integration.util.NameVersion; +import org.apache.commons.io.FileUtils; +import org.apache.commons.io.IOUtils; +import org.apache.commons.lang3.StringUtils; + import java.io.File; import java.io.FileOutputStream; import java.io.IOException; @@ -16,16 +25,6 @@ import java.util.List; import java.util.concurrent.Callable; -import org.apache.commons.io.FileUtils; -import org.apache.commons.io.IOUtils; -import org.apache.commons.lang3.StringUtils; - -import com.blackduck.integration.blackduck.service.model.ScannerSplitStream; -import com.blackduck.integration.blackduck.service.model.StreamRedirectThread; -import com.synopsys.integration.log.IntLogger; -import com.synopsys.integration.util.IntEnvironmentVariables; -import com.synopsys.integration.util.NameVersion; - public class ScanCommandCallable implements Callable { private static final List DRY_RUN_FILES_TO_KEEP = Arrays.asList("data"); diff --git a/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ScanCommandOutput.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ScanCommandOutput.java index 76313d447..3bbaccc44 100644 --- a/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ScanCommandOutput.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ScanCommandOutput.java @@ -7,15 +7,14 @@ */ package com.blackduck.integration.blackduck.codelocation.signaturescanner.command; -import java.io.File; -import java.util.Optional; - -import org.apache.commons.io.FilenameUtils; - import com.blackduck.integration.blackduck.codelocation.CodeLocationOutput; import com.blackduck.integration.blackduck.codelocation.Result; -import com.synopsys.integration.log.IntLogger; -import com.synopsys.integration.util.NameVersion; +import com.blackduck.integration.log.IntLogger; +import com.blackduck.integration.util.NameVersion; +import org.apache.commons.io.FilenameUtils; + +import java.io.File; +import java.util.Optional; public class ScanCommandOutput extends CodeLocationOutput { public static final String DRY_RUN_RESULT_DIRECTORY = "data"; diff --git a/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ScanCommandRunner.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ScanCommandRunner.java index 79290d8a4..cd67b2b6d 100644 --- a/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ScanCommandRunner.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ScanCommandRunner.java @@ -7,16 +7,16 @@ */ package com.blackduck.integration.blackduck.codelocation.signaturescanner.command; +import com.blackduck.integration.blackduck.exception.ScanFailedException; +import com.blackduck.integration.log.IntLogger; +import com.blackduck.integration.util.IntEnvironmentVariables; + import java.util.ArrayList; import java.util.List; import java.util.concurrent.ExecutorService; import java.util.concurrent.Future; import java.util.stream.Collectors; -import com.blackduck.integration.blackduck.exception.ScanFailedException; -import com.synopsys.integration.log.IntLogger; -import com.synopsys.integration.util.IntEnvironmentVariables; - public class ScanCommandRunner { private final IntLogger logger; private final IntEnvironmentVariables intEnvironmentVariables; diff --git a/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ScanPathsUtility.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ScanPathsUtility.java index 6702c2cc6..8faa2b53d 100644 --- a/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ScanPathsUtility.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ScanPathsUtility.java @@ -7,6 +7,14 @@ */ package com.blackduck.integration.blackduck.codelocation.signaturescanner.command; +import com.blackduck.integration.blackduck.exception.BlackDuckIntegrationException; +import com.blackduck.integration.function.ThrowingSupplier; +import com.blackduck.integration.log.IntLogger; +import com.blackduck.integration.util.IntEnvironmentVariables; +import com.blackduck.integration.util.OperatingSystemType; +import org.apache.commons.lang3.StringUtils; +import org.jetbrains.annotations.NotNull; + import java.io.File; import java.io.FileFilter; import java.io.IOException; @@ -18,15 +26,6 @@ import java.util.List; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.commons.lang3.StringUtils; -import org.jetbrains.annotations.NotNull; - -import com.blackduck.integration.blackduck.exception.BlackDuckIntegrationException; -import com.synopsys.integration.function.ThrowingSupplier; -import com.synopsys.integration.log.IntLogger; -import com.synopsys.integration.util.IntEnvironmentVariables; -import com.synopsys.integration.util.OperatingSystemType; - public class ScanPathsUtility { public static final String STANDARD_OUT_FILENAME = "CLI_Output.txt"; diff --git a/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ScanTarget.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ScanTarget.java index 866166a3d..fcb02d6fc 100644 --- a/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ScanTarget.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ScanTarget.java @@ -7,16 +7,15 @@ */ package com.blackduck.integration.blackduck.codelocation.signaturescanner.command; +import com.blackduck.integration.blackduck.exception.BlackDuckIntegrationException; +import org.apache.commons.lang3.StringUtils; + import java.io.File; import java.util.Collections; import java.util.Optional; import java.util.Set; import java.util.stream.Collectors; -import org.apache.commons.lang3.StringUtils; - -import com.blackduck.integration.blackduck.exception.BlackDuckIntegrationException; - public class ScanTarget { private final String path; private final Set exclusionPatterns; diff --git a/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ScannerInstaller.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ScannerInstaller.java index c24fbdf1a..424e4bcb8 100644 --- a/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ScannerInstaller.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ScannerInstaller.java @@ -7,10 +7,10 @@ */ package com.blackduck.integration.blackduck.codelocation.signaturescanner.command; -import java.io.File; - import com.blackduck.integration.blackduck.exception.BlackDuckIntegrationException; +import java.io.File; + public interface ScannerInstaller { File installOrUpdateScanner() throws BlackDuckIntegrationException; diff --git a/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ToolsApiScannerInstaller.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ToolsApiScannerInstaller.java index 2c99457f8..c1f89e958 100644 --- a/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ToolsApiScannerInstaller.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ToolsApiScannerInstaller.java @@ -7,32 +7,30 @@ */ package com.blackduck.integration.blackduck.codelocation.signaturescanner.command; -import java.io.File; -import java.io.IOException; -import java.io.InputStream; -import java.nio.charset.Charset; -import java.security.cert.Certificate; - +import com.blackduck.integration.blackduck.api.core.BlackDuckResponse; +import com.blackduck.integration.blackduck.api.core.response.UrlSingleResponse; +import com.blackduck.integration.blackduck.exception.BlackDuckIntegrationException; import com.blackduck.integration.blackduck.http.BlackDuckRequestBuilder; -import com.synopsys.integration.blackduck.api.core.BlackDuckResponse; -import com.synopsys.integration.blackduck.api.core.response.UrlSingleResponse; import com.blackduck.integration.blackduck.http.client.BlackDuckHttpClient; import com.blackduck.integration.blackduck.keystore.KeyStoreHelper; import com.blackduck.integration.blackduck.service.request.BlackDuckRequest; import com.blackduck.integration.blackduck.version.BlackDuckVersion; +import com.blackduck.integration.exception.IntegrationException; +import com.blackduck.integration.log.IntLogger; +import com.blackduck.integration.rest.HttpUrl; +import com.blackduck.integration.rest.response.Response; +import com.blackduck.integration.util.CleanupZipExpander; +import com.blackduck.integration.util.OperatingSystemType; import org.apache.commons.compress.archivers.ArchiveException; import org.apache.commons.io.FileUtils; -import com.blackduck.integration.blackduck.exception.BlackDuckIntegrationException; -import com.synopsys.integration.exception.IntegrationException; -import com.synopsys.integration.log.IntLogger; -import com.synopsys.integration.rest.HttpUrl; -import com.synopsys.integration.rest.response.Response; -import com.synopsys.integration.util.CleanupZipExpander; -import com.synopsys.integration.util.OperatingSystemType; - import javax.net.ssl.HttpsURLConnection; import javax.net.ssl.SSLHandshakeException; +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.nio.charset.Charset; +import java.security.cert.Certificate; public class ToolsApiScannerInstaller extends ApiScannerInstaller { // The tools API for downloading the scan-cli is called on by Detect for BD versions 2024.7.0 or newer diff --git a/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ZipApiScannerInstaller.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ZipApiScannerInstaller.java index 42d7d3637..b7dc5a650 100644 --- a/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ZipApiScannerInstaller.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ZipApiScannerInstaller.java @@ -7,28 +7,27 @@ */ package com.blackduck.integration.blackduck.codelocation.signaturescanner.command; +import com.blackduck.integration.blackduck.exception.BlackDuckIntegrationException; +import com.blackduck.integration.blackduck.http.client.SignatureScannerClient; +import com.blackduck.integration.blackduck.keystore.KeyStoreHelper; +import com.blackduck.integration.blackduck.service.dataservice.BlackDuckRegistrationService; +import com.blackduck.integration.exception.IntegrationException; +import com.blackduck.integration.log.IntLogger; +import com.blackduck.integration.rest.HttpUrl; +import com.blackduck.integration.rest.request.Request; +import com.blackduck.integration.rest.response.Response; +import com.blackduck.integration.util.CleanupZipExpander; +import com.blackduck.integration.util.OperatingSystemType; +import org.apache.commons.compress.archivers.ArchiveException; +import org.apache.commons.io.FileUtils; +import org.apache.commons.lang3.StringUtils; + import java.io.File; import java.io.IOException; import java.io.InputStream; import java.nio.charset.Charset; import java.security.cert.Certificate; -import org.apache.commons.compress.archivers.ArchiveException; -import org.apache.commons.io.FileUtils; -import org.apache.commons.lang3.StringUtils; - -import com.blackduck.integration.blackduck.exception.BlackDuckIntegrationException; -import com.blackduck.integration.blackduck.http.client.SignatureScannerClient; -import com.blackduck.integration.blackduck.keystore.KeyStoreHelper; -import com.blackduck.integration.blackduck.service.dataservice.BlackDuckRegistrationService; -import com.synopsys.integration.exception.IntegrationException; -import com.synopsys.integration.log.IntLogger; -import com.synopsys.integration.rest.HttpUrl; -import com.synopsys.integration.rest.request.Request; -import com.synopsys.integration.rest.response.Response; -import com.synopsys.integration.util.CleanupZipExpander; -import com.synopsys.integration.util.OperatingSystemType; - public class ZipApiScannerInstaller extends ApiScannerInstaller { public static final String DEFAULT_SIGNATURE_SCANNER_DOWNLOAD_URL_SUFFIX = "download/scan.cli.zip"; public static final String WINDOWS_SIGNATURE_SCANNER_DOWNLOAD_URL_SUFFIX = "download/scan.cli-windows.zip"; diff --git a/src/main/java/com/blackduck/integration/blackduck/codelocation/upload/UploadBatchOutput.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/upload/UploadBatchOutput.java index a362e040b..e5a756d07 100644 --- a/src/main/java/com/blackduck/integration/blackduck/codelocation/upload/UploadBatchOutput.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/upload/UploadBatchOutput.java @@ -7,10 +7,10 @@ */ package com.blackduck.integration.blackduck.codelocation.upload; -import java.util.List; - import com.blackduck.integration.blackduck.codelocation.CodeLocationBatchOutput; +import java.util.List; + public class UploadBatchOutput extends CodeLocationBatchOutput { public UploadBatchOutput(final List outputs) { super(outputs); diff --git a/src/main/java/com/blackduck/integration/blackduck/codelocation/upload/UploadOutput.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/upload/UploadOutput.java index 64be38d8e..209be81dd 100644 --- a/src/main/java/com/blackduck/integration/blackduck/codelocation/upload/UploadOutput.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/upload/UploadOutput.java @@ -7,13 +7,12 @@ */ package com.blackduck.integration.blackduck.codelocation.upload; -import java.util.Optional; - -import org.jetbrains.annotations.Nullable; - import com.blackduck.integration.blackduck.codelocation.CodeLocationOutput; import com.blackduck.integration.blackduck.codelocation.Result; -import com.synopsys.integration.util.NameVersion; +import com.blackduck.integration.util.NameVersion; +import org.jetbrains.annotations.Nullable; + +import java.util.Optional; public class UploadOutput extends CodeLocationOutput { private final String response; diff --git a/src/main/java/com/blackduck/integration/blackduck/codelocation/upload/UploadTarget.java b/src/main/java/com/blackduck/integration/blackduck/codelocation/upload/UploadTarget.java index dd9f74b6a..39ba2e77a 100644 --- a/src/main/java/com/blackduck/integration/blackduck/codelocation/upload/UploadTarget.java +++ b/src/main/java/com/blackduck/integration/blackduck/codelocation/upload/UploadTarget.java @@ -7,13 +7,12 @@ */ package com.blackduck.integration.blackduck.codelocation.upload; -import java.io.File; -import java.util.Optional; - +import com.blackduck.integration.util.NameVersion; import org.apache.commons.lang3.StringUtils; import org.jetbrains.annotations.Nullable; -import com.synopsys.integration.util.NameVersion; +import java.io.File; +import java.util.Optional; public class UploadTarget { @Nullable diff --git a/src/main/java/com/blackduck/integration/blackduck/configuration/BlackDuckConnectionResult.java b/src/main/java/com/blackduck/integration/blackduck/configuration/BlackDuckConnectionResult.java index ae96eb38d..aff5c3fcb 100644 --- a/src/main/java/com/blackduck/integration/blackduck/configuration/BlackDuckConnectionResult.java +++ b/src/main/java/com/blackduck/integration/blackduck/configuration/BlackDuckConnectionResult.java @@ -7,10 +7,10 @@ */ package com.blackduck.integration.blackduck.configuration; -import java.util.Optional; - import com.blackduck.integration.blackduck.http.client.BlackDuckHttpClient; -import com.synopsys.integration.rest.client.ConnectionResult; +import com.blackduck.integration.rest.client.ConnectionResult; + +import java.util.Optional; public class BlackDuckConnectionResult extends ConnectionResult { public static final BlackDuckConnectionResult BLACK_DUCK_SUCCESS(int httpStatusCode, BlackDuckHttpClient blackDuckHttpClient) { diff --git a/src/main/java/com/blackduck/integration/blackduck/configuration/BlackDuckServerConfig.java b/src/main/java/com/blackduck/integration/blackduck/configuration/BlackDuckServerConfig.java index e195cbdf1..957708723 100644 --- a/src/main/java/com/blackduck/integration/blackduck/configuration/BlackDuckServerConfig.java +++ b/src/main/java/com/blackduck/integration/blackduck/configuration/BlackDuckServerConfig.java @@ -7,33 +7,32 @@ */ package com.blackduck.integration.blackduck.configuration; -import static com.blackduck.integration.blackduck.configuration.BlackDuckServerConfigKeys.KEYS; - -import java.util.Optional; -import java.util.concurrent.ExecutorService; - +import com.blackduck.integration.blackduck.http.client.ApiTokenBlackDuckHttpClient; import com.blackduck.integration.blackduck.http.client.BlackDuckHttpClient; import com.blackduck.integration.blackduck.http.client.CookieHeaderParser; +import com.blackduck.integration.blackduck.http.client.CredentialsBlackDuckHttpClient; import com.blackduck.integration.blackduck.http.client.cache.CachingHttpClient; -import org.apache.commons.lang3.StringUtils; - +import com.blackduck.integration.blackduck.service.BlackDuckServicesFactory; +import com.blackduck.integration.builder.Buildable; +import com.blackduck.integration.log.IntLogger; +import com.blackduck.integration.log.SilentIntLogger; +import com.blackduck.integration.rest.HttpUrl; +import com.blackduck.integration.rest.credentials.Credentials; +import com.blackduck.integration.rest.proxy.ProxyInfo; +import com.blackduck.integration.rest.response.ErrorResponse; +import com.blackduck.integration.rest.response.Response; +import com.blackduck.integration.rest.support.AuthenticationSupport; +import com.blackduck.integration.util.IntEnvironmentVariables; +import com.blackduck.integration.util.NameVersion; +import com.blackduck.integration.util.Stringable; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.gson.Gson; -import com.blackduck.integration.blackduck.http.client.ApiTokenBlackDuckHttpClient; -import com.blackduck.integration.blackduck.http.client.CredentialsBlackDuckHttpClient; -import com.blackduck.integration.blackduck.service.BlackDuckServicesFactory; -import com.synopsys.integration.builder.Buildable; -import com.synopsys.integration.log.IntLogger; -import com.synopsys.integration.log.SilentIntLogger; -import com.synopsys.integration.rest.HttpUrl; -import com.synopsys.integration.rest.credentials.Credentials; -import com.synopsys.integration.rest.proxy.ProxyInfo; -import com.synopsys.integration.rest.response.ErrorResponse; -import com.synopsys.integration.rest.response.Response; -import com.synopsys.integration.rest.support.AuthenticationSupport; -import com.synopsys.integration.util.IntEnvironmentVariables; -import com.synopsys.integration.util.NameVersion; -import com.synopsys.integration.util.Stringable; +import org.apache.commons.lang3.StringUtils; + +import java.util.Optional; +import java.util.concurrent.ExecutorService; + +import static com.blackduck.integration.blackduck.configuration.BlackDuckServerConfigKeys.KEYS; public class BlackDuckServerConfig extends Stringable implements Buildable { @Deprecated diff --git a/src/main/java/com/blackduck/integration/blackduck/configuration/BlackDuckServerConfigBuilder.java b/src/main/java/com/blackduck/integration/blackduck/configuration/BlackDuckServerConfigBuilder.java index cce02dfd9..fe4505715 100644 --- a/src/main/java/com/blackduck/integration/blackduck/configuration/BlackDuckServerConfigBuilder.java +++ b/src/main/java/com/blackduck/integration/blackduck/configuration/BlackDuckServerConfigBuilder.java @@ -7,37 +7,36 @@ */ package com.blackduck.integration.blackduck.configuration; -import static com.blackduck.integration.blackduck.configuration.BlackDuckServerConfigKeys.KEYS; +import com.blackduck.integration.blackduck.http.client.CookieHeaderParser; +import com.blackduck.integration.blackduck.service.BlackDuckServicesFactory; +import com.blackduck.integration.builder.BuilderProperties; +import com.blackduck.integration.builder.BuilderPropertyKey; +import com.blackduck.integration.builder.BuilderStatus; +import com.blackduck.integration.builder.IntegrationBuilder; +import com.blackduck.integration.exception.IntegrationException; +import com.blackduck.integration.log.IntLogger; +import com.blackduck.integration.log.LogLevel; +import com.blackduck.integration.log.PrintStreamIntLogger; +import com.blackduck.integration.rest.HttpUrl; +import com.blackduck.integration.rest.credentials.Credentials; +import com.blackduck.integration.rest.credentials.CredentialsBuilder; +import com.blackduck.integration.rest.proxy.ProxyInfo; +import com.blackduck.integration.rest.proxy.ProxyInfoBuilder; +import com.blackduck.integration.rest.support.AuthenticationSupport; +import com.blackduck.integration.util.IntEnvironmentVariables; +import com.blackduck.integration.util.NameVersion; +import com.blackduck.integration.util.NoThreadExecutorService; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.google.gson.Gson; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.math.NumberUtils; import java.util.Map; import java.util.Optional; import java.util.Set; import java.util.concurrent.ExecutorService; -import com.blackduck.integration.blackduck.http.client.CookieHeaderParser; -import org.apache.commons.lang3.StringUtils; -import org.apache.commons.lang3.math.NumberUtils; - -import com.fasterxml.jackson.databind.ObjectMapper; -import com.google.gson.Gson; -import com.blackduck.integration.blackduck.service.BlackDuckServicesFactory; -import com.synopsys.integration.builder.BuilderProperties; -import com.synopsys.integration.builder.BuilderPropertyKey; -import com.synopsys.integration.builder.BuilderStatus; -import com.synopsys.integration.builder.IntegrationBuilder; -import com.synopsys.integration.exception.IntegrationException; -import com.synopsys.integration.log.IntLogger; -import com.synopsys.integration.log.LogLevel; -import com.synopsys.integration.log.PrintStreamIntLogger; -import com.synopsys.integration.rest.HttpUrl; -import com.synopsys.integration.rest.credentials.Credentials; -import com.synopsys.integration.rest.credentials.CredentialsBuilder; -import com.synopsys.integration.rest.proxy.ProxyInfo; -import com.synopsys.integration.rest.proxy.ProxyInfoBuilder; -import com.synopsys.integration.rest.support.AuthenticationSupport; -import com.synopsys.integration.util.IntEnvironmentVariables; -import com.synopsys.integration.util.NameVersion; -import com.synopsys.integration.util.NoThreadExecutorService; +import static com.blackduck.integration.blackduck.configuration.BlackDuckServerConfigKeys.KEYS; public class BlackDuckServerConfigBuilder extends IntegrationBuilder { public static final BuilderPropertyKey URL_KEY = new BuilderPropertyKey("BLACKDUCK_URL"); diff --git a/src/main/java/com/blackduck/integration/blackduck/configuration/BlackDuckServerConfigKeys.java b/src/main/java/com/blackduck/integration/blackduck/configuration/BlackDuckServerConfigKeys.java index 316678e63..ca175f84a 100644 --- a/src/main/java/com/blackduck/integration/blackduck/configuration/BlackDuckServerConfigKeys.java +++ b/src/main/java/com/blackduck/integration/blackduck/configuration/BlackDuckServerConfigKeys.java @@ -7,11 +7,11 @@ */ package com.blackduck.integration.blackduck.configuration; +import com.blackduck.integration.builder.BuilderPropertyKey; + import java.util.HashSet; import java.util.Set; -import com.synopsys.integration.builder.BuilderPropertyKey; - public class BlackDuckServerConfigKeys { public static final BlackDuckServerConfigKeys KEYS = new BlackDuckServerConfigKeys(); diff --git a/src/main/java/com/blackduck/integration/blackduck/exception/BlackDuckApiException.java b/src/main/java/com/blackduck/integration/blackduck/exception/BlackDuckApiException.java index c72271bd4..8eecbb34f 100644 --- a/src/main/java/com/blackduck/integration/blackduck/exception/BlackDuckApiException.java +++ b/src/main/java/com/blackduck/integration/blackduck/exception/BlackDuckApiException.java @@ -7,8 +7,8 @@ */ package com.blackduck.integration.blackduck.exception; -import com.synopsys.integration.exception.IntegrationException; -import com.synopsys.integration.rest.exception.IntegrationRestException; +import com.blackduck.integration.exception.IntegrationException; +import com.blackduck.integration.rest.exception.IntegrationRestException; public class BlackDuckApiException extends IntegrationException { private final IntegrationRestException originalIntegrationRestException; diff --git a/src/main/java/com/blackduck/integration/blackduck/exception/BlackDuckIntegrationException.java b/src/main/java/com/blackduck/integration/blackduck/exception/BlackDuckIntegrationException.java index c76f75d5a..5b7dc8f97 100644 --- a/src/main/java/com/blackduck/integration/blackduck/exception/BlackDuckIntegrationException.java +++ b/src/main/java/com/blackduck/integration/blackduck/exception/BlackDuckIntegrationException.java @@ -7,7 +7,7 @@ */ package com.blackduck.integration.blackduck.exception; -import com.synopsys.integration.exception.IntegrationException; +import com.blackduck.integration.exception.IntegrationException; public class BlackDuckIntegrationException extends IntegrationException { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/blackduck/integration/blackduck/exception/SignatureScannerInputException.java b/src/main/java/com/blackduck/integration/blackduck/exception/SignatureScannerInputException.java index 965cfb826..80a28c97a 100644 --- a/src/main/java/com/blackduck/integration/blackduck/exception/SignatureScannerInputException.java +++ b/src/main/java/com/blackduck/integration/blackduck/exception/SignatureScannerInputException.java @@ -7,7 +7,7 @@ */ package com.blackduck.integration.blackduck.exception; -import com.synopsys.integration.exception.IntegrationException; +import com.blackduck.integration.exception.IntegrationException; public class SignatureScannerInputException extends IntegrationException { public SignatureScannerInputException() { diff --git a/src/main/java/com/blackduck/integration/blackduck/http/BlackDuckPageResponse.java b/src/main/java/com/blackduck/integration/blackduck/http/BlackDuckPageResponse.java index c0fe51d97..7acb2b5b0 100644 --- a/src/main/java/com/blackduck/integration/blackduck/http/BlackDuckPageResponse.java +++ b/src/main/java/com/blackduck/integration/blackduck/http/BlackDuckPageResponse.java @@ -7,10 +7,10 @@ */ package com.blackduck.integration.blackduck.http; -import java.util.List; +import com.blackduck.integration.blackduck.api.core.BlackDuckComponent; +import com.blackduck.integration.blackduck.api.core.BlackDuckResponse; -import com.synopsys.integration.blackduck.api.core.BlackDuckComponent; -import com.synopsys.integration.blackduck.api.core.BlackDuckResponse; +import java.util.List; public class BlackDuckPageResponse extends BlackDuckComponent { private int totalCount; diff --git a/src/main/java/com/blackduck/integration/blackduck/http/BlackDuckRequestBuilder.java b/src/main/java/com/blackduck/integration/blackduck/http/BlackDuckRequestBuilder.java index 88637acc9..c249166d5 100644 --- a/src/main/java/com/blackduck/integration/blackduck/http/BlackDuckRequestBuilder.java +++ b/src/main/java/com/blackduck/integration/blackduck/http/BlackDuckRequestBuilder.java @@ -7,36 +7,25 @@ */ package com.blackduck.integration.blackduck.http; +import com.blackduck.integration.blackduck.api.core.BlackDuckResponse; +import com.blackduck.integration.blackduck.api.core.response.UrlMultipleResponses; +import com.blackduck.integration.blackduck.api.core.response.UrlSingleResponse; +import com.blackduck.integration.blackduck.api.manual.response.BlackDuckResponseResponse; +import com.blackduck.integration.blackduck.api.manual.response.BlackDuckStringResponse; +import com.blackduck.integration.blackduck.service.request.*; +import com.blackduck.integration.rest.HttpMethod; +import com.blackduck.integration.rest.HttpUrl; +import com.blackduck.integration.rest.body.*; +import com.blackduck.integration.rest.request.Request; +import org.apache.http.HttpHeaders; +import org.apache.http.entity.ContentType; + import java.io.File; import java.nio.charset.Charset; import java.util.List; import java.util.Map; import java.util.Set; -import org.apache.http.HttpHeaders; -import org.apache.http.entity.ContentType; - -import com.synopsys.integration.blackduck.api.core.BlackDuckResponse; -import com.synopsys.integration.blackduck.api.core.response.UrlMultipleResponses; -import com.synopsys.integration.blackduck.api.core.response.UrlSingleResponse; -import com.synopsys.integration.blackduck.api.manual.response.BlackDuckResponseResponse; -import com.synopsys.integration.blackduck.api.manual.response.BlackDuckStringResponse; -import com.blackduck.integration.blackduck.service.request.BlackDuckMultipleRequest; -import com.blackduck.integration.blackduck.service.request.BlackDuckRequest; -import com.blackduck.integration.blackduck.service.request.BlackDuckRequestBuilderEditor; -import com.blackduck.integration.blackduck.service.request.BlackDuckResponseRequest; -import com.blackduck.integration.blackduck.service.request.BlackDuckSingleRequest; -import com.blackduck.integration.blackduck.service.request.BlackDuckStringRequest; -import com.synopsys.integration.rest.HttpMethod; -import com.synopsys.integration.rest.HttpUrl; -import com.synopsys.integration.rest.body.BodyContent; -import com.synopsys.integration.rest.body.FileBodyContent; -import com.synopsys.integration.rest.body.MapBodyContent; -import com.synopsys.integration.rest.body.MultipartBodyContent; -import com.synopsys.integration.rest.body.ObjectBodyContent; -import com.synopsys.integration.rest.body.StringBodyContent; -import com.synopsys.integration.rest.request.Request; - public class BlackDuckRequestBuilder { public static final String LIMIT_PARAMETER = "limit"; public static final String OFFSET_PARAMETER = "offset"; diff --git a/src/main/java/com/blackduck/integration/blackduck/http/BlackDuckRequestFilter.java b/src/main/java/com/blackduck/integration/blackduck/http/BlackDuckRequestFilter.java index 63f4e2689..142c7d2a5 100644 --- a/src/main/java/com/blackduck/integration/blackduck/http/BlackDuckRequestFilter.java +++ b/src/main/java/com/blackduck/integration/blackduck/http/BlackDuckRequestFilter.java @@ -7,12 +7,7 @@ */ package com.blackduck.integration.blackduck.http; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; +import java.util.*; /** * Some requests to Black Duck can be filtered. There can be one more more diff --git a/src/main/java/com/blackduck/integration/blackduck/http/BlackDuckUrl.java b/src/main/java/com/blackduck/integration/blackduck/http/BlackDuckUrl.java index e5ac989ca..a9d41639d 100644 --- a/src/main/java/com/blackduck/integration/blackduck/http/BlackDuckUrl.java +++ b/src/main/java/com/blackduck/integration/blackduck/http/BlackDuckUrl.java @@ -7,9 +7,9 @@ */ package com.blackduck.integration.blackduck.http; -import java.util.List; +import com.blackduck.integration.rest.HttpUrl; -import com.synopsys.integration.rest.HttpUrl; +import java.util.List; /** * A url of the form: diff --git a/src/main/java/com/blackduck/integration/blackduck/http/client/ApiTokenBlackDuckHttpClient.java b/src/main/java/com/blackduck/integration/blackduck/http/client/ApiTokenBlackDuckHttpClient.java index 85b2f3064..17937f2ab 100644 --- a/src/main/java/com/blackduck/integration/blackduck/http/client/ApiTokenBlackDuckHttpClient.java +++ b/src/main/java/com/blackduck/integration/blackduck/http/client/ApiTokenBlackDuckHttpClient.java @@ -7,20 +7,19 @@ */ package com.blackduck.integration.blackduck.http.client; -import java.util.HashMap; -import java.util.Map; - +import com.blackduck.integration.exception.IntegrationException; +import com.blackduck.integration.log.IntLogger; +import com.blackduck.integration.rest.HttpUrl; +import com.blackduck.integration.rest.proxy.ProxyInfo; +import com.blackduck.integration.rest.response.Response; +import com.blackduck.integration.rest.support.AuthenticationSupport; +import com.blackduck.integration.util.NameVersion; +import com.google.gson.Gson; import org.apache.commons.lang3.StringUtils; import org.apache.http.client.methods.HttpUriRequest; -import com.google.gson.Gson; -import com.synopsys.integration.exception.IntegrationException; -import com.synopsys.integration.log.IntLogger; -import com.synopsys.integration.rest.HttpUrl; -import com.synopsys.integration.rest.proxy.ProxyInfo; -import com.synopsys.integration.rest.response.Response; -import com.synopsys.integration.rest.support.AuthenticationSupport; -import com.synopsys.integration.util.NameVersion; +import java.util.HashMap; +import java.util.Map; /** * Connection to the Black Duck application which authenticates using the API token feature diff --git a/src/main/java/com/blackduck/integration/blackduck/http/client/BlackDuckCertificateInterceptor.java b/src/main/java/com/blackduck/integration/blackduck/http/client/BlackDuckCertificateInterceptor.java index 14c6761fd..e2d94dbe2 100644 --- a/src/main/java/com/blackduck/integration/blackduck/http/client/BlackDuckCertificateInterceptor.java +++ b/src/main/java/com/blackduck/integration/blackduck/http/client/BlackDuckCertificateInterceptor.java @@ -7,17 +7,16 @@ */ package com.blackduck.integration.blackduck.http.client; -import java.io.IOException; -import java.security.cert.Certificate; - -import javax.net.ssl.SSLSession; - import org.apache.http.HttpResponse; import org.apache.http.HttpResponseInterceptor; import org.apache.http.conn.ManagedHttpClientConnection; import org.apache.http.protocol.HttpContext; import org.apache.http.protocol.HttpCoreContext; +import javax.net.ssl.SSLSession; +import java.io.IOException; +import java.security.cert.Certificate; + public class BlackDuckCertificateInterceptor implements HttpResponseInterceptor { @Override public void process(HttpResponse response, HttpContext context) throws IOException { diff --git a/src/main/java/com/blackduck/integration/blackduck/http/client/BlackDuckHttpClient.java b/src/main/java/com/blackduck/integration/blackduck/http/client/BlackDuckHttpClient.java index 30a556545..9773b10a5 100644 --- a/src/main/java/com/blackduck/integration/blackduck/http/client/BlackDuckHttpClient.java +++ b/src/main/java/com/blackduck/integration/blackduck/http/client/BlackDuckHttpClient.java @@ -7,21 +7,20 @@ */ package com.blackduck.integration.blackduck.http.client; -import java.util.Optional; - +import com.blackduck.integration.blackduck.api.core.BlackDuckResponse; +import com.blackduck.integration.blackduck.api.core.response.UrlResponse; import com.blackduck.integration.blackduck.service.request.BlackDuckRequest; +import com.blackduck.integration.exception.IntegrationException; +import com.blackduck.integration.log.IntLogger; +import com.blackduck.integration.rest.HttpUrl; +import com.blackduck.integration.rest.proxy.ProxyInfo; +import com.blackduck.integration.rest.response.ErrorResponse; +import com.blackduck.integration.rest.response.Response; +import com.google.gson.Gson; import org.apache.http.client.methods.HttpUriRequest; import org.apache.http.impl.client.HttpClientBuilder; -import com.google.gson.Gson; -import com.synopsys.integration.blackduck.api.core.BlackDuckResponse; -import com.synopsys.integration.blackduck.api.core.response.UrlResponse; -import com.synopsys.integration.exception.IntegrationException; -import com.synopsys.integration.log.IntLogger; -import com.synopsys.integration.rest.HttpUrl; -import com.synopsys.integration.rest.proxy.ProxyInfo; -import com.synopsys.integration.rest.response.ErrorResponse; -import com.synopsys.integration.rest.response.Response; +import java.util.Optional; public interface BlackDuckHttpClient { > Response execute(BlackDuckRequest blackDuckRequest) throws IntegrationException; diff --git a/src/main/java/com/blackduck/integration/blackduck/http/client/BlackDuckRedirectStrategy.java b/src/main/java/com/blackduck/integration/blackduck/http/client/BlackDuckRedirectStrategy.java index e81b213eb..2486b58d5 100644 --- a/src/main/java/com/blackduck/integration/blackduck/http/client/BlackDuckRedirectStrategy.java +++ b/src/main/java/com/blackduck/integration/blackduck/http/client/BlackDuckRedirectStrategy.java @@ -7,8 +7,6 @@ */ package com.blackduck.integration.blackduck.http.client; -import java.net.URI; - import org.apache.http.HttpRequest; import org.apache.http.HttpResponse; import org.apache.http.ProtocolException; @@ -18,6 +16,8 @@ import org.apache.http.impl.client.LaxRedirectStrategy; import org.apache.http.protocol.HttpContext; +import java.net.URI; + public class BlackDuckRedirectStrategy implements RedirectStrategy { private LaxRedirectStrategy baseRedirectStrategy = new LaxRedirectStrategy(); diff --git a/src/main/java/com/blackduck/integration/blackduck/http/client/CookieHeaderParser.java b/src/main/java/com/blackduck/integration/blackduck/http/client/CookieHeaderParser.java index a4c947a9c..a7ff00ba8 100644 --- a/src/main/java/com/blackduck/integration/blackduck/http/client/CookieHeaderParser.java +++ b/src/main/java/com/blackduck/integration/blackduck/http/client/CookieHeaderParser.java @@ -7,12 +7,12 @@ */ package com.blackduck.integration.blackduck.http.client; -import java.util.Arrays; -import java.util.Optional; - import org.apache.commons.lang3.StringUtils; import org.apache.http.Header; +import java.util.Arrays; +import java.util.Optional; + public class CookieHeaderParser { public static final String SET_COOKIE = "SET-COOKIE"; public static final String AUTHORIZATION_BEARER_PREFIX = "AUTHORIZATION_BEARER="; diff --git a/src/main/java/com/blackduck/integration/blackduck/http/client/CredentialsBlackDuckHttpClient.java b/src/main/java/com/blackduck/integration/blackduck/http/client/CredentialsBlackDuckHttpClient.java index dca93831f..d99eb457f 100644 --- a/src/main/java/com/blackduck/integration/blackduck/http/client/CredentialsBlackDuckHttpClient.java +++ b/src/main/java/com/blackduck/integration/blackduck/http/client/CredentialsBlackDuckHttpClient.java @@ -7,26 +7,25 @@ */ package com.blackduck.integration.blackduck.http.client; -import java.nio.charset.StandardCharsets; -import java.util.ArrayList; -import java.util.List; -import java.util.Optional; - +import com.blackduck.integration.exception.IntegrationException; +import com.blackduck.integration.log.IntLogger; +import com.blackduck.integration.rest.HttpUrl; +import com.blackduck.integration.rest.credentials.Credentials; +import com.blackduck.integration.rest.proxy.ProxyInfo; +import com.blackduck.integration.rest.response.Response; +import com.blackduck.integration.rest.support.AuthenticationSupport; +import com.blackduck.integration.util.NameVersion; +import com.google.gson.Gson; import org.apache.http.NameValuePair; import org.apache.http.client.entity.UrlEncodedFormEntity; import org.apache.http.client.methods.CloseableHttpResponse; import org.apache.http.client.methods.HttpUriRequest; import org.apache.http.message.BasicNameValuePair; -import com.google.gson.Gson; -import com.synopsys.integration.exception.IntegrationException; -import com.synopsys.integration.log.IntLogger; -import com.synopsys.integration.rest.HttpUrl; -import com.synopsys.integration.rest.credentials.Credentials; -import com.synopsys.integration.rest.proxy.ProxyInfo; -import com.synopsys.integration.rest.response.Response; -import com.synopsys.integration.rest.support.AuthenticationSupport; -import com.synopsys.integration.util.NameVersion; +import java.nio.charset.StandardCharsets; +import java.util.ArrayList; +import java.util.List; +import java.util.Optional; public class CredentialsBlackDuckHttpClient extends DefaultBlackDuckHttpClient { private final Credentials credentials; diff --git a/src/main/java/com/blackduck/integration/blackduck/http/client/DefaultBlackDuckHttpClient.java b/src/main/java/com/blackduck/integration/blackduck/http/client/DefaultBlackDuckHttpClient.java index 8e33211bf..162a3645d 100644 --- a/src/main/java/com/blackduck/integration/blackduck/http/client/DefaultBlackDuckHttpClient.java +++ b/src/main/java/com/blackduck/integration/blackduck/http/client/DefaultBlackDuckHttpClient.java @@ -7,32 +7,31 @@ */ package com.blackduck.integration.blackduck.http.client; -import java.util.Optional; - +import com.blackduck.integration.blackduck.api.core.BlackDuckResponse; +import com.blackduck.integration.blackduck.api.core.response.UrlResponse; +import com.blackduck.integration.blackduck.exception.BlackDuckApiException; import com.blackduck.integration.blackduck.service.request.BlackDuckRequest; +import com.blackduck.integration.blackduck.useragent.BlackDuckCommon; +import com.blackduck.integration.blackduck.useragent.UserAgentBuilder; +import com.blackduck.integration.blackduck.useragent.UserAgentItem; +import com.blackduck.integration.exception.IntegrationException; +import com.blackduck.integration.log.IntLogger; +import com.blackduck.integration.rest.HttpUrl; +import com.blackduck.integration.rest.client.AuthenticatingIntHttpClient; +import com.blackduck.integration.rest.exception.IntegrationRestException; +import com.blackduck.integration.rest.proxy.ProxyInfo; +import com.blackduck.integration.rest.request.Request; +import com.blackduck.integration.rest.response.ErrorResponse; +import com.blackduck.integration.rest.response.Response; +import com.blackduck.integration.rest.support.AuthenticationSupport; +import com.blackduck.integration.util.NameVersion; +import com.google.gson.Gson; import org.apache.http.HttpHeaders; import org.apache.http.client.config.RequestConfig; import org.apache.http.client.methods.HttpUriRequest; import org.apache.http.impl.client.HttpClientBuilder; -import com.google.gson.Gson; -import com.synopsys.integration.blackduck.api.core.BlackDuckResponse; -import com.synopsys.integration.blackduck.api.core.response.UrlResponse; -import com.blackduck.integration.blackduck.exception.BlackDuckApiException; -import com.blackduck.integration.blackduck.useragent.BlackDuckCommon; -import com.blackduck.integration.blackduck.useragent.UserAgentBuilder; -import com.blackduck.integration.blackduck.useragent.UserAgentItem; -import com.synopsys.integration.exception.IntegrationException; -import com.synopsys.integration.log.IntLogger; -import com.synopsys.integration.rest.HttpUrl; -import com.synopsys.integration.rest.client.AuthenticatingIntHttpClient; -import com.synopsys.integration.rest.exception.IntegrationRestException; -import com.synopsys.integration.rest.proxy.ProxyInfo; -import com.synopsys.integration.rest.request.Request; -import com.synopsys.integration.rest.response.ErrorResponse; -import com.synopsys.integration.rest.response.Response; -import com.synopsys.integration.rest.support.AuthenticationSupport; -import com.synopsys.integration.util.NameVersion; +import java.util.Optional; public abstract class DefaultBlackDuckHttpClient extends AuthenticatingIntHttpClient implements BlackDuckHttpClient { private final Gson gson; diff --git a/src/main/java/com/blackduck/integration/blackduck/http/client/SignatureScannerClient.java b/src/main/java/com/blackduck/integration/blackduck/http/client/SignatureScannerClient.java index 65a10f893..30e0538c1 100644 --- a/src/main/java/com/blackduck/integration/blackduck/http/client/SignatureScannerClient.java +++ b/src/main/java/com/blackduck/integration/blackduck/http/client/SignatureScannerClient.java @@ -7,24 +7,22 @@ */ package com.blackduck.integration.blackduck.http.client; -import java.io.IOException; -import java.security.cert.Certificate; -import java.util.Optional; - -import javax.net.ssl.SSLContext; - +import com.blackduck.integration.exception.IntegrationException; +import com.blackduck.integration.log.IntLogger; +import com.blackduck.integration.rest.client.IntHttpClient; +import com.blackduck.integration.rest.proxy.ProxyInfo; +import com.blackduck.integration.rest.request.Request; +import com.blackduck.integration.rest.response.Response; +import com.google.gson.Gson; import org.apache.http.client.config.RequestConfig; import org.apache.http.impl.client.HttpClientBuilder; import org.apache.http.protocol.BasicHttpContext; import org.apache.http.protocol.HttpContext; -import com.google.gson.Gson; -import com.synopsys.integration.exception.IntegrationException; -import com.synopsys.integration.log.IntLogger; -import com.synopsys.integration.rest.client.IntHttpClient; -import com.synopsys.integration.rest.proxy.ProxyInfo; -import com.synopsys.integration.rest.request.Request; -import com.synopsys.integration.rest.response.Response; +import javax.net.ssl.SSLContext; +import java.io.IOException; +import java.security.cert.Certificate; +import java.util.Optional; public class SignatureScannerClient extends IntHttpClient { public static final String PEER_CERTIFICATES = "PEER_CERTIFICATES"; diff --git a/src/main/java/com/blackduck/integration/blackduck/http/client/cache/CacheableResponse.java b/src/main/java/com/blackduck/integration/blackduck/http/client/cache/CacheableResponse.java index e9679a422..28075c0c6 100644 --- a/src/main/java/com/blackduck/integration/blackduck/http/client/cache/CacheableResponse.java +++ b/src/main/java/com/blackduck/integration/blackduck/http/client/cache/CacheableResponse.java @@ -7,19 +7,18 @@ */ package com.blackduck.integration.blackduck.http.client.cache; +import com.blackduck.integration.exception.IntegrationException; +import com.blackduck.integration.rest.exception.IntegrationRestException; +import com.blackduck.integration.rest.request.Request; +import com.blackduck.integration.rest.response.Response; +import org.apache.http.client.methods.CloseableHttpResponse; +import org.apache.http.client.methods.HttpUriRequest; + import java.io.IOException; import java.io.InputStream; import java.nio.charset.Charset; import java.util.Map; -import org.apache.http.client.methods.CloseableHttpResponse; -import org.apache.http.client.methods.HttpUriRequest; - -import com.synopsys.integration.exception.IntegrationException; -import com.synopsys.integration.rest.exception.IntegrationRestException; -import com.synopsys.integration.rest.request.Request; -import com.synopsys.integration.rest.response.Response; - public class CacheableResponse implements Response { private final Request request; private final Response response; diff --git a/src/main/java/com/blackduck/integration/blackduck/http/client/cache/CachingHttpClient.java b/src/main/java/com/blackduck/integration/blackduck/http/client/cache/CachingHttpClient.java index 61e9de8bb..1ad87e0b7 100644 --- a/src/main/java/com/blackduck/integration/blackduck/http/client/cache/CachingHttpClient.java +++ b/src/main/java/com/blackduck/integration/blackduck/http/client/cache/CachingHttpClient.java @@ -7,27 +7,26 @@ */ package com.blackduck.integration.blackduck.http.client.cache; -import java.util.Collections; -import java.util.Map; -import java.util.Optional; - +import com.blackduck.integration.blackduck.api.core.BlackDuckResponse; +import com.blackduck.integration.blackduck.api.core.response.UrlResponse; +import com.blackduck.integration.blackduck.http.client.BlackDuckHttpClient; +import com.blackduck.integration.blackduck.service.request.BlackDuckRequest; +import com.blackduck.integration.exception.IntegrationException; +import com.blackduck.integration.log.IntLogger; +import com.blackduck.integration.rest.HttpMethod; +import com.blackduck.integration.rest.HttpUrl; +import com.blackduck.integration.rest.proxy.ProxyInfo; +import com.blackduck.integration.rest.request.Request; +import com.blackduck.integration.rest.response.ErrorResponse; +import com.blackduck.integration.rest.response.Response; +import com.google.gson.Gson; import org.apache.commons.collections4.map.LRUMap; import org.apache.http.client.methods.HttpUriRequest; import org.apache.http.impl.client.HttpClientBuilder; -import com.google.gson.Gson; -import com.synopsys.integration.blackduck.api.core.BlackDuckResponse; -import com.synopsys.integration.blackduck.api.core.response.UrlResponse; -import com.blackduck.integration.blackduck.http.client.BlackDuckHttpClient; -import com.blackduck.integration.blackduck.service.request.BlackDuckRequest; -import com.synopsys.integration.exception.IntegrationException; -import com.synopsys.integration.log.IntLogger; -import com.synopsys.integration.rest.HttpMethod; -import com.synopsys.integration.rest.HttpUrl; -import com.synopsys.integration.rest.proxy.ProxyInfo; -import com.synopsys.integration.rest.request.Request; -import com.synopsys.integration.rest.response.ErrorResponse; -import com.synopsys.integration.rest.response.Response; +import java.util.Collections; +import java.util.Map; +import java.util.Optional; public class CachingHttpClient implements BlackDuckHttpClient { private final BlackDuckHttpClient blackDuckHttpClient; diff --git a/src/main/java/com/blackduck/integration/blackduck/http/transform/BlackDuckJsonTransformer.java b/src/main/java/com/blackduck/integration/blackduck/http/transform/BlackDuckJsonTransformer.java index e03945350..5c2ce54fc 100644 --- a/src/main/java/com/blackduck/integration/blackduck/http/transform/BlackDuckJsonTransformer.java +++ b/src/main/java/com/blackduck/integration/blackduck/http/transform/BlackDuckJsonTransformer.java @@ -7,32 +7,28 @@ */ package com.blackduck.integration.blackduck.http.transform; -import java.io.IOException; -import java.io.StringWriter; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - +import com.blackduck.integration.blackduck.api.core.BlackDuckResponse; +import com.blackduck.integration.blackduck.api.manual.response.BlackDuckResponseResponse; +import com.blackduck.integration.blackduck.api.manual.response.BlackDuckStringResponse; +import com.blackduck.integration.blackduck.exception.BlackDuckIntegrationException; import com.blackduck.integration.blackduck.http.BlackDuckPageResponse; import com.blackduck.integration.blackduck.http.transform.subclass.BlackDuckResponseResolver; +import com.blackduck.integration.exception.IntegrationException; +import com.blackduck.integration.log.IntLogger; +import com.blackduck.integration.rest.response.Response; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ArrayNode; import com.fasterxml.jackson.databind.node.JsonNodeFactory; import com.flipkart.zjsonpatch.JsonDiff; import com.flipkart.zjsonpatch.JsonPatch; -import com.google.gson.Gson; -import com.google.gson.JsonArray; -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import com.google.gson.JsonSyntaxException; -import com.synopsys.integration.blackduck.api.core.BlackDuckResponse; -import com.synopsys.integration.blackduck.api.manual.response.BlackDuckResponseResponse; -import com.synopsys.integration.blackduck.api.manual.response.BlackDuckStringResponse; -import com.blackduck.integration.blackduck.exception.BlackDuckIntegrationException; -import com.synopsys.integration.exception.IntegrationException; -import com.synopsys.integration.log.IntLogger; -import com.synopsys.integration.rest.response.Response; +import com.google.gson.*; + +import java.io.IOException; +import java.io.StringWriter; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; public class BlackDuckJsonTransformer { private final Gson gson; diff --git a/src/main/java/com/blackduck/integration/blackduck/http/transform/BlackDuckResponseTransformer.java b/src/main/java/com/blackduck/integration/blackduck/http/transform/BlackDuckResponseTransformer.java index 9341f159d..1bd242ca9 100644 --- a/src/main/java/com/blackduck/integration/blackduck/http/transform/BlackDuckResponseTransformer.java +++ b/src/main/java/com/blackduck/integration/blackduck/http/transform/BlackDuckResponseTransformer.java @@ -7,16 +7,16 @@ */ package com.blackduck.integration.blackduck.http.transform; -import java.io.IOException; - +import com.blackduck.integration.blackduck.api.core.BlackDuckResponse; +import com.blackduck.integration.blackduck.api.core.response.UrlSingleResponse; +import com.blackduck.integration.blackduck.exception.BlackDuckIntegrationException; import com.blackduck.integration.blackduck.http.client.BlackDuckHttpClient; import com.blackduck.integration.blackduck.service.request.BlackDuckRequest; +import com.blackduck.integration.exception.IntegrationException; +import com.blackduck.integration.rest.response.Response; import com.google.gson.JsonElement; -import com.synopsys.integration.blackduck.api.core.BlackDuckResponse; -import com.synopsys.integration.blackduck.api.core.response.UrlSingleResponse; -import com.blackduck.integration.blackduck.exception.BlackDuckIntegrationException; -import com.synopsys.integration.exception.IntegrationException; -import com.synopsys.integration.rest.response.Response; + +import java.io.IOException; public class BlackDuckResponseTransformer { private final BlackDuckHttpClient blackDuckHttpClient; diff --git a/src/main/java/com/blackduck/integration/blackduck/http/transform/BlackDuckResponsesTransformer.java b/src/main/java/com/blackduck/integration/blackduck/http/transform/BlackDuckResponsesTransformer.java index 73bee9597..e4d865fc3 100644 --- a/src/main/java/com/blackduck/integration/blackduck/http/transform/BlackDuckResponsesTransformer.java +++ b/src/main/java/com/blackduck/integration/blackduck/http/transform/BlackDuckResponsesTransformer.java @@ -7,26 +7,25 @@ */ package com.blackduck.integration.blackduck.http.transform; -import java.io.IOException; -import java.util.LinkedList; -import java.util.List; -import java.util.Set; -import java.util.function.Function; -import java.util.function.Predicate; -import java.util.stream.Collectors; - +import com.blackduck.integration.blackduck.api.core.BlackDuckResponse; +import com.blackduck.integration.blackduck.api.core.response.UrlMultipleResponses; +import com.blackduck.integration.blackduck.exception.BlackDuckIntegrationException; import com.blackduck.integration.blackduck.http.BlackDuckPageResponse; import com.blackduck.integration.blackduck.http.BlackDuckRequestBuilder; import com.blackduck.integration.blackduck.http.client.BlackDuckHttpClient; import com.blackduck.integration.blackduck.service.request.BlackDuckRequest; +import com.blackduck.integration.exception.IntegrationException; +import com.blackduck.integration.rest.response.Response; import org.apache.commons.lang3.math.NumberUtils; import org.jetbrains.annotations.NotNull; -import com.synopsys.integration.blackduck.api.core.BlackDuckResponse; -import com.synopsys.integration.blackduck.api.core.response.UrlMultipleResponses; -import com.blackduck.integration.blackduck.exception.BlackDuckIntegrationException; -import com.synopsys.integration.exception.IntegrationException; -import com.synopsys.integration.rest.response.Response; +import java.io.IOException; +import java.util.LinkedList; +import java.util.List; +import java.util.Set; +import java.util.function.Function; +import java.util.function.Predicate; +import java.util.stream.Collectors; public class BlackDuckResponsesTransformer { private final BlackDuckHttpClient blackDuckHttpClient; diff --git a/src/main/java/com/blackduck/integration/blackduck/http/transform/adapters/OffsetDateTimeTypeAdapter.java b/src/main/java/com/blackduck/integration/blackduck/http/transform/adapters/OffsetDateTimeTypeAdapter.java index c04b5a1d7..77bbf51ed 100644 --- a/src/main/java/com/blackduck/integration/blackduck/http/transform/adapters/OffsetDateTimeTypeAdapter.java +++ b/src/main/java/com/blackduck/integration/blackduck/http/transform/adapters/OffsetDateTimeTypeAdapter.java @@ -7,26 +7,17 @@ */ package com.blackduck.integration.blackduck.http.transform.adapters; +import com.blackduck.integration.rest.RestConstants; +import com.google.gson.*; +import com.google.gson.stream.JsonReader; +import com.google.gson.stream.JsonToken; +import com.google.gson.stream.JsonWriter; + import java.io.IOException; import java.lang.reflect.Type; import java.time.OffsetDateTime; import java.time.ZoneOffset; import java.time.format.DateTimeFormatter; -import java.time.format.DateTimeFormatterBuilder; - -import com.google.gson.InstanceCreator; -import com.google.gson.JsonDeserializationContext; -import com.google.gson.JsonDeserializer; -import com.google.gson.JsonElement; -import com.google.gson.JsonParseException; -import com.google.gson.JsonPrimitive; -import com.google.gson.JsonSerializationContext; -import com.google.gson.JsonSerializer; -import com.google.gson.TypeAdapter; -import com.google.gson.stream.JsonReader; -import com.google.gson.stream.JsonToken; -import com.google.gson.stream.JsonWriter; -import com.synopsys.integration.rest.RestConstants; public class OffsetDateTimeTypeAdapter extends TypeAdapter implements JsonSerializer, JsonDeserializer { private final DateTimeFormatter formatter; diff --git a/src/main/java/com/blackduck/integration/blackduck/http/transform/subclass/BlackDuckResponseResolver.java b/src/main/java/com/blackduck/integration/blackduck/http/transform/subclass/BlackDuckResponseResolver.java index 5acea67fa..acab34f5f 100644 --- a/src/main/java/com/blackduck/integration/blackduck/http/transform/subclass/BlackDuckResponseResolver.java +++ b/src/main/java/com/blackduck/integration/blackduck/http/transform/subclass/BlackDuckResponseResolver.java @@ -7,14 +7,14 @@ */ package com.blackduck.integration.blackduck.http.transform.subclass; -import java.util.HashMap; -import java.util.Map; - +import com.blackduck.integration.blackduck.api.core.BlackDuckResponse; +import com.blackduck.integration.blackduck.api.manual.view.NotificationUserView; +import com.blackduck.integration.blackduck.api.manual.view.NotificationView; import com.google.gson.Gson; import com.google.gson.JsonElement; -import com.synopsys.integration.blackduck.api.core.BlackDuckResponse; -import com.synopsys.integration.blackduck.api.manual.view.NotificationUserView; -import com.synopsys.integration.blackduck.api.manual.view.NotificationView; + +import java.util.HashMap; +import java.util.Map; public class BlackDuckResponseResolver { private final Gson gson; diff --git a/src/main/java/com/blackduck/integration/blackduck/http/transform/subclass/BlackDuckResponseSubclassResolver.java b/src/main/java/com/blackduck/integration/blackduck/http/transform/subclass/BlackDuckResponseSubclassResolver.java index 936e37bb0..34bc51ec0 100644 --- a/src/main/java/com/blackduck/integration/blackduck/http/transform/subclass/BlackDuckResponseSubclassResolver.java +++ b/src/main/java/com/blackduck/integration/blackduck/http/transform/subclass/BlackDuckResponseSubclassResolver.java @@ -7,9 +7,9 @@ */ package com.blackduck.integration.blackduck.http.transform.subclass; +import com.blackduck.integration.blackduck.api.core.BlackDuckResponse; import com.google.gson.Gson; import com.google.gson.JsonElement; -import com.synopsys.integration.blackduck.api.core.BlackDuckResponse; public abstract class BlackDuckResponseSubclassResolver { protected Gson gson; diff --git a/src/main/java/com/blackduck/integration/blackduck/http/transform/subclass/NotificationUserViewSubclassResolver.java b/src/main/java/com/blackduck/integration/blackduck/http/transform/subclass/NotificationUserViewSubclassResolver.java index 779d81cba..64726d442 100644 --- a/src/main/java/com/blackduck/integration/blackduck/http/transform/subclass/NotificationUserViewSubclassResolver.java +++ b/src/main/java/com/blackduck/integration/blackduck/http/transform/subclass/NotificationUserViewSubclassResolver.java @@ -7,21 +7,10 @@ */ package com.blackduck.integration.blackduck.http.transform.subclass; +import com.blackduck.integration.blackduck.api.core.BlackDuckResponse; +import com.blackduck.integration.blackduck.api.manual.view.*; import com.google.gson.Gson; import com.google.gson.JsonElement; -import com.synopsys.integration.blackduck.api.core.BlackDuckResponse; -import com.synopsys.integration.blackduck.api.manual.view.BomEditNotificationUserView; -import com.synopsys.integration.blackduck.api.manual.view.ComponentUnknownVersionNotificationUserView; -import com.synopsys.integration.blackduck.api.manual.view.LicenseLimitNotificationUserView; -import com.synopsys.integration.blackduck.api.manual.view.NotificationUserView; -import com.synopsys.integration.blackduck.api.manual.view.PolicyOverrideNotificationUserView; -import com.synopsys.integration.blackduck.api.manual.view.ProjectNotificationUserView; -import com.synopsys.integration.blackduck.api.manual.view.ProjectVersionNotificationUserView; -import com.synopsys.integration.blackduck.api.manual.view.RuleViolationClearedNotificationUserView; -import com.synopsys.integration.blackduck.api.manual.view.RuleViolationNotificationUserView; -import com.synopsys.integration.blackduck.api.manual.view.UnknownNotificationUserView; -import com.synopsys.integration.blackduck.api.manual.view.VersionBomCodeLocationBomComputedNotificationUserView; -import com.synopsys.integration.blackduck.api.manual.view.VulnerabilityNotificationUserView; public class NotificationUserViewSubclassResolver extends BlackDuckResponseSubclassResolver { public NotificationUserViewSubclassResolver(Gson gson) { diff --git a/src/main/java/com/blackduck/integration/blackduck/http/transform/subclass/NotificationViewSubclassResolver.java b/src/main/java/com/blackduck/integration/blackduck/http/transform/subclass/NotificationViewSubclassResolver.java index ab0f0ef4a..f829dfa92 100644 --- a/src/main/java/com/blackduck/integration/blackduck/http/transform/subclass/NotificationViewSubclassResolver.java +++ b/src/main/java/com/blackduck/integration/blackduck/http/transform/subclass/NotificationViewSubclassResolver.java @@ -7,21 +7,10 @@ */ package com.blackduck.integration.blackduck.http.transform.subclass; +import com.blackduck.integration.blackduck.api.core.BlackDuckResponse; +import com.blackduck.integration.blackduck.api.manual.view.*; import com.google.gson.Gson; import com.google.gson.JsonElement; -import com.synopsys.integration.blackduck.api.core.BlackDuckResponse; -import com.synopsys.integration.blackduck.api.manual.view.BomEditNotificationView; -import com.synopsys.integration.blackduck.api.manual.view.ComponentUnknownVersionNotificationView; -import com.synopsys.integration.blackduck.api.manual.view.LicenseLimitNotificationView; -import com.synopsys.integration.blackduck.api.manual.view.NotificationView; -import com.synopsys.integration.blackduck.api.manual.view.PolicyOverrideNotificationView; -import com.synopsys.integration.blackduck.api.manual.view.ProjectNotificationView; -import com.synopsys.integration.blackduck.api.manual.view.ProjectVersionNotificationView; -import com.synopsys.integration.blackduck.api.manual.view.RuleViolationClearedNotificationView; -import com.synopsys.integration.blackduck.api.manual.view.RuleViolationNotificationView; -import com.synopsys.integration.blackduck.api.manual.view.UnknownNotificationView; -import com.synopsys.integration.blackduck.api.manual.view.VersionBomCodeLocationBomComputedNotificationView; -import com.synopsys.integration.blackduck.api.manual.view.VulnerabilityNotificationView; public class NotificationViewSubclassResolver extends BlackDuckResponseSubclassResolver { public NotificationViewSubclassResolver(Gson gson) { diff --git a/src/main/java/com/blackduck/integration/blackduck/http/transform/subclass/SimpleNotificationView.java b/src/main/java/com/blackduck/integration/blackduck/http/transform/subclass/SimpleNotificationView.java index a9372f80f..cd21ae674 100644 --- a/src/main/java/com/blackduck/integration/blackduck/http/transform/subclass/SimpleNotificationView.java +++ b/src/main/java/com/blackduck/integration/blackduck/http/transform/subclass/SimpleNotificationView.java @@ -7,8 +7,8 @@ */ package com.blackduck.integration.blackduck.http.transform.subclass; -import com.synopsys.integration.blackduck.api.core.BlackDuckView; -import com.synopsys.integration.blackduck.api.manual.enumeration.NotificationType; +import com.blackduck.integration.blackduck.api.core.BlackDuckView; +import com.blackduck.integration.blackduck.api.manual.enumeration.NotificationType; public class SimpleNotificationView extends BlackDuckView { public NotificationType type; diff --git a/src/main/java/com/blackduck/integration/blackduck/keystore/KeyStoreHelper.java b/src/main/java/com/blackduck/integration/blackduck/keystore/KeyStoreHelper.java index 8d8e1c2ef..78e6486a8 100644 --- a/src/main/java/com/blackduck/integration/blackduck/keystore/KeyStoreHelper.java +++ b/src/main/java/com/blackduck/integration/blackduck/keystore/KeyStoreHelper.java @@ -7,19 +7,15 @@ */ package com.blackduck.integration.blackduck.keystore; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; +import com.blackduck.integration.log.IntLogger; + +import java.io.*; import java.security.KeyStore; import java.security.KeyStoreException; import java.security.NoSuchAlgorithmException; import java.security.cert.Certificate; import java.security.cert.CertificateException; -import com.synopsys.integration.log.IntLogger; - public class KeyStoreHelper { private static final char[] DEFAULT_JAVA_KEYSTORE_PASSWORD = new char[] { 'c', 'h', 'a', 'n', 'g', 'e', 'i', 't' }; diff --git a/src/main/java/com/blackduck/integration/blackduck/phonehome/BlackDuckPhoneHomeHelper.java b/src/main/java/com/blackduck/integration/blackduck/phonehome/BlackDuckPhoneHomeHelper.java index 0d731c4d2..b50d0511c 100644 --- a/src/main/java/com/blackduck/integration/blackduck/phonehome/BlackDuckPhoneHomeHelper.java +++ b/src/main/java/com/blackduck/integration/blackduck/phonehome/BlackDuckPhoneHomeHelper.java @@ -7,26 +7,25 @@ */ package com.blackduck.integration.blackduck.phonehome; -import java.util.Collections; -import java.util.Map; -import java.util.concurrent.ExecutorService; - import com.blackduck.integration.blackduck.http.client.BlackDuckHttpClient; import com.blackduck.integration.blackduck.service.BlackDuckServicesFactory; import com.blackduck.integration.blackduck.service.dataservice.BlackDuckRegistrationService; import com.blackduck.integration.blackduck.service.model.BlackDuckServerData; +import com.blackduck.integration.exception.IntegrationException; +import com.blackduck.integration.log.IntLogger; +import com.blackduck.integration.phonehome.PhoneHomeClient; +import com.blackduck.integration.phonehome.PhoneHomeResponse; +import com.blackduck.integration.phonehome.PhoneHomeService; +import com.blackduck.integration.phonehome.request.PhoneHomeRequestBody; +import com.blackduck.integration.phonehome.request.PhoneHomeRequestBodyBuilder; +import com.blackduck.integration.util.IntEnvironmentVariables; +import com.blackduck.integration.util.NoThreadExecutorService; +import com.google.gson.Gson; import org.apache.http.impl.client.HttpClientBuilder; -import com.google.gson.Gson; -import com.synopsys.integration.exception.IntegrationException; -import com.synopsys.integration.log.IntLogger; -import com.synopsys.integration.phonehome.PhoneHomeClient; -import com.synopsys.integration.phonehome.PhoneHomeResponse; -import com.synopsys.integration.phonehome.PhoneHomeService; -import com.synopsys.integration.phonehome.request.PhoneHomeRequestBody; -import com.synopsys.integration.phonehome.request.PhoneHomeRequestBodyBuilder; -import com.synopsys.integration.util.IntEnvironmentVariables; -import com.synopsys.integration.util.NoThreadExecutorService; +import java.util.Collections; +import java.util.Map; +import java.util.concurrent.ExecutorService; public class BlackDuckPhoneHomeHelper { private final IntLogger logger; diff --git a/src/main/java/com/blackduck/integration/blackduck/service/BlackDuckApiClient.java b/src/main/java/com/blackduck/integration/blackduck/service/BlackDuckApiClient.java index 46e6ff709..f70077663 100644 --- a/src/main/java/com/blackduck/integration/blackduck/service/BlackDuckApiClient.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/BlackDuckApiClient.java @@ -7,22 +7,15 @@ */ package com.blackduck.integration.blackduck.service; -import java.io.IOException; -import java.util.List; -import java.util.Optional; -import java.util.function.Predicate; - -import com.blackduck.integration.blackduck.http.BlackDuckRequestBuilder; -import org.apache.http.HttpHeaders; - -import com.synopsys.integration.blackduck.api.core.BlackDuckComponent; -import com.synopsys.integration.blackduck.api.core.BlackDuckPath; -import com.synopsys.integration.blackduck.api.core.BlackDuckResponse; -import com.synopsys.integration.blackduck.api.core.BlackDuckView; -import com.synopsys.integration.blackduck.api.core.response.UrlMultipleResponses; -import com.synopsys.integration.blackduck.api.core.response.UrlSingleResponse; -import com.synopsys.integration.blackduck.api.generated.discovery.BlackDuckMediaTypeDiscovery; +import com.blackduck.integration.blackduck.api.core.BlackDuckComponent; +import com.blackduck.integration.blackduck.api.core.BlackDuckPath; +import com.blackduck.integration.blackduck.api.core.BlackDuckResponse; +import com.blackduck.integration.blackduck.api.core.BlackDuckView; +import com.blackduck.integration.blackduck.api.core.response.UrlMultipleResponses; +import com.blackduck.integration.blackduck.api.core.response.UrlSingleResponse; +import com.blackduck.integration.blackduck.api.generated.discovery.BlackDuckMediaTypeDiscovery; import com.blackduck.integration.blackduck.http.BlackDuckPageResponse; +import com.blackduck.integration.blackduck.http.BlackDuckRequestBuilder; import com.blackduck.integration.blackduck.http.client.BlackDuckHttpClient; import com.blackduck.integration.blackduck.http.transform.BlackDuckJsonTransformer; import com.blackduck.integration.blackduck.http.transform.BlackDuckResponseTransformer; @@ -30,11 +23,17 @@ import com.blackduck.integration.blackduck.service.request.BlackDuckRequest; import com.blackduck.integration.blackduck.service.request.BlackDuckResponseRequest; import com.blackduck.integration.blackduck.version.BlackDuckVersion; -import com.synopsys.integration.exception.IntegrationException; -import com.synopsys.integration.rest.HttpMethod; -import com.synopsys.integration.rest.HttpUrl; -import com.synopsys.integration.rest.body.BodyContentConverter; -import com.synopsys.integration.rest.response.Response; +import com.blackduck.integration.exception.IntegrationException; +import com.blackduck.integration.rest.HttpMethod; +import com.blackduck.integration.rest.HttpUrl; +import com.blackduck.integration.rest.body.BodyContentConverter; +import com.blackduck.integration.rest.response.Response; +import org.apache.http.HttpHeaders; + +import java.io.IOException; +import java.util.List; +import java.util.Optional; +import java.util.function.Predicate; public class BlackDuckApiClient { //TODO ejk - create tests to exercise this endpoint - find out what version the slash is not required in diff --git a/src/main/java/com/blackduck/integration/blackduck/service/BlackDuckServicesFactory.java b/src/main/java/com/blackduck/integration/blackduck/service/BlackDuckServicesFactory.java index a18568796..4a43c6659 100644 --- a/src/main/java/com/blackduck/integration/blackduck/service/BlackDuckServicesFactory.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/BlackDuckServicesFactory.java @@ -7,10 +7,7 @@ */ package com.blackduck.integration.blackduck.service; -import java.io.File; -import java.time.OffsetDateTime; -import java.util.concurrent.ExecutorService; - +import com.blackduck.integration.blackduck.api.generated.discovery.ApiDiscovery; import com.blackduck.integration.blackduck.bdio2.Bdio2FileUploadService; import com.blackduck.integration.blackduck.bdio2.Bdio2RetryAwareStreamUploader; import com.blackduck.integration.blackduck.bdio2.Bdio2StreamUploader; @@ -33,37 +30,21 @@ import com.blackduck.integration.blackduck.http.transform.BlackDuckResponsesTransformer; import com.blackduck.integration.blackduck.http.transform.adapters.OffsetDateTimeTypeAdapter; import com.blackduck.integration.blackduck.http.transform.subclass.BlackDuckResponseResolver; -import org.apache.commons.lang3.builder.ReflectionToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; - +import com.blackduck.integration.blackduck.service.dataservice.*; +import com.blackduck.integration.log.IntLogger; +import com.blackduck.integration.rest.RestConstants; +import com.blackduck.integration.util.IntEnvironmentVariables; +import com.blackduck.integration.util.IntegrationEscapeUtil; +import com.blackduck.integration.util.NoThreadExecutorService; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.gson.Gson; import com.google.gson.GsonBuilder; -import com.synopsys.integration.blackduck.api.generated.discovery.ApiDiscovery; -import com.blackduck.integration.blackduck.service.dataservice.BlackDuckRegistrationService; -import com.blackduck.integration.blackduck.service.dataservice.BlackDuckScanReadinessService; -import com.blackduck.integration.blackduck.service.dataservice.CodeLocationService; -import com.blackduck.integration.blackduck.service.dataservice.ComponentService; -import com.blackduck.integration.blackduck.service.dataservice.IacScanUploadService; -import com.blackduck.integration.blackduck.service.dataservice.IssueService; -import com.blackduck.integration.blackduck.service.dataservice.LicenseService; -import com.blackduck.integration.blackduck.service.dataservice.NotificationService; -import com.blackduck.integration.blackduck.service.dataservice.PolicyRuleService; -import com.blackduck.integration.blackduck.service.dataservice.ProjectBomService; -import com.blackduck.integration.blackduck.service.dataservice.ProjectGetService; -import com.blackduck.integration.blackduck.service.dataservice.ProjectMappingService; -import com.blackduck.integration.blackduck.service.dataservice.ProjectService; -import com.blackduck.integration.blackduck.service.dataservice.ProjectUsersService; -import com.blackduck.integration.blackduck.service.dataservice.RoleService; -import com.blackduck.integration.blackduck.service.dataservice.TagService; -import com.blackduck.integration.blackduck.service.dataservice.UserGroupService; -import com.blackduck.integration.blackduck.service.dataservice.UserRoleService; -import com.blackduck.integration.blackduck.service.dataservice.UserService; -import com.synopsys.integration.log.IntLogger; -import com.synopsys.integration.rest.RestConstants; -import com.synopsys.integration.util.IntEnvironmentVariables; -import com.synopsys.integration.util.IntegrationEscapeUtil; -import com.synopsys.integration.util.NoThreadExecutorService; +import org.apache.commons.lang3.builder.ReflectionToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import java.io.File; +import java.time.OffsetDateTime; +import java.util.concurrent.ExecutorService; public class BlackDuckServicesFactory { public static final ExecutorService NO_THREAD_EXECUTOR_SERVICE = new NoThreadExecutorService(); diff --git a/src/main/java/com/blackduck/integration/blackduck/service/DataService.java b/src/main/java/com/blackduck/integration/blackduck/service/DataService.java index 780d8e5d1..3e6cbabd6 100644 --- a/src/main/java/com/blackduck/integration/blackduck/service/DataService.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/DataService.java @@ -7,8 +7,8 @@ */ package com.blackduck.integration.blackduck.service; -import com.synopsys.integration.blackduck.api.generated.discovery.ApiDiscovery; -import com.synopsys.integration.log.IntLogger; +import com.blackduck.integration.blackduck.api.generated.discovery.ApiDiscovery; +import com.blackduck.integration.log.IntLogger; public class DataService { protected final BlackDuckApiClient blackDuckApiClient; diff --git a/src/main/java/com/blackduck/integration/blackduck/service/dataservice/BlackDuckRegistrationService.java b/src/main/java/com/blackduck/integration/blackduck/service/dataservice/BlackDuckRegistrationService.java index 5382f08ae..f5fb64be2 100644 --- a/src/main/java/com/blackduck/integration/blackduck/service/dataservice/BlackDuckRegistrationService.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/dataservice/BlackDuckRegistrationService.java @@ -7,18 +7,18 @@ */ package com.blackduck.integration.blackduck.service.dataservice; +import com.blackduck.integration.blackduck.api.core.response.UrlSingleResponse; +import com.blackduck.integration.blackduck.api.generated.discovery.ApiDiscovery; +import com.blackduck.integration.blackduck.api.generated.response.CurrentVersionView; +import com.blackduck.integration.blackduck.api.generated.view.RegistrationView; import com.blackduck.integration.blackduck.http.BlackDuckRequestBuilder; import com.blackduck.integration.blackduck.service.BlackDuckApiClient; import com.blackduck.integration.blackduck.service.DataService; -import com.blackduck.integration.blackduck.service.request.BlackDuckSingleRequest; -import com.synopsys.integration.blackduck.api.core.response.UrlSingleResponse; -import com.synopsys.integration.blackduck.api.generated.discovery.ApiDiscovery; -import com.synopsys.integration.blackduck.api.generated.response.CurrentVersionView; -import com.synopsys.integration.blackduck.api.generated.view.RegistrationView; import com.blackduck.integration.blackduck.service.model.BlackDuckServerData; -import com.synopsys.integration.exception.IntegrationException; -import com.synopsys.integration.log.IntLogger; -import com.synopsys.integration.rest.HttpUrl; +import com.blackduck.integration.blackduck.service.request.BlackDuckSingleRequest; +import com.blackduck.integration.exception.IntegrationException; +import com.blackduck.integration.log.IntLogger; +import com.blackduck.integration.rest.HttpUrl; public class BlackDuckRegistrationService extends DataService { private final UrlSingleResponse registrationResponse = apiDiscovery.metaRegistrationLink(); diff --git a/src/main/java/com/blackduck/integration/blackduck/service/dataservice/BlackDuckScanReadinessService.java b/src/main/java/com/blackduck/integration/blackduck/service/dataservice/BlackDuckScanReadinessService.java index 981695fad..e4e8e0398 100644 --- a/src/main/java/com/blackduck/integration/blackduck/service/dataservice/BlackDuckScanReadinessService.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/dataservice/BlackDuckScanReadinessService.java @@ -7,12 +7,12 @@ */ package com.blackduck.integration.blackduck.service.dataservice; +import com.blackduck.integration.blackduck.api.generated.discovery.ApiDiscovery; +import com.blackduck.integration.blackduck.api.generated.view.ScanReadinessView; import com.blackduck.integration.blackduck.service.BlackDuckApiClient; import com.blackduck.integration.blackduck.service.DataService; -import com.synopsys.integration.blackduck.api.generated.discovery.ApiDiscovery; -import com.synopsys.integration.blackduck.api.generated.view.ScanReadinessView; -import com.synopsys.integration.exception.IntegrationException; -import com.synopsys.integration.log.IntLogger; +import com.blackduck.integration.exception.IntegrationException; +import com.blackduck.integration.log.IntLogger; public class BlackDuckScanReadinessService extends DataService { public BlackDuckScanReadinessService( diff --git a/src/main/java/com/blackduck/integration/blackduck/service/dataservice/CodeLocationService.java b/src/main/java/com/blackduck/integration/blackduck/service/dataservice/CodeLocationService.java index df147a092..5451fb813 100644 --- a/src/main/java/com/blackduck/integration/blackduck/service/dataservice/CodeLocationService.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/dataservice/CodeLocationService.java @@ -7,29 +7,29 @@ */ package com.blackduck.integration.blackduck.service.dataservice; -import java.util.List; -import java.util.Optional; -import java.util.function.BiPredicate; -import java.util.function.Predicate; - +import com.blackduck.integration.blackduck.api.core.BlackDuckPath; +import com.blackduck.integration.blackduck.api.core.ResourceMetadata; +import com.blackduck.integration.blackduck.api.core.response.UrlMultipleResponses; +import com.blackduck.integration.blackduck.api.core.response.UrlSingleResponse; +import com.blackduck.integration.blackduck.api.generated.discovery.ApiDiscovery; +import com.blackduck.integration.blackduck.api.generated.view.CodeLocationView; +import com.blackduck.integration.blackduck.api.generated.view.ProjectVersionView; +import com.blackduck.integration.blackduck.api.manual.view.ScanSummaryView; import com.blackduck.integration.blackduck.http.BlackDuckQuery; import com.blackduck.integration.blackduck.http.BlackDuckRequestBuilder; import com.blackduck.integration.blackduck.service.BlackDuckApiClient; import com.blackduck.integration.blackduck.service.DataService; +import com.blackduck.integration.blackduck.service.request.BlackDuckMultipleRequest; +import com.blackduck.integration.exception.IntegrationException; +import com.blackduck.integration.log.IntLogger; +import com.blackduck.integration.rest.HttpUrl; import com.fasterxml.jackson.databind.node.JsonNodeFactory; import com.fasterxml.jackson.databind.node.NullNode; -import com.synopsys.integration.blackduck.api.core.BlackDuckPath; -import com.synopsys.integration.blackduck.api.core.ResourceMetadata; -import com.synopsys.integration.blackduck.api.core.response.UrlMultipleResponses; -import com.synopsys.integration.blackduck.api.core.response.UrlSingleResponse; -import com.synopsys.integration.blackduck.api.generated.discovery.ApiDiscovery; -import com.synopsys.integration.blackduck.api.generated.view.CodeLocationView; -import com.synopsys.integration.blackduck.api.generated.view.ProjectVersionView; -import com.synopsys.integration.blackduck.api.manual.view.ScanSummaryView; -import com.blackduck.integration.blackduck.service.request.BlackDuckMultipleRequest; -import com.synopsys.integration.exception.IntegrationException; -import com.synopsys.integration.log.IntLogger; -import com.synopsys.integration.rest.HttpUrl; + +import java.util.List; +import java.util.Optional; +import java.util.function.BiPredicate; +import java.util.function.Predicate; public class CodeLocationService extends DataService { // as of at least 2019.6.0, code location names in Black Duck are case-insensitive diff --git a/src/main/java/com/blackduck/integration/blackduck/service/dataservice/ComponentService.java b/src/main/java/com/blackduck/integration/blackduck/service/dataservice/ComponentService.java index 843d05b84..1fc500350 100644 --- a/src/main/java/com/blackduck/integration/blackduck/service/dataservice/ComponentService.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/dataservice/ComponentService.java @@ -7,31 +7,30 @@ */ package com.blackduck.integration.blackduck.service.dataservice; -import java.util.List; -import java.util.Optional; -import java.util.function.BiFunction; -import java.util.function.Function; - +import com.blackduck.integration.bdio.model.externalid.ExternalId; +import com.blackduck.integration.blackduck.api.core.response.UrlMultipleResponses; +import com.blackduck.integration.blackduck.api.generated.discovery.ApiDiscovery; +import com.blackduck.integration.blackduck.api.generated.response.ComponentVersionUpgradeGuidanceView; +import com.blackduck.integration.blackduck.api.generated.response.ComponentsView; +import com.blackduck.integration.blackduck.api.generated.view.ComponentVersionView; +import com.blackduck.integration.blackduck.api.generated.view.ComponentView; +import com.blackduck.integration.blackduck.api.generated.view.VulnerabilityView; import com.blackduck.integration.blackduck.http.BlackDuckMediaTypes; import com.blackduck.integration.blackduck.http.BlackDuckQuery; import com.blackduck.integration.blackduck.http.BlackDuckRequestBuilder; import com.blackduck.integration.blackduck.service.BlackDuckApiClient; import com.blackduck.integration.blackduck.service.DataService; -import org.apache.commons.lang3.StringUtils; - -import com.synopsys.integration.bdio.model.externalid.ExternalId; -import com.synopsys.integration.blackduck.api.core.response.UrlMultipleResponses; -import com.synopsys.integration.blackduck.api.generated.discovery.ApiDiscovery; -import com.synopsys.integration.blackduck.api.generated.response.ComponentVersionUpgradeGuidanceView; -import com.synopsys.integration.blackduck.api.generated.response.ComponentsView; -import com.synopsys.integration.blackduck.api.generated.view.ComponentVersionView; -import com.synopsys.integration.blackduck.api.generated.view.ComponentView; -import com.synopsys.integration.blackduck.api.generated.view.VulnerabilityView; import com.blackduck.integration.blackduck.service.model.ComponentVersionVulnerabilities; import com.blackduck.integration.blackduck.service.request.BlackDuckMultipleRequest; -import com.synopsys.integration.exception.IntegrationException; -import com.synopsys.integration.log.IntLogger; -import com.synopsys.integration.rest.HttpUrl; +import com.blackduck.integration.exception.IntegrationException; +import com.blackduck.integration.log.IntLogger; +import com.blackduck.integration.rest.HttpUrl; +import org.apache.commons.lang3.StringUtils; + +import java.util.List; +import java.util.Optional; +import java.util.function.BiFunction; +import java.util.function.Function; public class ComponentService extends DataService { public static final Function, Optional> FIRST_OR_EMPTY_RESULT = diff --git a/src/main/java/com/blackduck/integration/blackduck/service/dataservice/IacScanUploadService.java b/src/main/java/com/blackduck/integration/blackduck/service/dataservice/IacScanUploadService.java index 6e2cdce4a..df7d62caa 100644 --- a/src/main/java/com/blackduck/integration/blackduck/service/dataservice/IacScanUploadService.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/dataservice/IacScanUploadService.java @@ -7,17 +7,16 @@ */ package com.blackduck.integration.blackduck.service.dataservice; +import com.blackduck.integration.blackduck.api.core.BlackDuckPath; +import com.blackduck.integration.blackduck.api.core.BlackDuckResponse; +import com.blackduck.integration.blackduck.api.generated.discovery.ApiDiscovery; import com.blackduck.integration.blackduck.http.BlackDuckRequestBuilder; import com.blackduck.integration.blackduck.service.BlackDuckApiClient; -import org.apache.http.entity.ContentType; - -import com.synopsys.integration.blackduck.api.core.BlackDuckPath; -import com.synopsys.integration.blackduck.api.core.BlackDuckResponse; -import com.synopsys.integration.blackduck.api.generated.discovery.ApiDiscovery; import com.blackduck.integration.blackduck.service.request.BlackDuckResponseRequest; -import com.synopsys.integration.exception.IntegrationException; -import com.synopsys.integration.rest.HttpUrl; -import com.synopsys.integration.rest.response.Response; +import com.blackduck.integration.exception.IntegrationException; +import com.blackduck.integration.rest.HttpUrl; +import com.blackduck.integration.rest.response.Response; +import org.apache.http.entity.ContentType; public class IacScanUploadService { public static final String IAC_SCAN_UPLOAD_PATH_PATTERN = "/api/internal/scans/%s/iac-issues"; diff --git a/src/main/java/com/blackduck/integration/blackduck/service/dataservice/IssueService.java b/src/main/java/com/blackduck/integration/blackduck/service/dataservice/IssueService.java index f8df90b13..2b1c77601 100644 --- a/src/main/java/com/blackduck/integration/blackduck/service/dataservice/IssueService.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/dataservice/IssueService.java @@ -7,23 +7,19 @@ */ package com.blackduck.integration.blackduck.service.dataservice; +import com.blackduck.integration.blackduck.api.generated.discovery.ApiDiscovery; +import com.blackduck.integration.blackduck.api.generated.view.*; +import com.blackduck.integration.blackduck.api.manual.temporary.component.IssueRequest; +import com.blackduck.integration.blackduck.service.BlackDuckApiClient; +import com.blackduck.integration.blackduck.service.DataService; +import com.blackduck.integration.exception.IntegrationException; +import com.blackduck.integration.log.IntLogger; +import com.blackduck.integration.rest.HttpUrl; + import java.util.List; import java.util.Optional; import java.util.function.Predicate; -import com.blackduck.integration.blackduck.service.BlackDuckApiClient; -import com.blackduck.integration.blackduck.service.DataService; -import com.synopsys.integration.blackduck.api.generated.discovery.ApiDiscovery; -import com.synopsys.integration.blackduck.api.generated.view.IssueView; -import com.synopsys.integration.blackduck.api.generated.view.ProjectVersionComponentVersionView; -import com.synopsys.integration.blackduck.api.generated.view.ProjectVersionComponentView; -import com.synopsys.integration.blackduck.api.generated.view.ProjectVersionIssuesView; -import com.synopsys.integration.blackduck.api.generated.view.ProjectVersionView; -import com.synopsys.integration.blackduck.api.manual.temporary.component.IssueRequest; -import com.synopsys.integration.exception.IntegrationException; -import com.synopsys.integration.log.IntLogger; -import com.synopsys.integration.rest.HttpUrl; - public class IssueService extends DataService { public IssueService(BlackDuckApiClient blackDuckApiClient, ApiDiscovery apiDiscovery, IntLogger logger) { super(blackDuckApiClient, apiDiscovery, logger); diff --git a/src/main/java/com/blackduck/integration/blackduck/service/dataservice/LicenseService.java b/src/main/java/com/blackduck/integration/blackduck/service/dataservice/LicenseService.java index c06c29900..71835e2b6 100644 --- a/src/main/java/com/blackduck/integration/blackduck/service/dataservice/LicenseService.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/dataservice/LicenseService.java @@ -7,28 +7,28 @@ */ package com.blackduck.integration.blackduck.service.dataservice; -import java.io.IOException; -import java.util.List; -import java.util.Optional; - +import com.blackduck.integration.bdio.model.externalid.ExternalId; +import com.blackduck.integration.blackduck.api.core.response.UrlMultipleResponses; +import com.blackduck.integration.blackduck.api.generated.discovery.ApiDiscovery; +import com.blackduck.integration.blackduck.api.generated.response.ComponentsView; +import com.blackduck.integration.blackduck.api.generated.view.ComponentVersionLicenseLicensesView; +import com.blackduck.integration.blackduck.api.generated.view.ComponentVersionLicenseView; +import com.blackduck.integration.blackduck.api.generated.view.ComponentVersionView; +import com.blackduck.integration.blackduck.api.generated.view.LicenseView; +import com.blackduck.integration.blackduck.api.manual.temporary.component.VersionBomLicenseView; import com.blackduck.integration.blackduck.http.BlackDuckQuery; import com.blackduck.integration.blackduck.http.BlackDuckRequestBuilder; import com.blackduck.integration.blackduck.service.BlackDuckApiClient; import com.blackduck.integration.blackduck.service.DataService; -import com.synopsys.integration.bdio.model.externalid.ExternalId; -import com.synopsys.integration.blackduck.api.core.response.UrlMultipleResponses; -import com.synopsys.integration.blackduck.api.generated.discovery.ApiDiscovery; -import com.synopsys.integration.blackduck.api.generated.response.ComponentsView; -import com.synopsys.integration.blackduck.api.generated.view.ComponentVersionLicenseLicensesView; -import com.synopsys.integration.blackduck.api.generated.view.ComponentVersionLicenseView; -import com.synopsys.integration.blackduck.api.generated.view.ComponentVersionView; -import com.synopsys.integration.blackduck.api.generated.view.LicenseView; -import com.synopsys.integration.blackduck.api.manual.temporary.component.VersionBomLicenseView; import com.blackduck.integration.blackduck.service.request.BlackDuckRequest; -import com.synopsys.integration.exception.IntegrationException; -import com.synopsys.integration.log.IntLogger; -import com.synopsys.integration.rest.HttpUrl; -import com.synopsys.integration.rest.response.Response; +import com.blackduck.integration.exception.IntegrationException; +import com.blackduck.integration.log.IntLogger; +import com.blackduck.integration.rest.HttpUrl; +import com.blackduck.integration.rest.response.Response; + +import java.io.IOException; +import java.util.List; +import java.util.Optional; public class LicenseService extends DataService { private final ComponentService componentDataService; diff --git a/src/main/java/com/blackduck/integration/blackduck/service/dataservice/NotificationService.java b/src/main/java/com/blackduck/integration/blackduck/service/dataservice/NotificationService.java index fd95b4d99..b884c4afa 100644 --- a/src/main/java/com/blackduck/integration/blackduck/service/dataservice/NotificationService.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/dataservice/NotificationService.java @@ -7,28 +7,28 @@ */ package com.blackduck.integration.blackduck.service.dataservice; -import java.util.Date; -import java.util.List; -import java.util.function.Function; -import java.util.stream.Collectors; -import java.util.stream.Stream; - +import com.blackduck.integration.blackduck.api.core.response.UrlMultipleResponses; +import com.blackduck.integration.blackduck.api.generated.discovery.ApiDiscovery; +import com.blackduck.integration.blackduck.api.generated.view.UserView; +import com.blackduck.integration.blackduck.api.manual.temporary.enumeration.NotificationType; +import com.blackduck.integration.blackduck.api.manual.view.NotificationUserView; +import com.blackduck.integration.blackduck.api.manual.view.NotificationView; import com.blackduck.integration.blackduck.http.BlackDuckPageDefinition; import com.blackduck.integration.blackduck.http.BlackDuckPageResponse; import com.blackduck.integration.blackduck.http.BlackDuckRequestBuilder; import com.blackduck.integration.blackduck.http.BlackDuckRequestFilter; import com.blackduck.integration.blackduck.service.BlackDuckApiClient; import com.blackduck.integration.blackduck.service.DataService; -import com.synopsys.integration.blackduck.api.core.response.UrlMultipleResponses; -import com.synopsys.integration.blackduck.api.generated.discovery.ApiDiscovery; -import com.synopsys.integration.blackduck.api.generated.view.UserView; -import com.synopsys.integration.blackduck.api.manual.temporary.enumeration.NotificationType; -import com.synopsys.integration.blackduck.api.manual.view.NotificationUserView; -import com.synopsys.integration.blackduck.api.manual.view.NotificationView; import com.blackduck.integration.blackduck.service.request.BlackDuckMultipleRequest; import com.blackduck.integration.blackduck.service.request.NotificationEditor; -import com.synopsys.integration.exception.IntegrationException; -import com.synopsys.integration.log.IntLogger; +import com.blackduck.integration.exception.IntegrationException; +import com.blackduck.integration.log.IntLogger; + +import java.util.Date; +import java.util.List; +import java.util.function.Function; +import java.util.stream.Collectors; +import java.util.stream.Stream; public class NotificationService extends DataService { // ejk - to get all notifications: diff --git a/src/main/java/com/blackduck/integration/blackduck/service/dataservice/PolicyRuleService.java b/src/main/java/com/blackduck/integration/blackduck/service/dataservice/PolicyRuleService.java index 1c1207c14..a55f52228 100644 --- a/src/main/java/com/blackduck/integration/blackduck/service/dataservice/PolicyRuleService.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/dataservice/PolicyRuleService.java @@ -7,25 +7,25 @@ */ package com.blackduck.integration.blackduck.service.dataservice; -import java.util.List; -import java.util.Optional; -import java.util.function.Predicate; - -import com.blackduck.integration.blackduck.service.BlackDuckApiClient; -import com.blackduck.integration.blackduck.service.DataService; -import com.synopsys.integration.bdio.model.externalid.ExternalId; -import com.synopsys.integration.blackduck.api.core.response.UrlMultipleResponses; +import com.blackduck.integration.bdio.model.externalid.ExternalId; +import com.blackduck.integration.blackduck.api.core.response.UrlMultipleResponses; import com.blackduck.integration.blackduck.api.enumeration.PolicyRuleConditionOperatorType; -import com.synopsys.integration.blackduck.api.generated.component.PolicyRuleExpressionView; -import com.synopsys.integration.blackduck.api.generated.discovery.ApiDiscovery; -import com.synopsys.integration.blackduck.api.generated.response.ComponentsView; -import com.synopsys.integration.blackduck.api.generated.view.ComponentVersionView; -import com.synopsys.integration.blackduck.api.generated.view.PolicyRuleView; +import com.blackduck.integration.blackduck.api.generated.component.PolicyRuleExpressionView; +import com.blackduck.integration.blackduck.api.generated.discovery.ApiDiscovery; +import com.blackduck.integration.blackduck.api.generated.response.ComponentsView; +import com.blackduck.integration.blackduck.api.generated.view.ComponentVersionView; +import com.blackduck.integration.blackduck.api.generated.view.PolicyRuleView; import com.blackduck.integration.blackduck.exception.BlackDuckIntegrationException; +import com.blackduck.integration.blackduck.service.BlackDuckApiClient; +import com.blackduck.integration.blackduck.service.DataService; import com.blackduck.integration.blackduck.service.model.PolicyRuleExpressionSetBuilder; -import com.synopsys.integration.exception.IntegrationException; -import com.synopsys.integration.log.IntLogger; -import com.synopsys.integration.rest.HttpUrl; +import com.blackduck.integration.exception.IntegrationException; +import com.blackduck.integration.log.IntLogger; +import com.blackduck.integration.rest.HttpUrl; + +import java.util.List; +import java.util.Optional; +import java.util.function.Predicate; public class PolicyRuleService extends DataService { private final UrlMultipleResponses policyRulesResponses = apiDiscovery.metaMultipleResponses(ApiDiscovery.POLICY_RULES_PATH); diff --git a/src/main/java/com/blackduck/integration/blackduck/service/dataservice/ProjectBomService.java b/src/main/java/com/blackduck/integration/blackduck/service/dataservice/ProjectBomService.java index e267fac65..0d01caa5d 100644 --- a/src/main/java/com/blackduck/integration/blackduck/service/dataservice/ProjectBomService.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/dataservice/ProjectBomService.java @@ -7,35 +7,28 @@ */ package com.blackduck.integration.blackduck.service.dataservice; -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; -import java.util.Optional; - +import com.blackduck.integration.bdio.model.externalid.ExternalId; +import com.blackduck.integration.blackduck.api.core.response.UrlMultipleResponses; +import com.blackduck.integration.blackduck.api.generated.discovery.ApiDiscovery; +import com.blackduck.integration.blackduck.api.generated.response.ComponentsView; +import com.blackduck.integration.blackduck.api.generated.view.*; import com.blackduck.integration.blackduck.http.BlackDuckRequestBuilder; import com.blackduck.integration.blackduck.service.BlackDuckApiClient; import com.blackduck.integration.blackduck.service.DataService; -import org.apache.commons.lang3.StringUtils; - -import com.synopsys.integration.bdio.model.externalid.ExternalId; -import com.synopsys.integration.blackduck.api.core.response.UrlMultipleResponses; -import com.synopsys.integration.blackduck.api.generated.discovery.ApiDiscovery; -import com.synopsys.integration.blackduck.api.generated.response.ComponentsView; -import com.synopsys.integration.blackduck.api.generated.view.ComponentMatchedFilesView; -import com.synopsys.integration.blackduck.api.generated.view.ComponentVersionView; -import com.synopsys.integration.blackduck.api.generated.view.ProjectVersionComponentVersionView; -import com.synopsys.integration.blackduck.api.generated.view.ProjectVersionPolicyRulesView; -import com.synopsys.integration.blackduck.api.generated.view.ProjectVersionPolicyStatusView; -import com.synopsys.integration.blackduck.api.generated.view.ProjectVersionView; -import com.synopsys.integration.blackduck.api.generated.view.ProjectVersionVulnerableBomComponentsView; import com.blackduck.integration.blackduck.service.model.ComponentVersionVulnerabilities; import com.blackduck.integration.blackduck.service.model.VersionBomComponentModel; import com.blackduck.integration.blackduck.service.request.BlackDuckResponseRequest; -import com.synopsys.integration.exception.IntegrationException; -import com.synopsys.integration.log.IntLogger; -import com.synopsys.integration.rest.HttpUrl; -import com.synopsys.integration.rest.body.BodyContentConverter; -import com.synopsys.integration.rest.response.Response; +import com.blackduck.integration.exception.IntegrationException; +import com.blackduck.integration.log.IntLogger; +import com.blackduck.integration.rest.HttpUrl; +import com.blackduck.integration.rest.body.BodyContentConverter; +import com.blackduck.integration.rest.response.Response; +import org.apache.commons.lang3.StringUtils; + +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; +import java.util.Optional; public class ProjectBomService extends DataService { private final ComponentService componentService; diff --git a/src/main/java/com/blackduck/integration/blackduck/service/dataservice/ProjectGetService.java b/src/main/java/com/blackduck/integration/blackduck/service/dataservice/ProjectGetService.java index 9a2aa182c..2d73e56a9 100644 --- a/src/main/java/com/blackduck/integration/blackduck/service/dataservice/ProjectGetService.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/dataservice/ProjectGetService.java @@ -7,21 +7,21 @@ */ package com.blackduck.integration.blackduck.service.dataservice; -import java.util.List; -import java.util.Optional; -import java.util.function.Predicate; - +import com.blackduck.integration.blackduck.api.core.response.UrlMultipleResponses; +import com.blackduck.integration.blackduck.api.generated.discovery.ApiDiscovery; +import com.blackduck.integration.blackduck.api.generated.view.ProjectVersionView; +import com.blackduck.integration.blackduck.api.manual.view.ProjectView; import com.blackduck.integration.blackduck.http.BlackDuckQuery; import com.blackduck.integration.blackduck.http.BlackDuckRequestBuilder; import com.blackduck.integration.blackduck.service.BlackDuckApiClient; import com.blackduck.integration.blackduck.service.DataService; -import com.synopsys.integration.blackduck.api.core.response.UrlMultipleResponses; -import com.synopsys.integration.blackduck.api.generated.discovery.ApiDiscovery; -import com.synopsys.integration.blackduck.api.generated.view.ProjectVersionView; -import com.synopsys.integration.blackduck.api.manual.view.ProjectView; import com.blackduck.integration.blackduck.service.request.BlackDuckMultipleRequest; -import com.synopsys.integration.exception.IntegrationException; -import com.synopsys.integration.log.IntLogger; +import com.blackduck.integration.exception.IntegrationException; +import com.blackduck.integration.log.IntLogger; + +import java.util.List; +import java.util.Optional; +import java.util.function.Predicate; public class ProjectGetService extends DataService { private final UrlMultipleResponses projectsResponses = apiDiscovery.metaMultipleResponses(ApiDiscovery.PROJECTS_PATH); diff --git a/src/main/java/com/blackduck/integration/blackduck/service/dataservice/ProjectMappingService.java b/src/main/java/com/blackduck/integration/blackduck/service/dataservice/ProjectMappingService.java index f776d6290..cbcf3bd51 100644 --- a/src/main/java/com/blackduck/integration/blackduck/service/dataservice/ProjectMappingService.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/dataservice/ProjectMappingService.java @@ -7,17 +7,17 @@ */ package com.blackduck.integration.blackduck.service.dataservice; -import java.util.List; - +import com.blackduck.integration.blackduck.api.generated.discovery.ApiDiscovery; +import com.blackduck.integration.blackduck.api.manual.view.ProjectMappingView; +import com.blackduck.integration.blackduck.api.manual.view.ProjectView; +import com.blackduck.integration.blackduck.exception.BlackDuckIntegrationException; import com.blackduck.integration.blackduck.service.BlackDuckApiClient; import com.blackduck.integration.blackduck.service.DataService; -import com.synopsys.integration.blackduck.api.generated.discovery.ApiDiscovery; -import com.synopsys.integration.blackduck.api.manual.view.ProjectView; -import com.synopsys.integration.blackduck.api.manual.view.ProjectMappingView; -import com.blackduck.integration.blackduck.exception.BlackDuckIntegrationException; -import com.synopsys.integration.exception.IntegrationException; -import com.synopsys.integration.log.IntLogger; -import com.synopsys.integration.rest.HttpUrl; +import com.blackduck.integration.exception.IntegrationException; +import com.blackduck.integration.log.IntLogger; +import com.blackduck.integration.rest.HttpUrl; + +import java.util.List; public class ProjectMappingService extends DataService { public ProjectMappingService(BlackDuckApiClient blackDuckApiClient, ApiDiscovery apiDiscovery, IntLogger logger) { diff --git a/src/main/java/com/blackduck/integration/blackduck/service/dataservice/ProjectService.java b/src/main/java/com/blackduck/integration/blackduck/service/dataservice/ProjectService.java index 5d54d4436..2025d1e5d 100644 --- a/src/main/java/com/blackduck/integration/blackduck/service/dataservice/ProjectService.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/dataservice/ProjectService.java @@ -7,25 +7,25 @@ */ package com.blackduck.integration.blackduck.service.dataservice; -import java.util.Comparator; -import java.util.List; -import java.util.Optional; - +import com.blackduck.integration.blackduck.api.core.response.UrlMultipleResponses; +import com.blackduck.integration.blackduck.api.generated.discovery.ApiDiscovery; +import com.blackduck.integration.blackduck.api.generated.view.ProjectVersionView; +import com.blackduck.integration.blackduck.api.manual.temporary.component.ProjectRequest; +import com.blackduck.integration.blackduck.api.manual.temporary.component.ProjectVersionRequest; +import com.blackduck.integration.blackduck.api.manual.view.ProjectView; +import com.blackduck.integration.blackduck.exception.BlackDuckIntegrationException; import com.blackduck.integration.blackduck.service.BlackDuckApiClient; import com.blackduck.integration.blackduck.service.DataService; -import com.synopsys.integration.blackduck.api.core.response.UrlMultipleResponses; -import com.synopsys.integration.blackduck.api.generated.discovery.ApiDiscovery; -import com.synopsys.integration.blackduck.api.generated.view.ProjectVersionView; -import com.synopsys.integration.blackduck.api.manual.view.ProjectView; -import com.synopsys.integration.blackduck.api.manual.temporary.component.ProjectRequest; -import com.synopsys.integration.blackduck.api.manual.temporary.component.ProjectVersionRequest; -import com.blackduck.integration.blackduck.exception.BlackDuckIntegrationException; import com.blackduck.integration.blackduck.service.model.ProjectSyncModel; import com.blackduck.integration.blackduck.service.model.ProjectVersionWrapper; -import com.synopsys.integration.exception.IntegrationException; -import com.synopsys.integration.log.IntLogger; -import com.synopsys.integration.rest.HttpUrl; -import com.synopsys.integration.util.NameVersion; +import com.blackduck.integration.exception.IntegrationException; +import com.blackduck.integration.log.IntLogger; +import com.blackduck.integration.rest.HttpUrl; +import com.blackduck.integration.util.NameVersion; + +import java.util.Comparator; +import java.util.List; +import java.util.Optional; public class ProjectService extends DataService { private final UrlMultipleResponses projectsResponses = apiDiscovery.metaMultipleResponses(ApiDiscovery.PROJECTS_PATH); diff --git a/src/main/java/com/blackduck/integration/blackduck/service/dataservice/ProjectUsersService.java b/src/main/java/com/blackduck/integration/blackduck/service/dataservice/ProjectUsersService.java index a61dd7377..f43c0c637 100644 --- a/src/main/java/com/blackduck/integration/blackduck/service/dataservice/ProjectUsersService.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/dataservice/ProjectUsersService.java @@ -7,28 +7,24 @@ */ package com.blackduck.integration.blackduck.service.dataservice; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; -import java.util.Optional; -import java.util.Set; -import java.util.stream.Collectors; - +import com.blackduck.integration.blackduck.api.core.response.UrlMultipleResponses; +import com.blackduck.integration.blackduck.api.generated.discovery.ApiDiscovery; +import com.blackduck.integration.blackduck.api.generated.view.UserGroupView; +import com.blackduck.integration.blackduck.api.generated.view.UserView; +import com.blackduck.integration.blackduck.api.manual.temporary.component.AssignedUserGroupRequest; +import com.blackduck.integration.blackduck.api.manual.temporary.component.AssignedUserRequest; +import com.blackduck.integration.blackduck.api.manual.temporary.response.AssignedUserGroupView; +import com.blackduck.integration.blackduck.api.manual.temporary.view.AssignedUserView; +import com.blackduck.integration.blackduck.api.manual.view.ProjectView; +import com.blackduck.integration.blackduck.exception.BlackDuckIntegrationException; import com.blackduck.integration.blackduck.service.BlackDuckApiClient; import com.blackduck.integration.blackduck.service.DataService; -import com.synopsys.integration.blackduck.api.core.response.UrlMultipleResponses; -import com.synopsys.integration.blackduck.api.generated.discovery.ApiDiscovery; -import com.synopsys.integration.blackduck.api.manual.view.ProjectView; -import com.synopsys.integration.blackduck.api.generated.view.UserGroupView; -import com.synopsys.integration.blackduck.api.generated.view.UserView; -import com.synopsys.integration.blackduck.api.manual.temporary.component.AssignedUserGroupRequest; -import com.synopsys.integration.blackduck.api.manual.temporary.component.AssignedUserRequest; -import com.synopsys.integration.blackduck.api.manual.temporary.response.AssignedUserGroupView; -import com.synopsys.integration.blackduck.api.manual.temporary.view.AssignedUserView; -import com.blackduck.integration.blackduck.exception.BlackDuckIntegrationException; -import com.synopsys.integration.exception.IntegrationException; -import com.synopsys.integration.log.IntLogger; -import com.synopsys.integration.rest.HttpUrl; +import com.blackduck.integration.exception.IntegrationException; +import com.blackduck.integration.log.IntLogger; +import com.blackduck.integration.rest.HttpUrl; + +import java.util.*; +import java.util.stream.Collectors; public class ProjectUsersService extends DataService { private final UserGroupService userGroupService; diff --git a/src/main/java/com/blackduck/integration/blackduck/service/dataservice/RoleService.java b/src/main/java/com/blackduck/integration/blackduck/service/dataservice/RoleService.java index ce56a3546..7b4da5b44 100644 --- a/src/main/java/com/blackduck/integration/blackduck/service/dataservice/RoleService.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/dataservice/RoleService.java @@ -7,18 +7,18 @@ */ package com.blackduck.integration.blackduck.service.dataservice; -import java.util.List; - +import com.blackduck.integration.blackduck.api.core.response.UrlMultipleResponses; +import com.blackduck.integration.blackduck.api.generated.discovery.ApiDiscovery; +import com.blackduck.integration.blackduck.api.generated.view.RoleView; import com.blackduck.integration.blackduck.http.BlackDuckRequestBuilder; import com.blackduck.integration.blackduck.http.BlackDuckRequestFilter; import com.blackduck.integration.blackduck.service.BlackDuckApiClient; import com.blackduck.integration.blackduck.service.DataService; -import com.synopsys.integration.blackduck.api.core.response.UrlMultipleResponses; -import com.synopsys.integration.blackduck.api.generated.discovery.ApiDiscovery; -import com.synopsys.integration.blackduck.api.generated.view.RoleView; import com.blackduck.integration.blackduck.service.request.BlackDuckMultipleRequest; -import com.synopsys.integration.exception.IntegrationException; -import com.synopsys.integration.log.IntLogger; +import com.blackduck.integration.exception.IntegrationException; +import com.blackduck.integration.log.IntLogger; + +import java.util.List; public class RoleService extends DataService { public static final String SERVER_SCOPE = "server"; diff --git a/src/main/java/com/blackduck/integration/blackduck/service/dataservice/TagService.java b/src/main/java/com/blackduck/integration/blackduck/service/dataservice/TagService.java index 9254222b4..e5e59e9d5 100644 --- a/src/main/java/com/blackduck/integration/blackduck/service/dataservice/TagService.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/dataservice/TagService.java @@ -7,18 +7,18 @@ */ package com.blackduck.integration.blackduck.service.dataservice; -import java.util.List; -import java.util.Optional; - +import com.blackduck.integration.blackduck.api.generated.discovery.ApiDiscovery; +import com.blackduck.integration.blackduck.api.generated.view.TagView; +import com.blackduck.integration.blackduck.api.manual.view.ProjectView; +import com.blackduck.integration.blackduck.exception.BlackDuckIntegrationException; import com.blackduck.integration.blackduck.service.BlackDuckApiClient; import com.blackduck.integration.blackduck.service.DataService; -import com.synopsys.integration.blackduck.api.generated.discovery.ApiDiscovery; -import com.synopsys.integration.blackduck.api.manual.view.ProjectView; -import com.synopsys.integration.blackduck.api.generated.view.TagView; -import com.blackduck.integration.blackduck.exception.BlackDuckIntegrationException; -import com.synopsys.integration.exception.IntegrationException; -import com.synopsys.integration.log.IntLogger; -import com.synopsys.integration.rest.HttpUrl; +import com.blackduck.integration.exception.IntegrationException; +import com.blackduck.integration.log.IntLogger; +import com.blackduck.integration.rest.HttpUrl; + +import java.util.List; +import java.util.Optional; public class TagService extends DataService { public TagService(BlackDuckApiClient blackDuckApiClient, ApiDiscovery apiDiscovery, IntLogger logger) { diff --git a/src/main/java/com/blackduck/integration/blackduck/service/dataservice/UserGroupService.java b/src/main/java/com/blackduck/integration/blackduck/service/dataservice/UserGroupService.java index 2d586d926..23c13ebc4 100644 --- a/src/main/java/com/blackduck/integration/blackduck/service/dataservice/UserGroupService.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/dataservice/UserGroupService.java @@ -7,29 +7,24 @@ */ package com.blackduck.integration.blackduck.service.dataservice; -import java.util.ArrayList; -import java.util.Collections; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Optional; -import java.util.Set; -import java.util.function.BiPredicate; -import java.util.function.Predicate; - +import com.blackduck.integration.blackduck.api.generated.discovery.ApiDiscovery; +import com.blackduck.integration.blackduck.api.generated.response.AssignedProjectView; +import com.blackduck.integration.blackduck.api.generated.view.RoleAssignmentView; +import com.blackduck.integration.blackduck.api.generated.view.UserGroupView; +import com.blackduck.integration.blackduck.api.generated.view.UserView; +import com.blackduck.integration.blackduck.api.manual.temporary.component.UserGroupRequest; +import com.blackduck.integration.blackduck.api.manual.view.ProjectView; import com.blackduck.integration.blackduck.http.BlackDuckRequestBuilder; import com.blackduck.integration.blackduck.service.BlackDuckApiClient; import com.blackduck.integration.blackduck.service.DataService; import com.blackduck.integration.blackduck.service.request.BlackDuckMultipleRequest; -import com.synopsys.integration.blackduck.api.generated.discovery.ApiDiscovery; -import com.synopsys.integration.blackduck.api.generated.response.AssignedProjectView; -import com.synopsys.integration.blackduck.api.manual.view.ProjectView; -import com.synopsys.integration.blackduck.api.generated.view.RoleAssignmentView; -import com.synopsys.integration.blackduck.api.generated.view.UserGroupView; -import com.synopsys.integration.blackduck.api.generated.view.UserView; -import com.synopsys.integration.blackduck.api.manual.temporary.component.UserGroupRequest; -import com.synopsys.integration.exception.IntegrationException; -import com.synopsys.integration.log.IntLogger; -import com.synopsys.integration.rest.HttpUrl; +import com.blackduck.integration.exception.IntegrationException; +import com.blackduck.integration.log.IntLogger; +import com.blackduck.integration.rest.HttpUrl; + +import java.util.*; +import java.util.function.BiPredicate; +import java.util.function.Predicate; public class UserGroupService extends DataService { public static final BiPredicate MATCHING_USERNAME = (username, userView) -> username.equalsIgnoreCase(userView.getUserName()); diff --git a/src/main/java/com/blackduck/integration/blackduck/service/dataservice/UserRoleService.java b/src/main/java/com/blackduck/integration/blackduck/service/dataservice/UserRoleService.java index 1282dc796..f3f231688 100644 --- a/src/main/java/com/blackduck/integration/blackduck/service/dataservice/UserRoleService.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/dataservice/UserRoleService.java @@ -7,19 +7,18 @@ */ package com.blackduck.integration.blackduck.service.dataservice; +import com.blackduck.integration.blackduck.api.generated.discovery.ApiDiscovery; +import com.blackduck.integration.blackduck.api.generated.view.RoleView; +import com.blackduck.integration.blackduck.api.generated.view.UserView; +import com.blackduck.integration.blackduck.api.manual.temporary.component.RoleAssignmentRequest; +import com.blackduck.integration.blackduck.api.manual.view.ProjectView; import com.blackduck.integration.blackduck.service.BlackDuckApiClient; import com.blackduck.integration.blackduck.service.DataService; +import com.blackduck.integration.exception.IntegrationException; +import com.blackduck.integration.log.IntLogger; +import com.blackduck.integration.rest.HttpUrl; import org.jetbrains.annotations.NotNull; -import com.synopsys.integration.blackduck.api.generated.discovery.ApiDiscovery; -import com.synopsys.integration.blackduck.api.manual.view.ProjectView; -import com.synopsys.integration.blackduck.api.generated.view.RoleView; -import com.synopsys.integration.blackduck.api.generated.view.UserView; -import com.synopsys.integration.blackduck.api.manual.temporary.component.RoleAssignmentRequest; -import com.synopsys.integration.exception.IntegrationException; -import com.synopsys.integration.log.IntLogger; -import com.synopsys.integration.rest.HttpUrl; - public class UserRoleService extends DataService { public UserRoleService(BlackDuckApiClient blackDuckApiClient, ApiDiscovery apiDiscovery, IntLogger logger) { super(blackDuckApiClient, apiDiscovery, logger); diff --git a/src/main/java/com/blackduck/integration/blackduck/service/dataservice/UserService.java b/src/main/java/com/blackduck/integration/blackduck/service/dataservice/UserService.java index 76fbfcd4a..95e0a0d6d 100644 --- a/src/main/java/com/blackduck/integration/blackduck/service/dataservice/UserService.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/dataservice/UserService.java @@ -7,9 +7,11 @@ */ package com.blackduck.integration.blackduck.service.dataservice; -import java.util.List; -import java.util.Optional; - +import com.blackduck.integration.blackduck.api.core.response.UrlMultipleResponses; +import com.blackduck.integration.blackduck.api.core.response.UrlSingleResponse; +import com.blackduck.integration.blackduck.api.generated.discovery.ApiDiscovery; +import com.blackduck.integration.blackduck.api.generated.view.UserView; +import com.blackduck.integration.blackduck.api.manual.temporary.component.UserRequest; import com.blackduck.integration.blackduck.http.BlackDuckPageDefinition; import com.blackduck.integration.blackduck.http.BlackDuckPageResponse; import com.blackduck.integration.blackduck.http.BlackDuckQuery; @@ -18,14 +20,12 @@ import com.blackduck.integration.blackduck.service.DataService; import com.blackduck.integration.blackduck.service.request.BlackDuckMultipleRequest; import com.blackduck.integration.blackduck.service.request.BlackDuckRequest; -import com.synopsys.integration.blackduck.api.core.response.UrlMultipleResponses; -import com.synopsys.integration.blackduck.api.core.response.UrlSingleResponse; -import com.synopsys.integration.blackduck.api.generated.discovery.ApiDiscovery; -import com.synopsys.integration.blackduck.api.generated.view.UserView; -import com.synopsys.integration.blackduck.api.manual.temporary.component.UserRequest; -import com.synopsys.integration.exception.IntegrationException; -import com.synopsys.integration.log.IntLogger; -import com.synopsys.integration.rest.HttpUrl; +import com.blackduck.integration.exception.IntegrationException; +import com.blackduck.integration.log.IntLogger; +import com.blackduck.integration.rest.HttpUrl; + +import java.util.List; +import java.util.Optional; public class UserService extends DataService { private final UrlSingleResponse currentUserResponse = apiDiscovery.metaSingleResponse(ApiDiscovery.CURRENT_USER_PATH); diff --git a/src/main/java/com/blackduck/integration/blackduck/service/model/BlackDuckServerData.java b/src/main/java/com/blackduck/integration/blackduck/service/model/BlackDuckServerData.java index 73607863f..04fd78204 100644 --- a/src/main/java/com/blackduck/integration/blackduck/service/model/BlackDuckServerData.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/model/BlackDuckServerData.java @@ -7,9 +7,9 @@ */ package com.blackduck.integration.blackduck.service.model; -import java.util.Optional; +import com.blackduck.integration.rest.HttpUrl; -import com.synopsys.integration.rest.HttpUrl; +import java.util.Optional; public class BlackDuckServerData { private final HttpUrl url; diff --git a/src/main/java/com/blackduck/integration/blackduck/service/model/ComponentVersionPolicyViolationCount.java b/src/main/java/com/blackduck/integration/blackduck/service/model/ComponentVersionPolicyViolationCount.java index bc76daeaf..a0ec892e4 100644 --- a/src/main/java/com/blackduck/integration/blackduck/service/model/ComponentVersionPolicyViolationCount.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/model/ComponentVersionPolicyViolationCount.java @@ -7,16 +7,15 @@ */ package com.blackduck.integration.blackduck.service.model; +import com.blackduck.integration.blackduck.api.generated.enumeration.PolicyRuleSeverityType; +import com.blackduck.integration.blackduck.api.manual.temporary.component.NameValuePairView; +import com.blackduck.integration.util.Stringable; +import org.apache.commons.lang3.math.NumberUtils; + import java.util.EnumSet; import java.util.Set; import java.util.stream.Collectors; -import org.apache.commons.lang3.math.NumberUtils; - -import com.synopsys.integration.blackduck.api.generated.enumeration.PolicyRuleSeverityType; -import com.synopsys.integration.blackduck.api.manual.temporary.component.NameValuePairView; -import com.synopsys.integration.util.Stringable; - public class ComponentVersionPolicyViolationCount extends Stringable { public PolicyRuleSeverityType name; public int value; diff --git a/src/main/java/com/blackduck/integration/blackduck/service/model/ComponentVersionStatusCount.java b/src/main/java/com/blackduck/integration/blackduck/service/model/ComponentVersionStatusCount.java index 1c5b3f139..734362d43 100644 --- a/src/main/java/com/blackduck/integration/blackduck/service/model/ComponentVersionStatusCount.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/model/ComponentVersionStatusCount.java @@ -7,16 +7,15 @@ */ package com.blackduck.integration.blackduck.service.model; +import com.blackduck.integration.blackduck.api.generated.enumeration.ProjectVersionComponentPolicyStatusType; +import com.blackduck.integration.blackduck.api.manual.temporary.component.NameValuePairView; +import com.blackduck.integration.util.Stringable; +import org.apache.commons.lang3.math.NumberUtils; + import java.util.EnumSet; import java.util.Set; import java.util.stream.Collectors; -import org.apache.commons.lang3.math.NumberUtils; - -import com.synopsys.integration.blackduck.api.generated.enumeration.ProjectVersionComponentPolicyStatusType; -import com.synopsys.integration.blackduck.api.manual.temporary.component.NameValuePairView; -import com.synopsys.integration.util.Stringable; - public class ComponentVersionStatusCount extends Stringable { public ProjectVersionComponentPolicyStatusType name; public int value; diff --git a/src/main/java/com/blackduck/integration/blackduck/service/model/ComponentVersionVulnerabilities.java b/src/main/java/com/blackduck/integration/blackduck/service/model/ComponentVersionVulnerabilities.java index 0b2c9a3b9..6ef6f302f 100644 --- a/src/main/java/com/blackduck/integration/blackduck/service/model/ComponentVersionVulnerabilities.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/model/ComponentVersionVulnerabilities.java @@ -7,10 +7,10 @@ */ package com.blackduck.integration.blackduck.service.model; -import java.util.List; +import com.blackduck.integration.blackduck.api.generated.view.ComponentVersionView; +import com.blackduck.integration.blackduck.api.generated.view.VulnerabilityView; -import com.synopsys.integration.blackduck.api.generated.view.ComponentVersionView; -import com.synopsys.integration.blackduck.api.generated.view.VulnerabilityView; +import java.util.List; public class ComponentVersionVulnerabilities { private final ComponentVersionView componentVersionView; diff --git a/src/main/java/com/blackduck/integration/blackduck/service/model/MatchedFilesModel.java b/src/main/java/com/blackduck/integration/blackduck/service/model/MatchedFilesModel.java index 0601eac64..2bf659550 100644 --- a/src/main/java/com/blackduck/integration/blackduck/service/model/MatchedFilesModel.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/model/MatchedFilesModel.java @@ -7,13 +7,13 @@ */ package com.blackduck.integration.blackduck.service.model; +import com.blackduck.integration.blackduck.api.generated.component.ComponentMatchedFilesItemsFilePathView; +import com.blackduck.integration.blackduck.api.generated.enumeration.UsageType; +import com.blackduck.integration.blackduck.api.generated.view.ComponentMatchedFilesView; + import java.util.HashSet; import java.util.Set; -import com.synopsys.integration.blackduck.api.generated.component.ComponentMatchedFilesItemsFilePathView; -import com.synopsys.integration.blackduck.api.generated.enumeration.UsageType; -import com.synopsys.integration.blackduck.api.generated.view.ComponentMatchedFilesView; - public class MatchedFilesModel { private final String path; private final String archiveContext; diff --git a/src/main/java/com/blackduck/integration/blackduck/service/model/PolicyRuleExpressionSetBuilder.java b/src/main/java/com/blackduck/integration/blackduck/service/model/PolicyRuleExpressionSetBuilder.java index a0e1f5435..b017de470 100644 --- a/src/main/java/com/blackduck/integration/blackduck/service/model/PolicyRuleExpressionSetBuilder.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/model/PolicyRuleExpressionSetBuilder.java @@ -7,28 +7,28 @@ */ package com.blackduck.integration.blackduck.service.model; -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - import com.blackduck.integration.blackduck.api.enumeration.PolicyRuleComponentUsageValueSetType; import com.blackduck.integration.blackduck.api.enumeration.PolicyRuleConditionOperatorType; import com.blackduck.integration.blackduck.api.enumeration.PolicyRuleConditionType; import com.blackduck.integration.blackduck.api.enumeration.ReviewStatusType; -import com.synopsys.integration.blackduck.api.generated.component.PolicyRuleExpressionExpressionsParametersView; -import com.synopsys.integration.blackduck.api.generated.component.PolicyRuleExpressionExpressionsView; -import com.synopsys.integration.blackduck.api.generated.component.PolicyRuleExpressionView; -import com.synopsys.integration.blackduck.api.generated.enumeration.PolicyRuleExpressionOperatorType; -import com.synopsys.integration.blackduck.api.generated.enumeration.ProjectVersionDistributionType; -import com.synopsys.integration.blackduck.api.generated.view.ComponentVersionView; -import com.synopsys.integration.blackduck.api.generated.view.ComponentView; -import com.synopsys.integration.blackduck.api.generated.view.LicenseView; -import com.synopsys.integration.blackduck.api.manual.view.ProjectView; -import com.synopsys.integration.blackduck.api.manual.temporary.enumeration.ProjectVersionPhaseType; +import com.blackduck.integration.blackduck.api.generated.component.PolicyRuleExpressionExpressionsParametersView; +import com.blackduck.integration.blackduck.api.generated.component.PolicyRuleExpressionExpressionsView; +import com.blackduck.integration.blackduck.api.generated.component.PolicyRuleExpressionView; +import com.blackduck.integration.blackduck.api.generated.enumeration.PolicyRuleExpressionOperatorType; +import com.blackduck.integration.blackduck.api.generated.enumeration.ProjectVersionDistributionType; +import com.blackduck.integration.blackduck.api.generated.view.ComponentVersionView; +import com.blackduck.integration.blackduck.api.generated.view.ComponentView; +import com.blackduck.integration.blackduck.api.generated.view.LicenseView; +import com.blackduck.integration.blackduck.api.manual.temporary.enumeration.ProjectVersionPhaseType; +import com.blackduck.integration.blackduck.api.manual.view.ProjectView; import com.blackduck.integration.blackduck.exception.BlackDuckIntegrationException; -import com.synopsys.integration.rest.HttpUrl; -import com.synopsys.integration.rest.RestConstants; +import com.blackduck.integration.rest.HttpUrl; +import com.blackduck.integration.rest.RestConstants; + +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; /** * The intention here is to provide a reasonable api on top of policy rule diff --git a/src/main/java/com/blackduck/integration/blackduck/service/model/PolicyStatusDescription.java b/src/main/java/com/blackduck/integration/blackduck/service/model/PolicyStatusDescription.java index 9282f56cb..21fd532ff 100644 --- a/src/main/java/com/blackduck/integration/blackduck/service/model/PolicyStatusDescription.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/model/PolicyStatusDescription.java @@ -7,18 +7,18 @@ */ package com.blackduck.integration.blackduck.service.model; +import com.blackduck.integration.blackduck.api.enumeration.RankedSeverityType; +import com.blackduck.integration.blackduck.api.generated.component.ProjectVersionPolicyStatusComponentVersionPolicyViolationDetailsView; +import com.blackduck.integration.blackduck.api.generated.enumeration.PolicyRuleSeverityType; +import com.blackduck.integration.blackduck.api.generated.enumeration.ProjectVersionComponentPolicyStatusType; +import com.blackduck.integration.blackduck.api.generated.view.ProjectVersionPolicyStatusView; +import com.blackduck.integration.blackduck.api.manual.temporary.component.NameValuePairView; + import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import com.blackduck.integration.blackduck.api.enumeration.RankedSeverityType; -import com.synopsys.integration.blackduck.api.generated.component.ProjectVersionPolicyStatusComponentVersionPolicyViolationDetailsView; -import com.synopsys.integration.blackduck.api.generated.enumeration.PolicyRuleSeverityType; -import com.synopsys.integration.blackduck.api.generated.enumeration.ProjectVersionComponentPolicyStatusType; -import com.synopsys.integration.blackduck.api.generated.view.ProjectVersionPolicyStatusView; -import com.synopsys.integration.blackduck.api.manual.temporary.component.NameValuePairView; - public class PolicyStatusDescription { private final ProjectVersionPolicyStatusView policyStatusItem; diff --git a/src/main/java/com/blackduck/integration/blackduck/service/model/ProjectNameVersionGuesser.java b/src/main/java/com/blackduck/integration/blackduck/service/model/ProjectNameVersionGuesser.java index 144b87fe8..fb5dd157d 100644 --- a/src/main/java/com/blackduck/integration/blackduck/service/model/ProjectNameVersionGuesser.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/model/ProjectNameVersionGuesser.java @@ -7,11 +7,11 @@ */ package com.blackduck.integration.blackduck.service.model; +import org.apache.commons.lang3.StringUtils; + import java.text.SimpleDateFormat; import java.util.Date; -import org.apache.commons.lang3.StringUtils; - public class ProjectNameVersionGuesser { public static final String DATE_FORMAT = "yyyy-MM-dd"; diff --git a/src/main/java/com/blackduck/integration/blackduck/service/model/ProjectSyncModel.java b/src/main/java/com/blackduck/integration/blackduck/service/model/ProjectSyncModel.java index 21ecd30d8..65422b9d5 100644 --- a/src/main/java/com/blackduck/integration/blackduck/service/model/ProjectSyncModel.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/model/ProjectSyncModel.java @@ -7,28 +7,21 @@ */ package com.blackduck.integration.blackduck.service.model; -import java.lang.reflect.Field; -import java.util.Arrays; -import java.util.Collections; -import java.util.Date; -import java.util.HashSet; -import java.util.LinkedList; -import java.util.List; -import java.util.Set; - +import com.blackduck.integration.blackduck.api.generated.enumeration.ProjectCloneCategoriesType; +import com.blackduck.integration.blackduck.api.generated.enumeration.ProjectVersionDistributionType; +import com.blackduck.integration.blackduck.api.generated.view.ProjectVersionLicenseLicensesView; +import com.blackduck.integration.blackduck.api.generated.view.ProjectVersionLicenseView; +import com.blackduck.integration.blackduck.api.generated.view.ProjectVersionView; +import com.blackduck.integration.blackduck.api.manual.temporary.component.ComplexLicenseRequest; +import com.blackduck.integration.blackduck.api.manual.temporary.component.ProjectRequest; +import com.blackduck.integration.blackduck.api.manual.temporary.component.ProjectVersionRequest; +import com.blackduck.integration.blackduck.api.manual.temporary.enumeration.ProjectVersionPhaseType; +import com.blackduck.integration.blackduck.api.manual.view.ProjectView; +import com.blackduck.integration.util.NameVersion; import org.apache.commons.lang3.StringUtils; -import com.synopsys.integration.blackduck.api.generated.enumeration.ProjectVersionDistributionType; -import com.synopsys.integration.blackduck.api.generated.enumeration.ProjectCloneCategoriesType; -import com.synopsys.integration.blackduck.api.generated.view.ProjectVersionLicenseLicensesView; -import com.synopsys.integration.blackduck.api.generated.view.ProjectVersionLicenseView; -import com.synopsys.integration.blackduck.api.generated.view.ProjectVersionView; -import com.synopsys.integration.blackduck.api.manual.view.ProjectView; -import com.synopsys.integration.blackduck.api.manual.temporary.component.ComplexLicenseRequest; -import com.synopsys.integration.blackduck.api.manual.temporary.component.ProjectRequest; -import com.synopsys.integration.blackduck.api.manual.temporary.component.ProjectVersionRequest; -import com.synopsys.integration.blackduck.api.manual.temporary.enumeration.ProjectVersionPhaseType; -import com.synopsys.integration.util.NameVersion; +import java.lang.reflect.Field; +import java.util.*; public class ProjectSyncModel { // these fields are currently not supported - if you need to create a diff --git a/src/main/java/com/blackduck/integration/blackduck/service/model/ProjectVersionWrapper.java b/src/main/java/com/blackduck/integration/blackduck/service/model/ProjectVersionWrapper.java index e07ddce95..80ca19009 100644 --- a/src/main/java/com/blackduck/integration/blackduck/service/model/ProjectVersionWrapper.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/model/ProjectVersionWrapper.java @@ -7,8 +7,8 @@ */ package com.blackduck.integration.blackduck.service.model; -import com.synopsys.integration.blackduck.api.generated.view.ProjectVersionView; -import com.synopsys.integration.blackduck.api.manual.view.ProjectView; +import com.blackduck.integration.blackduck.api.generated.view.ProjectVersionView; +import com.blackduck.integration.blackduck.api.manual.view.ProjectView; public class ProjectVersionWrapper { private ProjectView projectView; diff --git a/src/main/java/com/blackduck/integration/blackduck/service/model/RiskProfileCounts.java b/src/main/java/com/blackduck/integration/blackduck/service/model/RiskProfileCounts.java index c46ac1ea7..b50371b7a 100644 --- a/src/main/java/com/blackduck/integration/blackduck/service/model/RiskProfileCounts.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/model/RiskProfileCounts.java @@ -7,14 +7,14 @@ */ package com.blackduck.integration.blackduck.service.model; +import com.blackduck.integration.blackduck.api.generated.component.RiskProfileCountsView; +import com.blackduck.integration.blackduck.api.generated.enumeration.RiskPriorityType; +import com.blackduck.integration.blackduck.api.generated.view.RiskProfileView; + import java.math.BigDecimal; import java.util.HashMap; import java.util.Map; -import com.synopsys.integration.blackduck.api.generated.component.RiskProfileCountsView; -import com.synopsys.integration.blackduck.api.generated.enumeration.RiskPriorityType; -import com.synopsys.integration.blackduck.api.generated.view.RiskProfileView; - public class RiskProfileCounts { private final Map countsMap; diff --git a/src/main/java/com/blackduck/integration/blackduck/service/model/ScannerSplitStream.java b/src/main/java/com/blackduck/integration/blackduck/service/model/ScannerSplitStream.java index eb51c4e90..b9676232c 100644 --- a/src/main/java/com/blackduck/integration/blackduck/service/model/ScannerSplitStream.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/model/ScannerSplitStream.java @@ -7,16 +7,15 @@ */ package com.blackduck.integration.blackduck.service.model; +import com.blackduck.integration.log.IntLogger; +import org.apache.commons.lang3.StringUtils; + import java.io.EOFException; import java.io.IOException; import java.io.OutputStream; import java.io.UnsupportedEncodingException; import java.nio.charset.StandardCharsets; -import org.apache.commons.lang3.StringUtils; - -import com.synopsys.integration.log.IntLogger; - public class ScannerSplitStream extends OutputStream { // https://www.cs.cmu.edu/~pattis/15-1XX/common/handouts/ascii.html private static final int EOF = -1; // End of file diff --git a/src/main/java/com/blackduck/integration/blackduck/service/model/VersionBomComponentModel.java b/src/main/java/com/blackduck/integration/blackduck/service/model/VersionBomComponentModel.java index acd801d95..e598df335 100644 --- a/src/main/java/com/blackduck/integration/blackduck/service/model/VersionBomComponentModel.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/model/VersionBomComponentModel.java @@ -7,22 +7,18 @@ */ package com.blackduck.integration.blackduck.service.model; +import com.blackduck.integration.blackduck.api.generated.component.ProjectVersionComponentVersionActivityDataView; +import com.blackduck.integration.blackduck.api.generated.component.ProjectVersionComponentVersionLicensesView; +import com.blackduck.integration.blackduck.api.generated.component.ProjectVersionComponentVersionReviewedDetailsView; +import com.blackduck.integration.blackduck.api.generated.enumeration.*; +import com.blackduck.integration.blackduck.api.generated.view.ComponentMatchedFilesView; +import com.blackduck.integration.blackduck.api.generated.view.ProjectVersionComponentVersionView; +import com.blackduck.integration.blackduck.api.manual.temporary.component.VersionBomOriginView; + import java.util.ArrayList; import java.util.Date; import java.util.List; -import com.synopsys.integration.blackduck.api.generated.component.ProjectVersionComponentVersionActivityDataView; -import com.synopsys.integration.blackduck.api.generated.component.ProjectVersionComponentVersionLicensesView; -import com.synopsys.integration.blackduck.api.generated.component.ProjectVersionComponentVersionReviewedDetailsView; -import com.synopsys.integration.blackduck.api.generated.enumeration.RiskPriorityType; -import com.synopsys.integration.blackduck.api.generated.enumeration.UsageType; -import com.synopsys.integration.blackduck.api.generated.enumeration.ProjectVersionComponentPolicyStatusType; -import com.synopsys.integration.blackduck.api.generated.enumeration.MatchType; -import com.synopsys.integration.blackduck.api.generated.enumeration.ProjectVersionComponentReviewStatusType; -import com.synopsys.integration.blackduck.api.generated.view.ComponentMatchedFilesView; -import com.synopsys.integration.blackduck.api.generated.view.ProjectVersionComponentVersionView; -import com.synopsys.integration.blackduck.api.manual.temporary.component.VersionBomOriginView; - public class VersionBomComponentModel { private final ProjectVersionComponentVersionView component; private final List matchedFiles; diff --git a/src/main/java/com/blackduck/integration/blackduck/service/request/AcceptHeaderEditor.java b/src/main/java/com/blackduck/integration/blackduck/service/request/AcceptHeaderEditor.java index 24833f669..14421a1ae 100644 --- a/src/main/java/com/blackduck/integration/blackduck/service/request/AcceptHeaderEditor.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/request/AcceptHeaderEditor.java @@ -7,9 +7,9 @@ */ package com.blackduck.integration.blackduck.service.request; +import com.blackduck.integration.blackduck.api.generated.discovery.BlackDuckMediaTypeDiscovery; import com.blackduck.integration.blackduck.http.BlackDuckRequestBuilder; -import com.synopsys.integration.blackduck.api.generated.discovery.BlackDuckMediaTypeDiscovery; -import com.synopsys.integration.rest.HttpUrl; +import com.blackduck.integration.rest.HttpUrl; /** * When requesting resources from Black Duck, a default ACCEPT header of diff --git a/src/main/java/com/blackduck/integration/blackduck/service/request/BlackDuckMultipleRequest.java b/src/main/java/com/blackduck/integration/blackduck/service/request/BlackDuckMultipleRequest.java index 1a7136d19..86be9d65f 100644 --- a/src/main/java/com/blackduck/integration/blackduck/service/request/BlackDuckMultipleRequest.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/request/BlackDuckMultipleRequest.java @@ -7,9 +7,9 @@ */ package com.blackduck.integration.blackduck.service.request; +import com.blackduck.integration.blackduck.api.core.BlackDuckResponse; +import com.blackduck.integration.blackduck.api.core.response.UrlMultipleResponses; import com.blackduck.integration.blackduck.http.BlackDuckRequestBuilder; -import com.synopsys.integration.blackduck.api.core.BlackDuckResponse; -import com.synopsys.integration.blackduck.api.core.response.UrlMultipleResponses; public class BlackDuckMultipleRequest extends BlackDuckRequest> { public BlackDuckMultipleRequest(BlackDuckRequestBuilder blackDuckRequestBuilder, UrlMultipleResponses urlResponse) { diff --git a/src/main/java/com/blackduck/integration/blackduck/service/request/BlackDuckRequest.java b/src/main/java/com/blackduck/integration/blackduck/service/request/BlackDuckRequest.java index 21cab608b..b6265db63 100644 --- a/src/main/java/com/blackduck/integration/blackduck/service/request/BlackDuckRequest.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/request/BlackDuckRequest.java @@ -7,15 +7,15 @@ */ package com.blackduck.integration.blackduck.service.request; +import com.blackduck.integration.blackduck.api.core.BlackDuckResponse; +import com.blackduck.integration.blackduck.api.core.response.UrlMultipleResponses; +import com.blackduck.integration.blackduck.api.core.response.UrlResponse; +import com.blackduck.integration.blackduck.api.core.response.UrlSingleResponse; +import com.blackduck.integration.blackduck.api.generated.discovery.BlackDuckMediaTypeDiscovery; import com.blackduck.integration.blackduck.http.BlackDuckRequestBuilder; -import com.synopsys.integration.blackduck.api.core.BlackDuckResponse; -import com.synopsys.integration.blackduck.api.core.response.UrlMultipleResponses; -import com.synopsys.integration.blackduck.api.core.response.UrlResponse; -import com.synopsys.integration.blackduck.api.core.response.UrlSingleResponse; -import com.synopsys.integration.blackduck.api.generated.discovery.BlackDuckMediaTypeDiscovery; -import com.synopsys.integration.rest.HttpMethod; -import com.synopsys.integration.rest.HttpUrl; -import com.synopsys.integration.rest.request.Request; +import com.blackduck.integration.rest.HttpMethod; +import com.blackduck.integration.rest.HttpUrl; +import com.blackduck.integration.rest.request.Request; /** * The total picture of a Black Duck interaction. Intended to be an immutable, diff --git a/src/main/java/com/blackduck/integration/blackduck/service/request/BlackDuckResponseRequest.java b/src/main/java/com/blackduck/integration/blackduck/service/request/BlackDuckResponseRequest.java index 10e3d0d5e..de53584ad 100644 --- a/src/main/java/com/blackduck/integration/blackduck/service/request/BlackDuckResponseRequest.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/request/BlackDuckResponseRequest.java @@ -7,9 +7,9 @@ */ package com.blackduck.integration.blackduck.service.request; +import com.blackduck.integration.blackduck.api.core.response.UrlSingleResponse; +import com.blackduck.integration.blackduck.api.manual.response.BlackDuckResponseResponse; import com.blackduck.integration.blackduck.http.BlackDuckRequestBuilder; -import com.synopsys.integration.blackduck.api.core.response.UrlSingleResponse; -import com.synopsys.integration.blackduck.api.manual.response.BlackDuckResponseResponse; public class BlackDuckResponseRequest extends BlackDuckRequest> { public BlackDuckResponseRequest(BlackDuckRequestBuilder blackDuckRequestBuilder, diff --git a/src/main/java/com/blackduck/integration/blackduck/service/request/BlackDuckSingleRequest.java b/src/main/java/com/blackduck/integration/blackduck/service/request/BlackDuckSingleRequest.java index b3f61ad96..03dfc4acf 100644 --- a/src/main/java/com/blackduck/integration/blackduck/service/request/BlackDuckSingleRequest.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/request/BlackDuckSingleRequest.java @@ -7,9 +7,9 @@ */ package com.blackduck.integration.blackduck.service.request; +import com.blackduck.integration.blackduck.api.core.BlackDuckResponse; +import com.blackduck.integration.blackduck.api.core.response.UrlSingleResponse; import com.blackduck.integration.blackduck.http.BlackDuckRequestBuilder; -import com.synopsys.integration.blackduck.api.core.BlackDuckResponse; -import com.synopsys.integration.blackduck.api.core.response.UrlSingleResponse; public class BlackDuckSingleRequest extends BlackDuckRequest> { public BlackDuckSingleRequest(BlackDuckRequestBuilder blackDuckRequestBuilder, UrlSingleResponse urlResponse) { diff --git a/src/main/java/com/blackduck/integration/blackduck/service/request/BlackDuckStringRequest.java b/src/main/java/com/blackduck/integration/blackduck/service/request/BlackDuckStringRequest.java index bb5c1b77b..cd9ac31e9 100644 --- a/src/main/java/com/blackduck/integration/blackduck/service/request/BlackDuckStringRequest.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/request/BlackDuckStringRequest.java @@ -7,9 +7,9 @@ */ package com.blackduck.integration.blackduck.service.request; +import com.blackduck.integration.blackduck.api.core.response.UrlSingleResponse; +import com.blackduck.integration.blackduck.api.manual.response.BlackDuckStringResponse; import com.blackduck.integration.blackduck.http.BlackDuckRequestBuilder; -import com.synopsys.integration.blackduck.api.core.response.UrlSingleResponse; -import com.synopsys.integration.blackduck.api.manual.response.BlackDuckStringResponse; public class BlackDuckStringRequest extends BlackDuckRequest> { public BlackDuckStringRequest(BlackDuckRequestBuilder blackDuckRequestBuilder, diff --git a/src/main/java/com/blackduck/integration/blackduck/service/request/NotificationEditor.java b/src/main/java/com/blackduck/integration/blackduck/service/request/NotificationEditor.java index b67706d31..e000b93cd 100644 --- a/src/main/java/com/blackduck/integration/blackduck/service/request/NotificationEditor.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/request/NotificationEditor.java @@ -7,6 +7,12 @@ */ package com.blackduck.integration.blackduck.service.request; +import com.blackduck.integration.blackduck.api.manual.temporary.enumeration.NotificationType; +import com.blackduck.integration.blackduck.http.BlackDuckRequestBuilder; +import com.blackduck.integration.blackduck.http.BlackDuckRequestFilter; +import com.blackduck.integration.rest.RestConstants; +import com.blackduck.integration.util.Stringable; + import java.text.SimpleDateFormat; import java.time.OffsetDateTime; import java.util.Date; @@ -15,12 +21,6 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import com.blackduck.integration.blackduck.http.BlackDuckRequestBuilder; -import com.blackduck.integration.blackduck.http.BlackDuckRequestFilter; -import com.synopsys.integration.blackduck.api.manual.temporary.enumeration.NotificationType; -import com.synopsys.integration.rest.RestConstants; -import com.synopsys.integration.util.Stringable; - public class NotificationEditor extends Stringable implements BlackDuckRequestBuilderEditor { public static final List ALL_NOTIFICATION_TYPES = Stream.of(NotificationType.values()).map(Enum::name).collect(Collectors.toList()); diff --git a/src/main/java/com/blackduck/integration/blackduck/service/request/PagingDefaultsEditor.java b/src/main/java/com/blackduck/integration/blackduck/service/request/PagingDefaultsEditor.java index 9954911d9..d52754b0b 100644 --- a/src/main/java/com/blackduck/integration/blackduck/service/request/PagingDefaultsEditor.java +++ b/src/main/java/com/blackduck/integration/blackduck/service/request/PagingDefaultsEditor.java @@ -7,11 +7,11 @@ */ package com.blackduck.integration.blackduck.service.request; +import com.blackduck.integration.blackduck.http.BlackDuckRequestBuilder; + import java.util.function.Consumer; import java.util.function.Function; -import com.blackduck.integration.blackduck.http.BlackDuckRequestBuilder; - /** * Often, a request to Black Duck will need to have defaults set for paging. If * explicit values have not already been set, this will add the defaults to the diff --git a/src/main/java/com/blackduck/integration/blackduck/useragent/BlackDuckCommon.java b/src/main/java/com/blackduck/integration/blackduck/useragent/BlackDuckCommon.java index 5721466d7..5fc79bd46 100644 --- a/src/main/java/com/blackduck/integration/blackduck/useragent/BlackDuckCommon.java +++ b/src/main/java/com/blackduck/integration/blackduck/useragent/BlackDuckCommon.java @@ -7,6 +7,10 @@ */ package com.blackduck.integration.blackduck.useragent; +import com.blackduck.integration.util.NameVersion; +import org.apache.commons.io.IOUtils; +import org.apache.commons.lang3.StringUtils; + import java.io.IOException; import java.io.InputStream; import java.nio.charset.StandardCharsets; @@ -15,14 +19,9 @@ import java.util.function.Function; import java.util.stream.Collectors; -import org.apache.commons.io.IOUtils; -import org.apache.commons.lang3.StringUtils; - -import com.synopsys.integration.util.NameVersion; - public class BlackDuckCommon { public static final String NAME = "BlackDuckCommon"; - public static final String VERSION_RESOURCE_PATH = "com/synopsys/integration/blackduck/version.txt"; + public static final String VERSION_RESOURCE_PATH = "com/blackduck/integration/blackduck/version.txt"; public static final List JAVA_PROPERTIES = Arrays.asList("java.vendor", "java.version", "os.arch", "os.name", "os.version"); public static UserAgentItem createUserAgentItem() { diff --git a/src/main/java/com/blackduck/integration/blackduck/useragent/UserAgentBuilder.java b/src/main/java/com/blackduck/integration/blackduck/useragent/UserAgentBuilder.java index 66cb374b1..b311f27aa 100644 --- a/src/main/java/com/blackduck/integration/blackduck/useragent/UserAgentBuilder.java +++ b/src/main/java/com/blackduck/integration/blackduck/useragent/UserAgentBuilder.java @@ -7,12 +7,12 @@ */ package com.blackduck.integration.blackduck.useragent; +import org.apache.commons.lang3.StringUtils; + import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; -import org.apache.commons.lang3.StringUtils; - public class UserAgentBuilder { private List userAgentItems = new ArrayList<>(); diff --git a/src/main/java/com/blackduck/integration/blackduck/useragent/UserAgentItem.java b/src/main/java/com/blackduck/integration/blackduck/useragent/UserAgentItem.java index bf35e129f..1e04a07d1 100644 --- a/src/main/java/com/blackduck/integration/blackduck/useragent/UserAgentItem.java +++ b/src/main/java/com/blackduck/integration/blackduck/useragent/UserAgentItem.java @@ -7,12 +7,10 @@ */ package com.blackduck.integration.blackduck.useragent; -import java.util.Optional; -import java.util.function.Supplier; - +import com.blackduck.integration.util.NameVersion; import org.apache.commons.lang3.StringUtils; -import com.synopsys.integration.util.NameVersion; +import java.util.Optional; public class UserAgentItem { public static final String UNKNOWN = "unknown"; diff --git a/src/main/java/com/blackduck/integration/blackduck/version/BlackDuckVersion.java b/src/main/java/com/blackduck/integration/blackduck/version/BlackDuckVersion.java index ad808554f..0b914f414 100644 --- a/src/main/java/com/blackduck/integration/blackduck/version/BlackDuckVersion.java +++ b/src/main/java/com/blackduck/integration/blackduck/version/BlackDuckVersion.java @@ -7,7 +7,7 @@ */ package com.blackduck.integration.blackduck.version; -import com.synopsys.integration.util.Stringable; +import com.blackduck.integration.util.Stringable; public class BlackDuckVersion extends Stringable { private final int major; diff --git a/src/main/resources/riskreport/web/images/Synopsys_logo.png b/src/main/resources/riskreport/web/images/Synopsys_logo.png deleted file mode 100644 index 91aa2b63ae87c48194c02e352c26fe49f1cc485f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16487 zcmd6Pg;N#p-}W9FX^`%ePLb~J5JaTAL%KP1m$V=$Esb<{halY|oznd--`~9d!!yhr zU}l%yJ3ev6O@ykl4B9KAR{#K@$;nEp0{{#Z{J9bd0sOQpcGv^IAs8#jNCM9 zi2y(W$VrN6cw`=}c={}BHi?{0IJYMju-N5NC^E4;to^APz@?JqJM_EwzP)gW+xaz=OM zJ#UDZFwowm0~q?)M)e<+!CTcahKI(J&RIBO0v_o1T=!d8SI*;1OP6GHyq#;PK>u02 zq;^i_Xs-JXmPb?D3f-&USLzxwq@AIYX1M5x%J9n?ZpD;&j0l=Is_>^90E`6sn^s5| zzUYNuP&SX`1efkI&vrJ`?2GA$3NpM&nuZjS2?S}_dg`t;ph$lMGSzz5M}W8a2=@SyG7^-TksxB z|Hf9ndvmoN`0kwo8l}MaEpKRyH(P=yTc=Fmo-7Rccuo(bVvsIdOaOVlvs0SALsoJk z=eU=D*+E~qJ~P! zk$W{(?T_cON>s9R>@k@rfyJ*xagj6)HH^qH5ce*gGhHAa0i6>9rzpLJIER&_Jd56i zX5~j?g-2XAhcp<+`3t6p>UgLAzR!0yPqYcNCGEo>sz2jL1m8v&NM&_g71&alYb{9N zY{iCkar7oV@Okd+n2F;}Ap^t^FEUa5pzNZpi4iX3!v~9!wM6IKVty#ztl)>B>9j^j z4twWxywV$oK}#l%%D@dbn1-MIU!SwAx_=OPf1!MelC=pxSTa_^ieQ#=?UL%CUEe%R zw6vqKk6RL0Ba>P8H_tXent@%{#O#1u*EF_;vt;4QV#Qb=DmXYQ6mM{JcNOzyuNFWI z9S8nsKvz*51CBAaf=*ux`1L}cGeswAbXQt?DDU~$pK0(HoCXn389OT>7uZ|_F}XkC z{L4kWb`0`u?B}yi@Wv{t6TfveIg*%n69UpZEoi`Hz!?ugEP?6)1BalIksckgGu`4; zTmB62*UbEbk%eDb5h=1Hn^gC*~-JIhz9Iae{X?ds>Hx3(5?59Qkqp!MpyP0xYWb3KP{;@;4 zFxys5&Eu0(3Zp(eBr7CGH52Gp?>BPV5Z5tKbf4K08XrZk_-eYlq--E08LpTcSF*Ne zv_YOWP7x_BP|<7zON36d`v+A&JBT9&$K&_%o+oX7K@we$ccMzbx2z|zuliKoXe-Fe z>fvS_@JB$X1WMtT^9qwqXCO_y-YmWzYXkA`>bT8`j{D=RZ(9><<1QUcd*-9rUh>{& zMdq!!$!|?Jx&KM-|jXtIh_#Z2QrzD4SyQ*?Bp#GfhAk{jkZr z9?lkK>X{ZsXifX}(6!Qn_#G-g)Z1`U1nsn~I=NA3X>UqzJl*9lBto>$2l|B5YeK{6 zJQ}cT&t4JTYiDcVP=Uhw@H)UR;n6ID&{sz4&s=MoZ%TACqc^JOL$o9w4!5+)6~^A` zbhxyGv*W%61K(!a<+_aDGm6R=;d-2gko1`-5f)X5QB zbjtqwG)Kx#nJfPbcm&_KL=AD~OQDLdzr)V+{!Ve&>;DNn^St8h%lMhPaP}tuo6^X1 zTZyo#P5NydHol9a1#=va2vq_tC5i3@4v;}b4F_PdbHr`p|^`!a@#En%nxMtq@8+5yTJ6^BLAV@!qyBtzP@A*IWQD* zOIwIPib74QG)Fx~G<=HX2E%xRi{yjPaWgXIF+H}hEn9-Y(i)jwG4?J@Ou(Dzvt#pE zA{eqH9BT;O_cd+$MygR00?#JJ*Q<_`p@1LIX$q_W?QvvxZeO(}O2Ju03P=HvAiK1i zZ1sI#pByZYCUjS2R=Q>MeCJc_9|+eg^WF;h1CI2B)+lrHmEXOm=jRv0AYMwFfe5RD z5hTbzf4&3O1ryi{y``K&;jaK)Ys;C%<{Tj49u&U#>e(L0PFbDgHZz@SU7k;k^M#7l+BiwBH z=<~>+hC84l9u<_VP6py-6J8JL#{%o*R^QNBbwHJ3CCFlGSdFN0L7!y?&t@sCtU9nxa&U?MUO)3ma<_J(0O zZ!sYqfGYgtK~hd={W$Hxe&AJ|qvO;+q33G5jhshKU&kr;eF-;Kz&d7S87G3}i6s0O zE{)(Jv61N-#VY9p~TLR^cWfr{{-GH5P-u1VbG`3-XQ= zov?(Lxgkd8?Sz{nL*ZS!#+w#Mb>BK2U{03bf62huYXit>z4d_3ElKUZ2>{jlqK>t( z3bG#h^ufQTe8lat!-XB1?%kfTc5ATB)GfBeDHI#U@}un3&8M));o@FQS1F>?6|t_2$MN2>d3pPc2Q1)IdDfV6DBwJ%MqRh&TJ-$ywSOEP!Il z3Q=WhJinnB2q*v}&Tq5jKyDjtn$}cz5t}e}OyC=FKb(XQ1rA*&C0uv);FJp!mY$xL znSVp2lJq6_6)HkI<3~3~9B6je)HflS4Tm7@%Jk*$!A*cL1D}qh3YmiZZt!Wk=I;)^vg)XC%K)z#+-lkQ9P zOY-!ygBr<+RC13Eogu2ZZ$bCVk?8j@P;%hLh_~+ak6|+|XD!dYcN^|AWL*cgXdbQPOXd&nsw z;9rcw%9~(#Eb1g7HH)-u1N?FWER^fH51pO9ep`vTA3kKetikGhp8d_tPZrD;Sd7>C z4Pa-z8a>hpeBS|kN(onqC8{g{z14;tTsxvSNN~KyPakzg{d|hQbp%MxvFt_n<7dMbjudcqJ**AEFBFu3 zfh{HQ)$eu8(kCi+A|zw80Hm9be>8Nm_Ag)39H5fgM6lxd3DI}|Xnbwbk!IF~I7m`? zU-lgex!hx3)B9~k-Khhu*%4E;m=nhB!RQK{R6_qs#2x9kUZW4>3p=oYkiqd(w5?1_ z-r4r==-x13xLHsGJDWTIZeQY88}<61o<+E`9OxW% z=CnS>+$w;TH8u644z?H=$ZnFNK>>o=rwoc@s963cnm81A0z-Bi+UI<#yL#q3QQt8e z@cx{+Ei^l^YEf>T0Fn5@AdYbhU4S?HqvgY3HzuY#;g`LmUpsNotjek#?*+Q+97Q!_ucGDKDrZMoboZ&C3b@doMo~kUJ&Oe#NXl47#{aSZ*^3@ z;c@XGn-yrZ|48M75BP|IhoSq4cNP6i=TOWUZ~bQ!g@U0K+G42F8<9 z`Fq}NR<4IUy`|5h*56^&On#e4mch@SbnD;wvjrI43{U!MdQgH^PJ;9Lk8K!@-F3=} zB9Fe)Ss4&EB2v^AIwQq+3F8O`s#RVM<-qd=?|}a{1)32d6Y8kk5Syu#sw&j zPb4^gtx(HQ^QnJ?1yh^2p&+uVbDwhN-Eo41%!%pc-TmK-s@P0-fb^k`G#}LtYZL~k zGD#q2g4U^coAocF7!Drbxtl1GZ@=0yRkZ&Ul!Cu`xa4Ef?N!1&kF^F_$M4F7 zd~?UNuodrnMc=AUem_R#*D%EcNvCl2Cz3N^GGngB@EeAA$NeI5WQw^oVPFkCJ}+Y10_`eBIIjKzV6SuqjJp|3-4t4Thir z0D?{;dXKsT+7Z#(gnqW0u?ytZCY+;F+-A)~&f%y(WUL=4$}c(N*SfT=^im}3ZHp_y zD&XPbF28<1BWPT$%-V#yzmqV!NCNB{H7Osq^CrgcZ2_k~O(H>gqVc!dn{^hqkv`X1pn38%%Qr z0jTFzwSSzVCnoFp2-C!n@S7l}$QXWfT@4LnPUF60@AD7E#G(dqll1t2gtP#^wQQlg zR~%r4cWD8o@33gBovh=6kd{|(cPN;mS(J0!UsR|ojoxe;3gaAAiM*MlMiqXnrnusj zudnFOYB_Mh8J9rR1s^)&Z{58{Qv)~WdH7ypxAYpg5KCZh8e^Adpk=+Cl%T48ttg1G zIq)6r2gsa-e>6oDtets#b1IW#bLa25K{4TA;r5gY&=B}2`6idcKyg$adw#ee)x@O&^_!lH$(|TlASR=8-3&L<0s1ZL*Q@Z@aKs)Eu z`=T7P;RbzzVGnSWxj_ChcH5{9Amfz(Q!R*rj`f}~;6xK$t3 zeN^{>RY8C+TUkk8X6tY*Rr#nh-wsBOIv~XLvi%Xs`+^|6Oij$Lw(M}(?3)`OG|4QL z>azfOrw^ckuRAlkJ_0~HQ|n#dq2T(fsK@~4w%6RS3&R8UhC_LIcN!&0jPT{v8Qy@G zC>;yih%3@MifN#SmGImXI-;FkeN@b|5s(20FI=BW@|ubS`YJxpX)c&_=Sp2;v5Pc` zK))_+Dv6A%l)1uHQ6M#jnW6v4UIH<3!;hbBFxs&H7Pu$vEpW}{s>EB=<^Q55v}9;+ zk!=3iFWXVEI?$#1u)Vut{(Bw=A}mg2)0q7$iD_!*D|xow<5;2(P9w_tb#W&eKoCQn4(g5hjY+>^lF^pDxQth^=} z7)i>YBz=4@pB#Jj(~X#eC3SH4uP=Xu>2L>TO1ZwTO}6B$?C({39J}hmXJUK<9kiWs zI7cDqJs|jM(i*U%xZ?{DCfYsVd;80XO>fprY8c(D^m`$cv}MDo{SB-STa^V`PA)~a zC*DIQ4n08G3Tc7*lZji9WQ$v>pjzM> zQ$inWhgma{pl1fT$&Fj+SuW{(MswzpxLC*e~)f~4rczn#NG7$tRiTs|0bs&DD^f9#Sl8&zNp z*ZiF)=U7f!*e12IL}%BM6;Z#U&`bm-OF}Z)YHso8)mH7C{O)>>39QB^$6g7co(3!w zvcK2O;bmM2E2-P>q znwBh!=ZL=tW05=ryrF?(2_Dzpx)^iXS$Ha6<}fS6Q){P0eGz z_2%Hv)^OhXVz$SqHhC(C>JsJIrteJ3wTSbjbn# z#tQR|Do;atTuR=&&1JI5TkJ}q~Q|Dd6_&? zA(=GtAWF>|E0K4ruv~FjZ0h+H@p*bz+R&_oK_~I)&QbMR;ftGpu5KoU+14=&MO`=T zio^hw^Lt-a_ml1SAm*QH^nJzb^kgR@Y@yKCxEpO!fxS@jiJpnSy^Rn$NKc5ojCtoU zOZEOx+WnbPQ+;vCuA874t}|yi;1DGM<2v)YNV^NZNMQ>XZzLK9d)zM5dZc#95^3Qx zU>;fbCQ5HyD7GEhFh)`UU^O{)=;lUw)}d25QqafWljc8E0{kcmJf(9gjer06dMkrs zzWr_e?de`^neB%V?iemkTC=qJRM&hZ8U==A95N_gv}E6ga$M{kU9m2GTV|K7l&gb>LZ+UBgQDy~4x{&?UY>fbrLJ*D_6|ez zpYBKDMO8yhkSId@%XvQH-gXVMg(69~=B%A;Kv6PA(;LLfSenGhnvnJ=l=hshc#8vw z(!w@`NnBaywzlf58fn3Lh*6E0YMU$U+ZrJ}a$z@A+j3HUCN}vq0jZM8Q+i}w!REip zS}ggnMX%0X)#@vI-@+Vm3^AV)GGWBx7mok^h57k*un(@Nr`^K$N^Pluv_ z%biwdqv+h{)(mBB_0j$J1YH`EltByWOS z#6G+bHeTQ$?X$fU4_R4djizzBHAYD3bnn#7W+ilYDKH&E)m#9QmWAp+L})+0_A<9i zUh$_VzZeowDJ`~)i@S$&N>Yb^y;s!`#GzBF&j7G*bdTZwA^U;y>8y6ec`SUT=r&#^ zh}V@qo0%sKS=7`t+SlMvtc}||`$~5c6*?|FLD3#~ea5`apiwg<_ z><~6B*DYl9K*R*{IPMV<#(?kW)F=Mkrh*?naToU%;uCS|nI!sjr!p`SIdV$9PgdUy zeaKlM(!o|qx>N+)N#k-OMZ;}bkmkTKPUq`a-W68T)ibbD8Qh}AWoyQOVOGBz6|=v) zUdaPhDB*gOBSH2@Ro3K)bo`K@C_ksoh-|jR5z?l}JXjiE%oY=2_1B8 zqz(~KMSs_ENWPNrF(~tWmZvXYuv;tt@FA*uH6vP1s&bsSI57s|Y#^Qp*c8B@Yf)&a zBLTwhliLv(qd#u@J-SA*N-X)IqR&+7?~8DKDnpVFlM0fSmBz`9CY7sIx3$SMpFF{WN0Y(_gR2RyOp5D5 zs^@5Zt!SeGdp*gzLCPSyQMxN(bQ8$^vllnK0(%yxKyI>Rb&%5D-2sqXBYDfdI<(Z~ z^u_h!8_x=q}x_#xwlBG{zuk&rJ%@43l<~0r5F;eV?kveLJg(|8hPE`&mn9rW*dV)2=Z^Fz*0@59 z_M`cF=ayH3SnK=ZVtOcdc{T0lT;>Al*1NCpZ*bHSKjuvM7mRRHfvqQ-1;(fasF4 zYAw!mHvkd2uN`yGHidZt0$3hYxqAjFMmMc?Nid~8vM>a?Az*_1XKjIqh znA>}qb{p`!%mJ72_*=T{azA#(br9TxCUcSpD%bHZu3#>$I#4#EB30tyn3BR|!ReVM z)%sCdnI$5{`W}^Qx$BTup1560o7IjjcaHnPYxXPgB-~@q9mt4w zbQWGJzJHaP3l?$83 z*+=1Op*1=Md3*UjAT9XE5xs)jhPnA%%5!tLozRP5Rd{5!!b$wG220Pm=SuqR_>wx; zB^{=}9Aj$0gjQ>KK9TqpbvXx<=ex5ijSFgM%hq>ARFgmxHg)nEa{Q6kReR7FjDXWn z$q&u0)L<^e)D{pk1R(Q- zeIXn7{bK{DuG6uTB@b@;f~-Tbzmd4ho^*=@6_ZXA6HbrOz=Pv|WVIQ(3hgum&glbP zVIW}#Vnh1PFlZDoq60rq%k=1-$y z4obG9``SBAqM^sQk@B9_n*SOFh1E8xB>S`qnckQgLvfG-2D&Nl{kletioS#C27E)B zZ1#hoddqQ4w`dV0_yXn;Ds7F6I$pBGA$9o(!$svSR_myxlb!otU<19hc{RdEu#&E} zaYlWqSufA(yc@mdUNlO0Tq0mTgCEa-SKjc(2ySj=$g@Z>dRICx!qBf6MEy)@d_R(O z5itk#(g_g!t!;S7GPxGykD7^V&V(|k4TnpuMW8JGtxZ&YHndfne&?Af2-Cb>g(k1lv)!+Vdk7Wq?uFuC-svVixg4s{+q z9yFkY)(G`{Q_p^q3~mx94$hp2_`+LY^&hcgQa=ab{5$C;M+VpBKAvs~ufUXC|K$XL z8RF!~6dd_*nnoy$*{?%ZQB9sWGOFkfa}B#ox!x<2SPETaf1bP za}IOA=dPvWb8 zVkx+YStEnAlk)vbF)S|uSd8l^O(&d2!P56d?(Zwi$7W&EH~4u7n%=3tW$or_0yz7e z&u`0Z4Qv|FF61Q!$qqgi7Sk6HnrT?mP&yUyjUNWEbnYIZc`QMo_g)QJcNO@6vR|%K zZQtevX>%+k&rib-!rm(fKQ-OVL&6MTZo)NKvHY)c#&F(@{kWC>6B+B^kTN{Be&^2h zXPDB*MdG4q`wfEEi%!MYj~dY&uN$aI^l5T4KmYG9$Fc4m(F-A2w2vGr=VEbV{EJyF z4}ACEWz8dq-jRw@+|s;j8CG^DV>1)og<8^?GrtPMBW<#JPe4tO|x$i zsh!-$c*#ylfBB^fLc@-OudlCInQC6s{+)bepIkL-A)dOaF7GO-WWV98HvC_ucDv-6 zP_iE%B){6TCm3&q9duz+zc`(5au(G{uv-FvfZlIZeDIiHBg~*%>j<0J6w{ec!-?#} z%XjzQH>RzzyoWV$kXfq7_?3tIi!Sw&%ojL00D@=za3T%l<2K@S2Pe4;_&fCqCZk+E zvpx-QhidYJ@q;jMTWI_H2NBa-fSor%`5qstKYHQ3XRey|eb~iF$z|n>a_*17aF@3$ z3>^vK1Dt1VuG}ac6sg*uLiG?aWh=<%-#!(bBVQ;im}aSMY;^g4TcR)VUy&~4zItl? zw{W0Oz8hkyrWXEsfVn>}Prl?A7C4BAaN&^LN>?&~+&o-sR+BB0Hnr&_ipo>Nite4O z3MVX?#G*&<-+aIx(=v5Fy)R^zs5Z{?aDqTyMj!@AxHaN!bPO;wA0kKrm&Nm|w9c|0 zLNMKe=@XB~-?*(>Ma9Aco?j`nr(>SlJoF`&QIU)V@-jN3Pekipz!&cQ{)F87gFqBE z>`_Gr-fD+1gh5?6SyhpY^5 zIc)`?kG$AAt>F1+ek72ycM0$PP z!735yZo%RwV!$$1GK0X_0vA8IfcPj@>Au5-5=kU+l=jpgRAf77(zQpWC10A!0oxfu zegzM#y`)I{g+IIMgopg-%ICss&dwC)Ys;4o%4+fq93yiJF+$0_iBQBo@rZ${EuHG~z1lEjNO~%Kq<$D=FhB5tK>pye`GHG6AnH zhP-qs>s}WCVtDI(B^UP@0UF~}@(|ISll)05^^Wmr{fX+{swgU?&|j=fz64Bor7m@# z-Ln6KIxGir1;=)d$udPMPgV6wMk>ZO>b1*2O~TAVM`!?~0I%0%B(n6*mcLjac$IYc zj44Lce-|)TW+#oDY1aTTcRQBIzHR=utOgu?T*zNPrNkrp|(ocjc~%sN|ocoB5{ zuwGtBgml?LrDEl&){<<&4ok!8WAoH8{q-ppR3AI?t+1ySD4W%tTuxmKXcQ&SkhZPE zg3b7M(x*W$)wtdxDrm2DG1s{kv3Tmx>rGa5>Ka%i8uxD;f4r(i^Clw93fANOh~~e0 z>e+q@*d+(aWd)FIDERfUdDWiEEgPy^y^FG=SdWNohBgS&F!6;IM$MZOy;+mKL=LUO z8-Lvre*EhCOD4>6)5$)y(TRa#hFgHO1c8H|wPj=^2s#Scpw4XH^*ebj>m+Z7-G|i2 zZg-$xi2uP#jWZT+lO+CCt_N-#D?3spCdv<^X(M+&nM{e?RZmlGuQNUlo;XL$aPb)r zxNJW8kn4OxeW3;ks*D4oGb>NnzGJOGY(dMZGSywRYUbYA%8Ay*%SVvUXM(5RJWJ;cy?#y(8)#I%*WbBmLxw`9FyU7}B5G&mx-g&Yp zh?jN&cRR_wvA|e(!uhnAV&rBn-55@dsoIno>Dcq@VRiWuF+vcWvm-gknqqlGN-FcW zAGEpWaBo|U^s*zzJWXA_^g~qIwDj8gVWxi1y}x7L+cn94z#=*$6^&c8n=6|C@$ z-u;=YuMZEcuf-`+H^6H9>@UUGIqf>+WJ}n zmg{FO%j`p%WW0K5BWQ=qq)*&xBZyhjGOM}Tl0OuVfjbVA;Q^M{4ri{d{w#+<64vw_ zx{qEn=d?8}XkJaOIz^AaD{93TNO9FpP)hUW5)xnY?)e0o50W97L$;EIXbmYb*$7=m zE9xIs?LK+SoS_5x5ZklSgOT^G$!U&Ry>=ml*J97o4BX6Eqd4(tSjN}50FT)>F4Q{L zg$l>9Jb&n^FmU=SdC#~6@p6V6q2PwhZ~JyR-WOd6*m9Gpmv`t@fu!bvxey)d=6bhy zS5$osHq%Mcrxlz9Nkm^8PBIvHCjU#gKFx!_FOukzAxA(;vED#+!9kiF9`1@uXMdPv zO_I8G@I3c^sy(b;caLtk5B^Dhe~$V|9%(1Gl#n?C)b4KpX-QnWQM>4tF?Ai7!sN~J z{bw9}o6%g&ll1GyifYLJ7bhV2~M!m4JvjO^*D2so9V44cw0IFnf z+5e4w!{)QznnX85wgJhxnaWqVxZIY+doTKob@8v2qJl#I>E8qzjJQVty2KYLsfE3| zKy`V!46dnI^KRSpw|a&7oJFLaM)d2BS*jY95)+T&+Mr|q?lRV`7J7)n2)k#4%9tGK z282vb^zr!HBN>mCj<4I}-OOoLxpZMob_bO-+ z;GKl%NfQBhxTI4^G%lv(-kf|vT#S>{HN@D!e3zUV18w;~cy~Mk(1L)vcPGOAb`e5i z-s_eepk<{t^{Y3UR9r2f8K;7PI_akh^3D-ka$i5%NAmY2#+~Y#L{K!4Q*BgDAu@7W zgt$10Q)2oGD_*@-07en;%#f;8DwW8HJ95)N(n zelqWo#G;5F4dUlImWU(@qNQ*bVRAHH+Y7yuznpN-2LJ3^Wm_7U(`6%L?G`J+&3|g@ z5@$d?(qB|LgB+iFMKv{J8b_@wzEVt*42$nI*jt4PW=AL}<$CbIepju!HZ`mregub0 zvFtchc3YrRO^m0WJNS?Rpp!Q(5I_;u3fJDYfX_@kaRC6rYTJQ`K)=czbud`k-(0^| z9?zsr{@F5yYhu&aJ=jK*!ksiioNEQY?QaQA&2OCuZr~D3V7opMnPPhKyNA{={8Yq; z#Ms)@h$t&%d$#GBLg2G_OBM?$TA9CaNh+7h!*0Z6$ywqL4WBlPi@i5js-_~{a5ph8 zdFqbEC0(0EUst`j+|Y*J(bS~fd`ahCBVbGTDbTZxVyr!m=CNubJPH~ZgPO$Xl#2Wn zwC_K)#H5jbk;~`1TPHorf-Pnt$I^iDmZ zTSv}q3=%4R5C*V^C49%a<6hbK`8St44|(POh`x*#Ck>8_@Skp$?K{BaCTdDwHz~pVy7_kg0cCpy|sF@PCB0@pWD9 zml+JmGtAI`BjP{3!FiPbt_dJL_`W`s6SKc&D+iByyyw&|RR!BdR`}C8MWT*@_=da} zB%XNvt`uWYMWFu?)60Xh5b*_PCJqwGkvs?hCBOIt`|{P|WCh;_mmMLJAd(^QE_pw( zPFbe1%-^Y!XH9aFE(%w8+i1`*N!WdJLjy`q!kq#=t61yU4+7Fa3-EjsvKowXvL%6N zh7e~*(h#F^fUW^l=Hv$6j@+5M7q4w|Gpl!(@RIVL1;%fUsFoPve&NMIH%`iqW7qn7xk_3&%Zj&o)xkLU_@@@z_a+lvfSjEoWubN(O*@lHVZb^^KdEd z^qRVa6y}zcB#^B^wKVOsFpfd@C^@F(5~~0<#7BzVp*Ot0(vt%;YufvLx)*a#cdvTbSFZALE8BO zdFK$1vS;tJwV}PLTJv6G{AX&7P}WjLB=Gg z+Av0VCrLSLd{_gj-*95zLx~cz82EJS`oF%MRA7ZEmScCLOS8DTyXXLCffrgt;6apw zA5o3gZx_Y|!e8Wj!fro9p3otU#GY!3tbKytK;of+gfWb8i*eggydtUGaBJ^xU%v%D zfSmrdHu@$TVHg|8kH5qG!|~4JD`_Q9FzKi{6HxUzA2ovm5Jwdz%h?0Shq`eX;o6(y zWeQ&uy!G>YnwrMWgF0%`s|HuGd(Xgma}@U6arQa8y~6U19N*WS?2KV5gD-Gzg0OHvjnr9;@WYO+N zkeJ8)+VwNB9C*}#0N?D!g(d_W!)MvErJp8^m6DrE?y`t+G}o0K+Xl7bS0zkG{`(B5xGuYim=3DxD|C?9TeuurS7XAruGy0VUAm%=U`1K zT~+ni3c4MxZ+vv>(xGy{8wdhrM!m^Tp+MD-k#^K|383xcZoRD09QXJdf zaH&oPU_zGCZlk6e+bEj15pu=n`qWI18% zi(seUo><6H3y<;*`wPznQKuGxm#;O4;CEO69>$sSpRa6X&ZU)!mqg(#LC*4LJa znA$tSdZs{A0wS~zEw{|xi1q$$kZ{;m^8}St8B*iVr2*0-J*AZp`>|sJ^DNc1%_(C- z9}oQ4{tQ3RMt?}=hL|}anJrU8;M|Uwju2LYv*nlN7@?!}GLqbk_w?|4!0|5wmEB*U z)9K+aVjK5ogn%6mRm7aq_#@-Vj_?~wUj2>yoeE<;4E7fDuCsPkP$t|=|Df7rVMJ>D z@s;5oC{gpX$J1w^y+Z@C(GAsem*yOV!pV#bwF?@konD;Oc+FzeYBq<>bAS(Gr#nbi z7It~y1I36plCLjNvhD~xX5ynTmrry|6kchBGqpL>>3NF6+{8WJdkL%Izk)-D>*F;|}LYB>5P67gTm(M}qF%=|U z25oF$0LF!;GYr-xTve%7&kNEDj8!InK`jrGvFSt*i_@ zRg7?fu8**J{#89h6BmN3YiEND=GSa65f40G69gsV!+lJ@79KFbldM&a{Ty1PyO$pn z-!zt>@{eO`a^1*6(Gyps6j4tV;PzcczezrPr+hjXf92o`_9RNj{7oCFT3N6uH|G@Z zB7S+Q8nlnw!=1tcB9=&cA2y}~iZEOLq>r5;_`JoT3*p3!n zsTvY9_h^DD-W$(b8Yx^AlAbmgC)dGl~BU zMsqv<5i>`HO?K3k4t`v{Y+_N|>M=qbw6jPnhc2PMTUzKraGL-4{rxBFUHX?Uo4@kG zal$aqgyfYQ8RQS}9uhQVNG9=!@mg^UcD{T3NO9JYJA-f+z6C#BSF6+3FW29+ga#}p z$H9ZQ9T(TK%aNI>dW!!+4PUe5FxX>RW0GOhVWj!&K~Ge!ERta{LG!tLLXW5bedARG z&LzTK?%>po{3t;ewCl~WFY=|Z#j8_b=j3uYbok4pndX;~13suvFu()F0vnMWb-trz zn1p{fLlQg^C({SzaSvdWeyYUAC?0ie(u1VFde6kwqq&%MWa15L0!hK06=Id-5H4;( za$ob16hnc0x^6PUC;SNR%H$zX-vxn_Y)vu!i{33CVFTJSAfvd*`J1JWMWKiwUZbjf z=)q)U9A>{Z&&~(2ntO(OV=ZvVme99#5Y&tfq8ef1cn-Ul2hLm&B7%0 zZZeeHB7j$eDoTyNFI&@U3cSXssc5)^?Vz=A2L1Shd`aHUeB!6VS}Px)@+{wSCvk8P z-;aZt`hnuqK`P%;4f&ExiiAWF0Jv_*>BApZx5fZph0^?fmmdii_qU!I=(?~JhQq+L0A2(>q@RJ9eg>aCj&7w|_>V5GXs`H6T z?~9Szy*LkpYmyeDKol8lsitO7gbNF`~Y5$02({7Pc1Qv zV0^+QQ$USVp24%Wa6ST1PL`YAGf4IZhXs*7J~a5>dmG-d<5R7bY;ldYE$q-IXMryU zaOqKCOV(-p2O0&d_YAgW@;={}%BHAWfny#FDZ^KU{rpoB@8AWoMxc-zy?QP^&$>WW;bZ$J3+pvqTLl y3UzY-cMiY*cMzWu`iyZpXzK?4rvSK@{|hjc>iV1BT+kf+9gve!maGsr4E%o)Oig3} diff --git a/src/test/java/com/blackduck/integration/blackduck/TimingExtension.java b/src/test/java/com/blackduck/integration/blackduck/TimingExtension.java index 479b90963..4fc86f5ac 100644 --- a/src/test/java/com/blackduck/integration/blackduck/TimingExtension.java +++ b/src/test/java/com/blackduck/integration/blackduck/TimingExtension.java @@ -1,13 +1,12 @@ package com.blackduck.integration.blackduck; -import java.lang.reflect.Method; -import java.util.Date; - +import com.blackduck.integration.rest.RestConstants; import org.junit.jupiter.api.extension.AfterTestExecutionCallback; import org.junit.jupiter.api.extension.BeforeTestExecutionCallback; import org.junit.jupiter.api.extension.ExtensionContext; -import com.synopsys.integration.rest.RestConstants; +import java.lang.reflect.Method; +import java.util.Date; public class TimingExtension implements BeforeTestExecutionCallback, AfterTestExecutionCallback { private static final String START_TIME = "start time"; diff --git a/src/test/java/com/blackduck/integration/blackduck/api/enumeration/RankedSeverityTypeTest.java b/src/test/java/com/blackduck/integration/blackduck/api/enumeration/RankedSeverityTypeTest.java index 7a9691a2c..47bc53d54 100644 --- a/src/test/java/com/blackduck/integration/blackduck/api/enumeration/RankedSeverityTypeTest.java +++ b/src/test/java/com/blackduck/integration/blackduck/api/enumeration/RankedSeverityTypeTest.java @@ -1,15 +1,14 @@ package com.blackduck.integration.blackduck.api.enumeration; -import static org.junit.jupiter.api.Assertions.assertEquals; - -import java.util.Arrays; -import java.util.List; - import com.blackduck.integration.blackduck.TimingExtension; +import com.blackduck.integration.blackduck.api.generated.enumeration.PolicyRuleSeverityType; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import com.synopsys.integration.blackduck.api.generated.enumeration.PolicyRuleSeverityType; +import java.util.Arrays; +import java.util.List; + +import static org.junit.jupiter.api.Assertions.assertEquals; @ExtendWith(TimingExtension.class) public class RankedSeverityTypeTest { diff --git a/src/test/java/com/blackduck/integration/blackduck/bdio2/Bdio2RetryAwareStreamUploaderTest.java b/src/test/java/com/blackduck/integration/blackduck/bdio2/Bdio2RetryAwareStreamUploaderTest.java index 3ce4281fb..d1994e580 100644 --- a/src/test/java/com/blackduck/integration/blackduck/bdio2/Bdio2RetryAwareStreamUploaderTest.java +++ b/src/test/java/com/blackduck/integration/blackduck/bdio2/Bdio2RetryAwareStreamUploaderTest.java @@ -1,21 +1,17 @@ package com.blackduck.integration.blackduck.bdio2; -import com.blackduck.integration.blackduck.bdio2.Bdio2RetryAwareStreamUploader; -import com.blackduck.integration.blackduck.bdio2.Bdio2StreamUploader; -import com.blackduck.integration.blackduck.bdio2.RetriableBdioUploadException; +import com.blackduck.integration.blackduck.bdio2.model.BdioFileContent; +import com.blackduck.integration.blackduck.exception.BlackDuckIntegrationException; +import com.blackduck.integration.blackduck.service.request.BlackDuckRequestBuilderEditor; +import com.blackduck.integration.exception.IntegrationException; +import com.blackduck.integration.rest.HttpUrl; +import com.blackduck.integration.rest.exception.IntegrationRestException; +import com.blackduck.integration.rest.response.Response; import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.mockito.Mockito; -import com.blackduck.integration.blackduck.bdio2.model.BdioFileContent; -import com.blackduck.integration.blackduck.exception.BlackDuckIntegrationException; -import com.blackduck.integration.blackduck.service.request.BlackDuckRequestBuilderEditor; -import com.synopsys.integration.exception.IntegrationException; -import com.synopsys.integration.rest.HttpUrl; -import com.synopsys.integration.rest.exception.IntegrationRestException; -import com.synopsys.integration.rest.response.Response; - class Bdio2RetryAwareStreamUploaderTest { @Test diff --git a/src/test/java/com/blackduck/integration/blackduck/bdio2/Bdio2UploadJobTest.java b/src/test/java/com/blackduck/integration/blackduck/bdio2/Bdio2UploadJobTest.java index f6efc5bc3..b2b106496 100644 --- a/src/test/java/com/blackduck/integration/blackduck/bdio2/Bdio2UploadJobTest.java +++ b/src/test/java/com/blackduck/integration/blackduck/bdio2/Bdio2UploadJobTest.java @@ -1,27 +1,23 @@ package com.blackduck.integration.blackduck.bdio2; -import java.util.Collections; - -import com.blackduck.integration.blackduck.bdio2.Bdio2RetryAwareStreamUploader; -import com.blackduck.integration.blackduck.bdio2.Bdio2UploadJob; -import com.blackduck.integration.blackduck.bdio2.RetriableBdioUploadException; +import com.blackduck.integration.blackduck.bdio2.model.BdioFileContent; +import com.blackduck.integration.blackduck.service.request.BlackDuckRequestBuilderEditor; +import com.blackduck.integration.exception.IntegrationException; +import com.blackduck.integration.exception.IntegrationTimeoutException; +import com.blackduck.integration.log.IntLogger; +import com.blackduck.integration.log.Slf4jIntLogger; +import com.blackduck.integration.rest.HttpUrl; +import com.blackduck.integration.rest.response.Response; +import com.blackduck.integration.wait.ResilientJobConfig; +import com.blackduck.integration.wait.ResilientJobExecutor; +import com.blackduck.integration.wait.tracker.WaitIntervalTracker; +import com.blackduck.integration.wait.tracker.WaitIntervalTrackerFactory; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.mockito.Mockito; import org.slf4j.LoggerFactory; -import com.blackduck.integration.blackduck.bdio2.model.BdioFileContent; -import com.blackduck.integration.blackduck.service.request.BlackDuckRequestBuilderEditor; -import com.synopsys.integration.exception.IntegrationException; -import com.synopsys.integration.exception.IntegrationTimeoutException; -import com.synopsys.integration.log.IntLogger; -import com.synopsys.integration.log.Slf4jIntLogger; -import com.synopsys.integration.rest.HttpUrl; -import com.synopsys.integration.rest.response.Response; -import com.synopsys.integration.wait.ResilientJobConfig; -import com.synopsys.integration.wait.ResilientJobExecutor; -import com.synopsys.integration.wait.tracker.WaitIntervalTracker; -import com.synopsys.integration.wait.tracker.WaitIntervalTrackerFactory; +import java.util.Collections; public class Bdio2UploadJobTest { private final IntLogger logger = new Slf4jIntLogger(LoggerFactory.getLogger(this.getClass())); diff --git a/src/test/java/com/blackduck/integration/blackduck/bdio2/util/Bdio2ContentExtractorTest.java b/src/test/java/com/blackduck/integration/blackduck/bdio2/util/Bdio2ContentExtractorTest.java index 854e1a834..ebb08d8b3 100644 --- a/src/test/java/com/blackduck/integration/blackduck/bdio2/util/Bdio2ContentExtractorTest.java +++ b/src/test/java/com/blackduck/integration/blackduck/bdio2/util/Bdio2ContentExtractorTest.java @@ -1,16 +1,14 @@ package com.blackduck.integration.blackduck.bdio2.util; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.fail; +import com.blackduck.integration.blackduck.bdio2.model.BdioFileContent; +import org.junit.jupiter.api.Test; import java.io.File; import java.nio.file.Files; import java.util.List; -import com.blackduck.integration.blackduck.bdio2.util.Bdio2ContentExtractor; -import org.junit.jupiter.api.Test; - -import com.blackduck.integration.blackduck.bdio2.model.BdioFileContent; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.fail; public class Bdio2ContentExtractorTest { @Test diff --git a/src/test/java/com/blackduck/integration/blackduck/bdio2/util/Bdio2FactoryTest.java b/src/test/java/com/blackduck/integration/blackduck/bdio2/util/Bdio2FactoryTest.java index c740a3060..4ac64f370 100644 --- a/src/test/java/com/blackduck/integration/blackduck/bdio2/util/Bdio2FactoryTest.java +++ b/src/test/java/com/blackduck/integration/blackduck/bdio2/util/Bdio2FactoryTest.java @@ -1,23 +1,21 @@ package com.blackduck.integration.blackduck.bdio2.util; -import static org.junit.jupiter.api.Assertions.assertEquals; +import com.blackduck.integration.bdio.graph.DependencyGraph; +import com.blackduck.integration.bdio.model.dependency.Dependency; +import com.blackduck.integration.bdio.model.dependency.ProjectDependency; +import com.blackduck.integration.bdio.model.externalid.ExternalId; +import com.blackduck.integration.bdio.model.externalid.ExternalIdFactory; +import com.blackducksoftware.bdio2.model.Component; +import com.blackducksoftware.bdio2.model.Project; +import org.apache.commons.lang3.tuple.Pair; +import org.junit.jupiter.api.Test; +import org.mockito.Mockito; import java.util.HashSet; import java.util.List; import java.util.Set; -import com.blackduck.integration.blackduck.bdio2.util.Bdio2Factory; -import org.apache.commons.lang3.tuple.Pair; -import org.junit.jupiter.api.Test; -import org.mockito.Mockito; - -import com.blackducksoftware.bdio2.model.Component; -import com.blackducksoftware.bdio2.model.Project; -import com.synopsys.integration.bdio.graph.DependencyGraph; -import com.synopsys.integration.bdio.model.dependency.Dependency; -import com.synopsys.integration.bdio.model.dependency.ProjectDependency; -import com.synopsys.integration.bdio.model.externalid.ExternalId; -import com.synopsys.integration.bdio.model.externalid.ExternalIdFactory; +import static org.junit.jupiter.api.Assertions.assertEquals; class Bdio2FactoryTest { @Test diff --git a/src/test/java/com/blackduck/integration/blackduck/codelocation/CodeLocationWaiterTest.java b/src/test/java/com/blackduck/integration/blackduck/codelocation/CodeLocationWaiterTest.java index 242692058..bc81495af 100644 --- a/src/test/java/com/blackduck/integration/blackduck/codelocation/CodeLocationWaiterTest.java +++ b/src/test/java/com/blackduck/integration/blackduck/codelocation/CodeLocationWaiterTest.java @@ -1,22 +1,23 @@ package com.blackduck.integration.blackduck.codelocation; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertNull; -import static org.junit.jupiter.api.Assertions.assertTrue; - -import java.time.Instant; -import java.time.LocalDateTime; -import java.time.ZoneOffset; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.Date; -import java.util.HashSet; -import java.util.List; -import java.util.Optional; -import java.util.Set; - +import com.blackduck.integration.blackduck.TimingExtension; +import com.blackduck.integration.blackduck.api.core.ResourceMetadata; +import com.blackduck.integration.blackduck.api.generated.view.CodeLocationView; +import com.blackduck.integration.blackduck.api.generated.view.ProjectVersionView; +import com.blackduck.integration.blackduck.api.generated.view.UserView; +import com.blackduck.integration.blackduck.api.manual.component.VersionBomCodeLocationBomComputedNotificationContent; +import com.blackduck.integration.blackduck.api.manual.view.NotificationUserView; +import com.blackduck.integration.blackduck.api.manual.view.VersionBomCodeLocationBomComputedNotificationUserView; +import com.blackduck.integration.blackduck.service.BlackDuckApiClient; +import com.blackduck.integration.blackduck.service.dataservice.NotificationService; +import com.blackduck.integration.blackduck.service.dataservice.ProjectService; +import com.blackduck.integration.blackduck.service.model.NotificationTaskRange; +import com.blackduck.integration.blackduck.service.model.ProjectVersionWrapper; +import com.blackduck.integration.exception.IntegrationException; +import com.blackduck.integration.log.BufferedIntLogger; +import com.blackduck.integration.log.LogLevel; +import com.blackduck.integration.rest.HttpUrl; +import com.blackduck.integration.util.NameVersion; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.params.ParameterizedTest; @@ -25,24 +26,12 @@ import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; -import com.blackduck.integration.blackduck.TimingExtension; -import com.synopsys.integration.blackduck.api.core.ResourceMetadata; -import com.synopsys.integration.blackduck.api.generated.view.CodeLocationView; -import com.synopsys.integration.blackduck.api.generated.view.ProjectVersionView; -import com.synopsys.integration.blackduck.api.generated.view.UserView; -import com.synopsys.integration.blackduck.api.manual.component.VersionBomCodeLocationBomComputedNotificationContent; -import com.synopsys.integration.blackduck.api.manual.view.NotificationUserView; -import com.synopsys.integration.blackduck.api.manual.view.VersionBomCodeLocationBomComputedNotificationUserView; -import com.blackduck.integration.blackduck.service.BlackDuckApiClient; -import com.blackduck.integration.blackduck.service.dataservice.NotificationService; -import com.blackduck.integration.blackduck.service.dataservice.ProjectService; -import com.blackduck.integration.blackduck.service.model.NotificationTaskRange; -import com.blackduck.integration.blackduck.service.model.ProjectVersionWrapper; -import com.synopsys.integration.exception.IntegrationException; -import com.synopsys.integration.log.BufferedIntLogger; -import com.synopsys.integration.log.LogLevel; -import com.synopsys.integration.rest.HttpUrl; -import com.synopsys.integration.util.NameVersion; +import java.time.Instant; +import java.time.LocalDateTime; +import java.time.ZoneOffset; +import java.util.*; + +import static org.junit.jupiter.api.Assertions.*; @ExtendWith(TimingExtension.class) public class CodeLocationWaiterTest { diff --git a/src/test/java/com/blackduck/integration/blackduck/codelocation/CodeLocationsRetrieverTest.java b/src/test/java/com/blackduck/integration/blackduck/codelocation/CodeLocationsRetrieverTest.java index 1eddaa44b..6708a8083 100644 --- a/src/test/java/com/blackduck/integration/blackduck/codelocation/CodeLocationsRetrieverTest.java +++ b/src/test/java/com/blackduck/integration/blackduck/codelocation/CodeLocationsRetrieverTest.java @@ -1,31 +1,23 @@ package com.blackduck.integration.blackduck.codelocation; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.fail; - -import java.util.Arrays; -import java.util.HashMap; -import java.util.HashSet; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import com.blackduck.integration.blackduck.codelocation.CodeLocationsRetriever; +import com.blackduck.integration.blackduck.api.core.ResourceLink; +import com.blackduck.integration.blackduck.api.core.ResourceMetadata; +import com.blackduck.integration.blackduck.api.core.response.UrlMultipleResponses; +import com.blackduck.integration.blackduck.api.generated.view.CodeLocationView; +import com.blackduck.integration.blackduck.api.generated.view.ProjectVersionView; +import com.blackduck.integration.blackduck.service.BlackDuckApiClient; +import com.blackduck.integration.exception.IntegrationException; +import com.blackduck.integration.rest.HttpUrl; import org.junit.jupiter.api.Test; import org.mockito.Mockito; -import com.synopsys.integration.blackduck.api.core.ResourceLink; -import com.synopsys.integration.blackduck.api.core.ResourceMetadata; -import com.synopsys.integration.blackduck.api.core.response.UrlMultipleResponses; -import com.synopsys.integration.blackduck.api.generated.view.CodeLocationView; -import com.synopsys.integration.blackduck.api.generated.view.ProjectVersionView; -import com.blackduck.integration.blackduck.service.BlackDuckApiClient; -import com.synopsys.integration.exception.IntegrationException; -import com.synopsys.integration.rest.HttpUrl; +import java.util.*; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.fail; public class CodeLocationsRetrieverTest { - private final HttpUrl url = new HttpUrl("https://www.synopsys.com"); + private final HttpUrl url = new HttpUrl("https://www.blackduck.com"); public CodeLocationsRetrieverTest() throws IntegrationException {} @@ -71,11 +63,11 @@ private ProjectVersionView buildProjectVersionView() { private Map expectedResults() { Map results = new HashMap<>(); - results.put("https://www.synopsys.com/codelocations/1", "frodo"); - results.put("https://www.synopsys.com/codelocations/2", "sam"); - results.put("https://www.synopsys.com/codelocations/3", "aragorn"); - results.put("https://www.synopsys.com/codelocations/4", "legolas"); - results.put("https://www.synopsys.com/codelocations/5", "gimli"); + results.put("https://www.blackduck.com/codelocations/1", "frodo"); + results.put("https://www.blackduck.com/codelocations/2", "sam"); + results.put("https://www.blackduck.com/codelocations/3", "aragorn"); + results.put("https://www.blackduck.com/codelocations/4", "legolas"); + results.put("https://www.blackduck.com/codelocations/5", "gimli"); return results; } diff --git a/src/test/java/com/blackduck/integration/blackduck/codelocation/binaryscanner/BinaryScanUploadServiceTestIT.java b/src/test/java/com/blackduck/integration/blackduck/codelocation/binaryscanner/BinaryScanUploadServiceTestIT.java index 600169059..4ac4dfb77 100644 --- a/src/test/java/com/blackduck/integration/blackduck/codelocation/binaryscanner/BinaryScanUploadServiceTestIT.java +++ b/src/test/java/com/blackduck/integration/blackduck/codelocation/binaryscanner/BinaryScanUploadServiceTestIT.java @@ -1,31 +1,30 @@ package com.blackduck.integration.blackduck.codelocation.binaryscanner; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; - -import java.io.File; -import java.util.Date; -import java.util.Optional; - import com.blackduck.integration.blackduck.TimingExtension; +import com.blackduck.integration.blackduck.api.generated.view.CodeLocationView; +import com.blackduck.integration.blackduck.api.generated.view.UserView; +import com.blackduck.integration.blackduck.codelocation.Result; +import com.blackduck.integration.blackduck.comprehensive.BlackDuckServices; +import com.blackduck.integration.blackduck.comprehensive.VerifyNotifications; +import com.blackduck.integration.blackduck.exception.BlackDuckIntegrationException; +import com.blackduck.integration.blackduck.http.client.IntHttpClientTestHelper; import com.blackduck.integration.blackduck.service.dataservice.ProjectServiceTestIT; +import com.blackduck.integration.blackduck.service.model.ProjectVersionWrapper; +import com.blackduck.integration.exception.IntegrationException; +import com.blackduck.integration.log.BufferedIntLogger; +import com.blackduck.integration.log.LogLevel; import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import com.synopsys.integration.blackduck.api.generated.view.CodeLocationView; -import com.synopsys.integration.blackduck.api.generated.view.UserView; -import com.blackduck.integration.blackduck.codelocation.Result; -import com.blackduck.integration.blackduck.comprehensive.BlackDuckServices; -import com.blackduck.integration.blackduck.comprehensive.VerifyNotifications; -import com.blackduck.integration.blackduck.exception.BlackDuckIntegrationException; -import com.blackduck.integration.blackduck.http.client.IntHttpClientTestHelper; -import com.blackduck.integration.blackduck.service.model.ProjectVersionWrapper; -import com.synopsys.integration.exception.IntegrationException; -import com.synopsys.integration.log.BufferedIntLogger; -import com.synopsys.integration.log.LogLevel; +import java.io.File; +import java.util.Date; +import java.util.Optional; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; @Tag("integration") @ExtendWith(TimingExtension.class) diff --git a/src/test/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/CodeLocationWaitJobConditionTest.java b/src/test/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/CodeLocationWaitJobConditionTest.java index cdb8089bd..3fbcd5424 100644 --- a/src/test/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/CodeLocationWaitJobConditionTest.java +++ b/src/test/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/CodeLocationWaitJobConditionTest.java @@ -1,30 +1,16 @@ package com.blackduck.integration.blackduck.codelocation.signaturescanner; -import static org.junit.jupiter.api.Assertions.assertTrue; - -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.Arrays; -import java.util.Date; -import java.util.HashSet; -import java.util.List; -import java.util.Optional; -import java.util.Set; - -import org.junit.jupiter.api.Test; -import org.mockito.Mockito; - -import com.synopsys.integration.blackduck.api.core.ResourceLink; -import com.synopsys.integration.blackduck.api.core.ResourceMetadata; -import com.synopsys.integration.blackduck.api.core.response.UrlMultipleResponses; -import com.synopsys.integration.blackduck.api.generated.view.CodeLocationView; -import com.synopsys.integration.blackduck.api.generated.view.ProjectVersionView; -import com.synopsys.integration.blackduck.api.manual.view.ProjectView; -import com.synopsys.integration.blackduck.api.generated.view.UserView; -import com.synopsys.integration.blackduck.api.manual.component.VersionBomCodeLocationBomComputedNotificationContent; -import com.synopsys.integration.blackduck.api.manual.enumeration.NotificationType; -import com.synopsys.integration.blackduck.api.manual.view.NotificationUserView; -import com.synopsys.integration.blackduck.api.manual.view.VersionBomCodeLocationBomComputedNotificationUserView; +import com.blackduck.integration.blackduck.api.core.ResourceLink; +import com.blackduck.integration.blackduck.api.core.ResourceMetadata; +import com.blackduck.integration.blackduck.api.core.response.UrlMultipleResponses; +import com.blackduck.integration.blackduck.api.generated.view.CodeLocationView; +import com.blackduck.integration.blackduck.api.generated.view.ProjectVersionView; +import com.blackduck.integration.blackduck.api.generated.view.UserView; +import com.blackduck.integration.blackduck.api.manual.component.VersionBomCodeLocationBomComputedNotificationContent; +import com.blackduck.integration.blackduck.api.manual.enumeration.NotificationType; +import com.blackduck.integration.blackduck.api.manual.view.NotificationUserView; +import com.blackduck.integration.blackduck.api.manual.view.ProjectView; +import com.blackduck.integration.blackduck.api.manual.view.VersionBomCodeLocationBomComputedNotificationUserView; import com.blackduck.integration.blackduck.codelocation.CodeLocationWaitJobCondition; import com.blackduck.integration.blackduck.service.BlackDuckApiClient; import com.blackduck.integration.blackduck.service.dataservice.NotificationService; @@ -32,16 +18,24 @@ import com.blackduck.integration.blackduck.service.model.NotificationTaskRange; import com.blackduck.integration.blackduck.service.model.ProjectVersionWrapper; import com.blackduck.integration.blackduck.service.request.NotificationEditor; -import com.synopsys.integration.exception.IntegrationException; -import com.synopsys.integration.log.BufferedIntLogger; -import com.synopsys.integration.log.IntLogger; -import com.synopsys.integration.rest.HttpUrl; -import com.synopsys.integration.util.NameVersion; +import com.blackduck.integration.exception.IntegrationException; +import com.blackduck.integration.log.BufferedIntLogger; +import com.blackduck.integration.log.IntLogger; +import com.blackduck.integration.rest.HttpUrl; +import com.blackduck.integration.util.NameVersion; +import org.junit.jupiter.api.Test; +import org.mockito.Mockito; + +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.*; + +import static org.junit.jupiter.api.Assertions.assertTrue; public class CodeLocationWaitJobConditionTest { - private final HttpUrl codeLocationsUrl = new HttpUrl("https://synopsys.com/codelocations"); + private final HttpUrl codeLocationsUrl = new HttpUrl("https://blackduck.com/codelocations"); private final UrlMultipleResponses codeLocationResponses = new UrlMultipleResponses<>(codeLocationsUrl, CodeLocationView.class); - private final HttpUrl codeLocationUrl = new HttpUrl("https://synopsys.com/codelocations/2.71828182845"); + private final HttpUrl codeLocationUrl = new HttpUrl("https://blackduck.com/codelocations/2.71828182845"); public CodeLocationWaitJobConditionTest() throws IntegrationException {} diff --git a/src/test/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/ScanBatchBuilderTest.java b/src/test/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/ScanBatchBuilderTest.java index 9347821d8..6ba4ab5b0 100644 --- a/src/test/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/ScanBatchBuilderTest.java +++ b/src/test/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/ScanBatchBuilderTest.java @@ -1,21 +1,18 @@ package com.blackduck.integration.blackduck.codelocation.signaturescanner; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.junit.jupiter.api.Assertions.fail; - -import java.io.File; -import java.io.IOException; - import com.blackduck.integration.blackduck.TimingExtension; +import com.blackduck.integration.blackduck.codelocation.signaturescanner.command.ScanTarget; +import com.blackduck.integration.blackduck.codelocation.signaturescanner.command.SnippetMatching; +import com.blackduck.integration.exception.IntegrationException; +import com.blackduck.integration.rest.HttpUrl; +import com.blackduck.integration.rest.proxy.ProxyInfo; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import com.blackduck.integration.blackduck.codelocation.signaturescanner.command.ScanTarget; -import com.blackduck.integration.blackduck.codelocation.signaturescanner.command.SnippetMatching; -import com.synopsys.integration.exception.IntegrationException; -import com.synopsys.integration.rest.HttpUrl; -import com.synopsys.integration.rest.proxy.ProxyInfo; +import java.io.File; +import java.io.IOException; + +import static org.junit.jupiter.api.Assertions.*; @ExtendWith(TimingExtension.class) public class ScanBatchBuilderTest { diff --git a/src/test/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/ScanBatchOutputTest.java b/src/test/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/ScanBatchOutputTest.java index dfc481b83..559b4567d 100644 --- a/src/test/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/ScanBatchOutputTest.java +++ b/src/test/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/ScanBatchOutputTest.java @@ -1,6 +1,13 @@ package com.blackduck.integration.blackduck.codelocation.signaturescanner; -import static org.junit.jupiter.api.Assertions.assertEquals; +import com.blackduck.integration.blackduck.codelocation.signaturescanner.command.*; +import com.blackduck.integration.blackduck.exception.BlackDuckIntegrationException; +import com.blackduck.integration.log.IntLogger; +import com.blackduck.integration.log.SilentIntLogger; +import com.blackduck.integration.util.IntEnvironmentVariables; +import com.blackduck.integration.util.NameVersion; +import org.junit.jupiter.api.Test; +import org.mockito.Mockito; import java.io.File; import java.util.ArrayList; @@ -8,22 +15,7 @@ import java.util.HashSet; import java.util.List; -import com.blackduck.integration.blackduck.codelocation.signaturescanner.ScanBatch; -import com.blackduck.integration.blackduck.codelocation.signaturescanner.ScanBatchBuilder; -import com.blackduck.integration.blackduck.codelocation.signaturescanner.ScanBatchOutput; -import org.junit.jupiter.api.Test; -import org.mockito.Mockito; - -import com.blackduck.integration.blackduck.codelocation.signaturescanner.command.ScanCommand; -import com.blackduck.integration.blackduck.codelocation.signaturescanner.command.ScanCommandOutput; -import com.blackduck.integration.blackduck.codelocation.signaturescanner.command.ScanPathsUtility; -import com.blackduck.integration.blackduck.codelocation.signaturescanner.command.ScanTarget; -import com.blackduck.integration.blackduck.codelocation.signaturescanner.command.SnippetMatching; -import com.blackduck.integration.blackduck.exception.BlackDuckIntegrationException; -import com.synopsys.integration.log.IntLogger; -import com.synopsys.integration.log.SilentIntLogger; -import com.synopsys.integration.util.IntEnvironmentVariables; -import com.synopsys.integration.util.NameVersion; +import static org.junit.jupiter.api.Assertions.assertEquals; public class ScanBatchOutputTest { @Test diff --git a/src/test/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/ScanPathsTest.java b/src/test/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/ScanPathsTest.java index 8aa02626f..4b00f9599 100644 --- a/src/test/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/ScanPathsTest.java +++ b/src/test/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/ScanPathsTest.java @@ -1,19 +1,12 @@ package com.blackduck.integration.blackduck.codelocation.signaturescanner; -import static com.blackduck.integration.blackduck.codelocation.signaturescanner.command.ScanPathsUtility.BDS_JAVA_HOME; -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.CoreMatchers.startsWith; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; - -import java.io.File; -import java.io.IOException; -import java.nio.file.Files; -import java.nio.file.Path; - import com.blackduck.integration.blackduck.TimingExtension; +import com.blackduck.integration.blackduck.codelocation.signaturescanner.command.ScanPaths; +import com.blackduck.integration.blackduck.codelocation.signaturescanner.command.ScanPathsUtility; import com.blackduck.integration.blackduck.codelocation.signaturescanner.command.ZipApiScannerInstaller; +import com.blackduck.integration.log.BufferedIntLogger; +import com.blackduck.integration.util.IntEnvironmentVariables; +import com.blackduck.integration.util.OperatingSystemType; import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.StringUtils; import org.junit.jupiter.api.AfterEach; @@ -21,11 +14,17 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import com.blackduck.integration.blackduck.codelocation.signaturescanner.command.ScanPaths; -import com.blackduck.integration.blackduck.codelocation.signaturescanner.command.ScanPathsUtility; -import com.synopsys.integration.log.BufferedIntLogger; -import com.synopsys.integration.util.IntEnvironmentVariables; -import com.synopsys.integration.util.OperatingSystemType; +import java.io.File; +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; + +import static com.blackduck.integration.blackduck.codelocation.signaturescanner.command.ScanPathsUtility.BDS_JAVA_HOME; +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.CoreMatchers.startsWith; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; @ExtendWith(TimingExtension.class) public class ScanPathsTest { diff --git a/src/test/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/ScannerZipInstallerTest.java b/src/test/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/ScannerZipInstallerTest.java index 87708dda0..f74d6acb8 100644 --- a/src/test/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/ScannerZipInstallerTest.java +++ b/src/test/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/ScannerZipInstallerTest.java @@ -1,18 +1,9 @@ package com.blackduck.integration.blackduck.codelocation.signaturescanner; -import static org.junit.jupiter.api.Assertions.assertTrue; - -import java.io.File; - import com.blackduck.integration.blackduck.TimingExtension; -import com.blackduck.integration.blackduck.codelocation.signaturescanner.command.ZipApiScannerInstaller; -import org.apache.commons.lang3.StringUtils; -import org.junit.jupiter.api.Tag; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; - import com.blackduck.integration.blackduck.codelocation.signaturescanner.command.ScanPaths; import com.blackduck.integration.blackduck.codelocation.signaturescanner.command.ScanPathsUtility; +import com.blackduck.integration.blackduck.codelocation.signaturescanner.command.ZipApiScannerInstaller; import com.blackduck.integration.blackduck.configuration.BlackDuckServerConfig; import com.blackduck.integration.blackduck.configuration.BlackDuckServerConfigBuilder; import com.blackduck.integration.blackduck.http.client.BlackDuckHttpClient; @@ -21,12 +12,20 @@ import com.blackduck.integration.blackduck.keystore.KeyStoreHelper; import com.blackduck.integration.blackduck.service.BlackDuckServicesFactory; import com.blackduck.integration.blackduck.service.dataservice.BlackDuckRegistrationService; -import com.synopsys.integration.log.BufferedIntLogger; -import com.synopsys.integration.log.IntLogger; -import com.synopsys.integration.rest.HttpUrl; -import com.synopsys.integration.util.CleanupZipExpander; -import com.synopsys.integration.util.IntEnvironmentVariables; -import com.synopsys.integration.util.OperatingSystemType; +import com.blackduck.integration.log.BufferedIntLogger; +import com.blackduck.integration.log.IntLogger; +import com.blackduck.integration.rest.HttpUrl; +import com.blackduck.integration.util.CleanupZipExpander; +import com.blackduck.integration.util.IntEnvironmentVariables; +import com.blackduck.integration.util.OperatingSystemType; +import org.apache.commons.lang3.StringUtils; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; + +import java.io.File; + +import static org.junit.jupiter.api.Assertions.assertTrue; @ExtendWith(TimingExtension.class) @Tag("integration") diff --git a/src/test/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ScanCommandArgumentParserTest.java b/src/test/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ScanCommandArgumentParserTest.java index 498070d06..772c19af9 100644 --- a/src/test/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ScanCommandArgumentParserTest.java +++ b/src/test/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ScanCommandArgumentParserTest.java @@ -1,16 +1,13 @@ package com.blackduck.integration.blackduck.codelocation.signaturescanner.command; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.junit.jupiter.api.Assertions.assertTrue; -import java.util.List; - -import com.blackduck.integration.blackduck.codelocation.signaturescanner.command.ScanCommandArgumentParser; +import com.blackduck.integration.blackduck.exception.SignatureScannerInputException; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.CsvFileSource; -import com.blackduck.integration.blackduck.exception.SignatureScannerInputException; +import java.util.List; + +import static org.junit.jupiter.api.Assertions.*; public class ScanCommandArgumentParserTest { private ScanCommandArgumentParser parser = new ScanCommandArgumentParser(); diff --git a/src/test/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ScanCommandQuoteParserTest.java b/src/test/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ScanCommandQuoteParserTest.java index 486f06bb5..f37284528 100644 --- a/src/test/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ScanCommandQuoteParserTest.java +++ b/src/test/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ScanCommandQuoteParserTest.java @@ -1,11 +1,10 @@ package com.blackduck.integration.blackduck.codelocation.signaturescanner.command; -import static org.junit.jupiter.api.Assertions.assertEquals; - -import com.blackduck.integration.blackduck.codelocation.signaturescanner.command.ScanCommandQuoteParser; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.CsvFileSource; +import static org.junit.jupiter.api.Assertions.assertEquals; + public class ScanCommandQuoteParserTest { private ScanCommandQuoteParser parser = new ScanCommandQuoteParser(); diff --git a/src/test/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ScanCommandTest.java b/src/test/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ScanCommandTest.java index e51dc8bb6..d4b58e552 100644 --- a/src/test/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ScanCommandTest.java +++ b/src/test/java/com/blackduck/integration/blackduck/codelocation/signaturescanner/command/ScanCommandTest.java @@ -1,17 +1,20 @@ package com.blackduck.integration.blackduck.codelocation.signaturescanner.command; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertTrue; - -import java.io.IOException; -import java.nio.file.Files; -import java.nio.file.Path; -import java.util.List; -import java.util.Set; -import java.util.HashSet; - import com.blackduck.integration.blackduck.TimingExtension; +import com.blackduck.integration.blackduck.codelocation.signaturescanner.ScanBatch; +import com.blackduck.integration.blackduck.codelocation.signaturescanner.ScanBatchBuilder; +import com.blackduck.integration.blackduck.exception.BlackDuckIntegrationException; +import com.blackduck.integration.exception.IntegrationException; +import com.blackduck.integration.log.BufferedIntLogger; +import com.blackduck.integration.log.IntLogger; +import com.blackduck.integration.log.LogLevel; +import com.blackduck.integration.log.PrintStreamIntLogger; +import com.blackduck.integration.rest.HttpUrl; +import com.blackduck.integration.rest.credentials.CredentialsBuilder; +import com.blackduck.integration.rest.proxy.ProxyInfo; +import com.blackduck.integration.rest.proxy.ProxyInfoBuilder; +import com.blackduck.integration.util.IntEnvironmentVariables; +import com.blackduck.integration.util.OperatingSystemType; import org.apache.commons.io.FileUtils; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; @@ -19,20 +22,14 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mockito; -import com.blackduck.integration.blackduck.codelocation.signaturescanner.ScanBatch; -import com.blackduck.integration.blackduck.codelocation.signaturescanner.ScanBatchBuilder; -import com.blackduck.integration.blackduck.exception.BlackDuckIntegrationException; -import com.synopsys.integration.exception.IntegrationException; -import com.synopsys.integration.log.BufferedIntLogger; -import com.synopsys.integration.log.IntLogger; -import com.synopsys.integration.log.LogLevel; -import com.synopsys.integration.log.PrintStreamIntLogger; -import com.synopsys.integration.rest.HttpUrl; -import com.synopsys.integration.rest.credentials.CredentialsBuilder; -import com.synopsys.integration.rest.proxy.ProxyInfo; -import com.synopsys.integration.rest.proxy.ProxyInfoBuilder; -import com.synopsys.integration.util.IntEnvironmentVariables; -import com.synopsys.integration.util.OperatingSystemType; +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + +import static org.junit.jupiter.api.Assertions.*; @ExtendWith(TimingExtension.class) public class ScanCommandTest { diff --git a/src/test/java/com/blackduck/integration/blackduck/comprehensive/BlackDuckServices.java b/src/test/java/com/blackduck/integration/blackduck/comprehensive/BlackDuckServices.java index 3853801c3..f0a3af092 100644 --- a/src/test/java/com/blackduck/integration/blackduck/comprehensive/BlackDuckServices.java +++ b/src/test/java/com/blackduck/integration/blackduck/comprehensive/BlackDuckServices.java @@ -1,24 +1,16 @@ package com.blackduck.integration.blackduck.comprehensive; -import com.blackduck.integration.blackduck.http.client.IntHttpClientTestHelper; -import com.synopsys.integration.blackduck.api.generated.discovery.ApiDiscovery; +import com.blackduck.integration.blackduck.api.generated.discovery.ApiDiscovery; import com.blackduck.integration.blackduck.codelocation.CodeLocationCreationService; import com.blackduck.integration.blackduck.configuration.BlackDuckServerConfig; +import com.blackduck.integration.blackduck.http.client.IntHttpClientTestHelper; import com.blackduck.integration.blackduck.service.BlackDuckApiClient; import com.blackduck.integration.blackduck.service.BlackDuckServicesFactory; -import com.blackduck.integration.blackduck.service.dataservice.BlackDuckRegistrationService; -import com.blackduck.integration.blackduck.service.dataservice.CodeLocationService; -import com.blackduck.integration.blackduck.service.dataservice.ComponentService; -import com.blackduck.integration.blackduck.service.dataservice.NotificationService; -import com.blackduck.integration.blackduck.service.dataservice.PolicyRuleService; -import com.blackduck.integration.blackduck.service.dataservice.ProjectBomService; -import com.blackduck.integration.blackduck.service.dataservice.ProjectService; -import com.blackduck.integration.blackduck.service.dataservice.ProjectUsersService; -import com.blackduck.integration.blackduck.service.dataservice.UserService; -import com.synopsys.integration.exception.IntegrationException; -import com.synopsys.integration.log.IntLogger; -import com.synopsys.integration.log.LogLevel; -import com.synopsys.integration.log.PrintStreamIntLogger; +import com.blackduck.integration.blackduck.service.dataservice.*; +import com.blackduck.integration.exception.IntegrationException; +import com.blackduck.integration.log.IntLogger; +import com.blackduck.integration.log.LogLevel; +import com.blackduck.integration.log.PrintStreamIntLogger; public class BlackDuckServices { public IntLogger logger; diff --git a/src/test/java/com/blackduck/integration/blackduck/comprehensive/ComprehensiveCookbookTestIT.java b/src/test/java/com/blackduck/integration/blackduck/comprehensive/ComprehensiveCookbookTestIT.java index 44b2c4cf2..69210be0f 100644 --- a/src/test/java/com/blackduck/integration/blackduck/comprehensive/ComprehensiveCookbookTestIT.java +++ b/src/test/java/com/blackduck/integration/blackduck/comprehensive/ComprehensiveCookbookTestIT.java @@ -1,38 +1,18 @@ package com.blackduck.integration.blackduck.comprehensive; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertTrue; - -import java.io.File; -import java.util.Date; -import java.util.List; -import java.util.Optional; - +import com.blackduck.integration.bdio.model.externalid.ExternalId; +import com.blackduck.integration.bdio.model.externalid.ExternalIdFactory; import com.blackduck.integration.blackduck.TimingExtension; -import com.blackduck.integration.blackduck.http.client.IntHttpClientTestHelper; -import org.junit.jupiter.api.Tag; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; - -import com.synopsys.integration.bdio.model.externalid.ExternalId; -import com.synopsys.integration.bdio.model.externalid.ExternalIdFactory; -import com.synopsys.integration.blackduck.api.core.BlackDuckResponse; -import com.synopsys.integration.blackduck.api.core.response.UrlMultipleResponses; -import com.synopsys.integration.blackduck.api.generated.discovery.ApiDiscovery; -import com.synopsys.integration.blackduck.api.generated.enumeration.ProjectVersionComponentPolicyStatusType; -import com.synopsys.integration.blackduck.api.generated.enumeration.ProjectVersionDistributionType; -import com.synopsys.integration.blackduck.api.generated.view.CodeLocationView; -import com.synopsys.integration.blackduck.api.generated.view.PolicyRuleView; -import com.synopsys.integration.blackduck.api.generated.view.ProjectVersionComponentVersionView; -import com.synopsys.integration.blackduck.api.generated.view.ProjectVersionPolicyStatusView; -import com.synopsys.integration.blackduck.api.generated.view.ProjectVersionView; -import com.synopsys.integration.blackduck.api.manual.view.ProjectView; -import com.synopsys.integration.blackduck.api.generated.view.UserView; -import com.synopsys.integration.blackduck.api.manual.temporary.component.ProjectRequest; -import com.synopsys.integration.blackduck.api.manual.temporary.component.ProjectVersionRequest; -import com.synopsys.integration.blackduck.api.manual.temporary.enumeration.ProjectVersionPhaseType; +import com.blackduck.integration.blackduck.api.core.BlackDuckResponse; +import com.blackduck.integration.blackduck.api.core.response.UrlMultipleResponses; +import com.blackduck.integration.blackduck.api.generated.discovery.ApiDiscovery; +import com.blackduck.integration.blackduck.api.generated.enumeration.ProjectVersionComponentPolicyStatusType; +import com.blackduck.integration.blackduck.api.generated.enumeration.ProjectVersionDistributionType; +import com.blackduck.integration.blackduck.api.generated.view.*; +import com.blackduck.integration.blackduck.api.manual.temporary.component.ProjectRequest; +import com.blackduck.integration.blackduck.api.manual.temporary.component.ProjectVersionRequest; +import com.blackduck.integration.blackduck.api.manual.temporary.enumeration.ProjectVersionPhaseType; +import com.blackduck.integration.blackduck.api.manual.view.ProjectView; import com.blackduck.integration.blackduck.codelocation.Result; import com.blackduck.integration.blackduck.codelocation.bdiolegacy.BdioUploadService; import com.blackduck.integration.blackduck.codelocation.signaturescanner.ScanBatch; @@ -47,6 +27,7 @@ import com.blackduck.integration.blackduck.codelocation.upload.UploadTarget; import com.blackduck.integration.blackduck.http.BlackDuckPageResponse; import com.blackduck.integration.blackduck.http.BlackDuckRequestBuilder; +import com.blackduck.integration.blackduck.http.client.IntHttpClientTestHelper; import com.blackduck.integration.blackduck.http.transform.BlackDuckResponsesTransformer; import com.blackduck.integration.blackduck.service.BlackDuckApiClient; import com.blackduck.integration.blackduck.service.BlackDuckServicesFactory; @@ -54,10 +35,20 @@ import com.blackduck.integration.blackduck.service.model.ProjectSyncModel; import com.blackduck.integration.blackduck.service.model.ProjectVersionWrapper; import com.blackduck.integration.blackduck.service.request.BlackDuckMultipleRequest; -import com.synopsys.integration.exception.IntegrationException; -import com.synopsys.integration.log.IntLogger; -import com.synopsys.integration.log.SilentIntLogger; -import com.synopsys.integration.util.NameVersion; +import com.blackduck.integration.exception.IntegrationException; +import com.blackduck.integration.log.IntLogger; +import com.blackduck.integration.log.SilentIntLogger; +import com.blackduck.integration.util.NameVersion; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; + +import java.io.File; +import java.util.Date; +import java.util.List; +import java.util.Optional; + +import static org.junit.jupiter.api.Assertions.*; @Tag("integration") @ExtendWith(TimingExtension.class) diff --git a/src/test/java/com/blackduck/integration/blackduck/comprehensive/CreateProjectWithBdioAndVerifyBOMTest.java b/src/test/java/com/blackduck/integration/blackduck/comprehensive/CreateProjectWithBdioAndVerifyBOMTest.java index be3a9165a..e978b9a59 100644 --- a/src/test/java/com/blackduck/integration/blackduck/comprehensive/CreateProjectWithBdioAndVerifyBOMTest.java +++ b/src/test/java/com/blackduck/integration/blackduck/comprehensive/CreateProjectWithBdioAndVerifyBOMTest.java @@ -1,52 +1,47 @@ package com.blackduck.integration.blackduck.comprehensive; -import static org.junit.jupiter.api.Assertions.assertTrue; - -import java.io.File; -import java.time.temporal.ChronoUnit; -import java.util.Arrays; -import java.util.Date; -import java.util.List; -import java.util.Optional; -import java.util.Set; -import java.util.function.Predicate; -import java.util.stream.Collectors; - import com.blackduck.integration.blackduck.TimingExtension; -import com.blackduck.integration.blackduck.http.client.IntHttpClientTestHelper; -import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Tag; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; - -import com.synopsys.integration.blackduck.api.generated.view.CodeLocationView; -import com.synopsys.integration.blackduck.api.generated.view.ProjectVersionView; -import com.synopsys.integration.blackduck.api.manual.view.ProjectView; -import com.synopsys.integration.blackduck.api.generated.view.UserView; -import com.synopsys.integration.blackduck.api.manual.component.VersionBomCodeLocationBomComputedNotificationContent; -import com.synopsys.integration.blackduck.api.manual.temporary.enumeration.NotificationType; -import com.synopsys.integration.blackduck.api.manual.view.NotificationUserView; -import com.synopsys.integration.blackduck.api.manual.view.VersionBomCodeLocationBomComputedNotificationUserView; +import com.blackduck.integration.blackduck.api.generated.view.CodeLocationView; +import com.blackduck.integration.blackduck.api.generated.view.ProjectVersionView; +import com.blackduck.integration.blackduck.api.generated.view.UserView; +import com.blackduck.integration.blackduck.api.manual.component.VersionBomCodeLocationBomComputedNotificationContent; +import com.blackduck.integration.blackduck.api.manual.temporary.enumeration.NotificationType; +import com.blackduck.integration.blackduck.api.manual.view.NotificationUserView; +import com.blackduck.integration.blackduck.api.manual.view.ProjectView; +import com.blackduck.integration.blackduck.api.manual.view.VersionBomCodeLocationBomComputedNotificationUserView; import com.blackduck.integration.blackduck.codelocation.CodeLocationCreationData; import com.blackduck.integration.blackduck.codelocation.bdiolegacy.BdioUploadService; import com.blackduck.integration.blackduck.codelocation.upload.UploadBatch; import com.blackduck.integration.blackduck.codelocation.upload.UploadBatchOutput; import com.blackduck.integration.blackduck.codelocation.upload.UploadTarget; +import com.blackduck.integration.blackduck.http.client.IntHttpClientTestHelper; import com.blackduck.integration.blackduck.service.model.ProjectVersionWrapper; import com.blackduck.integration.blackduck.service.request.NotificationEditor; -import com.synopsys.integration.exception.IntegrationException; -import com.synopsys.integration.log.IntLogger; -import com.synopsys.integration.log.LogLevel; -import com.synopsys.integration.log.PrintStreamIntLogger; -import com.synopsys.integration.rest.HttpUrl; -import com.synopsys.integration.rest.RestConstants; -import com.synopsys.integration.util.NameVersion; -import com.synopsys.integration.wait.ResilientJobConfig; -import com.synopsys.integration.wait.WaitJob; -import com.synopsys.integration.wait.WaitJobCondition; -import com.synopsys.integration.wait.tracker.WaitIntervalTracker; -import com.synopsys.integration.wait.tracker.WaitIntervalTrackerFactory; +import com.blackduck.integration.exception.IntegrationException; +import com.blackduck.integration.log.IntLogger; +import com.blackduck.integration.log.LogLevel; +import com.blackduck.integration.log.PrintStreamIntLogger; +import com.blackduck.integration.rest.HttpUrl; +import com.blackduck.integration.rest.RestConstants; +import com.blackduck.integration.util.NameVersion; +import com.blackduck.integration.wait.ResilientJobConfig; +import com.blackduck.integration.wait.WaitJob; +import com.blackduck.integration.wait.WaitJobCondition; +import com.blackduck.integration.wait.tracker.WaitIntervalTracker; +import com.blackduck.integration.wait.tracker.WaitIntervalTrackerFactory; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; + +import java.io.File; +import java.time.temporal.ChronoUnit; +import java.util.*; +import java.util.function.Predicate; +import java.util.stream.Collectors; + +import static org.junit.jupiter.api.Assertions.assertTrue; @Tag("integration") @ExtendWith(TimingExtension.class) @@ -61,13 +56,13 @@ public class CreateProjectWithBdioAndVerifyBOMTest { public static final List CODE_LOCATION_NAMES = Arrays.asList( "blackduck-alert/6.1.0-SNAPSHOT/alert-common/blackduck-alert/alert-common/6.1.0-SNAPSHOT gradle/bom" , "blackduck-alert/6.1.0-SNAPSHOT/alert-database/blackduck-alert/alert-database/6.1.0-SNAPSHOT gradle/bom" - , "blackduck-alert/6.1.0-SNAPSHOT/com.synopsys.integration/blackduck-alert/6.1.0-SNAPSHOT gradle/bom" + , "blackduck-alert/6.1.0-SNAPSHOT/com.blackduck.integration/blackduck-alert/6.1.0-SNAPSHOT gradle/bom" ); public static final String[] BDIO_FILE_NAMES = new String[] { "bdio/alert/blackduck_alert_6_1_0_SNAPSHOT_alert_common_blackduck_alert_alert_common_6_1_0_SNAPSHOT_gradle_bom.jsonld" , "bdio/alert/blackduck_alert_6_1_0_SNAPSHOT_alert_database_blackduck_alert_alert_database_6_1_0_SNAPSHOT_gradle_bom.jsonld" - , "bdio/alert/blackduck_alert_6_1_0_SNAPSHOT_com_synopsys_integration_blackduck_alert_6_1_0_SNAPSHOT_gradle_bom.jsonld" + , "bdio/alert/blackduck_alert_6_1_0_SNAPSHOT_com_blackduck_integration_blackduck_alert_6_1_0_SNAPSHOT_gradle_bom.jsonld" }; private final IntHttpClientTestHelper intHttpClientTestHelper = new IntHttpClientTestHelper(); diff --git a/src/test/java/com/blackduck/integration/blackduck/comprehensive/InstallAndRunSignatureScannerTestIT.java b/src/test/java/com/blackduck/integration/blackduck/comprehensive/InstallAndRunSignatureScannerTestIT.java index 50a3af2f7..f34d57e23 100644 --- a/src/test/java/com/blackduck/integration/blackduck/comprehensive/InstallAndRunSignatureScannerTestIT.java +++ b/src/test/java/com/blackduck/integration/blackduck/comprehensive/InstallAndRunSignatureScannerTestIT.java @@ -1,55 +1,50 @@ package com.blackduck.integration.blackduck.comprehensive; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; - -import java.io.File; -import java.io.IOException; -import java.nio.file.Files; -import java.security.cert.Certificate; -import java.util.Arrays; -import java.util.List; -import java.util.Optional; -import java.util.concurrent.ExecutorService; - import com.blackduck.integration.blackduck.TimingExtension; -import com.blackduck.integration.blackduck.http.client.IntHttpClientTestHelper; -import com.blackduck.integration.blackduck.codelocation.signaturescanner.command.*; -import org.apache.commons.io.FileUtils; -import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Tag; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; - -import com.synopsys.integration.blackduck.api.generated.view.CodeLocationView; +import com.blackduck.integration.blackduck.api.generated.view.CodeLocationView; import com.blackduck.integration.blackduck.codelocation.Result; -import com.blackduck.integration.blackduck.codelocation.signaturescanner.ScanBatch; -import com.blackduck.integration.blackduck.codelocation.signaturescanner.ScanBatchBuilder; -import com.blackduck.integration.blackduck.codelocation.signaturescanner.ScanBatchOutput; -import com.blackduck.integration.blackduck.codelocation.signaturescanner.ScanBatchRunner; -import com.blackduck.integration.blackduck.codelocation.signaturescanner.SignatureScannerService; +import com.blackduck.integration.blackduck.codelocation.signaturescanner.*; +import com.blackduck.integration.blackduck.codelocation.signaturescanner.command.*; import com.blackduck.integration.blackduck.configuration.BlackDuckServerConfig; import com.blackduck.integration.blackduck.configuration.BlackDuckServerConfigBuilder; import com.blackduck.integration.blackduck.http.client.BlackDuckHttpClient; +import com.blackduck.integration.blackduck.http.client.IntHttpClientTestHelper; import com.blackduck.integration.blackduck.http.client.SignatureScannerClient; import com.blackduck.integration.blackduck.keystore.KeyStoreHelper; import com.blackduck.integration.blackduck.service.BlackDuckApiClient; import com.blackduck.integration.blackduck.service.BlackDuckServicesFactory; import com.blackduck.integration.blackduck.service.dataservice.BlackDuckRegistrationService; import com.blackduck.integration.blackduck.service.dataservice.CodeLocationService; -import com.synopsys.integration.exception.IntegrationException; -import com.synopsys.integration.log.BufferedIntLogger; -import com.synopsys.integration.log.LogLevel; -import com.synopsys.integration.log.SilentIntLogger; -import com.synopsys.integration.rest.HttpUrl; -import com.synopsys.integration.util.CleanupZipExpander; -import com.synopsys.integration.util.IntEnvironmentVariables; -import com.synopsys.integration.util.OperatingSystemType; -import com.synopsys.integration.wait.ResilientJobConfig; -import com.synopsys.integration.wait.WaitJob; -import com.synopsys.integration.wait.tracker.WaitIntervalTracker; -import com.synopsys.integration.wait.tracker.WaitIntervalTrackerFactory; +import com.blackduck.integration.exception.IntegrationException; +import com.blackduck.integration.log.BufferedIntLogger; +import com.blackduck.integration.log.LogLevel; +import com.blackduck.integration.log.SilentIntLogger; +import com.blackduck.integration.rest.HttpUrl; +import com.blackduck.integration.util.CleanupZipExpander; +import com.blackduck.integration.util.IntEnvironmentVariables; +import com.blackduck.integration.util.OperatingSystemType; +import com.blackduck.integration.wait.ResilientJobConfig; +import com.blackduck.integration.wait.WaitJob; +import com.blackduck.integration.wait.tracker.WaitIntervalTracker; +import com.blackduck.integration.wait.tracker.WaitIntervalTrackerFactory; +import org.apache.commons.io.FileUtils; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; + +import java.io.File; +import java.io.IOException; +import java.nio.file.Files; +import java.security.cert.Certificate; +import java.util.Arrays; +import java.util.List; +import java.util.Optional; +import java.util.concurrent.ExecutorService; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; @Tag("integration") @ExtendWith(TimingExtension.class) diff --git a/src/test/java/com/blackduck/integration/blackduck/comprehensive/NotificationsTestIT.java b/src/test/java/com/blackduck/integration/blackduck/comprehensive/NotificationsTestIT.java index e840edd43..73a4c0a60 100644 --- a/src/test/java/com/blackduck/integration/blackduck/comprehensive/NotificationsTestIT.java +++ b/src/test/java/com/blackduck/integration/blackduck/comprehensive/NotificationsTestIT.java @@ -1,28 +1,14 @@ package com.blackduck.integration.blackduck.comprehensive; -import static org.junit.jupiter.api.Assertions.assertEquals; - -import java.time.temporal.ChronoUnit; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Date; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - import com.blackduck.integration.blackduck.TimingExtension; +import com.blackduck.integration.blackduck.api.generated.view.UserView; +import com.blackduck.integration.blackduck.api.manual.component.ProjectNotificationContent; +import com.blackduck.integration.blackduck.api.manual.component.ProjectVersionNotificationContent; +import com.blackduck.integration.blackduck.api.manual.temporary.enumeration.NotificationType; +import com.blackduck.integration.blackduck.api.manual.view.NotificationUserView; +import com.blackduck.integration.blackduck.api.manual.view.ProjectNotificationUserView; +import com.blackduck.integration.blackduck.api.manual.view.ProjectVersionNotificationUserView; import com.blackduck.integration.blackduck.http.client.IntHttpClientTestHelper; -import org.junit.jupiter.api.Tag; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; - -import com.synopsys.integration.blackduck.api.generated.view.UserView; -import com.synopsys.integration.blackduck.api.manual.component.ProjectNotificationContent; -import com.synopsys.integration.blackduck.api.manual.component.ProjectVersionNotificationContent; -import com.synopsys.integration.blackduck.api.manual.temporary.enumeration.NotificationType; -import com.synopsys.integration.blackduck.api.manual.view.NotificationUserView; -import com.synopsys.integration.blackduck.api.manual.view.ProjectNotificationUserView; -import com.synopsys.integration.blackduck.api.manual.view.ProjectVersionNotificationUserView; import com.blackduck.integration.blackduck.service.BlackDuckApiClient; import com.blackduck.integration.blackduck.service.BlackDuckServicesFactory; import com.blackduck.integration.blackduck.service.dataservice.NotificationService; @@ -31,7 +17,15 @@ import com.blackduck.integration.blackduck.service.model.ProjectSyncModel; import com.blackduck.integration.blackduck.service.model.ProjectVersionWrapper; import com.blackduck.integration.blackduck.service.request.NotificationEditor; -import com.synopsys.integration.exception.IntegrationException; +import com.blackduck.integration.exception.IntegrationException; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; + +import java.time.temporal.ChronoUnit; +import java.util.*; + +import static org.junit.jupiter.api.Assertions.assertEquals; @Tag("integration") @ExtendWith(TimingExtension.class) diff --git a/src/test/java/com/blackduck/integration/blackduck/comprehensive/ProjectBomServiceTestIT.java b/src/test/java/com/blackduck/integration/blackduck/comprehensive/ProjectBomServiceTestIT.java index 8828115e2..4f5b9aa73 100644 --- a/src/test/java/com/blackduck/integration/blackduck/comprehensive/ProjectBomServiceTestIT.java +++ b/src/test/java/com/blackduck/integration/blackduck/comprehensive/ProjectBomServiceTestIT.java @@ -1,32 +1,16 @@ package com.blackduck.integration.blackduck.comprehensive; -import static org.junit.jupiter.api.Assertions.assertEquals; - -import java.util.List; -import java.util.NoSuchElementException; -import java.util.Optional; - +import com.blackduck.integration.bdio.model.externalid.ExternalId; +import com.blackduck.integration.bdio.model.externalid.ExternalIdFactory; import com.blackduck.integration.blackduck.TimingExtension; -import com.blackduck.integration.blackduck.http.client.IntHttpClientTestHelper; -import org.junit.Assume; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Tag; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; - -import com.synopsys.integration.bdio.model.externalid.ExternalId; -import com.synopsys.integration.bdio.model.externalid.ExternalIdFactory; import com.blackduck.integration.blackduck.api.enumeration.PolicyRuleConditionOperatorType; -import com.synopsys.integration.blackduck.api.generated.component.PolicyRuleExpressionView; -import com.synopsys.integration.blackduck.api.generated.enumeration.PolicyRuleCategoryType; -import com.synopsys.integration.blackduck.api.generated.enumeration.ProjectVersionComponentPolicyStatusType; -import com.synopsys.integration.blackduck.api.generated.view.ComponentVersionView; -import com.synopsys.integration.blackduck.api.generated.view.PolicyRuleView; -import com.synopsys.integration.blackduck.api.generated.view.ProjectVersionComponentVersionView; -import com.synopsys.integration.blackduck.api.generated.view.ProjectVersionPolicyRulesView; -import com.synopsys.integration.blackduck.api.generated.view.ProjectVersionView; -import com.synopsys.integration.blackduck.api.manual.view.ProjectView; +import com.blackduck.integration.blackduck.api.generated.component.PolicyRuleExpressionView; +import com.blackduck.integration.blackduck.api.generated.enumeration.PolicyRuleCategoryType; +import com.blackduck.integration.blackduck.api.generated.enumeration.ProjectVersionComponentPolicyStatusType; +import com.blackduck.integration.blackduck.api.generated.view.*; +import com.blackduck.integration.blackduck.api.manual.view.ProjectView; import com.blackduck.integration.blackduck.exception.BlackDuckIntegrationException; +import com.blackduck.integration.blackduck.http.client.IntHttpClientTestHelper; import com.blackduck.integration.blackduck.service.BlackDuckApiClient; import com.blackduck.integration.blackduck.service.BlackDuckServicesFactory; import com.blackduck.integration.blackduck.service.dataservice.PolicyRuleService; @@ -35,8 +19,19 @@ import com.blackduck.integration.blackduck.service.model.PolicyRuleExpressionSetBuilder; import com.blackduck.integration.blackduck.service.model.ProjectSyncModel; import com.blackduck.integration.blackduck.service.model.ProjectVersionWrapper; -import com.synopsys.integration.log.IntLogger; -import com.synopsys.integration.rest.HttpUrl; +import com.blackduck.integration.log.IntLogger; +import com.blackduck.integration.rest.HttpUrl; +import org.junit.Assume; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; + +import java.util.List; +import java.util.NoSuchElementException; +import java.util.Optional; + +import static org.junit.jupiter.api.Assertions.assertEquals; @Tag("integration") @ExtendWith(TimingExtension.class) @@ -66,7 +61,7 @@ public void testAddingComponentToBom() throws Exception { List bomComponents = projectBomService.getComponentsForProjectVersion(projectVersionWrapper.getProjectVersionView()); assertEquals(0, bomComponents.size()); - ExternalId externalId = new ExternalIdFactory().createMavenExternalId("com.synopsys.integration", "blackduck-common", "47.0.0"); + ExternalId externalId = new ExternalIdFactory().createMavenExternalId("com.blackduck.integration", "blackduck-common", "47.0.0"); projectBomService.addComponentToProjectVersion(externalId, projectVersionWrapper.getProjectVersionView()); bomComponents = projectBomService.getComponentsForProjectVersion(projectVersionWrapper.getProjectVersionView()); @@ -132,7 +127,7 @@ public void testGetActivePoliciesForVersion() throws Exception { String projectName = "get_active_policies_test"; String projectVersionName = "1.0.0"; String testPolicyName = "testPolicy"; - String componentGroup = "com.synopsys.integration"; + String componentGroup = "com.blackduck.integration"; String componentName = "blackduck-common"; String componentVersion = "47.0.0"; ExternalId componentExternalId = externalIdFactory.createMavenExternalId(componentGroup, componentName, componentVersion); diff --git a/src/test/java/com/blackduck/integration/blackduck/comprehensive/ToolsApiScannerInstallerTestIT.java b/src/test/java/com/blackduck/integration/blackduck/comprehensive/ToolsApiScannerInstallerTestIT.java index bed0ee191..ef956d9fe 100644 --- a/src/test/java/com/blackduck/integration/blackduck/comprehensive/ToolsApiScannerInstallerTestIT.java +++ b/src/test/java/com/blackduck/integration/blackduck/comprehensive/ToolsApiScannerInstallerTestIT.java @@ -1,26 +1,27 @@ package com.blackduck.integration.blackduck.comprehensive; import com.blackduck.integration.blackduck.TimingExtension; -import com.blackduck.integration.blackduck.http.client.IntHttpClientTestHelper; -import com.blackduck.integration.blackduck.http.client.TestingPropertyKey; -import com.blackduck.integration.blackduck.codelocation.signaturescanner.command.ToolsApiScannerInstaller; import com.blackduck.integration.blackduck.codelocation.signaturescanner.command.ScanPaths; import com.blackduck.integration.blackduck.codelocation.signaturescanner.command.ScanPathsUtility; +import com.blackduck.integration.blackduck.codelocation.signaturescanner.command.ToolsApiScannerInstaller; import com.blackduck.integration.blackduck.configuration.BlackDuckServerConfig; +import com.blackduck.integration.blackduck.configuration.BlackDuckServerConfigBuilder; import com.blackduck.integration.blackduck.exception.BlackDuckIntegrationException; import com.blackduck.integration.blackduck.http.client.BlackDuckHttpClient; -import com.blackduck.integration.blackduck.configuration.BlackDuckServerConfigBuilder; -import com.synopsys.integration.blackduck.http.client.*; +import com.blackduck.integration.blackduck.http.client.IntHttpClientTestHelper; +import com.blackduck.integration.blackduck.http.client.TestingPropertyKey; import com.blackduck.integration.blackduck.keystore.KeyStoreHelper; -import com.synopsys.integration.log.BufferedIntLogger; -import com.synopsys.integration.log.IntLogger; -import com.synopsys.integration.rest.HttpUrl; -import com.synopsys.integration.util.CleanupZipExpander; -import com.synopsys.integration.util.IntEnvironmentVariables; -import com.synopsys.integration.util.OperatingSystemType; +import com.blackduck.integration.log.BufferedIntLogger; +import com.blackduck.integration.log.IntLogger; +import com.blackduck.integration.rest.HttpUrl; +import com.blackduck.integration.util.CleanupZipExpander; +import com.blackduck.integration.util.IntEnvironmentVariables; +import com.blackduck.integration.util.OperatingSystemType; import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.StringUtils; -import org.junit.jupiter.api.*; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import java.io.File; @@ -28,8 +29,8 @@ import java.nio.charset.Charset; import static com.blackduck.integration.blackduck.codelocation.signaturescanner.command.ApiScannerInstaller.BLACK_DUCK_SIGNATURE_SCANNER_INSTALL_DIRECTORY; -import static org.junit.jupiter.api.Assertions.assertTrue; import static com.blackduck.integration.blackduck.codelocation.signaturescanner.command.ApiScannerInstaller.VERSION_FILENAME; +import static org.junit.jupiter.api.Assertions.assertTrue; @Tag("integration") @ExtendWith(TimingExtension.class) diff --git a/src/test/java/com/blackduck/integration/blackduck/comprehensive/VerifyNotifications.java b/src/test/java/com/blackduck/integration/blackduck/comprehensive/VerifyNotifications.java index e32d38e3c..26252a2c7 100644 --- a/src/test/java/com/blackduck/integration/blackduck/comprehensive/VerifyNotifications.java +++ b/src/test/java/com/blackduck/integration/blackduck/comprehensive/VerifyNotifications.java @@ -1,8 +1,16 @@ package com.blackduck.integration.blackduck.comprehensive; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertTrue; +import com.blackduck.integration.blackduck.api.generated.view.UserView; +import com.blackduck.integration.blackduck.api.manual.component.VersionBomCodeLocationBomComputedNotificationContent; +import com.blackduck.integration.blackduck.api.manual.temporary.enumeration.NotificationType; +import com.blackduck.integration.blackduck.api.manual.view.NotificationUserView; +import com.blackduck.integration.blackduck.api.manual.view.NotificationView; +import com.blackduck.integration.blackduck.api.manual.view.VersionBomCodeLocationBomComputedNotificationUserView; +import com.blackduck.integration.blackduck.api.manual.view.VersionBomCodeLocationBomComputedNotificationView; +import com.blackduck.integration.blackduck.service.dataservice.BlackDuckRegistrationService; +import com.blackduck.integration.blackduck.service.dataservice.NotificationService; +import com.blackduck.integration.blackduck.service.request.NotificationEditor; +import com.blackduck.integration.exception.IntegrationException; import java.time.temporal.ChronoUnit; import java.util.Arrays; @@ -10,17 +18,7 @@ import java.util.List; import java.util.stream.Collectors; -import com.synopsys.integration.blackduck.api.generated.view.UserView; -import com.synopsys.integration.blackduck.api.manual.component.VersionBomCodeLocationBomComputedNotificationContent; -import com.synopsys.integration.blackduck.api.manual.temporary.enumeration.NotificationType; -import com.synopsys.integration.blackduck.api.manual.view.NotificationUserView; -import com.synopsys.integration.blackduck.api.manual.view.NotificationView; -import com.synopsys.integration.blackduck.api.manual.view.VersionBomCodeLocationBomComputedNotificationUserView; -import com.synopsys.integration.blackduck.api.manual.view.VersionBomCodeLocationBomComputedNotificationView; -import com.blackduck.integration.blackduck.service.dataservice.BlackDuckRegistrationService; -import com.blackduck.integration.blackduck.service.dataservice.NotificationService; -import com.blackduck.integration.blackduck.service.request.NotificationEditor; -import com.synopsys.integration.exception.IntegrationException; +import static org.junit.jupiter.api.Assertions.*; public class VerifyNotifications { public static void verify(UserView currentUser, BlackDuckRegistrationService blackDuckRegistrationService, NotificationService notificationService, Date userStartDate, Date systemStartDate) throws IntegrationException { diff --git a/src/test/java/com/blackduck/integration/blackduck/comprehensive/recipe/BasicRecipe.java b/src/test/java/com/blackduck/integration/blackduck/comprehensive/recipe/BasicRecipe.java index 3ecc2a816..026090bcd 100644 --- a/src/test/java/com/blackduck/integration/blackduck/comprehensive/recipe/BasicRecipe.java +++ b/src/test/java/com/blackduck/integration/blackduck/comprehensive/recipe/BasicRecipe.java @@ -1,17 +1,11 @@ package com.blackduck.integration.blackduck.comprehensive.recipe; -import java.util.LinkedHashSet; -import java.util.Optional; -import java.util.concurrent.ExecutorService; - -import org.junit.jupiter.api.BeforeEach; - -import com.synopsys.integration.blackduck.api.generated.discovery.ApiDiscovery; -import com.synopsys.integration.blackduck.api.generated.enumeration.ProjectVersionDistributionType; -import com.synopsys.integration.blackduck.api.generated.view.CodeLocationView; -import com.synopsys.integration.blackduck.api.manual.view.ProjectView; -import com.synopsys.integration.blackduck.api.manual.temporary.component.ProjectRequest; -import com.synopsys.integration.blackduck.api.manual.temporary.enumeration.ProjectVersionPhaseType; +import com.blackduck.integration.blackduck.api.generated.discovery.ApiDiscovery; +import com.blackduck.integration.blackduck.api.generated.enumeration.ProjectVersionDistributionType; +import com.blackduck.integration.blackduck.api.generated.view.CodeLocationView; +import com.blackduck.integration.blackduck.api.manual.temporary.component.ProjectRequest; +import com.blackduck.integration.blackduck.api.manual.temporary.enumeration.ProjectVersionPhaseType; +import com.blackduck.integration.blackduck.api.manual.view.ProjectView; import com.blackduck.integration.blackduck.codelocation.CodeLocationCreationService; import com.blackduck.integration.blackduck.codelocation.bdio2legacy.Bdio2UploadService; import com.blackduck.integration.blackduck.codelocation.bdiolegacy.UploadBatchRunner; @@ -20,17 +14,17 @@ import com.blackduck.integration.blackduck.http.client.IntHttpClientTestHelper; import com.blackduck.integration.blackduck.service.BlackDuckApiClient; import com.blackduck.integration.blackduck.service.BlackDuckServicesFactory; -import com.blackduck.integration.blackduck.service.dataservice.CodeLocationService; -import com.blackduck.integration.blackduck.service.dataservice.NotificationService; -import com.blackduck.integration.blackduck.service.dataservice.PolicyRuleService; -import com.blackduck.integration.blackduck.service.dataservice.ProjectBomService; -import com.blackduck.integration.blackduck.service.dataservice.ProjectService; -import com.blackduck.integration.blackduck.service.dataservice.ProjectUsersService; +import com.blackduck.integration.blackduck.service.dataservice.*; import com.blackduck.integration.blackduck.service.model.ProjectSyncModel; -import com.synopsys.integration.exception.IntegrationException; -import com.synopsys.integration.log.BufferedIntLogger; -import com.synopsys.integration.log.IntLogger; -import com.synopsys.integration.util.IntEnvironmentVariables; +import com.blackduck.integration.exception.IntegrationException; +import com.blackduck.integration.log.BufferedIntLogger; +import com.blackduck.integration.log.IntLogger; +import com.blackduck.integration.util.IntEnvironmentVariables; +import org.junit.jupiter.api.BeforeEach; + +import java.util.LinkedHashSet; +import java.util.Optional; +import java.util.concurrent.ExecutorService; public class BasicRecipe { public static final String PROJECT_NAME = "My Recipe Project"; diff --git a/src/test/java/com/blackduck/integration/blackduck/comprehensive/recipe/Bdio2UploadRecipeTest.java b/src/test/java/com/blackduck/integration/blackduck/comprehensive/recipe/Bdio2UploadRecipeTest.java index 15eb2e785..3f885aa5d 100644 --- a/src/test/java/com/blackduck/integration/blackduck/comprehensive/recipe/Bdio2UploadRecipeTest.java +++ b/src/test/java/com/blackduck/integration/blackduck/comprehensive/recipe/Bdio2UploadRecipeTest.java @@ -1,8 +1,26 @@ package com.blackduck.integration.blackduck.comprehensive.recipe; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertTrue; +import com.blackduck.integration.bdio.graph.ProjectDependencyGraph; +import com.blackduck.integration.bdio.model.dependency.Dependency; +import com.blackduck.integration.blackduck.TimingExtension; +import com.blackduck.integration.blackduck.api.generated.view.ProjectVersionComponentVersionView; +import com.blackduck.integration.blackduck.bdio2.model.Bdio2Document; +import com.blackduck.integration.blackduck.bdio2.model.GitInfo; +import com.blackduck.integration.blackduck.bdio2.model.ProjectInfo; +import com.blackduck.integration.blackduck.bdio2.util.Bdio2Factory; +import com.blackduck.integration.blackduck.bdio2.util.Bdio2Writer; +import com.blackduck.integration.blackduck.codelocation.upload.UploadBatch; +import com.blackduck.integration.blackduck.codelocation.upload.UploadBatchOutput; +import com.blackduck.integration.blackduck.codelocation.upload.UploadTarget; +import com.blackduck.integration.blackduck.service.model.ProjectVersionWrapper; +import com.blackduck.integration.exception.IntegrationException; +import com.blackduck.integration.util.NameVersion; +import com.blackducksoftware.bdio2.Bdio; +import com.blackducksoftware.bdio2.BdioMetadata; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import java.io.File; import java.io.FileOutputStream; @@ -14,35 +32,14 @@ import java.util.Optional; import java.util.UUID; -import com.blackduck.integration.blackduck.TimingExtension; -import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.Tag; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; - -import com.blackducksoftware.bdio2.Bdio; -import com.blackducksoftware.bdio2.BdioMetadata; -import com.synopsys.integration.bdio.graph.ProjectDependencyGraph; -import com.synopsys.integration.bdio.model.dependency.Dependency; -import com.synopsys.integration.blackduck.api.generated.view.ProjectVersionComponentVersionView; -import com.blackduck.integration.blackduck.bdio2.model.Bdio2Document; -import com.blackduck.integration.blackduck.bdio2.model.GitInfo; -import com.blackduck.integration.blackduck.bdio2.model.ProjectInfo; -import com.blackduck.integration.blackduck.bdio2.util.Bdio2Factory; -import com.blackduck.integration.blackduck.bdio2.util.Bdio2Writer; -import com.blackduck.integration.blackduck.codelocation.upload.UploadBatch; -import com.blackduck.integration.blackduck.codelocation.upload.UploadBatchOutput; -import com.blackduck.integration.blackduck.codelocation.upload.UploadTarget; -import com.blackduck.integration.blackduck.service.model.ProjectVersionWrapper; -import com.synopsys.integration.exception.IntegrationException; -import com.synopsys.integration.util.NameVersion; +import static org.junit.jupiter.api.Assertions.*; @Tag("integration") @ExtendWith(TimingExtension.class) class Bdio2UploadRecipeTest extends BasicRecipe { public static final String CODE_LOCATION_NAME = "bdio2 code location junit"; public static final NameVersion PROJECT = new NameVersion("bdio2uploadtest-" + UUID.randomUUID().toString(), "test"); - private static final String GROUP_NAME = "com.synopsys.integration"; + private static final String GROUP_NAME = "com.blackduck.integration"; @AfterEach void cleanup() throws IntegrationException { diff --git a/src/test/java/com/blackduck/integration/blackduck/comprehensive/recipe/BdioUploadRecipeTest.java b/src/test/java/com/blackduck/integration/blackduck/comprehensive/recipe/BdioUploadRecipeTest.java index b6b1bfcdb..364a1ac08 100644 --- a/src/test/java/com/blackduck/integration/blackduck/comprehensive/recipe/BdioUploadRecipeTest.java +++ b/src/test/java/com/blackduck/integration/blackduck/comprehensive/recipe/BdioUploadRecipeTest.java @@ -1,21 +1,7 @@ package com.blackduck.integration.blackduck.comprehensive.recipe; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; - -import java.io.File; -import java.util.Arrays; -import java.util.HashSet; -import java.util.List; -import java.util.Optional; - import com.blackduck.integration.blackduck.TimingExtension; -import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.Tag; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; - -import com.synopsys.integration.blackduck.api.generated.view.CodeLocationView; +import com.blackduck.integration.blackduck.api.generated.view.CodeLocationView; import com.blackduck.integration.blackduck.codelocation.CodeLocationWaitResult; import com.blackduck.integration.blackduck.codelocation.bdiolegacy.BdioUploadCodeLocationCreationRequest; import com.blackduck.integration.blackduck.codelocation.bdiolegacy.UploadBatchRunner; @@ -25,15 +11,28 @@ import com.blackduck.integration.blackduck.service.model.NotificationTaskRange; import com.blackduck.integration.blackduck.service.model.ProjectSyncModel; import com.blackduck.integration.blackduck.service.model.ProjectVersionWrapper; -import com.synopsys.integration.exception.IntegrationException; -import com.synopsys.integration.log.BufferedIntLogger; -import com.synopsys.integration.log.IntLogger; -import com.synopsys.integration.rest.RestConstants; -import com.synopsys.integration.util.NameVersion; -import com.synopsys.integration.wait.ResilientJobConfig; -import com.synopsys.integration.wait.WaitJob; -import com.synopsys.integration.wait.tracker.WaitIntervalTracker; -import com.synopsys.integration.wait.tracker.WaitIntervalTrackerFactory; +import com.blackduck.integration.exception.IntegrationException; +import com.blackduck.integration.log.BufferedIntLogger; +import com.blackduck.integration.log.IntLogger; +import com.blackduck.integration.rest.RestConstants; +import com.blackduck.integration.util.NameVersion; +import com.blackduck.integration.wait.ResilientJobConfig; +import com.blackduck.integration.wait.WaitJob; +import com.blackduck.integration.wait.tracker.WaitIntervalTracker; +import com.blackduck.integration.wait.tracker.WaitIntervalTrackerFactory; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; + +import java.io.File; +import java.util.Arrays; +import java.util.HashSet; +import java.util.List; +import java.util.Optional; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; @Tag("integration") @ExtendWith(TimingExtension.class) diff --git a/src/test/java/com/blackduck/integration/blackduck/comprehensive/recipe/CheckPolicyForProjectVersionRecipeTest.java b/src/test/java/com/blackduck/integration/blackduck/comprehensive/recipe/CheckPolicyForProjectVersionRecipeTest.java index 003a4559e..275c01ba9 100644 --- a/src/test/java/com/blackduck/integration/blackduck/comprehensive/recipe/CheckPolicyForProjectVersionRecipeTest.java +++ b/src/test/java/com/blackduck/integration/blackduck/comprehensive/recipe/CheckPolicyForProjectVersionRecipeTest.java @@ -1,30 +1,25 @@ package com.blackduck.integration.blackduck.comprehensive.recipe; -import java.util.Optional; - +import com.blackduck.integration.bdio.model.Forge; +import com.blackduck.integration.bdio.model.externalid.ExternalId; import com.blackduck.integration.blackduck.TimingExtension; -import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Tag; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; - -import com.synopsys.integration.bdio.model.Forge; -import com.synopsys.integration.bdio.model.externalid.ExternalId; import com.blackduck.integration.blackduck.api.enumeration.PolicyRuleConditionOperatorType; -import com.synopsys.integration.blackduck.api.generated.component.PolicyRuleExpressionView; -import com.synopsys.integration.blackduck.api.generated.enumeration.ProjectVersionComponentPolicyStatusType; -import com.synopsys.integration.blackduck.api.generated.response.ComponentsView; -import com.synopsys.integration.blackduck.api.generated.view.ComponentVersionView; -import com.synopsys.integration.blackduck.api.generated.view.PolicyRuleView; -import com.synopsys.integration.blackduck.api.generated.view.ProjectVersionPolicyStatusView; +import com.blackduck.integration.blackduck.api.generated.component.PolicyRuleExpressionView; +import com.blackduck.integration.blackduck.api.generated.enumeration.ProjectVersionComponentPolicyStatusType; +import com.blackduck.integration.blackduck.api.generated.response.ComponentsView; +import com.blackduck.integration.blackduck.api.generated.view.ComponentVersionView; +import com.blackduck.integration.blackduck.api.generated.view.PolicyRuleView; +import com.blackduck.integration.blackduck.api.generated.view.ProjectVersionPolicyStatusView; import com.blackduck.integration.blackduck.service.dataservice.ComponentService; import com.blackduck.integration.blackduck.service.model.PolicyRuleExpressionSetBuilder; import com.blackduck.integration.blackduck.service.model.ProjectSyncModel; import com.blackduck.integration.blackduck.service.model.ProjectVersionWrapper; -import com.synopsys.integration.exception.IntegrationException; -import com.synopsys.integration.rest.HttpUrl; +import com.blackduck.integration.exception.IntegrationException; +import com.blackduck.integration.rest.HttpUrl; +import org.junit.jupiter.api.*; +import org.junit.jupiter.api.extension.ExtendWith; + +import java.util.Optional; @Tag("integration") @ExtendWith(TimingExtension.class) diff --git a/src/test/java/com/blackduck/integration/blackduck/comprehensive/recipe/ComponentManagementRecipeTest.java b/src/test/java/com/blackduck/integration/blackduck/comprehensive/recipe/ComponentManagementRecipeTest.java index 10388d2a5..452bae694 100644 --- a/src/test/java/com/blackduck/integration/blackduck/comprehensive/recipe/ComponentManagementRecipeTest.java +++ b/src/test/java/com/blackduck/integration/blackduck/comprehensive/recipe/ComponentManagementRecipeTest.java @@ -1,25 +1,24 @@ package com.blackduck.integration.blackduck.comprehensive.recipe; -import static org.junit.jupiter.api.Assertions.assertEquals; - -import java.util.List; -import java.util.Optional; - +import com.blackduck.integration.bdio.model.Forge; +import com.blackduck.integration.bdio.model.externalid.ExternalId; import com.blackduck.integration.blackduck.TimingExtension; +import com.blackduck.integration.blackduck.api.generated.view.ProjectVersionComponentVersionView; +import com.blackduck.integration.blackduck.api.generated.view.ProjectVersionView; +import com.blackduck.integration.blackduck.api.manual.view.ProjectView; +import com.blackduck.integration.blackduck.service.model.ProjectSyncModel; +import com.blackduck.integration.blackduck.service.model.ProjectVersionWrapper; +import com.blackduck.integration.exception.IntegrationException; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import com.synopsys.integration.bdio.model.Forge; -import com.synopsys.integration.bdio.model.externalid.ExternalId; -import com.synopsys.integration.blackduck.api.generated.view.ProjectVersionComponentVersionView; -import com.synopsys.integration.blackduck.api.generated.view.ProjectVersionView; -import com.synopsys.integration.blackduck.api.manual.view.ProjectView; -import com.blackduck.integration.blackduck.service.model.ProjectSyncModel; -import com.blackduck.integration.blackduck.service.model.ProjectVersionWrapper; -import com.synopsys.integration.exception.IntegrationException; +import java.util.List; +import java.util.Optional; + +import static org.junit.jupiter.api.Assertions.assertEquals; @Tag("integration") @ExtendWith(TimingExtension.class) diff --git a/src/test/java/com/blackduck/integration/blackduck/comprehensive/recipe/CreateDetailedProjectRecipeTest.java b/src/test/java/com/blackduck/integration/blackduck/comprehensive/recipe/CreateDetailedProjectRecipeTest.java index 4de3f9029..271658acc 100644 --- a/src/test/java/com/blackduck/integration/blackduck/comprehensive/recipe/CreateDetailedProjectRecipeTest.java +++ b/src/test/java/com/blackduck/integration/blackduck/comprehensive/recipe/CreateDetailedProjectRecipeTest.java @@ -1,23 +1,22 @@ package com.blackduck.integration.blackduck.comprehensive.recipe; import com.blackduck.integration.blackduck.TimingExtension; +import com.blackduck.integration.blackduck.api.generated.enumeration.ProjectVersionDistributionType; +import com.blackduck.integration.blackduck.api.generated.view.ProjectVersionView; +import com.blackduck.integration.blackduck.api.manual.temporary.enumeration.ProjectVersionPhaseType; +import com.blackduck.integration.blackduck.api.manual.view.ProjectView; +import com.blackduck.integration.blackduck.service.BlackDuckApiClient; +import com.blackduck.integration.blackduck.service.dataservice.ProjectService; +import com.blackduck.integration.blackduck.service.model.ProjectSyncModel; +import com.blackduck.integration.blackduck.service.model.ProjectVersionWrapper; +import com.blackduck.integration.exception.IntegrationException; +import com.blackduck.integration.rest.HttpUrl; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import com.synopsys.integration.blackduck.api.generated.enumeration.ProjectVersionDistributionType; -import com.synopsys.integration.blackduck.api.generated.view.ProjectVersionView; -import com.synopsys.integration.blackduck.api.manual.view.ProjectView; -import com.synopsys.integration.blackduck.api.manual.temporary.enumeration.ProjectVersionPhaseType; -import com.blackduck.integration.blackduck.service.BlackDuckApiClient; -import com.blackduck.integration.blackduck.service.dataservice.ProjectService; -import com.blackduck.integration.blackduck.service.model.ProjectSyncModel; -import com.blackduck.integration.blackduck.service.model.ProjectVersionWrapper; -import com.synopsys.integration.exception.IntegrationException; -import com.synopsys.integration.rest.HttpUrl; - @Tag("integration") @ExtendWith(TimingExtension.class) public class CreateDetailedProjectRecipeTest extends BasicRecipe { diff --git a/src/test/java/com/blackduck/integration/blackduck/comprehensive/recipe/IntelligentPersistenceRecipeTest.java b/src/test/java/com/blackduck/integration/blackduck/comprehensive/recipe/IntelligentPersistenceRecipeTest.java index 3a6477c7f..73765553f 100644 --- a/src/test/java/com/blackduck/integration/blackduck/comprehensive/recipe/IntelligentPersistenceRecipeTest.java +++ b/src/test/java/com/blackduck/integration/blackduck/comprehensive/recipe/IntelligentPersistenceRecipeTest.java @@ -1,8 +1,25 @@ package com.blackduck.integration.blackduck.comprehensive.recipe; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertTrue; +import com.blackduck.integration.bdio.graph.ProjectDependencyGraph; +import com.blackduck.integration.bdio.model.dependency.Dependency; +import com.blackduck.integration.blackduck.TimingExtension; +import com.blackduck.integration.blackduck.api.generated.view.ProjectVersionComponentVersionView; +import com.blackduck.integration.blackduck.bdio2.model.Bdio2Document; +import com.blackduck.integration.blackduck.bdio2.model.ProjectInfo; +import com.blackduck.integration.blackduck.bdio2.util.Bdio2Factory; +import com.blackduck.integration.blackduck.bdio2.util.Bdio2Writer; +import com.blackduck.integration.blackduck.codelocation.intelligentpersistence.IntelligentPersistenceService; +import com.blackduck.integration.blackduck.codelocation.upload.UploadBatch; +import com.blackduck.integration.blackduck.codelocation.upload.UploadBatchOutput; +import com.blackduck.integration.blackduck.codelocation.upload.UploadTarget; +import com.blackduck.integration.blackduck.service.model.ProjectVersionWrapper; +import com.blackduck.integration.exception.IntegrationException; +import com.blackduck.integration.util.NameVersion; +import com.blackducksoftware.bdio2.BdioMetadata; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import java.io.File; import java.io.FileOutputStream; @@ -14,27 +31,7 @@ import java.util.Optional; import java.util.UUID; -import com.blackduck.integration.blackduck.TimingExtension; -import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.Tag; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; - -import com.blackducksoftware.bdio2.BdioMetadata; -import com.synopsys.integration.bdio.graph.ProjectDependencyGraph; -import com.synopsys.integration.bdio.model.dependency.Dependency; -import com.synopsys.integration.blackduck.api.generated.view.ProjectVersionComponentVersionView; -import com.blackduck.integration.blackduck.bdio2.model.Bdio2Document; -import com.blackduck.integration.blackduck.bdio2.model.ProjectInfo; -import com.blackduck.integration.blackduck.bdio2.util.Bdio2Factory; -import com.blackduck.integration.blackduck.bdio2.util.Bdio2Writer; -import com.blackduck.integration.blackduck.codelocation.intelligentpersistence.IntelligentPersistenceService; -import com.blackduck.integration.blackduck.codelocation.upload.UploadBatch; -import com.blackduck.integration.blackduck.codelocation.upload.UploadBatchOutput; -import com.blackduck.integration.blackduck.codelocation.upload.UploadTarget; -import com.blackduck.integration.blackduck.service.model.ProjectVersionWrapper; -import com.synopsys.integration.exception.IntegrationException; -import com.synopsys.integration.util.NameVersion; +import static org.junit.jupiter.api.Assertions.*; @Tag("integration") @ExtendWith(TimingExtension.class) @@ -60,7 +57,7 @@ void uploadBdio2() throws IOException, IntegrationException, InterruptedExceptio BdioMetadata bdio2Metadata = bdio2Factory.createBdioMetadata(CODE_LOCATION_NAME, projectInfo, now); // create the bdio2 project - Dependency projectDependency = Dependency.FACTORY.createMavenDependency("com.synopsys.integration", PROJECT.getName(), PROJECT.getVersion()); + Dependency projectDependency = Dependency.FACTORY.createMavenDependency("com.blackduck.integration", PROJECT.getName(), PROJECT.getVersion()); // create a graph of one dependency Dependency dependency = Dependency.FACTORY.createMavenDependency("org.apache.commons", "commons-lang3", "3.11"); diff --git a/src/test/java/com/blackduck/integration/blackduck/comprehensive/recipe/ProjectErrorsRecipeTest.java b/src/test/java/com/blackduck/integration/blackduck/comprehensive/recipe/ProjectErrorsRecipeTest.java index d2906b921..342a86627 100644 --- a/src/test/java/com/blackduck/integration/blackduck/comprehensive/recipe/ProjectErrorsRecipeTest.java +++ b/src/test/java/com/blackduck/integration/blackduck/comprehensive/recipe/ProjectErrorsRecipeTest.java @@ -1,19 +1,18 @@ package com.blackduck.integration.blackduck.comprehensive.recipe; -import java.util.Optional; - import com.blackduck.integration.blackduck.TimingExtension; +import com.blackduck.integration.blackduck.api.manual.view.ProjectView; +import com.blackduck.integration.blackduck.exception.BlackDuckApiException; +import com.blackduck.integration.blackduck.service.model.ProjectSyncModel; +import com.blackduck.integration.blackduck.service.model.ProjectVersionWrapper; +import com.blackduck.integration.exception.IntegrationException; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import com.synopsys.integration.blackduck.api.manual.view.ProjectView; -import com.blackduck.integration.blackduck.exception.BlackDuckApiException; -import com.blackduck.integration.blackduck.service.model.ProjectSyncModel; -import com.blackduck.integration.blackduck.service.model.ProjectVersionWrapper; -import com.synopsys.integration.exception.IntegrationException; +import java.util.Optional; @Tag("integration") @ExtendWith(TimingExtension.class) diff --git a/src/test/java/com/blackduck/integration/blackduck/configuration/BlackDuckServerConfigBuilderTest.java b/src/test/java/com/blackduck/integration/blackduck/configuration/BlackDuckServerConfigBuilderTest.java index 735130146..bf8a8a1cf 100644 --- a/src/test/java/com/blackduck/integration/blackduck/configuration/BlackDuckServerConfigBuilderTest.java +++ b/src/test/java/com/blackduck/integration/blackduck/configuration/BlackDuckServerConfigBuilderTest.java @@ -1,12 +1,27 @@ package com.blackduck.integration.blackduck.configuration; -import static com.blackduck.integration.blackduck.configuration.BlackDuckServerConfigKeys.KEYS; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertNull; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.junit.jupiter.api.Assertions.fail; +import com.blackduck.integration.blackduck.http.client.CookieHeaderParser; +import com.blackduck.integration.blackduck.service.BlackDuckServicesFactory; +import com.blackduck.integration.builder.BuilderProperties; +import com.blackduck.integration.builder.BuilderPropertyKey; +import com.blackduck.integration.builder.BuilderStatus; +import com.blackduck.integration.exception.IntegrationException; +import com.blackduck.integration.log.IntLogger; +import com.blackduck.integration.log.LogLevel; +import com.blackduck.integration.log.PrintStreamIntLogger; +import com.blackduck.integration.rest.HttpUrl; +import com.blackduck.integration.rest.credentials.Credentials; +import com.blackduck.integration.rest.credentials.CredentialsBuilder; +import com.blackduck.integration.rest.proxy.ProxyInfo; +import com.blackduck.integration.rest.proxy.ProxyInfoBuilder; +import com.blackduck.integration.rest.support.AuthenticationSupport; +import com.blackduck.integration.util.IntEnvironmentVariables; +import com.blackduck.integration.util.NameVersion; +import com.blackduck.integration.util.NoThreadExecutorService; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.google.gson.Gson; +import org.apache.commons.lang3.StringUtils; +import org.junit.jupiter.api.Test; import java.lang.reflect.Field; import java.util.HashMap; @@ -16,31 +31,8 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; -import com.blackduck.integration.blackduck.configuration.BlackDuckServerConfig; -import com.blackduck.integration.blackduck.configuration.BlackDuckServerConfigBuilder; -import org.apache.commons.lang3.StringUtils; -import org.junit.jupiter.api.Test; - -import com.fasterxml.jackson.databind.ObjectMapper; -import com.google.gson.Gson; -import com.blackduck.integration.blackduck.http.client.CookieHeaderParser; -import com.blackduck.integration.blackduck.service.BlackDuckServicesFactory; -import com.synopsys.integration.builder.BuilderProperties; -import com.synopsys.integration.builder.BuilderPropertyKey; -import com.synopsys.integration.builder.BuilderStatus; -import com.synopsys.integration.exception.IntegrationException; -import com.synopsys.integration.log.IntLogger; -import com.synopsys.integration.log.LogLevel; -import com.synopsys.integration.log.PrintStreamIntLogger; -import com.synopsys.integration.rest.HttpUrl; -import com.synopsys.integration.rest.credentials.Credentials; -import com.synopsys.integration.rest.credentials.CredentialsBuilder; -import com.synopsys.integration.rest.proxy.ProxyInfo; -import com.synopsys.integration.rest.proxy.ProxyInfoBuilder; -import com.synopsys.integration.rest.support.AuthenticationSupport; -import com.synopsys.integration.util.IntEnvironmentVariables; -import com.synopsys.integration.util.NameVersion; -import com.synopsys.integration.util.NoThreadExecutorService; +import static com.blackduck.integration.blackduck.configuration.BlackDuckServerConfigKeys.KEYS; +import static org.junit.jupiter.api.Assertions.*; public class BlackDuckServerConfigBuilderTest { public static final String API_TOKEN = "a valid API_TOKEN_KEY"; diff --git a/src/test/java/com/blackduck/integration/blackduck/configuration/BlackDuckServerConfigBuilderTestIT.java b/src/test/java/com/blackduck/integration/blackduck/configuration/BlackDuckServerConfigBuilderTestIT.java index 77b1ac5a9..7d5c09f98 100644 --- a/src/test/java/com/blackduck/integration/blackduck/configuration/BlackDuckServerConfigBuilderTestIT.java +++ b/src/test/java/com/blackduck/integration/blackduck/configuration/BlackDuckServerConfigBuilderTestIT.java @@ -1,29 +1,25 @@ package com.blackduck.integration.blackduck.configuration; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.junit.jupiter.api.Assertions.fail; - -import java.net.URL; - import com.blackduck.integration.blackduck.TimingExtension; +import com.blackduck.integration.blackduck.http.client.BlackDuckHttpClient; import com.blackduck.integration.blackduck.http.client.IntHttpClientTestHelper; import com.blackduck.integration.blackduck.http.client.TestingPropertyKey; +import com.blackduck.integration.blackduck.useragent.BlackDuckCommon; +import com.blackduck.integration.exception.IntegrationException; +import com.blackduck.integration.log.SilentIntLogger; +import com.blackduck.integration.rest.HttpUrl; +import com.blackduck.integration.rest.RestConstants; +import com.blackduck.integration.rest.client.ConnectionResult; +import com.blackduck.integration.util.NameVersion; import org.apache.commons.lang3.math.NumberUtils; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import com.blackduck.integration.blackduck.http.client.BlackDuckHttpClient; -import com.blackduck.integration.blackduck.useragent.BlackDuckCommon; -import com.synopsys.integration.exception.IntegrationException; -import com.synopsys.integration.log.SilentIntLogger; -import com.synopsys.integration.rest.HttpUrl; -import com.synopsys.integration.rest.RestConstants; -import com.synopsys.integration.rest.client.ConnectionResult; -import com.synopsys.integration.util.NameVersion; +import java.net.URL; + +import static org.junit.jupiter.api.Assertions.*; @Tag("integration") @ExtendWith(TimingExtension.class) diff --git a/src/test/java/com/blackduck/integration/blackduck/http/BlackDuckRequestBuilderTest.java b/src/test/java/com/blackduck/integration/blackduck/http/BlackDuckRequestBuilderTest.java index 77c09bba1..ac6c5d1c3 100644 --- a/src/test/java/com/blackduck/integration/blackduck/http/BlackDuckRequestBuilderTest.java +++ b/src/test/java/com/blackduck/integration/blackduck/http/BlackDuckRequestBuilderTest.java @@ -1,18 +1,17 @@ package com.blackduck.integration.blackduck.http; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; - -import java.util.Arrays; -import java.util.Set; - import com.blackduck.integration.blackduck.TimingExtension; +import com.blackduck.integration.exception.IntegrationException; +import com.blackduck.integration.rest.HttpUrl; +import com.blackduck.integration.rest.request.Request; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import com.synopsys.integration.exception.IntegrationException; -import com.synopsys.integration.rest.HttpUrl; -import com.synopsys.integration.rest.request.Request; +import java.util.Arrays; +import java.util.Set; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; @ExtendWith(TimingExtension.class) public class BlackDuckRequestBuilderTest { diff --git a/src/test/java/com/blackduck/integration/blackduck/http/BlackDuckUrlTest.java b/src/test/java/com/blackduck/integration/blackduck/http/BlackDuckUrlTest.java index 06525c94a..857b6a247 100644 --- a/src/test/java/com/blackduck/integration/blackduck/http/BlackDuckUrlTest.java +++ b/src/test/java/com/blackduck/integration/blackduck/http/BlackDuckUrlTest.java @@ -1,17 +1,14 @@ package com.blackduck.integration.blackduck.http; -import static org.junit.jupiter.api.Assertions.assertEquals; +import com.blackduck.integration.exception.IntegrationException; +import com.blackduck.integration.rest.HttpUrl; +import org.junit.jupiter.api.Test; import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; -import com.blackduck.integration.blackduck.http.BlackDuckUrl; -import com.blackduck.integration.blackduck.http.BlackDuckUrlSearchTerm; -import org.junit.jupiter.api.Test; - -import com.synopsys.integration.exception.IntegrationException; -import com.synopsys.integration.rest.HttpUrl; +import static org.junit.jupiter.api.Assertions.assertEquals; public class BlackDuckUrlTest { @Test diff --git a/src/test/java/com/blackduck/integration/blackduck/http/client/BlackDuckHttpClientTestIT.java b/src/test/java/com/blackduck/integration/blackduck/http/client/BlackDuckHttpClientTestIT.java index 32c2db7db..1278d3068 100644 --- a/src/test/java/com/blackduck/integration/blackduck/http/client/BlackDuckHttpClientTestIT.java +++ b/src/test/java/com/blackduck/integration/blackduck/http/client/BlackDuckHttpClientTestIT.java @@ -1,26 +1,12 @@ package com.blackduck.integration.blackduck.http.client; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; - -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; - import com.blackduck.integration.blackduck.TimingExtension; -import org.junit.jupiter.api.Disabled; -import org.junit.jupiter.api.Tag; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; - -import com.synopsys.integration.blackduck.api.core.BlackDuckComponent; -import com.synopsys.integration.blackduck.api.core.BlackDuckPath; -import com.synopsys.integration.blackduck.api.core.BlackDuckView; -import com.synopsys.integration.blackduck.api.core.response.UrlSingleResponse; -import com.synopsys.integration.blackduck.api.generated.discovery.ApiDiscovery; -import com.synopsys.integration.blackduck.api.generated.view.UserView; +import com.blackduck.integration.blackduck.api.core.BlackDuckComponent; +import com.blackduck.integration.blackduck.api.core.BlackDuckPath; +import com.blackduck.integration.blackduck.api.core.BlackDuckView; +import com.blackduck.integration.blackduck.api.core.response.UrlSingleResponse; +import com.blackduck.integration.blackduck.api.generated.discovery.ApiDiscovery; +import com.blackduck.integration.blackduck.api.generated.view.UserView; import com.blackduck.integration.blackduck.configuration.BlackDuckServerConfig; import com.blackduck.integration.blackduck.configuration.BlackDuckServerConfigBuilder; import com.blackduck.integration.blackduck.http.BlackDuckRequestBuilder; @@ -28,17 +14,29 @@ import com.blackduck.integration.blackduck.service.BlackDuckServicesFactory; import com.blackduck.integration.blackduck.service.dataservice.UserService; import com.blackduck.integration.blackduck.service.request.BlackDuckSingleRequest; -import com.synopsys.integration.exception.IntegrationException; -import com.synopsys.integration.log.IntLogger; -import com.synopsys.integration.log.LogLevel; -import com.synopsys.integration.log.PrintStreamIntLogger; -import com.synopsys.integration.log.SilentIntLogger; -import com.synopsys.integration.rest.HttpUrl; -import com.synopsys.integration.rest.body.BodyContentConverter; -import com.synopsys.integration.rest.proxy.ProxyInfo; -import com.synopsys.integration.rest.response.Response; - +import com.blackduck.integration.exception.IntegrationException; +import com.blackduck.integration.log.IntLogger; +import com.blackduck.integration.log.LogLevel; +import com.blackduck.integration.log.PrintStreamIntLogger; +import com.blackduck.integration.log.SilentIntLogger; +import com.blackduck.integration.rest.HttpUrl; +import com.blackduck.integration.rest.body.BodyContentConverter; +import com.blackduck.integration.rest.proxy.ProxyInfo; +import com.blackduck.integration.rest.response.Response; import okhttp3.mockwebserver.MockWebServer; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; + +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; + +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; @Tag("integration") @ExtendWith(TimingExtension.class) diff --git a/src/test/java/com/blackduck/integration/blackduck/http/client/BlackDuckRedirectStrategyTest.java b/src/test/java/com/blackduck/integration/blackduck/http/client/BlackDuckRedirectStrategyTest.java index d02813af8..f7218cb94 100644 --- a/src/test/java/com/blackduck/integration/blackduck/http/client/BlackDuckRedirectStrategyTest.java +++ b/src/test/java/com/blackduck/integration/blackduck/http/client/BlackDuckRedirectStrategyTest.java @@ -1,32 +1,30 @@ package com.blackduck.integration.blackduck.http.client; -import static org.junit.jupiter.api.Assertions.assertEquals; - -import java.io.IOException; -import java.nio.charset.StandardCharsets; - import com.blackduck.integration.blackduck.TimingExtension; +import com.blackduck.integration.exception.IntegrationException; +import com.blackduck.integration.log.BufferedIntLogger; +import com.blackduck.integration.log.IntLogger; +import com.blackduck.integration.rest.HttpMethod; +import com.blackduck.integration.rest.HttpUrl; +import com.blackduck.integration.rest.body.BodyContentConverter; +import com.blackduck.integration.rest.body.StringBodyContent; +import com.blackduck.integration.rest.client.IntHttpClient; +import com.blackduck.integration.rest.proxy.ProxyInfo; +import com.blackduck.integration.rest.request.Request; +import com.blackduck.integration.rest.response.Response; +import com.google.gson.Gson; +import okhttp3.mockwebserver.MockResponse; +import okhttp3.mockwebserver.MockWebServer; +import okhttp3.mockwebserver.RecordedRequest; import org.apache.http.client.config.RequestConfig; import org.apache.http.impl.client.HttpClientBuilder; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import com.google.gson.Gson; -import com.synopsys.integration.exception.IntegrationException; -import com.synopsys.integration.log.BufferedIntLogger; -import com.synopsys.integration.log.IntLogger; -import com.synopsys.integration.rest.HttpMethod; -import com.synopsys.integration.rest.HttpUrl; -import com.synopsys.integration.rest.body.BodyContentConverter; -import com.synopsys.integration.rest.body.StringBodyContent; -import com.synopsys.integration.rest.client.IntHttpClient; -import com.synopsys.integration.rest.proxy.ProxyInfo; -import com.synopsys.integration.rest.request.Request; -import com.synopsys.integration.rest.response.Response; +import java.io.IOException; +import java.nio.charset.StandardCharsets; -import okhttp3.mockwebserver.MockResponse; -import okhttp3.mockwebserver.MockWebServer; -import okhttp3.mockwebserver.RecordedRequest; +import static org.junit.jupiter.api.Assertions.assertEquals; @ExtendWith(TimingExtension.class) public class BlackDuckRedirectStrategyTest { diff --git a/src/test/java/com/blackduck/integration/blackduck/http/client/CookieHeaderParserTest.java b/src/test/java/com/blackduck/integration/blackduck/http/client/CookieHeaderParserTest.java index a13a50356..2ff212974 100644 --- a/src/test/java/com/blackduck/integration/blackduck/http/client/CookieHeaderParserTest.java +++ b/src/test/java/com/blackduck/integration/blackduck/http/client/CookieHeaderParserTest.java @@ -1,12 +1,11 @@ package com.blackduck.integration.blackduck.http.client; -import static org.junit.jupiter.api.Assertions.assertEquals; - -import com.blackduck.integration.blackduck.http.client.CookieHeaderParser; import org.apache.http.Header; import org.apache.http.message.BasicHeader; import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; + public class CookieHeaderParserTest { public static final String BEARER_TOKEN = "bearertoken"; diff --git a/src/test/java/com/blackduck/integration/blackduck/http/client/IntHttpClientTestHelper.java b/src/test/java/com/blackduck/integration/blackduck/http/client/IntHttpClientTestHelper.java index 2151aa08c..16788e023 100644 --- a/src/test/java/com/blackduck/integration/blackduck/http/client/IntHttpClientTestHelper.java +++ b/src/test/java/com/blackduck/integration/blackduck/http/client/IntHttpClientTestHelper.java @@ -1,6 +1,20 @@ package com.blackduck.integration.blackduck.http.client; -import static org.junit.Assert.fail; +import com.blackduck.integration.blackduck.api.manual.view.ProjectView; +import com.blackduck.integration.blackduck.configuration.BlackDuckServerConfig; +import com.blackduck.integration.blackduck.configuration.BlackDuckServerConfigBuilder; +import com.blackduck.integration.blackduck.exception.BlackDuckIntegrationException; +import com.blackduck.integration.blackduck.service.BlackDuckApiClient; +import com.blackduck.integration.blackduck.service.BlackDuckServicesFactory; +import com.blackduck.integration.blackduck.service.dataservice.ProjectService; +import com.blackduck.integration.exception.IntegrationException; +import com.blackduck.integration.log.IntLogger; +import com.blackduck.integration.log.LogLevel; +import com.blackduck.integration.log.PrintStreamIntLogger; +import com.blackduck.integration.rest.HttpUrl; +import com.blackduck.integration.util.IntEnvironmentVariables; +import org.apache.commons.lang3.StringUtils; +import org.apache.http.client.HttpClient; import java.io.File; import java.io.InputStream; @@ -11,22 +25,7 @@ import java.util.logging.Level; import java.util.logging.Logger; -import org.apache.commons.lang3.StringUtils; -import org.apache.http.client.HttpClient; - -import com.synopsys.integration.blackduck.api.manual.view.ProjectView; -import com.blackduck.integration.blackduck.configuration.BlackDuckServerConfig; -import com.blackduck.integration.blackduck.configuration.BlackDuckServerConfigBuilder; -import com.blackduck.integration.blackduck.exception.BlackDuckIntegrationException; -import com.blackduck.integration.blackduck.service.BlackDuckApiClient; -import com.blackduck.integration.blackduck.service.BlackDuckServicesFactory; -import com.blackduck.integration.blackduck.service.dataservice.ProjectService; -import com.synopsys.integration.exception.IntegrationException; -import com.synopsys.integration.log.IntLogger; -import com.synopsys.integration.log.LogLevel; -import com.synopsys.integration.log.PrintStreamIntLogger; -import com.synopsys.integration.rest.HttpUrl; -import com.synopsys.integration.util.IntEnvironmentVariables; +import static org.junit.Assert.fail; public class IntHttpClientTestHelper { private static Properties testProperties; diff --git a/src/test/java/com/blackduck/integration/blackduck/http/client/MockWebServerUtil.java b/src/test/java/com/blackduck/integration/blackduck/http/client/MockWebServerUtil.java index 258c65b54..d16b3832a 100644 --- a/src/test/java/com/blackduck/integration/blackduck/http/client/MockWebServerUtil.java +++ b/src/test/java/com/blackduck/integration/blackduck/http/client/MockWebServerUtil.java @@ -1,11 +1,10 @@ package com.blackduck.integration.blackduck.http.client; -import org.apache.http.HttpHeaders; - import okhttp3.mockwebserver.Dispatcher; import okhttp3.mockwebserver.MockResponse; import okhttp3.mockwebserver.MockWebServer; import okhttp3.mockwebserver.RecordedRequest; +import org.apache.http.HttpHeaders; public class MockWebServerUtil { public static void setupRedirecting(MockWebServer server, String destinationUrl) { diff --git a/src/test/java/com/blackduck/integration/blackduck/http/client/SignatureScannerClientProxyTest.java b/src/test/java/com/blackduck/integration/blackduck/http/client/SignatureScannerClientProxyTest.java index 10da076a3..701113800 100644 --- a/src/test/java/com/blackduck/integration/blackduck/http/client/SignatureScannerClientProxyTest.java +++ b/src/test/java/com/blackduck/integration/blackduck/http/client/SignatureScannerClientProxyTest.java @@ -1,17 +1,14 @@ package com.blackduck.integration.blackduck.http.client; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.mockserver.integration.ClientAndServer.startClientAndServer; -import static org.mockserver.model.HttpRequest.request; -import static org.mockserver.model.HttpResponse.response; -import static org.mockserver.stop.Stop.stopQuietly; - -import java.util.Map; -import java.util.concurrent.TimeUnit; - -import com.blackduck.integration.blackduck.http.client.SignatureScannerClient; +import com.blackduck.integration.blackduck.http.BlackDuckRequestBuilder; +import com.blackduck.integration.exception.IntegrationException; +import com.blackduck.integration.log.BufferedIntLogger; +import com.blackduck.integration.rest.HttpUrl; +import com.blackduck.integration.rest.proxy.ProxyInfo; +import com.blackduck.integration.rest.proxy.ProxyInfoBuilder; +import com.blackduck.integration.rest.request.Request; +import com.blackduck.integration.rest.response.Response; +import com.google.gson.Gson; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; @@ -19,15 +16,14 @@ import org.mockserver.integration.ClientAndServer; import org.mockserver.model.Header; -import com.google.gson.Gson; -import com.blackduck.integration.blackduck.http.BlackDuckRequestBuilder; -import com.synopsys.integration.exception.IntegrationException; -import com.synopsys.integration.log.BufferedIntLogger; -import com.synopsys.integration.rest.HttpUrl; -import com.synopsys.integration.rest.proxy.ProxyInfo; -import com.synopsys.integration.rest.proxy.ProxyInfoBuilder; -import com.synopsys.integration.rest.request.Request; -import com.synopsys.integration.rest.response.Response; +import java.util.Map; +import java.util.concurrent.TimeUnit; + +import static org.junit.jupiter.api.Assertions.*; +import static org.mockserver.integration.ClientAndServer.startClientAndServer; +import static org.mockserver.model.HttpRequest.request; +import static org.mockserver.model.HttpResponse.response; +import static org.mockserver.stop.Stop.stopQuietly; public class SignatureScannerClientProxyTest { private static final BufferedIntLogger LOGGER = new BufferedIntLogger(); diff --git a/src/test/java/com/blackduck/integration/blackduck/http/client/SignatureScannerClientTest.java b/src/test/java/com/blackduck/integration/blackduck/http/client/SignatureScannerClientTest.java index 2ab840635..15308e042 100644 --- a/src/test/java/com/blackduck/integration/blackduck/http/client/SignatureScannerClientTest.java +++ b/src/test/java/com/blackduck/integration/blackduck/http/client/SignatureScannerClientTest.java @@ -1,9 +1,25 @@ package com.blackduck.integration.blackduck.http.client; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertTrue; +import com.blackduck.integration.blackduck.TimingExtension; +import com.blackduck.integration.blackduck.http.BlackDuckRequestBuilder; +import com.blackduck.integration.exception.IntegrationException; +import com.blackduck.integration.log.BufferedIntLogger; +import com.blackduck.integration.rest.HttpUrl; +import com.blackduck.integration.rest.proxy.ProxyInfo; +import com.blackduck.integration.rest.request.Request; +import com.blackduck.integration.rest.response.Response; +import com.google.gson.Gson; +import okhttp3.mockwebserver.MockResponse; +import okhttp3.mockwebserver.MockWebServer; +import okhttp3.tls.HandshakeCertificates; +import okhttp3.tls.HeldCertificate; +import org.apache.http.ssl.SSLContexts; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import javax.net.ssl.SSLContext; import java.io.File; import java.io.FileOutputStream; import java.io.IOException; @@ -17,28 +33,7 @@ import java.util.Optional; import java.util.TimeZone; -import javax.net.ssl.SSLContext; - -import com.blackduck.integration.blackduck.TimingExtension; -import org.apache.http.ssl.SSLContexts; -import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; - -import com.google.gson.Gson; -import com.blackduck.integration.blackduck.http.BlackDuckRequestBuilder; -import com.synopsys.integration.exception.IntegrationException; -import com.synopsys.integration.log.BufferedIntLogger; -import com.synopsys.integration.rest.HttpUrl; -import com.synopsys.integration.rest.proxy.ProxyInfo; -import com.synopsys.integration.rest.request.Request; -import com.synopsys.integration.rest.response.Response; - -import okhttp3.mockwebserver.MockResponse; -import okhttp3.mockwebserver.MockWebServer; -import okhttp3.tls.HandshakeCertificates; -import okhttp3.tls.HeldCertificate; +import static org.junit.jupiter.api.Assertions.*; @ExtendWith(TimingExtension.class) public class SignatureScannerClientTest { diff --git a/src/test/java/com/blackduck/integration/blackduck/http/client/cache/CachingHttpClientTestIT.java b/src/test/java/com/blackduck/integration/blackduck/http/client/cache/CachingHttpClientTestIT.java index efa5387fa..cb11ea489 100644 --- a/src/test/java/com/blackduck/integration/blackduck/http/client/cache/CachingHttpClientTestIT.java +++ b/src/test/java/com/blackduck/integration/blackduck/http/client/cache/CachingHttpClientTestIT.java @@ -1,23 +1,22 @@ package com.blackduck.integration.blackduck.http.client.cache; -import static org.junit.jupiter.api.Assertions.assertTrue; +import com.blackduck.integration.blackduck.api.manual.view.ProjectView; +import com.blackduck.integration.blackduck.configuration.BlackDuckServerConfig; +import com.blackduck.integration.blackduck.http.client.IntHttpClientTestHelper; +import com.blackduck.integration.blackduck.service.BlackDuckServicesFactory; +import com.blackduck.integration.blackduck.service.dataservice.ProjectService; +import com.blackduck.integration.exception.IntegrationException; +import com.blackduck.integration.log.IntLogger; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; import java.time.Duration; import java.time.LocalTime; import java.util.ArrayList; import java.util.List; -import org.junit.jupiter.api.BeforeAll; -import org.junit.jupiter.api.Tag; -import org.junit.jupiter.api.Test; - -import com.synopsys.integration.blackduck.api.manual.view.ProjectView; -import com.blackduck.integration.blackduck.configuration.BlackDuckServerConfig; -import com.blackduck.integration.blackduck.http.client.IntHttpClientTestHelper; -import com.blackduck.integration.blackduck.service.BlackDuckServicesFactory; -import com.blackduck.integration.blackduck.service.dataservice.ProjectService; -import com.synopsys.integration.exception.IntegrationException; -import com.synopsys.integration.log.IntLogger; +import static org.junit.jupiter.api.Assertions.assertTrue; @Tag("integration") public class CachingHttpClientTestIT { diff --git a/src/test/java/com/blackduck/integration/blackduck/http/transform/BlackDuckJsonTransformerTest.java b/src/test/java/com/blackduck/integration/blackduck/http/transform/BlackDuckJsonTransformerTest.java index 875505ff8..4372a6287 100644 --- a/src/test/java/com/blackduck/integration/blackduck/http/transform/BlackDuckJsonTransformerTest.java +++ b/src/test/java/com/blackduck/integration/blackduck/http/transform/BlackDuckJsonTransformerTest.java @@ -1,35 +1,31 @@ package com.blackduck.integration.blackduck.http.transform; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertTrue; - -import java.io.InputStream; -import java.nio.charset.StandardCharsets; -import java.util.HashSet; -import java.util.Iterator; -import java.util.Set; - import com.blackduck.integration.blackduck.TimingExtension; +import com.blackduck.integration.blackduck.api.core.BlackDuckView; +import com.blackduck.integration.blackduck.api.generated.view.ProjectVersionView; +import com.blackduck.integration.blackduck.api.manual.view.ProjectView; +import com.blackduck.integration.blackduck.http.BlackDuckPageResponse; +import com.blackduck.integration.blackduck.http.transform.subclass.BlackDuckResponseResolver; +import com.blackduck.integration.blackduck.service.BlackDuckServicesFactory; +import com.blackduck.integration.log.BufferedIntLogger; +import com.blackduck.integration.log.IntLogger; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.google.gson.Gson; +import com.google.gson.JsonArray; +import com.google.gson.JsonElement; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.google.gson.Gson; -import com.google.gson.JsonArray; -import com.google.gson.JsonElement; -import com.synopsys.integration.blackduck.api.core.BlackDuckView; -import com.synopsys.integration.blackduck.api.generated.view.ProjectVersionView; -import com.synopsys.integration.blackduck.api.manual.view.ProjectView; -import com.blackduck.integration.blackduck.http.BlackDuckPageResponse; -import com.blackduck.integration.blackduck.http.transform.subclass.BlackDuckResponseResolver; -import com.blackduck.integration.blackduck.service.BlackDuckServicesFactory; -import com.synopsys.integration.log.BufferedIntLogger; -import com.synopsys.integration.log.IntLogger; +import java.io.InputStream; +import java.nio.charset.StandardCharsets; +import java.util.HashSet; +import java.util.Iterator; +import java.util.Set; + +import static org.junit.jupiter.api.Assertions.*; @ExtendWith(TimingExtension.class) public class BlackDuckJsonTransformerTest { diff --git a/src/test/java/com/blackduck/integration/blackduck/http/transform/BlackDuckResponsesTransformerTest.java b/src/test/java/com/blackduck/integration/blackduck/http/transform/BlackDuckResponsesTransformerTest.java index 2a223fcda..5fe60ad52 100644 --- a/src/test/java/com/blackduck/integration/blackduck/http/transform/BlackDuckResponsesTransformerTest.java +++ b/src/test/java/com/blackduck/integration/blackduck/http/transform/BlackDuckResponsesTransformerTest.java @@ -1,23 +1,7 @@ package com.blackduck.integration.blackduck.http.transform; -import static org.junit.jupiter.api.Assertions.assertEquals; - -import java.io.IOException; -import java.nio.charset.StandardCharsets; -import java.util.HashMap; -import java.util.Map; -import java.util.Set; -import java.util.function.Predicate; - import com.blackduck.integration.blackduck.TimingExtension; -import org.apache.commons.io.IOUtils; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; -import org.mockito.ArgumentMatcher; -import org.mockito.Mockito; - -import com.google.gson.Gson; -import com.synopsys.integration.blackduck.api.manual.view.ProjectView; +import com.blackduck.integration.blackduck.api.manual.view.ProjectView; import com.blackduck.integration.blackduck.http.BlackDuckPageResponse; import com.blackduck.integration.blackduck.http.BlackDuckRequestBuilder; import com.blackduck.integration.blackduck.http.client.BlackDuckHttpClient; @@ -25,11 +9,26 @@ import com.blackduck.integration.blackduck.service.BlackDuckServicesFactory; import com.blackduck.integration.blackduck.service.request.BlackDuckMultipleRequest; import com.blackduck.integration.blackduck.service.request.BlackDuckRequest; -import com.synopsys.integration.exception.IntegrationException; -import com.synopsys.integration.log.LogLevel; -import com.synopsys.integration.log.PrintStreamIntLogger; -import com.synopsys.integration.rest.HttpUrl; -import com.synopsys.integration.rest.response.Response; +import com.blackduck.integration.exception.IntegrationException; +import com.blackduck.integration.log.LogLevel; +import com.blackduck.integration.log.PrintStreamIntLogger; +import com.blackduck.integration.rest.HttpUrl; +import com.blackduck.integration.rest.response.Response; +import com.google.gson.Gson; +import org.apache.commons.io.IOUtils; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.ArgumentMatcher; +import org.mockito.Mockito; + +import java.io.IOException; +import java.nio.charset.StandardCharsets; +import java.util.HashMap; +import java.util.Map; +import java.util.Set; +import java.util.function.Predicate; + +import static org.junit.jupiter.api.Assertions.assertEquals; @ExtendWith(TimingExtension.class) public class BlackDuckResponsesTransformerTest { diff --git a/src/test/java/com/blackduck/integration/blackduck/http/transform/BlackDuckResponsesTransformerTestIT.java b/src/test/java/com/blackduck/integration/blackduck/http/transform/BlackDuckResponsesTransformerTestIT.java index 9e71a0dca..d263356cd 100644 --- a/src/test/java/com/blackduck/integration/blackduck/http/transform/BlackDuckResponsesTransformerTestIT.java +++ b/src/test/java/com/blackduck/integration/blackduck/http/transform/BlackDuckResponsesTransformerTestIT.java @@ -1,23 +1,18 @@ package com.blackduck.integration.blackduck.http.transform; import com.blackduck.integration.blackduck.TimingExtension; +import com.blackduck.integration.blackduck.api.generated.discovery.ApiDiscovery; +import com.blackduck.integration.blackduck.api.manual.view.ProjectView; import com.blackduck.integration.blackduck.comprehensive.recipe.BasicRecipe; -import com.blackduck.integration.blackduck.http.client.IntHttpClientTestHelper; -import org.junit.jupiter.api.AfterAll; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Tag; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.TestInstance; -import org.junit.jupiter.api.extension.ExtendWith; - -import com.synopsys.integration.blackduck.api.generated.discovery.ApiDiscovery; -import com.synopsys.integration.blackduck.api.manual.view.ProjectView; import com.blackduck.integration.blackduck.http.BlackDuckPageDefinition; import com.blackduck.integration.blackduck.http.BlackDuckPageResponse; import com.blackduck.integration.blackduck.http.BlackDuckRequestBuilder; +import com.blackduck.integration.blackduck.http.client.IntHttpClientTestHelper; import com.blackduck.integration.blackduck.service.BlackDuckServicesFactory; import com.blackduck.integration.blackduck.service.request.BlackDuckMultipleRequest; -import com.synopsys.integration.exception.IntegrationException; +import com.blackduck.integration.exception.IntegrationException; +import org.junit.jupiter.api.*; +import org.junit.jupiter.api.extension.ExtendWith; @Tag("integration") @TestInstance(TestInstance.Lifecycle.PER_CLASS) diff --git a/src/test/java/com/blackduck/integration/blackduck/http/transform/ProjectViewWithoutDescription.java b/src/test/java/com/blackduck/integration/blackduck/http/transform/ProjectViewWithoutDescription.java index 60361d043..03706e6ea 100644 --- a/src/test/java/com/blackduck/integration/blackduck/http/transform/ProjectViewWithoutDescription.java +++ b/src/test/java/com/blackduck/integration/blackduck/http/transform/ProjectViewWithoutDescription.java @@ -1,8 +1,8 @@ package com.blackduck.integration.blackduck.http.transform; -import com.synopsys.integration.blackduck.api.core.BlackDuckView; -import com.synopsys.integration.blackduck.api.generated.enumeration.OriginSourceType; -import com.synopsys.integration.blackduck.api.generated.enumeration.ProjectCloneCategoriesType; +import com.blackduck.integration.blackduck.api.core.BlackDuckView; +import com.blackduck.integration.blackduck.api.generated.enumeration.OriginSourceType; +import com.blackduck.integration.blackduck.api.generated.enumeration.ProjectCloneCategoriesType; public class ProjectViewWithoutDescription extends BlackDuckView { private java.util.List cloneCategories; diff --git a/src/test/java/com/blackduck/integration/blackduck/http/transform/SillyFruitResponse.java b/src/test/java/com/blackduck/integration/blackduck/http/transform/SillyFruitResponse.java index 1083d060b..e3e6f9166 100644 --- a/src/test/java/com/blackduck/integration/blackduck/http/transform/SillyFruitResponse.java +++ b/src/test/java/com/blackduck/integration/blackduck/http/transform/SillyFruitResponse.java @@ -1,8 +1,8 @@ package com.blackduck.integration.blackduck.http.transform; -import java.util.List; +import com.blackduck.integration.blackduck.api.core.BlackDuckResponse; -import com.synopsys.integration.blackduck.api.core.BlackDuckResponse; +import java.util.List; public class SillyFruitResponse extends BlackDuckResponse { public String name; diff --git a/src/test/java/com/blackduck/integration/blackduck/http/transform/subclass/BlackDuckResponseResolverTest.java b/src/test/java/com/blackduck/integration/blackduck/http/transform/subclass/BlackDuckResponseResolverTest.java index a67973a3e..fa5efe5cf 100644 --- a/src/test/java/com/blackduck/integration/blackduck/http/transform/subclass/BlackDuckResponseResolverTest.java +++ b/src/test/java/com/blackduck/integration/blackduck/http/transform/subclass/BlackDuckResponseResolverTest.java @@ -1,18 +1,16 @@ package com.blackduck.integration.blackduck.http.transform.subclass; -import static org.junit.jupiter.api.Assertions.assertTrue; +import com.blackduck.integration.blackduck.api.manual.view.NotificationView; +import com.blackduck.integration.blackduck.api.manual.view.ProjectVersionNotificationView; +import com.blackduck.integration.blackduck.api.manual.view.VulnerabilityNotificationView; +import com.google.gson.Gson; +import org.apache.commons.io.IOUtils; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.nio.charset.StandardCharsets; -import com.blackduck.integration.blackduck.http.transform.subclass.BlackDuckResponseResolver; -import org.apache.commons.io.IOUtils; -import org.junit.jupiter.api.Test; - -import com.google.gson.Gson; -import com.synopsys.integration.blackduck.api.manual.view.NotificationView; -import com.synopsys.integration.blackduck.api.manual.view.ProjectVersionNotificationView; -import com.synopsys.integration.blackduck.api.manual.view.VulnerabilityNotificationView; +import static org.junit.jupiter.api.Assertions.assertTrue; public class BlackDuckResponseResolverTest { @Test diff --git a/src/test/java/com/blackduck/integration/blackduck/license/LicenseTest.java b/src/test/java/com/blackduck/integration/blackduck/license/LicenseTest.java index 55a48b478..a8dc46078 100644 --- a/src/test/java/com/blackduck/integration/blackduck/license/LicenseTest.java +++ b/src/test/java/com/blackduck/integration/blackduck/license/LicenseTest.java @@ -1,25 +1,22 @@ package com.blackduck.integration.blackduck.license; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertTrue; - -import java.util.List; -import java.util.function.Predicate; - -import org.junit.jupiter.api.Tag; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; - import com.blackduck.integration.blackduck.TimingExtension; -import com.synopsys.integration.blackduck.api.core.response.UrlMultipleResponses; -import com.synopsys.integration.blackduck.api.generated.discovery.ApiDiscovery; -import com.synopsys.integration.blackduck.api.generated.view.LicenseView; -import com.synopsys.integration.blackduck.api.manual.response.BlackDuckStringResponse; +import com.blackduck.integration.blackduck.api.core.response.UrlMultipleResponses; +import com.blackduck.integration.blackduck.api.generated.discovery.ApiDiscovery; +import com.blackduck.integration.blackduck.api.generated.view.LicenseView; +import com.blackduck.integration.blackduck.api.manual.response.BlackDuckStringResponse; import com.blackduck.integration.blackduck.http.client.IntHttpClientTestHelper; import com.blackduck.integration.blackduck.service.BlackDuckApiClient; import com.blackduck.integration.blackduck.service.BlackDuckServicesFactory; -import com.synopsys.integration.exception.IntegrationException; +import com.blackduck.integration.exception.IntegrationException; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; + +import java.util.List; +import java.util.function.Predicate; + +import static org.junit.jupiter.api.Assertions.*; @Tag("integration") @ExtendWith(TimingExtension.class) diff --git a/src/test/java/com/blackduck/integration/blackduck/service/BlackDuckApiClientTest.java b/src/test/java/com/blackduck/integration/blackduck/service/BlackDuckApiClientTest.java index 2bd7c4aa3..7a5ef4c85 100644 --- a/src/test/java/com/blackduck/integration/blackduck/service/BlackDuckApiClientTest.java +++ b/src/test/java/com/blackduck/integration/blackduck/service/BlackDuckApiClientTest.java @@ -1,35 +1,32 @@ package com.blackduck.integration.blackduck.service; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.junit.jupiter.api.Assertions.fail; - -import java.io.IOException; -import java.io.InputStream; -import java.nio.charset.StandardCharsets; -import java.util.NoSuchElementException; - -import org.apache.commons.io.IOUtils; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; -import org.mockito.Mockito; - -import com.fasterxml.jackson.databind.ObjectMapper; -import com.google.gson.Gson; import com.blackduck.integration.blackduck.TimingExtension; -import com.synopsys.integration.blackduck.api.generated.enumeration.ProjectVersionComponentPolicyStatusType; -import com.synopsys.integration.blackduck.api.generated.view.ProjectVersionPolicyStatusView; -import com.synopsys.integration.blackduck.api.generated.view.ProjectVersionView; +import com.blackduck.integration.blackduck.api.generated.enumeration.ProjectVersionComponentPolicyStatusType; +import com.blackduck.integration.blackduck.api.generated.view.ProjectVersionPolicyStatusView; +import com.blackduck.integration.blackduck.api.generated.view.ProjectVersionView; import com.blackduck.integration.blackduck.http.client.BlackDuckHttpClient; import com.blackduck.integration.blackduck.http.transform.BlackDuckJsonTransformer; import com.blackduck.integration.blackduck.http.transform.BlackDuckResponseTransformer; import com.blackduck.integration.blackduck.http.transform.BlackDuckResponsesTransformer; import com.blackduck.integration.blackduck.http.transform.subclass.BlackDuckResponseResolver; import com.blackduck.integration.blackduck.service.request.BlackDuckRequest; -import com.synopsys.integration.exception.IntegrationException; -import com.synopsys.integration.log.BufferedIntLogger; -import com.synopsys.integration.log.IntLogger; -import com.synopsys.integration.rest.response.Response; +import com.blackduck.integration.exception.IntegrationException; +import com.blackduck.integration.log.BufferedIntLogger; +import com.blackduck.integration.log.IntLogger; +import com.blackduck.integration.rest.response.Response; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.google.gson.Gson; +import org.apache.commons.io.IOUtils; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.Mockito; + +import java.io.IOException; +import java.io.InputStream; +import java.nio.charset.StandardCharsets; +import java.util.NoSuchElementException; + +import static org.junit.jupiter.api.Assertions.*; @ExtendWith(TimingExtension.class) public class BlackDuckApiClientTest { diff --git a/src/test/java/com/blackduck/integration/blackduck/service/BlackDuckApiClientTestIT.java b/src/test/java/com/blackduck/integration/blackduck/service/BlackDuckApiClientTestIT.java index ba1eda92a..ffe9c27e3 100644 --- a/src/test/java/com/blackduck/integration/blackduck/service/BlackDuckApiClientTestIT.java +++ b/src/test/java/com/blackduck/integration/blackduck/service/BlackDuckApiClientTestIT.java @@ -1,22 +1,10 @@ package com.blackduck.integration.blackduck.service; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNull; -import static org.junit.jupiter.api.Assertions.assertTrue; - -import java.util.List; - -import org.junit.jupiter.api.Tag; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; - -import com.fasterxml.jackson.databind.ObjectMapper; -import com.google.gson.Gson; import com.blackduck.integration.blackduck.TimingExtension; -import com.synopsys.integration.blackduck.api.core.response.UrlSingleResponse; -import com.synopsys.integration.blackduck.api.generated.discovery.ApiDiscovery; -import com.synopsys.integration.blackduck.api.generated.discovery.BlackDuckMediaTypeDiscovery; -import com.synopsys.integration.blackduck.api.manual.view.ProjectView; +import com.blackduck.integration.blackduck.api.core.response.UrlSingleResponse; +import com.blackduck.integration.blackduck.api.generated.discovery.ApiDiscovery; +import com.blackduck.integration.blackduck.api.generated.discovery.BlackDuckMediaTypeDiscovery; +import com.blackduck.integration.blackduck.api.manual.view.ProjectView; import com.blackduck.integration.blackduck.configuration.BlackDuckServerConfig; import com.blackduck.integration.blackduck.configuration.BlackDuckServerConfigBuilder; import com.blackduck.integration.blackduck.http.BlackDuckRequestBuilder; @@ -31,11 +19,20 @@ import com.blackduck.integration.blackduck.service.request.BlackDuckMultipleRequest; import com.blackduck.integration.blackduck.service.request.BlackDuckSingleRequest; import com.blackduck.integration.blackduck.service.request.PagingDefaultsEditor; -import com.synopsys.integration.exception.IntegrationException; -import com.synopsys.integration.log.IntLogger; -import com.synopsys.integration.log.LogLevel; -import com.synopsys.integration.log.PrintStreamIntLogger; -import com.synopsys.integration.rest.HttpUrl; +import com.blackduck.integration.exception.IntegrationException; +import com.blackduck.integration.log.IntLogger; +import com.blackduck.integration.log.LogLevel; +import com.blackduck.integration.log.PrintStreamIntLogger; +import com.blackduck.integration.rest.HttpUrl; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.google.gson.Gson; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; + +import java.util.List; + +import static org.junit.jupiter.api.Assertions.*; @Tag("integration") @ExtendWith(TimingExtension.class) diff --git a/src/test/java/com/blackduck/integration/blackduck/service/dataservice/BlackDuckRegistrationRequestServiceTestIT.java b/src/test/java/com/blackduck/integration/blackduck/service/dataservice/BlackDuckRegistrationRequestServiceTestIT.java index b772d5986..9a2eed5f8 100644 --- a/src/test/java/com/blackduck/integration/blackduck/service/dataservice/BlackDuckRegistrationRequestServiceTestIT.java +++ b/src/test/java/com/blackduck/integration/blackduck/service/dataservice/BlackDuckRegistrationRequestServiceTestIT.java @@ -1,15 +1,14 @@ package com.blackduck.integration.blackduck.service.dataservice; -import static org.junit.jupiter.api.Assertions.assertTrue; - import com.blackduck.integration.blackduck.TimingExtension; import com.blackduck.integration.blackduck.http.client.IntHttpClientTestHelper; +import com.blackduck.integration.blackduck.service.BlackDuckServicesFactory; import org.apache.commons.lang3.StringUtils; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import com.blackduck.integration.blackduck.service.BlackDuckServicesFactory; +import static org.junit.jupiter.api.Assertions.assertTrue; @Tag("integration") @ExtendWith(TimingExtension.class) diff --git a/src/test/java/com/blackduck/integration/blackduck/service/dataservice/BlackDuckScanReadinessServiceTestIT.java b/src/test/java/com/blackduck/integration/blackduck/service/dataservice/BlackDuckScanReadinessServiceTestIT.java index 934a0b5a2..cb481185e 100644 --- a/src/test/java/com/blackduck/integration/blackduck/service/dataservice/BlackDuckScanReadinessServiceTestIT.java +++ b/src/test/java/com/blackduck/integration/blackduck/service/dataservice/BlackDuckScanReadinessServiceTestIT.java @@ -1,17 +1,16 @@ package com.blackduck.integration.blackduck.service.dataservice; import com.blackduck.integration.blackduck.TimingExtension; +import com.blackduck.integration.blackduck.api.generated.view.ScanReadinessView; +import com.blackduck.integration.blackduck.http.client.IntHttpClientTestHelper; +import com.blackduck.integration.blackduck.service.BlackDuckServicesFactory; +import com.blackduck.integration.exception.IntegrationException; import org.junit.Assume; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import com.synopsys.integration.blackduck.api.generated.view.ScanReadinessView; -import com.blackduck.integration.blackduck.http.client.IntHttpClientTestHelper; -import com.blackduck.integration.blackduck.service.BlackDuckServicesFactory; -import com.synopsys.integration.exception.IntegrationException; - @Tag("integration") @ExtendWith(TimingExtension.class) public class BlackDuckScanReadinessServiceTestIT { diff --git a/src/test/java/com/blackduck/integration/blackduck/service/dataservice/CodeLocationServiceTestIT.java b/src/test/java/com/blackduck/integration/blackduck/service/dataservice/CodeLocationServiceTestIT.java index 094a2ea53..c216153bd 100644 --- a/src/test/java/com/blackduck/integration/blackduck/service/dataservice/CodeLocationServiceTestIT.java +++ b/src/test/java/com/blackduck/integration/blackduck/service/dataservice/CodeLocationServiceTestIT.java @@ -1,31 +1,13 @@ package com.blackduck.integration.blackduck.service.dataservice; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.junit.jupiter.api.Assertions.fail; - -import java.io.File; -import java.io.IOException; -import java.util.List; -import java.util.Optional; -import java.util.function.Predicate; -import java.util.stream.Collectors; -import java.util.stream.IntStream; - +import com.blackduck.integration.bdio.SimpleBdioFactory; +import com.blackduck.integration.bdio.graph.ProjectDependencyGraph; +import com.blackduck.integration.bdio.model.SimpleBdioDocument; +import com.blackduck.integration.bdio.model.dependency.Dependency; import com.blackduck.integration.blackduck.TimingExtension; -import org.apache.commons.lang3.StringUtils; -import org.junit.jupiter.api.Disabled; -import org.junit.jupiter.api.Tag; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; - -import com.synopsys.integration.bdio.SimpleBdioFactory; -import com.synopsys.integration.bdio.graph.ProjectDependencyGraph; -import com.synopsys.integration.bdio.model.SimpleBdioDocument; -import com.synopsys.integration.bdio.model.dependency.Dependency; -import com.synopsys.integration.blackduck.api.generated.view.CodeLocationView; -import com.synopsys.integration.blackduck.api.manual.view.ProjectView; -import com.synopsys.integration.blackduck.api.generated.view.UserView; +import com.blackduck.integration.blackduck.api.generated.view.CodeLocationView; +import com.blackduck.integration.blackduck.api.generated.view.UserView; +import com.blackduck.integration.blackduck.api.manual.view.ProjectView; import com.blackduck.integration.blackduck.codelocation.Result; import com.blackduck.integration.blackduck.codelocation.bdiolegacy.BdioUploadCodeLocationCreationRequest; import com.blackduck.integration.blackduck.codelocation.bdiolegacy.BdioUploadService; @@ -42,10 +24,25 @@ import com.blackduck.integration.blackduck.service.BlackDuckServicesFactory; import com.blackduck.integration.blackduck.service.model.ProjectVersionWrapper; import com.blackduck.integration.blackduck.service.request.BlackDuckMultipleRequest; -import com.synopsys.integration.exception.IntegrationException; -import com.synopsys.integration.log.BufferedIntLogger; -import com.synopsys.integration.rest.HttpUrl; -import com.synopsys.integration.util.NameVersion; +import com.blackduck.integration.exception.IntegrationException; +import com.blackduck.integration.log.BufferedIntLogger; +import com.blackduck.integration.rest.HttpUrl; +import com.blackduck.integration.util.NameVersion; +import org.apache.commons.lang3.StringUtils; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; + +import java.io.File; +import java.io.IOException; +import java.util.List; +import java.util.Optional; +import java.util.function.Predicate; +import java.util.stream.Collectors; +import java.util.stream.IntStream; + +import static org.junit.jupiter.api.Assertions.*; @Tag("integration") @ExtendWith(TimingExtension.class) diff --git a/src/test/java/com/blackduck/integration/blackduck/service/dataservice/ComponentServiceTestIT.java b/src/test/java/com/blackduck/integration/blackduck/service/dataservice/ComponentServiceTestIT.java index c4acefefe..dfa787115 100644 --- a/src/test/java/com/blackduck/integration/blackduck/service/dataservice/ComponentServiceTestIT.java +++ b/src/test/java/com/blackduck/integration/blackduck/service/dataservice/ComponentServiceTestIT.java @@ -1,27 +1,23 @@ package com.blackduck.integration.blackduck.service.dataservice; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertTrue; - -import java.util.List; -import java.util.Optional; - +import com.blackduck.integration.bdio.model.Forge; +import com.blackduck.integration.bdio.model.externalid.ExternalId; +import com.blackduck.integration.bdio.model.externalid.ExternalIdFactory; import com.blackduck.integration.blackduck.TimingExtension; +import com.blackduck.integration.blackduck.api.generated.response.ComponentsView; +import com.blackduck.integration.blackduck.api.generated.view.ComponentVersionView; import com.blackduck.integration.blackduck.http.client.IntHttpClientTestHelper; +import com.blackduck.integration.blackduck.service.BlackDuckServicesFactory; +import com.blackduck.integration.exception.IntegrationException; import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import com.synopsys.integration.bdio.model.Forge; -import com.synopsys.integration.bdio.model.externalid.ExternalId; -import com.synopsys.integration.bdio.model.externalid.ExternalIdFactory; -import com.synopsys.integration.blackduck.api.generated.response.ComponentsView; -import com.synopsys.integration.blackduck.api.generated.view.ComponentVersionView; -import com.blackduck.integration.blackduck.service.BlackDuckServicesFactory; -import com.synopsys.integration.exception.IntegrationException; +import java.util.List; +import java.util.Optional; + +import static org.junit.jupiter.api.Assertions.*; @Tag("integration") @ExtendWith(TimingExtension.class) diff --git a/src/test/java/com/blackduck/integration/blackduck/service/dataservice/IssueServiceTestIT.java b/src/test/java/com/blackduck/integration/blackduck/service/dataservice/IssueServiceTestIT.java index 74ccb2b56..a1a4d982b 100644 --- a/src/test/java/com/blackduck/integration/blackduck/service/dataservice/IssueServiceTestIT.java +++ b/src/test/java/com/blackduck/integration/blackduck/service/dataservice/IssueServiceTestIT.java @@ -1,7 +1,24 @@ package com.blackduck.integration.blackduck.service.dataservice; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; +import com.blackduck.integration.bdio.model.externalid.ExternalId; +import com.blackduck.integration.bdio.model.externalid.ExternalIdFactory; +import com.blackduck.integration.blackduck.TimingExtension; +import com.blackduck.integration.blackduck.api.generated.view.IssueView; +import com.blackduck.integration.blackduck.api.generated.view.ProjectVersionComponentVersionView; +import com.blackduck.integration.blackduck.api.generated.view.ProjectVersionIssuesView; +import com.blackduck.integration.blackduck.api.manual.temporary.component.IssueRequest; +import com.blackduck.integration.blackduck.api.manual.view.ProjectView; +import com.blackduck.integration.blackduck.http.client.IntHttpClientTestHelper; +import com.blackduck.integration.blackduck.service.BlackDuckApiClient; +import com.blackduck.integration.blackduck.service.BlackDuckServicesFactory; +import com.blackduck.integration.blackduck.service.model.ProjectSyncModel; +import com.blackduck.integration.blackduck.service.model.ProjectVersionWrapper; +import com.blackduck.integration.exception.IntegrationException; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import java.sql.Date; import java.time.Instant; @@ -11,26 +28,8 @@ import java.util.Set; import java.util.stream.Collectors; -import com.blackduck.integration.blackduck.TimingExtension; -import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.BeforeAll; -import org.junit.jupiter.api.Tag; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; - -import com.synopsys.integration.bdio.model.externalid.ExternalId; -import com.synopsys.integration.bdio.model.externalid.ExternalIdFactory; -import com.synopsys.integration.blackduck.api.generated.view.IssueView; -import com.synopsys.integration.blackduck.api.generated.view.ProjectVersionComponentVersionView; -import com.synopsys.integration.blackduck.api.generated.view.ProjectVersionIssuesView; -import com.synopsys.integration.blackduck.api.manual.view.ProjectView; -import com.synopsys.integration.blackduck.api.manual.temporary.component.IssueRequest; -import com.blackduck.integration.blackduck.http.client.IntHttpClientTestHelper; -import com.blackduck.integration.blackduck.service.BlackDuckApiClient; -import com.blackduck.integration.blackduck.service.BlackDuckServicesFactory; -import com.blackduck.integration.blackduck.service.model.ProjectSyncModel; -import com.blackduck.integration.blackduck.service.model.ProjectVersionWrapper; -import com.synopsys.integration.exception.IntegrationException; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; @Tag("integration") @ExtendWith(TimingExtension.class) @@ -74,7 +73,7 @@ public void addingAndRetrievingIssues() throws IntegrationException { project = projectVersionWrapper.getProjectView(); // add some components to the BOM - ExternalId blackDuckCommon = externalIdFactory.createMavenExternalId("com.synopsys.integration", "blackduck-common", "50.0.0"); + ExternalId blackDuckCommon = externalIdFactory.createMavenExternalId("com.blackduck.integration", "blackduck-common", "50.0.0"); ExternalId apacheFileUpload = externalIdFactory.createMavenExternalId("commons-fileupload", "commons-fileupload"); projectBomService.addComponentToProjectVersion(blackDuckCommon, projectVersionWrapper.getProjectVersionView()); projectBomService.addComponentToProjectVersion(apacheFileUpload, projectVersionWrapper.getProjectVersionView()); diff --git a/src/test/java/com/blackduck/integration/blackduck/service/dataservice/LicenseDataServiceTestIT.java b/src/test/java/com/blackduck/integration/blackduck/service/dataservice/LicenseDataServiceTestIT.java index a3bf25d61..aa384f572 100644 --- a/src/test/java/com/blackduck/integration/blackduck/service/dataservice/LicenseDataServiceTestIT.java +++ b/src/test/java/com/blackduck/integration/blackduck/service/dataservice/LicenseDataServiceTestIT.java @@ -1,26 +1,23 @@ package com.blackduck.integration.blackduck.service.dataservice; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNull; -import static org.junit.jupiter.api.Assertions.assertTrue; - -import java.util.Optional; - +import com.blackduck.integration.bdio.SimpleBdioFactory; +import com.blackduck.integration.bdio.model.externalid.ExternalId; +import com.blackduck.integration.bdio.model.externalid.ExternalIdFactory; import com.blackduck.integration.blackduck.TimingExtension; +import com.blackduck.integration.blackduck.api.generated.enumeration.LicenseType; +import com.blackduck.integration.blackduck.api.generated.view.ComponentVersionLicenseLicensesView; +import com.blackduck.integration.blackduck.api.generated.view.ComponentVersionLicenseView; +import com.blackduck.integration.blackduck.http.client.IntHttpClientTestHelper; +import com.blackduck.integration.blackduck.service.BlackDuckServicesFactory; +import com.blackduck.integration.exception.IntegrationException; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import com.synopsys.integration.bdio.SimpleBdioFactory; -import com.synopsys.integration.bdio.model.externalid.ExternalId; -import com.synopsys.integration.bdio.model.externalid.ExternalIdFactory; -import com.synopsys.integration.blackduck.api.generated.enumeration.LicenseType; -import com.synopsys.integration.blackduck.api.generated.view.ComponentVersionLicenseLicensesView; -import com.synopsys.integration.blackduck.api.generated.view.ComponentVersionLicenseView; -import com.blackduck.integration.blackduck.http.client.IntHttpClientTestHelper; -import com.blackduck.integration.blackduck.service.BlackDuckServicesFactory; -import com.synopsys.integration.exception.IntegrationException; +import java.util.Optional; + +import static org.junit.jupiter.api.Assertions.assertEquals; @Tag("integration") @ExtendWith(TimingExtension.class) diff --git a/src/test/java/com/blackduck/integration/blackduck/service/dataservice/PolicyRuleServiceTestIT.java b/src/test/java/com/blackduck/integration/blackduck/service/dataservice/PolicyRuleServiceTestIT.java index 4f094f178..656f67203 100644 --- a/src/test/java/com/blackduck/integration/blackduck/service/dataservice/PolicyRuleServiceTestIT.java +++ b/src/test/java/com/blackduck/integration/blackduck/service/dataservice/PolicyRuleServiceTestIT.java @@ -1,27 +1,26 @@ package com.blackduck.integration.blackduck.service.dataservice; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; - -import java.util.LinkedList; -import java.util.List; -import java.util.Optional; -import java.util.UUID; - -import org.junit.jupiter.api.Tag; -import org.junit.jupiter.api.Test; - import com.blackduck.integration.blackduck.api.enumeration.PolicyRuleConditionOperatorType; -import com.synopsys.integration.blackduck.api.generated.component.PolicyRuleExpressionView; -import com.synopsys.integration.blackduck.api.generated.enumeration.PolicyRuleCategoryType; -import com.synopsys.integration.blackduck.api.generated.view.PolicyRuleView; +import com.blackduck.integration.blackduck.api.generated.component.PolicyRuleExpressionView; +import com.blackduck.integration.blackduck.api.generated.enumeration.PolicyRuleCategoryType; +import com.blackduck.integration.blackduck.api.generated.view.PolicyRuleView; import com.blackduck.integration.blackduck.exception.BlackDuckIntegrationException; import com.blackduck.integration.blackduck.http.client.IntHttpClientTestHelper; import com.blackduck.integration.blackduck.service.BlackDuckApiClient; import com.blackduck.integration.blackduck.service.BlackDuckServicesFactory; import com.blackduck.integration.blackduck.service.model.PolicyRuleExpressionSetBuilder; -import com.synopsys.integration.exception.IntegrationException; -import com.synopsys.integration.rest.HttpUrl; +import com.blackduck.integration.exception.IntegrationException; +import com.blackduck.integration.rest.HttpUrl; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; + +import java.util.LinkedList; +import java.util.List; +import java.util.Optional; +import java.util.UUID; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; @Tag("integration") public class PolicyRuleServiceTestIT { diff --git a/src/test/java/com/blackduck/integration/blackduck/service/dataservice/PolicyStatusDescriptionTest.java b/src/test/java/com/blackduck/integration/blackduck/service/dataservice/PolicyStatusDescriptionTest.java index ebf612689..4ff9b7f9e 100644 --- a/src/test/java/com/blackduck/integration/blackduck/service/dataservice/PolicyStatusDescriptionTest.java +++ b/src/test/java/com/blackduck/integration/blackduck/service/dataservice/PolicyStatusDescriptionTest.java @@ -1,19 +1,18 @@ package com.blackduck.integration.blackduck.service.dataservice; -import java.util.ArrayList; -import java.util.List; - import com.blackduck.integration.blackduck.TimingExtension; +import com.blackduck.integration.blackduck.api.generated.component.ProjectVersionPolicyStatusComponentVersionPolicyViolationDetailsView; +import com.blackduck.integration.blackduck.api.generated.enumeration.PolicyRuleSeverityType; +import com.blackduck.integration.blackduck.api.generated.enumeration.ProjectVersionComponentPolicyStatusType; +import com.blackduck.integration.blackduck.api.generated.view.ProjectVersionPolicyStatusView; +import com.blackduck.integration.blackduck.api.manual.temporary.component.NameValuePairView; +import com.blackduck.integration.blackduck.service.model.PolicyStatusDescription; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import com.synopsys.integration.blackduck.api.generated.component.ProjectVersionPolicyStatusComponentVersionPolicyViolationDetailsView; -import com.synopsys.integration.blackduck.api.generated.enumeration.PolicyRuleSeverityType; -import com.synopsys.integration.blackduck.api.generated.enumeration.ProjectVersionComponentPolicyStatusType; -import com.synopsys.integration.blackduck.api.generated.view.ProjectVersionPolicyStatusView; -import com.synopsys.integration.blackduck.api.manual.temporary.component.NameValuePairView; -import com.blackduck.integration.blackduck.service.model.PolicyStatusDescription; +import java.util.ArrayList; +import java.util.List; @ExtendWith(TimingExtension.class) public class PolicyStatusDescriptionTest { diff --git a/src/test/java/com/blackduck/integration/blackduck/service/dataservice/ProjectAssignmentServiceTestIT.java b/src/test/java/com/blackduck/integration/blackduck/service/dataservice/ProjectAssignmentServiceTestIT.java index b05af940f..c5b74a869 100644 --- a/src/test/java/com/blackduck/integration/blackduck/service/dataservice/ProjectAssignmentServiceTestIT.java +++ b/src/test/java/com/blackduck/integration/blackduck/service/dataservice/ProjectAssignmentServiceTestIT.java @@ -1,25 +1,24 @@ package com.blackduck.integration.blackduck.service.dataservice; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; - -import java.util.Date; -import java.util.List; - import com.blackduck.integration.blackduck.TimingExtension; +import com.blackduck.integration.blackduck.api.manual.temporary.component.ProjectRequest; +import com.blackduck.integration.blackduck.api.manual.temporary.view.AssignedUserView; +import com.blackduck.integration.blackduck.api.manual.view.ProjectView; import com.blackduck.integration.blackduck.http.client.IntHttpClientTestHelper; +import com.blackduck.integration.blackduck.service.BlackDuckServicesFactory; +import com.blackduck.integration.blackduck.service.model.ProjectVersionWrapper; +import com.blackduck.integration.exception.IntegrationException; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import com.synopsys.integration.blackduck.api.manual.view.ProjectView; -import com.synopsys.integration.blackduck.api.manual.temporary.component.ProjectRequest; -import com.synopsys.integration.blackduck.api.manual.temporary.view.AssignedUserView; -import com.blackduck.integration.blackduck.service.BlackDuckServicesFactory; -import com.blackduck.integration.blackduck.service.model.ProjectVersionWrapper; -import com.synopsys.integration.exception.IntegrationException; +import java.util.Date; +import java.util.List; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; @Tag("integration") @ExtendWith(TimingExtension.class) diff --git a/src/test/java/com/blackduck/integration/blackduck/service/dataservice/ProjectMappingServiceTest.java b/src/test/java/com/blackduck/integration/blackduck/service/dataservice/ProjectMappingServiceTest.java index b00bb5628..cad9f3502 100644 --- a/src/test/java/com/blackduck/integration/blackduck/service/dataservice/ProjectMappingServiceTest.java +++ b/src/test/java/com/blackduck/integration/blackduck/service/dataservice/ProjectMappingServiceTest.java @@ -1,24 +1,23 @@ package com.blackduck.integration.blackduck.service.dataservice; -import static org.junit.jupiter.api.Assertions.assertEquals; - -import java.util.List; - import com.blackduck.integration.blackduck.TimingExtension; +import com.blackduck.integration.blackduck.api.manual.view.ProjectMappingView; +import com.blackduck.integration.blackduck.api.manual.view.ProjectView; +import com.blackduck.integration.blackduck.http.client.IntHttpClientTestHelper; +import com.blackduck.integration.blackduck.service.BlackDuckApiClient; +import com.blackduck.integration.blackduck.service.BlackDuckServicesFactory; +import com.blackduck.integration.blackduck.service.model.ProjectSyncModel; +import com.blackduck.integration.blackduck.service.model.ProjectVersionWrapper; +import com.blackduck.integration.exception.IntegrationException; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import com.synopsys.integration.blackduck.api.manual.view.ProjectView; -import com.synopsys.integration.blackduck.api.manual.view.ProjectMappingView; -import com.blackduck.integration.blackduck.http.client.IntHttpClientTestHelper; -import com.blackduck.integration.blackduck.service.BlackDuckApiClient; -import com.blackduck.integration.blackduck.service.BlackDuckServicesFactory; -import com.blackduck.integration.blackduck.service.model.ProjectSyncModel; -import com.blackduck.integration.blackduck.service.model.ProjectVersionWrapper; -import com.synopsys.integration.exception.IntegrationException; +import java.util.List; + +import static org.junit.jupiter.api.Assertions.assertEquals; @Tag("integration") @ExtendWith(TimingExtension.class) diff --git a/src/test/java/com/blackduck/integration/blackduck/service/dataservice/ProjectServiceTest.java b/src/test/java/com/blackduck/integration/blackduck/service/dataservice/ProjectServiceTest.java index 7c47fdb98..fcbf62dc1 100644 --- a/src/test/java/com/blackduck/integration/blackduck/service/dataservice/ProjectServiceTest.java +++ b/src/test/java/com/blackduck/integration/blackduck/service/dataservice/ProjectServiceTest.java @@ -1,7 +1,23 @@ package com.blackduck.integration.blackduck.service.dataservice; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; +import com.blackduck.integration.blackduck.api.generated.discovery.ApiDiscovery; +import com.blackduck.integration.blackduck.api.generated.view.ProjectVersionView; +import com.blackduck.integration.blackduck.api.manual.view.ProjectView; +import com.blackduck.integration.blackduck.http.BlackDuckPageResponse; +import com.blackduck.integration.blackduck.http.transform.BlackDuckJsonTransformer; +import com.blackduck.integration.blackduck.http.transform.subclass.BlackDuckResponseResolver; +import com.blackduck.integration.blackduck.service.BlackDuckApiClient; +import com.blackduck.integration.blackduck.service.BlackDuckServicesFactory; +import com.blackduck.integration.exception.IntegrationException; +import com.blackduck.integration.log.BufferedIntLogger; +import com.blackduck.integration.log.IntLogger; +import com.blackduck.integration.rest.HttpUrl; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.google.gson.Gson; +import org.apache.commons.io.IOUtils; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; +import org.mockito.Mockito; import java.io.IOException; import java.io.InputStream; @@ -9,27 +25,8 @@ import java.util.List; import java.util.Optional; -import com.blackduck.integration.blackduck.service.dataservice.ProjectGetService; -import com.blackduck.integration.blackduck.service.dataservice.ProjectService; -import org.apache.commons.io.IOUtils; -import org.junit.jupiter.api.Disabled; -import org.junit.jupiter.api.Test; -import org.mockito.Mockito; - -import com.fasterxml.jackson.databind.ObjectMapper; -import com.google.gson.Gson; -import com.synopsys.integration.blackduck.api.generated.discovery.ApiDiscovery; -import com.synopsys.integration.blackduck.api.generated.view.ProjectVersionView; -import com.synopsys.integration.blackduck.api.manual.view.ProjectView; -import com.blackduck.integration.blackduck.http.BlackDuckPageResponse; -import com.blackduck.integration.blackduck.http.transform.BlackDuckJsonTransformer; -import com.blackduck.integration.blackduck.http.transform.subclass.BlackDuckResponseResolver; -import com.blackduck.integration.blackduck.service.BlackDuckApiClient; -import com.blackduck.integration.blackduck.service.BlackDuckServicesFactory; -import com.synopsys.integration.exception.IntegrationException; -import com.synopsys.integration.log.BufferedIntLogger; -import com.synopsys.integration.log.IntLogger; -import com.synopsys.integration.rest.HttpUrl; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; public class ProjectServiceTest { @Disabled @@ -49,7 +46,7 @@ public void testGettingLatestProjectVersion() throws IOException, IntegrationExc BlackDuckApiClient blackDuckApiClient = Mockito.mock(BlackDuckApiClient.class); ProjectGetService projectGetService = Mockito.mock(ProjectGetService.class); - ApiDiscovery apiDiscovery = new ApiDiscovery(new HttpUrl("https://synopsys.com")); + ApiDiscovery apiDiscovery = new ApiDiscovery(new HttpUrl("https://blackduck.com")); ProjectService projectService = new ProjectService(blackDuckApiClient, apiDiscovery, logger, projectGetService); ProjectView projectView = new ProjectView(); diff --git a/src/test/java/com/blackduck/integration/blackduck/service/dataservice/ProjectServiceTestIT.java b/src/test/java/com/blackduck/integration/blackduck/service/dataservice/ProjectServiceTestIT.java index 01e24c39b..182df60bb 100644 --- a/src/test/java/com/blackduck/integration/blackduck/service/dataservice/ProjectServiceTestIT.java +++ b/src/test/java/com/blackduck/integration/blackduck/service/dataservice/ProjectServiceTestIT.java @@ -1,41 +1,33 @@ package com.blackduck.integration.blackduck.service.dataservice; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.junit.jupiter.api.Assertions.fail; - -import java.time.Instant; -import java.util.Arrays; -import java.util.Date; -import java.util.List; -import java.util.Optional; - import com.blackduck.integration.blackduck.TimingExtension; -import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.BeforeAll; -import org.junit.jupiter.api.Tag; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; - -import com.synopsys.integration.blackduck.api.generated.enumeration.ProjectCloneCategoriesType; -import com.synopsys.integration.blackduck.api.generated.enumeration.ProjectVersionDistributionType; -import com.synopsys.integration.blackduck.api.generated.view.ProjectVersionView; -import com.synopsys.integration.blackduck.api.manual.view.ProjectView; -import com.synopsys.integration.blackduck.api.manual.temporary.component.ComplexLicenseRequest; -import com.synopsys.integration.blackduck.api.manual.temporary.component.ProjectRequest; -import com.synopsys.integration.blackduck.api.manual.temporary.component.ProjectVersionRequest; -import com.synopsys.integration.blackduck.api.manual.temporary.enumeration.ProjectVersionPhaseType; +import com.blackduck.integration.blackduck.api.generated.enumeration.ProjectCloneCategoriesType; +import com.blackduck.integration.blackduck.api.generated.enumeration.ProjectVersionDistributionType; +import com.blackduck.integration.blackduck.api.generated.view.ProjectVersionView; +import com.blackduck.integration.blackduck.api.manual.temporary.component.ComplexLicenseRequest; +import com.blackduck.integration.blackduck.api.manual.temporary.component.ProjectRequest; +import com.blackduck.integration.blackduck.api.manual.temporary.component.ProjectVersionRequest; +import com.blackduck.integration.blackduck.api.manual.temporary.enumeration.ProjectVersionPhaseType; +import com.blackduck.integration.blackduck.api.manual.view.ProjectView; import com.blackduck.integration.blackduck.exception.BlackDuckApiException; import com.blackduck.integration.blackduck.http.client.IntHttpClientTestHelper; import com.blackduck.integration.blackduck.service.BlackDuckApiClient; import com.blackduck.integration.blackduck.service.BlackDuckServicesFactory; import com.blackduck.integration.blackduck.service.model.ProjectSyncModel; import com.blackduck.integration.blackduck.service.model.ProjectVersionWrapper; -import com.synopsys.integration.exception.IntegrationException; -import com.synopsys.integration.rest.HttpUrl; -import com.synopsys.integration.rest.RestConstants; +import com.blackduck.integration.exception.IntegrationException; +import com.blackduck.integration.rest.HttpUrl; +import com.blackduck.integration.rest.RestConstants; +import org.junit.jupiter.api.*; +import org.junit.jupiter.api.extension.ExtendWith; + +import java.time.Instant; +import java.util.Arrays; +import java.util.Date; +import java.util.List; +import java.util.Optional; + +import static org.junit.jupiter.api.Assertions.*; @Tag("integration") @ExtendWith(TimingExtension.class) diff --git a/src/test/java/com/blackduck/integration/blackduck/service/dataservice/UserServiceTestIT.java b/src/test/java/com/blackduck/integration/blackduck/service/dataservice/UserServiceTestIT.java index ad96cc3bc..57e9043b2 100644 --- a/src/test/java/com/blackduck/integration/blackduck/service/dataservice/UserServiceTestIT.java +++ b/src/test/java/com/blackduck/integration/blackduck/service/dataservice/UserServiceTestIT.java @@ -1,34 +1,29 @@ package com.blackduck.integration.blackduck.service.dataservice; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.junit.jupiter.api.Assertions.assertTrue; - -import java.util.List; -import java.util.Set; - import com.blackduck.integration.blackduck.TimingExtension; -import org.junit.jupiter.api.Tag; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; - -import com.synopsys.integration.blackduck.api.core.BlackDuckView; -import com.synopsys.integration.blackduck.api.generated.discovery.ApiDiscovery; -import com.synopsys.integration.blackduck.api.manual.view.ProjectView; -import com.synopsys.integration.blackduck.api.generated.view.RoleAssignmentView; -import com.synopsys.integration.blackduck.api.generated.view.UserGroupView; -import com.synopsys.integration.blackduck.api.generated.view.UserView; -import com.synopsys.integration.blackduck.api.manual.temporary.component.UserGroupRequest; -import com.synopsys.integration.blackduck.api.manual.temporary.component.UserRequest; +import com.blackduck.integration.blackduck.api.core.BlackDuckView; +import com.blackduck.integration.blackduck.api.generated.discovery.ApiDiscovery; +import com.blackduck.integration.blackduck.api.generated.view.RoleAssignmentView; +import com.blackduck.integration.blackduck.api.generated.view.UserGroupView; +import com.blackduck.integration.blackduck.api.generated.view.UserView; +import com.blackduck.integration.blackduck.api.manual.temporary.component.UserGroupRequest; +import com.blackduck.integration.blackduck.api.manual.temporary.component.UserRequest; +import com.blackduck.integration.blackduck.api.manual.view.ProjectView; import com.blackduck.integration.blackduck.exception.BlackDuckIntegrationException; import com.blackduck.integration.blackduck.http.client.IntHttpClientTestHelper; import com.blackduck.integration.blackduck.service.BlackDuckApiClient; import com.blackduck.integration.blackduck.service.BlackDuckServicesFactory; import com.blackduck.integration.blackduck.service.model.ProjectSyncModel; -import com.synopsys.integration.exception.IntegrationException; -import com.synopsys.integration.rest.HttpUrl; +import com.blackduck.integration.exception.IntegrationException; +import com.blackduck.integration.rest.HttpUrl; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; + +import java.util.List; +import java.util.Set; + +import static org.junit.jupiter.api.Assertions.*; @Tag("integration") @ExtendWith(TimingExtension.class) @@ -195,7 +190,7 @@ private UserView createUserView(String userName, Boolean active) throws Integrat userRequest.setFirstName("Test User"); userRequest.setLastName("IntegrationTest"); userRequest.setActive(active); - userRequest.setEmail("noreply@synopsys.com"); + userRequest.setEmail("noreply@blackduck.com"); userRequest.setPassword("53CUR17y7hR0ugH085Cur17y"); UserView userView = userService.findUserByUsername(userName).orElse(null); diff --git a/src/test/java/com/blackduck/integration/blackduck/service/dataservice/VulnerabilityDataServiceTestIT.java b/src/test/java/com/blackduck/integration/blackduck/service/dataservice/VulnerabilityDataServiceTestIT.java index d524f7a4f..e90fb1182 100644 --- a/src/test/java/com/blackduck/integration/blackduck/service/dataservice/VulnerabilityDataServiceTestIT.java +++ b/src/test/java/com/blackduck/integration/blackduck/service/dataservice/VulnerabilityDataServiceTestIT.java @@ -1,26 +1,23 @@ package com.blackduck.integration.blackduck.service.dataservice; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertTrue; - -import java.util.List; -import java.util.Optional; - +import com.blackduck.integration.bdio.SimpleBdioFactory; +import com.blackduck.integration.bdio.model.externalid.ExternalId; +import com.blackduck.integration.bdio.model.externalid.ExternalIdFactory; import com.blackduck.integration.blackduck.TimingExtension; +import com.blackduck.integration.blackduck.api.generated.response.ComponentsView; +import com.blackduck.integration.blackduck.api.generated.view.ComponentVersionView; +import com.blackduck.integration.blackduck.api.generated.view.VulnerabilityView; +import com.blackduck.integration.blackduck.http.client.IntHttpClientTestHelper; +import com.blackduck.integration.blackduck.service.BlackDuckServicesFactory; +import com.blackduck.integration.blackduck.service.model.ComponentVersionVulnerabilities; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import com.synopsys.integration.bdio.SimpleBdioFactory; -import com.synopsys.integration.bdio.model.externalid.ExternalId; -import com.synopsys.integration.bdio.model.externalid.ExternalIdFactory; -import com.synopsys.integration.blackduck.api.generated.response.ComponentsView; -import com.synopsys.integration.blackduck.api.generated.view.ComponentVersionView; -import com.synopsys.integration.blackduck.api.generated.view.VulnerabilityView; -import com.blackduck.integration.blackduck.http.client.IntHttpClientTestHelper; -import com.blackduck.integration.blackduck.service.BlackDuckServicesFactory; -import com.blackduck.integration.blackduck.service.model.ComponentVersionVulnerabilities; +import java.util.List; +import java.util.Optional; + +import static org.junit.jupiter.api.Assertions.*; @Tag("integration") @ExtendWith(TimingExtension.class) diff --git a/src/test/java/com/blackduck/integration/blackduck/service/model/ProjectSyncModelTest.java b/src/test/java/com/blackduck/integration/blackduck/service/model/ProjectSyncModelTest.java index 6b2c4c575..c7acdb3f3 100644 --- a/src/test/java/com/blackduck/integration/blackduck/service/model/ProjectSyncModelTest.java +++ b/src/test/java/com/blackduck/integration/blackduck/service/model/ProjectSyncModelTest.java @@ -1,29 +1,19 @@ package com.blackduck.integration.blackduck.service.model; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertTrue; +import com.blackduck.integration.blackduck.api.generated.enumeration.ProjectCloneCategoriesType; +import com.blackduck.integration.blackduck.api.generated.enumeration.ProjectVersionDistributionType; +import com.blackduck.integration.blackduck.api.manual.temporary.component.ProjectRequest; +import com.blackduck.integration.blackduck.api.manual.temporary.component.ProjectVersionRequest; +import com.blackduck.integration.blackduck.api.manual.temporary.enumeration.ProjectVersionPhaseType; +import com.blackduck.integration.blackduck.api.manual.view.ProjectView; +import org.junit.jupiter.api.Test; import java.lang.reflect.Field; import java.lang.reflect.Modifier; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; +import java.util.*; import java.util.stream.Collectors; -import com.blackduck.integration.blackduck.service.model.ProjectSyncModel; -import org.junit.jupiter.api.Test; - -import com.synopsys.integration.blackduck.api.generated.enumeration.ProjectVersionDistributionType; -import com.synopsys.integration.blackduck.api.generated.enumeration.ProjectCloneCategoriesType; -import com.synopsys.integration.blackduck.api.manual.view.ProjectView; -import com.synopsys.integration.blackduck.api.manual.temporary.component.ProjectRequest; -import com.synopsys.integration.blackduck.api.manual.temporary.component.ProjectVersionRequest; -import com.synopsys.integration.blackduck.api.manual.temporary.enumeration.ProjectVersionPhaseType; +import static org.junit.jupiter.api.Assertions.*; public class ProjectSyncModelTest { @Test diff --git a/src/test/java/com/blackduck/integration/blackduck/useragent/BlackDuckCommonTest.java b/src/test/java/com/blackduck/integration/blackduck/useragent/BlackDuckCommonTest.java index 8640113bb..2fd69a4a7 100644 --- a/src/test/java/com/blackduck/integration/blackduck/useragent/BlackDuckCommonTest.java +++ b/src/test/java/com/blackduck/integration/blackduck/useragent/BlackDuckCommonTest.java @@ -1,15 +1,13 @@ package com.blackduck.integration.blackduck.useragent; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; +import org.junit.jupiter.api.Test; import java.util.Map; import java.util.function.Function; import java.util.stream.Collectors; -import com.blackduck.integration.blackduck.useragent.BlackDuckCommon; -import com.blackduck.integration.blackduck.useragent.UserAgentItem; -import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; public class BlackDuckCommonTest { @Test diff --git a/src/test/java/com/blackduck/integration/blackduck/util/ProjectNameVersionGuesserTest.java b/src/test/java/com/blackduck/integration/blackduck/util/ProjectNameVersionGuesserTest.java index 231f4e0e6..f93c6ef95 100644 --- a/src/test/java/com/blackduck/integration/blackduck/util/ProjectNameVersionGuesserTest.java +++ b/src/test/java/com/blackduck/integration/blackduck/util/ProjectNameVersionGuesserTest.java @@ -1,13 +1,12 @@ package com.blackduck.integration.blackduck.util; -import static org.junit.jupiter.api.Assertions.assertEquals; - -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; - import com.blackduck.integration.blackduck.TimingExtension; import com.blackduck.integration.blackduck.service.model.ProjectNameVersionGuess; import com.blackduck.integration.blackduck.service.model.ProjectNameVersionGuesser; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; + +import static org.junit.jupiter.api.Assertions.assertEquals; @ExtendWith(TimingExtension.class) public class ProjectNameVersionGuesserTest { diff --git a/src/test/java/com/blackduck/integration/blackduck/version/BlackDuckVersionTest.java b/src/test/java/com/blackduck/integration/blackduck/version/BlackDuckVersionTest.java index 6a8e0841b..d0dcf1f6e 100644 --- a/src/test/java/com/blackduck/integration/blackduck/version/BlackDuckVersionTest.java +++ b/src/test/java/com/blackduck/integration/blackduck/version/BlackDuckVersionTest.java @@ -1,12 +1,10 @@ package com.blackduck.integration.blackduck.version; +import org.junit.jupiter.api.Test; + import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; -import com.blackduck.integration.blackduck.version.BlackDuckVersion; - -import org.junit.jupiter.api.Test; - public class BlackDuckVersionTest { @Test diff --git a/src/test/resources/bdio/alert/blackduck_alert_6_1_0_SNAPSHOT_com_synopsys_integration_blackduck_alert_6_1_0_SNAPSHOT_gradle_bom.jsonld b/src/test/resources/bdio/alert/blackduck_alert_6_1_0_SNAPSHOT_com_blackduck_integration_blackduck_alert_6_1_0_SNAPSHOT_gradle_bom.jsonld similarity index 100% rename from src/test/resources/bdio/alert/blackduck_alert_6_1_0_SNAPSHOT_com_synopsys_integration_blackduck_alert_6_1_0_SNAPSHOT_gradle_bom.jsonld rename to src/test/resources/bdio/alert/blackduck_alert_6_1_0_SNAPSHOT_com_blackduck_integration_blackduck_alert_6_1_0_SNAPSHOT_gradle_bom.jsonld From 422dcb238bd9a332c8545bf12d19add6b3e4e6a5 Mon Sep 17 00:00:00 2001 From: devmehtasynopsys Date: Fri, 13 Sep 2024 15:37:08 -0400 Subject: [PATCH 5/7] Update test failures --- .../blackduck/comprehensive/ProjectBomServiceTestIT.java | 6 +++--- .../blackduck/service/BlackDuckApiClientTestIT.java | 2 +- .../blackduck/service/dataservice/IssueServiceTestIT.java | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/test/java/com/blackduck/integration/blackduck/comprehensive/ProjectBomServiceTestIT.java b/src/test/java/com/blackduck/integration/blackduck/comprehensive/ProjectBomServiceTestIT.java index 4f5b9aa73..eed59df3f 100644 --- a/src/test/java/com/blackduck/integration/blackduck/comprehensive/ProjectBomServiceTestIT.java +++ b/src/test/java/com/blackduck/integration/blackduck/comprehensive/ProjectBomServiceTestIT.java @@ -61,7 +61,7 @@ public void testAddingComponentToBom() throws Exception { List bomComponents = projectBomService.getComponentsForProjectVersion(projectVersionWrapper.getProjectVersionView()); assertEquals(0, bomComponents.size()); - ExternalId externalId = new ExternalIdFactory().createMavenExternalId("com.blackduck.integration", "blackduck-common", "47.0.0"); + ExternalId externalId = new ExternalIdFactory().createMavenExternalId("com.blackducksoftware.integration", "blackduck-common", "45.0.7"); projectBomService.addComponentToProjectVersion(externalId, projectVersionWrapper.getProjectVersionView()); bomComponents = projectBomService.getComponentsForProjectVersion(projectVersionWrapper.getProjectVersionView()); @@ -127,9 +127,9 @@ public void testGetActivePoliciesForVersion() throws Exception { String projectName = "get_active_policies_test"; String projectVersionName = "1.0.0"; String testPolicyName = "testPolicy"; - String componentGroup = "com.blackduck.integration"; + String componentGroup = "com.blackducksoftware.integration"; String componentName = "blackduck-common"; - String componentVersion = "47.0.0"; + String componentVersion = "45.0.7"; ExternalId componentExternalId = externalIdFactory.createMavenExternalId(componentGroup, componentName, componentVersion); // delete the project, if it exists diff --git a/src/test/java/com/blackduck/integration/blackduck/service/BlackDuckApiClientTestIT.java b/src/test/java/com/blackduck/integration/blackduck/service/BlackDuckApiClientTestIT.java index ffe9c27e3..c47a991ff 100644 --- a/src/test/java/com/blackduck/integration/blackduck/service/BlackDuckApiClientTestIT.java +++ b/src/test/java/com/blackduck/integration/blackduck/service/BlackDuckApiClientTestIT.java @@ -78,7 +78,7 @@ public void testMediaType() throws IntegrationException { BlackDuckSingleRequest requestSingle = new BlackDuckSingleRequest<>(blackDuckRequestBuilder, projectViewUrlSingleResponse, new PagingDefaultsEditor(), new AcceptHeaderEditor(blackDuckMediaTypeDiscoveryVerifier)); ProjectView retrievedById = blackDuckApiClient.getResponse(requestSingle); assertEquals(null, blackDuckMediaTypeDiscoveryVerifier.originalMediaType); - assertEquals("application/vnd.blackducksoftware.project-detail-6+json", blackDuckMediaTypeDiscoveryVerifier.discoveredMediaType); + assertEquals("application/vnd.blackducksoftware.project-detail-7+json", blackDuckMediaTypeDiscoveryVerifier.discoveredMediaType); } private class BlackDuckMediaTypeDiscoveryVerifier extends BlackDuckMediaTypeDiscovery { diff --git a/src/test/java/com/blackduck/integration/blackduck/service/dataservice/IssueServiceTestIT.java b/src/test/java/com/blackduck/integration/blackduck/service/dataservice/IssueServiceTestIT.java index a1a4d982b..d294944f3 100644 --- a/src/test/java/com/blackduck/integration/blackduck/service/dataservice/IssueServiceTestIT.java +++ b/src/test/java/com/blackduck/integration/blackduck/service/dataservice/IssueServiceTestIT.java @@ -73,7 +73,7 @@ public void addingAndRetrievingIssues() throws IntegrationException { project = projectVersionWrapper.getProjectView(); // add some components to the BOM - ExternalId blackDuckCommon = externalIdFactory.createMavenExternalId("com.blackduck.integration", "blackduck-common", "50.0.0"); + ExternalId blackDuckCommon = externalIdFactory.createMavenExternalId("com.blackducksoftware.integration", "blackduck-common", "45.0.7"); ExternalId apacheFileUpload = externalIdFactory.createMavenExternalId("commons-fileupload", "commons-fileupload"); projectBomService.addComponentToProjectVersion(blackDuckCommon, projectVersionWrapper.getProjectVersionView()); projectBomService.addComponentToProjectVersion(apacheFileUpload, projectVersionWrapper.getProjectVersionView()); From dee44e20d36e76ed8e0eb85edf52f7dbc24d8b96 Mon Sep 17 00:00:00 2001 From: devmehtasynopsys Date: Tue, 17 Sep 2024 10:52:08 -0400 Subject: [PATCH 6/7] Delete version file --- .../resources/com/synopsys/integration/blackduck/version.txt | 1 - 1 file changed, 1 deletion(-) delete mode 100644 src/main/resources/com/synopsys/integration/blackduck/version.txt diff --git a/src/main/resources/com/synopsys/integration/blackduck/version.txt b/src/main/resources/com/synopsys/integration/blackduck/version.txt deleted file mode 100644 index 8f4b090df..000000000 --- a/src/main/resources/com/synopsys/integration/blackduck/version.txt +++ /dev/null @@ -1 +0,0 @@ -66.2.32-SNAPSHOT \ No newline at end of file From 31f9d84b0104a146b39272fb268ab1f0cda1280a Mon Sep 17 00:00:00 2001 From: devmehtasynopsys Date: Tue, 17 Sep 2024 10:54:33 -0400 Subject: [PATCH 7/7] Update test --- .../blackduck/comprehensive/NotificationsTestIT.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/com/blackduck/integration/blackduck/comprehensive/NotificationsTestIT.java b/src/test/java/com/blackduck/integration/blackduck/comprehensive/NotificationsTestIT.java index 16a1bb692..2ac580f87 100644 --- a/src/test/java/com/blackduck/integration/blackduck/comprehensive/NotificationsTestIT.java +++ b/src/test/java/com/blackduck/integration/blackduck/comprehensive/NotificationsTestIT.java @@ -70,7 +70,7 @@ public void testProjectNotifications() throws IntegrationException, InterruptedE NotificationEditor notificationEditor = new NotificationEditor(startDate, endDate, notificationTypes); List notifications = notificationService.getAllUserNotifications(currentUser, notificationEditor); for (NotificationUserView notificationUserView : notifications) { - if (notificationUserView instanceof ProjectNotificationUserView) { + if (notificationUserView instanceof ProjectVersionNotificationUserView) { ProjectVersionNotificationContent content = ((ProjectVersionNotificationUserView) notificationUserView).getContent(); if (projectName.equals(content.getProjectName())) { foundKeys.add(content.getOperationType() + content.getProjectVersionName());