Artwork, JavaDoc updates #7
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,127 @@ | ||
| package org.schedulesdirect.api; | ||
|
|
||
| import org.json.JSONObject; | ||
|
|
||
| public class Artwork { | ||
|
|
||
| public static enum Size { | ||
| MASSIVE, | ||
| LARGE, | ||
| MEDIUM, | ||
| SMALL, | ||
| EXTRA_SMALL, | ||
| UNKNOWN; | ||
|
|
||
| public static Size fromString(String val) { | ||
| if(val != null) { | ||
| switch(val) { | ||
| case "Ms": | ||
| return Size.MASSIVE; | ||
| case "Lg": | ||
| return Size.LARGE; | ||
| case "Md": | ||
| return Size.MEDIUM; | ||
| case "Sm": | ||
| return Size.SMALL; | ||
| case "Xs": | ||
| return Size.EXTRA_SMALL; | ||
| } | ||
| } | ||
|
|
||
| return Size.UNKNOWN; | ||
| } | ||
| } | ||
|
|
||
| private String aspect; | ||
| private int width; | ||
| private int height; | ||
| private boolean text; | ||
| private String category; | ||
| private String uri; | ||
| private String tier; | ||
| private Size size; | ||
|
|
||
| public Artwork(JSONObject obj, EpgClient clnt) { | ||
| aspect = obj.optString("aspect"); | ||
| String width = obj.optString("width"); | ||
| this.width = width.length() == 0 ? 0 : Integer.parseInt(width); | ||
| String height = obj.optString("height"); | ||
| this.height = height.length() == 0 ? 0 : Integer.parseInt(height); | ||
| text = "yes".equalsIgnoreCase(obj.optString("text")); | ||
| category = obj.optString("category"); | ||
| tier = obj.optString("tier"); | ||
| String uri = obj.optString("uri"); | ||
| if(uri.matches("^https?:\\/\\/.*")) { | ||
| this.uri = uri; | ||
| } | ||
| else { | ||
| this.uri = String.format("%s/%s/image/%s", clnt.getBaseUrl(), EpgClient.API_VERSION, uri); | ||
| } | ||
|
|
||
| size = Size.fromString(obj.optString("size")); | ||
| } | ||
|
|
||
| public String getAspect() { | ||
| return aspect; | ||
| } | ||
|
|
||
| public void setAspect(String aspect) { | ||
| this.aspect = aspect; | ||
| } | ||
|
|
||
| public int getWidth() { | ||
| return width; | ||
| } | ||
|
|
||
| public void setWidth(int width) { | ||
| this.width = width; | ||
| } | ||
|
|
||
| public int getHeight() { | ||
| return height; | ||
| } | ||
|
|
||
| public void setHeight(int height) { | ||
| this.height = height; | ||
| } | ||
|
|
||
| public boolean isText() { | ||
| return text; | ||
| } | ||
|
|
||
| public void setText(boolean text) { | ||
| this.text = text; | ||
| } | ||
|
|
||
| public String getCategory() { | ||
| return category; | ||
| } | ||
|
|
||
| public void setCategory(String category) { | ||
| this.category = category; | ||
| } | ||
|
|
||
| public String getUri() { | ||
| return uri; | ||
| } | ||
|
|
||
| public void setUri(String uri) { | ||
| this.uri = uri; | ||
| } | ||
|
|
||
| public String getTier() { | ||
| return tier; | ||
| } | ||
|
|
||
| public void setTier(String tier) { | ||
| this.tier = tier; | ||
| } | ||
|
|
||
| public Size getSize() { | ||
| return size; | ||
| } | ||
|
|
||
| public void setSize(Size size) { | ||
| this.size = size; | ||
| } | ||
| } | ||
|
There was a problem hiding this comment. I'd like to see a unit test for this class as well. Even if it's just a basic one that validates good vs. bad json input. You'll see some simplistic examples for other classes that are this simple already. Basic validation is good, but also provides a starting point should something more substantial be needed later. |
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is there a particular reason to upgrade the bintray plugin?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, it was when using gradle 2.9.