diff --git a/pom.xml b/pom.xml index 579ee71ba1f15dac6a06189d26f40c87cb39e124..56c7f4edccbc350debd01a304492c913aba81f0c 100644 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,7 @@ org.opengroup.osdu core-lib-azure jar - 0.13.0-SNAPSHOT + 0.13.1-SNAPSHOT core-lib-azure diff --git a/src/main/java/org/opengroup/osdu/azure/publisherFacade/EventGridPublisher.java b/src/main/java/org/opengroup/osdu/azure/publisherFacade/EventGridPublisher.java index 7af94b3a2474fab5ea49892c282d5aa3227c2e48..4b4b567f7ff277132fb760308fd939c3e0edc642 100644 --- a/src/main/java/org/opengroup/osdu/azure/publisherFacade/EventGridPublisher.java +++ b/src/main/java/org/opengroup/osdu/azure/publisherFacade/EventGridPublisher.java @@ -39,8 +39,6 @@ public class EventGridPublisher { private static final Logger LOGGER = LoggerFactory.getLogger(EventGridPublisher.class); @Autowired private EventGridTopicStore eventGridTopicStore; - @Autowired - private PubSubAttributesBuilder pubSubAttributesBuilder; /** * @param publisherInfo Contains Event grid batch and publishing details diff --git a/src/main/java/org/opengroup/osdu/azure/publisherFacade/ServiceBusPublisher.java b/src/main/java/org/opengroup/osdu/azure/publisherFacade/ServiceBusPublisher.java index 133cea69f00f99038844a7002ae1cd6e6deb7dd6..af05eb6a87e5f67a0419af444120b26dba20fe5e 100644 --- a/src/main/java/org/opengroup/osdu/azure/publisherFacade/ServiceBusPublisher.java +++ b/src/main/java/org/opengroup/osdu/azure/publisherFacade/ServiceBusPublisher.java @@ -39,10 +39,6 @@ public class ServiceBusPublisher { private static final Logger LOGGER = LoggerFactory.getLogger(ServiceBusPublisher.class); @Autowired private ITopicClientFactory topicClientFactory; - @Autowired - private PubsubConfiguration pubsubConfiguration; - @Autowired - private PubSubAttributesBuilder pubSubAttributesBuilder; /** * @param publisherInfo Contains Service bus batch and publishing details diff --git a/src/test/java/org/opengroup/osdu/azure/publisherFacade/EventGridPublisherTest.java b/src/test/java/org/opengroup/osdu/azure/publisherFacade/EventGridPublisherTest.java index ad1046a9eadc9f3006345bdf01f67f9460de77d8..b96c4eb021a8735191fb196edb1d034e65b5cc7c 100644 --- a/src/test/java/org/opengroup/osdu/azure/publisherFacade/EventGridPublisherTest.java +++ b/src/test/java/org/opengroup/osdu/azure/publisherFacade/EventGridPublisherTest.java @@ -53,8 +53,6 @@ public class EventGridPublisherTest { private JaxRsDpsLog logger; @Mock private EventGridTopicStore eventGridTopicStore; - @Mock - private PubSubAttributesBuilder pubSubAttributesBuilder; @InjectMocks private EventGridPublisher sut; @@ -69,7 +67,6 @@ public class EventGridPublisherTest { Mockito.lenient().doReturn(CORRELATION_ID).when(dpsHeaders).getCorrelationId(); Mockito.lenient().doReturn(EVENT_GRID_TOPIC_NAME).when(publisherInfo).getEventGridTopicName(); Mockito.lenient().doReturn(batch).when(publisherInfo).getBatch(); - Mockito.lenient().doReturn(dpsHeaders.getHeaders()).when(pubSubAttributesBuilder).createAttributesMap(); } @Test diff --git a/src/test/java/org/opengroup/osdu/azure/publisherFacade/ServiceBusPublisherTest.java b/src/test/java/org/opengroup/osdu/azure/publisherFacade/ServiceBusPublisherTest.java index 09305790584fc4b73a318f71f10a10404fc77ed9..a2771be1c8cba6a671ca1ddb102836614e3f4177 100644 --- a/src/test/java/org/opengroup/osdu/azure/publisherFacade/ServiceBusPublisherTest.java +++ b/src/test/java/org/opengroup/osdu/azure/publisherFacade/ServiceBusPublisherTest.java @@ -51,8 +51,6 @@ public class ServiceBusPublisherTest { private TopicClientFactoryImpl topicClientFactory; @Mock private PublisherInfo publisherInfo; - @Mock - private PubSubAttributesBuilder pubSubAttributesBuilder; @InjectMocks private ServiceBusPublisher sut; @@ -65,7 +63,6 @@ public class ServiceBusPublisherTest { lenient().doReturn(CORRELATION_ID).when(dpsHeaders).getCorrelationId(); lenient().doReturn(SERVICE_BUS_TOPIC_NAME).when(publisherInfo).getServiceBusTopicName(); lenient().doReturn(batch).when(publisherInfo).getBatch(); - lenient().doReturn(dpsHeaders.getHeaders()).when(pubSubAttributesBuilder).createAttributesMap(); lenient().doReturn(topicClient).when(topicClientFactory).getClient(any(), any()); }