Skip to content
This repository has been archived by the owner on Oct 29, 2019. It is now read-only.

Merge 3.0 and integrate http package for rest v2 #114

Merged
merged 11 commits into from
Jul 15, 2019
Merged

Merge 3.0 and integrate http package for rest v2 #114

merged 11 commits into from
Jul 15, 2019

Conversation

marakiis
Copy link
Contributor

Merge the fixes developed on branch 3.0
Add a modified netty-http compatible with java6

@marakiis marakiis added this to the 3.1.0 milestone Jun 14, 2019
@marakiis marakiis requested a review from bcarlin June 14, 2019 13:14
Copy link
Contributor

@fredericBregier fredericBregier left a comment

Choose a reason for hiding this comment

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

If I understand correctly, you managed to copy all from a project (among other changed) in order to stay Java 6 compatible. I believe it is not the best way to do this.

src/main/java/io/cdap/http/AbstractHandlerHook.java Outdated Show resolved Hide resolved
@bcarlin
Copy link
Member

bcarlin commented Jun 18, 2019 via email

@fredericBregier
Copy link
Contributor

It is always a good practice to propagate fixes upstream. As for the inclusion of the library in the codebase, we were looking for a "quick" (and dirty, I admit) solution to add compatibility for Java 6, given that the compatibility with Java 6 will be dropped with a 4.0 version of Waarp R66. The release of this major milestone is yet to be planned, but it will arrive within two years top. The inclusion of netty-http will be dropped then, and will be included as a "regular" dependency. This is just a temporary solution.

I understand the reason, of course. In the meantime, we could just import the tagged files (10 of them) instead of all... WDYT?

src/main/java/org/waarp/common/database/DbAdmin.java Outdated Show resolved Hide resolved
src/main/java/org/waarp/common/database/DbAdmin.java Outdated Show resolved Hide resolved
src/main/java/org/waarp/common/database/DbAdmin.java Outdated Show resolved Hide resolved
src/main/java/org/waarp/common/database/DbAdmin.java Outdated Show resolved Hide resolved
getSession().useConnection(); // default since this is the top
// connection
return;
}
Copy link
Member

@bcarlin bcarlin Jun 19, 2019

Choose a reason for hiding this comment

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

KISS!
The only difference between the two branches of the if is the value of isReadOnly, which is, in fact !write. the if is useless.

@fredericBregier fredericBregier self-requested a review June 19, 2019 11:06
Copy link
Contributor

@fredericBregier fredericBregier left a comment

Choose a reason for hiding this comment

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

I propose you an extra update on external project, following good advice from maintener.

@bcarlin
Copy link
Member

bcarlin commented Jul 2, 2019

Is DbAdmin on its way to be removed ? if so, I'm OK with this PR.
If not I'm still waiting for the change mentioned above (my last unresolved comment) because it will become a bug within a year...

@bcarlin bcarlin merged commit 6b9f956 into waarp:wNetty41 Jul 15, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants