Skip to content

Feature/java 8 version #333

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
merged 19 commits into from
May 11, 2020
Merged

Feature/java 8 version #333

merged 19 commits into from
May 11, 2020
+275 −279

Conversation

@smic1909
Copy link
Contributor

Description
This is the initial PR to upgrade from Java 7 to Java 8. First minor changes are already implemented. Further PRs can follow once this PR has been merged.

Tested scenarios
Tests are all green

Fixed issue: #329

@coveralls
Copy link

coveralls commented Apr 16, 2020 •
edited
Loading

Coverage Status

Coverage decreased (-0.8%) to 23.894% when pulling de222ad on smic1909:feature/java-8-version into 5a6cc33 on Adyen:develop.

andrei-dediu
andrei-dediu previously approved these changes Apr 21, 2020
View reviewed changes
@martinsrenato
Copy link
Contributor

Hi @smic1909,

Many thanks for the effort creating this pull request!
This is a big chance that will be followed by a major release, so our team is reviewing it carefully and running some tests to see if everything still works as expected. We'll soon let you know if there's any comments regarding it.

Regards,
Renato
Adyen

@martinsrenato
Copy link
Contributor

Hi @smic1909 ,

There's some conflicts on you pull request, can you please fix them?
They're really simple and related to a previous PR you created, so there should be no problem.

Regards,
Renato
Adyen

@smic1909
Merge branch 'develop' into feature/java-8-version
6a79545 
# Conflicts:
#	src/main/java/com/adyen/model/checkout/InputDetail.java
#	src/main/java/com/adyen/model/checkout/PaymentMethod.java
#	src/main/java/com/adyen/model/checkout/RecurringDetail.java
#	src/main/java/com/adyen/model/modification/AbstractModificationRequest.java
@smic1909
- Remove unused imports
1117b91 
- Remove redundant null values
@smic1909
Copy link
Contributor Author

@martinsrenato FYI, in case you missed my merge. Should be ok now, can you please double check.

martinsrenato
martinsrenato previously approved these changes Apr 29, 2020
View reviewed changes
rkewlani
rkewlani previously approved these changes Apr 29, 2020
View reviewed changes
@rkewlani rkewlani requested a review from andrei-dediu May 1, 2020 08:10
@smic1909 smic1909 dismissed stale reviews from rkewlani and martinsrenato via b7c4b39 May 1, 2020 18:02
@smic1909 smic1909 requested a review from Aleffio as a code owner May 1, 2020 18:02
martinsrenato
martinsrenato previously approved these changes May 7, 2020
View reviewed changes
andrei-dediu
andrei-dediu previously approved these changes May 8, 2020
View reviewed changes
@martinsrenato
Copy link
Contributor

Hi @smic1909 !

Sorry for taking some time to answer you.
Your changes look fine and we already approved, but before merging we would like to ask if it's possible for you to commit one last change.
As you can see, the Travis build for this PR is failing. Currently it is building for both java 7 and 8, and after your change it is logically breaking for the java 7 build.
Could you please change the travis.yml file to remove java 7 as one of the JDKs to build? So basically keep the jdk session of the file as

jdk:
  - oraclejdk8

Since the changes were made on your cloned repo, it is easier if you commit it. After that Travis will build again, hopefully without any issues.

Thanks again for all the contributions.

Regards,
Renato
Adyen

@smic1909 smic1909 dismissed stale reviews from andrei-dediu and martinsrenato via 6e4e8d7 May 8, 2020 13:23
@smic1909
Copy link
Contributor Author

smic1909 commented May 8, 2020

Hi @smic1909 !

Sorry for taking some time to answer you.
Your changes look fine and we already approved, but before merging we would like to ask if it's possible for you to commit one last change.
As you can see, the Travis build for this PR is failing. Currently it is building for both java 7 and 8, and after your change it is logically breaking for the java 7 build.
Could you please change the travis.yml file to remove java 7 as one of the JDKs to build? So basically keep the jdk session of the file as

jdk:
  - oraclejdk8

Since the changes were made on your cloned repo, it is easier if you commit it. After that Travis will build again, hopefully without any issues.

Thanks again for all the contributions.

Regards,
Renato
Adyen

Hi @martinsrenato , please check my latest commit.

@martinsrenato martinsrenato self-requested a review May 8, 2020 14:14
@martinsrenato
Copy link
Contributor

Hi @smic1909,

I am merging your PR now, since all the issues have been fixed and approved by reviewers.
This will be included on our next major release, which should happen on the next coming days.

Thanks again for the contribution!

Regards,
Renato
Adyen

@martinsrenato martinsrenato merged commit c65f159 into Adyen:develop May 11, 2020
@Aleffio Aleffio mentioned this pull request May 18, 2020
Merged
This was referenced May 18, 2020
Merged
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@AlexandrosMor AlexandrosMor Awaiting requested review from AlexandrosMor

@Aleffio Aleffio Awaiting requested review from Aleffio

@rkewlani rkewlani Awaiting requested review from rkewlani

3 more reviewers

@rikterbeek rikterbeek rikterbeek approved these changes

@martinsrenato martinsrenato martinsrenato approved these changes

@andrei-dediu andrei-dediu andrei-dediu approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@martinsrenato martinsrenato

@andrei-dediu andrei-dediu

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@smic1909 @coveralls @martinsrenato @rikterbeek @rkewlani @andrei-dediu @AlexandrosMor