Skip to content

Conversation

@KostyaSha
Copy link
Member

@KostyaSha KostyaSha commented Apr 23, 2017

reworked #739

@orzeh please review

This change is Reviewable

@codecov-io
Copy link

codecov-io commented Apr 23, 2017

Codecov Report

Merging #835 into master will increase coverage by 0.06%.
The diff coverage is 70.58%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #835      +/-   ##
==========================================
+ Coverage   71.75%   71.82%   +0.06%     
==========================================
  Files         306      306              
  Lines        6596     6629      +33     
  Branches      486      497      +11     
==========================================
+ Hits         4733     4761      +28     
- Misses       1577     1579       +2     
- Partials      286      289       +3
Impacted Files Coverage Δ
...hub/dockerjava/core/command/BuildImageCmdImpl.java 61.61% <100%> (+1.19%) ⬆️
...in/java/com/github/dockerjava/netty/WebTarget.java 67.6% <65.71%> (-4.49%) ⬇️
...ithub/dockerjava/netty/exec/BuildImageCmdExec.java 57.44% <75%> (+2.34%) ⬆️
...com/github/dockerjava/jaxrs/BuildImageCmdExec.java 56.36% <80%> (+1.46%) ⬆️
...github/dockerjava/api/model/BuildResponseItem.java 71.42% <0%> (+14.28%) ⬆️
...kerjava/core/command/BuildImageResultCallback.java 60.86% <0%> (+17.39%) ⬆️

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 4604067...c82b92d. Read the comment docs.

@KostyaSha
Copy link
Member Author

Reviewed 7 of 7 files at r1.
Review status: all files reviewed at latest revision, all discussions resolved, some commit checks failed.


Comments from Reviewable

webTarget = webTarget.queryParam("t", command.getTag());

if (command.getTags() != null && !command.getTags().isEmpty()) {
webTarget = webTarget.queryParam("t", command.getTags());
Copy link
Contributor

Choose a reason for hiding this comment

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

should be:

webTarget = webTarget.queryParamSet("t", command.getTags());

if (command.getTags() != null && !command.getTags().isEmpty()) {
webTarget = webTarget.queryParam("t", command.getTags());
} else if (command.getTags() != null) {
webTarget = webTarget.queryParamsSet("t", command.getTags());
Copy link
Contributor

Choose a reason for hiding this comment

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

should be:

webTarget = webTarget.queryParam("t", command.getTag());

Copy link
Member Author

Choose a reason for hiding this comment

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

damn git conflict

@KostyaSha
Copy link
Member Author

@orzeh please review again

Several tags for image can be defined by calling multiple time withTag() method of BuildImageCmd.
In Netty implementation, the WebTarget class is modified to support several query parameteres with the same name.
Fix docker-java#720
@KostyaSha KostyaSha changed the title Reworked PR #739 Reworked PR #739 (multiple tags) May 5, 2017
@KostyaSha KostyaSha added this to the 3.0.10 milestone May 5, 2017
@orzeh
Copy link
Contributor

orzeh commented May 5, 2017

@KostyaSha LGTM 👍

@KostyaSha KostyaSha merged commit ec30edc into docker-java:master May 5, 2017
@KostyaSha KostyaSha deleted the pr/739 branch May 5, 2017 14:52
if (command.getTags() != null && !command.getTags().isEmpty()) {
webTarget = webTarget.queryParamsSet("t", command.getTags());
} else if (isNotBlank(command.getTag())) {
webTarget = webTarget.queryParam("t", command.getTags());
Copy link
Member Author

Choose a reason for hiding this comment

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

!

Copy link
Contributor

Choose a reason for hiding this comment

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

O_o

panuse pushed a commit to TuKangTech/docker-java that referenced this pull request Aug 20, 2017
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.

3 participants