Skip to content

Develop 1296 #1303

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.

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

Merged
merged 13 commits into from
Jul 16, 2021
Merged

Develop 1296 #1303

merged 13 commits into from
Jul 16, 2021

Conversation

ehennum
Copy link
Contributor

@ehennum ehennum commented Jul 2, 2021

Pull request for #1296 for 10.0-8

The rebase didn't apply cleanly, so I will need to clean up during the merge to make sure that everything is preserved.

Anyway, this refactoring of the Data Services implementation introduces a handle provider class so native content representations like String and InputStream can continue to be supported for existing types but adapters with a document format like StringHandle and InputStreamHandle can be supported for the new anyDocument type.

@ehennum ehennum requested review from georgeajit and llinggit July 2, 2021 18:47
@ehennum ehennum self-assigned this Jul 2, 2021
@llinggit
Copy link
Contributor

llinggit commented Jul 2, 2021

Thanks Erik for having this in this release!

@llinggit
Copy link
Contributor

llinggit commented Jul 2, 2021

Hi @ehennum , I see there are 12 commits in your pull request, https://github.com/marklogic/java-client-api/pull/1303/commits. I would guess only the last 4 are your intended commits. Is there a problem including so many old commits together?

@ehennum
Copy link
Contributor Author

ehennum commented Jul 6, 2021

Hi @ehennum , I see there are 12 commits in your pull request, https://github.com/marklogic/java-client-api/pull/1303/commits. I would guess only the last 4 are your intended commits. Is there a problem including so many old commits together?

Hi, @llinggit -- thanks for reviewing the changes. The other commits are the result of rebasing on top of changes to develop since the start of this branch.

If there's a better git technique than rebase for merging without overwriting changes on develop, please just let me know.

Just to be clear, I will hold off on merging until after the release.

@ehennum ehennum merged commit 75864b7 into develop Jul 16, 2021
@ehennum ehennum deleted the develop-1296 branch July 16, 2021 14:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants