diff --git a/build.gradle b/build.gradle index 03d6391e5..42f516f8a 100644 --- a/build.gradle +++ b/build.gradle @@ -10,7 +10,6 @@ buildscript { dependencies { classpath "com.synopsys.integration:common-gradle-plugin:${managedCgpVersion}" } } - project.ext.moduleName = 'com.synopsys.integration.blackduck-common' project.ext.javaUseAutoModuleName = 'true' project.ext.junitShowStandardStreams = 'true' @@ -26,17 +25,20 @@ versionFile.mkdirs() versionFile.delete() versionFile << version +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/" } } dependencies { api 'com.synopsys.integration:blackduck-common-api:2023.4.2.5' - api 'com.synopsys.integration:phone-home-client:5.1.13' + api 'com.synopsys.integration:phone-home-client:6.0.0-SNAPSHOT' api 'com.synopsys.integration:integration-bdio:26.0.13' api 'com.blackducksoftware.bdio:bdio2:3.2.5' - testImplementation 'com.google.guava:guava:31.1-jre' testImplementation 'org.hamcrest:hamcrest-core:2.2' @@ -47,4 +49,4 @@ dependencies { testImplementation 'org.mock-server:mockserver-netty:5.15.0' testRuntimeOnly 'org.slf4j:slf4j-simple:2.0.7' -} \ No newline at end of file +} diff --git a/src/main/java/com/synopsys/integration/blackduck/phonehome/BlackDuckPhoneHomeHelper.java b/src/main/java/com/synopsys/integration/blackduck/phonehome/BlackDuckPhoneHomeHelper.java index 4fd4936b7..3baa73d67 100644 --- a/src/main/java/com/synopsys/integration/blackduck/phonehome/BlackDuckPhoneHomeHelper.java +++ b/src/main/java/com/synopsys/integration/blackduck/phonehome/BlackDuckPhoneHomeHelper.java @@ -23,7 +23,6 @@ import com.synopsys.integration.phonehome.PhoneHomeClient; import com.synopsys.integration.phonehome.PhoneHomeResponse; import com.synopsys.integration.phonehome.PhoneHomeService; -import com.synopsys.integration.phonehome.google.analytics.GoogleAnalyticsConstants; import com.synopsys.integration.phonehome.request.PhoneHomeRequestBody; import com.synopsys.integration.phonehome.request.PhoneHomeRequestBodyBuilder; import com.synopsys.integration.util.IntEnvironmentVariables; @@ -35,15 +34,11 @@ public class BlackDuckPhoneHomeHelper { private final BlackDuckRegistrationService blackDuckRegistrationService; private final IntEnvironmentVariables intEnvironmentVariables; - public static BlackDuckPhoneHomeHelper createPhoneHomeHelper(BlackDuckServicesFactory blackDuckServicesFactory) { - return BlackDuckPhoneHomeHelper.createAsynchronousPhoneHomeHelper(blackDuckServicesFactory, new NoThreadExecutorService()); + public static BlackDuckPhoneHomeHelper createPhoneHomeHelper(BlackDuckServicesFactory blackDuckServicesFactory, String apiSecret, String measurementId) { + return BlackDuckPhoneHomeHelper.createAsynchronousPhoneHomeHelper(blackDuckServicesFactory, apiSecret, measurementId, new NoThreadExecutorService()); } - public static BlackDuckPhoneHomeHelper createAsynchronousPhoneHomeHelper(BlackDuckServicesFactory blackDuckServicesFactory, ExecutorService executorService) { - return createAsynchronousPhoneHomeHelper(blackDuckServicesFactory, executorService, GoogleAnalyticsConstants.PRODUCTION_INTEGRATIONS_TRACKING_ID); - } - - public static BlackDuckPhoneHomeHelper createAsynchronousPhoneHomeHelper(BlackDuckServicesFactory blackDuckServicesFactory, ExecutorService executorService, String trackingId) { + public static BlackDuckPhoneHomeHelper createAsynchronousPhoneHomeHelper(BlackDuckServicesFactory blackDuckServicesFactory, String apiSecret, String measurementId, ExecutorService executorService) { BlackDuckRegistrationService blackDuckRegistrationService = blackDuckServicesFactory.createBlackDuckRegistrationService(); IntLogger intLogger = blackDuckServicesFactory.getLogger(); @@ -51,19 +46,15 @@ public static BlackDuckPhoneHomeHelper createAsynchronousPhoneHomeHelper(BlackDu BlackDuckHttpClient blackDuckHttpClient = blackDuckServicesFactory.getBlackDuckHttpClient(); HttpClientBuilder httpClientBuilder = blackDuckHttpClient.getHttpClientBuilder(); Gson gson = blackDuckServicesFactory.getGson(); - PhoneHomeClient phoneHomeClient = BlackDuckPhoneHomeHelper.createPhoneHomeClient(intLogger, httpClientBuilder, gson, trackingId); + PhoneHomeClient phoneHomeClient = BlackDuckPhoneHomeHelper.createPhoneHomeClient(intLogger, httpClientBuilder, gson, apiSecret, measurementId); PhoneHomeService phoneHomeService = PhoneHomeService.createAsynchronousPhoneHomeService(intLogger, phoneHomeClient, executorService); return new BlackDuckPhoneHomeHelper(intLogger, phoneHomeService, blackDuckRegistrationService, intEnvironmentVariables); } - public static PhoneHomeClient createPhoneHomeClient(IntLogger intLogger, HttpClientBuilder httpClientBuilder, Gson gson) { - return createPhoneHomeClient(intLogger, httpClientBuilder, gson, GoogleAnalyticsConstants.PRODUCTION_INTEGRATIONS_TRACKING_ID); - } - - public static PhoneHomeClient createPhoneHomeClient(IntLogger intLogger, HttpClientBuilder httpClientBuilder, Gson gson, String trackingId) { - return new PhoneHomeClient(intLogger, httpClientBuilder, gson, trackingId); + public static PhoneHomeClient createPhoneHomeClient(IntLogger intLogger, HttpClientBuilder httpClientBuilder, Gson gson, String apiSecret, String measurementId) { + return new PhoneHomeClient(intLogger, httpClientBuilder, gson, apiSecret, measurementId); } public BlackDuckPhoneHomeHelper(IntLogger logger, PhoneHomeService phoneHomeService, BlackDuckRegistrationService blackDuckRegistrationService,