diff --git a/notification-core/src/main/java/org/opengroup/osdu/notification/api/PubsubEndpoint.java b/notification-core/src/main/java/org/opengroup/osdu/notification/api/PubsubEndpoint.java index a291671c2a22273d856504efe3100f0ad497c87d..edbce0c44ab6f27f5a949bd58240db67ca2ef2e0 100644 --- a/notification-core/src/main/java/org/opengroup/osdu/notification/api/PubsubEndpoint.java +++ b/notification-core/src/main/java/org/opengroup/osdu/notification/api/PubsubEndpoint.java @@ -122,7 +122,7 @@ public class PubsubEndpoint { requestHeader.put("Authorization", idToken); } - this.log.info("komakkar sending out notification to endpoint: " + pushUrl); + this.log.info("sending out notification to endpoint: " + endpoint); requestHeader.put(DpsHeaders.CONTENT_TYPE, "application/json"); requestHeader.put(DpsHeaders.CORRELATION_ID, headerAttributes.get(DpsHeaders.CORRELATION_ID)); requestHeader.put(DpsHeaders.DATA_PARTITION_ID, headerAttributes.get(DpsHeaders.DATA_PARTITION_ID)); diff --git a/testing/notification-test-core/src/main/java/org/opengroup/osdu/notification/api/PubsubEndpointHMACTests.java b/testing/notification-test-core/src/main/java/org/opengroup/osdu/notification/api/PubsubEndpointHMACTests.java index dd88efd1a06503aa7fa6fdb62c2ffdb3f2a39f72..71e87539c3d9dd88ca597ccb7d0f5cc2a35cb70a 100644 --- a/testing/notification-test-core/src/main/java/org/opengroup/osdu/notification/api/PubsubEndpointHMACTests.java +++ b/testing/notification-test-core/src/main/java/org/opengroup/osdu/notification/api/PubsubEndpointHMACTests.java @@ -92,7 +92,6 @@ public abstract class PubsubEndpointHMACTests extends BaseTestTemplate { subscription.setSecret(secret); - System.out.println(subscription.toString()); try { Subscription subscriptionCreated = subscriptionService.create(subscription); notificationId = subscriptionCreated.getNotificationId(); diff --git a/testing/notification-test-core/src/main/java/org/opengroup/osdu/notification/util/Config.java b/testing/notification-test-core/src/main/java/org/opengroup/osdu/notification/util/Config.java index b09565335413e2c0ac69be1e1ae11fca02e14957..3a9c5544b783a3ea0e44d981b3afe213a07a5e3e 100644 --- a/testing/notification-test-core/src/main/java/org/opengroup/osdu/notification/util/Config.java +++ b/testing/notification-test-core/src/main/java/org/opengroup/osdu/notification/util/Config.java @@ -36,7 +36,7 @@ public class Config { config.ClientTenant = getEnvironmentVariableOrDefaultValue("CLIENT_TENANT","nonexistenttenant"); config.IntegrationAudience = getEnvironmentVariableOrDefaultValue("INTEGRATION_TEST_AUDIENCE","245464679631-ktfdfpl147m1mjpbutl00b3cmffissgq.apps.googleusercontent.com"); config.OsduTenant = getEnvironmentVariableOrDefaultValue("OSDU_TENANT","opendes"); - config.Topic = getEnvironmentVariableOrDefaultValue("TOPIC_ID","osdu-mvp-idcmvpd-i2or-grid-recordstopic"); + config.Topic = getEnvironmentVariableOrDefaultValue("TOPIC_ID","records-changed"); config.hmacSecretValue = System.getProperty("HMAC_SECRET", System.getenv("HMAC_SECRET")); if (env.equalsIgnoreCase("LOCAL")) { @@ -54,7 +54,7 @@ public class Config { config.HostUrl = System.getProperty("NOTIFICATION_BASE_URL", System.getenv("NOTIFICATION_BASE_URL")); config.GSAPushUrl = registerUrl+"/test/gsa-challenge/"; //Adding this so CPs can point to custom HMAC push endpoints - config.HMACPushUrl = getEnvironmentVariableOrDefaultValue("REGISTER_CUSTOM_PUSH_URL_HMAC",registerUrl+"/test/challenge/1"); + config.HMACPushUrl = getEnvironmentVariableOrDefaultValue("REGISTER_CUSTOM_PUSH_URL_HMAC",registerUrl+"/test/challenge/"); //Adding a new variable NOTIFICATION_REGISTER_BASE_URL since REGISTER_BASE_URL is used by Register integration tests which needs a trailing \ String regUrl= getEnvironmentVariable("NOTIFICATION_REGISTER_BASE_URL"); if(regUrl==null)