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

Move the classes that need to be hidden to the implementation package #27281

Merged
merged 24 commits into from
Feb 24, 2022
Merged

Move the classes that need to be hidden to the implementation package #27281

Show file tree
Hide file tree
Changes from 21 commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
3a5dcf0
Add servicebus binder migration guide.
hui-00 Nov 18, 2021
a013b68
Merge branch 4.0
hui-00 Nov 19, 2021
29b3159
Merge branch 'feature/azure-spring-cloud-4.0' of github.com:Azure/azu…
hui-00 Nov 19, 2021
a931329
Merge branch 'feature/azure-spring-cloud-4.0' of github.com:Azure/azu…
hui-00 Nov 20, 2021
d964e9a
Merge branch 'feature/azure-spring-cloud-4.0' of github.com:Azure/azu…
hui-00 Nov 22, 2021
d5190e2
Merge branch 'feature/azure-spring-cloud-4.0' of github.com:Azure/azu…
hui-00 Nov 22, 2021
dbc3d23
Merge branch 'feature/azure-spring-cloud-4.0' of github.com:Azure/azu…
hui-00 Nov 23, 2021
9580d77
Merge branch 'feature/azure-spring-cloud-4.0' of github.com:Azure/azu…
hui-00 Nov 25, 2021
b39a183
Merge branch 'feature/azure-spring-cloud-4.0' of github.com:Azure/azu…
hui-00 Nov 26, 2021
629b6a0
Merge branch 'feature/azure-spring-cloud-4.0' of github.com:Azure/azu…
hui-00 Dec 1, 2021
d532a27
Merge branch 'feature/azure-spring-cloud-4.0' of github.com:Azure/azu…
hui-00 Dec 14, 2021
5734313
Merge branch 'feature/azure-spring-cloud-4.0' of github.com:Azure/azu…
hui-00 Dec 16, 2021
36e554e
Merge branch 'feature/azure-spring-cloud-4.0' of github.com:Azure/azu…
hui-00 Dec 17, 2021
93f8d32
Merge branch 'feature/azure-spring-cloud-4.0' of github.com:Azure/azu…
hui-00 Dec 21, 2021
2d287f0
Merge branch 'feature/azure-spring-cloud-4.0' of github.com:Azure/azu…
hui-00 Dec 21, 2021
0353ed5
Merge branch 'feature/azure-spring-cloud-4.0' of github.com:Azure/azu…
hui-00 Dec 23, 2021
b85bee1
Merge branch 'feature/azure-spring-cloud-4.0' of github.com:Azure/azu…
hui-00 Dec 24, 2021
730fb8c
Merge branch 'feature/azure-spring-cloud-4.0' of github.com:Azure/azu…
hui-00 Dec 30, 2021
6fbd2d9
Merge branch 'feature/azure-spring-cloud-4.0' of github.com:Azure/azu…
hui-00 Jan 26, 2022
6ea77ed
Merge branch 'feature/azure-spring-cloud-4.0' of github.com:Azure/azu…
hui-00 Feb 24, 2022
324ee1b
Move the classes that need to be hidden to the implementation package.
hui-00 Feb 24, 2022
a363a26
Update package.
hui-00 Feb 24, 2022
f302b45
Update test package.
hui-00 Feb 24, 2022
46dde64
Merge branch 'feature/azure-spring-cloud-4.0' of github.com:Azure/azu…
hui-00 Feb 24, 2022
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
8 changes: 4 additions & 4 deletions ...in/java/com/azure/spring/cloud/stream/binder/eventhubs/EventHubsMessageChannelBinder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@
import com.azure.spring.eventhubs.core.properties.ProcessorProperties;
import com.azure.spring.eventhubs.core.properties.ProducerProperties;
import com.azure.spring.integration.eventhubs.inbound.EventHubsInboundChannelAdapter;
import com.azure.spring.integration.eventhubs.inbound.health.EventHubsProcessorInstrumentation;
import com.azure.spring.integration.handler.DefaultMessageHandler;
import com.azure.spring.integration.instrumentation.DefaultInstrumentation;
import com.azure.spring.integration.instrumentation.DefaultInstrumentationManager;
import com.azure.spring.integration.eventhubs.inbound.implementation.EventHubsProcessorInstrumentation;
import com.azure.spring.integration.implementation.DefaultMessageHandler;
import com.azure.spring.integration.implementation.DefaultInstrumentation;
import com.azure.spring.integration.implementation.DefaultInstrumentationManager;
import com.azure.spring.integration.instrumentation.Instrumentation;
import com.azure.spring.integration.instrumentation.InstrumentationManager;
import com.azure.spring.integration.instrumentation.InstrumentationSendCallback;
Expand Down
2 changes: 1 addition & 1 deletion ...st/java/com/azure/spring/cloud/stream/binder/eventhubs/EventHubsHealthIndicatorTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
import com.azure.spring.eventhubs.core.EventHubsProcessorContainer;
import com.azure.spring.eventhubs.core.EventHubsTemplate;
import com.azure.spring.eventhubs.implementation.core.DefaultEventHubsNamespaceProducerFactory;
import com.azure.spring.integration.eventhubs.inbound.health.EventHubsProcessorInstrumentation;
import com.azure.spring.integration.eventhubs.inbound.implementation.EventHubsProcessorInstrumentation;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should we keep the package as implementation. health ?

import com.azure.spring.integration.instrumentation.Instrumentation;
import com.azure.spring.integration.instrumentation.InstrumentationManager;
import com.azure.spring.messaging.checkpoint.CheckpointConfig;
Expand Down
4 changes: 2 additions & 2 deletions ...ava/com/azure/spring/cloud/stream/binder/eventhubs/TestEventHubsMessageChannelBinder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
import com.azure.spring.cloud.stream.binder.eventhubs.properties.EventHubsProducerProperties;
import com.azure.spring.cloud.stream.binder.eventhubs.provisioning.EventHubsChannelProvisioner;
import com.azure.spring.integration.eventhubs.inbound.EventHubsInboundChannelAdapter;
import com.azure.spring.integration.handler.DefaultMessageHandler;
import com.azure.spring.integration.instrumentation.DefaultInstrumentation;
saragluna marked this conversation as resolved.
Show resolved Hide resolved
import com.azure.spring.integration.implementation.DefaultMessageHandler;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should we keep the package as implementation.handler?

import com.azure.spring.integration.implementation.DefaultInstrumentation;
import com.azure.spring.integration.instrumentation.Instrumentation;
import org.springframework.cloud.stream.binder.ExtendedConsumerProperties;
import org.springframework.cloud.stream.binder.ExtendedProducerProperties;
Expand Down
8 changes: 4 additions & 4 deletions .../java/com/azure/spring/cloud/stream/binder/servicebus/ServiceBusMessageChannelBinder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@
import com.azure.spring.cloud.stream.binder.servicebus.properties.ServiceBusExtendedBindingProperties;
import com.azure.spring.cloud.stream.binder.servicebus.properties.ServiceBusProducerProperties;
import com.azure.spring.cloud.stream.binder.servicebus.provisioning.ServiceBusChannelProvisioner;
import com.azure.spring.integration.handler.DefaultMessageHandler;
import com.azure.spring.integration.instrumentation.DefaultInstrumentation;
import com.azure.spring.integration.instrumentation.DefaultInstrumentationManager;
import com.azure.spring.integration.implementation.DefaultMessageHandler;
import com.azure.spring.integration.implementation.DefaultInstrumentation;
import com.azure.spring.integration.implementation.DefaultInstrumentationManager;
import com.azure.spring.integration.instrumentation.Instrumentation;
import com.azure.spring.integration.instrumentation.InstrumentationManager;
import com.azure.spring.integration.instrumentation.InstrumentationSendCallback;
import com.azure.spring.integration.servicebus.inbound.ServiceBusInboundChannelAdapter;
import com.azure.spring.integration.servicebus.inbound.health.ServiceBusProcessorInstrumentation;
import com.azure.spring.integration.servicebus.inbound.implementation.ServiceBusProcessorInstrumentation;
import com.azure.spring.messaging.ConsumerIdentifier;
import com.azure.spring.messaging.PropertiesSupplier;
import com.azure.spring.messaging.checkpoint.CheckpointConfig;
Expand Down
4 changes: 2 additions & 2 deletions .../java/com/azure/spring/cloud/stream/binder/servicebus/ServiceBusHealthIndicatorTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
import com.azure.spring.cloud.stream.binder.servicebus.properties.ServiceBusExtendedBindingProperties;
import com.azure.spring.cloud.stream.binder.servicebus.properties.ServiceBusProducerProperties;
import com.azure.spring.cloud.stream.binder.servicebus.provisioning.ServiceBusChannelProvisioner;
import com.azure.spring.integration.handler.DefaultMessageHandler;
import com.azure.spring.integration.implementation.DefaultMessageHandler;
import com.azure.spring.integration.instrumentation.Instrumentation;
import com.azure.spring.integration.servicebus.inbound.health.ServiceBusProcessorInstrumentation;
import com.azure.spring.integration.servicebus.inbound.implementation.ServiceBusProcessorInstrumentation;
import com.azure.spring.messaging.AzureHeaders;
import com.azure.spring.messaging.checkpoint.CheckpointMode;
import com.azure.spring.service.servicebus.processor.RecordMessageProcessingListener;
Expand Down
2 changes: 1 addition & 1 deletion ...a/com/azure/spring/cloud/stream/binder/servicebus/TestServiceBusMessageChannelBinder.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.spring.cloud.stream.binder.servicebus.properties.ServiceBusConsumerProperties;
import com.azure.spring.cloud.stream.binder.servicebus.properties.ServiceBusProducerProperties;
import com.azure.spring.cloud.stream.binder.servicebus.provisioning.ServiceBusChannelProvisioner;
import com.azure.spring.integration.instrumentation.DefaultInstrumentation;
import com.azure.spring.integration.implementation.DefaultInstrumentation;
import com.azure.spring.integration.instrumentation.Instrumentation;
import org.springframework.cloud.stream.binder.ExtendedConsumerProperties;
import org.springframework.cloud.stream.binder.ExtendedProducerProperties;
Expand Down
4 changes: 3 additions & 1 deletion ...strumentation/DefaultInstrumentation.java → ...mplementation/DefaultInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.

package com.azure.spring.integration.instrumentation;
package com.azure.spring.integration.implementation;

import com.azure.spring.integration.instrumentation.Instrumentation;

/**
*
Expand Down
5 changes: 4 additions & 1 deletion ...tation/DefaultInstrumentationManager.java → ...tation/DefaultInstrumentationManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.

package com.azure.spring.integration.instrumentation;
package com.azure.spring.integration.implementation;

import com.azure.spring.integration.instrumentation.Instrumentation;
import com.azure.spring.integration.instrumentation.InstrumentationManager;

import java.util.Map;
import java.util.Set;
Expand Down
2 changes: 1 addition & 1 deletion ...ration/handler/DefaultMessageHandler.java → ...implementation/DefaultMessageHandler.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.integration.handler;
package com.azure.spring.integration.implementation;

import com.azure.spring.messaging.AzureHeaders;
import com.azure.spring.messaging.AzureSendFailureException;
Expand Down
2 changes: 1 addition & 1 deletion ...ing/integration/handler/package-info.java → ...egration/implementation/package-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
/**
* Support for Spring Integration Core.
*/
package com.azure.spring.integration.handler;
package com.azure.spring.integration.implementation;
1 change: 1 addition & 0 deletions ...e-core/src/test/java/com/azure/spring/integration/handler/DefaultMessageHandlerTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

package com.azure.spring.integration.handler;

import com.azure.spring.integration.implementation.DefaultMessageHandler;
import com.azure.spring.messaging.AzureHeaders;
import com.azure.spring.messaging.PartitionSupplier;
import com.azure.spring.messaging.core.SendOperation;
Expand Down
2 changes: 1 addition & 1 deletion ...n/java/com/azure/spring/integration/eventhubs/inbound/EventHubsInboundChannelAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
import com.azure.spring.eventhubs.support.EventHubsHeaders;
import com.azure.spring.eventhubs.support.converter.EventHubsBatchMessageConverter;
import com.azure.spring.eventhubs.support.converter.EventHubsMessageConverter;
import com.azure.spring.integration.eventhubs.inbound.health.EventHubsProcessorInstrumentation;
import com.azure.spring.integration.eventhubs.inbound.implementation.EventHubsProcessorInstrumentation;
import com.azure.spring.integration.instrumentation.Instrumentation;
import com.azure.spring.integration.instrumentation.InstrumentationManager;
import com.azure.spring.messaging.AzureHeaders;
Expand Down
2 changes: 1 addition & 1 deletion ...th/EventHubsProcessorInstrumentation.java → ...on/EventHubsProcessorInstrumentation.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.integration.eventhubs.inbound.health;
package com.azure.spring.integration.eventhubs.inbound.implementation;

import com.azure.messaging.eventhubs.models.ErrorContext;
import com.azure.spring.integration.instrumentation.AbstractProcessorInstrumentation;
Expand Down
2 changes: 1 addition & 1 deletion ...venthubs/inbound/health/package-info.java → .../inbound/implementation/package-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
/**
* Event Hubs instrumentation.
*/
package com.azure.spring.integration.eventhubs.inbound.health;
package com.azure.spring.integration.eventhubs.inbound.implementation;
2 changes: 1 addition & 1 deletion ...a/com/azure/spring/integration/eventhubs/inbound/EventHubsInboundChannelAdapterTests.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.eventhubs.EventData;
import com.azure.messaging.eventhubs.models.EventBatchContext;
import com.azure.spring.eventhubs.core.EventHubsProcessorContainer;
import com.azure.spring.integration.instrumentation.DefaultInstrumentationManager;
import com.azure.spring.integration.implementation.DefaultInstrumentationManager;
import com.azure.spring.messaging.checkpoint.CheckpointConfig;
import com.azure.spring.messaging.converter.AbstractAzureMessageConverter;
import com.fasterxml.jackson.databind.ObjectMapper;
Expand Down
1 change: 1 addition & 0 deletions ...e/spring/integration/eventhubs/inbound/health/EventHubsProcessorInstrumentationTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

import com.azure.messaging.eventhubs.models.ErrorContext;
import com.azure.messaging.eventhubs.models.PartitionContext;
import com.azure.spring.integration.eventhubs.inbound.implementation.EventHubsProcessorInstrumentation;
import com.azure.spring.integration.instrumentation.AbstractProcessorInstrumentation;
import com.azure.spring.integration.instrumentation.AbstractProcessorInstrumentationTests;
import com.azure.spring.integration.instrumentation.Instrumentation;
Expand Down
2 changes: 1 addition & 1 deletion ...st/java/com/azure/spring/integration/eventhubs/outbound/EventHubsMessageHandlerTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
package com.azure.spring.integration.eventhubs.outbound;

import com.azure.spring.eventhubs.core.EventHubsTemplate;
import com.azure.spring.integration.handler.DefaultMessageHandler;
import com.azure.spring.integration.implementation.DefaultMessageHandler;
import com.azure.spring.integration.handler.DefaultMessageHandlerTests;
import com.azure.spring.messaging.PartitionSupplier;
import org.junit.jupiter.api.AfterEach;
Expand Down
2 changes: 1 addition & 1 deletion ...java/com/azure/spring/integration/servicebus/inbound/ServiceBusInboundChannelAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import com.azure.messaging.servicebus.ServiceBusReceivedMessageContext;
import com.azure.spring.integration.instrumentation.Instrumentation;
import com.azure.spring.integration.instrumentation.InstrumentationManager;
import com.azure.spring.integration.servicebus.inbound.health.ServiceBusProcessorInstrumentation;
import com.azure.spring.integration.servicebus.inbound.implementation.ServiceBusProcessorInstrumentation;
import com.azure.spring.messaging.AzureHeaders;
import com.azure.spring.messaging.ListenerMode;
import com.azure.spring.messaging.checkpoint.AzureCheckpointer;
Expand Down
2 changes: 1 addition & 1 deletion ...h/ServiceBusProcessorInstrumentation.java → ...n/ServiceBusProcessorInstrumentation.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.integration.servicebus.inbound.health;
package com.azure.spring.integration.servicebus.inbound.implementation;

import com.azure.messaging.servicebus.ServiceBusErrorContext;
import com.azure.spring.integration.instrumentation.AbstractProcessorInstrumentation;
Expand Down
2 changes: 1 addition & 1 deletion ...rvicebus/inbound/health/package-info.java → .../inbound/implementation/package-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
/**
* Service Bus instrumentation.
*/
package com.azure.spring.integration.servicebus.inbound.health;
package com.azure.spring.integration.servicebus.inbound.implementation;
2 changes: 1 addition & 1 deletion ...com/azure/spring/integration/servicebus/inbound/ServiceBusInboundChannelAdapterTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import com.azure.messaging.servicebus.ServiceBusErrorContext;
import com.azure.messaging.servicebus.ServiceBusMessage;
import com.azure.messaging.servicebus.ServiceBusReceivedMessage;
import com.azure.spring.integration.instrumentation.DefaultInstrumentationManager;
import com.azure.spring.integration.implementation.DefaultInstrumentationManager;
import com.azure.spring.integration.servicebus.inbound.ServiceBusInboundChannelAdapter.IntegrationRecordMessageProcessingListener;
import com.azure.spring.messaging.checkpoint.CheckpointConfig;
import com.azure.spring.messaging.checkpoint.CheckpointMode;
Expand Down
1 change: 1 addition & 0 deletions ...spring/integration/servicebus/inbound/health/ServiceBusProcessorInstrumentationTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import com.azure.spring.integration.instrumentation.AbstractProcessorInstrumentation;
import com.azure.spring.integration.instrumentation.AbstractProcessorInstrumentationTests;
import com.azure.spring.integration.instrumentation.Instrumentation;
import com.azure.spring.integration.servicebus.inbound.implementation.ServiceBusProcessorInstrumentation;

import java.time.Duration;

Expand Down
2 changes: 1 addition & 1 deletion .../java/com/azure/spring/integration/servicebus/outbound/ServiceBusMessageHandlerTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

package com.azure.spring.integration.servicebus.outbound;

import com.azure.spring.integration.handler.DefaultMessageHandler;
import com.azure.spring.integration.implementation.DefaultMessageHandler;
import com.azure.spring.integration.handler.DefaultMessageHandlerTests;
import com.azure.spring.messaging.PartitionSupplier;
import com.azure.spring.servicebus.core.ServiceBusTemplate;
Expand Down