Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

drop rxjava and completableFuture api #24326

Merged
merged 8 commits into from
Sep 27, 2021
Merged

drop rxjava and completableFuture api #24326

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5729c27
drop rxjava and completableFuture api
yiliuTo Sep 26, 2021
4951d8c
add sync api for operation class
yiliuTo Sep 26, 2021
4022dd5
fix javadoc error
yiliuTo Sep 26, 2021
f5ae1c3
Merge branch 'feature/azure-spring-cloud-4.0' of https://github.com/A…
yiliuTo Sep 27, 2021
09bebb8
update method name for logging
yiliuTo Sep 27, 2021
f852ebf
move provisioner from autoconfigure to messaging modules
yiliuTo Sep 27, 2021
fc6499e
rename package path
yiliuTo Sep 27, 2021
a277b81
move default provisioner to arm package
yiliuTo Sep 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions ...main/java/com/azure/spring/cloud/autoconfigure/eventhub/resourcemanager/package-info.java
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions ...ng/cloud/autoconfigure/resourcemanager/AzureEventHubResourceManagerAutoConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@

import com.azure.resourcemanager.AzureResourceManager;
import com.azure.spring.cloud.autoconfigure.eventhub.AzureEventHubProperties;
import com.azure.spring.cloud.autoconfigure.eventhub.resourcemanager.DefaultEventHubProvisioner;
import com.azure.spring.eventhubs.resourcemanager.DefaultEventHubProvisioner;
import com.azure.spring.cloud.resourcemanager.connectionstring.EventHubArmConnectionStringProvider;
import com.azure.spring.eventhubs.core.EventHubProvisioner;
import com.azure.spring.eventhubs.resourcemanager.EventHubProvisioner;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
Expand Down
8 changes: 4 additions & 4 deletions .../cloud/autoconfigure/resourcemanager/AzureServiceBusResourceManagerAutoConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@

import com.azure.resourcemanager.AzureResourceManager;
import com.azure.spring.cloud.autoconfigure.servicebus.AzureServiceBusProperties;
import com.azure.spring.cloud.autoconfigure.servicebus.resourcemanager.DefaultServiceBusQueueProvisioner;
import com.azure.spring.cloud.autoconfigure.servicebus.resourcemanager.DefaultServiceBusTopicProvisioner;
import com.azure.spring.servicebus.resourcemanager.DefaultServiceBusQueueProvisioner;
import com.azure.spring.servicebus.resourcemanager.DefaultServiceBusTopicProvisioner;
import com.azure.spring.cloud.resourcemanager.connectionstring.ServiceBusArmConnectionStringProvider;
import com.azure.spring.servicebus.core.ServiceBusQueueProvisioner;
import com.azure.spring.servicebus.core.ServiceBusTopicProvisioner;
import com.azure.spring.servicebus.resourcemanager.ServiceBusQueueProvisioner;
import com.azure.spring.servicebus.resourcemanager.ServiceBusTopicProvisioner;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
Expand Down
2 changes: 1 addition & 1 deletion ...spring/cloud/autoconfigure/servicebus/AzureServiceBusQueueOperationAutoConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import com.azure.messaging.servicebus.ServiceBusClientBuilder;
import com.azure.spring.servicebus.core.DefaultServiceBusQueueClientFactory;
import com.azure.spring.servicebus.core.ServiceBusQueueClientFactory;
import com.azure.spring.servicebus.core.ServiceBusQueueProvisioner;
import com.azure.spring.servicebus.resourcemanager.ServiceBusQueueProvisioner;
import com.azure.spring.servicebus.core.queue.ServiceBusQueueOperation;
import com.azure.spring.servicebus.core.queue.ServiceBusQueueTemplate;
import com.azure.spring.servicebus.support.converter.ServiceBusMessageConverter;
Expand Down
2 changes: 1 addition & 1 deletion ...spring/cloud/autoconfigure/servicebus/AzureServiceBusTopicOperationAutoConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import com.azure.messaging.servicebus.ServiceBusClientBuilder;
import com.azure.spring.servicebus.core.DefaultServiceBusTopicClientFactory;
import com.azure.spring.servicebus.core.ServiceBusTopicClientFactory;
import com.azure.spring.servicebus.core.ServiceBusTopicProvisioner;
import com.azure.spring.servicebus.resourcemanager.ServiceBusTopicProvisioner;
import com.azure.spring.servicebus.core.topic.ServiceBusTopicOperation;
import com.azure.spring.servicebus.core.topic.ServiceBusTopicTemplate;
import com.azure.spring.servicebus.support.converter.ServiceBusMessageConverter;
Expand Down
7 changes: 0 additions & 7 deletions ...in/java/com/azure/spring/cloud/autoconfigure/servicebus/resourcemanager/package-info.java
View file
Open in desktop

This file was deleted.

7 changes: 6 additions & 1 deletion sdk/spring/azure-spring-eventhubs/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,12 @@
<artifactId>azure-messaging-eventhubs</artifactId>
<version>5.10.1</version> <!-- {x-version-update;com.azure:azure-messaging-eventhubs;dependency} -->
</dependency>

<dependency>
<groupId>com.azure.spring</groupId>
<artifactId>azure-spring-cloud-resourcemanager</artifactId>
<version>4.0.0-beta.1</version> <!-- {x-version-update;com.azure.spring:azure-spring-cloud-resourcemanager;current} -->
<optional>true</optional>
</dependency>
<!-- Contains Azure Storage Blobs checkpoint store when using EventProcessorClient -->
<dependency>
<groupId>com.azure</groupId>
Expand Down
4 changes: 2 additions & 2 deletions ...ure-spring-eventhubs/src/main/java/com/azure/spring/eventhubs/core/EventHubOperation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@

import com.azure.spring.eventhubs.support.StartPosition;
import com.azure.spring.messaging.core.SubscribeByGroupOperation;
import com.azure.spring.messaging.core.reactor.BatchSendOperation;
import com.azure.spring.messaging.core.reactor.SendOperation;
import com.azure.spring.messaging.core.BatchSendOperation;
import com.azure.spring.messaging.core.SendOperation;

/**
* Azure event hub operation to support send data asynchronously and subscribe
Expand Down
4 changes: 2 additions & 2 deletions ...ure-spring-eventhubs/src/main/java/com/azure/spring/eventhubs/core/EventHubProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
import com.azure.spring.messaging.AzureHeaders;
import com.azure.spring.messaging.checkpoint.CheckpointConfig;
import com.azure.spring.messaging.checkpoint.CheckpointMode;
import com.azure.spring.messaging.checkpoint.reactor.AzureCheckpointer;
import com.azure.spring.messaging.checkpoint.reactor.Checkpointer;
import com.azure.spring.messaging.checkpoint.AzureCheckpointer;
import com.azure.spring.messaging.checkpoint.Checkpointer;
import com.azure.spring.eventhubs.checkpoint.CheckpointManager;
import com.azure.spring.eventhubs.support.converter.EventHubMessageConverter;
import org.slf4j.Logger;
Expand Down
4 changes: 2 additions & 2 deletions ...ing-eventhubs/src/main/java/com/azure/spring/eventhubs/core/EventHubProcessorSupport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
import com.azure.spring.messaging.AzureHeaders;
import com.azure.spring.messaging.checkpoint.CheckpointConfig;
import com.azure.spring.messaging.checkpoint.CheckpointMode;
import com.azure.spring.messaging.checkpoint.reactor.AzureCheckpointer;
import com.azure.spring.messaging.checkpoint.reactor.Checkpointer;
import com.azure.spring.messaging.checkpoint.AzureCheckpointer;
import com.azure.spring.messaging.checkpoint.Checkpointer;
import com.azure.spring.eventhubs.support.converter.EventHubMessageConverter;
import org.springframework.messaging.Message;
import org.springframework.messaging.MessageHeaders;
Expand Down
18 changes: 0 additions & 18 deletions ...e-spring-eventhubs/src/main/java/com/azure/spring/eventhubs/core/EventHubRxOperation.java
View file
Open in desktop

This file was deleted.

63 changes: 0 additions & 63 deletions ...re-spring-eventhubs/src/main/java/com/azure/spring/eventhubs/core/EventHubRxTemplate.java
View file
Open in desktop

This file was deleted.

4 changes: 1 addition & 3 deletions ...cemanager/DefaultEventHubProvisioner.java → ...cemanager/DefaultEventHubProvisioner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.

package com.azure.spring.cloud.autoconfigure.eventhub.resourcemanager;
package com.azure.spring.eventhubs.resourcemanager;

import com.azure.resourcemanager.AzureResourceManager;
import com.azure.spring.cloud.resourcemanager.implementation.crud.EventHubConsumerGroupCrud;
import com.azure.spring.cloud.resourcemanager.implementation.crud.EventHubCrud;
import com.azure.spring.cloud.resourcemanager.implementation.crud.EventHubNamespaceCrud;
import com.azure.spring.core.properties.resource.AzureResourceMetadata;
import com.azure.spring.eventhubs.core.EventHubProvisioner;
import reactor.util.function.Tuple2;
import reactor.util.function.Tuples;

/**
Expand Down
2 changes: 1 addition & 1 deletion ...g/eventhubs/core/EventHubProvisioner.java → .../resourcemanager/EventHubProvisioner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.

package com.azure.spring.eventhubs.core;
package com.azure.spring.eventhubs.resourcemanager;

/**
* An interface to provision Event Hubs resources.
Expand Down
7 changes: 7 additions & 0 deletions ...ring-eventhubs/src/main/java/com/azure/spring/eventhubs/resourcemanager/package-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.

/**
* Package com.azure.spring.eventhubs.resourcemanager
*/
package com.azure.spring.eventhubs.resourcemanager;
62 changes: 0 additions & 62 deletions ...g-eventhubs/src/main/java/com/azure/spring/eventhubs/support/RxEventHubTestOperation.java
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions ...ubs/src/test/java/com/azure/spring/eventhubs/core/EventHubOperationSendSubscribeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
import com.azure.spring.messaging.AzureHeaders;
import com.azure.spring.messaging.checkpoint.CheckpointConfig;
import com.azure.spring.messaging.checkpoint.CheckpointMode;
import com.azure.spring.messaging.checkpoint.reactor.Checkpointer;
import com.azure.spring.messaging.core.reactor.SendSubscribeByGroupOperationTest;
import com.azure.spring.messaging.checkpoint.Checkpointer;
import com.azure.spring.messaging.core.SendSubscribeByGroupOperationTest;
import com.azure.spring.messaging.support.pojo.User;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
Expand Down
96 changes: 0 additions & 96 deletions ...s/src/test/java/com/azure/spring/eventhubs/core/EventHubRxOperationSendSubscribeTest.java
View file
Open in desktop

This file was deleted.

Loading