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

EventHubs integration part 1 #3100

Merged
merged 37 commits into from
Mar 21, 2019
+907 −796
Merged

EventHubs integration part 1 #3100

Show file tree
Hide file tree
Changes from 26 commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
a0a9256
Merge branch 'master' of https://github.com/Azure/azure-sdk-for-java …
mssfang Mar 7, 2019
448eb87
eventhubs-java: pom and code changes
mssfang Mar 5, 2019
81bf995
eventhubs-java: client.test.live.yml updated
mssfang Mar 5, 2019
cbdcbc4
LicenseJava: add license info for all java files
mssfang Mar 6, 2019
63202b8
Merge branch 'master' of https://github.com/Azure/azure-sdk-for-java …
mssfang Mar 8, 2019
2b77b7e
PR-3067: Eventhub-java: integrate event hubs into azure-sdk-for-java …
mssfang Mar 8, 2019
b3f9025
fix: update jproxy link for unit tests
mssfang Mar 11, 2019
7e62e12
Merge branch 'master' into eventhub-after-init
mssfang Mar 11, 2019
6205425
fix<test-proxy-server>: add external proxy server lib source file for…
mssfang Mar 11, 2019
d428a0b
fix<checkstyle>: fixed all indentation errors
mssfang Mar 13, 2019
7ca54ae
fix<checkstyle>: FileTabCharacter rule fixed
mssfang Mar 13, 2019
77f60ad
fix<checkstyle>: fixed OperatorWrap rule
mssfang Mar 13, 2019
6af1c75
fix<checkStyle>: fixed AvoidStarImport rule
mssfang Mar 13, 2019
2f659da
fix<checkstyle>: WhitespaceAround rule
mssfang Mar 13, 2019
d27ff38
fix<checkstyle>: NoWhitespaceBefore and WhitespaceAfter rules
mssfang Mar 13, 2019
d74dd65
fix<checkstyle>: WhitespaceAround rule
mssfang Mar 13, 2019
370ac79
fix<checkstyle>: RegexpSingleline rule
mssfang Mar 13, 2019
490ba69
fix<checkstyle>: ArrayTypeStyle rule
mssfang Mar 13, 2019
aa398e5
fix<checkstyle>: NewlineAtEndOfFile rule
mssfang Mar 13, 2019
0186bde
fix<checkstyle>: UnusedImports
mssfang Mar 13, 2019
ad9e36e
fix<checkstyle>: ConstantName
mssfang Mar 13, 2019
1bdd20c
fix<checkstyle>: MethodName and StaticVariableName rules
mssfang Mar 13, 2019
8b1c784
fix<checkstyle>: VisibilityModifier
mssfang Mar 13, 2019
7ef1d6f
fix<checkstyle>: EmptyBlock, InnerAssignment
mssfang Mar 13, 2019
175b3c0
fix<checkstyle>: ModifierOrder
mssfang Mar 13, 2019
6b62e9e
fix<checkstyle>: RedundantModifier
mssfang Mar 13, 2019
442091a
fix<checkstyle-warning>: LeftCurly
mssfang Mar 13, 2019
630824a
fix<revert>: revert client.test.live.yml changes, exclude event hub
mssfang Mar 13, 2019
efa2053
fix<checkstyle>: additional 10 Indentation errors
mssfang Mar 14, 2019
e1b698a
fix<checkstyle, pom>: updates changes for connie's code changes request
mssfang Mar 14, 2019
0071253
fix<conflict>: resolved conflict after update
mssfang Mar 14, 2019
7452fbd
test<live-test>: enable live test for eventhubs
mssfang Mar 14, 2019
939e823
Merge branch 'master' into eventhubs-checkstyle-2
mssfang Mar 20, 2019
64d6046
fix(CheckStyle): update to latest checkstyle-suppressions that matche…
mssfang Mar 20, 2019
c872da8
conflict: resolve check style conflict issue
mssfang Mar 20, 2019
be64553
Merge branch 'master' of https://github.com/Azure/azure-sdk-for-java …
mssfang Mar 20, 2019
750e86f
Merge branch 'eventhubs-checkstyle-2' of https://github.com/mssfang/a…
mssfang Mar 20, 2019
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
3 changes: 3 additions & 0 deletions .azure-pipelines/client.test.live.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ jobs:
pomFilePath: './batch/data-plane/pom.xml'
mssfang marked this conversation as resolved.
Show resolved Hide resolved
AzureKeyVault:
pomFilePath: './keyvault/data-plane/pom.xml'
AzureEventHubs:
pomFilePath: './eventhubs/data-plane/pom.xml'

pool:
vmImage: 'vs2017-win2016'
Expand All @@ -33,6 +35,7 @@ jobs:
STORAGE_ACCOUNT_KEY: $(java-batch-test-storage-account-key)
STORAGE_ACCOUNT_NAME: $(java-batch-test-storage-account-name)
AZURE_BATCH_ENDPOINT: https://servbatch.centralus.batch.azure.com
AZURE_EVENTHUBS_CONNECTION_STRING: ${java-event-hubs-test-connection-string}

- task: PublishTestResults@2
condition: succeededOrFailed()
Expand Down
50 changes: 49 additions & 1 deletion eng/code-quality-reports/src/main/resources/checkstyle/checkstyle-suppressions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,62 @@
<!-- Public API already released with incorrect upper-case naming pattern -->
<suppress checks="MethodName" files="AsymmetricEncryptionAlgorithm.java"/>
<suppress checks="MethodName" files="KeyWrapAlgorithm.java"/>
<suppress checks="MethodName" files="PartitionSenderImpl.java"/>
mssfang marked this conversation as resolved.
Show resolved Hide resolved
<suppress checks="MethodName" files="SignatureEncoding.java"/>
<suppress checks="MethodName" files="SymmetricEncryptionAlgorithm.java"/>
<suppress checks="MethodName" files="RsaSignature.java"/>

<!-- Public API already released with incorrect constant variable naming -->
<suppress checks="ConstantName" files="AlgorithmResolver.java"/>
<suppress checks="ConstantName" files="AmqpErrorCode.java"/>
<suppress checks="ConstantName" files="BatchErrorCodeStrings.java"/>
<suppress checks="ConstantName" files="ConnectionStringBuilder.java"/>
Copy link
Member

Choose a reason for hiding this comment

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

Looking over your PR #3105 , the checkstyle-suppression comments I had may be similar. I made the same comment about ConnectionStringBuilder.java being able to be removed.

Since you're merging 3105 after this, I'd suggest removing this line instead of fixing it.

Copy link
Member Author

@mssfang mssfang Mar 20, 2019 •
edited
Loading

Choose a reason for hiding this comment

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

I updated checkstyle supression file. but no changes to the corresponding errors.

<suppress checks="ConstantName" files="EventProcessorHost.java"/>
mssfang marked this conversation as resolved.
Show resolved Hide resolved
<suppress checks="ConstantName" files="InMemoryCheckpointManager.java"/>
<suppress checks="ConstantName" files="InMemoryLeaseManager.java"/>
<suppress checks="ConstantName" files="MessagingFactory.java"/>
<suppress checks="ConstantName" files="PartitionManagerOptions.java"/>
<suppress checks="ConstantName" files="PartitionScanner.java"/>
<suppress checks="ConstantName" files="RsaKey.java"/>
<suppress checks="ConstantName" files="SymmetricKey.java"/>
<suppress checks="ConstantName" files="BatchErrorCodeStrings.java"/>
<suppress checks="ConstantName" files="TaskFailureInformationCodes.java"/>

<!-- Public API already released with incorrect static variable naming -->
<suppress checks="StaticVariableName" files="EventHubClientImpl.java"/>

<!-- Public API already released with visibility modifier -->
<suppress checks="VisibilityModifier" files="BatchOptions.java"/>
<suppress checks="VisibilityModifier" files="EventHubClientImpl.java"/>

<!-- Public API already released with inner assignment-->
<suppress checks="InnerAssignment" files="MessageReceiver.java"/>

<!-- Public API already released with empty block-->
<suppress checks="EmptyBlock" files="MessageReceiver.java"/>
<suppress checks="EmptyBlock" files="InMemoryLeaseManager.java"/>
<suppress checks="EmptyBlock" files="ReactorDispatcher.java"/>
<suppress checks="EmptyBlock" files="AzureStorageCheckpointLeaseManager.java"/>

<!-- Public API already released with redundant modifier-->
<suppress checks="RedundantModifier" files="ActiveClientTokenManager.java"/>
<suppress checks="RedundantModifier" files="AmqpResponseCode.java"/>
<suppress checks="RedundantModifier" files="BatchOptions.java"/>
<suppress checks="RedundantModifier" files="CBSChannel.java"/>
<suppress checks="RedundantModifier" files="EventDataBatchImpl.java"/>
<suppress checks="RedundantModifier" files="EventHubClientImpl.java"/>
<suppress checks="RedundantModifier" files="EventProcessorHost.java"/>
<suppress checks="RedundantModifier" files="ICheckpointManager.java"/>
<suppress checks="RedundantModifier" files="IEventProcessor.java"/>
<suppress checks="RedundantModifier" files="IEventProcessorFactory.java"/>
<suppress checks="RedundantModifier" files="ILeaseManager.java"/>
<suppress checks="RedundantModifier" files="IOObject.java"/>
<suppress checks="RedundantModifier" files="ManagementChannel.java"/>
<suppress checks="RedundantModifier" files="MessageReceiver.java"/>
<suppress checks="RedundantModifier" files="MessageSender.java"/>
<suppress checks="RedundantModifier" files="MessagingFactory.java"/>
<suppress checks="RedundantModifier" files="PartitionReceiverImpl.java"/>
<suppress checks="RedundantModifier" files="PartitionSenderImpl.java"/>
<suppress checks="RedundantModifier" files="PumpManager.java"/>
<suppress checks="RedundantModifier" files="ReactorDispatcher.java"/>
<suppress checks="RedundantModifier" files="Timer.java"/>
</suppressions>
19 changes: 19 additions & 0 deletions eng/spotbugs-aggregate-report/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
<properties>
<azure-keyvault.version>1.2.0</azure-keyvault.version>
<azure-batch.version>5.0.1</azure-batch.version>
<azure-eventhubs.version>2.0.0</azure-eventhubs.version>
</properties>

<distributionManagement>
Expand Down Expand Up @@ -56,6 +57,21 @@
<artifactId>azure-batch</artifactId>
<version>${azure-batch.version}</version>
</dependency>
<dependency>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-eventhubs</artifactId>
<version>${azure-eventhubs.version}</version>
</dependency>
<dependency>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-eventhubs-eph</artifactId>
<version>${azure-eventhubs.version}</version>
</dependency>
<dependency>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-eventhubs-extensions</artifactId>
<version>${azure-eventhubs.version}</version>
</dependency>
</dependencies>

<build>
Expand All @@ -78,6 +94,9 @@
<source>..\..\keyvault\data-plane\azure-keyvault-webkey\src\main\java</source>
<source>..\..\keyvault\data-plane\azure-keyvault-extensions\src\main\java</source>
<source>..\..\batch\data-plane\src\main\java</source>
<source>..\..\eventhubs\data-plane\azure-eventhubs\src\main\java</source>
<source>..\..\eventhubs\data-plane\azure-eventhubs-eph\src\main\java</source>
<source>..\..\eventhubs\data-plane\azure-eventhubs-extensions\src\main\java</source>
</sources>
</configuration>
</execution>
Expand Down
76 changes: 43 additions & 33 deletions eventhubs/data-plane/azure-eventhubs-eph/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,40 +1,50 @@
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<!-- Copyright (c) Microsoft Corporation. All rights reserved.
Licensed under the MIT License. -->
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-eventhubs-eph</artifactId>
<version>2.2.0</version>

<parent>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-eventhubs-clients</artifactId>
<version>2.0.0</version>
</parent>
<name>Microsoft Azure SDK for Event Hubs Event Processor Host(EPH)</name>
<description>EPH is built on top of the Azure Event Hubs Client and provides a number of features not present in that lower layer</description>
<url>https://github.com/Azure/azure-sdk-for-java</url>

<version>2.2.0</version>
<parent>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-eventhubs-clients</artifactId>
<version>2.0.0</version>
<relativePath>../pom.xml</relativePath>
</parent>

<modelVersion>4.0.0</modelVersion>
<distributionManagement>
<site>
<id>azure-java-build-docs</id>
<url>${site.url}/site/${project.artifactId}</url>
</site>
</distributionManagement>

<artifactId>azure-eventhubs-eph</artifactId>
<name>azure-eventhubs-eph</name>
<scm>
<url>scm:git:https://github.com/Azure/azure-sdk-for-java</url>
</scm>

<scm>
<url>scm:git:https://github.com/Azure/azure-event-hubs</url>
</scm>
<dependencies>
<dependency>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-eventhubs</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-storage</artifactId>
Copy link
Contributor

Choose a reason for hiding this comment

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

FYI: Event Processor Host has not been updated for the new Storage 10.x client yet. (We had one customer ask, then later close the issue stating that they had encountered reliability issues with 10.x, so we decided to wait a bit before doing the work for the API changes.)

Copy link
Member Author

Choose a reason for hiding this comment

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

Thank you for sharing the information.

</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
</dependency>
</dependencies>

<dependencies>
<dependency>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-eventhubs</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-storage</artifactId>
<version>8.0.0</version>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.8.5</version>
</dependency>
</dependencies>

<description>libraries and extensions built on Microsoft Azure Event Hubs</description>
</project>
6 changes: 2 additions & 4 deletions ...re-eventhubs-eph/src/main/java/com/microsoft/azure/eventprocessorhost/AzureBlobLease.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
/*
* Copyright (c) Microsoft. All rights reserved.
* Licensed under the MIT license. See LICENSE file in the project root for full license information.
*/
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.

package com.microsoft.azure.eventprocessorhost;

Expand Down
Loading