Skip to content

Preparing Easymock for a future upgrade. #5510

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

Jump to bottom
Merged
sduskis merged 3 commits into from
Jun 18, 2019
Merged

Preparing Easymock for a future upgrade. #5510

sduskis merged 3 commits into from
Jun 18, 2019

Conversation

@sduskis
Copy link
Contributor

@sduskis sduskis commented Jun 18, 2019 •
edited
Loading

Easymock 4.0 changed EasyMock.createMock's signature in a backwards incompatible way from .createMock(Class<T> clazz) to .createMock(Class<> clazz). This requires adding an explicit generics type to be set.

Easymock 4.0+ doesn't support Java 7, so we can't immediately upgrade. This PR future proofs Easymock upgrades once we no longer have to support Java 7.

@sduskis sduskis requested a review from a team as a code owner June 18, 2019 15:51
@googlebot googlebot added the cla: yes This human has signed the Contributor License Agreement. label Jun 18, 2019
@chingor13
Copy link
Contributor

chingor13 commented Jun 18, 2019

Looks like easymock 4.0 no longer supports Java 7

@codecov
Copy link

codecov bot commented Jun 18, 2019

Codecov Report

Merging #5510 into master will decrease coverage by 0.31%.
The diff coverage is n/a.

Impacted file tree graph

@@             Coverage Diff              @@
##             master    #5510      +/-   ##
============================================
- Coverage     50.85%   50.53%   -0.32%     
+ Complexity    24194    22807    -1387     
============================================
  Files          2271     2271              
  Lines        230126   225283    -4843     
  Branches      25010    24892     -118     
============================================
- Hits         117038   113855    -3183     
+ Misses       104451   103685     -766     
+ Partials       8637     7743     -894
Impacted Files Coverage Δ Complexity Δ
...m/google/cloud/vision/v1/ImageAnnotatorClient.java 58.69% <0%> (-3.31%) 15% <0%> (-4%)
...e/cloud/vision/v1p4beta1/ImageAnnotatorClient.java 58.69% <0%> (-3.31%) 15% <0%> (-4%)
...e/cloud/vision/v1p3beta1/ImageAnnotatorClient.java 47.05% <0%> (-2.95%) 9% <0%> (-2%)
...e/cloud/vision/v1p2beta1/ImageAnnotatorClient.java 47.05% <0%> (-2.95%) 9% <0%> (-2%)
.../java/com/google/cloud/speech/v1/SpeechClient.java 48.57% <0%> (-2.78%) 10% <0%> (-2%)
...om/google/cloud/speech/v1p1beta1/SpeechClient.java 48.57% <0%> (-2.78%) 10% <0%> (-2%)
...d/webrisk/v1beta1/WebRiskServiceV1Beta1Client.java 63.41% <0%> (-2.5%) 12% <0%> (-3%)
...ogle/cloud/texttospeech/v1/TextToSpeechClient.java 55.88% <0%> (-2.46%) 9% <0%> (-2%)
...cloud/texttospeech/v1beta1/TextToSpeechClient.java 55.88% <0%> (-2.46%) 9% <0%> (-2%)
...oogle/cloud/language/v1/LanguageServiceClient.java 79.16% <0%> (-2.32%) 26% <0%> (-9%)
... and 534 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update aedbc1d...3e0c129. Read the comment docs.

@sduskis sduskis changed the title Upgrading Easymock. Preparing Easymock for a future upgrade. Jun 18, 2019
@sduskis
Copy link
Contributor Author

sduskis commented Jun 18, 2019

@chingor13, I reverted the pom.xml changes, but kept the generics changes in the code. Can you PTAL?

@sduskis sduskis merged commit 9debbd8 into googleapis:master Jun 18, 2019
@sduskis sduskis deleted the upgrade_easymock branch June 18, 2019 17:03
@kolea2 kolea2 mentioned this pull request Jun 20, 2019
Merged
github-actions bot pushed a commit to suztomo/google-cloud-java that referenced this pull request Jun 29, 2022
@sduskis
Preparing Easymock for a future upgrade. (googleapis#5510)
9302425 
* Upgrading Easymock.

* Reverting the upgrade of easymock, but keeping code changes.
meltsufin pushed a commit that referenced this pull request Dec 22, 2025
@sduskis
Preparing Easymock for a future upgrade. (#5510)
13ae313 
* Upgrading Easymock.

* Reverting the upgrade of easymock, but keeping code changes.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@chingor13 chingor13 chingor13 approved these changes

Assignees

No one assigned

Labels

cla: yes This human has signed the Contributor License Agreement.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@sduskis @chingor13 @googlebot